From 40bd37315a1b8a733a14636291f824162a38354b Mon Sep 17 00:00:00 2001
From: Eric Kotato <radrussianrus@gmail.com>
Date: Thu, 14 Mar 2024 07:01:15 +0300
Subject: [PATCH 001/596] Use %NUMBER_OF_PROCESSORS% for jom

---
 Telegram/build/prepare/prepare.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index bb63f2d62..173f34c2b 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1454,8 +1454,8 @@ win:
         -nomake tests ^
         -platform win32-msvc
 
-    jom -j16
-    jom -j16 install
+    jom -j%NUMBER_OF_PROCESSORS%
+    jom -j%NUMBER_OF_PROCESSORS% install
 mac:
     find ../../patches/qtbase_5.15.13 -type f -print0 | sort -z | xargs -0 git apply
     cd ..

From c9e566f8aa9372bd767203848c06a5f2f8d20d09 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Mar 2024 08:50:38 +0400
Subject: [PATCH 002/596] Fix snap build

Qt has removed support for kernels less than 4.11 by removing the -no-feature-statx flag. Remove the usage all the related flags.
---
 snap/snapcraft.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f869d7697..a4ef1f060 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -512,10 +512,6 @@ parts:
         -release \
         -opensource \
         -confirm-license \
-        -no-feature-getentropy \
-        -no-feature-renameat2 \
-        -no-feature-statx \
-        -no-feature-egl-extension-platform-wayland \
         -openssl-linked \
         -nomake examples \
         -nomake tests

From 9414ef570940eef138d04825289d489460309868 Mon Sep 17 00:00:00 2001
From: Eric Kotato <radrussianrus@gmail.com>
Date: Thu, 14 Mar 2024 07:32:25 +0300
Subject: [PATCH 003/596] Using system font stack for Instant View

---
 Telegram/Resources/iv_html/page.css | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
index bdc44f184..7d4bd22c0 100644
--- a/Telegram/Resources/iv_html/page.css
+++ b/Telegram/Resources/iv_html/page.css
@@ -1,5 +1,11 @@
+:root {
+	--font-sans: -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, tahoma, arial, sans-serif;
+	--font-serif: Iowan Old Style, Apple Garamond, Baskerville, Georgia, Times New Roman, Droid Serif, Times, Source Serif Pro, serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;
+	--font-mono: Menlo, Cascadia Code, Consolas, Monaco, Liberation Mono, Lucida Console, monospace;
+}
+
 body {
-	font-family: 'Helvetica Neue';
+	font-family: var(--font-sans);
 	font-size: 17px;
 	line-height: 25px;
 	padding: 0;
@@ -145,7 +151,7 @@ article {
 }
 article h1,
 article h2 {
-	font-family: 'Georgia';
+	font-family: var(--font-serif);
 	font-size: 28px;
 	line-height: 31px;
 	margin: 21px 18px 12px;
@@ -237,7 +243,7 @@ article ol p {
 }
 article pre,
 article pre.hljs {
-	font-family: Menlo;
+	font-family: var(--font-mono);
 	margin: 14px 0;
 	padding: 7px 18px;
 	background: #F5F8FC;
@@ -265,7 +271,7 @@ article pre + pre {
 }
 article h3,
 article h4 {
-	font-family: 'Georgia';
+	font-family: var(--font-serif);
 	font-size: 24px;
 	line-height: 30px;
 	margin: 18px 18px 9px;
@@ -284,7 +290,7 @@ article ol h4 {
 	margin: 10px 0 5px;
 }
 article blockquote {
-	font-family: 'Georgia';
+	font-family: var(--font-serif);
 	margin: 18px 18px 16px;
 	padding-left: 22px;
 	position: relative;
@@ -310,7 +316,7 @@ article.rtl blockquote:before {
 	left: auto;
 }
 article aside {
-	font-family: 'Georgia';
+	font-family: var(--font-serif);
 	margin: 18px 18px 16px;
 	padding: 0 18px;
 	text-align: center;
@@ -326,7 +332,7 @@ article blockquote cite,
 article aside cite,
 article footer cite,
 article .pullquote cite {
-	font-family: 'Helvetica Neue';
+	font-family: var(--font-sans);
 	font-size: 15px;
 	display: block;
 	color: var(--td-window-sub-text-fg);
@@ -601,7 +607,7 @@ ol figcaption {
 	padding-right: 0;
 }
 figcaption > cite {
-	font-family: 'Helvetica Neue';
+	font-family: var(--font-sans);
 	font-size: 12px;
 	display: block;
 	line-height: 15px;
@@ -855,7 +861,7 @@ section.related {
 	margin: 7px 0 12px;
 }
 section.related h4 {
-	font-family: 'Helvetica Neue';
+	font-family: var(--font-sans);
 	font-size: 17px;
 	line-height: 26px;
 	font-weight: 500;
@@ -996,7 +1002,7 @@ section.channel > a > div.join span:before {
 	content: var(--td-lng-group-call-join);
 }
 section.channel > a > h4 {
-	font-family: 'Helvetica Neue';
+	font-family: var(--font-sans);
 	font-size: 17px;
 	line-height: 26px;
 	font-weight: 500;

From c0b612c45753a9b45c0b965787c52b3055238320 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Mar 2024 08:37:38 +0400
Subject: [PATCH 004/596] Update cppgir

---
 .../linux/notifications_manager_linux.cpp     | 30 +++++--------------
 cmake                                         |  2 +-
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 85d0fc037..aed48c948 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -469,29 +469,18 @@ void NotificationData::close() {
 }
 
 void NotificationData::setImage(QImage image) {
-	using DestroyNotify = gi::detail::callback<
-		void(),
-		gi::transfer_full_t,
-		std::tuple<>
-	>;
-
 	if (_notification) {
 		const auto imageData = std::make_shared<QByteArray>();
 		QBuffer buffer(imageData.get());
 		buffer.open(QIODevice::WriteOnly);
 		image.save(&buffer, "PNG");
 
-		const auto callbackWrap = gi::unwrap(
-			DestroyNotify([imageData] {}),
-			gi::scope_notified);
-
 		_notification.set_icon(
 			Gio::BytesIcon::new_(
-				gi::wrap(g_bytes_new_with_free_func(
-					imageData->constData(),
+				GLib::Bytes::new_with_free_func(
+					reinterpret_cast<const uchar*>(imageData->constData()),
 					imageData->size(),
-					&callbackWrap->destroy,
-					callbackWrap), gi::transfer_full)));
+					[imageData] {})));
 
 		return;
 	}
@@ -506,10 +495,6 @@ void NotificationData::setImage(QImage image) {
 		image.convertTo(QImage::Format_RGB888);
 	}
 
-	const auto callbackWrap = gi::unwrap(
-		DestroyNotify([image] {}),
-		gi::scope_notified);
-
 	_hints.insert_value(_imageKey, GLib::Variant::new_tuple({
 		GLib::Variant::new_int32(image.width()),
 		GLib::Variant::new_int32(image.height()),
@@ -517,13 +502,12 @@ void NotificationData::setImage(QImage image) {
 		GLib::Variant::new_boolean(image.hasAlphaChannel()),
 		GLib::Variant::new_int32(8),
 		GLib::Variant::new_int32(image.hasAlphaChannel() ? 4 : 3),
-		gi::wrap(g_variant_new_from_data(
-			G_VARIANT_TYPE_BYTESTRING,
-			image.constBits(),
+		GLib::Variant::new_from_data(
+			GLib::VariantType::new_("ay"),
+			reinterpret_cast<const uchar*>(image.constBits()),
 			image.sizeInBytes(),
 			true,
-			&callbackWrap->destroy,
-			callbackWrap), gi::transfer_none),
+			[image] {}),
 	}));
 }
 
diff --git a/cmake b/cmake
index c82faf706..95c83fd26 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit c82faf706fd10618ad5f97a7972fb09c56843271
+Subproject commit 95c83fd26424c26d4fc4454cef601529616683aa

From e0447539343dad225d60c8d4f65937134e96acfc Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Mar 2024 10:17:15 +0400
Subject: [PATCH 005/596] Fix macOS GH action

---
 .github/workflows/mac.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 68bab389c..61561be9f 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -64,7 +64,10 @@ jobs:
       - name: First set up.
         run: |
           sudo chown -R `whoami`:admin /usr/local/share
-          brew install automake ninja pkg-config nasm meson
+
+          brew update
+          brew upgrade || true
+          brew install automake meson nasm ninja pkg-config
 
           # Disable spotlight.
           sudo mdutil -a -i off

From 458b990b8c4f5816689a49a9e2517a8b973f26da Mon Sep 17 00:00:00 2001
From: kukuruzka <60149954+kukuruzka165@users.noreply.github.com>
Date: Mon, 4 Mar 2024 19:39:07 +0200
Subject: [PATCH 006/596] Improve transliteration

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

diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp
index bcc0068e0..53e0008ca 100644
--- a/Telegram/SourceFiles/core/utils.cpp
+++ b/Telegram/SourceFiles/core/utils.cpp
@@ -598,8 +598,10 @@ QString rusKeyboardLayoutSwitch(const QString &from) {
 		fastRusKeyboardSwitch.insert(QString::fromUtf8("ю").at(0), '.');
 		fastRusKeyboardSwitch.insert(QString::fromUtf8("І").at(0), 'S');
 		fastRusKeyboardSwitch.insert(QString::fromUtf8("і").at(0), 's');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ї").at(0), ']');
+		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ї").at(0), '}');
 		fastRusKeyboardSwitch.insert(QString::fromUtf8("ї").at(0), ']');
+		fastRusKeyboardSwitch.insert(QString::fromUtf8("Є").at(0), '"');
+		fastRusKeyboardSwitch.insert(QString::fromUtf8("є").at(0), '\'');
 	}
 
 	QString result;

From bf4b4ae9361813badee92d6c7322091689486d7f Mon Sep 17 00:00:00 2001
From: kukuruzka <60149954+kukuruzka165@users.noreply.github.com>
Date: Tue, 5 Mar 2024 19:37:47 +0200
Subject: [PATCH 007/596] full support for ukrainian transliteration

---
 Telegram/SourceFiles/core/utils.cpp | 175 ++++++----------------------
 1 file changed, 36 insertions(+), 139 deletions(-)

diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp
index 53e0008ca..c82c7ed65 100644
--- a/Telegram/SourceFiles/core/utils.cpp
+++ b/Telegram/SourceFiles/core/utils.cpp
@@ -335,6 +335,7 @@ namespace {
 	QHash<QChar, QString> fastLetterRusEng;
 	QMap<uint32, QString> fastDoubleLetterRusEng;
 	QHash<QChar, QChar> fastRusKeyboardSwitch;
+	QHash<QChar, QChar> fastUkrKeyboardSwitch;
 }
 
 QString translitLetterRusEng(QChar letter, QChar next, int32 &toSkip) {
@@ -466,149 +467,38 @@ QString translitRusEng(const QString &rus) {
 	return result;
 }
 
-QString rusKeyboardLayoutSwitch(const QString &from) {
-	if (fastRusKeyboardSwitch.isEmpty()) {
-		fastRusKeyboardSwitch.insert('Q', QString::fromUtf8("Й").at(0));
-		fastRusKeyboardSwitch.insert('W', QString::fromUtf8("Ц").at(0));
-		fastRusKeyboardSwitch.insert('E', QString::fromUtf8("У").at(0));
-		fastRusKeyboardSwitch.insert('R', QString::fromUtf8("К").at(0));
-		fastRusKeyboardSwitch.insert('T', QString::fromUtf8("Е").at(0));
-		fastRusKeyboardSwitch.insert('Y', QString::fromUtf8("Н").at(0));
-		fastRusKeyboardSwitch.insert('U', QString::fromUtf8("Г").at(0));
-		fastRusKeyboardSwitch.insert('I', QString::fromUtf8("Ш").at(0));
-		fastRusKeyboardSwitch.insert('O', QString::fromUtf8("Щ").at(0));
-		fastRusKeyboardSwitch.insert('P', QString::fromUtf8("З").at(0));
-		fastRusKeyboardSwitch.insert('{', QString::fromUtf8("Х").at(0));
-		fastRusKeyboardSwitch.insert('}', QString::fromUtf8("Ъ").at(0));
-		fastRusKeyboardSwitch.insert('A', QString::fromUtf8("Ф").at(0));
-		fastRusKeyboardSwitch.insert('S', QString::fromUtf8("Ы").at(0));
-		fastRusKeyboardSwitch.insert('D', QString::fromUtf8("В").at(0));
-		fastRusKeyboardSwitch.insert('F', QString::fromUtf8("А").at(0));
-		fastRusKeyboardSwitch.insert('G', QString::fromUtf8("П").at(0));
-		fastRusKeyboardSwitch.insert('H', QString::fromUtf8("Р").at(0));
-		fastRusKeyboardSwitch.insert('J', QString::fromUtf8("О").at(0));
-		fastRusKeyboardSwitch.insert('K', QString::fromUtf8("Л").at(0));
-		fastRusKeyboardSwitch.insert('L', QString::fromUtf8("Д").at(0));
-		fastRusKeyboardSwitch.insert(':', QString::fromUtf8("Ж").at(0));
-		fastRusKeyboardSwitch.insert('"', QString::fromUtf8("Э").at(0));
-		fastRusKeyboardSwitch.insert('Z', QString::fromUtf8("Я").at(0));
-		fastRusKeyboardSwitch.insert('X', QString::fromUtf8("Ч").at(0));
-		fastRusKeyboardSwitch.insert('C', QString::fromUtf8("С").at(0));
-		fastRusKeyboardSwitch.insert('V', QString::fromUtf8("М").at(0));
-		fastRusKeyboardSwitch.insert('B', QString::fromUtf8("И").at(0));
-		fastRusKeyboardSwitch.insert('N', QString::fromUtf8("Т").at(0));
-		fastRusKeyboardSwitch.insert('M', QString::fromUtf8("Ь").at(0));
-		fastRusKeyboardSwitch.insert('<', QString::fromUtf8("Б").at(0));
-		fastRusKeyboardSwitch.insert('>', QString::fromUtf8("Ю").at(0));
-		fastRusKeyboardSwitch.insert('q', QString::fromUtf8("й").at(0));
-		fastRusKeyboardSwitch.insert('w', QString::fromUtf8("ц").at(0));
-		fastRusKeyboardSwitch.insert('e', QString::fromUtf8("у").at(0));
-		fastRusKeyboardSwitch.insert('r', QString::fromUtf8("к").at(0));
-		fastRusKeyboardSwitch.insert('t', QString::fromUtf8("е").at(0));
-		fastRusKeyboardSwitch.insert('y', QString::fromUtf8("н").at(0));
-		fastRusKeyboardSwitch.insert('u', QString::fromUtf8("г").at(0));
-		fastRusKeyboardSwitch.insert('i', QString::fromUtf8("ш").at(0));
-		fastRusKeyboardSwitch.insert('o', QString::fromUtf8("щ").at(0));
-		fastRusKeyboardSwitch.insert('p', QString::fromUtf8("з").at(0));
-		fastRusKeyboardSwitch.insert('[', QString::fromUtf8("х").at(0));
-		fastRusKeyboardSwitch.insert(']', QString::fromUtf8("ъ").at(0));
-		fastRusKeyboardSwitch.insert('a', QString::fromUtf8("ф").at(0));
-		fastRusKeyboardSwitch.insert('s', QString::fromUtf8("ы").at(0));
-		fastRusKeyboardSwitch.insert('d', QString::fromUtf8("в").at(0));
-		fastRusKeyboardSwitch.insert('f', QString::fromUtf8("а").at(0));
-		fastRusKeyboardSwitch.insert('g', QString::fromUtf8("п").at(0));
-		fastRusKeyboardSwitch.insert('h', QString::fromUtf8("р").at(0));
-		fastRusKeyboardSwitch.insert('j', QString::fromUtf8("о").at(0));
-		fastRusKeyboardSwitch.insert('k', QString::fromUtf8("л").at(0));
-		fastRusKeyboardSwitch.insert('l', QString::fromUtf8("д").at(0));
-		fastRusKeyboardSwitch.insert(';', QString::fromUtf8("ж").at(0));
-		fastRusKeyboardSwitch.insert('\'', QString::fromUtf8("э").at(0));
-		fastRusKeyboardSwitch.insert('z', QString::fromUtf8("я").at(0));
-		fastRusKeyboardSwitch.insert('x', QString::fromUtf8("ч").at(0));
-		fastRusKeyboardSwitch.insert('c', QString::fromUtf8("с").at(0));
-		fastRusKeyboardSwitch.insert('v', QString::fromUtf8("м").at(0));
-		fastRusKeyboardSwitch.insert('b', QString::fromUtf8("и").at(0));
-		fastRusKeyboardSwitch.insert('n', QString::fromUtf8("т").at(0));
-		fastRusKeyboardSwitch.insert('m', QString::fromUtf8("ь").at(0));
-		fastRusKeyboardSwitch.insert(',', QString::fromUtf8("б").at(0));
-		fastRusKeyboardSwitch.insert('.', QString::fromUtf8("ю").at(0));
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Й").at(0), 'Q');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ц").at(0), 'W');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("У").at(0), 'E');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("К").at(0), 'R');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Е").at(0), 'T');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Н").at(0), 'Y');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Г").at(0), 'U');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ш").at(0), 'I');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Щ").at(0), 'O');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("З").at(0), 'P');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Х").at(0), '{');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ъ").at(0), '}');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ф").at(0), 'A');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ы").at(0), 'S');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("В").at(0), 'D');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("А").at(0), 'F');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("П").at(0), 'G');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Р").at(0), 'H');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("О").at(0), 'J');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Л").at(0), 'K');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Д").at(0), 'L');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ж").at(0), ':');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Э").at(0), '"');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Я").at(0), 'Z');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ч").at(0), 'X');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("С").at(0), 'C');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("М").at(0), 'V');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("И").at(0), 'B');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Т").at(0), 'N');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ь").at(0), 'M');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Б").at(0), '<');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ю").at(0), '>');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("й").at(0), 'q');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ц").at(0), 'w');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("у").at(0), 'e');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("к").at(0), 'r');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("е").at(0), 't');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("н").at(0), 'y');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("г").at(0), 'u');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ш").at(0), 'i');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("щ").at(0), 'o');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("з").at(0), 'p');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("х").at(0), '[');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ъ").at(0), ']');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ф").at(0), 'a');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ы").at(0), 's');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("в").at(0), 'd');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("а").at(0), 'f');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("п").at(0), 'g');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("р").at(0), 'h');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("о").at(0), 'j');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("л").at(0), 'k');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("д").at(0), 'l');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ж").at(0), ';');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("э").at(0), '\'');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("я").at(0), 'z');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ч").at(0), 'x');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("с").at(0), 'c');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("м").at(0), 'v');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("и").at(0), 'b');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("т").at(0), 'n');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ь").at(0), 'm');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("б").at(0), ',');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ю").at(0), '.');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("І").at(0), 'S');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("і").at(0), 's');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Ї").at(0), '}');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("ї").at(0), ']');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("Є").at(0), '"');
-		fastRusKeyboardSwitch.insert(QString::fromUtf8("є").at(0), '\'');
-	}
+QString engAlphabet = "qwertyuiop[]asdfghjkl;'zxcvbnm,.";
+QString engAlphabetUpper = engAlphabet.toUpper();
 
+void initializeKeyboardSwitch() {
+	if (fastRusKeyboardSwitch.isEmpty()) {
+		QString rusAlphabet = "йцукенгшщзхъфывапролджэячсмитьбю";
+		QString rusAlphabetUpper = rusAlphabet.toUpper();
+		for (int i = 0; i < rusAlphabet.size(); ++i) {
+			fastRusKeyboardSwitch.insert(engAlphabetUpper[i], rusAlphabetUpper[i]);
+			fastRusKeyboardSwitch.insert(engAlphabet[i], rusAlphabet[i]);
+			fastRusKeyboardSwitch.insert(rusAlphabetUpper[i], engAlphabetUpper[i]);
+			fastRusKeyboardSwitch.insert(rusAlphabet[i], engAlphabet[i]);
+		}
+	}
+	if (fastUkrKeyboardSwitch.isEmpty()) {
+		QString ukrAlphabet = "йцукенгшщзхїфівапролджєячсмитьбю";
+		QString ukrAlphabetUpper = ukrAlphabet.toUpper();
+		for (int i = 0; i < ukrAlphabet.size(); ++i) {
+			fastUkrKeyboardSwitch.insert(engAlphabetUpper[i], ukrAlphabetUpper[i]);
+			fastUkrKeyboardSwitch.insert(engAlphabet[i], ukrAlphabet[i]);
+			fastUkrKeyboardSwitch.insert(ukrAlphabetUpper[i], engAlphabetUpper[i]);
+			fastUkrKeyboardSwitch.insert(ukrAlphabet[i], engAlphabet[i]);
+		}
+	}
+}
+
+QString switchKeyboardLayout(const QString& from, QHash<QChar, QChar>& keyboardSwitch) {
 	QString result;
 	result.reserve(from.size());
 	for (QString::const_iterator i = from.cbegin(), e = from.cend(); i != e; ++i) {
-		QHash<QChar, QChar>::const_iterator j = fastRusKeyboardSwitch.constFind(*i);
-		if (j == fastRusKeyboardSwitch.cend()) {
+		QHash<QChar, QChar>::const_iterator j = keyboardSwitch.constFind(*i);
+		if (j == keyboardSwitch.cend()) {
 			result += *i;
 		} else {
 			result += j.value();
@@ -616,3 +506,10 @@ QString rusKeyboardLayoutSwitch(const QString &from) {
 	}
 	return result;
 }
+
+QString rusKeyboardLayoutSwitch(const QString& from) {
+	initializeKeyboardSwitch();
+	QString rus = switchKeyboardLayout(from, fastRusKeyboardSwitch);
+	QString ukr = switchKeyboardLayout(from, fastUkrKeyboardSwitch);
+	return rus == ukr ? rus : rus + ' ' + ukr;
+}

From d5b23b5bde162ac94295665b3579ba4707db79c6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 10:55:21 +0400
Subject: [PATCH 008/596] Use a separate lang key for IV channel join button.

---
 Telegram/Resources/iv_html/page.css       | 2 +-
 Telegram/Resources/langs/lang.strings     | 1 +
 Telegram/SourceFiles/iv/iv_controller.cpp | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
index 7d4bd22c0..85a6124cc 100644
--- a/Telegram/Resources/iv_html/page.css
+++ b/Telegram/Resources/iv_html/page.css
@@ -999,7 +999,7 @@ section.channel > a > div.join:hover {
 	text-decoration: underline;
 }
 section.channel > a > div.join span:before {
-	content: var(--td-lng-group-call-join);
+	content: var(--td-lng-iv-join-channel);
 }
 section.channel > a > h4 {
 	font-family: var(--font-sans);
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2237f68ca..437479980 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4869,6 +4869,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_iv_open_in_browser" = "Open in Browser";
 "lng_iv_share" = "Share";
+"lng_iv_join_channel" = "Join";
 
 // Wnd specific
 
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index db69e9b97..3d7a30318 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -76,7 +76,7 @@ namespace {
 		{ "toast-fg", &st::toastFg },
 	};
 	static const auto phrases = base::flat_map<QByteArray, tr::phrase<>>{
-		{ "group-call-join", tr::lng_group_call_join },
+		{ "iv-join-channel", tr::lng_iv_join_channel },
 	};
 	static const auto serialize = [](const style::color *color) {
 		const auto qt = (*color)->c;

From 5133f74f67c66ede2c9dc0fac861aa7fbc7934b7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 10:56:02 +0400
Subject: [PATCH 009/596] Fix IV theming on macOS because of broken HTML.

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

diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 3d7a30318..1bafb769d 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -161,7 +161,7 @@ namespace {
 	return R"(<!DOCTYPE html>
 <html)"_q
 	+ classAttribute
-	+ R"("" style=")"
+	+ R"( style=")"
 	+ EscapeForAttribute(ComputeStyles())
 	+ R"(">
 	<head>

From 5c8e6c301228d456d433b8881fd351af92f371f6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 10:56:24 +0400
Subject: [PATCH 010/596] Fix page encoding in IV on macOS.

---
 Telegram/SourceFiles/iv/iv_controller.cpp | 2 +-
 Telegram/SourceFiles/iv/iv_instance.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 1bafb769d..67c423636 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -494,7 +494,7 @@ void Controller::createWebview(const QString &dataPath) {
 				|| index >= _pages.size()) {
 				return Webview::DataResult::Failed;
 			}
-			return finishWith(WrapPage(_pages[index]), "text/html");
+			return finishWith(WrapPage(_pages[index]), "text/html; charset=utf-8");
 		} else if (id.starts_with("page") && id.ends_with(".json")) {
 			auto index = 0;
 			const auto result = std::from_chars(
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index d48cb85c8..49b945d5e 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -708,7 +708,7 @@ void Shown::streamMap(QString params, Webview::DataRequest request) {
 void Shown::sendEmbed(QByteArray hash, Webview::DataRequest request) {
 	const auto i = _embeds.find(hash);
 	if (i != end(_embeds)) {
-		requestDone(std::move(request), i->second, "text/html");
+		requestDone(std::move(request), i->second, "text/html; charset=utf-8");
 	} else {
 		requestFail(std::move(request));
 	}

From 5c32423597d185ddef8832b152ce1a301e22a0f5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 11:22:52 +0400
Subject: [PATCH 011/596] Integrate IV menu hiding by click inside WebView.

---
 Telegram/Resources/iv_html/page.css       |  6 ++++++
 Telegram/Resources/iv_html/page.js        | 19 +++++++++++++++++++
 Telegram/SourceFiles/iv/iv_controller.cpp | 19 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
index 85a6124cc..0e0b3322a 100644
--- a/Telegram/Resources/iv_html/page.css
+++ b/Telegram/Resources/iv_html/page.css
@@ -88,6 +88,12 @@ html.custom_scroll ::-webkit-scrollbar-thumb:hover {
 		opacity: 1;
 	}
 }
+#menu_page_blocker {
+	z-index: 999;
+	position: fixed;
+	width: 100%;
+	height: 100%;
+}
 #top_shadow {
 	z-index: 999;
 	position: fixed;
diff --git a/Telegram/Resources/iv_html/page.js b/Telegram/Resources/iv_html/page.js
index efac9fa65..ac75d6d93 100644
--- a/Telegram/Resources/iv_html/page.js
+++ b/Telegram/Resources/iv_html/page.js
@@ -8,6 +8,11 @@ var IV = {
 		var target = e.target;
 		var context = '';
 		while (target) {
+			if (target.id == 'menu_page_blocker') {
+				IV.notify({ event: 'menu_page_blocker_click' });
+				IV.menuShown(false);
+				return;
+			}
 			if (target.tagName == 'AUDIO' || target.tagName == 'VIDEO') {
 				return;
 			}
@@ -599,6 +604,20 @@ var IV = {
 	back: function () {
         window.history.back();
 	},
+	menuShown: function (shown) {
+		var already = document.getElementById('menu_page_blocker');
+		if (already && shown) {
+			return;
+		} else if (already) {
+			document.body.removeChild(already);
+			return;
+		} else if (!shown) {
+			return;
+		}
+		var blocker = document.createElement('div');
+		blocker.id = 'menu_page_blocker';
+		document.body.appendChild(blocker);
+	},
 
 	videos: {},
 	videosPlaying: {},
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 67c423636..e24124ecd 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -429,6 +429,10 @@ void Controller::createWebview(const QString &dataPath) {
 				const auto url = object.value("url").toString();
 				const auto context = object.value("context").toString();
 				processLink(url, context);
+			} else if (event == "menu_page_blocker_click") {
+				if (_menu) {
+					_menu->hideMenu();
+				}
 			} else if (event == u"ready"_q) {
 				_ready = true;
 				auto script = QByteArray();
@@ -443,6 +447,9 @@ void Controller::createWebview(const QString &dataPath) {
 				if (base::take(_reloadInitialWhenReady)) {
 					script += reloadScript(0);
 				}
+				if (_menu) {
+					script += "IV.menuShown(true);";
+				}
 				if (!script.isEmpty()) {
 					_webview->eval(script);
 				}
@@ -648,7 +655,7 @@ bool Controller::active() const {
 }
 
 void Controller::showJoinedTooltip() {
-	if (_webview) {
+	if (_webview && _ready) {
 		_webview->eval("IV.showTooltip('"
 			+ EscapeForScriptString(
 				tr::lng_action_you_joined(tr::now).toUtf8())
@@ -679,6 +686,9 @@ void Controller::showMenu() {
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		_window.get(),
 		st::popupMenuWithIcons);
+	if (_webview && _ready) {
+		_webview->eval("IV.menuShown(true);");
+	}
 	_menu->setDestroyedCallback(crl::guard(_window.get(), [
 			this,
 			weakButton = Ui::MakeWeak(_menuToggle.data()),
@@ -686,6 +696,13 @@ void Controller::showMenu() {
 		if (_menu == menu && weakButton) {
 			weakButton->setForceRippled(false);
 		}
+		if (const auto widget = _webview ? _webview->widget() : nullptr) {
+			InvokeQueued(widget, crl::guard(_window.get(), [=] {
+				if (_webview && _ready) {
+					_webview->eval("IV.menuShown(false);");
+				}
+			}));
+		}
 	}));
 	_menuToggle->setForceRippled(true);
 

From 782556495adae0894b57c4bf13a353588444545b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 11:39:11 +0400
Subject: [PATCH 012/596] Improve joined channels tracking in IV.

---
 Telegram/Resources/iv_html/page.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/iv_html/page.js b/Telegram/Resources/iv_html/page.js
index ac75d6d93..4b43286b7 100644
--- a/Telegram/Resources/iv_html/page.js
+++ b/Telegram/Resources/iv_html/page.js
@@ -127,12 +127,17 @@ var IV = {
 		}
 	},
 	toggleChannelJoined: function (id, joined) {
+		IV.channelsJoined['channel' + id] = joined;
+		IV.checkChannelButtons();
+	},
+	checkChannelButtons: function() {
 		const channels = document.getElementsByClassName('channel');
-		const full = 'channel' + id;
 		for (var i = 0; i < channels.length; ++i) {
 			const channel = channels[i];
-			if (String(channel.getAttribute('data-context')) === full) {
-				channel.classList.toggle('joined', joined);
+			const full = String(channel.getAttribute('data-context'));
+			const value = IV.channelsJoined[full];
+			if (value !== undefined) {
+				channel.classList.toggle('joined', value);
 			}
 		}
 	},
@@ -419,6 +424,15 @@ var IV = {
 					&& (fromEl.getAttribute('data-src')
 						== toEl.getAttribute('data-src'))) {
 					return false;
+				} else if (fromEl.tagName == 'SECTION'
+					&& fromEl.classList.contains('channel')
+					&& fromEl.hasAttribute('data-context')
+					&& toEl.tagName == 'SECTION'
+					&& toEl.classList.contains('channel')
+					&& toEl.hasAttribute('data-context')
+					&& (String(fromEl.getAttribute('data-context'))
+						== String(toEl.getAttribute('data-context')))) {
+					return false;
 				} else if (fromEl.classList.contains('loaded')) {
 					toEl.classList.add('loaded');
 				}
@@ -573,6 +587,7 @@ var IV = {
 			} else {
 				IV.initMedia();
 			}
+			IV.checkChannelButtons();
 			if (scroll === undefined) {
 				IV.jumpToHash(hash, true);
 			} else {
@@ -623,6 +638,7 @@ var IV = {
 	videosPlaying: {},
 
 	cache: {},
+	channelsJoined: {},
 	index: 0,
 	position: 0
 };

From fe4b853393f1cf93874af35952e5f4a9e86d925f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 13 Mar 2024 21:29:46 +0300
Subject: [PATCH 013/596] Improved section of scheduled messages when forum
 opened in flat mode.

---
 .../history/view/history_view_context_menu.cpp        |  6 ++++--
 .../SourceFiles/history/view/history_view_element.h   |  1 +
 .../SourceFiles/history/view/history_view_message.cpp | 10 +++++-----
 .../history/view/history_view_scheduled_section.cpp   | 11 ++++++++---
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 09c3b89f9..5a7852b82 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -104,7 +104,8 @@ bool HasEditMessageAction(
 		|| !request.selectedItems.empty()
 		|| (context != Context::History
 			&& context != Context::Replies
-			&& context != Context::ShortcutMessages)) {
+			&& context != Context::ShortcutMessages
+			&& context != Context::ScheduledTopic)) {
 		return false;
 	}
 	const auto peer = item->history()->peer;
@@ -1340,7 +1341,8 @@ void AddPollActions(
 	}
 	if ((context != Context::History)
 		&& (context != Context::Replies)
-		&& (context != Context::Pinned)) {
+		&& (context != Context::Pinned)
+		&& (context != Context::ScheduledTopic)) {
 		return;
 	}
 	if (poll->closed()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 5a6ea07d6..f47937516 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -60,6 +60,7 @@ enum class Context : char {
 	SavedSublist,
 	TTLViewer,
 	ShortcutMessages,
+	ScheduledTopic,
 };
 
 enum class OnlyEmojiAndSpaces : char {
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 18c3dc57a..2e8f79f30 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -861,9 +861,7 @@ QSize Message::performCountOptimalSize() {
 
 void Message::refreshTopicButton() {
 	const auto item = data();
-	if (isAttachedToPrevious()
-			|| (context() != Context::History)
-			|| item->isScheduled()) {
+	if (isAttachedToPrevious() || context() != Context::History) {
 		_topicButton = nullptr;
 	} else if (const auto topic = item->topic()) {
 		if (!_topicButton) {
@@ -2044,7 +2042,8 @@ bool Message::hasFromPhoto() const {
 	case Context::TTLViewer:
 	case Context::Pinned:
 	case Context::Replies:
-	case Context::SavedSublist: {
+	case Context::SavedSublist:
+	case Context::ScheduledTopic: {
 		const auto item = data();
 		if (item->isPost()) {
 			return false;
@@ -3243,7 +3242,8 @@ bool Message::hasFromName() const {
 	case Context::TTLViewer:
 	case Context::Pinned:
 	case Context::Replies:
-	case Context::SavedSublist: {
+	case Context::SavedSublist:
+	case Context::ScheduledTopic: {
 		const auto item = data();
 		const auto peer = item->history()->peer;
 		if (hasOutLayout() && !item->from()->isChannel()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index c93b149eb..2a6328b38 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -252,7 +252,8 @@ void ScheduledWidget::setupComposeControls() {
 					& ~ChatRestriction::SendPolls;
 				const auto canSendAnything = Data::CanSendAnyOf(
 					_history->peer,
-					allWithoutPolls);
+					allWithoutPolls,
+					false);
 				const auto restriction = Data::RestrictionError(
 					_history->peer,
 					ChatRestriction::SendOther);
@@ -650,7 +651,11 @@ void ScheduledWidget::send() {
 	const auto error = GetErrorTextForSending(
 		_history->peer,
 		{
-			.topicRootId = _forumTopic ? _forumTopic->topicRootId() : MsgId(),
+			.topicRootId = _forumTopic
+				? _forumTopic->topicRootId()
+				: history()->isForum()
+				? MsgId(1)
+				: MsgId(),
 			.forward = nullptr,
 			.text = &textWithTags,
 			.ignoreSlowmodeCountdown = true,
@@ -1143,7 +1148,7 @@ QRect ScheduledWidget::floatPlayerAvailableRect() {
 }
 
 Context ScheduledWidget::listContext() {
-	return Context::History;
+	return _forumTopic ? Context::ScheduledTopic : Context::History;
 }
 
 bool ScheduledWidget::listScrollTo(int top, bool syntetic) {

From d92418dc6d4030bafe5cc65b55facf85564a1d48 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 12:49:51 +0400
Subject: [PATCH 014/596] Disable media context menus in IV.

---
 Telegram/Resources/iv_html/page.js     | 1 +
 Telegram/SourceFiles/iv/iv_prepare.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Telegram/Resources/iv_html/page.js b/Telegram/Resources/iv_html/page.js
index 4b43286b7..26cab565c 100644
--- a/Telegram/Resources/iv_html/page.js
+++ b/Telegram/Resources/iv_html/page.js
@@ -330,6 +330,7 @@ var IV = {
 							+ '" type="video/mp4" />'
 						+ '</video>';
 					var media = element.firstChild;
+					media.oncontextmenu = function () { return false; };
 					media.oncanplay = IV.checkVideos;
 					media.onloadeddata = IV.checkVideos;
 				}
diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp
index e4e69b2de..9e276bce7 100644
--- a/Telegram/SourceFiles/iv/iv_prepare.cpp
+++ b/Telegram/SourceFiles/iv/iv_prepare.cpp
@@ -516,6 +516,7 @@ QByteArray Parser::block(
 	const auto id = Number(photo.id);
 	result = tag("a", {
 		{ "href", href },
+		{ "oncontextmenu", data.vurl() ? QByteArray() : "return false;" },
 		{ "data-context", data.vurl() ? QByteArray() : "viewer-photo" + id },
 	}, result) + caption(data.vcaption());
 	return result;
@@ -576,6 +577,7 @@ QByteArray Parser::block(
 		const auto href = resource("video" + id);
 		result = tag("a", {
 			{ "href", href },
+			{ "oncontextmenu", "return false;" },
 			{ "data-context", "viewer-video" + id },
 		}, result);
 	}
@@ -745,6 +747,7 @@ QByteArray Parser::block(const MTPDpageBlockAudio &data) {
 	const auto src = documentFullUrl(audio);
 	return tag("figure", tag("audio", {
 		{ "src", src },
+		{ "oncontextmenu", "return false;" },
 		{ "controls", std::nullopt },
 	}) + caption(data.vcaption()));
 }

From f6b9702b5290407afbbdc6ca64e218bf691bd560 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 12:51:34 +0400
Subject: [PATCH 015/596] Unminimize IV when opening another one.

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

diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index e24124ecd..494007872 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -577,6 +577,11 @@ void Controller::showInWindow(const QString &dataPath, Prepared page) {
 }
 
 void Controller::activate() {
+	if (_window->isMinimized()) {
+		_window->showNormal();
+	} else if (_window->isHidden()) {
+		_window->show();
+	}
 	_window->raise();
 	_window->activateWindow();
 	_window->setFocus();

From a118d3d848591e5619037ace14f9ce68d9fd85f2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 14:26:00 +0400
Subject: [PATCH 016/596] Close IV when opening URL in the browser.

---
 Telegram/SourceFiles/iv/iv_instance.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 49b945d5e..673535cc7 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -833,6 +833,7 @@ void Instance::show(
 			break;
 		case Type::OpenLinkExternal:
 			QDesktopServices::openUrl(event.url);
+			closeAll();
 			break;
 		case Type::OpenMedia:
 			if (const auto window = Core::App().activeWindow()) {

From 396f52b8ca04515b9d9c0b4afd14443cf3c22fe3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 14:27:46 +0400
Subject: [PATCH 017/596] Fix title updating on IV menu show.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 2687a19b1..0e175983d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 2687a19b1435276e5a998d04b7d47df92e0c8391
+Subproject commit 0e175983d97605c20ee0321ca4485345536087b0

From 200bb31e0841b4d5c849ac979983dd836e230c25 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 15:01:03 +0400
Subject: [PATCH 018/596] Fix theming in code blocks.

---
 Telegram/Resources/iv_html/page.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
index 0e0b3322a..ae3d64655 100644
--- a/Telegram/Resources/iv_html/page.css
+++ b/Telegram/Resources/iv_html/page.css
@@ -252,7 +252,7 @@ article pre.hljs {
 	font-family: var(--font-mono);
 	margin: 14px 0;
 	padding: 7px 18px;
-	background: #F5F8FC;
+	background: var(--td-box-divider-bg);
 	font-size: 16px;
 	white-space: pre-wrap;
 	word-wrap: break-word;

From 73ca78215fa9340d520fc4eefa0c4e3749a283e5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 18:35:57 +0400
Subject: [PATCH 019/596] Set window title in IV.

---
 Telegram/Resources/langs/lang.strings     |  1 +
 Telegram/SourceFiles/iv/iv_controller.cpp | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 437479980..39907f573 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4870,6 +4870,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_iv_open_in_browser" = "Open in Browser";
 "lng_iv_share" = "Share";
 "lng_iv_join_channel" = "Join";
+"lng_iv_window_title" = "Instant View";
 
 // Wnd specific
 
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 494007872..d3f962641 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -244,14 +244,20 @@ void Controller::updateTitleGeometry(int newWidth) const {
 
 void Controller::initControls() {
 	_subtitleWrap = std::make_unique<Ui::RpWidget>(_window.get());
+	_subtitleText = _index.value() | rpl::filter(
+		rpl::mappers::_1 >= 0
+	) | rpl::map([=](int index) {
+		return _pages[index].name;
+	});
 	_subtitle = std::make_unique<Ui::FlatLabel>(
 		_subtitleWrap.get(),
-		_index.value() | rpl::filter(
-			rpl::mappers::_1 >= 0
-		) | rpl::map([=](int index) {
-			return _pages[index].name;
-		}),
+		_subtitleText.value(),
 		st::ivSubtitle);
+	_subtitleText.value(
+	) | rpl::start_with_next([=](const QString &subtitle) {
+		const auto prefix = tr::lng_iv_window_title(tr::now);
+		_window->setWindowTitle(prefix + ' ' + QChar(0x2014) + ' ' + subtitle);
+	}, _subtitle->lifetime());
 	_subtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_menuToggle.create(_subtitleWrap.get(), st::ivMenuToggle);

From 461aebd7f3ef6f193fdcdad8592e54323216ce36 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 18:36:17 +0400
Subject: [PATCH 020/596] Hide IV when sharing on macOS, fixes sharing.

---
 Telegram/SourceFiles/iv/iv_controller.cpp | 52 +++++++++++++++++------
 Telegram/SourceFiles/iv/iv_controller.h   |  1 +
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index d3f962641..1671c59ba 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -762,10 +762,18 @@ void Controller::destroyShareMenu() {
 		setInnerFocus();
 	}
 	if (_shareWrap) {
-		_shareWrap->windowHandle()->setParent(nullptr);
+		if (_shareContainer) {
+			_shareWrap->windowHandle()->setParent(nullptr);
+		}
 		_shareWrap = nullptr;
 		_shareContainer = nullptr;
 	}
+	if (_shareHidesContent) {
+		_shareHidesContent = false;
+		if (const auto content = _webview ? _webview->widget() : nullptr) {
+			content->show();
+		}
+	}
 }
 
 void Controller::showShareMenu() {
@@ -773,22 +781,33 @@ void Controller::showShareMenu() {
 	if (_shareWrap || index < 0 || index > _pages.size()) {
 		return;
 	}
+	_shareHidesContent = Platform::IsMac();
+	if (_shareHidesContent) {
+		if (const auto content = _webview ? _webview->widget() : nullptr) {
+			content->hide();
+		}
+	}
 
-	_shareWrap = std::make_unique<Ui::RpWidget>(nullptr);
+	_shareWrap = std::make_unique<Ui::RpWidget>(_shareHidesContent
+		? _window->window()
+		: nullptr);
 	const auto margins = QMargins(0, st::windowTitleHeight, 0, 0);
-	_shareWrap->setGeometry(_window->geometry().marginsRemoved(margins));
-	_shareWrap->setWindowFlag(Qt::FramelessWindowHint);
-	_shareWrap->setAttribute(Qt::WA_TranslucentBackground);
-	_shareWrap->setAttribute(Qt::WA_NoSystemBackground);
-	_shareWrap->createWinId();
+	if (!_shareHidesContent) {
+		_shareWrap->setWindowFlag(Qt::FramelessWindowHint);
+		_shareWrap->setAttribute(Qt::WA_TranslucentBackground);
+		_shareWrap->setAttribute(Qt::WA_NoSystemBackground);
+		_shareWrap->createWinId();
 
-	_shareContainer.reset(QWidget::createWindowContainer(
-		_shareWrap->windowHandle(),
-		_window.get(),
-		Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint));
+		_shareContainer.reset(QWidget::createWindowContainer(
+			_shareWrap->windowHandle(),
+			_window.get(),
+			Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint));
+	}
 	_window->sizeValue() | rpl::start_with_next([=](QSize size) {
-		_shareContainer->setGeometry(QRect(QPoint(), size).marginsRemoved(
-			margins));
+		const auto widget = _shareHidesContent
+			? _shareWrap.get()
+			: _shareContainer.get();
+		widget->setGeometry(QRect(QPoint(), size).marginsRemoved(margins));
 	}, _shareWrap->lifetime());
 
 	auto result = _showShareBox({
@@ -803,7 +822,12 @@ void Controller::showShareMenu() {
 	}, _shareWrap->lifetime());
 
 	Ui::ForceFullRepaintSync(_shareWrap.get());
-	_shareContainer->show();
+
+	if (_shareHidesContent) {
+		_shareWrap->show();
+	} else {
+		_shareContainer->show();
+	}
 	activate();
 }
 
diff --git a/Telegram/SourceFiles/iv/iv_controller.h b/Telegram/SourceFiles/iv/iv_controller.h
index 76e53d6e5..f8352f0d3 100644
--- a/Telegram/SourceFiles/iv/iv_controller.h
+++ b/Telegram/SourceFiles/iv/iv_controller.h
@@ -142,6 +142,7 @@ private:
 	std::unique_ptr<QWidget> _shareContainer;
 	Fn<void()> _shareFocus;
 	Fn<void()> _shareHide;
+	bool _shareHidesContent = false;
 
 	std::vector<Prepared> _pages;
 	base::flat_map<QString, int> _indices;

From 2e7323d484ade5577d7d59df3a8271d90883f5a2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 19:03:46 +0400
Subject: [PATCH 021/596] Fix a glitch in IV sharing on Windows.

---
 Telegram/SourceFiles/iv/iv_controller.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 1671c59ba..66eef977d 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -793,6 +793,7 @@ void Controller::showShareMenu() {
 		: nullptr);
 	const auto margins = QMargins(0, st::windowTitleHeight, 0, 0);
 	if (!_shareHidesContent) {
+		_shareWrap->setGeometry(_window->geometry().marginsRemoved(margins));
 		_shareWrap->setWindowFlag(Qt::FramelessWindowHint);
 		_shareWrap->setAttribute(Qt::WA_TranslucentBackground);
 		_shareWrap->setAttribute(Qt::WA_NoSystemBackground);

From 6c083e88a3cf1f8c0232a7d4ead4770b96915ff9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Mar 2024 20:05:17 +0300
Subject: [PATCH 022/596] Changed behavior of bot menu button to decrease size
 to first emoji.

---
 .../SourceFiles/history/history_widget.cpp    | 84 ++++++++++++-------
 Telegram/SourceFiles/history/history_widget.h |  7 +-
 2 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index b480d1dea..e759ea5f8 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -203,6 +203,18 @@ const auto kPsaAboutPrefix = "cloud_lng_about_psa_";
 	});
 }
 
+[[nodiscard]] QString FirstEmoji(const QString &s) {
+	const auto begin = s.data();
+	const auto end = begin + s.size();
+	for (auto ch = begin; ch != end; ch++) {
+		auto length = 0;
+		if (const auto e = Ui::Emoji::Find(ch, end, &length)) {
+			return e->text();
+		}
+	}
+	return QString();
+}
+
 } // namespace
 
 HistoryWidget::HistoryWidget(
@@ -2908,8 +2920,8 @@ void HistoryWidget::updateControlsVisibility() {
 		_botKeyboardShow->hide();
 		_botKeyboardHide->hide();
 		_botCommandStart->hide();
-		if (_botMenuButton) {
-			_botMenuButton->hide();
+		if (_botMenu.button) {
+			_botMenu.button->hide();
 		}
 		if (_tabbedPanel) {
 			_tabbedPanel->hide();
@@ -2977,8 +2989,8 @@ void HistoryWidget::updateControlsVisibility() {
 		} else {
 			_attachToggle->show();
 		}
-		if (_botMenuButton) {
-			_botMenuButton->show();
+		if (_botMenu.button) {
+			_botMenu.button->show();
 		}
 		if (_sendRestriction) {
 			_sendRestriction->hide();
@@ -3055,8 +3067,8 @@ void HistoryWidget::updateControlsVisibility() {
 		if (_sendAs) {
 			_sendAs->hide();
 		}
-		if (_botMenuButton) {
-			_botMenuButton->hide();
+		if (_botMenu.button) {
+			_botMenu.button->hide();
 		}
 		_kbScroll->hide();
 		if (_replyTo || readyToForward() || _kbReplyTo) {
@@ -4803,28 +4815,35 @@ bool HistoryWidget::updateCmdStartShown() {
 			}
 		}
 	}
+	constexpr auto kSmallMenuAfter = 10;
 	const auto commandsChanged = (_cmdStartShown != cmdStartShown);
 	auto buttonChanged = false;
 	if (!bot
 		|| (bot->botInfo->botMenuButtonUrl.isEmpty()
 			&& bot->botInfo->commands.empty())) {
-		buttonChanged = (_botMenuButton != nullptr);
-		_botMenuButton.destroy();
-	} else if (!_botMenuButton) {
+		buttonChanged = (_botMenu.button != nullptr);
+		_botMenu.button.destroy();
+	} else if (!_botMenu.button) {
 		buttonChanged = true;
-		_botMenuButtonText = bot->botInfo->botMenuButtonText;
-		_botMenuButton.create(
+		_botMenu.text = bot->botInfo->botMenuButtonText;
+		_botMenu.small = (Ui::FieldCharacterCount(_field) > kSmallMenuAfter);
+		if (_botMenu.small) {
+			if (const auto e = FirstEmoji(_botMenu.text); !e.isEmpty()) {
+				_botMenu.text = e;
+			}
+		}
+		_botMenu.button.create(
 			this,
-			(_botMenuButtonText.isEmpty()
+			(_botMenu.text.isEmpty()
 				? tr::lng_bot_menu_button()
-				: rpl::single(_botMenuButtonText)),
+				: rpl::single(_botMenu.text)),
 			st::historyBotMenuButton);
 		orderWidgets();
 
-		_botMenuButton->setTextTransform(
+		_botMenu.button->setTextTransform(
 			Ui::RoundButton::TextTransform::NoTransform);
-		_botMenuButton->setFullRadius(true);
-		_botMenuButton->setClickedCallback([=] {
+		_botMenu.button->setFullRadius(true);
+		_botMenu.button->setClickedCallback([=] {
 			const auto user = _peer ? _peer->asUser() : nullptr;
 			const auto bot = (user && user->isBot()) ? user : nullptr;
 			if (bot && !bot->botInfo->botMenuButtonUrl.isEmpty()) {
@@ -4835,22 +4854,29 @@ bool HistoryWidget::updateCmdStartShown() {
 				_fieldAutocomplete->showFiltered(_peer, "/", true);
 			}
 		});
-		_botMenuButton->widthValue(
+		_botMenu.button->widthValue(
 		) | rpl::start_with_next([=](int width) {
 			if (width > st::historyBotMenuMaxWidth) {
-				_botMenuButton->setFullWidth(st::historyBotMenuMaxWidth);
+				_botMenu.button->setFullWidth(st::historyBotMenuMaxWidth);
 			} else {
 				updateFieldSize();
 			}
-		}, _botMenuButton->lifetime());
+		}, _botMenu.button->lifetime());
 	}
-	const auto textChanged = _botMenuButton
-		&& (_botMenuButtonText != bot->botInfo->botMenuButtonText);
+	const auto textSmall = Ui::FieldCharacterCount(_field) > kSmallMenuAfter;
+	const auto textChanged = _botMenu.button
+		&& ((_botMenu.text != bot->botInfo->botMenuButtonText)
+		|| (_botMenu.small != textSmall));
 	if (textChanged) {
-		_botMenuButtonText = bot->botInfo->botMenuButtonText;
-		_botMenuButton->setText(_botMenuButtonText.isEmpty()
+		_botMenu.text = bot->botInfo->botMenuButtonText;
+		if (_botMenu.small = textSmall) {
+			if (const auto e = FirstEmoji(_botMenu.text); !e.isEmpty()) {
+				_botMenu.text = e;
+			}
+		}
+		_botMenu.button->setText(_botMenu.text.isEmpty()
 			? tr::lng_bot_menu_button()
-			: rpl::single(_botMenuButtonText));
+			: rpl::single(_botMenu.text));
 	}
 	_cmdStartShown = cmdStartShown;
 	return commandsChanged || buttonChanged || textChanged;
@@ -5166,15 +5192,15 @@ void HistoryWidget::moveFieldControls() {
 		_kbScroll->setGeometryToLeft(0, bottom, width(), keyboardHeight);
 	}
 
-// (_botMenuButton) (_attachToggle|_replaceMedia) (_sendAs) ---- _inlineResults ------------------------------ _tabbedPanel ------ _fieldBarCancel
+// (_botMenu.button) (_attachToggle|_replaceMedia) (_sendAs) ---- _inlineResults ------------------------------ _tabbedPanel ------ _fieldBarCancel
 // (_attachDocument|_attachPhoto) _field (_ttlInfo) (_scheduled) (_silent|_cmdStart|_kbShow) (_kbHide|_tabbedSelectorToggle) _send
 // (_botStart|_unblock|_joinChannel|_muteUnmute|_reportMessages)
 
 	auto buttonsBottom = bottom - _attachToggle->height();
 	auto left = st::historySendRight;
-	if (_botMenuButton) {
+	if (_botMenu.button) {
 		const auto skip = st::historyBotMenuSkip;
-		_botMenuButton->moveToLeft(left + skip, buttonsBottom + skip); left += skip + _botMenuButton->width();
+		_botMenu.button->moveToLeft(left + skip, buttonsBottom + skip); left += skip + _botMenu.button->width();
 	}
 	if (_replaceMedia) {
 		_replaceMedia->moveToLeft(left, buttonsBottom);
@@ -5246,8 +5272,8 @@ void HistoryWidget::updateFieldSize() {
 		- st::historySendRight
 		- _send->width()
 		- _tabbedSelectorToggle->width();
-	if (_botMenuButton) {
-		fieldWidth -= st::historyBotMenuSkip + _botMenuButton->width();
+	if (_botMenu.button) {
+		fieldWidth -= st::historyBotMenuSkip + _botMenu.button->width();
 	}
 	if (_sendAs) {
 		fieldWidth -= _sendAs->width();
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index e4ec63ea2..4cbfd46af 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -748,8 +748,11 @@ private:
 	object_ptr<Ui::FlatButton> _joinChannel;
 	object_ptr<Ui::FlatButton> _muteUnmute;
 	object_ptr<Ui::FlatButton> _reportMessages;
-	object_ptr<Ui::RoundButton> _botMenuButton = { nullptr };
-	QString _botMenuButtonText;
+	struct {
+		object_ptr<Ui::RoundButton> button = { nullptr };
+		QString text;
+		bool small = false;
+	} _botMenu;
 	object_ptr<Ui::IconButton> _attachToggle;
 	object_ptr<Ui::IconButton> _replaceMedia = { nullptr };
 	object_ptr<Ui::SendAsButton> _sendAs = { nullptr };

From 1f0ed3bb315eea05d97107cb8b65c76a520a13e6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Mar 2024 20:36:19 +0300
Subject: [PATCH 023/596] Fixed links in service message about requested peers
 from bot.

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

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index d990c56ef..43bebb226 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -4628,7 +4628,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 	auto prepareRequestedPeer = [&](
 			const MTPDmessageActionRequestedPeer &action) {
 		auto result = PreparedServiceText{};
-		result.links.push_back(fromLink());
+		result.links.push_back(history()->peer->createOpenLink());
 
 		const auto &list = action.vpeers().v;
 		for (auto i = 0, count = int(list.size()); i != count; ++i) {
@@ -4664,7 +4664,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			lt_chat,
 			result.text,
 			lt_bot,
-			Ui::Text::Link(history()->peer->name(), 2),
+			Ui::Text::Link(history()->peer->name(), 1),
 			Ui::Text::WithEntities);
 		return result;
 	};

From 5a5d89c32ced14a1e401a09b561a99166989e6ab Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 20:29:08 +0400
Subject: [PATCH 024/596] Fix crashing regression in Qt 6.7.0.

---
 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 274b4919a..ec9e9a3ad 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -54,7 +54,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin cc0c2f83650bbd52064bb7bc7257c950822cce5b \
+	&& git fetch --depth=1 origin b8390aef3db43f973486c6e512f4e825ffd09691 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 

From b955d3297036e9afd67fa75b50d833b3c2935ab2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 21:55:16 +0400
Subject: [PATCH 025/596] Beta version 4.15.14.

- Fix initial text color in dark mode Instant View on macOS.
- Fix non-English symbols encoding in Instant View on macOS.
- Fix sharing from Instant View on macOS.
- Fix crash with long messages on Linux.
---
 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                                | 7 +++++++
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 466034289..e6aa01dc5 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.15.3.0" />
+    Version="4.15.4.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index fda1d34da..fe9addb7b 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 4,15,3,0
- PRODUCTVERSION 4,15,3,0
+ FILEVERSION 4,15,4,0
+ PRODUCTVERSION 4,15,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.15.3.0"
+            VALUE "FileVersion", "4.15.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.3.0"
+            VALUE "ProductVersion", "4.15.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 8ebf2c68b..1289e471e 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 4,15,3,0
- PRODUCTVERSION 4,15,3,0
+ FILEVERSION 4,15,4,0
+ PRODUCTVERSION 4,15,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.15.3.0"
+            VALUE "FileVersion", "4.15.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.3.0"
+            VALUE "ProductVersion", "4.15.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 933b976d6..cc1bff4ac 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 = 4015003;
-constexpr auto AppVersionStr = "4.15.3";
+constexpr auto AppVersion = 4015004;
+constexpr auto AppVersionStr = "4.15.4";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 2ccb686af..d1f6650e1 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4015003
+AppVersion         4015004
 AppVersionStrMajor 4.15
-AppVersionStrSmall 4.15.3
-AppVersionStr      4.15.3
+AppVersionStrSmall 4.15.4
+AppVersionStr      4.15.4
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 4.15.3.beta
+AppVersionOriginal 4.15.4.beta
diff --git a/changelog.txt b/changelog.txt
index 99986b155..62f49bf5e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+4.15.4 beta (14.03.24)
+
+- Fix initial text color in dark mode Instant View on macOS.
+- Fix non-English symbols encoding in Instant View on macOS.
+- Fix sharing from Instant View on macOS.
+- Fix crash with long messages on Linux.
+
 4.15.3 beta (13.03.24)
 
 - Instant View on Windows (with WebView2) and macOS.

From 20db635366a38f55a7df13ad53f58e86ae2c5332 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 21:58:56 +0400
Subject: [PATCH 026/596] Beta version 4.15.4: Update Qt patches in snap.

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a4ef1f060..b309c3d11 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -167,7 +167,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: cc0c2f83650bbd52064bb7bc7257c950822cce5b
+    source-commit: b8390aef3db43f973486c6e512f4e825ffd09691
     plugin: dump
     override-pull: |
       craftctl default

From f2a54e3cbbe7d70b795f64713c030734a44a739b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Mar 2024 22:30:52 +0400
Subject: [PATCH 027/596] Beta version 4.15.4: Fix build with Xcode.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index e759ea5f8..8aa8f7332 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4869,7 +4869,7 @@ bool HistoryWidget::updateCmdStartShown() {
 		|| (_botMenu.small != textSmall));
 	if (textChanged) {
 		_botMenu.text = bot->botInfo->botMenuButtonText;
-		if (_botMenu.small = textSmall) {
+		if ((_botMenu.small = textSmall)) {
 			if (const auto e = FirstEmoji(_botMenu.text); !e.isEmpty()) {
 				_botMenu.text = e;
 			}

From 59e53c1edfc031f98075aa0fa05374232732ea3b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Mar 2024 21:49:25 +0400
Subject: [PATCH 028/596] Port NotificationId conversion to cppgir

---
 .../platform/linux/integration_linux.cpp      | 74 +++++++++----------
 .../linux/notifications_manager_linux.cpp     | 31 +++++++-
 .../window/notifications_manager.h            | 37 +++++-----
 3 files changed, 80 insertions(+), 62 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index fef646b20..929ed15b7 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -19,7 +19,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QAbstractEventDispatcher>
 #include <qpa/qwindowsysteminterface.h>
 
-#include <glibmm.h>
 #include <gio/gio.hpp>
 #include <xdpinhibit/xdpinhibit.hpp>
 
@@ -28,6 +27,32 @@ namespace {
 
 using namespace gi::repository;
 
+std::vector<std::any> AnyVectorFromVariant(GLib::Variant value) {
+	std::vector<std::any> result;
+
+	auto iter = gi::wrap(
+		g_variant_iter_new(value.gobj_()),
+		gi::transfer_full);
+
+	const auto uint64Type = GLib::VariantType::new_("t");
+	const auto int64Type = GLib::VariantType::new_("x");
+
+	while (auto value = iter.next_value()) {
+		value = value.get_variant();
+		if (value.is_of_type(uint64Type)) {
+			result.push_back(std::make_any<uint64>(value.get_uint64()));
+		} else if (value.is_of_type(int64Type)) {
+			result.push_back(std::make_any<int64>(value.get_int64()));
+		} else if (value.is_container()) {
+			result.push_back(
+				std::make_any<std::vector<std::any>>(
+					AnyVectorFromVariant(value)));
+		}
+	}
+
+	return result;
+}
+
 class Application : public Gio::impl::ApplicationImpl {
 public:
 	Application();
@@ -102,23 +127,8 @@ Application::Application()
 
 	using Window::Notifications::Manager;
 	using NotificationId = Manager::NotificationId;
-	using NotificationIdTuple = std::invoke_result_t<
-		decltype(&NotificationId::toTuple),
-		NotificationId*
-	>;
 
-	const auto notificationIdVariantType = [] {
-		try {
-			return gi::wrap(
-				Glib::create_variant(
-					NotificationId().toTuple()
-				).get_type().gobj_copy(),
-				gi::transfer_full
-			);
-		} catch (...) {
-			return GLib::VariantType();
-		}
-	}();
+	const auto notificationIdVariantType = GLib::VariantType::new_("av");
 
 	auto notificationActivateAction = Gio::SimpleAction::new_(
 		"notification-activate",
@@ -128,17 +138,9 @@ Application::Application()
 			Gio::SimpleAction,
 			GLib::Variant parameter) {
 		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-			try {
-				const auto &app = Core::App();
-				app.notifications().manager().notificationActivated(
-					NotificationId::FromTuple(
-						Glib::wrap(
-							parameter.gobj_copy_()
-						).get_dynamic<NotificationIdTuple>()
-					)
-				);
-			} catch (...) {
-			}
+			Core::App().notifications().manager().notificationActivated(
+				NotificationId::FromAnyVector(
+					AnyVectorFromVariant(parameter)));
 		});
 	});
 
@@ -152,18 +154,10 @@ Application::Application()
 			Gio::SimpleAction,
 			GLib::Variant parameter) {
 		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-			try {
-				const auto &app = Core::App();
-				app.notifications().manager().notificationReplied(
-					NotificationId::FromTuple(
-						Glib::wrap(
-							parameter.gobj_copy_()
-						).get_dynamic<NotificationIdTuple>()
-					),
-					{}
-				);
-			} catch (...) {
-			}
+			Core::App().notifications().manager().notificationReplied(
+				NotificationId::FromAnyVector(
+					AnyVectorFromVariant(parameter)),
+				{});
 		});
 	});
 
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index aed48c948..34e9a07eb 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -28,7 +28,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QVersionNumber>
 #include <QtGui/QGuiApplication>
 
-#include <glibmm.h>
 #include <xdgnotifications/xdgnotifications.hpp>
 
 #include <dlfcn.h>
@@ -139,6 +138,32 @@ bool UseGNotification() {
 	return KSandbox::isFlatpak() && !ServiceRegistered;
 }
 
+GLib::Variant AnyVectorToVariant(const std::vector<std::any> &value) {
+	return GLib::Variant::new_array(
+		value | ranges::views::transform([](const std::any &value) {
+			try {
+				return GLib::Variant::new_variant(
+					GLib::Variant::new_uint64(std::any_cast<uint64>(value)));
+			} catch (...) {
+			}
+
+			try {
+				return GLib::Variant::new_variant(
+					GLib::Variant::new_int64(std::any_cast<int64>(value)));
+			} catch (...) {
+			}
+
+			try {
+				return GLib::Variant::new_variant(
+					AnyVectorToVariant(
+						std::any_cast<std::vector<std::any>>(value)));
+			} catch (...) {
+			}
+
+			return GLib::Variant(nullptr);
+		}) | ranges::to_vector);
+}
+
 class NotificationData final : public base::has_weak_ptr {
 public:
 	using NotificationId = Window::Notifications::Manager::NotificationId;
@@ -239,9 +264,7 @@ bool NotificationData::init(
 			set_category(_notification.gobj_(), "im.received");
 		}
 
-		const auto idVariant = gi::wrap(
-			Glib::create_variant(_id.toTuple()).gobj_copy(),
-			gi::transfer_full);
+		const auto idVariant = AnyVectorToVariant(_id.toAnyVector());
 
 		_notification.set_default_action_and_target(
 			"app.notification-activate",
diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h
index 9d7224c74..a8db13833 100644
--- a/Telegram/SourceFiles/window/notifications_manager.h
+++ b/Telegram/SourceFiles/window/notifications_manager.h
@@ -233,19 +233,19 @@ public:
 			const ContextId&,
 			const ContextId&) = default;
 
-		[[nodiscard]] auto toTuple() const {
-			return std::make_tuple(
-				sessionId,
-				peerId.value,
-				topicRootId.bare);
+		[[nodiscard]] auto toAnyVector() const {
+			return std::vector<std::any>{
+				std::make_any<uint64>(sessionId),
+				std::make_any<uint64>(peerId.value),
+				std::make_any<int64>(topicRootId.bare),
+			};
 		}
 
-		template<typename T>
-		[[nodiscard]] static auto FromTuple(const T &tuple) {
+		[[nodiscard]] static auto FromAnyVector(const auto &vector) {
 			return ContextId{
-				std::get<0>(tuple),
-				PeerIdHelper(std::get<1>(tuple)),
-				std::get<2>(tuple),
+				std::any_cast<uint64>(vector[0]),
+				PeerIdHelper(std::any_cast<uint64>(vector[1])),
+				std::any_cast<int64>(vector[2]),
 			};
 		}
 	};
@@ -257,17 +257,18 @@ public:
 			const NotificationId&,
 			const NotificationId&) = default;
 
-		[[nodiscard]] auto toTuple() const {
-			return std::make_tuple(
-				contextId.toTuple(),
-				msgId.bare);
+		[[nodiscard]] auto toAnyVector() const {
+			return std::vector<std::any>{
+				std::make_any<std::vector<std::any>>(contextId.toAnyVector()),
+				std::make_any<int64>(msgId.bare),
+			};
 		}
 
-		template<typename T>
-		[[nodiscard]] static auto FromTuple(const T &tuple) {
+		[[nodiscard]] static auto FromAnyVector(const auto &vector) {
 			return NotificationId{
-				ContextId::FromTuple(std::get<0>(tuple)),
-				std::get<1>(tuple),
+				ContextId::FromAnyVector(
+					std::any_cast<std::vector<std::any>>(vector[0])),
+				std::any_cast<int64>(vector[1]),
 			};
 		}
 	};

From 3689e7dfbca149afc4251de9e09d2ecf211705b5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Mar 2024 21:50:18 +0400
Subject: [PATCH 029/596] Use cppgir compatible XDP utilities API

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

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 929ed15b7..38e5cc7f2 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -197,12 +197,12 @@ LinuxIntegration::LinuxIntegration()
 , _darkModeWatcher(
 	"org.freedesktop.appearance",
 	"color-scheme",
-	[](uint value) {
+	[](GLib::Variant value) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
 		QWindowSystemInterface::handleThemeChange();
 #else // Qt >= 6.5.0
 		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-			Core::App().settings().setSystemDarkMode(value == 1);
+			Core::App().settings().setSystemDarkMode(value.get_uint32() == 1);
 		});
 #endif // Qt < 6.5.0
 }) {
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 750c4dc5f..c6f9390e7 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -512,12 +512,12 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 std::optional<bool> IsDarkMode() {
-	const auto result = base::Platform::XDP::ReadSetting<uint>(
+	const auto result = base::Platform::XDP::ReadSetting(
 		"org.freedesktop.appearance",
 		"color-scheme");
 
 	return result.has_value()
-		? std::make_optional(*result == 1)
+		? std::make_optional(result->get_uint32() == 1)
 		: std::nullopt;
 }
 #endif // Qt < 6.5.0

From d3715cc3624046d34580b2944d88cea4d9d89576 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Mar 2024 21:50:58 +0400
Subject: [PATCH 030/596] Get rid of glibmm

---
 CMakeLists.txt                                |  1 +
 Telegram/CMakeLists.txt                       |  5 --
 .../platform/linux/specific_linux.cpp         |  4 --
 Telegram/build/docker/centos_env/Dockerfile   | 22 ------
 docs/building-linux.md                        |  3 -
 snap/snapcraft.yaml                           | 68 ++-----------------
 6 files changed, 7 insertions(+), 96 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcf88602f..3bf13693b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,7 @@ endif()
 include(cmake/external/qt/package.cmake)
 
 set(desktop_app_skip_libs
+    glibmm
     variant
 )
 
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 5d30acc96..46e061a09 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1679,11 +1679,6 @@ elseif (APPLE)
         )
     endif()
 else()
-    target_link_libraries(Telegram
-    PRIVATE
-        desktop-app::external_glibmm
-    )
-
     include(${cmake_helpers_loc}/external/glib/generate_dbus.cmake)
     generate_dbus(Telegram org.freedesktop.portal. XdpBackground ${third_party_loc}/xdg-desktop-portal/data/org.freedesktop.portal.Background.xml)
     generate_dbus(Telegram org.freedesktop. XdgNotifications ${src_loc}/platform/linux/org.freedesktop.Notifications.xml)
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index c6f9390e7..8d662cdc4 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -35,8 +35,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <kshell.h>
 #include <ksandbox.h>
 
-#include <glibmm.h>
-
 #include <xdgdbus/xdgdbus.hpp>
 #include <xdpbackground/xdpbackground.hpp>
 #include <xdprequest/xdprequest.hpp>
@@ -692,8 +690,6 @@ void start() {
 	GLib::set_prgname(cExeName().toStdString());
 	GLib::set_application_name(AppName.data());
 
-	Glib::init();
-
 	Webview::WebKitGTK::SetSocketPath(u"%1/%2-%3-webview-%4"_q.arg(
 		QDir::tempPath(),
 		h,
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index ec9e9a3ad..9ff771f41 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -705,27 +705,6 @@ RUN git clone -b 2.78.1 --depth=1 {{ GIT }}/GNOME/glib.git \
 	&& cd .. \
 	&& rm -rf glib
 
-FROM patches AS glibmm
-COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
-
-RUN git clone -b 2.78.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
-	&& cd glibmm \
-	&& git apply ../patches/glibmm.patch \
-	&& CFLAGS="$CFLAGS {{ CFLAGS_LTO }}" CXXFLAGS="$CXXFLAGS {{ CFLAGS_LTO }}" meson build \
-		--buildtype=plain \
-		--default-library=both \
-		-Dbuild-documentation=false \
-		-Dbuild-examples=false \
-		-Dsigc++-3.0:build-documentation=false \
-		-Dsigc++-3.0:build-examples=false \
-		-Dsigc++-3.0:build-tests=false \
-		-Dsigc++-3.0:validation=false \
-		-Dmm-common:use-network=true \
-	&& meson compile -C build \
-	&& DESTDIR="{{ LibrariesPath }}/glibmm-cache" meson install -C build \
-	&& cd .. \
-	&& rm -rf glibmm
-
 FROM builder AS gobject-introspection
 COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
 
@@ -873,7 +852,6 @@ COPY --link --from=openal {{ LibrariesPath }}/openal-cache /
 COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
 COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
 COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
-COPY --link --from=glibmm {{ LibrariesPath }}/glibmm-cache /
 COPY --link --from=gobject-introspection {{ LibrariesPath }}/gobject-introspection-cache /
 COPY --link --from=qt {{ LibrariesPath }}/qt-cache /
 COPY --link --from=breakpad {{ LibrariesPath }}/breakpad-cache /
diff --git a/docs/building-linux.md b/docs/building-linux.md
index 4fa4503b5..393bd854a 100644
--- a/docs/building-linux.md
+++ b/docs/building-linux.md
@@ -36,9 +36,6 @@ Or, to create a debug build, run (also using [your **api_id** and **api_hash**](
         -D TDESKTOP_API_ID=YOUR_API_ID \
         -D TDESKTOP_API_HASH=YOUR_API_HASH
 
-If you need a backward compatible binary (running on older OS like the official one), you should build the binary with LTO.  
-To do this, add `-D CMAKE_INTERPROCEDURAL_OPTIMIZATION=ON` option.
-
 The built files will be in the `out` directory.
 
 [api_credentials]: api_credentials.md
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b309c3d11..95e95f375 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -99,6 +99,7 @@ parts:
       - libboost-regex1.74-dev
       - libfmt-dev
       - libgirepository1.0-dev
+      - libglib2.0-dev
       - libheif-dev
       - libopus-dev
       - libpulse-dev
@@ -113,6 +114,7 @@ parts:
       - libasound2
       - libavif13
       - libboost-regex1.74.0
+      - libglib2.0-0
       - libheif1
       - libopus0
       - libpulse0
@@ -156,7 +158,6 @@ parts:
     after:
       - ffmpeg
       - libjxl
-      - glibmm
       - mozjpeg
       - openal
       - protobuf
@@ -176,18 +177,6 @@ parts:
       rm -rf patches
     stage: [-./*]
 
-  meson-deps:
-    source: https://github.com/mesonbuild/meson.git
-    source-depth: 1
-    source-branch: 1.2.3
-    plugin: nil
-    build-packages:
-      - python3-pip
-      - ninja-build
-    override-build: |
-      pip install .
-    stage: [-./*]
-
   desktop-qt:
     source: https://github.com/desktop-app/snapcraft-desktop-helpers.git
     source-depth: 1
@@ -254,53 +243,6 @@ parts:
     after:
       - mozjpeg
 
-  glib:
-    source: https://github.com/GNOME/glib.git
-    source-depth: 1
-    source-tag: 2.78.1
-    plugin: meson
-    build-packages:
-      - mm-common
-      - ninja-build
-    meson-parameters:
-      - --buildtype=release
-      - --prefix=/usr
-      - --strip
-      - -Dtests=false
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-    after:
-      - meson-deps
-
-  glibmm:
-    source: https://github.com/GNOME/glibmm.git
-    source-depth: 1
-    source-tag: 2.78.0
-    plugin: meson
-    build-packages:
-      - mm-common
-      - ninja-build
-      - libxml-parser-perl
-    meson-parameters:
-      - --buildtype=release
-      - --prefix=/usr
-      - --strip
-      - -Dbuild-documentation=false
-      - -Dbuild-examples=false
-      - -Dsigc++-3.0:build-documentation=false
-      - -Dsigc++-3.0:build-examples=false
-      - -Dsigc++-3.0:build-tests=false
-      - -Dsigc++-3.0:validation=false
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-    after:
-      - meson-deps
-      - glib
-
   libjxl:
     source: https://github.com/libjxl/libjxl.git
     source-depth: 1
@@ -418,6 +360,7 @@ parts:
       - libegl-dev
       - libfontconfig1-dev
       - libfreetype-dev
+      - libglib2.0-dev
       - libglx-dev
       - libgtk-3-dev
       - libharfbuzz-dev
@@ -456,6 +399,7 @@ parts:
       - libegl1
       - libfontconfig1
       - libfreetype6
+      - libglib2.0-0
       - libglx0
       - libgtk-3-0
       - libharfbuzz0b
@@ -535,7 +479,6 @@ parts:
       - -./usr/mkspecs
       - -./usr/modules
     after:
-      - glib
       - mozjpeg
       - patches
 
@@ -579,6 +522,7 @@ parts:
       - libegl-dev
       - libgbm-dev
       - libgl-dev
+      - libglib2.0-dev
       - libopenh264-dev
       - libopus-dev
       - libpipewire-0.3-dev
@@ -597,6 +541,7 @@ parts:
       - libegl1
       - libgbm1
       - libgl1
+      - libglib2.0-0
       - libopenh264-6
       - libopus0
       - libssl3
@@ -620,5 +565,4 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
     after:
       - ffmpeg
-      - glib
       - mozjpeg

From a117c1ebf2d15c4ca15905d4d965091e26dccb4c Mon Sep 17 00:00:00 2001
From: Dubzer <me@dubzer.dev>
Date: Thu, 14 Mar 2024 22:48:40 +0300
Subject: [PATCH 031/596] Add new Segoe UI to IV css

---
 Telegram/Resources/iv_html/page.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
index ae3d64655..6df26aaf9 100644
--- a/Telegram/Resources/iv_html/page.css
+++ b/Telegram/Resources/iv_html/page.css
@@ -1,5 +1,5 @@
 :root {
-	--font-sans: -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, tahoma, arial, sans-serif;
+	--font-sans: -apple-system, BlinkMacSystemFont, avenir next, avenir, Segoe UI Variable Text, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, tahoma, arial, sans-serif;
 	--font-serif: Iowan Old Style, Apple Garamond, Baskerville, Georgia, Times New Roman, Droid Serif, Times, Source Serif Pro, serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;
 	--font-mono: Menlo, Cascadia Code, Consolas, Monaco, Liberation Mono, Lucida Console, monospace;
 }

From ded7aada5243dd05b535e9f9cc7969c2d1a37654 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 15 Mar 2024 02:34:08 +0300
Subject: [PATCH 032/596] Slightly improved filter for choosing users requested
 by bot.

---
 Telegram/SourceFiles/api/api_bot.cpp                 | 8 ++++----
 Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index d49f1bbf7..706b7a7cb 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -421,10 +421,10 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 				MTP_int(itemId),
 				MTP_int(id),
 				MTP_vector_from_range(
-					result
-					| ranges::views::transform([](
-						not_null<PeerData*> peer) {
-				return MTPInputPeer(peer->input); }))
+					result | ranges::views::transform([](
+							not_null<PeerData*> peer) {
+						return MTPInputPeer(peer->input);
+					}))
 			)).done([=](const MTPUpdates &result) {
 				peer->session().api().applyUpdates(result);
 			}).send();
diff --git a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
index 7d4d74453..33ce09ac4 100644
--- a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
@@ -49,7 +49,7 @@ public:
 	void submit();
 
 	QString savedMessagesChatStatus() const override {
-		return tr::lng_saved_forward_here(tr::now);
+		return {};
 	}
 
 private:
@@ -295,6 +295,8 @@ object_ptr<Ui::BoxContent> CreatePeerByQueryBox(
 	case Type::User: {
 		const auto user = peer->asUser();
 		return user
+			&& !user->isInaccessible()
+			&& !user->isNotificationsUser()
 			&& checkRestriction(query.userIsBot, user->isBot())
 			&& checkRestriction(query.userIsPremium, user->isPremium());
 	}

From 9e18236b55fadf9d00635b50f495733a2a303c15 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 15 Mar 2024 02:34:49 +0300
Subject: [PATCH 033/596] Added ability to open account in new window with
 middle click.

---
 Telegram/SourceFiles/settings/settings_information.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index 6a46992cc..9e4a66529 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -650,6 +650,9 @@ void SetupAccountsWrap(
 		if (which == Qt::LeftButton) {
 			callback(raw->clickModifiers());
 			return;
+		} else if (which == Qt::MiddleButton) {
+			callback(Qt::ControlModifier);
+			return;
 		} else if (which != Qt::RightButton) {
 			return;
 		}

From c3ca8c6258cb26ae99c594d79224ad39b41c2843 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 15 Mar 2024 03:06:05 +0300
Subject: [PATCH 034/596] Fixed emoji drawing in statuses of group call
 participants.

---
 .../calls/group/calls_group_members_row.cpp   | 55 ++++++++++---------
 .../calls/group/calls_group_members_row.h     |  2 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
index 96a31fcb9..78484dadc 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
@@ -129,7 +129,7 @@ MembersRow::MembersRow(
 : PeerListRow(participantPeer)
 , _delegate(delegate) {
 	refreshStatus();
-	_aboutText = participantPeer->about();
+	_about.setText(st::defaultTextStyle, participantPeer->about());
 }
 
 MembersRow::~MembersRow() = default;
@@ -562,10 +562,10 @@ void MembersRow::paintStatusIcon(
 }
 
 void MembersRow::setAbout(const QString &about) {
-	if (_aboutText == about) {
+	if (_about.toString() == about) {
 		return;
 	}
-	_aboutText = about;
+	_about.setText(st::defaultTextStyle, about);
 	_delegate->rowUpdateRow(this);
 }
 
@@ -610,13 +610,11 @@ void MembersRow::paintComplexStatusText(
 	x += skip;
 	availableWidth -= skip;
 	const auto &font = st::normalFont;
-	const auto about = (style == MembersRowStyle::Video)
-		? QString()
+	const auto useAbout = (style == MembersRowStyle::Video)
+		? false
 		: ((_state == State::RaisedHand && !_raisedHandStatus)
-			|| (_state != State::RaisedHand && !_speaking))
-		? _aboutText
-		: QString();
-	if (about.isEmpty()
+			|| (_state != State::RaisedHand && !_speaking));
+	if (!useAbout
 		&& _state != State::Invited
 		&& !_mutedByMe) {
 		paintStatusIcon(p, x, y, st, font, selected, narrowMode);
@@ -641,25 +639,30 @@ void MembersRow::paintComplexStatusText(
 			selected);
 		return;
 	}
-	p.setFont(font);
-	if (style == MembersRowStyle::Video) {
-		p.setPen(st::groupCallVideoSubTextFg);
-	} else if (_mutedByMe) {
-		p.setPen(st::groupCallMemberMutedIcon);
+	p.setPen((style == MembersRowStyle::Video)
+		? st::groupCallVideoSubTextFg
+		: _mutedByMe
+		? st::groupCallMemberMutedIcon
+		: st::groupCallMemberNotJoinedStatus);
+	if (!_mutedByMe && useAbout) {
+		return _about.draw(p, {
+			.position = QPoint(x, y),
+			.outerWidth = outerWidth,
+			.availableWidth = availableWidth,
+			.elisionLines = 1,
+		});
 	} else {
-		p.setPen(st::groupCallMemberNotJoinedStatus);
+		p.setFont(font);
+		p.drawTextLeft(
+			x,
+			y,
+			outerWidth,
+			(_mutedByMe
+				? tr::lng_group_call_muted_by_me_status(tr::now)
+				: _delegate->rowIsMe(peer())
+				? tr::lng_status_connecting(tr::now)
+				: tr::lng_group_call_invited_status(tr::now)));
 	}
-	p.drawTextLeft(
-		x,
-		y,
-		outerWidth,
-		(_mutedByMe
-			? tr::lng_group_call_muted_by_me_status(tr::now)
-			: !about.isEmpty()
-			? font->elided(about, availableWidth)
-			: _delegate->rowIsMe(peer())
-			? tr::lng_status_connecting(tr::now)
-			: tr::lng_group_call_invited_status(tr::now)));
 }
 
 QSize MembersRow::rightActionSize() const {
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members_row.h b/Telegram/SourceFiles/calls/group/calls_group_members_row.h
index 8dd02f1de..5ba910c8e 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members_row.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_members_row.h
@@ -208,7 +208,7 @@ private:
 	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.
-	QString _aboutText;
+	Ui::Text::String _about;
 	crl::time _speakingLastTime = 0;
 	uint64 _raisedHandRating = 0;
 	int _volume = Group::kDefaultVolume;

From 77dc234b2d28e2a9aa3bf6e1b4584fbb6afad16d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Mar 2024 14:42:31 +0400
Subject: [PATCH 035/596] Support AirPods Mute/Unmute toggle.

---
 Telegram/SourceFiles/calls/calls_call.cpp     | 25 ++++++++++++++++
 Telegram/SourceFiles/calls/calls_call.h       |  8 ++++-
 .../calls/group/calls_group_call.cpp          | 29 +++++++++++++++++++
 .../calls/group/calls_group_call.h            |  8 ++++-
 Telegram/lib_webrtc                           |  2 +-
 5 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index ba59556d9..486d5af2a 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -420,6 +420,14 @@ void Call::actuallyAnswer() {
 	}).send();
 }
 
+void Call::captureMuteChanged(bool mute) {
+	setMuted(mute);
+}
+
+rpl::producer<Webrtc::DeviceResolvedId> Call::captureMuteDeviceId() {
+	return _captureDeviceId.value();
+}
+
 void Call::setMuted(bool mute) {
 	_muted = mute;
 	if (_instance) {
@@ -1033,6 +1041,20 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 
 	raw->setIncomingVideoOutput(_videoIncoming->sink());
 	raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
+
+	_state.value() | rpl::start_with_next([=](State state) {
+		const auto track = (state != State::FailedHangingUp)
+			&& (state != State::Failed)
+			&& (state != State::HangingUp)
+			&& (state != State::Ended)
+			&& (state != State::EndedByOtherDevice)
+			&& (state != State::Busy);
+		Core::App().mediaDevices().setCaptureMuteTracker(this, track);
+	}, _instanceLifetime);
+
+	_muted.value() | rpl::start_with_next([=](bool muted) {
+		Core::App().mediaDevices().setCaptureMuted(muted);
+	}, _instanceLifetime);
 }
 
 void Call::handleControllerStateChange(tgcalls::State state) {
@@ -1375,6 +1397,9 @@ void Call::handleControllerError(const QString &error) {
 }
 
 void Call::destroyController() {
+	_instanceLifetime.destroy();
+	Core::App().mediaDevices().setCaptureMuteTracker(this, false);
+
 	if (_instance) {
 		_instance->stop([](tgcalls::FinalState) {
 		});
diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 4be689831..69c2d94da 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -59,7 +59,9 @@ enum class CallType {
 	Outgoing,
 };
 
-class Call : public base::has_weak_ptr {
+class Call final
+	: public base::has_weak_ptr
+	, private Webrtc::CaptureMuteTracker {
 public:
 	class Delegate {
 	public:
@@ -249,6 +251,9 @@ private:
 	void setSignalBarCount(int count);
 	void destroyController();
 
+	void captureMuteChanged(bool mute) override;
+	rpl::producer<Webrtc::DeviceResolvedId> captureMuteDeviceId() override;
+
 	void setupMediaDevices();
 	void setupOutgoingVideo();
 	void updateRemoteMediaState(
@@ -298,6 +303,7 @@ private:
 
 	std::unique_ptr<Media::Audio::Track> _waitingTrack;
 
+	rpl::lifetime _instanceLifetime;
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.cpp b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
index 8617aef85..5f7346913 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/random.h"
 #include "webrtc/webrtc_video_track.h"
 #include "webrtc/webrtc_create_adm.h"
+#include "webrtc/webrtc_environment.h"
 
 #include <tgcalls/group/GroupInstanceCustomImpl.h>
 #include <tgcalls/VideoCaptureInterface.h>
@@ -667,6 +668,8 @@ GroupCall::GroupCall(
 GroupCall::~GroupCall() {
 	destroyScreencast();
 	destroyController();
+
+	Core::App().mediaDevices().setCaptureMuteTracker(this, false);
 }
 
 bool GroupCall::isSharingScreen() const {
@@ -2087,6 +2090,32 @@ void GroupCall::setupMediaDevices() {
 	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_cameraCapture->switchToDevice(deviceId.value.toStdString(), false);
 	}, _lifetime);
+
+	_muted.value() | rpl::start_with_next([=](MuteState state) {
+		const auto devices = &Core::App().mediaDevices();
+		const auto muted = (state != MuteState::Active)
+			&& (state != MuteState::PushToTalk);
+		const auto track = !muted || (state == MuteState::Muted);
+		devices->setCaptureMuteTracker(this, track);
+		devices->setCaptureMuted(muted);
+	}, _lifetime);
+}
+
+void GroupCall::captureMuteChanged(bool mute) {
+	const auto oldState = muted();
+	if (mute
+		&& (oldState == MuteState::ForceMuted
+			|| oldState == MuteState::RaisedHand
+			|| oldState == MuteState::Muted)) {
+		return;
+	} else if (!mute && oldState != MuteState::Muted) {
+		return;
+	}
+	setMutedAndUpdate(mute ? MuteState::Muted : MuteState::Active);
+}
+
+rpl::producer<Webrtc::DeviceResolvedId> GroupCall::captureMuteDeviceId() {
+	return _captureDeviceId.value();
 }
 
 int GroupCall::activeVideoSendersCount() const {
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.h b/Telegram/SourceFiles/calls/group/calls_group_call.h
index fd2cd88a0..8f93793bd 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.h
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/bytes.h"
 #include "mtproto/sender.h"
 #include "mtproto/mtproto_auth_key.h"
+#include "webrtc/webrtc_device_common.h"
 #include "webrtc/webrtc_device_resolver.h"
 
 class History;
@@ -175,7 +176,9 @@ struct ParticipantVideoParams;
 [[nodiscard]] uint32 GetAdditionalAudioSsrc(
 	const std::shared_ptr<ParticipantVideoParams> &params);
 
-class GroupCall final : public base::has_weak_ptr {
+class GroupCall final
+	: public base::has_weak_ptr
+	, private Webrtc::CaptureMuteTracker {
 public:
 	class Delegate {
 	public:
@@ -550,6 +553,9 @@ private:
 	void applySelfUpdate(const MTPDgroupCallParticipant &data);
 	void applyOtherParticipantUpdate(const MTPDgroupCallParticipant &data);
 
+	void captureMuteChanged(bool mute) override;
+	rpl::producer<Webrtc::DeviceResolvedId> captureMuteDeviceId() override;
+
 	void setupMediaDevices();
 	void setupOutgoingVideo();
 	void setScreenEndpoint(std::string endpoint);
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index 5493af61d..1cbf5fa7d 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit 5493af61df5cb90a30b686296521961763a009e0
+Subproject commit 1cbf5fa7d875074c40e76216a3047bd7c59996d7

From a1a415de82b9ab18589e8d3fe0b43caadaaf566b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 15 Mar 2024 17:08:17 +0300
Subject: [PATCH 036/596] Fixed crash in non-stack bar chart view when hide
 selected point.

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

diff --git a/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp b/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp
index e4ce96160..8beeaa509 100644
--- a/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp
@@ -149,7 +149,7 @@ void BarChartView::paintSelectedXIndex(
 
 	if (_isStack) {
 		BarChartView::paintChartAndSelected(p, c);
-	} else {
+	} else if (selectedXIndex >= 0) {
 		const auto linesFilter = linesFilterController();
 		auto hq = PainterHighQualityEnabler(p);
 		auto o = ScopedPainterOpacity(p, progress);

From f1d8135e30181d16c93c6775f47eb2990da6adc1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Mar 2024 20:23:48 +0400
Subject: [PATCH 037/596] Fix crash in IV parsing.

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

diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp
index 9e276bce7..2d9595667 100644
--- a/Telegram/SourceFiles/iv/iv_prepare.cpp
+++ b/Telegram/SourceFiles/iv/iv_prepare.cpp
@@ -851,7 +851,7 @@ QByteArray Parser::block(const MTPDpageRelatedArticle &data) {
 			inner += tag(
 				"span",
 				{ { "class", "related-link-source" } },
-				EscapeText(utf(*author)
+				EscapeText((author ? utf(*author) : QByteArray())
 					+ separator
 					+ langDateTimeFull(parsed).toUtf8()));
 		}

From 24e9a3ea595cd05391839ba15bf7bf69435df092 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Mar 2024 20:27:54 +0400
Subject: [PATCH 038/596] Bot close confirm closes only by Close button.

---
 Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index ed57fdf2b..a84890032 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -1073,7 +1073,7 @@ void Panel::closeWithConfirmation() {
 	});
 	if (!weak) {
 		return;
-	} else if (result.id != "cancel") {
+	} else if (result.id == "close") {
 		_delegate->botClose();
 	} else {
 		_closeWithConfirmationScheduled = false;

From ad101dc8a06ab50384b386186383542b78a20bd0 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 15 Mar 2024 23:08:20 +0400
Subject: [PATCH 039/596] A way to initialize GLib::VariantIter without
 gi::wrap is found

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

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 38e5cc7f2..47b6e63ef 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -30,9 +30,9 @@ using namespace gi::repository;
 std::vector<std::any> AnyVectorFromVariant(GLib::Variant value) {
 	std::vector<std::any> result;
 
-	auto iter = gi::wrap(
-		g_variant_iter_new(value.gobj_()),
-		gi::transfer_full);
+	GLib::VariantIter iter;
+	iter.allocate_();
+	iter.init(value);
 
 	const auto uint64Type = GLib::VariantType::new_("t");
 	const auto int64Type = GLib::VariantType::new_("x");

From f4ecfeaddd96963f5c05a15f1a31269c1de750ca Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 15 Mar 2024 19:07:22 +0300
Subject: [PATCH 040/596] Added ability to perform bulk selection from menu in
 HistoryWidget.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../history/history_inner_widget.cpp          | 81 +++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 39907f573..190958942 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3013,6 +3013,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_delete_msg" = "Delete Message";
 "lng_context_auto_delete_in" = "auto-delete in {duration}";
 "lng_context_select_msg" = "Select Message";
+"lng_context_select_msg_bulk" = "Select up to this message";
 "lng_context_report_msg" = "Report Message";
 "lng_context_pin_msg" = "Pin Message";
 "lng_context_unpin_msg" = "Unpin Message";
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index a2188d7d5..79c25f691 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2277,6 +2277,87 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					}
 				}
 			}, &st::menuIconSelect);
+			const auto collectBetween = [=](
+					not_null<HistoryItem*> from,
+					not_null<HistoryItem*> to,
+					int max) -> HistoryItemsList {
+				auto current = from;
+				auto collected = HistoryItemsList();
+				collected.reserve(max);
+				collected.push_back(from);
+				collected.push_back(to);
+				const auto toId = to->fullId();
+				while (true) {
+					if (collected.size() > max) {
+						return {};
+					}
+					const auto view = viewByItem(current);
+					const auto nextView = nextItem(view);
+					if (!nextView) {
+						return {};
+					}
+					const auto nextItem = nextView->data();
+					if (nextItem->fullId() == toId) {
+						return collected;
+					}
+					if (nextItem->isRegular() && !nextItem->isService()) {
+						collected.push_back(nextItem);
+					}
+					current = nextItem;
+				}
+			};
+
+			[&] { // Select up to this message.
+				if (selectedState.count <= 0) {
+					return;
+				}
+				const auto toItem = groupLeaderOrSelf(item);
+				auto topToBottom = false;
+				auto nearestItem = (HistoryItem*)(nullptr);
+				{
+					auto minDiff = std::numeric_limits<int>::max();
+					for (const auto &[item, _] : _selected) {
+						const auto diff = item->fullId().msg.bare
+							- toItem->fullId().msg.bare;
+						if (std::abs(diff) < minDiff) {
+							nearestItem = item;
+							minDiff = std::abs(diff);
+							topToBottom = (diff < 0);
+						}
+					}
+				}
+				if (!nearestItem) {
+					return;
+				}
+				const auto start = (topToBottom ? nearestItem : toItem);
+				const auto end = (topToBottom ? toItem : nearestItem);
+				const auto left = MaxSelectedItems
+					- selectedState.count
+					+ (topToBottom ? 0 : 1);
+				if (collectBetween(start, end, left).empty()) {
+					return;
+				}
+				const auto startId = start->fullId();
+				const auto endId = end->fullId();
+				const auto callback = [=] {
+					const auto from = session->data().message(startId);
+					const auto to = session->data().message(endId);
+					if (from && to) {
+						for (const auto &i : collectBetween(from, to, left)) {
+							changeSelectionAsGroup(
+								&_selected,
+								i,
+								SelectAction::Select);
+						}
+						update();
+						_widget->updateTopBarSelection();
+					}
+				};
+				_menu->addAction(
+					tr::lng_context_select_msg_bulk(tr::now),
+					callback,
+					&st::menuIconSelect);
+			}();
 		}
 	};
 

From 393f330d15c6c0412ed85d465b6269971b277b7d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 16 Mar 2024 04:38:43 +0300
Subject: [PATCH 041/596] Added ability to go to message from Calls box.

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

diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp
index 11c6347d5..a3d0d5369 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -572,6 +572,11 @@ base::unique_qptr<Ui::PopupMenu> BoxController::rowContextMenu(
 		_window->show(
 			Box<DeleteMessagesBox>(session, base::duplicate(ids)));
 	}, &st::menuIconDelete);
+	result->addAction(tr::lng_context_to_msg(tr::now), [=, window = _window] {
+		if (const auto item = session->data().message(ids.front())) {
+			window->showMessage(item);
+		}
+	}, &st::menuIconShowInChat);
 	return result;
 }
 

From 55b2b04e2ea67078731e932c045622b465e4854a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 16 Mar 2024 09:54:07 +0400
Subject: [PATCH 042/596] Reapply "Disable system proxy support on Linux"

This reverts commit 202a4064a43578980a21d57288569210a506cac5.
---
 Telegram/SourceFiles/core/sandbox.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 6feacdb5b..fb145f7f1 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QSessionManager>
 #include <QtGui/QScreen>
 #include <QtGui/qpa/qplatformscreen.h>
+#include <ksandbox.h>
 
 namespace Core {
 namespace {
@@ -517,8 +518,10 @@ void Sandbox::refreshGlobalProxy() {
 		|| proxy.type == MTP::ProxyData::Type::Http) {
 		QNetworkProxy::setApplicationProxy(
 			MTP::ToNetworkProxy(MTP::ToDirectIpProxy(proxy)));
-	} else if (!Core::IsAppLaunched()
-		|| Core::App().settings().proxy().isSystem()) {
+	} else if ((!Core::IsAppLaunched()
+		|| Core::App().settings().proxy().isSystem())
+		// this works stable only in sandboxed environment where it works through portal
+		&& (!Platform::IsLinux() || KSandbox::isInside() || cDebugMode())) {
 		QNetworkProxyFactory::setUseSystemConfiguration(true);
 	} else {
 		QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);

From 82fda96ed88065a761e27cb80173250c81aba8a9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 16 Mar 2024 09:59:23 +0400
Subject: [PATCH 043/596] Beta version 4.15.5.

- Fix a crash in Instant View article parsing.
- Support AirPods Mute/Unmute toggle in calls on macOS.
- Disable system proxy on Linux to check if it fixes crashes.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index e6aa01dc5..1149de562 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.15.4.0" />
+    Version="4.15.5.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index fe9addb7b..fe116dd6d 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 4,15,4,0
- PRODUCTVERSION 4,15,4,0
+ FILEVERSION 4,15,5,0
+ PRODUCTVERSION 4,15,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.15.4.0"
+            VALUE "FileVersion", "4.15.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.4.0"
+            VALUE "ProductVersion", "4.15.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 1289e471e..93b6c21de 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 4,15,4,0
- PRODUCTVERSION 4,15,4,0
+ FILEVERSION 4,15,5,0
+ PRODUCTVERSION 4,15,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.15.4.0"
+            VALUE "FileVersion", "4.15.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.4.0"
+            VALUE "ProductVersion", "4.15.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index cc1bff4ac..fbb996b7c 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 = 4015004;
-constexpr auto AppVersionStr = "4.15.4";
+constexpr auto AppVersion = 4015005;
+constexpr auto AppVersionStr = "4.15.5";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index d1f6650e1..24dca8f50 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4015004
+AppVersion         4015005
 AppVersionStrMajor 4.15
-AppVersionStrSmall 4.15.4
-AppVersionStr      4.15.4
+AppVersionStrSmall 4.15.5
+AppVersionStr      4.15.5
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 4.15.4.beta
+AppVersionOriginal 4.15.5.beta
diff --git a/changelog.txt b/changelog.txt
index 62f49bf5e..191239576 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+4.15.5 beta (16.03.24)
+
+- Fix a crash in Instant View article parsing.
+- Support AirPods Mute/Unmute toggle in calls on macOS.
+- Disable system proxy on Linux to check if it fixes crashes.
+
 4.15.4 beta (14.03.24)
 
 - Fix initial text color in dark mode Instant View on macOS.

From 6d5347472d422a5b5ed481153c13b9dd91b8ed60 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 16 Mar 2024 02:25:32 +0400
Subject: [PATCH 044/596] Fix media viewer geometry logging

It has regressed after c64e953174b9e40dc27754dbdcd4a9b9d1bb729b
---
 .../media/view/media_view_overlay_widget.cpp         | 12 +++++++++---
 1 file changed, 9 insertions(+), 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 4c8a0cf70..bc1b00968 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -481,6 +481,10 @@ OverlayWidget::OverlayWidget()
 				moveToScreen(true);
 			}
 		} else if (type == QEvent::Resize) {
+			const auto size = static_cast<QResizeEvent*>(e.get())->size();
+			DEBUG_LOG(("Viewer Pos: Resized to %1, %2")
+				.arg(size.width())
+				.arg(size.height()));
 			if (_windowed) {
 				savePosition();
 			}
@@ -508,9 +512,6 @@ OverlayWidget::OverlayWidget()
 		const auto type = e->type();
 		if (type == QEvent::Resize) {
 			const auto size = static_cast<QResizeEvent*>(e.get())->size();
-			DEBUG_LOG(("Viewer Pos: Resized to %1, %2")
-				.arg(size.width())
-				.arg(size.height()));
 
 			// Somehow Windows 11 knows the geometry of first widget below
 			// the semi-native title control widgets and it uses
@@ -909,6 +910,11 @@ void OverlayWidget::updateGeometry(bool inMove) {
 	if (_fullscreen && (!Platform::IsWindows11OrGreater() || !isHidden())) {
 		updateGeometryToScreen(inMove);
 	} else if (_windowed && _normalGeometryInited) {
+		DEBUG_LOG(("Viewer Pos: Setting %1, %2, %3, %4")
+			.arg(_normalGeometry.x())
+			.arg(_normalGeometry.y())
+			.arg(_normalGeometry.width())
+			.arg(_normalGeometry.height()));
 		_window->setGeometry(_normalGeometry);
 	}
 	if constexpr (!Platform::IsMac()) {

From ddaf78828a82bf1db2b19e91ae9e5d73889ba4b5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 16 Mar 2024 02:29:12 +0400
Subject: [PATCH 045/596] Fix media viewer geometry restoration

---
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 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 bc1b00968..b4965fe6f 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -915,7 +915,7 @@ void OverlayWidget::updateGeometry(bool inMove) {
 			.arg(_normalGeometry.y())
 			.arg(_normalGeometry.width())
 			.arg(_normalGeometry.height()));
-		_window->setGeometry(_normalGeometry);
+		_window->RpWidget::setGeometry(_normalGeometry);
 	}
 	if constexpr (!Platform::IsMac()) {
 		if (_fullscreen) {

From 2638ee292616f1238d7804f0d537a34cb374b98b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Mar 2024 03:46:11 +0300
Subject: [PATCH 046/596] Improved message edition with pre-selected text.

---
 .../chat_helpers/message_field.cpp            | 25 +++++++++++++++++++
 .../SourceFiles/chat_helpers/message_field.h  |  4 +++
 .../history/history_inner_widget.cpp          | 12 ++++++++-
 .../SourceFiles/history/history_widget.cpp    | 13 ++++------
 Telegram/SourceFiles/history/history_widget.h |  5 ++--
 .../history_view_compose_controls.cpp         |  5 +++-
 .../controls/history_view_compose_controls.h  |  2 +-
 .../history/view/history_view_list_widget.cpp |  5 ++++
 .../history/view/history_view_list_widget.h   |  2 ++
 .../view/history_view_replies_section.cpp     |  4 ++-
 .../view/history_view_scheduled_section.cpp   |  4 ++-
 .../business/settings_shortcut_messages.cpp   |  4 ++-
 12 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 5715eea45..c5c04a43c 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -1037,3 +1037,28 @@ base::unique_qptr<Ui::RpWidget> PremiumRequiredSendRestriction(
 	});
 	return result;
 }
+
+void SelectTextInFieldWithMargins(
+		not_null<Ui::InputField*> field,
+		const TextSelection &selection) {
+	if (selection.empty()) {
+		return;
+	}
+	auto textCursor = field->textCursor();
+	// Try to set equal margins for top and bottom sides.
+	const auto charsCountInLine = field->width()
+		/ field->st().font->width('W');
+	const auto linesCount = (field->height() / field->st().font->height);
+	const auto selectedLines = (selection.to - selection.from)
+		/ charsCountInLine;
+	constexpr auto kMinDiff = ushort(3);
+	if ((linesCount - selectedLines) > kMinDiff) {
+		textCursor.setPosition(selection.from
+			- charsCountInLine * ((linesCount - 1) / 2));
+		field->setTextCursor(textCursor);
+	}
+	textCursor.setPosition(selection.from);
+	field->setTextCursor(textCursor);
+	textCursor.setPosition(selection.to, QTextCursor::KeepAnchor);
+	field->setTextCursor(textCursor);
+}
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h
index a8f248e82..0c9d8ff85 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.h
+++ b/Telegram/SourceFiles/chat_helpers/message_field.h
@@ -154,3 +154,7 @@ private:
 	QWidget *parent,
 	not_null<UserData*> user,
 	not_null<Window::SessionController*> controller);
+
+void SelectTextInFieldWithMargins(
+	not_null<Ui::InputField*> field,
+	const TextSelection &selection);
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 79c25f691..c5f201f51 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2131,7 +2131,17 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		if (editItem) {
 			const auto editItemId = editItem->fullId();
 			_menu->addAction(tr::lng_context_edit_msg(tr::now), [=] {
-				_widget->editMessage(editItemId);
+				if (const auto item = session->data().message(editItemId)) {
+					auto it = _selected.find(item);
+					const auto selection = ((it != _selected.end())
+							&& (it->second != FullSelection))
+						? it->second
+						: TextSelection();
+					if (!selection.empty()) {
+						clearSelected(true);
+					}
+					_widget->editMessage(item, selection);
+				}
 			}, &st::menuIconEdit);
 		}
 		const auto pinItem = (item->canPin() && item->isPinned())
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 8aa8f7332..1bc4ac21f 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -6606,7 +6606,7 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
 			&& _field->empty()
 			&& !_editMsgId
 			&& !_replyTo) {
-			editMessage(item);
+			editMessage(item, {});
 			return;
 		}
 		_scroll->keyPressEvent(e);
@@ -7570,13 +7570,9 @@ void HistoryWidget::setReplyFieldsFromProcessing() {
 	setInnerFocus();
 }
 
-void HistoryWidget::editMessage(FullMsgId itemId) {
-	if (const auto item = session().data().message(itemId)) {
-		editMessage(item);
-	}
-}
-
-void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
+void HistoryWidget::editMessage(
+		not_null<HistoryItem*> item,
+		const TextSelection &selection) {
 	if (_chooseTheme) {
 		toggleChooseChatTheme(_peer);
 	} else if (_voiceRecordBar->isActive()) {
@@ -7625,6 +7621,7 @@ void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
 	updateReplyToName();
 	updateControlsGeometry();
 	updateField();
+	SelectTextInFieldWithMargins(_field, selection);
 
 	_saveDraftText = true;
 	_saveDraftStart = crl::now();
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 4cbfd46af..eafa19ac9 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -195,8 +195,9 @@ public:
 		not_null<HistoryItem*> item,
 		TextWithEntities quote = {},
 		int quoteOffset = 0);
-	void editMessage(FullMsgId itemId);
-	void editMessage(not_null<HistoryItem*> item);
+	void editMessage(
+		not_null<HistoryItem*> item,
+		const TextSelection &selection);
 
 	[[nodiscard]] FullReplyTo replyTo() const;
 	bool lastForceReplyReplied(const FullMsgId &replyTo) 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 8fe8752c5..185073db1 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2857,9 +2857,12 @@ void ComposeControls::updateHeight() {
 	}
 }
 
-void ComposeControls::editMessage(FullMsgId id) {
+void ComposeControls::editMessage(
+		FullMsgId id,
+		const TextSelection &selection) {
 	if (const auto item = session().data().message(id)) {
 		editMessage(item);
+		SelectTextInFieldWithMargins(_field, selection);
 	}
 }
 
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 779c8c2d8..b24e0213a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -198,7 +198,7 @@ public:
 	void showFinished();
 	void raisePanels();
 
-	void editMessage(FullMsgId id);
+	void editMessage(FullMsgId id, const TextSelection &selection);
 	void cancelEditMessage();
 	void maybeCancelEditMessage(); // Confirm if changed and cancel.
 
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 9c2f94086..fb8d99130 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -2425,6 +2425,11 @@ SelectedItems ListWidget::getSelectedItems() const {
 	return collectSelectedItems();
 }
 
+const TextSelection &ListWidget::getSelectedTextRange(
+		not_null<HistoryItem*> item) const {
+	return _selectedTextRange;
+}
+
 int ListWidget::findItemIndexByY(int y) const {
 	Expects(!_items.empty());
 
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 12e09accf..b68e689e9 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -248,6 +248,8 @@ public:
 	[[nodiscard]] TextForMimeData getSelectedText() const;
 	[[nodiscard]] MessageIdsList getSelectedIds() const;
 	[[nodiscard]] SelectedItems getSelectedItems() const;
+	[[nodiscard]] const TextSelection &getSelectedTextRange(
+		not_null<HistoryItem*> item) const;
 	void cancelSelection();
 	void selectItem(not_null<HistoryItem*> item);
 	void selectItemAsGroup(not_null<HistoryItem*> item);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 7b8eb8765..9451bd556 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -316,7 +316,9 @@ RepliesWidget::RepliesWidget(
 		if (const auto item = session().data().message(fullId)) {
 			const auto media = item->media();
 			if (!media || media->webpage() || media->allowsEditCaption()) {
-				_composeControls->editMessage(fullId);
+				_composeControls->editMessage(
+					fullId,
+					_inner->getSelectedTextRange(item));
 			}
 		}
 	}, _inner->lifetime());
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 2a6328b38..59ee93ae9 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -172,7 +172,9 @@ ScheduledWidget::ScheduledWidget(
 		if (const auto item = session().data().message(fullId)) {
 			const auto media = item->media();
 			if (!media || media->webpage() || media->allowsEditCaption()) {
-				_composeControls->editMessage(fullId);
+				_composeControls->editMessage(
+					fullId,
+					_inner->getSelectedTextRange(item));
 			}
 		}
 	}, _inner->lifetime());
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index e1fcec944..9422c892c 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -394,7 +394,9 @@ ShortcutMessages::ShortcutMessages(
 		if (const auto item = _session->data().message(fullId)) {
 			const auto media = item->media();
 			if (!media || media->webpage() || media->allowsEditCaption()) {
-				_composeControls->editMessage(fullId);
+				_composeControls->editMessage(
+					fullId,
+					_inner->getSelectedTextRange(item));
 			}
 		}
 	}, _inner->lifetime());

From 4abc68ab1c987e856f09d6d08672abc23f1bd6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
Date: Fri, 15 Mar 2024 14:42:03 +0100
Subject: [PATCH 047/596] Upgrade dav1d, libavif, libde265, libheif

---
 Telegram/build/prepare/prepare.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 173f34c2b..7ce74596b 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -696,7 +696,7 @@ mac:
 """)
 
 stage('dav1d', """
-    git clone -b 1.2.1 --depth 1 https://code.videolan.org/videolan/dav1d.git
+    git clone -b 1.4.1 --depth 1 https://code.videolan.org/videolan/dav1d.git
     cd dav1d
 win:
     if "%X8664%" equ "x64" (
@@ -774,7 +774,7 @@ mac:
 """)
 
 stage('libavif', """
-    git clone -b v0.11.1 --depth 1 https://github.com/AOMediaCodec/libavif.git
+    git clone -b v1.0.4 --depth 1 https://github.com/AOMediaCodec/libavif.git
     cd libavif
 win:
     cmake . ^
@@ -804,7 +804,7 @@ mac:
 """)
 
 stage('libde265', """
-    git clone --depth 1 -b v1.0.12 https://github.com/strukturag/libde265.git
+    git clone --depth 1 -b v1.0.15 https://github.com/strukturag/libde265.git
     cd libde265
 win:
     cmake . ^
@@ -880,7 +880,7 @@ mac:
 """)
 
 stage('libheif', """
-    git clone --depth 1 -b v1.16.2 https://github.com/strukturag/libheif.git
+    git clone --depth 1 -b v1.17.6 https://github.com/strukturag/libheif.git
     cd libheif
 win:
     %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/LIBHEIF_EXPORTS/LIBDE265_STATIC_BUILD/g' libheif/CMakeLists.txt

From 0e428aebdba504ee8355964285d4fcca1ca579f2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Mar 2024 20:34:02 +0400
Subject: [PATCH 048/596] Update patches in Linux build.

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 9ff771f41..f7b674422 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -54,7 +54,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin b8390aef3db43f973486c6e512f4e825ffd09691 \
+	&& git fetch --depth=1 origin 75140a10eefcecaad7b3f3aa4586b880a39007ff \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 95e95f375..dbb12885e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -168,7 +168,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: b8390aef3db43f973486c6e512f4e825ffd09691
+    source-commit: 75140a10eefcecaad7b3f3aa4586b880a39007ff
     plugin: dump
     override-pull: |
       craftctl default

From 602b0b5d9b83a7c7486d86f7a029c64954a4f142 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 18 Mar 2024 09:57:44 +0400
Subject: [PATCH 049/596] Use the File::OpenUrl routine in IV

---
 Telegram/SourceFiles/iv/iv_instance.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 673535cc7..50545ed32 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -47,7 +47,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "window/window_session_controller_link_info.h"
 
-#include <QtGui/QDesktopServices>
 #include <QtGui/QGuiApplication>
 
 namespace Iv {
@@ -832,7 +831,7 @@ void Instance::show(
 			processJoinChannel(event.context);
 			break;
 		case Type::OpenLinkExternal:
-			QDesktopServices::openUrl(event.url);
+			File::OpenUrl(event.url);
 			closeAll();
 			break;
 		case Type::OpenMedia:

From 07ab8756555f4a410d043d2aa3bf4bd13fc22731 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 18 Mar 2024 09:57:55 +0400
Subject: [PATCH 050/596] 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 928fe24bb..216aed4e8 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 928fe24bb723bbebd4bcc87792da54b796d0b5a9
+Subproject commit 216aed4e8d518571e33df26fef918edcac8122f9

From 846a6d8717b6a8e0c125f79f049734f87ec07010 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 18 Mar 2024 17:57:44 +0400
Subject: [PATCH 051/596] Update scudo to 18.1.1

---
 Telegram/ThirdParty/scudo/CMakeLists.txt      |  13 +-
 Telegram/ThirdParty/scudo/allocator_common.h  |  85 +++
 Telegram/ThirdParty/scudo/allocator_config.h  |  53 +-
 Telegram/ThirdParty/scudo/atomic_helpers.h    |   8 +-
 .../scudo/benchmarks/malloc_benchmark.cpp     |   4 -
 Telegram/ThirdParty/scudo/chunk.h             |  13 -
 Telegram/ThirdParty/scudo/combined.h          | 230 ++++----
 Telegram/ThirdParty/scudo/common.cpp          |  18 -
 Telegram/ThirdParty/scudo/common.h            |  38 +-
 .../ThirdParty/scudo/condition_variable.h     |  60 ++
 .../scudo/condition_variable_base.h           |  56 ++
 .../scudo/condition_variable_linux.cpp        |  52 ++
 .../scudo/condition_variable_linux.h          |  38 ++
 Telegram/ThirdParty/scudo/flags.cpp           |   3 +
 Telegram/ThirdParty/scudo/flags.inc           |  12 +-
 Telegram/ThirdParty/scudo/flags_parser.cpp    |  30 +-
 Telegram/ThirdParty/scudo/flags_parser.h      |   3 +-
 .../scudo/fuzz/get_error_info_fuzzer.cpp      |   9 +-
 .../scudo/include/scudo/interface.h           |  17 +-
 Telegram/ThirdParty/scudo/linux.cpp           |  50 +-
 Telegram/ThirdParty/scudo/local_cache.h       | 125 +---
 Telegram/ThirdParty/scudo/mem_map.h           |   5 +-
 Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp |  12 +-
 Telegram/ThirdParty/scudo/mem_map_linux.cpp   | 153 +++++
 Telegram/ThirdParty/scudo/mem_map_linux.h     |  67 +++
 Telegram/ThirdParty/scudo/mutex.h             |  19 +-
 Telegram/ThirdParty/scudo/options.h           |   2 +-
 Telegram/ThirdParty/scudo/platform.h          |  14 +
 Telegram/ThirdParty/scudo/primary32.h         | 298 +++++++---
 Telegram/ThirdParty/scudo/primary64.h         | 551 +++++++++++-------
 Telegram/ThirdParty/scudo/release.cpp         |   3 +-
 Telegram/ThirdParty/scudo/release.h           | 171 +++---
 Telegram/ThirdParty/scudo/report.cpp          |  33 +-
 Telegram/ThirdParty/scudo/report.h            |   8 +-
 Telegram/ThirdParty/scudo/report_linux.cpp    |  58 ++
 Telegram/ThirdParty/scudo/report_linux.h      |  34 ++
 .../ThirdParty/scudo/rss_limit_checker.cpp    |  37 --
 Telegram/ThirdParty/scudo/rss_limit_checker.h |  63 --
 Telegram/ThirdParty/scudo/secondary.h         | 186 ++++--
 Telegram/ThirdParty/scudo/size_class_map.h    |  26 +-
 Telegram/ThirdParty/scudo/stack_depot.h       |   5 +-
 .../ThirdParty/scudo/tests/CMakeLists.txt     |  15 +-
 .../ThirdParty/scudo/tests/chunk_test.cpp     |  23 -
 .../ThirdParty/scudo/tests/combined_test.cpp  | 188 ++++--
 .../ThirdParty/scudo/tests/common_test.cpp    |  23 -
 .../scudo/tests/condition_variable_test.cpp   |  59 ++
 .../ThirdParty/scudo/tests/memtag_test.cpp    |  10 +-
 .../ThirdParty/scudo/tests/primary_test.cpp   |  43 +-
 .../ThirdParty/scudo/tests/release_test.cpp   |  42 +-
 .../ThirdParty/scudo/tests/report_test.cpp    |   1 -
 .../scudo/tests/scudo_hooks_test.cpp          | 114 ----
 .../ThirdParty/scudo/tests/scudo_unit_test.h  |   6 +
 .../scudo/tests/scudo_unit_test_main.cpp      |   4 +-
 .../scudo/tests/size_class_map_test.cpp       |   4 -
 Telegram/ThirdParty/scudo/tests/tsd_test.cpp  |   4 +
 .../scudo/tests/wrappers_c_test.cpp           | 201 ++++++-
 .../scudo/tests/wrappers_cpp_test.cpp         | 143 +++--
 Telegram/ThirdParty/scudo/trusty.cpp          |   6 +-
 Telegram/ThirdParty/scudo/tsd.h               |  17 +-
 Telegram/ThirdParty/scudo/tsd_shared.h        |   5 +
 Telegram/ThirdParty/scudo/vector.h            |  51 +-
 Telegram/ThirdParty/scudo/wrappers_c.cpp      |   3 +
 Telegram/ThirdParty/scudo/wrappers_c.inc      | 108 +++-
 .../ThirdParty/scudo/wrappers_c_bionic.cpp    |  21 +-
 Telegram/ThirdParty/scudo/wrappers_cpp.cpp    |  66 ++-
 65 files changed, 2424 insertions(+), 1395 deletions(-)
 create mode 100644 Telegram/ThirdParty/scudo/allocator_common.h
 create mode 100644 Telegram/ThirdParty/scudo/condition_variable.h
 create mode 100644 Telegram/ThirdParty/scudo/condition_variable_base.h
 create mode 100644 Telegram/ThirdParty/scudo/condition_variable_linux.cpp
 create mode 100644 Telegram/ThirdParty/scudo/condition_variable_linux.h
 create mode 100644 Telegram/ThirdParty/scudo/mem_map_linux.cpp
 create mode 100644 Telegram/ThirdParty/scudo/mem_map_linux.h
 create mode 100644 Telegram/ThirdParty/scudo/report_linux.cpp
 create mode 100644 Telegram/ThirdParty/scudo/report_linux.h
 delete mode 100644 Telegram/ThirdParty/scudo/rss_limit_checker.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/rss_limit_checker.h
 create mode 100644 Telegram/ThirdParty/scudo/tests/condition_variable_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/scudo_hooks_test.cpp

diff --git a/Telegram/ThirdParty/scudo/CMakeLists.txt b/Telegram/ThirdParty/scudo/CMakeLists.txt
index 094c23a73..60092005c 100644
--- a/Telegram/ThirdParty/scudo/CMakeLists.txt
+++ b/Telegram/ThirdParty/scudo/CMakeLists.txt
@@ -25,7 +25,7 @@ append_list_if(COMPILER_RT_HAS_WNO_PEDANTIC -Wno-pedantic SCUDO_CFLAGS)
 append_list_if(COMPILER_RT_HAS_FNO_LTO_FLAG -fno-lto SCUDO_CFLAGS)
 
 if(COMPILER_RT_DEBUG)
-  list(APPEND SCUDO_CFLAGS -O0 -DSCUDO_DEBUG=1)
+  list(APPEND SCUDO_CFLAGS -O0 -DSCUDO_DEBUG=1 -DSCUDO_ENABLE_HOOKS=1)
 else()
   list(APPEND SCUDO_CFLAGS -O3)
 endif()
@@ -56,11 +56,15 @@ if(ANDROID)
 endif()
 
 set(SCUDO_HEADERS
+  allocator_common.h
   allocator_config.h
   atomic_helpers.h
   bytemap.h
   checksum.h
   chunk.h
+  condition_variable.h
+  condition_variable_base.h
+  condition_variable_linux.h
   combined.h
   common.h
   flags_parser.h
@@ -74,6 +78,7 @@ set(SCUDO_HEADERS
   mem_map.h
   mem_map_base.h
   mem_map_fuchsia.h
+  mem_map_linux.h
   mutex.h
   options.h
   platform.h
@@ -82,7 +87,7 @@ set(SCUDO_HEADERS
   quarantine.h
   release.h
   report.h
-  rss_limit_checker.h
+  report_linux.h
   secondary.h
   size_class_map.h
   stack_depot.h
@@ -102,6 +107,7 @@ set(SCUDO_HEADERS
 set(SCUDO_SOURCES
   checksum.cpp
   common.cpp
+  condition_variable_linux.cpp
   crc32_hw.cpp
   flags_parser.cpp
   flags.cpp
@@ -109,9 +115,10 @@ set(SCUDO_SOURCES
   linux.cpp
   mem_map.cpp
   mem_map_fuchsia.cpp
+  mem_map_linux.cpp
   release.cpp
   report.cpp
-  rss_limit_checker.cpp
+  report_linux.cpp
   string_utils.cpp
   timing.cpp
   )
diff --git a/Telegram/ThirdParty/scudo/allocator_common.h b/Telegram/ThirdParty/scudo/allocator_common.h
new file mode 100644
index 000000000..95f4776ac
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/allocator_common.h
@@ -0,0 +1,85 @@
+//===-- allocator_common.h --------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SCUDO_ALLOCATOR_COMMON_H_
+#define SCUDO_ALLOCATOR_COMMON_H_
+
+#include "common.h"
+#include "list.h"
+
+namespace scudo {
+
+template <class SizeClassAllocator> struct TransferBatch {
+  typedef typename SizeClassAllocator::SizeClassMap SizeClassMap;
+  typedef typename SizeClassAllocator::CompactPtrT CompactPtrT;
+
+  static const u16 MaxNumCached = SizeClassMap::MaxNumCachedHint;
+  void setFromArray(CompactPtrT *Array, u16 N) {
+    DCHECK_LE(N, MaxNumCached);
+    Count = N;
+    memcpy(Batch, Array, sizeof(Batch[0]) * Count);
+  }
+  void appendFromArray(CompactPtrT *Array, u16 N) {
+    DCHECK_LE(N, MaxNumCached - Count);
+    memcpy(Batch + Count, Array, sizeof(Batch[0]) * N);
+    // u16 will be promoted to int by arithmetic type conversion.
+    Count = static_cast<u16>(Count + N);
+  }
+  void appendFromTransferBatch(TransferBatch *B, u16 N) {
+    DCHECK_LE(N, MaxNumCached - Count);
+    DCHECK_GE(B->Count, N);
+    // Append from the back of `B`.
+    memcpy(Batch + Count, B->Batch + (B->Count - N), sizeof(Batch[0]) * N);
+    // u16 will be promoted to int by arithmetic type conversion.
+    Count = static_cast<u16>(Count + N);
+    B->Count = static_cast<u16>(B->Count - N);
+  }
+  void clear() { Count = 0; }
+  void add(CompactPtrT P) {
+    DCHECK_LT(Count, MaxNumCached);
+    Batch[Count++] = P;
+  }
+  void moveToArray(CompactPtrT *Array) {
+    memcpy(Array, Batch, sizeof(Batch[0]) * Count);
+    clear();
+  }
+  u16 getCount() const { return Count; }
+  bool isEmpty() const { return Count == 0U; }
+  CompactPtrT get(u16 I) const {
+    DCHECK_LE(I, Count);
+    return Batch[I];
+  }
+  TransferBatch *Next;
+
+private:
+  CompactPtrT Batch[MaxNumCached];
+  u16 Count;
+};
+
+// A BatchGroup is used to collect blocks. Each group has a group id to
+// identify the group kind of contained blocks.
+template <class SizeClassAllocator> struct BatchGroup {
+  // `Next` is used by IntrusiveList.
+  BatchGroup *Next;
+  // The compact base address of each group
+  uptr CompactPtrGroupBase;
+  // Cache value of SizeClassAllocatorLocalCache::getMaxCached()
+  u16 MaxCachedPerBatch;
+  // Number of blocks pushed into this group. This is an increment-only
+  // counter.
+  uptr PushedBlocks;
+  // This is used to track how many bytes are not in-use since last time we
+  // tried to release pages.
+  uptr BytesInBGAtLastCheckpoint;
+  // Blocks are managed by TransferBatch in a list.
+  SinglyLinkedList<TransferBatch<SizeClassAllocator>> Batches;
+};
+
+} // namespace scudo
+
+#endif // SCUDO_ALLOCATOR_COMMON_H_
diff --git a/Telegram/ThirdParty/scudo/allocator_config.h b/Telegram/ThirdParty/scudo/allocator_config.h
index 315a04f76..3c6aa3acb 100644
--- a/Telegram/ThirdParty/scudo/allocator_config.h
+++ b/Telegram/ThirdParty/scudo/allocator_config.h
@@ -11,6 +11,7 @@
 
 #include "combined.h"
 #include "common.h"
+#include "condition_variable.h"
 #include "flags.h"
 #include "primary32.h"
 #include "primary64.h"
@@ -82,6 +83,14 @@ namespace scudo {
 //     // Defines the minimal & maximal release interval that can be set.
 //     static const s32 MinReleaseToOsIntervalMs = INT32_MIN;
 //     static const s32 MaxReleaseToOsIntervalMs = INT32_MAX;
+//
+//     // Use condition variable to shorten the waiting time of refillment of
+//     // freelist. Note that this depends on the implementation of condition
+//     // variable on each platform and the performance may vary so that it
+//     // doesn't guarantee a performance benefit.
+//     // Note that both variables have to be defined to enable it.
+//     static const bool UseConditionVariable = true;
+//     using ConditionVariableT = ConditionVariableLinux;
 //   };
 //   // Defines the type of Primary allocator to use.
 //   template <typename Config> using PrimaryT = SizeClassAllocator64<Config>;
@@ -195,50 +204,6 @@ struct AndroidConfig {
   template <typename Config> using SecondaryT = MapAllocator<Config>;
 };
 
-struct AndroidSvelteConfig {
-  static const bool MaySupportMemoryTagging = false;
-  template <class A>
-  using TSDRegistryT = TSDRegistrySharedT<A, 2U, 1U>; // Shared, max 2 TSDs.
-
-  struct Primary {
-    using SizeClassMap = SvelteSizeClassMap;
-#if SCUDO_CAN_USE_PRIMARY64
-    static const uptr RegionSizeLog = 27U;
-    typedef u32 CompactPtrT;
-    static const uptr CompactPtrScale = SCUDO_MIN_ALIGNMENT_LOG;
-    static const uptr GroupSizeLog = 18U;
-    static const bool EnableRandomOffset = true;
-    static const uptr MapSizeIncrement = 1UL << 18;
-#else
-    static const uptr RegionSizeLog = 16U;
-    static const uptr GroupSizeLog = 16U;
-    typedef uptr CompactPtrT;
-#endif
-    static const s32 MinReleaseToOsIntervalMs = 1000;
-    static const s32 MaxReleaseToOsIntervalMs = 1000;
-  };
-
-#if SCUDO_CAN_USE_PRIMARY64
-  template <typename Config> using PrimaryT = SizeClassAllocator64<Config>;
-#else
-  template <typename Config> using PrimaryT = SizeClassAllocator32<Config>;
-#endif
-
-  struct Secondary {
-    struct Cache {
-      static const u32 EntriesArraySize = 16U;
-      static const u32 QuarantineSize = 32U;
-      static const u32 DefaultMaxEntriesCount = 4U;
-      static const uptr DefaultMaxEntrySize = 1UL << 18;
-      static const s32 MinReleaseToOsIntervalMs = 0;
-      static const s32 MaxReleaseToOsIntervalMs = 0;
-    };
-    template <typename Config> using CacheT = MapAllocatorCache<Config>;
-  };
-
-  template <typename Config> using SecondaryT = MapAllocator<Config>;
-};
-
 #if SCUDO_CAN_USE_PRIMARY64
 struct FuchsiaConfig {
   static const bool MaySupportMemoryTagging = false;
diff --git a/Telegram/ThirdParty/scudo/atomic_helpers.h b/Telegram/ThirdParty/scudo/atomic_helpers.h
index d88f5d7be..a68ffd162 100644
--- a/Telegram/ThirdParty/scudo/atomic_helpers.h
+++ b/Telegram/ThirdParty/scudo/atomic_helpers.h
@@ -133,10 +133,10 @@ inline void atomic_store_relaxed(volatile T *A, typename T::Type V) {
 }
 
 template <typename T>
-inline typename T::Type atomic_compare_exchange(volatile T *A,
-                                                typename T::Type Cmp,
-                                                typename T::Type Xchg) {
-  atomic_compare_exchange_strong(A, &Cmp, Xchg, memory_order_acquire);
+inline typename T::Type
+atomic_compare_exchange_strong(volatile T *A, typename T::Type Cmp,
+                               typename T::Type Xchg, memory_order MO) {
+  atomic_compare_exchange_strong(A, &Cmp, Xchg, MO);
   return Cmp;
 }
 
diff --git a/Telegram/ThirdParty/scudo/benchmarks/malloc_benchmark.cpp b/Telegram/ThirdParty/scudo/benchmarks/malloc_benchmark.cpp
index 2adec88da..4fb05b761 100644
--- a/Telegram/ThirdParty/scudo/benchmarks/malloc_benchmark.cpp
+++ b/Telegram/ThirdParty/scudo/benchmarks/malloc_benchmark.cpp
@@ -52,8 +52,6 @@ static const size_t MaxSize = 128 * 1024;
 // cleanly.
 BENCHMARK_TEMPLATE(BM_malloc_free, scudo::AndroidConfig)
     ->Range(MinSize, MaxSize);
-BENCHMARK_TEMPLATE(BM_malloc_free, scudo::AndroidSvelteConfig)
-    ->Range(MinSize, MaxSize);
 #if SCUDO_CAN_USE_PRIMARY64
 BENCHMARK_TEMPLATE(BM_malloc_free, scudo::FuchsiaConfig)
     ->Range(MinSize, MaxSize);
@@ -99,8 +97,6 @@ static const size_t MaxIters = 32 * 1024;
 // cleanly.
 BENCHMARK_TEMPLATE(BM_malloc_free_loop, scudo::AndroidConfig)
     ->Range(MinIters, MaxIters);
-BENCHMARK_TEMPLATE(BM_malloc_free_loop, scudo::AndroidSvelteConfig)
-    ->Range(MinIters, MaxIters);
 #if SCUDO_CAN_USE_PRIMARY64
 BENCHMARK_TEMPLATE(BM_malloc_free_loop, scudo::FuchsiaConfig)
     ->Range(MinIters, MaxIters);
diff --git a/Telegram/ThirdParty/scudo/chunk.h b/Telegram/ThirdParty/scudo/chunk.h
index 32874a8df..9228df047 100644
--- a/Telegram/ThirdParty/scudo/chunk.h
+++ b/Telegram/ThirdParty/scudo/chunk.h
@@ -128,19 +128,6 @@ inline void loadHeader(u32 Cookie, const void *Ptr,
     reportHeaderCorruption(const_cast<void *>(Ptr));
 }
 
-inline void compareExchangeHeader(u32 Cookie, void *Ptr,
-                                  UnpackedHeader *NewUnpackedHeader,
-                                  UnpackedHeader *OldUnpackedHeader) {
-  NewUnpackedHeader->Checksum =
-      computeHeaderChecksum(Cookie, Ptr, NewUnpackedHeader);
-  PackedHeader NewPackedHeader = bit_cast<PackedHeader>(*NewUnpackedHeader);
-  PackedHeader OldPackedHeader = bit_cast<PackedHeader>(*OldUnpackedHeader);
-  if (UNLIKELY(!atomic_compare_exchange_strong(
-          getAtomicHeader(Ptr), &OldPackedHeader, NewPackedHeader,
-          memory_order_relaxed)))
-    reportHeaderRace(Ptr);
-}
-
 inline bool isValid(u32 Cookie, const void *Ptr,
                     UnpackedHeader *NewUnpackedHeader) {
   PackedHeader NewPackedHeader = atomic_load_relaxed(getConstAtomicHeader(Ptr));
diff --git a/Telegram/ThirdParty/scudo/combined.h b/Telegram/ThirdParty/scudo/combined.h
index b17acc71f..4624f83d1 100644
--- a/Telegram/ThirdParty/scudo/combined.h
+++ b/Telegram/ThirdParty/scudo/combined.h
@@ -14,11 +14,11 @@
 #include "flags.h"
 #include "flags_parser.h"
 #include "local_cache.h"
+#include "mem_map.h"
 #include "memtag.h"
 #include "options.h"
 #include "quarantine.h"
 #include "report.h"
-#include "rss_limit_checker.h"
 #include "secondary.h"
 #include "stack_depot.h"
 #include "string_utils.h"
@@ -68,14 +68,13 @@ public:
       if (UNLIKELY(Header.State != Chunk::State::Quarantined))
         reportInvalidChunkState(AllocatorAction::Recycling, Ptr);
 
-      Chunk::UnpackedHeader NewHeader = Header;
-      NewHeader.State = Chunk::State::Available;
-      Chunk::compareExchangeHeader(Allocator.Cookie, Ptr, &NewHeader, &Header);
+      Header.State = Chunk::State::Available;
+      Chunk::storeHeader(Allocator.Cookie, Ptr, &Header);
 
       if (allocatorSupportsMemoryTagging<Config>())
         Ptr = untagPointer(Ptr);
-      void *BlockBegin = Allocator::getBlockBegin(Ptr, &NewHeader);
-      Cache.deallocate(NewHeader.ClassId, BlockBegin);
+      void *BlockBegin = Allocator::getBlockBegin(Ptr, &Header);
+      Cache.deallocate(Header.ClassId, BlockBegin);
     }
 
     // We take a shortcut when allocating a quarantine batch by working with the
@@ -118,9 +117,8 @@ public:
       DCHECK_EQ(Header.Offset, 0);
       DCHECK_EQ(Header.SizeOrUnusedBytes, sizeof(QuarantineBatch));
 
-      Chunk::UnpackedHeader NewHeader = Header;
-      NewHeader.State = Chunk::State::Available;
-      Chunk::compareExchangeHeader(Allocator.Cookie, Ptr, &NewHeader, &Header);
+      Header.State = Chunk::State::Available;
+      Chunk::storeHeader(Allocator.Cookie, Ptr, &Header);
       Cache.deallocate(QuarantineClassId,
                        reinterpret_cast<void *>(reinterpret_cast<uptr>(Ptr) -
                                                 Chunk::getHeaderSize()));
@@ -149,9 +147,6 @@ public:
     initFlags();
     reportUnrecognizedFlags();
 
-    RssChecker.init(scudo::getFlags()->soft_rss_limit_mb,
-                    scudo::getFlags()->hard_rss_limit_mb);
-
     // Store some flags locally.
     if (getFlags()->may_return_null)
       Primary.Options.set(OptionBit::MayReturnNull);
@@ -251,12 +246,14 @@ public:
   // - unlinking the local stats from the global ones (destroying the cache does
   //   the last two items).
   void commitBack(TSD<ThisT> *TSD) {
+    TSD->assertLocked(/*BypassCheck=*/true);
     Quarantine.drain(&TSD->getQuarantineCache(),
                      QuarantineCallback(*this, TSD->getCache()));
     TSD->getCache().destroy(&Stats);
   }
 
   void drainCache(TSD<ThisT> *TSD) {
+    TSD->assertLocked(/*BypassCheck=*/true);
     Quarantine.drainAndRecycle(&TSD->getQuarantineCache(),
                                QuarantineCallback(*this, TSD->getCache()));
     TSD->getCache().drain();
@@ -299,7 +296,7 @@ public:
 #endif
   }
 
-  uptr computeOddEvenMaskForPointerMaybe(Options Options, uptr Ptr,
+  uptr computeOddEvenMaskForPointerMaybe(const Options &Options, uptr Ptr,
                                          uptr ClassId) {
     if (!Options.get(OptionBit::UseOddEvenTags))
       return 0;
@@ -329,8 +326,6 @@ public:
 #ifdef GWP_ASAN_HOOKS
     if (UNLIKELY(GuardedAlloc.shouldSample())) {
       if (void *Ptr = GuardedAlloc.allocate(Size, Alignment)) {
-        if (UNLIKELY(&__scudo_allocate_hook))
-          __scudo_allocate_hook(Ptr, Size);
         Stats.lock();
         Stats.add(StatAllocated, GuardedAllocSlotSize);
         Stats.sub(StatFree, GuardedAllocSlotSize);
@@ -363,19 +358,6 @@ public:
     }
     DCHECK_LE(Size, NeededSize);
 
-    switch (RssChecker.getRssLimitExceeded()) {
-    case RssLimitChecker::Neither:
-      break;
-    case RssLimitChecker::Soft:
-      if (Options.get(OptionBit::MayReturnNull))
-        return nullptr;
-      reportSoftRSSLimit(RssChecker.getSoftRssLimit());
-      break;
-    case RssLimitChecker::Hard:
-      reportHardRSSLimit(RssChecker.getHardRssLimit());
-      break;
-    }
-
     void *Block = nullptr;
     uptr ClassId = 0;
     uptr SecondaryBlockEnd = 0;
@@ -384,11 +366,11 @@ public:
       DCHECK_NE(ClassId, 0U);
       bool UnlockRequired;
       auto *TSD = TSDRegistry.getTSDAndLock(&UnlockRequired);
+      TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
       Block = TSD->getCache().allocate(ClassId);
-      // If the allocation failed, the most likely reason with a 32-bit primary
-      // is the region being full. In that event, retry in each successively
-      // larger class until it fits. If it fails to fit in the largest class,
-      // fallback to the Secondary.
+      // If the allocation failed, retry in each successively larger class until
+      // it fits. If it fails to fit in the largest class, fallback to the
+      // Secondary.
       if (UNLIKELY(!Block)) {
         while (ClassId < SizeClassMap::LargestClassId && !Block)
           Block = TSD->getCache().allocate(++ClassId);
@@ -406,6 +388,7 @@ public:
     if (UNLIKELY(!Block)) {
       if (Options.get(OptionBit::MayReturnNull))
         return nullptr;
+      printStats();
       reportOutOfMemory(NeededSize);
     }
 
@@ -535,14 +518,14 @@ public:
         Chunk::SizeOrUnusedBytesMask;
     Chunk::storeHeader(Cookie, Ptr, &Header);
 
-    if (UNLIKELY(&__scudo_allocate_hook))
-      __scudo_allocate_hook(TaggedPtr, Size);
-
     return TaggedPtr;
   }
 
   NOINLINE void deallocate(void *Ptr, Chunk::Origin Origin, uptr DeleteSize = 0,
                            UNUSED uptr Alignment = MinAlignment) {
+    if (UNLIKELY(!Ptr))
+      return;
+
     // For a deallocation, we only ensure minimal initialization, meaning thread
     // local data will be left uninitialized for now (when using ELF TLS). The
     // fallback cache will be used instead. This is a workaround for a situation
@@ -551,12 +534,6 @@ public:
     // being destroyed properly. Any other heap operation will do a full init.
     initThreadMaybe(/*MinimalInit=*/true);
 
-    if (UNLIKELY(&__scudo_deallocate_hook))
-      __scudo_deallocate_hook(Ptr);
-
-    if (UNLIKELY(!Ptr))
-      return;
-
 #ifdef GWP_ASAN_HOOKS
     if (UNLIKELY(GuardedAlloc.pointerIsMine(Ptr))) {
       GuardedAlloc.deallocate(Ptr);
@@ -635,47 +612,46 @@ public:
     if (UNLIKELY(!isAligned(reinterpret_cast<uptr>(OldPtr), MinAlignment)))
       reportMisalignedPointer(AllocatorAction::Reallocating, OldPtr);
 
-    Chunk::UnpackedHeader OldHeader;
-    Chunk::loadHeader(Cookie, OldPtr, &OldHeader);
+    Chunk::UnpackedHeader Header;
+    Chunk::loadHeader(Cookie, OldPtr, &Header);
 
-    if (UNLIKELY(OldHeader.State != Chunk::State::Allocated))
+    if (UNLIKELY(Header.State != Chunk::State::Allocated))
       reportInvalidChunkState(AllocatorAction::Reallocating, OldPtr);
 
     // Pointer has to be allocated with a malloc-type function. Some
     // applications think that it is OK to realloc a memalign'ed pointer, which
     // will trigger this check. It really isn't.
     if (Options.get(OptionBit::DeallocTypeMismatch)) {
-      if (UNLIKELY(OldHeader.OriginOrWasZeroed != Chunk::Origin::Malloc))
+      if (UNLIKELY(Header.OriginOrWasZeroed != Chunk::Origin::Malloc))
         reportDeallocTypeMismatch(AllocatorAction::Reallocating, OldPtr,
-                                  OldHeader.OriginOrWasZeroed,
+                                  Header.OriginOrWasZeroed,
                                   Chunk::Origin::Malloc);
     }
 
-    void *BlockBegin = getBlockBegin(OldTaggedPtr, &OldHeader);
+    void *BlockBegin = getBlockBegin(OldTaggedPtr, &Header);
     uptr BlockEnd;
     uptr OldSize;
-    const uptr ClassId = OldHeader.ClassId;
+    const uptr ClassId = Header.ClassId;
     if (LIKELY(ClassId)) {
       BlockEnd = reinterpret_cast<uptr>(BlockBegin) +
                  SizeClassMap::getSizeByClassId(ClassId);
-      OldSize = OldHeader.SizeOrUnusedBytes;
+      OldSize = Header.SizeOrUnusedBytes;
     } else {
       BlockEnd = SecondaryT::getBlockEnd(BlockBegin);
       OldSize = BlockEnd - (reinterpret_cast<uptr>(OldTaggedPtr) +
-                            OldHeader.SizeOrUnusedBytes);
+                            Header.SizeOrUnusedBytes);
     }
     // If the new chunk still fits in the previously allocated block (with a
     // reasonable delta), we just keep the old block, and update the chunk
     // header to reflect the size change.
     if (reinterpret_cast<uptr>(OldTaggedPtr) + NewSize <= BlockEnd) {
       if (NewSize > OldSize || (OldSize - NewSize) < getPageSizeCached()) {
-        Chunk::UnpackedHeader NewHeader = OldHeader;
-        NewHeader.SizeOrUnusedBytes =
+        Header.SizeOrUnusedBytes =
             (ClassId ? NewSize
                      : BlockEnd -
                            (reinterpret_cast<uptr>(OldTaggedPtr) + NewSize)) &
             Chunk::SizeOrUnusedBytesMask;
-        Chunk::compareExchangeHeader(Cookie, OldPtr, &NewHeader, &OldHeader);
+        Chunk::storeHeader(Cookie, OldPtr, &Header);
         if (UNLIKELY(useMemoryTagging<Config>(Options))) {
           if (ClassId) {
             resizeTaggedChunk(reinterpret_cast<uptr>(OldTaggedPtr) + OldSize,
@@ -697,9 +673,7 @@ public:
     void *NewPtr = allocate(NewSize, Chunk::Origin::Malloc, Alignment);
     if (LIKELY(NewPtr)) {
       memcpy(NewPtr, OldTaggedPtr, Min(NewSize, OldSize));
-      if (UNLIKELY(&__scudo_deallocate_hook))
-        __scudo_deallocate_hook(OldTaggedPtr);
-      quarantineOrDeallocateChunk(Options, OldTaggedPtr, &OldHeader, OldSize);
+      quarantineOrDeallocateChunk(Options, OldTaggedPtr, &Header, OldSize);
     }
     return NewPtr;
   }
@@ -754,6 +728,13 @@ public:
     Str.output();
   }
 
+  void printFragmentationInfo() {
+    ScopedString Str;
+    Primary.getFragmentationInfo(&Str);
+    // Secondary allocator dumps the fragmentation data in getStats().
+    Str.output();
+  }
+
   void releaseToOS(ReleaseToOS ReleaseType) {
     initThreadMaybe();
     if (ReleaseType == ReleaseToOS::ForceAll)
@@ -847,10 +828,15 @@ public:
   // for it, which then forces realloc to copy the usable size of a chunk as
   // opposed to its actual size.
   uptr getUsableSize(const void *Ptr) {
-    initThreadMaybe();
     if (UNLIKELY(!Ptr))
       return 0;
 
+    return getAllocSize(Ptr);
+  }
+
+  uptr getAllocSize(const void *Ptr) {
+    initThreadMaybe();
+
 #ifdef GWP_ASAN_HOOKS
     if (UNLIKELY(GuardedAlloc.pointerIsMine(Ptr)))
       return GuardedAlloc.getSize(Ptr);
@@ -859,9 +845,11 @@ public:
     Ptr = getHeaderTaggedPointer(const_cast<void *>(Ptr));
     Chunk::UnpackedHeader Header;
     Chunk::loadHeader(Cookie, Ptr, &Header);
-    // Getting the usable size of a chunk only makes sense if it's allocated.
+
+    // Getting the alloc size of a chunk only makes sense if it's allocated.
     if (UNLIKELY(Header.State != Chunk::State::Allocated))
       reportInvalidChunkState(AllocatorAction::Sizing, const_cast<void *>(Ptr));
+
     return getSize(Ptr, &Header);
   }
 
@@ -887,13 +875,6 @@ public:
            Header.State == Chunk::State::Allocated;
   }
 
-  void setRssLimitsTestOnly(int SoftRssLimitMb, int HardRssLimitMb,
-                            bool MayReturnNull) {
-    RssChecker.init(SoftRssLimitMb, HardRssLimitMb);
-    if (MayReturnNull)
-      Primary.Options.set(OptionBit::MayReturnNull);
-  }
-
   bool useMemoryTaggingTestOnly() const {
     return useMemoryTagging<Config>(Primary.Options.load());
   }
@@ -913,7 +894,7 @@ public:
 
   void setTrackAllocationStacks(bool Track) {
     initThreadMaybe();
-    if (getFlags()->allocation_ring_buffer_size == 0) {
+    if (getFlags()->allocation_ring_buffer_size <= 0) {
       DCHECK(!Primary.Options.load().get(OptionBit::TrackAllocationStacks));
       return;
     }
@@ -955,21 +936,7 @@ public:
 
   uptr getRingBufferSize() {
     initThreadMaybe();
-    auto *RingBuffer = getRingBuffer();
-    return RingBuffer ? ringBufferSizeInBytes(RingBuffer->Size) : 0;
-  }
-
-  static bool setRingBufferSizeForBuffer(char *Buffer, size_t Size) {
-    // Need at least one entry.
-    if (Size < sizeof(AllocationRingBuffer) +
-                   sizeof(typename AllocationRingBuffer::Entry)) {
-      return false;
-    }
-    AllocationRingBuffer *RingBuffer =
-        reinterpret_cast<AllocationRingBuffer *>(Buffer);
-    RingBuffer->Size = (Size - sizeof(AllocationRingBuffer)) /
-                       sizeof(typename AllocationRingBuffer::Entry);
-    return true;
+    return RingBufferElements ? ringBufferSizeInBytes(RingBufferElements) : 0;
   }
 
   static const uptr MaxTraceSize = 64;
@@ -986,8 +953,9 @@ public:
   static void getErrorInfo(struct scudo_error_info *ErrorInfo,
                            uintptr_t FaultAddr, const char *DepotPtr,
                            const char *RegionInfoPtr, const char *RingBufferPtr,
-                           const char *Memory, const char *MemoryTags,
-                           uintptr_t MemoryAddr, size_t MemorySize) {
+                           size_t RingBufferSize, const char *Memory,
+                           const char *MemoryTags, uintptr_t MemoryAddr,
+                           size_t MemorySize) {
     *ErrorInfo = {};
     if (!allocatorSupportsMemoryTagging<Config>() ||
         MemoryAddr + MemorySize < MemoryAddr)
@@ -1006,7 +974,7 @@ public:
     // Check the ring buffer. For primary allocations this will only find UAF;
     // for secondary allocations we can find either UAF or OOB.
     getRingBufferErrorInfo(ErrorInfo, NextErrorReport, FaultAddr, Depot,
-                           RingBufferPtr);
+                           RingBufferPtr, RingBufferSize);
 
     // Check for OOB in the 28 blocks surrounding the 3 we checked earlier.
     // Beyond that we are likely to hit false positives.
@@ -1053,7 +1021,6 @@ private:
   QuarantineT Quarantine;
   TSDRegistryT TSDRegistry;
   pthread_once_t PostInitNonce = PTHREAD_ONCE_INIT;
-  RssLimitChecker RssChecker;
 
 #ifdef GWP_ASAN_HOOKS
   gwp_asan::GuardedPoolAllocator GuardedAlloc;
@@ -1073,13 +1040,14 @@ private:
     };
 
     atomic_uptr Pos;
-    u32 Size;
     // An array of Size (at least one) elements of type Entry is immediately
     // following to this struct.
   };
   // Pointer to memory mapped area starting with AllocationRingBuffer struct,
   // and immediately followed by Size elements of type Entry.
   char *RawRingBuffer = {};
+  u32 RingBufferElements = 0;
+  MemMapT RawRingBufferMap;
 
   // The following might get optimized out by the compiler.
   NOINLINE void performSanityChecks() {
@@ -1134,35 +1102,34 @@ private:
            reinterpret_cast<uptr>(Ptr) - SizeOrUnusedBytes;
   }
 
-  void quarantineOrDeallocateChunk(Options Options, void *TaggedPtr,
+  void quarantineOrDeallocateChunk(const Options &Options, void *TaggedPtr,
                                    Chunk::UnpackedHeader *Header,
                                    uptr Size) NO_THREAD_SAFETY_ANALYSIS {
     void *Ptr = getHeaderTaggedPointer(TaggedPtr);
-    Chunk::UnpackedHeader NewHeader = *Header;
     // If the quarantine is disabled, the actual size of a chunk is 0 or larger
     // than the maximum allowed, we return a chunk directly to the backend.
     // This purposefully underflows for Size == 0.
     const bool BypassQuarantine = !Quarantine.getCacheSize() ||
                                   ((Size - 1) >= QuarantineMaxChunkSize) ||
-                                  !NewHeader.ClassId;
+                                  !Header->ClassId;
     if (BypassQuarantine)
-      NewHeader.State = Chunk::State::Available;
+      Header->State = Chunk::State::Available;
     else
-      NewHeader.State = Chunk::State::Quarantined;
-    NewHeader.OriginOrWasZeroed = useMemoryTagging<Config>(Options) &&
-                                  NewHeader.ClassId &&
-                                  !TSDRegistry.getDisableMemInit();
-    Chunk::compareExchangeHeader(Cookie, Ptr, &NewHeader, Header);
+      Header->State = Chunk::State::Quarantined;
+    Header->OriginOrWasZeroed = useMemoryTagging<Config>(Options) &&
+                                Header->ClassId &&
+                                !TSDRegistry.getDisableMemInit();
+    Chunk::storeHeader(Cookie, Ptr, Header);
 
     if (UNLIKELY(useMemoryTagging<Config>(Options))) {
       u8 PrevTag = extractTag(reinterpret_cast<uptr>(TaggedPtr));
       storeDeallocationStackMaybe(Options, Ptr, PrevTag, Size);
-      if (NewHeader.ClassId) {
+      if (Header->ClassId) {
         if (!TSDRegistry.getDisableMemInit()) {
           uptr TaggedBegin, TaggedEnd;
           const uptr OddEvenMask = computeOddEvenMaskForPointerMaybe(
-              Options, reinterpret_cast<uptr>(getBlockBegin(Ptr, &NewHeader)),
-              NewHeader.ClassId);
+              Options, reinterpret_cast<uptr>(getBlockBegin(Ptr, Header)),
+              Header->ClassId);
           // Exclude the previous tag so that immediate use after free is
           // detected 100% of the time.
           setRandomTag(Ptr, Size, OddEvenMask | (1UL << PrevTag), &TaggedBegin,
@@ -1173,11 +1140,12 @@ private:
     if (BypassQuarantine) {
       if (allocatorSupportsMemoryTagging<Config>())
         Ptr = untagPointer(Ptr);
-      void *BlockBegin = getBlockBegin(Ptr, &NewHeader);
-      const uptr ClassId = NewHeader.ClassId;
+      void *BlockBegin = getBlockBegin(Ptr, Header);
+      const uptr ClassId = Header->ClassId;
       if (LIKELY(ClassId)) {
         bool UnlockRequired;
         auto *TSD = TSDRegistry.getTSDAndLock(&UnlockRequired);
+        TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
         const bool CacheDrained =
             TSD->getCache().deallocate(ClassId, BlockBegin);
         if (UnlockRequired)
@@ -1197,6 +1165,7 @@ private:
     } else {
       bool UnlockRequired;
       auto *TSD = TSDRegistry.getTSDAndLock(&UnlockRequired);
+      TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
       Quarantine.put(&TSD->getQuarantineCache(),
                      QuarantineCallback(*this, TSD->getCache()), Ptr, Size);
       if (UnlockRequired)
@@ -1273,7 +1242,7 @@ private:
     storeEndMarker(RoundNewPtr, NewSize, BlockEnd);
   }
 
-  void storePrimaryAllocationStackMaybe(Options Options, void *Ptr) {
+  void storePrimaryAllocationStackMaybe(const Options &Options, void *Ptr) {
     if (!UNLIKELY(Options.get(OptionBit::TrackAllocationStacks)))
       return;
     auto *Ptr32 = reinterpret_cast<u32 *>(Ptr);
@@ -1286,7 +1255,7 @@ private:
                             u32 DeallocationTid) {
     uptr Pos = atomic_fetch_add(&getRingBuffer()->Pos, 1, memory_order_relaxed);
     typename AllocationRingBuffer::Entry *Entry =
-        getRingBufferEntry(RawRingBuffer, Pos % getRingBuffer()->Size);
+        getRingBufferEntry(RawRingBuffer, Pos % RingBufferElements);
 
     // First invalidate our entry so that we don't attempt to interpret a
     // partially written state in getSecondaryErrorInfo(). The fences below
@@ -1305,7 +1274,7 @@ private:
     atomic_store_relaxed(&Entry->Ptr, reinterpret_cast<uptr>(Ptr));
   }
 
-  void storeSecondaryAllocationStackMaybe(Options Options, void *Ptr,
+  void storeSecondaryAllocationStackMaybe(const Options &Options, void *Ptr,
                                           uptr Size) {
     if (!UNLIKELY(Options.get(OptionBit::TrackAllocationStacks)))
       return;
@@ -1320,8 +1289,8 @@ private:
     storeRingBufferEntry(untagPointer(Ptr), Trace, Tid, Size, 0, 0);
   }
 
-  void storeDeallocationStackMaybe(Options Options, void *Ptr, u8 PrevTag,
-                                   uptr Size) {
+  void storeDeallocationStackMaybe(const Options &Options, void *Ptr,
+                                   u8 PrevTag, uptr Size) {
     if (!UNLIKELY(Options.get(OptionBit::TrackAllocationStacks)))
       return;
 
@@ -1427,17 +1396,19 @@ private:
                                      size_t &NextErrorReport,
                                      uintptr_t FaultAddr,
                                      const StackDepot *Depot,
-                                     const char *RingBufferPtr) {
+                                     const char *RingBufferPtr,
+                                     size_t RingBufferSize) {
     auto *RingBuffer =
         reinterpret_cast<const AllocationRingBuffer *>(RingBufferPtr);
-    if (!RingBuffer || RingBuffer->Size == 0)
+    size_t RingBufferElements = ringBufferElementsFromBytes(RingBufferSize);
+    if (!RingBuffer || RingBufferElements == 0)
       return;
     uptr Pos = atomic_load_relaxed(&RingBuffer->Pos);
 
-    for (uptr I = Pos - 1;
-         I != Pos - 1 - RingBuffer->Size && NextErrorReport != NumErrorReports;
+    for (uptr I = Pos - 1; I != Pos - 1 - RingBufferElements &&
+                           NextErrorReport != NumErrorReports;
          --I) {
-      auto *Entry = getRingBufferEntry(RingBufferPtr, I % RingBuffer->Size);
+      auto *Entry = getRingBufferEntry(RingBufferPtr, I % RingBufferElements);
       uptr EntryPtr = atomic_load_relaxed(&Entry->Ptr);
       if (!EntryPtr)
         continue;
@@ -1516,17 +1487,19 @@ private:
   }
 
   void mapAndInitializeRingBuffer() {
+    if (getFlags()->allocation_ring_buffer_size <= 0)
+      return;
     u32 AllocationRingBufferSize =
         static_cast<u32>(getFlags()->allocation_ring_buffer_size);
-    if (AllocationRingBufferSize < 1)
-      return;
-    RawRingBuffer = static_cast<char *>(
-        map(/*Addr=*/nullptr,
-            roundUp(ringBufferSizeInBytes(AllocationRingBufferSize),
-                    getPageSizeCached()),
-            "AllocatorRingBuffer"));
-    auto *RingBuffer = reinterpret_cast<AllocationRingBuffer *>(RawRingBuffer);
-    RingBuffer->Size = AllocationRingBufferSize;
+    MemMapT MemMap;
+    MemMap.map(
+        /*Addr=*/0U,
+        roundUp(ringBufferSizeInBytes(AllocationRingBufferSize),
+                getPageSizeCached()),
+        "scudo:ring_buffer");
+    RawRingBuffer = reinterpret_cast<char *>(MemMap.getBase());
+    RawRingBufferMap = MemMap;
+    RingBufferElements = AllocationRingBufferSize;
     static_assert(sizeof(AllocationRingBuffer) %
                           alignof(typename AllocationRingBuffer::Entry) ==
                       0,
@@ -1534,14 +1507,25 @@ private:
   }
 
   void unmapRingBuffer() {
-    unmap(RawRingBuffer, roundUp(getRingBufferSize(), getPageSizeCached()));
+    auto *RingBuffer = getRingBuffer();
+    if (RingBuffer != nullptr) {
+      RawRingBufferMap.unmap(RawRingBufferMap.getBase(),
+                             RawRingBufferMap.getCapacity());
+    }
     RawRingBuffer = nullptr;
   }
 
-  static constexpr size_t ringBufferSizeInBytes(u32 AllocationRingBufferSize) {
+  static constexpr size_t ringBufferSizeInBytes(u32 RingBufferElements) {
     return sizeof(AllocationRingBuffer) +
-           AllocationRingBufferSize *
-               sizeof(typename AllocationRingBuffer::Entry);
+           RingBufferElements * sizeof(typename AllocationRingBuffer::Entry);
+  }
+
+  static constexpr size_t ringBufferElementsFromBytes(size_t Bytes) {
+    if (Bytes < sizeof(AllocationRingBuffer)) {
+      return 0;
+    }
+    return (Bytes - sizeof(AllocationRingBuffer)) /
+           sizeof(typename AllocationRingBuffer::Entry);
   }
 
   inline AllocationRingBuffer *getRingBuffer() {
diff --git a/Telegram/ThirdParty/scudo/common.cpp b/Telegram/ThirdParty/scudo/common.cpp
index 9f14faeef..06e930638 100644
--- a/Telegram/ThirdParty/scudo/common.cpp
+++ b/Telegram/ThirdParty/scudo/common.cpp
@@ -21,22 +21,4 @@ uptr getPageSizeSlow() {
   return PageSizeCached;
 }
 
-// Fatal internal map() or unmap() error (potentially OOM related).
-void NORETURN dieOnMapUnmapError(uptr SizeIfOOM) {
-  char Error[128] = "Scudo ERROR: internal map or unmap failure\n";
-  if (SizeIfOOM) {
-    formatString(
-        Error, sizeof(Error),
-        "Scudo ERROR: internal map failure (NO MEMORY) requesting %zuKB\n",
-        SizeIfOOM >> 10);
-  }
-  outputRaw(Error);
-  setAbortMessage(Error);
-  die();
-}
-
-#if !SCUDO_LINUX
-uptr GetRSS() { return 0; }
-#endif
-
 } // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/common.h b/Telegram/ThirdParty/scudo/common.h
index 82e6cf4ae..ae45683f1 100644
--- a/Telegram/ThirdParty/scudo/common.h
+++ b/Telegram/ThirdParty/scudo/common.h
@@ -17,6 +17,7 @@
 
 #include <stddef.h>
 #include <string.h>
+#include <unistd.h>
 
 namespace scudo {
 
@@ -111,19 +112,19 @@ template <typename T> inline void shuffle(T *A, u32 N, u32 *RandState) {
   *RandState = State;
 }
 
-// Hardware specific inlinable functions.
+inline void computePercentage(uptr Numerator, uptr Denominator, uptr *Integral,
+                              uptr *Fractional) {
+  constexpr uptr Digits = 100;
+  if (Denominator == 0) {
+    *Integral = 100;
+    *Fractional = 0;
+    return;
+  }
 
-inline void yieldProcessor(UNUSED u8 Count) {
-#if defined(__i386__) || defined(__x86_64__)
-  __asm__ __volatile__("" ::: "memory");
-  for (u8 I = 0; I < Count; I++)
-    __asm__ __volatile__("pause");
-#elif defined(__aarch64__) || defined(__arm__)
-  __asm__ __volatile__("" ::: "memory");
-  for (u8 I = 0; I < Count; I++)
-    __asm__ __volatile__("yield");
-#endif
-  __asm__ __volatile__("" ::: "memory");
+  *Integral = Numerator * Digits / Denominator;
+  *Fractional =
+      (((Numerator * Digits) % Denominator) * Digits + Denominator / 2) /
+      Denominator;
 }
 
 // Platform specific functions.
@@ -131,9 +132,10 @@ inline void yieldProcessor(UNUSED u8 Count) {
 extern uptr PageSizeCached;
 uptr getPageSizeSlow();
 inline uptr getPageSizeCached() {
-  // Bionic uses a hardcoded value.
-  if (SCUDO_ANDROID)
-    return 4096U;
+#if SCUDO_ANDROID && defined(PAGE_SIZE)
+  // Most Android builds have a build-time constant page size.
+  return PAGE_SIZE;
+#endif
   if (LIKELY(PageSizeCached))
     return PageSizeCached;
   return getPageSizeSlow();
@@ -144,8 +146,6 @@ u32 getNumberOfCPUs();
 
 const char *getEnv(const char *Name);
 
-uptr GetRSS();
-
 u64 getMonotonicTime();
 // Gets the time faster but with less accuracy. Can call getMonotonicTime
 // if no fast version is available.
@@ -190,10 +190,6 @@ void setMemoryPermission(uptr Addr, uptr Size, uptr Flags,
 void releasePagesToOS(uptr BaseAddress, uptr Offset, uptr Size,
                       MapPlatformData *Data = nullptr);
 
-// Internal map & unmap fatal error. This must not call map(). SizeIfOOM shall
-// hold the requested size on an out-of-memory error, 0 otherwise.
-void NORETURN dieOnMapUnmapError(uptr SizeIfOOM = 0);
-
 // Logging related functions.
 
 void setAbortMessage(const char *Message);
diff --git a/Telegram/ThirdParty/scudo/condition_variable.h b/Telegram/ThirdParty/scudo/condition_variable.h
new file mode 100644
index 000000000..4afebdc9d
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/condition_variable.h
@@ -0,0 +1,60 @@
+//===-- condition_variable.h ------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SCUDO_CONDITION_VARIABLE_H_
+#define SCUDO_CONDITION_VARIABLE_H_
+
+#include "condition_variable_base.h"
+
+#include "common.h"
+#include "platform.h"
+
+#include "condition_variable_linux.h"
+
+namespace scudo {
+
+// A default implementation of default condition variable. It doesn't do a real
+// `wait`, instead it spins a short amount of time only.
+class ConditionVariableDummy
+    : public ConditionVariableBase<ConditionVariableDummy> {
+public:
+  void notifyAllImpl(UNUSED HybridMutex &M) REQUIRES(M) {}
+
+  void waitImpl(UNUSED HybridMutex &M) REQUIRES(M) {
+    M.unlock();
+
+    constexpr u32 SpinTimes = 64;
+    volatile u32 V = 0;
+    for (u32 I = 0; I < SpinTimes; ++I) {
+      u32 Tmp = V + 1;
+      V = Tmp;
+    }
+
+    M.lock();
+  }
+};
+
+template <typename Config, typename = const bool>
+struct ConditionVariableState {
+  static constexpr bool enabled() { return false; }
+  // This is only used for compilation purpose so that we won't end up having
+  // many conditional compilations. If you want to use `ConditionVariableDummy`,
+  // define `ConditionVariableT` in your allocator configuration. See
+  // allocator_config.h for more details.
+  using ConditionVariableT = ConditionVariableDummy;
+};
+
+template <typename Config>
+struct ConditionVariableState<Config, decltype(Config::UseConditionVariable)> {
+  static constexpr bool enabled() { return Config::UseConditionVariable; }
+  using ConditionVariableT = typename Config::ConditionVariableT;
+};
+
+} // namespace scudo
+
+#endif // SCUDO_CONDITION_VARIABLE_H_
diff --git a/Telegram/ThirdParty/scudo/condition_variable_base.h b/Telegram/ThirdParty/scudo/condition_variable_base.h
new file mode 100644
index 000000000..416c327fe
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/condition_variable_base.h
@@ -0,0 +1,56 @@
+//===-- condition_variable_base.h -------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SCUDO_CONDITION_VARIABLE_BASE_H_
+#define SCUDO_CONDITION_VARIABLE_BASE_H_
+
+#include "mutex.h"
+#include "thread_annotations.h"
+
+namespace scudo {
+
+template <typename Derived> class ConditionVariableBase {
+public:
+  constexpr ConditionVariableBase() = default;
+
+  void bindTestOnly(HybridMutex &Mutex) {
+#if SCUDO_DEBUG
+    boundMutex = &Mutex;
+#else
+    (void)Mutex;
+#endif
+  }
+
+  void notifyAll(HybridMutex &M) REQUIRES(M) {
+#if SCUDO_DEBUG
+    CHECK_EQ(&M, boundMutex);
+#endif
+    getDerived()->notifyAllImpl(M);
+  }
+
+  void wait(HybridMutex &M) REQUIRES(M) {
+#if SCUDO_DEBUG
+    CHECK_EQ(&M, boundMutex);
+#endif
+    getDerived()->waitImpl(M);
+  }
+
+protected:
+  Derived *getDerived() { return static_cast<Derived *>(this); }
+
+#if SCUDO_DEBUG
+  // Because thread-safety analysis doesn't support pointer aliasing, we are not
+  // able to mark the proper annotations without false positive. Instead, we
+  // pass the lock and do the same-lock check separately.
+  HybridMutex *boundMutex = nullptr;
+#endif
+};
+
+} // namespace scudo
+
+#endif // SCUDO_CONDITION_VARIABLE_BASE_H_
diff --git a/Telegram/ThirdParty/scudo/condition_variable_linux.cpp b/Telegram/ThirdParty/scudo/condition_variable_linux.cpp
new file mode 100644
index 000000000..e6d9bd177
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/condition_variable_linux.cpp
@@ -0,0 +1,52 @@
+//===-- condition_variable_linux.cpp ----------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "platform.h"
+
+#if SCUDO_LINUX
+
+#include "condition_variable_linux.h"
+
+#include "atomic_helpers.h"
+
+#include <limits.h>
+#include <linux/futex.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+namespace scudo {
+
+void ConditionVariableLinux::notifyAllImpl(UNUSED HybridMutex &M) {
+  const u32 V = atomic_load_relaxed(&Counter);
+  atomic_store_relaxed(&Counter, V + 1);
+
+  // TODO(chiahungduan): Move the waiters from the futex waiting queue
+  // `Counter` to futex waiting queue `M` so that the awoken threads won't be
+  // blocked again due to locked `M` by current thread.
+  if (LastNotifyAll != V) {
+    syscall(SYS_futex, reinterpret_cast<uptr>(&Counter), FUTEX_WAKE_PRIVATE,
+            INT_MAX, nullptr, nullptr, 0);
+  }
+
+  LastNotifyAll = V + 1;
+}
+
+void ConditionVariableLinux::waitImpl(HybridMutex &M) {
+  const u32 V = atomic_load_relaxed(&Counter) + 1;
+  atomic_store_relaxed(&Counter, V);
+
+  // TODO: Use ScopedUnlock when it's supported.
+  M.unlock();
+  syscall(SYS_futex, reinterpret_cast<uptr>(&Counter), FUTEX_WAIT_PRIVATE, V,
+          nullptr, nullptr, 0);
+  M.lock();
+}
+
+} // namespace scudo
+
+#endif // SCUDO_LINUX
diff --git a/Telegram/ThirdParty/scudo/condition_variable_linux.h b/Telegram/ThirdParty/scudo/condition_variable_linux.h
new file mode 100644
index 000000000..cd0732873
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/condition_variable_linux.h
@@ -0,0 +1,38 @@
+//===-- condition_variable_linux.h ------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SCUDO_CONDITION_VARIABLE_LINUX_H_
+#define SCUDO_CONDITION_VARIABLE_LINUX_H_
+
+#include "platform.h"
+
+#if SCUDO_LINUX
+
+#include "atomic_helpers.h"
+#include "condition_variable_base.h"
+#include "thread_annotations.h"
+
+namespace scudo {
+
+class ConditionVariableLinux
+    : public ConditionVariableBase<ConditionVariableLinux> {
+public:
+  void notifyAllImpl(HybridMutex &M) REQUIRES(M);
+
+  void waitImpl(HybridMutex &M) REQUIRES(M);
+
+private:
+  u32 LastNotifyAll = 0;
+  atomic_u32 Counter = {};
+};
+
+} // namespace scudo
+
+#endif // SCUDO_LINUX
+
+#endif // SCUDO_CONDITION_VARIABLE_LINUX_H_
diff --git a/Telegram/ThirdParty/scudo/flags.cpp b/Telegram/ThirdParty/scudo/flags.cpp
index de5153b28..f498edfbd 100644
--- a/Telegram/ThirdParty/scudo/flags.cpp
+++ b/Telegram/ThirdParty/scudo/flags.cpp
@@ -68,6 +68,9 @@ void initFlags() {
   Parser.parseString(getCompileDefinitionScudoDefaultOptions());
   Parser.parseString(getScudoDefaultOptions());
   Parser.parseString(getEnv("SCUDO_OPTIONS"));
+  if (const char *V = getEnv("SCUDO_ALLOCATION_RING_BUFFER_SIZE")) {
+    Parser.parseStringPair("allocation_ring_buffer_size", V);
+  }
 }
 
 } // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/flags.inc b/Telegram/ThirdParty/scudo/flags.inc
index c1f153baf..f5a2bab50 100644
--- a/Telegram/ThirdParty/scudo/flags.inc
+++ b/Telegram/ThirdParty/scudo/flags.inc
@@ -46,14 +46,6 @@ SCUDO_FLAG(int, release_to_os_interval_ms, SCUDO_ANDROID ? INT32_MIN : 5000,
            "Interval (in milliseconds) at which to attempt release of unused "
            "memory to the OS. Negative values disable the feature.")
 
-SCUDO_FLAG(int, hard_rss_limit_mb, 0,
-           "Hard RSS Limit in Mb. If non-zero, once the limit is achieved, "
-           "abort the process")
-
-SCUDO_FLAG(int, soft_rss_limit_mb, 0,
-           "Soft RSS Limit in Mb. If non-zero, once the limit is reached, all "
-           "subsequent calls will fail or return NULL until the RSS goes below "
-           "the soft limit")
-
 SCUDO_FLAG(int, allocation_ring_buffer_size, 32768,
-           "Entries to keep in the allocation ring buffer for scudo.")
+           "Entries to keep in the allocation ring buffer for scudo. "
+           "Values less or equal to zero disable the buffer.")
diff --git a/Telegram/ThirdParty/scudo/flags_parser.cpp b/Telegram/ThirdParty/scudo/flags_parser.cpp
index be39fcd4f..3d8c6f378 100644
--- a/Telegram/ThirdParty/scudo/flags_parser.cpp
+++ b/Telegram/ThirdParty/scudo/flags_parser.cpp
@@ -10,6 +10,8 @@
 #include "common.h"
 #include "report.h"
 
+#include <errno.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -80,7 +82,7 @@ void FlagParser::parseFlag() {
       ++Pos;
     Value = Buffer + ValueStart;
   }
-  if (!runHandler(Name, Value))
+  if (!runHandler(Name, Value, '='))
     reportError("flag parsing failed.");
 }
 
@@ -122,10 +124,16 @@ inline bool parseBool(const char *Value, bool *b) {
   return false;
 }
 
-bool FlagParser::runHandler(const char *Name, const char *Value) {
+void FlagParser::parseStringPair(const char *Name, const char *Value) {
+  if (!runHandler(Name, Value, '\0'))
+    reportError("flag parsing failed.");
+}
+
+bool FlagParser::runHandler(const char *Name, const char *Value,
+                            const char Sep) {
   for (u32 I = 0; I < NumberOfFlags; ++I) {
     const uptr Len = strlen(Flags[I].Name);
-    if (strncmp(Name, Flags[I].Name, Len) != 0 || Name[Len] != '=')
+    if (strncmp(Name, Flags[I].Name, Len) != 0 || Name[Len] != Sep)
       continue;
     bool Ok = false;
     switch (Flags[I].Type) {
@@ -136,12 +144,18 @@ bool FlagParser::runHandler(const char *Name, const char *Value) {
       break;
     case FlagType::FT_int:
       char *ValueEnd;
-      *reinterpret_cast<int *>(Flags[I].Var) =
-          static_cast<int>(strtol(Value, &ValueEnd, 10));
-      Ok =
-          *ValueEnd == '"' || *ValueEnd == '\'' || isSeparatorOrNull(*ValueEnd);
-      if (!Ok)
+      errno = 0;
+      long V = strtol(Value, &ValueEnd, 10);
+      if (errno != 0 ||                 // strtol failed (over or underflow)
+          V > INT_MAX || V < INT_MIN || // overflows integer
+          // contains unexpected characters
+          (*ValueEnd != '"' && *ValueEnd != '\'' &&
+           !isSeparatorOrNull(*ValueEnd))) {
         reportInvalidFlag("int", Value);
+        break;
+      }
+      *reinterpret_cast<int *>(Flags[I].Var) = static_cast<int>(V);
+      Ok = true;
       break;
     }
     return Ok;
diff --git a/Telegram/ThirdParty/scudo/flags_parser.h b/Telegram/ThirdParty/scudo/flags_parser.h
index ba832adbd..ded496fda 100644
--- a/Telegram/ThirdParty/scudo/flags_parser.h
+++ b/Telegram/ThirdParty/scudo/flags_parser.h
@@ -27,6 +27,7 @@ public:
                     void *Var);
   void parseString(const char *S);
   void printFlagDescriptions();
+  void parseStringPair(const char *Name, const char *Value);
 
 private:
   static const u32 MaxFlags = 20;
@@ -45,7 +46,7 @@ private:
   void skipWhitespace();
   void parseFlags();
   void parseFlag();
-  bool runHandler(const char *Name, const char *Value);
+  bool runHandler(const char *Name, const char *Value, char Sep);
 };
 
 void reportUnrecognizedFlags();
diff --git a/Telegram/ThirdParty/scudo/fuzz/get_error_info_fuzzer.cpp b/Telegram/ThirdParty/scudo/fuzz/get_error_info_fuzzer.cpp
index 74456450a..5b01ebe11 100644
--- a/Telegram/ThirdParty/scudo/fuzz/get_error_info_fuzzer.cpp
+++ b/Telegram/ThirdParty/scudo/fuzz/get_error_info_fuzzer.cpp
@@ -46,14 +46,11 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t *Data, size_t Size) {
   }
 
   std::string RingBufferBytes = FDP.ConsumeRemainingBytesAsString();
-  // RingBuffer is too short.
-  if (!AllocatorT::setRingBufferSizeForBuffer(RingBufferBytes.data(),
-                                              RingBufferBytes.size()))
-    return 0;
 
   scudo_error_info ErrorInfo;
   AllocatorT::getErrorInfo(&ErrorInfo, FaultAddr, StackDepot.data(),
-                           RegionInfo.data(), RingBufferBytes.data(), Memory,
-                           MemoryTags, MemoryAddr, MemorySize);
+                           RegionInfo.data(), RingBufferBytes.data(),
+                           RingBufferBytes.size(), Memory, MemoryTags,
+                           MemoryAddr, MemorySize);
   return 0;
 }
diff --git a/Telegram/ThirdParty/scudo/include/scudo/interface.h b/Telegram/ThirdParty/scudo/include/scudo/interface.h
index 6c0c521f8..a2dedea91 100644
--- a/Telegram/ThirdParty/scudo/include/scudo/interface.h
+++ b/Telegram/ThirdParty/scudo/include/scudo/interface.h
@@ -17,10 +17,22 @@ extern "C" {
 __attribute__((weak)) const char *__scudo_default_options(void);
 
 // Post-allocation & pre-deallocation hooks.
-// They must be thread-safe and not use heap related functions.
 __attribute__((weak)) void __scudo_allocate_hook(void *ptr, size_t size);
 __attribute__((weak)) void __scudo_deallocate_hook(void *ptr);
 
+// `realloc` involves both deallocation and allocation but they are not reported
+// atomically. In one specific case which may keep taking a snapshot right in
+// the middle of `realloc` reporting the deallocation and allocation, it may
+// confuse the user by missing memory from `realloc`. To alleviate that case,
+// define the two `realloc` hooks to get the knowledge of the bundled hook
+// calls. These hooks are optional and should only be used when a hooks user
+// wants to track reallocs more closely.
+//
+// See more details in the comment of `realloc` in wrapper_c.inc.
+__attribute__((weak)) void
+__scudo_realloc_allocate_hook(void *old_ptr, void *new_ptr, size_t size);
+__attribute__((weak)) void __scudo_realloc_deallocate_hook(void *old_ptr);
+
 void __scudo_print_stats(void);
 
 typedef void (*iterate_callback)(uintptr_t base, size_t size, void *arg);
@@ -73,7 +85,8 @@ typedef void (*iterate_callback)(uintptr_t base, size_t size, void *arg);
 // pointer.
 void __scudo_get_error_info(struct scudo_error_info *error_info,
                             uintptr_t fault_addr, const char *stack_depot,
-                            const char *region_info, const char *ring_buffer,
+                            size_t stack_depot_size, const char *region_info,
+                            const char *ring_buffer, size_t ring_buffer_size,
                             const char *memory, const char *memory_tags,
                             uintptr_t memory_addr, size_t memory_size);
 
diff --git a/Telegram/ThirdParty/scudo/linux.cpp b/Telegram/ThirdParty/scudo/linux.cpp
index e285d8a3d..274695108 100644
--- a/Telegram/ThirdParty/scudo/linux.cpp
+++ b/Telegram/ThirdParty/scudo/linux.cpp
@@ -14,6 +14,7 @@
 #include "internal_defs.h"
 #include "linux.h"
 #include "mutex.h"
+#include "report_linux.h"
 #include "string_utils.h"
 
 #include <errno.h>
@@ -43,6 +44,7 @@ uptr getPageSize() { return static_cast<uptr>(sysconf(_SC_PAGESIZE)); }
 
 void NORETURN die() { abort(); }
 
+// TODO: Will be deprecated. Use the interfaces in MemMapLinux instead.
 void *map(void *Addr, uptr Size, UNUSED const char *Name, uptr Flags,
           UNUSED MapPlatformData *Data) {
   int MmapFlags = MAP_PRIVATE | MAP_ANONYMOUS;
@@ -65,7 +67,7 @@ void *map(void *Addr, uptr Size, UNUSED const char *Name, uptr Flags,
   void *P = mmap(Addr, Size, MmapProt, MmapFlags, -1, 0);
   if (P == MAP_FAILED) {
     if (!(Flags & MAP_ALLOWNOMEM) || errno != ENOMEM)
-      dieOnMapUnmapError(errno == ENOMEM ? Size : 0);
+      reportMapError(errno == ENOMEM ? Size : 0);
     return nullptr;
   }
 #if SCUDO_ANDROID
@@ -75,19 +77,22 @@ void *map(void *Addr, uptr Size, UNUSED const char *Name, uptr Flags,
   return P;
 }
 
+// TODO: Will be deprecated. Use the interfaces in MemMapLinux instead.
 void unmap(void *Addr, uptr Size, UNUSED uptr Flags,
            UNUSED MapPlatformData *Data) {
   if (munmap(Addr, Size) != 0)
-    dieOnMapUnmapError();
+    reportUnmapError(reinterpret_cast<uptr>(Addr), Size);
 }
 
+// TODO: Will be deprecated. Use the interfaces in MemMapLinux instead.
 void setMemoryPermission(uptr Addr, uptr Size, uptr Flags,
                          UNUSED MapPlatformData *Data) {
   int Prot = (Flags & MAP_NOACCESS) ? PROT_NONE : (PROT_READ | PROT_WRITE);
   if (mprotect(reinterpret_cast<void *>(Addr), Size, Prot) != 0)
-    dieOnMapUnmapError();
+    reportProtectError(Addr, Size, Prot);
 }
 
+// TODO: Will be deprecated. Use the interfaces in MemMapLinux instead.
 void releasePagesToOS(uptr BaseAddress, uptr Offset, uptr Size,
                       UNUSED MapPlatformData *Data) {
   void *Addr = reinterpret_cast<void *>(BaseAddress + Offset);
@@ -104,12 +109,14 @@ enum State : u32 { Unlocked = 0, Locked = 1, Sleeping = 2 };
 }
 
 bool HybridMutex::tryLock() {
-  return atomic_compare_exchange(&M, Unlocked, Locked) == Unlocked;
+  return atomic_compare_exchange_strong(&M, Unlocked, Locked,
+                                        memory_order_acquire) == Unlocked;
 }
 
 // The following is based on https://akkadia.org/drepper/futex.pdf.
 void HybridMutex::lockSlow() {
-  u32 V = atomic_compare_exchange(&M, Unlocked, Locked);
+  u32 V = atomic_compare_exchange_strong(&M, Unlocked, Locked,
+                                         memory_order_acquire);
   if (V == Unlocked)
     return;
   if (V != Sleeping)
@@ -197,39 +204,6 @@ bool getRandom(void *Buffer, uptr Length, UNUSED bool Blocking) {
 extern "C" WEAK int async_safe_write_log(int pri, const char *tag,
                                          const char *msg);
 
-static uptr GetRSSFromBuffer(const char *Buf) {
-  // The format of the file is:
-  // 1084 89 69 11 0 79 0
-  // We need the second number which is RSS in pages.
-  const char *Pos = Buf;
-  // Skip the first number.
-  while (*Pos >= '0' && *Pos <= '9')
-    Pos++;
-  // Skip whitespaces.
-  while (!(*Pos >= '0' && *Pos <= '9') && *Pos != 0)
-    Pos++;
-  // Read the number.
-  u64 Rss = 0;
-  for (; *Pos >= '0' && *Pos <= '9'; Pos++)
-    Rss = Rss * 10 + static_cast<u64>(*Pos) - '0';
-  return static_cast<uptr>(Rss * getPageSizeCached());
-}
-
-uptr GetRSS() {
-  // TODO: We currently use sanitizer_common's GetRSS which reads the
-  // RSS from /proc/self/statm by default. We might want to
-  // call getrusage directly, even if it's less accurate.
-  auto Fd = open("/proc/self/statm", O_RDONLY);
-  char Buf[64];
-  s64 Len = read(Fd, Buf, sizeof(Buf) - 1);
-  close(Fd);
-  if (Len <= 0)
-    return 0;
-  Buf[Len] = 0;
-
-  return GetRSSFromBuffer(Buf);
-}
-
 void outputRaw(const char *Buffer) {
   if (&async_safe_write_log) {
     constexpr s32 AndroidLogInfo = 4;
diff --git a/Telegram/ThirdParty/scudo/local_cache.h b/Telegram/ThirdParty/scudo/local_cache.h
index 1095eb5f1..46d6affdc 100644
--- a/Telegram/ThirdParty/scudo/local_cache.h
+++ b/Telegram/ThirdParty/scudo/local_cache.h
@@ -22,80 +22,13 @@ template <class SizeClassAllocator> struct SizeClassAllocatorLocalCache {
   typedef typename SizeClassAllocator::SizeClassMap SizeClassMap;
   typedef typename SizeClassAllocator::CompactPtrT CompactPtrT;
 
-  struct TransferBatch {
-    static const u16 MaxNumCached = SizeClassMap::MaxNumCachedHint;
-    void setFromArray(CompactPtrT *Array, u16 N) {
-      DCHECK_LE(N, MaxNumCached);
-      Count = N;
-      memcpy(Batch, Array, sizeof(Batch[0]) * Count);
-    }
-    void appendFromArray(CompactPtrT *Array, u16 N) {
-      DCHECK_LE(N, MaxNumCached - Count);
-      memcpy(Batch + Count, Array, sizeof(Batch[0]) * N);
-      // u16 will be promoted to int by arithmetic type conversion.
-      Count = static_cast<u16>(Count + N);
-    }
-    void appendFromTransferBatch(TransferBatch *B, u16 N) {
-      DCHECK_LE(N, MaxNumCached - Count);
-      DCHECK_GE(B->Count, N);
-      // Append from the back of `B`.
-      memcpy(Batch + Count, B->Batch + (B->Count - N), sizeof(Batch[0]) * N);
-      // u16 will be promoted to int by arithmetic type conversion.
-      Count = static_cast<u16>(Count + N);
-      B->Count = static_cast<u16>(B->Count - N);
-    }
-    void clear() { Count = 0; }
-    void add(CompactPtrT P) {
-      DCHECK_LT(Count, MaxNumCached);
-      Batch[Count++] = P;
-    }
-    void copyToArray(CompactPtrT *Array) const {
-      memcpy(Array, Batch, sizeof(Batch[0]) * Count);
-    }
-    u16 getCount() const { return Count; }
-    bool isEmpty() const { return Count == 0U; }
-    CompactPtrT get(u16 I) const {
-      DCHECK_LE(I, Count);
-      return Batch[I];
-    }
-    static u16 getMaxCached(uptr Size) {
-      return Min(MaxNumCached, SizeClassMap::getMaxCachedHint(Size));
-    }
-    TransferBatch *Next;
-
-  private:
-    CompactPtrT Batch[MaxNumCached];
-    u16 Count;
-  };
-
-  // A BatchGroup is used to collect blocks. Each group has a group id to
-  // identify the group kind of contained blocks.
-  struct BatchGroup {
-    // `Next` is used by IntrusiveList.
-    BatchGroup *Next;
-    // The compact base address of each group
-    uptr CompactPtrGroupBase;
-    // Cache value of TransferBatch::getMaxCached()
-    u16 MaxCachedPerBatch;
-    // Number of blocks pushed into this group. This is an increment-only
-    // counter.
-    uptr PushedBlocks;
-    // This is used to track how many bytes are not in-use since last time we
-    // tried to release pages.
-    uptr BytesInBGAtLastCheckpoint;
-    // Blocks are managed by TransferBatch in a list.
-    SinglyLinkedList<TransferBatch> Batches;
-  };
-
-  static_assert(sizeof(BatchGroup) <= sizeof(TransferBatch),
-                "BatchGroup uses the same class size as TransferBatch");
-
   void init(GlobalStats *S, SizeClassAllocator *A) {
     DCHECK(isEmpty());
     Stats.init();
     if (LIKELY(S))
       S->link(&Stats);
     Allocator = A;
+    initCache();
   }
 
   void destroy(GlobalStats *S) {
@@ -108,7 +41,9 @@ template <class SizeClassAllocator> struct SizeClassAllocatorLocalCache {
     DCHECK_LT(ClassId, NumClasses);
     PerClass *C = &PerClassArray[ClassId];
     if (C->Count == 0) {
-      if (UNLIKELY(!refill(C, ClassId)))
+      // Refill half of the number of max cached.
+      DCHECK_GT(C->MaxCount / 2, 0U);
+      if (UNLIKELY(!refill(C, ClassId, C->MaxCount / 2)))
         return nullptr;
       DCHECK_GT(C->Count, 0);
     }
@@ -125,9 +60,6 @@ template <class SizeClassAllocator> struct SizeClassAllocatorLocalCache {
   bool deallocate(uptr ClassId, void *P) {
     CHECK_LT(ClassId, NumClasses);
     PerClass *C = &PerClassArray[ClassId];
-    // We still have to initialize the cache in the event that the first heap
-    // operation in a thread is a deallocation.
-    initCacheMaybe(C);
 
     // If the cache is full, drain half of blocks back to the main allocator.
     const bool NeedToDrainCache = C->Count == C->MaxCount;
@@ -151,7 +83,7 @@ template <class SizeClassAllocator> struct SizeClassAllocatorLocalCache {
   }
 
   void drain() {
-    // Drain BatchClassId last as createBatch can refill it.
+    // Drain BatchClassId last as it may be needed while draining normal blocks.
     for (uptr I = 0; I < NumClasses; ++I) {
       if (I == BatchClassId)
         continue;
@@ -163,19 +95,11 @@ template <class SizeClassAllocator> struct SizeClassAllocatorLocalCache {
     DCHECK(isEmpty());
   }
 
-  TransferBatch *createBatch(uptr ClassId, void *B) {
-    if (ClassId != BatchClassId)
-      B = allocate(BatchClassId);
+  void *getBatchClassBlock() {
+    void *B = allocate(BatchClassId);
     if (UNLIKELY(!B))
       reportOutOfMemory(SizeClassAllocator::getSizeByClassId(BatchClassId));
-    return reinterpret_cast<TransferBatch *>(B);
-  }
-
-  BatchGroup *createGroup() {
-    void *Ptr = allocate(BatchClassId);
-    if (UNLIKELY(!Ptr))
-      reportOutOfMemory(SizeClassAllocator::getSizeByClassId(BatchClassId));
-    return reinterpret_cast<BatchGroup *>(Ptr);
+    return B;
   }
 
   LocalStats &getStats() { return Stats; }
@@ -203,6 +127,11 @@ template <class SizeClassAllocator> struct SizeClassAllocatorLocalCache {
       Str->append("    No block is cached.\n");
   }
 
+  static u16 getMaxCached(uptr Size) {
+    return Min(SizeClassMap::MaxNumCachedHint,
+               SizeClassMap::getMaxCachedHint(Size));
+  }
+
 private:
   static const uptr NumClasses = SizeClassMap::NumClasses;
   static const uptr BatchClassId = SizeClassMap::BatchClassId;
@@ -211,24 +140,17 @@ private:
     u16 MaxCount;
     // Note: ClassSize is zero for the transfer batch.
     uptr ClassSize;
-    CompactPtrT Chunks[2 * TransferBatch::MaxNumCached];
+    CompactPtrT Chunks[2 * SizeClassMap::MaxNumCachedHint];
   };
   PerClass PerClassArray[NumClasses] = {};
   LocalStats Stats;
   SizeClassAllocator *Allocator = nullptr;
 
-  ALWAYS_INLINE void initCacheMaybe(PerClass *C) {
-    if (LIKELY(C->MaxCount))
-      return;
-    initCache();
-    DCHECK_NE(C->MaxCount, 0U);
-  }
-
   NOINLINE void initCache() {
     for (uptr I = 0; I < NumClasses; I++) {
       PerClass *P = &PerClassArray[I];
       const uptr Size = SizeClassAllocator::getSizeByClassId(I);
-      P->MaxCount = static_cast<u16>(2 * TransferBatch::getMaxCached(Size));
+      P->MaxCount = static_cast<u16>(2 * getMaxCached(Size));
       if (I != BatchClassId) {
         P->ClassSize = Size;
       } else {
@@ -244,17 +166,12 @@ private:
       deallocate(BatchClassId, B);
   }
 
-  NOINLINE bool refill(PerClass *C, uptr ClassId) {
-    initCacheMaybe(C);
-    TransferBatch *B = Allocator->popBatch(this, ClassId);
-    if (UNLIKELY(!B))
-      return false;
-    DCHECK_GT(B->getCount(), 0);
-    C->Count = B->getCount();
-    B->copyToArray(C->Chunks);
-    B->clear();
-    destroyBatch(ClassId, B);
-    return true;
+  NOINLINE bool refill(PerClass *C, uptr ClassId, u16 MaxRefill) {
+    const u16 NumBlocksRefilled =
+        Allocator->popBlocks(this, ClassId, C->Chunks, MaxRefill);
+    DCHECK_LE(NumBlocksRefilled, MaxRefill);
+    C->Count = static_cast<u16>(C->Count + NumBlocksRefilled);
+    return NumBlocksRefilled != 0;
   }
 
   NOINLINE void drain(PerClass *C, uptr ClassId) {
diff --git a/Telegram/ThirdParty/scudo/mem_map.h b/Telegram/ThirdParty/scudo/mem_map.h
index 409e4dbbe..b92216cf2 100644
--- a/Telegram/ThirdParty/scudo/mem_map.h
+++ b/Telegram/ThirdParty/scudo/mem_map.h
@@ -22,6 +22,7 @@
 #include "trusty.h"
 
 #include "mem_map_fuchsia.h"
+#include "mem_map_linux.h"
 
 namespace scudo {
 
@@ -73,10 +74,10 @@ private:
 };
 
 #if SCUDO_LINUX
-using ReservedMemoryT = ReservedMemoryDefault;
+using ReservedMemoryT = ReservedMemoryLinux;
 using MemMapT = ReservedMemoryT::MemMapT;
 #elif SCUDO_FUCHSIA
-using ReservedMemoryT = ReservedMemoryDefault;
+using ReservedMemoryT = ReservedMemoryFuchsia;
 using MemMapT = ReservedMemoryT::MemMapT;
 #elif SCUDO_TRUSTY
 using ReservedMemoryT = ReservedMemoryDefault;
diff --git a/Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp b/Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp
index 9ace1fef7..0566ab065 100644
--- a/Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp
+++ b/Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp
@@ -41,7 +41,7 @@ static void setVmoName(zx_handle_t Vmo, const char *Name) {
 static uptr getRootVmarBase() {
   static atomic_uptr CachedResult = {0};
 
-  uptr Result = atomic_load_relaxed(&CachedResult);
+  uptr Result = atomic_load(&CachedResult, memory_order_acquire);
   if (UNLIKELY(!Result)) {
     zx_info_vmar_t VmarInfo;
     zx_status_t Status =
@@ -50,7 +50,7 @@ static uptr getRootVmarBase() {
     CHECK_EQ(Status, ZX_OK);
     CHECK_NE(VmarInfo.base, 0);
 
-    atomic_store_relaxed(&CachedResult, VmarInfo.base);
+    atomic_store(&CachedResult, VmarInfo.base, memory_order_release);
     Result = VmarInfo.base;
   }
 
@@ -61,7 +61,7 @@ static uptr getRootVmarBase() {
 static zx_handle_t getPlaceholderVmo() {
   static atomic_u32 StoredVmo = {ZX_HANDLE_INVALID};
 
-  zx_handle_t Vmo = atomic_load_relaxed(&StoredVmo);
+  zx_handle_t Vmo = atomic_load(&StoredVmo, memory_order_acquire);
   if (UNLIKELY(Vmo == ZX_HANDLE_INVALID)) {
     // Create a zero-sized placeholder VMO.
     zx_status_t Status = _zx_vmo_create(0, 0, &Vmo);
@@ -72,9 +72,9 @@ static zx_handle_t getPlaceholderVmo() {
 
     // Atomically store its handle. If some other thread wins the race, use its
     // handle and discard ours.
-    zx_handle_t OldValue =
-        atomic_compare_exchange(&StoredVmo, ZX_HANDLE_INVALID, Vmo);
-    if (OldValue != ZX_HANDLE_INVALID) {
+    zx_handle_t OldValue = atomic_compare_exchange_strong(
+        &StoredVmo, ZX_HANDLE_INVALID, Vmo, memory_order_acq_rel);
+    if (UNLIKELY(OldValue != ZX_HANDLE_INVALID)) {
       Status = _zx_handle_close(Vmo);
       CHECK_EQ(Status, ZX_OK);
 
diff --git a/Telegram/ThirdParty/scudo/mem_map_linux.cpp b/Telegram/ThirdParty/scudo/mem_map_linux.cpp
new file mode 100644
index 000000000..783c4f0d9
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/mem_map_linux.cpp
@@ -0,0 +1,153 @@
+//===-- mem_map_linux.cpp ---------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "platform.h"
+
+#if SCUDO_LINUX
+
+#include "mem_map_linux.h"
+
+#include "common.h"
+#include "internal_defs.h"
+#include "linux.h"
+#include "mutex.h"
+#include "report_linux.h"
+#include "string_utils.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/futex.h>
+#include <sched.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
+#if SCUDO_ANDROID
+// TODO(chiahungduan): Review if we still need the followings macros.
+#include <sys/prctl.h>
+// Definitions of prctl arguments to set a vma name in Android kernels.
+#define ANDROID_PR_SET_VMA 0x53564d41
+#define ANDROID_PR_SET_VMA_ANON_NAME 0
+#endif
+
+namespace scudo {
+
+static void *mmapWrapper(uptr Addr, uptr Size, const char *Name, uptr Flags) {
+  int MmapFlags = MAP_PRIVATE | MAP_ANONYMOUS;
+  int MmapProt;
+  if (Flags & MAP_NOACCESS) {
+    MmapFlags |= MAP_NORESERVE;
+    MmapProt = PROT_NONE;
+  } else {
+    MmapProt = PROT_READ | PROT_WRITE;
+  }
+#if defined(__aarch64__)
+#ifndef PROT_MTE
+#define PROT_MTE 0x20
+#endif
+  if (Flags & MAP_MEMTAG)
+    MmapProt |= PROT_MTE;
+#endif
+  if (Addr)
+    MmapFlags |= MAP_FIXED;
+  void *P =
+      mmap(reinterpret_cast<void *>(Addr), Size, MmapProt, MmapFlags, -1, 0);
+  if (P == MAP_FAILED) {
+    if (!(Flags & MAP_ALLOWNOMEM) || errno != ENOMEM)
+      reportMapError(errno == ENOMEM ? Size : 0);
+    return nullptr;
+  }
+#if SCUDO_ANDROID
+  if (Name)
+    prctl(ANDROID_PR_SET_VMA, ANDROID_PR_SET_VMA_ANON_NAME, P, Size, Name);
+#else
+  (void)Name;
+#endif
+
+  return P;
+}
+
+bool MemMapLinux::mapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags) {
+  void *P = mmapWrapper(Addr, Size, Name, Flags);
+  if (P == nullptr)
+    return false;
+
+  MapBase = reinterpret_cast<uptr>(P);
+  MapCapacity = Size;
+  return true;
+}
+
+void MemMapLinux::unmapImpl(uptr Addr, uptr Size) {
+  // If we unmap all the pages, also mark `MapBase` to 0 to indicate invalid
+  // status.
+  if (Size == MapCapacity) {
+    MapBase = MapCapacity = 0;
+  } else {
+    // This is partial unmap and is unmapping the pages from the beginning,
+    // shift `MapBase` to the new base.
+    if (MapBase == Addr)
+      MapBase = Addr + Size;
+    MapCapacity -= Size;
+  }
+
+  if (munmap(reinterpret_cast<void *>(Addr), Size) != 0)
+    reportUnmapError(Addr, Size);
+}
+
+bool MemMapLinux::remapImpl(uptr Addr, uptr Size, const char *Name,
+                            uptr Flags) {
+  void *P = mmapWrapper(Addr, Size, Name, Flags);
+  if (reinterpret_cast<uptr>(P) != Addr)
+    reportMapError();
+  return true;
+}
+
+void MemMapLinux::setMemoryPermissionImpl(uptr Addr, uptr Size, uptr Flags) {
+  int Prot = (Flags & MAP_NOACCESS) ? PROT_NONE : (PROT_READ | PROT_WRITE);
+  if (mprotect(reinterpret_cast<void *>(Addr), Size, Prot) != 0)
+    reportProtectError(Addr, Size, Prot);
+}
+
+void MemMapLinux::releaseAndZeroPagesToOSImpl(uptr From, uptr Size) {
+  void *Addr = reinterpret_cast<void *>(From);
+
+  while (madvise(Addr, Size, MADV_DONTNEED) == -1 && errno == EAGAIN) {
+  }
+}
+
+bool ReservedMemoryLinux::createImpl(uptr Addr, uptr Size, const char *Name,
+                                     uptr Flags) {
+  ReservedMemoryLinux::MemMapT MemMap;
+  if (!MemMap.map(Addr, Size, Name, Flags | MAP_NOACCESS))
+    return false;
+
+  MapBase = MemMap.getBase();
+  MapCapacity = MemMap.getCapacity();
+
+  return true;
+}
+
+void ReservedMemoryLinux::releaseImpl() {
+  if (munmap(reinterpret_cast<void *>(getBase()), getCapacity()) != 0)
+    reportUnmapError(getBase(), getCapacity());
+}
+
+ReservedMemoryLinux::MemMapT ReservedMemoryLinux::dispatchImpl(uptr Addr,
+                                                               uptr Size) {
+  return ReservedMemoryLinux::MemMapT(Addr, Size);
+}
+
+} // namespace scudo
+
+#endif // SCUDO_LINUX
diff --git a/Telegram/ThirdParty/scudo/mem_map_linux.h b/Telegram/ThirdParty/scudo/mem_map_linux.h
new file mode 100644
index 000000000..7a89b3bff
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/mem_map_linux.h
@@ -0,0 +1,67 @@
+//===-- mem_map_linux.h -----------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SCUDO_MEM_MAP_LINUX_H_
+#define SCUDO_MEM_MAP_LINUX_H_
+
+#include "platform.h"
+
+#if SCUDO_LINUX
+
+#include "common.h"
+#include "mem_map_base.h"
+
+namespace scudo {
+
+class MemMapLinux final : public MemMapBase<MemMapLinux> {
+public:
+  constexpr MemMapLinux() = default;
+  MemMapLinux(uptr Base, uptr Capacity)
+      : MapBase(Base), MapCapacity(Capacity) {}
+
+  // Impls for base functions.
+  bool mapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags = 0);
+  void unmapImpl(uptr Addr, uptr Size);
+  bool remapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags = 0);
+  void setMemoryPermissionImpl(uptr Addr, uptr Size, uptr Flags);
+  void releasePagesToOSImpl(uptr From, uptr Size) {
+    return releaseAndZeroPagesToOSImpl(From, Size);
+  }
+  void releaseAndZeroPagesToOSImpl(uptr From, uptr Size);
+  uptr getBaseImpl() { return MapBase; }
+  uptr getCapacityImpl() { return MapCapacity; }
+
+private:
+  uptr MapBase = 0;
+  uptr MapCapacity = 0;
+};
+
+// This will be deprecated when every allocator has been supported by each
+// platform's `MemMap` implementation.
+class ReservedMemoryLinux final
+    : public ReservedMemory<ReservedMemoryLinux, MemMapLinux> {
+public:
+  // The following two are the Impls for function in `MemMapBase`.
+  uptr getBaseImpl() { return MapBase; }
+  uptr getCapacityImpl() { return MapCapacity; }
+
+  // These threes are specific to `ReservedMemory`.
+  bool createImpl(uptr Addr, uptr Size, const char *Name, uptr Flags);
+  void releaseImpl();
+  MemMapT dispatchImpl(uptr Addr, uptr Size);
+
+private:
+  uptr MapBase = 0;
+  uptr MapCapacity = 0;
+};
+
+} // namespace scudo
+
+#endif // SCUDO_LINUX
+
+#endif // SCUDO_MEM_MAP_LINUX_H_
diff --git a/Telegram/ThirdParty/scudo/mutex.h b/Telegram/ThirdParty/scudo/mutex.h
index 05340de3e..4caa94521 100644
--- a/Telegram/ThirdParty/scudo/mutex.h
+++ b/Telegram/ThirdParty/scudo/mutex.h
@@ -35,7 +35,7 @@ public:
 #pragma nounroll
 #endif
     for (u8 I = 0U; I < NumberOfTries; I++) {
-      yieldProcessor(NumberOfYields);
+      delayLoop();
       if (tryLock())
         return;
     }
@@ -53,10 +53,23 @@ public:
   }
 
 private:
+  void delayLoop() {
+    // The value comes from the average time spent in accessing caches (which
+    // are the fastest operations) so that we are unlikely to wait too long for
+    // fast operations.
+    constexpr u32 SpinTimes = 16;
+    volatile u32 V = 0;
+    for (u32 I = 0; I < SpinTimes; ++I) {
+      u32 Tmp = V + 1;
+      V = Tmp;
+    }
+  }
+
   void assertHeldImpl();
 
-  static constexpr u8 NumberOfTries = 8U;
-  static constexpr u8 NumberOfYields = 8U;
+  // TODO(chiahungduan): Adapt this value based on scenarios. E.g., primary and
+  // secondary allocator have different allocation times.
+  static constexpr u8 NumberOfTries = 32U;
 
 #if SCUDO_LINUX
   atomic_u32 M = {};
diff --git a/Telegram/ThirdParty/scudo/options.h b/Telegram/ThirdParty/scudo/options.h
index 4e6786513..b20142a41 100644
--- a/Telegram/ThirdParty/scudo/options.h
+++ b/Telegram/ThirdParty/scudo/options.h
@@ -38,7 +38,7 @@ struct Options {
   }
 };
 
-template <typename Config> bool useMemoryTagging(Options Options) {
+template <typename Config> bool useMemoryTagging(const Options &Options) {
   return allocatorSupportsMemoryTagging<Config>() &&
          Options.get(OptionBit::UseMemoryTagging);
 }
diff --git a/Telegram/ThirdParty/scudo/platform.h b/Telegram/ThirdParty/scudo/platform.h
index 7c7024ff5..b71a86be7 100644
--- a/Telegram/ThirdParty/scudo/platform.h
+++ b/Telegram/ThirdParty/scudo/platform.h
@@ -63,6 +63,20 @@
 #define SCUDO_CAN_USE_MTE (SCUDO_LINUX || SCUDO_TRUSTY)
 #endif
 
+// Use smaller table sizes for fuzzing in order to reduce input size.
+// Trusty just has less available memory.
+#ifndef SCUDO_SMALL_STACK_DEPOT
+#if defined(SCUDO_FUZZ) || SCUDO_TRUSTY
+#define SCUDO_SMALL_STACK_DEPOT 1
+#else
+#define SCUDO_SMALL_STACK_DEPOT 0
+#endif
+#endif
+
+#ifndef SCUDO_ENABLE_HOOKS
+#define SCUDO_ENABLE_HOOKS 0
+#endif
+
 #ifndef SCUDO_MIN_ALIGNMENT_LOG
 // We force malloc-type functions to be aligned to std::max_align_t, but there
 // is no reason why the minimum alignment for all other functions can't be 8
diff --git a/Telegram/ThirdParty/scudo/primary32.h b/Telegram/ThirdParty/scudo/primary32.h
index 1d8a34ec6..4d03b282d 100644
--- a/Telegram/ThirdParty/scudo/primary32.h
+++ b/Telegram/ThirdParty/scudo/primary32.h
@@ -9,6 +9,7 @@
 #ifndef SCUDO_PRIMARY32_H_
 #define SCUDO_PRIMARY32_H_
 
+#include "allocator_common.h"
 #include "bytemap.h"
 #include "common.h"
 #include "list.h"
@@ -53,12 +54,15 @@ public:
                 "");
   typedef SizeClassAllocator32<Config> ThisT;
   typedef SizeClassAllocatorLocalCache<ThisT> CacheT;
-  typedef typename CacheT::TransferBatch TransferBatch;
-  typedef typename CacheT::BatchGroup BatchGroup;
+  typedef TransferBatch<ThisT> TransferBatchT;
+  typedef BatchGroup<ThisT> BatchGroupT;
+
+  static_assert(sizeof(BatchGroupT) <= sizeof(TransferBatchT),
+                "BatchGroupT uses the same class size as TransferBatchT");
 
   static uptr getSizeByClassId(uptr ClassId) {
     return (ClassId == SizeClassMap::BatchClassId)
-               ? sizeof(TransferBatch)
+               ? sizeof(TransferBatchT)
                : SizeClassMap::getSizeByClassId(ClassId);
   }
 
@@ -126,7 +130,7 @@ public:
       SizeClassInfo *Sci = getSizeClassInfo(I);
       ScopedLock L1(Sci->Mutex);
       uptr TotalBlocks = 0;
-      for (BatchGroup &BG : Sci->FreeListInfo.BlockList) {
+      for (BatchGroupT &BG : Sci->FreeListInfo.BlockList) {
         // `BG::Batches` are `TransferBatches`. +1 for `BatchGroup`.
         BatchClassUsedInFreeLists += BG.Batches.size() + 1;
         for (const auto &It : BG.Batches)
@@ -141,7 +145,7 @@ public:
     SizeClassInfo *Sci = getSizeClassInfo(SizeClassMap::BatchClassId);
     ScopedLock L1(Sci->Mutex);
     uptr TotalBlocks = 0;
-    for (BatchGroup &BG : Sci->FreeListInfo.BlockList) {
+    for (BatchGroupT &BG : Sci->FreeListInfo.BlockList) {
       if (LIKELY(!BG.Batches.empty())) {
         for (const auto &It : BG.Batches)
           TotalBlocks += It.getCount();
@@ -187,11 +191,30 @@ public:
     return BlockSize > PageSize;
   }
 
-  TransferBatch *popBatch(CacheT *C, uptr ClassId) {
+  // Note that the `MaxBlockCount` will be used when we support arbitrary blocks
+  // count. Now it's the same as the number of blocks stored in the
+  // `TransferBatch`.
+  u16 popBlocks(CacheT *C, uptr ClassId, CompactPtrT *ToArray,
+                UNUSED const u16 MaxBlockCount) {
+    TransferBatchT *B = popBatch(C, ClassId);
+    if (!B)
+      return 0;
+
+    const u16 Count = B->getCount();
+    DCHECK_GT(Count, 0U);
+    B->moveToArray(ToArray);
+
+    if (ClassId != SizeClassMap::BatchClassId)
+      C->deallocate(SizeClassMap::BatchClassId, B);
+
+    return Count;
+  }
+
+  TransferBatchT *popBatch(CacheT *C, uptr ClassId) {
     DCHECK_LT(ClassId, NumClasses);
     SizeClassInfo *Sci = getSizeClassInfo(ClassId);
     ScopedLock L(Sci->Mutex);
-    TransferBatch *B = popBatchImpl(C, ClassId, Sci);
+    TransferBatchT *B = popBatchImpl(C, ClassId, Sci);
     if (UNLIKELY(!B)) {
       if (UNLIKELY(!populateFreeList(C, ClassId, Sci)))
         return nullptr;
@@ -311,6 +334,18 @@ public:
     }
   }
 
+  void getFragmentationInfo(ScopedString *Str) {
+    Str->append(
+        "Fragmentation Stats: SizeClassAllocator32: page size = %zu bytes\n",
+        getPageSizeCached());
+
+    for (uptr I = 1; I < NumClasses; I++) {
+      SizeClassInfo *Sci = getSizeClassInfo(I);
+      ScopedLock L(Sci->Mutex);
+      getSizeClassFragmentationInfo(Sci, I, Str);
+    }
+  }
+
   bool setOption(Option O, sptr Value) {
     if (O == Option::ReleaseInterval) {
       const s32 Interval = Max(Min(static_cast<s32>(Value),
@@ -369,7 +404,7 @@ private:
   };
 
   struct BlocksInfo {
-    SinglyLinkedList<BatchGroup> BlockList = {};
+    SinglyLinkedList<BatchGroupT> BlockList = {};
     uptr PoppedBlocks = 0;
     uptr PushedBlocks = 0;
   };
@@ -493,11 +528,11 @@ private:
     // reusable and don't need additional space for them.
 
     Sci->FreeListInfo.PushedBlocks += Size;
-    BatchGroup *BG = Sci->FreeListInfo.BlockList.front();
+    BatchGroupT *BG = Sci->FreeListInfo.BlockList.front();
 
     if (BG == nullptr) {
       // Construct `BatchGroup` on the last element.
-      BG = reinterpret_cast<BatchGroup *>(
+      BG = reinterpret_cast<BatchGroupT *>(
           decompactPtr(SizeClassMap::BatchClassId, Array[Size - 1]));
       --Size;
       BG->Batches.clear();
@@ -508,8 +543,8 @@ private:
       // from `CreateGroup` in `pushBlocksImpl`
       BG->PushedBlocks = 1;
       BG->BytesInBGAtLastCheckpoint = 0;
-      BG->MaxCachedPerBatch = TransferBatch::getMaxCached(
-          getSizeByClassId(SizeClassMap::BatchClassId));
+      BG->MaxCachedPerBatch =
+          CacheT::getMaxCached(getSizeByClassId(SizeClassMap::BatchClassId));
 
       Sci->FreeListInfo.BlockList.push_front(BG);
     }
@@ -522,7 +557,7 @@ private:
     //   2. Only 1 block is pushed when the freelist is empty.
     if (BG->Batches.empty()) {
       // Construct the `TransferBatch` on the last element.
-      TransferBatch *TB = reinterpret_cast<TransferBatch *>(
+      TransferBatchT *TB = reinterpret_cast<TransferBatchT *>(
           decompactPtr(SizeClassMap::BatchClassId, Array[Size - 1]));
       TB->clear();
       // As mentioned above, addresses of `TransferBatch` and `BatchGroup` are
@@ -537,14 +572,14 @@ private:
       BG->Batches.push_front(TB);
     }
 
-    TransferBatch *CurBatch = BG->Batches.front();
+    TransferBatchT *CurBatch = BG->Batches.front();
     DCHECK_NE(CurBatch, nullptr);
 
     for (u32 I = 0; I < Size;) {
       u16 UnusedSlots =
           static_cast<u16>(BG->MaxCachedPerBatch - CurBatch->getCount());
       if (UnusedSlots == 0) {
-        CurBatch = reinterpret_cast<TransferBatch *>(
+        CurBatch = reinterpret_cast<TransferBatchT *>(
             decompactPtr(SizeClassMap::BatchClassId, Array[I]));
         CurBatch->clear();
         // Self-contained
@@ -588,24 +623,25 @@ private:
     DCHECK_GT(Size, 0U);
 
     auto CreateGroup = [&](uptr CompactPtrGroupBase) {
-      BatchGroup *BG = C->createGroup();
+      BatchGroupT *BG =
+          reinterpret_cast<BatchGroupT *>(C->getBatchClassBlock());
       BG->Batches.clear();
-      TransferBatch *TB = C->createBatch(ClassId, nullptr);
+      TransferBatchT *TB =
+          reinterpret_cast<TransferBatchT *>(C->getBatchClassBlock());
       TB->clear();
 
       BG->CompactPtrGroupBase = CompactPtrGroupBase;
       BG->Batches.push_front(TB);
       BG->PushedBlocks = 0;
       BG->BytesInBGAtLastCheckpoint = 0;
-      BG->MaxCachedPerBatch =
-          TransferBatch::getMaxCached(getSizeByClassId(ClassId));
+      BG->MaxCachedPerBatch = CacheT::getMaxCached(getSizeByClassId(ClassId));
 
       return BG;
     };
 
-    auto InsertBlocks = [&](BatchGroup *BG, CompactPtrT *Array, u32 Size) {
-      SinglyLinkedList<TransferBatch> &Batches = BG->Batches;
-      TransferBatch *CurBatch = Batches.front();
+    auto InsertBlocks = [&](BatchGroupT *BG, CompactPtrT *Array, u32 Size) {
+      SinglyLinkedList<TransferBatchT> &Batches = BG->Batches;
+      TransferBatchT *CurBatch = Batches.front();
       DCHECK_NE(CurBatch, nullptr);
 
       for (u32 I = 0; I < Size;) {
@@ -613,9 +649,8 @@ private:
         u16 UnusedSlots =
             static_cast<u16>(BG->MaxCachedPerBatch - CurBatch->getCount());
         if (UnusedSlots == 0) {
-          CurBatch = C->createBatch(
-              ClassId,
-              reinterpret_cast<void *>(decompactPtr(ClassId, Array[I])));
+          CurBatch =
+              reinterpret_cast<TransferBatchT *>(C->getBatchClassBlock());
           CurBatch->clear();
           Batches.push_front(CurBatch);
           UnusedSlots = BG->MaxCachedPerBatch;
@@ -630,11 +665,11 @@ private:
     };
 
     Sci->FreeListInfo.PushedBlocks += Size;
-    BatchGroup *Cur = Sci->FreeListInfo.BlockList.front();
+    BatchGroupT *Cur = Sci->FreeListInfo.BlockList.front();
 
     // In the following, `Cur` always points to the BatchGroup for blocks that
     // will be pushed next. `Prev` is the element right before `Cur`.
-    BatchGroup *Prev = nullptr;
+    BatchGroupT *Prev = nullptr;
 
     while (Cur != nullptr &&
            compactPtrGroupBase(Array[0]) > Cur->CompactPtrGroupBase) {
@@ -695,22 +730,22 @@ private:
   // group id will be considered first.
   //
   // The region mutex needs to be held while calling this method.
-  TransferBatch *popBatchImpl(CacheT *C, uptr ClassId, SizeClassInfo *Sci)
+  TransferBatchT *popBatchImpl(CacheT *C, uptr ClassId, SizeClassInfo *Sci)
       REQUIRES(Sci->Mutex) {
     if (Sci->FreeListInfo.BlockList.empty())
       return nullptr;
 
-    SinglyLinkedList<TransferBatch> &Batches =
+    SinglyLinkedList<TransferBatchT> &Batches =
         Sci->FreeListInfo.BlockList.front()->Batches;
 
     if (Batches.empty()) {
       DCHECK_EQ(ClassId, SizeClassMap::BatchClassId);
-      BatchGroup *BG = Sci->FreeListInfo.BlockList.front();
+      BatchGroupT *BG = Sci->FreeListInfo.BlockList.front();
       Sci->FreeListInfo.BlockList.pop_front();
 
       // Block used by `BatchGroup` is from BatchClassId. Turn the block into
       // `TransferBatch` with single block.
-      TransferBatch *TB = reinterpret_cast<TransferBatch *>(BG);
+      TransferBatchT *TB = reinterpret_cast<TransferBatchT *>(BG);
       TB->clear();
       TB->add(
           compactPtr(SizeClassMap::BatchClassId, reinterpret_cast<uptr>(TB)));
@@ -718,13 +753,13 @@ private:
       return TB;
     }
 
-    TransferBatch *B = Batches.front();
+    TransferBatchT *B = Batches.front();
     Batches.pop_front();
     DCHECK_NE(B, nullptr);
     DCHECK_GT(B->getCount(), 0U);
 
     if (Batches.empty()) {
-      BatchGroup *BG = Sci->FreeListInfo.BlockList.front();
+      BatchGroupT *BG = Sci->FreeListInfo.BlockList.front();
       Sci->FreeListInfo.BlockList.pop_front();
 
       // We don't keep BatchGroup with zero blocks to avoid empty-checking while
@@ -763,7 +798,7 @@ private:
     }
 
     const uptr Size = getSizeByClassId(ClassId);
-    const u16 MaxCount = TransferBatch::getMaxCached(Size);
+    const u16 MaxCount = CacheT::getMaxCached(Size);
     DCHECK_GT(MaxCount, 0U);
     // The maximum number of blocks we should carve in the region is dictated
     // by the maximum number of batches we want to fill, and the amount of
@@ -776,7 +811,7 @@ private:
     DCHECK_GT(NumberOfBlocks, 0U);
 
     constexpr u32 ShuffleArraySize =
-        MaxNumBatches * TransferBatch::MaxNumCached;
+        MaxNumBatches * TransferBatchT::MaxNumCached;
     // Fill the transfer batches and put them in the size-class freelist. We
     // need to randomize the blocks for security purposes, so we first fill a
     // local array that we then shuffle before populating the batches.
@@ -856,11 +891,60 @@ private:
                 PushedBytesDelta >> 10);
   }
 
+  void getSizeClassFragmentationInfo(SizeClassInfo *Sci, uptr ClassId,
+                                     ScopedString *Str) REQUIRES(Sci->Mutex) {
+    const uptr BlockSize = getSizeByClassId(ClassId);
+    const uptr First = Sci->MinRegionIndex;
+    const uptr Last = Sci->MaxRegionIndex;
+    const uptr Base = First * RegionSize;
+    const uptr NumberOfRegions = Last - First + 1U;
+    auto SkipRegion = [this, First, ClassId](uptr RegionIndex) {
+      ScopedLock L(ByteMapMutex);
+      return (PossibleRegions[First + RegionIndex] - 1U) != ClassId;
+    };
+
+    FragmentationRecorder Recorder;
+    if (!Sci->FreeListInfo.BlockList.empty()) {
+      PageReleaseContext Context =
+          markFreeBlocks(Sci, ClassId, BlockSize, Base, NumberOfRegions,
+                         ReleaseToOS::ForceAll);
+      releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
+    }
+
+    const uptr PageSize = getPageSizeCached();
+    const uptr TotalBlocks = Sci->AllocatedUser / BlockSize;
+    const uptr InUseBlocks =
+        Sci->FreeListInfo.PoppedBlocks - Sci->FreeListInfo.PushedBlocks;
+    uptr AllocatedPagesCount = 0;
+    if (TotalBlocks != 0U) {
+      for (uptr I = 0; I < NumberOfRegions; ++I) {
+        if (SkipRegion(I))
+          continue;
+        AllocatedPagesCount += RegionSize / PageSize;
+      }
+
+      DCHECK_NE(AllocatedPagesCount, 0U);
+    }
+
+    DCHECK_GE(AllocatedPagesCount, Recorder.getReleasedPagesCount());
+    const uptr InUsePages =
+        AllocatedPagesCount - Recorder.getReleasedPagesCount();
+    const uptr InUseBytes = InUsePages * PageSize;
+
+    uptr Integral;
+    uptr Fractional;
+    computePercentage(BlockSize * InUseBlocks, InUsePages * PageSize, &Integral,
+                      &Fractional);
+    Str->append("  %02zu (%6zu): inuse/total blocks: %6zu/%6zu inuse/total "
+                "pages: %6zu/%6zu inuse bytes: %6zuK util: %3zu.%02zu%%\n",
+                ClassId, BlockSize, InUseBlocks, TotalBlocks, InUsePages,
+                AllocatedPagesCount, InUseBytes >> 10, Integral, Fractional);
+  }
+
   NOINLINE uptr releaseToOSMaybe(SizeClassInfo *Sci, uptr ClassId,
                                  ReleaseToOS ReleaseType = ReleaseToOS::Normal)
       REQUIRES(Sci->Mutex) {
     const uptr BlockSize = getSizeByClassId(ClassId);
-    const uptr PageSize = getPageSizeCached();
 
     DCHECK_GE(Sci->FreeListInfo.PoppedBlocks, Sci->FreeListInfo.PushedBlocks);
     const uptr BytesInFreeList =
@@ -871,6 +955,60 @@ private:
     if (UNLIKELY(BytesInFreeList == 0))
       return 0;
 
+    // ====================================================================== //
+    // 1. Check if we have enough free blocks and if it's worth doing a page
+    // release.
+    // ====================================================================== //
+    if (ReleaseType != ReleaseToOS::ForceAll &&
+        !hasChanceToReleasePages(Sci, BlockSize, BytesInFreeList,
+                                 ReleaseType)) {
+      return 0;
+    }
+
+    const uptr First = Sci->MinRegionIndex;
+    const uptr Last = Sci->MaxRegionIndex;
+    DCHECK_NE(Last, 0U);
+    DCHECK_LE(First, Last);
+    uptr TotalReleasedBytes = 0;
+    const uptr Base = First * RegionSize;
+    const uptr NumberOfRegions = Last - First + 1U;
+
+    // ==================================================================== //
+    // 2. Mark the free blocks and we can tell which pages are in-use by
+    //    querying `PageReleaseContext`.
+    // ==================================================================== //
+    PageReleaseContext Context = markFreeBlocks(Sci, ClassId, BlockSize, Base,
+                                                NumberOfRegions, ReleaseType);
+    if (!Context.hasBlockMarked())
+      return 0;
+
+    // ==================================================================== //
+    // 3. Release the unused physical pages back to the OS.
+    // ==================================================================== //
+    ReleaseRecorder Recorder(Base);
+    auto SkipRegion = [this, First, ClassId](uptr RegionIndex) {
+      ScopedLock L(ByteMapMutex);
+      return (PossibleRegions[First + RegionIndex] - 1U) != ClassId;
+    };
+    releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
+
+    if (Recorder.getReleasedRangesCount() > 0) {
+      Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint = BytesInFreeList;
+      Sci->ReleaseInfo.RangesReleased += Recorder.getReleasedRangesCount();
+      Sci->ReleaseInfo.LastReleasedBytes = Recorder.getReleasedBytes();
+      TotalReleasedBytes += Sci->ReleaseInfo.LastReleasedBytes;
+    }
+    Sci->ReleaseInfo.LastReleaseAtNs = getMonotonicTimeFast();
+
+    return TotalReleasedBytes;
+  }
+
+  bool hasChanceToReleasePages(SizeClassInfo *Sci, uptr BlockSize,
+                               uptr BytesInFreeList, ReleaseToOS ReleaseType)
+      REQUIRES(Sci->Mutex) {
+    DCHECK_GE(Sci->FreeListInfo.PoppedBlocks, Sci->FreeListInfo.PushedBlocks);
+    const uptr PageSize = getPageSizeCached();
+
     if (BytesInFreeList <= Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint)
       Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint = BytesInFreeList;
 
@@ -892,22 +1030,20 @@ private:
     // (BytesInFreeListAtLastCheckpoint - BytesInFreeList).
     const uptr PushedBytesDelta =
         BytesInFreeList - Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint;
-    if (PushedBytesDelta < PageSize && ReleaseType != ReleaseToOS::ForceAll)
-      return 0;
+    if (PushedBytesDelta < PageSize)
+      return false;
 
-    const bool CheckDensity =
-        isSmallBlock(BlockSize) && ReleaseType != ReleaseToOS::ForceAll;
     // Releasing smaller blocks is expensive, so we want to make sure that a
     // significant amount of bytes are free, and that there has been a good
     // amount of batches pushed to the freelist before attempting to release.
-    if (CheckDensity && ReleaseType == ReleaseToOS::Normal)
+    if (isSmallBlock(BlockSize) && ReleaseType == ReleaseToOS::Normal)
       if (PushedBytesDelta < Sci->AllocatedUser / 16U)
-        return 0;
+        return false;
 
     if (ReleaseType == ReleaseToOS::Normal) {
       const s32 IntervalMs = atomic_load_relaxed(&ReleaseToOsIntervalMs);
       if (IntervalMs < 0)
-        return 0;
+        return false;
 
       // The constant 8 here is selected from profiling some apps and the number
       // of unreleased pages in the large size classes is around 16 pages or
@@ -920,30 +1056,31 @@ private:
                 static_cast<u64>(IntervalMs) * 1000000 >
             getMonotonicTimeFast()) {
           // Memory was returned recently.
-          return 0;
+          return false;
         }
       }
     } // if (ReleaseType == ReleaseToOS::Normal)
 
-    const uptr First = Sci->MinRegionIndex;
-    const uptr Last = Sci->MaxRegionIndex;
-    DCHECK_NE(Last, 0U);
-    DCHECK_LE(First, Last);
-    uptr TotalReleasedBytes = 0;
-    const uptr Base = First * RegionSize;
-    const uptr NumberOfRegions = Last - First + 1U;
-    const uptr GroupSize = (1U << GroupSizeLog);
+    return true;
+  }
+
+  PageReleaseContext markFreeBlocks(SizeClassInfo *Sci, const uptr ClassId,
+                                    const uptr BlockSize, const uptr Base,
+                                    const uptr NumberOfRegions,
+                                    ReleaseToOS ReleaseType)
+      REQUIRES(Sci->Mutex) {
+    const uptr PageSize = getPageSizeCached();
+    const uptr GroupSize = (1UL << GroupSizeLog);
     const uptr CurGroupBase =
         compactPtrGroupBase(compactPtr(ClassId, Sci->CurrentRegion));
 
-    ReleaseRecorder Recorder(Base);
     PageReleaseContext Context(BlockSize, NumberOfRegions,
                                /*ReleaseSize=*/RegionSize);
 
     auto DecompactPtr = [](CompactPtrT CompactPtr) {
       return reinterpret_cast<uptr>(CompactPtr);
     };
-    for (BatchGroup &BG : Sci->FreeListInfo.BlockList) {
+    for (BatchGroupT &BG : Sci->FreeListInfo.BlockList) {
       const uptr GroupBase = decompactGroupBase(BG.CompactPtrGroupBase);
       // The `GroupSize` may not be divided by `BlockSize`, which means there is
       // an unused space at the end of Region. Exclude that space to avoid
@@ -960,25 +1097,27 @@ private:
                              BG.Batches.front()->getCount();
       const uptr BytesInBG = NumBlocks * BlockSize;
 
-      if (ReleaseType != ReleaseToOS::ForceAll &&
-          BytesInBG <= BG.BytesInBGAtLastCheckpoint) {
-        BG.BytesInBGAtLastCheckpoint = BytesInBG;
-        continue;
-      }
-      const uptr PushedBytesDelta = BytesInBG - BG.BytesInBGAtLastCheckpoint;
-      if (ReleaseType != ReleaseToOS::ForceAll && PushedBytesDelta < PageSize)
-        continue;
+      if (ReleaseType != ReleaseToOS::ForceAll) {
+        if (BytesInBG <= BG.BytesInBGAtLastCheckpoint) {
+          BG.BytesInBGAtLastCheckpoint = BytesInBG;
+          continue;
+        }
 
-      // Given the randomness property, we try to release the pages only if the
-      // bytes used by free blocks exceed certain proportion of allocated
-      // spaces.
-      if (CheckDensity && (BytesInBG * 100U) / AllocatedGroupSize <
-                              (100U - 1U - BlockSize / 16U)) {
-        continue;
+        const uptr PushedBytesDelta = BytesInBG - BG.BytesInBGAtLastCheckpoint;
+        if (PushedBytesDelta < PageSize)
+          continue;
+
+        // Given the randomness property, we try to release the pages only if
+        // the bytes used by free blocks exceed certain proportion of allocated
+        // spaces.
+        if (isSmallBlock(BlockSize) && (BytesInBG * 100U) / AllocatedGroupSize <
+                                           (100U - 1U - BlockSize / 16U)) {
+          continue;
+        }
       }
 
       // TODO: Consider updating this after page release if `ReleaseRecorder`
-      // can tell the releasd bytes in each group.
+      // can tell the released bytes in each group.
       BG.BytesInBGAtLastCheckpoint = BytesInBG;
 
       const uptr MaxContainedBlocks = AllocatedGroupSize / BlockSize;
@@ -1006,27 +1145,10 @@ private:
       // We may not be able to do the page release In a rare case that we may
       // fail on PageMap allocation.
       if (UNLIKELY(!Context.hasBlockMarked()))
-        return 0;
+        break;
     }
 
-    if (!Context.hasBlockMarked())
-      return 0;
-
-    auto SkipRegion = [this, First, ClassId](uptr RegionIndex) {
-      ScopedLock L(ByteMapMutex);
-      return (PossibleRegions[First + RegionIndex] - 1U) != ClassId;
-    };
-    releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
-
-    if (Recorder.getReleasedRangesCount() > 0) {
-      Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint = BytesInFreeList;
-      Sci->ReleaseInfo.RangesReleased += Recorder.getReleasedRangesCount();
-      Sci->ReleaseInfo.LastReleasedBytes = Recorder.getReleasedBytes();
-      TotalReleasedBytes += Sci->ReleaseInfo.LastReleasedBytes;
-    }
-    Sci->ReleaseInfo.LastReleaseAtNs = getMonotonicTimeFast();
-
-    return TotalReleasedBytes;
+    return Context;
   }
 
   SizeClassInfo SizeClassInfoArray[NumClasses] = {};
diff --git a/Telegram/ThirdParty/scudo/primary64.h b/Telegram/ThirdParty/scudo/primary64.h
index fd7a1f9e8..9a642d236 100644
--- a/Telegram/ThirdParty/scudo/primary64.h
+++ b/Telegram/ThirdParty/scudo/primary64.h
@@ -9,6 +9,7 @@
 #ifndef SCUDO_PRIMARY64_H_
 #define SCUDO_PRIMARY64_H_
 
+#include "allocator_common.h"
 #include "bytemap.h"
 #include "common.h"
 #include "list.h"
@@ -21,6 +22,8 @@
 #include "string_utils.h"
 #include "thread_annotations.h"
 
+#include "condition_variable.h"
+
 namespace scudo {
 
 // SizeClassAllocator64 is an allocator tuned for 64-bit address space.
@@ -47,27 +50,39 @@ template <typename Config> class SizeClassAllocator64 {
 public:
   typedef typename Config::Primary::CompactPtrT CompactPtrT;
   typedef typename Config::Primary::SizeClassMap SizeClassMap;
+  typedef typename ConditionVariableState<
+      typename Config::Primary>::ConditionVariableT ConditionVariableT;
   static const uptr CompactPtrScale = Config::Primary::CompactPtrScale;
+  static const uptr RegionSizeLog = Config::Primary::RegionSizeLog;
   static const uptr GroupSizeLog = Config::Primary::GroupSizeLog;
+  static_assert(RegionSizeLog >= GroupSizeLog,
+                "Group size shouldn't be greater than the region size");
   static const uptr GroupScale = GroupSizeLog - CompactPtrScale;
   typedef SizeClassAllocator64<Config> ThisT;
   typedef SizeClassAllocatorLocalCache<ThisT> CacheT;
-  typedef typename CacheT::TransferBatch TransferBatch;
-  typedef typename CacheT::BatchGroup BatchGroup;
+  typedef TransferBatch<ThisT> TransferBatchT;
+  typedef BatchGroup<ThisT> BatchGroupT;
+
+  static_assert(sizeof(BatchGroupT) <= sizeof(TransferBatchT),
+                "BatchGroupT uses the same class size as TransferBatchT");
 
   static uptr getSizeByClassId(uptr ClassId) {
     return (ClassId == SizeClassMap::BatchClassId)
-               ? roundUp(sizeof(TransferBatch), 1U << CompactPtrScale)
+               ? roundUp(sizeof(TransferBatchT), 1U << CompactPtrScale)
                : SizeClassMap::getSizeByClassId(ClassId);
   }
 
   static bool canAllocate(uptr Size) { return Size <= SizeClassMap::MaxSize; }
 
+  static bool conditionVariableEnabled() {
+    return ConditionVariableState<typename Config::Primary>::enabled();
+  }
+
   void init(s32 ReleaseToOsInterval) NO_THREAD_SAFETY_ANALYSIS {
     DCHECK(isAligned(reinterpret_cast<uptr>(this), alignof(ThisT)));
 
     const uptr PageSize = getPageSizeCached();
-    const uptr GroupSize = (1U << GroupSizeLog);
+    const uptr GroupSize = (1UL << GroupSizeLog);
     const uptr PagesInGroup = GroupSize / PageSize;
     const uptr MinSizeClass = getSizeByClassId(1);
     // When trying to release pages back to memory, visiting smaller size
@@ -117,13 +132,13 @@ public:
 
     for (uptr I = 0; I < NumClasses; I++) {
       RegionInfo *Region = getRegionInfo(I);
+
       // The actual start of a region is offset by a random number of pages
       // when PrimaryEnableRandomOffset is set.
-      Region->RegionBeg =
-          (PrimaryBase + (I << Config::Primary::RegionSizeLog)) +
-          (Config::Primary::EnableRandomOffset
-               ? ((getRandomModN(&Seed, 16) + 1) * PageSize)
-               : 0);
+      Region->RegionBeg = (PrimaryBase + (I << RegionSizeLog)) +
+                          (Config::Primary::EnableRandomOffset
+                               ? ((getRandomModN(&Seed, 16) + 1) * PageSize)
+                               : 0);
       Region->RandState = getRandomU32(&Seed);
       // Releasing small blocks is expensive, set a higher threshold to avoid
       // frequent page releases.
@@ -134,11 +149,16 @@ public:
       Region->ReleaseInfo.LastReleaseAtNs = Time;
 
       Region->MemMapInfo.MemMap = ReservedMemory.dispatch(
-          PrimaryBase + (I << Config::Primary::RegionSizeLog), RegionSize);
+          PrimaryBase + (I << RegionSizeLog), RegionSize);
       CHECK(Region->MemMapInfo.MemMap.isAllocated());
     }
     shuffle(RegionInfoArray, NumClasses, &Seed);
 
+    // The binding should be done after region shuffling so that it won't bind
+    // the FLLock from the wrong region.
+    for (uptr I = 0; I < NumClasses; I++)
+      getRegionInfo(I)->FLLockCV.bindTestOnly(getRegionInfo(I)->FLLock);
+
     setOption(Option::ReleaseInterval, static_cast<sptr>(ReleaseToOsInterval));
   }
 
@@ -165,7 +185,7 @@ public:
       ScopedLock FL(Region->FLLock);
       const uptr BlockSize = getSizeByClassId(I);
       uptr TotalBlocks = 0;
-      for (BatchGroup &BG : Region->FreeListInfo.BlockList) {
+      for (BatchGroupT &BG : Region->FreeListInfo.BlockList) {
         // `BG::Batches` are `TransferBatches`. +1 for `BatchGroup`.
         BatchClassUsedInFreeLists += BG.Batches.size() + 1;
         for (const auto &It : BG.Batches)
@@ -182,7 +202,7 @@ public:
     ScopedLock FL(Region->FLLock);
     const uptr BlockSize = getSizeByClassId(SizeClassMap::BatchClassId);
     uptr TotalBlocks = 0;
-    for (BatchGroup &BG : Region->FreeListInfo.BlockList) {
+    for (BatchGroupT &BG : Region->FreeListInfo.BlockList) {
       if (LIKELY(!BG.Batches.empty())) {
         for (const auto &It : BG.Batches)
           TotalBlocks += It.getCount();
@@ -201,51 +221,64 @@ public:
     DCHECK_EQ(BlocksInUse, BatchClassUsedInFreeLists);
   }
 
-  TransferBatch *popBatch(CacheT *C, uptr ClassId) {
+  // Note that the `MaxBlockCount` will be used when we support arbitrary blocks
+  // count. Now it's the same as the number of blocks stored in the
+  // `TransferBatch`.
+  u16 popBlocks(CacheT *C, uptr ClassId, CompactPtrT *ToArray,
+                UNUSED const u16 MaxBlockCount) {
+    TransferBatchT *B = popBatch(C, ClassId);
+    if (!B)
+      return 0;
+
+    const u16 Count = B->getCount();
+    DCHECK_GT(Count, 0U);
+    B->moveToArray(ToArray);
+
+    if (ClassId != SizeClassMap::BatchClassId)
+      C->deallocate(SizeClassMap::BatchClassId, B);
+
+    return Count;
+  }
+
+  TransferBatchT *popBatch(CacheT *C, uptr ClassId) {
     DCHECK_LT(ClassId, NumClasses);
     RegionInfo *Region = getRegionInfo(ClassId);
 
     {
       ScopedLock L(Region->FLLock);
-      TransferBatch *B = popBatchImpl(C, ClassId, Region);
+      TransferBatchT *B = popBatchImpl(C, ClassId, Region);
       if (LIKELY(B))
         return B;
     }
 
-    bool PrintStats = false;
-    TransferBatch *B = nullptr;
+    bool ReportRegionExhausted = false;
+    TransferBatchT *B = nullptr;
 
-    while (true) {
-      // When two threads compete for `Region->MMLock`, we only want one of them
-      // does the populateFreeListAndPopBatch(). To avoid both of them doing
-      // that, always check the freelist before mapping new pages.
-      //
-      // TODO(chiahungduan): Use a condition variable so that we don't need to
-      // hold `Region->MMLock` here.
-      ScopedLock ML(Region->MMLock);
-      {
-        ScopedLock FL(Region->FLLock);
-        B = popBatchImpl(C, ClassId, Region);
-        if (LIKELY(B))
-          return B;
+    if (conditionVariableEnabled()) {
+      B = popBatchWithCV(C, ClassId, Region, ReportRegionExhausted);
+    } else {
+      while (true) {
+        // When two threads compete for `Region->MMLock`, we only want one of
+        // them to call populateFreeListAndPopBatch(). To avoid both of them
+        // doing that, always check the freelist before mapping new pages.
+        ScopedLock ML(Region->MMLock);
+        {
+          ScopedLock FL(Region->FLLock);
+          if ((B = popBatchImpl(C, ClassId, Region)))
+            break;
+        }
+
+        const bool RegionIsExhausted = Region->Exhausted;
+        if (!RegionIsExhausted)
+          B = populateFreeListAndPopBatch(C, ClassId, Region);
+        ReportRegionExhausted = !RegionIsExhausted && Region->Exhausted;
+        break;
       }
-
-      const bool RegionIsExhausted = Region->Exhausted;
-      if (!RegionIsExhausted)
-        B = populateFreeListAndPopBatch(C, ClassId, Region);
-      PrintStats = !RegionIsExhausted && Region->Exhausted;
-      break;
     }
 
-    // Note that `getStats()` requires locking each region so we can't call it
-    // while locking the Region->Mutex in the above.
-    if (UNLIKELY(PrintStats)) {
-      ScopedString Str;
-      getStats(&Str);
-      Str.append(
-          "Scudo OOM: The process has exhausted %zuM for size class %zu.\n",
-          RegionSize >> 20, getSizeByClassId(ClassId));
-      Str.output();
+    if (UNLIKELY(ReportRegionExhausted)) {
+      Printf("Can't populate more pages for size class %zu.\n",
+             getSizeByClassId(ClassId));
 
       // Theoretically, BatchClass shouldn't be used up. Abort immediately  when
       // it happens.
@@ -265,30 +298,36 @@ public:
     if (ClassId == SizeClassMap::BatchClassId) {
       ScopedLock L(Region->FLLock);
       pushBatchClassBlocks(Region, Array, Size);
+      if (conditionVariableEnabled())
+        Region->FLLockCV.notifyAll(Region->FLLock);
       return;
     }
 
     // TODO(chiahungduan): Consider not doing grouping if the group size is not
     // greater than the block size with a certain scale.
 
-    // Sort the blocks so that blocks belonging to the same group can be pushed
-    // together.
     bool SameGroup = true;
-    for (u32 I = 1; I < Size; ++I) {
-      if (compactPtrGroup(Array[I - 1]) != compactPtrGroup(Array[I]))
-        SameGroup = false;
-      CompactPtrT Cur = Array[I];
-      u32 J = I;
-      while (J > 0 && compactPtrGroup(Cur) < compactPtrGroup(Array[J - 1])) {
-        Array[J] = Array[J - 1];
-        --J;
+    if (GroupSizeLog < RegionSizeLog) {
+      // Sort the blocks so that blocks belonging to the same group can be
+      // pushed together.
+      for (u32 I = 1; I < Size; ++I) {
+        if (compactPtrGroup(Array[I - 1]) != compactPtrGroup(Array[I]))
+          SameGroup = false;
+        CompactPtrT Cur = Array[I];
+        u32 J = I;
+        while (J > 0 && compactPtrGroup(Cur) < compactPtrGroup(Array[J - 1])) {
+          Array[J] = Array[J - 1];
+          --J;
+        }
+        Array[J] = Cur;
       }
-      Array[J] = Cur;
     }
 
     {
       ScopedLock L(Region->FLLock);
       pushBlocksImpl(C, ClassId, Region, Array, Size, SameGroup);
+      if (conditionVariableEnabled())
+        Region->FLLockCV.notifyAll(Region->FLLock);
     }
   }
 
@@ -363,6 +402,18 @@ public:
     }
   }
 
+  void getFragmentationInfo(ScopedString *Str) {
+    Str->append(
+        "Fragmentation Stats: SizeClassAllocator64: page size = %zu bytes\n",
+        getPageSizeCached());
+
+    for (uptr I = 1; I < NumClasses; I++) {
+      RegionInfo *Region = getRegionInfo(I);
+      ScopedLock L(Region->MMLock);
+      getRegionFragmentationInfo(Region, I, Str);
+    }
+  }
+
   bool setOption(Option O, sptr Value) {
     if (O == Option::ReleaseInterval) {
       const s32 Interval = Max(Min(static_cast<s32>(Value),
@@ -477,7 +528,7 @@ public:
   AtomicOptions Options;
 
 private:
-  static const uptr RegionSize = 1UL << Config::Primary::RegionSizeLog;
+  static const uptr RegionSize = 1UL << RegionSizeLog;
   static const uptr NumClasses = SizeClassMap::NumClasses;
   static const uptr PrimarySize = RegionSize * NumClasses;
 
@@ -493,7 +544,7 @@ private:
   };
 
   struct BlocksInfo {
-    SinglyLinkedList<BatchGroup> BlockList = {};
+    SinglyLinkedList<BatchGroupT> BlockList = {};
     uptr PoppedBlocks = 0;
     uptr PushedBlocks = 0;
   };
@@ -509,6 +560,7 @@ private:
   struct UnpaddedRegionInfo {
     // Mutex for operations on freelist
     HybridMutex FLLock;
+    ConditionVariableT FLLockCV GUARDED_BY(FLLock);
     // Mutex for memmap operations
     HybridMutex MMLock ACQUIRED_BEFORE(FLLock);
     // `RegionBeg` is initialized before thread creation and won't be changed.
@@ -520,6 +572,7 @@ private:
     uptr TryReleaseThreshold GUARDED_BY(MMLock) = 0;
     ReleaseToOsInfo ReleaseInfo GUARDED_BY(MMLock) = {};
     bool Exhausted GUARDED_BY(MMLock) = false;
+    bool isPopulatingFreeList GUARDED_BY(FLLock) = false;
   };
   struct RegionInfo : UnpaddedRegionInfo {
     char Padding[SCUDO_CACHE_LINE_SIZE -
@@ -605,11 +658,11 @@ private:
     // reusable and don't need additional space for them.
 
     Region->FreeListInfo.PushedBlocks += Size;
-    BatchGroup *BG = Region->FreeListInfo.BlockList.front();
+    BatchGroupT *BG = Region->FreeListInfo.BlockList.front();
 
     if (BG == nullptr) {
       // Construct `BatchGroup` on the last element.
-      BG = reinterpret_cast<BatchGroup *>(
+      BG = reinterpret_cast<BatchGroupT *>(
           decompactPtr(SizeClassMap::BatchClassId, Array[Size - 1]));
       --Size;
       BG->Batches.clear();
@@ -620,8 +673,8 @@ private:
       // from `CreateGroup` in `pushBlocksImpl`
       BG->PushedBlocks = 1;
       BG->BytesInBGAtLastCheckpoint = 0;
-      BG->MaxCachedPerBatch = TransferBatch::getMaxCached(
-          getSizeByClassId(SizeClassMap::BatchClassId));
+      BG->MaxCachedPerBatch =
+          CacheT::getMaxCached(getSizeByClassId(SizeClassMap::BatchClassId));
 
       Region->FreeListInfo.BlockList.push_front(BG);
     }
@@ -634,7 +687,7 @@ private:
     //   2. Only 1 block is pushed when the freelist is empty.
     if (BG->Batches.empty()) {
       // Construct the `TransferBatch` on the last element.
-      TransferBatch *TB = reinterpret_cast<TransferBatch *>(
+      TransferBatchT *TB = reinterpret_cast<TransferBatchT *>(
           decompactPtr(SizeClassMap::BatchClassId, Array[Size - 1]));
       TB->clear();
       // As mentioned above, addresses of `TransferBatch` and `BatchGroup` are
@@ -649,14 +702,14 @@ private:
       BG->Batches.push_front(TB);
     }
 
-    TransferBatch *CurBatch = BG->Batches.front();
+    TransferBatchT *CurBatch = BG->Batches.front();
     DCHECK_NE(CurBatch, nullptr);
 
     for (u32 I = 0; I < Size;) {
       u16 UnusedSlots =
           static_cast<u16>(BG->MaxCachedPerBatch - CurBatch->getCount());
       if (UnusedSlots == 0) {
-        CurBatch = reinterpret_cast<TransferBatch *>(
+        CurBatch = reinterpret_cast<TransferBatchT *>(
             decompactPtr(SizeClassMap::BatchClassId, Array[I]));
         CurBatch->clear();
         // Self-contained
@@ -699,24 +752,25 @@ private:
     DCHECK_GT(Size, 0U);
 
     auto CreateGroup = [&](uptr CompactPtrGroupBase) {
-      BatchGroup *BG = C->createGroup();
+      BatchGroupT *BG =
+          reinterpret_cast<BatchGroupT *>(C->getBatchClassBlock());
       BG->Batches.clear();
-      TransferBatch *TB = C->createBatch(ClassId, nullptr);
+      TransferBatchT *TB =
+          reinterpret_cast<TransferBatchT *>(C->getBatchClassBlock());
       TB->clear();
 
       BG->CompactPtrGroupBase = CompactPtrGroupBase;
       BG->Batches.push_front(TB);
       BG->PushedBlocks = 0;
       BG->BytesInBGAtLastCheckpoint = 0;
-      BG->MaxCachedPerBatch =
-          TransferBatch::getMaxCached(getSizeByClassId(ClassId));
+      BG->MaxCachedPerBatch = CacheT::getMaxCached(getSizeByClassId(ClassId));
 
       return BG;
     };
 
-    auto InsertBlocks = [&](BatchGroup *BG, CompactPtrT *Array, u32 Size) {
-      SinglyLinkedList<TransferBatch> &Batches = BG->Batches;
-      TransferBatch *CurBatch = Batches.front();
+    auto InsertBlocks = [&](BatchGroupT *BG, CompactPtrT *Array, u32 Size) {
+      SinglyLinkedList<TransferBatchT> &Batches = BG->Batches;
+      TransferBatchT *CurBatch = Batches.front();
       DCHECK_NE(CurBatch, nullptr);
 
       for (u32 I = 0; I < Size;) {
@@ -724,9 +778,8 @@ private:
         u16 UnusedSlots =
             static_cast<u16>(BG->MaxCachedPerBatch - CurBatch->getCount());
         if (UnusedSlots == 0) {
-          CurBatch = C->createBatch(
-              ClassId,
-              reinterpret_cast<void *>(decompactPtr(ClassId, Array[I])));
+          CurBatch =
+              reinterpret_cast<TransferBatchT *>(C->getBatchClassBlock());
           CurBatch->clear();
           Batches.push_front(CurBatch);
           UnusedSlots = BG->MaxCachedPerBatch;
@@ -741,21 +794,11 @@ private:
     };
 
     Region->FreeListInfo.PushedBlocks += Size;
-    BatchGroup *Cur = Region->FreeListInfo.BlockList.front();
-
-    if (ClassId == SizeClassMap::BatchClassId) {
-      if (Cur == nullptr) {
-        // Don't need to classify BatchClassId.
-        Cur = CreateGroup(/*CompactPtrGroupBase=*/0);
-        Region->FreeListInfo.BlockList.push_front(Cur);
-      }
-      InsertBlocks(Cur, Array, Size);
-      return;
-    }
+    BatchGroupT *Cur = Region->FreeListInfo.BlockList.front();
 
     // In the following, `Cur` always points to the BatchGroup for blocks that
     // will be pushed next. `Prev` is the element right before `Cur`.
-    BatchGroup *Prev = nullptr;
+    BatchGroupT *Prev = nullptr;
 
     while (Cur != nullptr &&
            compactPtrGroup(Array[0]) > Cur->CompactPtrGroupBase) {
@@ -812,26 +855,96 @@ private:
     InsertBlocks(Cur, Array + Size - Count, Count);
   }
 
+  TransferBatchT *popBatchWithCV(CacheT *C, uptr ClassId, RegionInfo *Region,
+                                 bool &ReportRegionExhausted) {
+    TransferBatchT *B = nullptr;
+
+    while (true) {
+      // We only expect one thread doing the freelist refillment and other
+      // threads will be waiting for either the completion of the
+      // `populateFreeListAndPopBatch()` or `pushBlocks()` called by other
+      // threads.
+      bool PopulateFreeList = false;
+      {
+        ScopedLock FL(Region->FLLock);
+        if (!Region->isPopulatingFreeList) {
+          Region->isPopulatingFreeList = true;
+          PopulateFreeList = true;
+        }
+      }
+
+      if (PopulateFreeList) {
+        ScopedLock ML(Region->MMLock);
+
+        const bool RegionIsExhausted = Region->Exhausted;
+        if (!RegionIsExhausted)
+          B = populateFreeListAndPopBatch(C, ClassId, Region);
+        ReportRegionExhausted = !RegionIsExhausted && Region->Exhausted;
+
+        {
+          // Before reacquiring the `FLLock`, the freelist may be used up again
+          // and some threads are waiting for the freelist refillment by the
+          // current thread. It's important to set
+          // `Region->isPopulatingFreeList` to false so the threads about to
+          // sleep will notice the status change.
+          ScopedLock FL(Region->FLLock);
+          Region->isPopulatingFreeList = false;
+          Region->FLLockCV.notifyAll(Region->FLLock);
+        }
+
+        break;
+      }
+
+      // At here, there are two preconditions to be met before waiting,
+      //   1. The freelist is empty.
+      //   2. Region->isPopulatingFreeList == true, i.e, someone is still doing
+      //   `populateFreeListAndPopBatch()`.
+      //
+      // Note that it has the chance that freelist is empty but
+      // Region->isPopulatingFreeList == false because all the new populated
+      // blocks were used up right after the refillment. Therefore, we have to
+      // check if someone is still populating the freelist.
+      ScopedLock FL(Region->FLLock);
+      if (LIKELY(B = popBatchImpl(C, ClassId, Region)))
+        break;
+
+      if (!Region->isPopulatingFreeList)
+        continue;
+
+      // Now the freelist is empty and someone's doing the refillment. We will
+      // wait until anyone refills the freelist or someone finishes doing
+      // `populateFreeListAndPopBatch()`. The refillment can be done by
+      // `populateFreeListAndPopBatch()`, `pushBlocks()`,
+      // `pushBatchClassBlocks()` and `mergeGroupsToReleaseBack()`.
+      Region->FLLockCV.wait(Region->FLLock);
+
+      if (LIKELY(B = popBatchImpl(C, ClassId, Region)))
+        break;
+    }
+
+    return B;
+  }
+
   // Pop one TransferBatch from a BatchGroup. The BatchGroup with the smallest
   // group id will be considered first.
   //
   // The region mutex needs to be held while calling this method.
-  TransferBatch *popBatchImpl(CacheT *C, uptr ClassId, RegionInfo *Region)
+  TransferBatchT *popBatchImpl(CacheT *C, uptr ClassId, RegionInfo *Region)
       REQUIRES(Region->FLLock) {
     if (Region->FreeListInfo.BlockList.empty())
       return nullptr;
 
-    SinglyLinkedList<TransferBatch> &Batches =
+    SinglyLinkedList<TransferBatchT> &Batches =
         Region->FreeListInfo.BlockList.front()->Batches;
 
     if (Batches.empty()) {
       DCHECK_EQ(ClassId, SizeClassMap::BatchClassId);
-      BatchGroup *BG = Region->FreeListInfo.BlockList.front();
+      BatchGroupT *BG = Region->FreeListInfo.BlockList.front();
       Region->FreeListInfo.BlockList.pop_front();
 
       // Block used by `BatchGroup` is from BatchClassId. Turn the block into
       // `TransferBatch` with single block.
-      TransferBatch *TB = reinterpret_cast<TransferBatch *>(BG);
+      TransferBatchT *TB = reinterpret_cast<TransferBatchT *>(BG);
       TB->clear();
       TB->add(
           compactPtr(SizeClassMap::BatchClassId, reinterpret_cast<uptr>(TB)));
@@ -839,13 +952,13 @@ private:
       return TB;
     }
 
-    TransferBatch *B = Batches.front();
+    TransferBatchT *B = Batches.front();
     Batches.pop_front();
     DCHECK_NE(B, nullptr);
     DCHECK_GT(B->getCount(), 0U);
 
     if (Batches.empty()) {
-      BatchGroup *BG = Region->FreeListInfo.BlockList.front();
+      BatchGroupT *BG = Region->FreeListInfo.BlockList.front();
       Region->FreeListInfo.BlockList.pop_front();
 
       // We don't keep BatchGroup with zero blocks to avoid empty-checking while
@@ -863,11 +976,11 @@ private:
   }
 
   // Refill the freelist and return one batch.
-  NOINLINE TransferBatch *populateFreeListAndPopBatch(CacheT *C, uptr ClassId,
-                                                      RegionInfo *Region)
+  NOINLINE TransferBatchT *populateFreeListAndPopBatch(CacheT *C, uptr ClassId,
+                                                       RegionInfo *Region)
       REQUIRES(Region->MMLock) EXCLUDES(Region->FLLock) {
     const uptr Size = getSizeByClassId(ClassId);
-    const u16 MaxCount = TransferBatch::getMaxCached(Size);
+    const u16 MaxCount = CacheT::getMaxCached(Size);
 
     const uptr RegionBeg = Region->RegionBeg;
     const uptr MappedUser = Region->MemMapInfo.MappedUser;
@@ -903,7 +1016,7 @@ private:
     DCHECK_GT(NumberOfBlocks, 0);
 
     constexpr u32 ShuffleArraySize =
-        MaxNumBatches * TransferBatch::MaxNumCached;
+        MaxNumBatches * TransferBatchT::MaxNumCached;
     CompactPtrT ShuffleArray[ShuffleArraySize];
     DCHECK_LE(NumberOfBlocks, ShuffleArraySize);
 
@@ -936,7 +1049,7 @@ private:
       pushBatchClassBlocks(Region, ShuffleArray, NumberOfBlocks);
     }
 
-    TransferBatch *B = popBatchImpl(C, ClassId, Region);
+    TransferBatchT *B = popBatchImpl(C, ClassId, Region);
     DCHECK_NE(B, nullptr);
 
     // Note that `PushedBlocks` and `PoppedBlocks` are supposed to only record
@@ -957,10 +1070,10 @@ private:
     if (Region->MemMapInfo.MappedUser == 0)
       return;
     const uptr BlockSize = getSizeByClassId(ClassId);
-    const uptr InUse =
+    const uptr InUseBlocks =
         Region->FreeListInfo.PoppedBlocks - Region->FreeListInfo.PushedBlocks;
     const uptr BytesInFreeList =
-        Region->MemMapInfo.AllocatedUser - InUse * BlockSize;
+        Region->MemMapInfo.AllocatedUser - InUseBlocks * BlockSize;
     uptr RegionPushedBytesDelta = 0;
     if (BytesInFreeList >=
         Region->ReleaseInfo.BytesInFreeListAtLastCheckpoint) {
@@ -972,122 +1085,145 @@ private:
         "%s %02zu (%6zu): mapped: %6zuK popped: %7zu pushed: %7zu "
         "inuse: %6zu total: %6zu releases: %6zu last "
         "released: %6zuK latest pushed bytes: %6zuK region: 0x%zx (0x%zx)\n",
-        Region->Exhausted ? "F" : " ", ClassId, getSizeByClassId(ClassId),
+        Region->Exhausted ? "E" : " ", ClassId, getSizeByClassId(ClassId),
         Region->MemMapInfo.MappedUser >> 10, Region->FreeListInfo.PoppedBlocks,
-        Region->FreeListInfo.PushedBlocks, InUse, TotalChunks,
+        Region->FreeListInfo.PushedBlocks, InUseBlocks, TotalChunks,
         Region->ReleaseInfo.RangesReleased,
         Region->ReleaseInfo.LastReleasedBytes >> 10,
         RegionPushedBytesDelta >> 10, Region->RegionBeg,
         getRegionBaseByClassId(ClassId));
   }
 
+  void getRegionFragmentationInfo(RegionInfo *Region, uptr ClassId,
+                                  ScopedString *Str) REQUIRES(Region->MMLock) {
+    const uptr BlockSize = getSizeByClassId(ClassId);
+    const uptr AllocatedUserEnd =
+        Region->MemMapInfo.AllocatedUser + Region->RegionBeg;
+
+    SinglyLinkedList<BatchGroupT> GroupsToRelease;
+    {
+      ScopedLock L(Region->FLLock);
+      GroupsToRelease = Region->FreeListInfo.BlockList;
+      Region->FreeListInfo.BlockList.clear();
+    }
+
+    FragmentationRecorder Recorder;
+    if (!GroupsToRelease.empty()) {
+      PageReleaseContext Context =
+          markFreeBlocks(Region, BlockSize, AllocatedUserEnd,
+                         getCompactPtrBaseByClassId(ClassId), GroupsToRelease);
+      auto SkipRegion = [](UNUSED uptr RegionIndex) { return false; };
+      releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
+
+      mergeGroupsToReleaseBack(Region, GroupsToRelease);
+    }
+
+    ScopedLock L(Region->FLLock);
+    const uptr PageSize = getPageSizeCached();
+    const uptr TotalBlocks = Region->MemMapInfo.AllocatedUser / BlockSize;
+    const uptr InUseBlocks =
+        Region->FreeListInfo.PoppedBlocks - Region->FreeListInfo.PushedBlocks;
+    const uptr AllocatedPagesCount =
+        roundUp(Region->MemMapInfo.AllocatedUser, PageSize) / PageSize;
+    DCHECK_GE(AllocatedPagesCount, Recorder.getReleasedPagesCount());
+    const uptr InUsePages =
+        AllocatedPagesCount - Recorder.getReleasedPagesCount();
+    const uptr InUseBytes = InUsePages * PageSize;
+
+    uptr Integral;
+    uptr Fractional;
+    computePercentage(BlockSize * InUseBlocks, InUsePages * PageSize, &Integral,
+                      &Fractional);
+    Str->append("  %02zu (%6zu): inuse/total blocks: %6zu/%6zu inuse/total "
+                "pages: %6zu/%6zu inuse bytes: %6zuK util: %3zu.%02zu%%\n",
+                ClassId, BlockSize, InUseBlocks, TotalBlocks, InUsePages,
+                AllocatedPagesCount, InUseBytes >> 10, Integral, Fractional);
+  }
+
   NOINLINE uptr releaseToOSMaybe(RegionInfo *Region, uptr ClassId,
                                  ReleaseToOS ReleaseType = ReleaseToOS::Normal)
       REQUIRES(Region->MMLock) EXCLUDES(Region->FLLock) {
-    ScopedLock L(Region->FLLock);
-
     const uptr BlockSize = getSizeByClassId(ClassId);
-    const uptr BytesInFreeList =
-        Region->MemMapInfo.AllocatedUser - (Region->FreeListInfo.PoppedBlocks -
-                                            Region->FreeListInfo.PushedBlocks) *
-                                               BlockSize;
-    if (UNLIKELY(BytesInFreeList == 0))
-      return false;
-
+    uptr BytesInFreeList;
     const uptr AllocatedUserEnd =
         Region->MemMapInfo.AllocatedUser + Region->RegionBeg;
-    const uptr CompactPtrBase = getCompactPtrBaseByClassId(ClassId);
+    SinglyLinkedList<BatchGroupT> GroupsToRelease;
 
-    // ====================================================================== //
-    // 1. Check if we have enough free blocks and if it's worth doing a page
-    //    release.
-    // ====================================================================== //
-    if (ReleaseType != ReleaseToOS::ForceAll &&
-        !hasChanceToReleasePages(Region, BlockSize, BytesInFreeList,
-                                 ReleaseType)) {
-      return 0;
-    }
+    {
+      ScopedLock L(Region->FLLock);
 
-    // ====================================================================== //
-    // 2. Determine which groups can release the pages. Use a heuristic to
-    //    gather groups that are candidates for doing a release.
-    // ====================================================================== //
-    SinglyLinkedList<BatchGroup> GroupsToRelease;
-    if (ReleaseType == ReleaseToOS::ForceAll) {
-      GroupsToRelease = Region->FreeListInfo.BlockList;
-      Region->FreeListInfo.BlockList.clear();
-    } else {
-      GroupsToRelease = collectGroupsToRelease(
-          Region, BlockSize, AllocatedUserEnd, CompactPtrBase);
-    }
-    if (GroupsToRelease.empty())
-      return 0;
+      BytesInFreeList = Region->MemMapInfo.AllocatedUser -
+                        (Region->FreeListInfo.PoppedBlocks -
+                         Region->FreeListInfo.PushedBlocks) *
+                            BlockSize;
+      if (UNLIKELY(BytesInFreeList == 0))
+        return false;
 
-    // Ideally, we should use a class like `ScopedUnlock`. However, this form of
-    // unlocking is not supported by the thread-safety analysis. See
-    // https://clang.llvm.org/docs/ThreadSafetyAnalysis.html#no-alias-analysis
-    // for more details.
-    // Put it as local class so that we can mark the ctor/dtor with proper
-    // annotations associated to the target lock. Note that accessing the
-    // function variable in local class only works in thread-safety annotations.
-    // TODO: Implement general `ScopedUnlock` when it's supported.
-    class FLLockScopedUnlock {
-    public:
-      FLLockScopedUnlock(RegionInfo *Region) RELEASE(Region->FLLock)
-          : R(Region) {
-        R->FLLock.assertHeld();
-        R->FLLock.unlock();
+      // ==================================================================== //
+      // 1. Check if we have enough free blocks and if it's worth doing a page
+      //    release.
+      // ==================================================================== //
+      if (ReleaseType != ReleaseToOS::ForceAll &&
+          !hasChanceToReleasePages(Region, BlockSize, BytesInFreeList,
+                                   ReleaseType)) {
+        return 0;
       }
-      ~FLLockScopedUnlock() ACQUIRE(Region->FLLock) { R->FLLock.lock(); }
 
-    private:
-      RegionInfo *R;
-    };
+      // ==================================================================== //
+      // 2. Determine which groups can release the pages. Use a heuristic to
+      //    gather groups that are candidates for doing a release.
+      // ==================================================================== //
+      if (ReleaseType == ReleaseToOS::ForceAll) {
+        GroupsToRelease = Region->FreeListInfo.BlockList;
+        Region->FreeListInfo.BlockList.clear();
+      } else {
+        GroupsToRelease =
+            collectGroupsToRelease(Region, BlockSize, AllocatedUserEnd,
+                                   getCompactPtrBaseByClassId(ClassId));
+      }
+      if (GroupsToRelease.empty())
+        return 0;
+    }
 
     // Note that we have extracted the `GroupsToRelease` from region freelist.
     // It's safe to let pushBlocks()/popBatches() access the remaining region
     // freelist. In the steps 3 and 4, we will temporarily release the FLLock
     // and lock it again before step 5.
 
-    uptr ReleasedBytes = 0;
-    {
-      FLLockScopedUnlock UL(Region);
-      // ==================================================================== //
-      // 3. Mark the free blocks in `GroupsToRelease` in the
-      //    `PageReleaseContext`. Then we can tell which pages are in-use by
-      //    querying `PageReleaseContext`.
-      // ==================================================================== //
-      PageReleaseContext Context = markFreeBlocks(
-          Region, BlockSize, AllocatedUserEnd, CompactPtrBase, GroupsToRelease);
-      if (UNLIKELY(!Context.hasBlockMarked())) {
-        ScopedLock L(Region->FLLock);
-        mergeGroupsToReleaseBack(Region, GroupsToRelease);
-        return 0;
-      }
-
-      // ==================================================================== //
-      // 4. Release the unused physical pages back to the OS.
-      // ==================================================================== //
-      RegionReleaseRecorder<MemMapT> Recorder(&Region->MemMapInfo.MemMap,
-                                              Region->RegionBeg,
-                                              Context.getReleaseOffset());
-      auto SkipRegion = [](UNUSED uptr RegionIndex) { return false; };
-      releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
-      if (Recorder.getReleasedRangesCount() > 0) {
-        Region->ReleaseInfo.BytesInFreeListAtLastCheckpoint = BytesInFreeList;
-        Region->ReleaseInfo.RangesReleased += Recorder.getReleasedRangesCount();
-        Region->ReleaseInfo.LastReleasedBytes = Recorder.getReleasedBytes();
-      }
-      Region->ReleaseInfo.LastReleaseAtNs = getMonotonicTimeFast();
-      ReleasedBytes = Recorder.getReleasedBytes();
+    // ==================================================================== //
+    // 3. Mark the free blocks in `GroupsToRelease` in the `PageReleaseContext`.
+    //    Then we can tell which pages are in-use by querying
+    //    `PageReleaseContext`.
+    // ==================================================================== //
+    PageReleaseContext Context =
+        markFreeBlocks(Region, BlockSize, AllocatedUserEnd,
+                       getCompactPtrBaseByClassId(ClassId), GroupsToRelease);
+    if (UNLIKELY(!Context.hasBlockMarked())) {
+      mergeGroupsToReleaseBack(Region, GroupsToRelease);
+      return 0;
     }
 
+    // ==================================================================== //
+    // 4. Release the unused physical pages back to the OS.
+    // ==================================================================== //
+    RegionReleaseRecorder<MemMapT> Recorder(&Region->MemMapInfo.MemMap,
+                                            Region->RegionBeg,
+                                            Context.getReleaseOffset());
+    auto SkipRegion = [](UNUSED uptr RegionIndex) { return false; };
+    releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
+    if (Recorder.getReleasedRangesCount() > 0) {
+      Region->ReleaseInfo.BytesInFreeListAtLastCheckpoint = BytesInFreeList;
+      Region->ReleaseInfo.RangesReleased += Recorder.getReleasedRangesCount();
+      Region->ReleaseInfo.LastReleasedBytes = Recorder.getReleasedBytes();
+    }
+    Region->ReleaseInfo.LastReleaseAtNs = getMonotonicTimeFast();
+
     // ====================================================================== //
     // 5. Merge the `GroupsToRelease` back to the freelist.
     // ====================================================================== //
     mergeGroupsToReleaseBack(Region, GroupsToRelease);
 
-    return ReleasedBytes;
+    return Recorder.getReleasedBytes();
   }
 
   bool hasChanceToReleasePages(RegionInfo *Region, uptr BlockSize,
@@ -1154,13 +1290,13 @@ private:
     return true;
   }
 
-  SinglyLinkedList<BatchGroup>
+  SinglyLinkedList<BatchGroupT>
   collectGroupsToRelease(RegionInfo *Region, const uptr BlockSize,
                          const uptr AllocatedUserEnd, const uptr CompactPtrBase)
       REQUIRES(Region->MMLock, Region->FLLock) {
-    const uptr GroupSize = (1U << GroupSizeLog);
+    const uptr GroupSize = (1UL << GroupSizeLog);
     const uptr PageSize = getPageSizeCached();
-    SinglyLinkedList<BatchGroup> GroupsToRelease;
+    SinglyLinkedList<BatchGroupT> GroupsToRelease;
 
     // We are examining each group and will take the minimum distance to the
     // release threshold as the next Region::TryReleaseThreshold(). Note that if
@@ -1169,8 +1305,8 @@ private:
     // the comment on `SmallerBlockReleasePageDelta` for more details.
     uptr MinDistToThreshold = GroupSize;
 
-    for (BatchGroup *BG = Region->FreeListInfo.BlockList.front(),
-                    *Prev = nullptr;
+    for (BatchGroupT *BG = Region->FreeListInfo.BlockList.front(),
+                     *Prev = nullptr;
          BG != nullptr;) {
       // Group boundary is always GroupSize-aligned from CompactPtr base. The
       // layout of memory groups is like,
@@ -1254,7 +1390,7 @@ private:
         }
       }
 
-      // If `BG` is the first BatchGroup in the list, we only need to advance
+      // If `BG` is the first BatchGroupT in the list, we only need to advance
       // `BG` and call FreeListInfo.BlockList::pop_front(). No update is needed
       // for `Prev`.
       //
@@ -1290,7 +1426,7 @@ private:
       // Note that we need to advance before pushing this BatchGroup to
       // GroupsToRelease because it's a destructive operation.
 
-      BatchGroup *Cur = BG;
+      BatchGroupT *Cur = BG;
       BG = BG->Next;
 
       // Ideally, we may want to update this only after successful release.
@@ -1323,9 +1459,9 @@ private:
   PageReleaseContext
   markFreeBlocks(RegionInfo *Region, const uptr BlockSize,
                  const uptr AllocatedUserEnd, const uptr CompactPtrBase,
-                 SinglyLinkedList<BatchGroup> &GroupsToRelease)
+                 SinglyLinkedList<BatchGroupT> &GroupsToRelease)
       REQUIRES(Region->MMLock) EXCLUDES(Region->FLLock) {
-    const uptr GroupSize = (1U << GroupSizeLog);
+    const uptr GroupSize = (1UL << GroupSizeLog);
     auto DecompactPtr = [CompactPtrBase](CompactPtrT CompactPtr) {
       return decompactPtrInternal(CompactPtrBase, CompactPtr);
     };
@@ -1352,7 +1488,7 @@ private:
     if (UNLIKELY(!Context.ensurePageMapAllocated()))
       return Context;
 
-    for (BatchGroup &BG : GroupsToRelease) {
+    for (BatchGroupT &BG : GroupsToRelease) {
       const uptr BatchGroupBase =
           decompactGroupBase(CompactPtrBase, BG.CompactPtrGroupBase);
       const uptr BatchGroupEnd = BatchGroupBase + GroupSize;
@@ -1400,8 +1536,10 @@ private:
   }
 
   void mergeGroupsToReleaseBack(RegionInfo *Region,
-                                SinglyLinkedList<BatchGroup> &GroupsToRelease)
-      REQUIRES(Region->MMLock, Region->FLLock) {
+                                SinglyLinkedList<BatchGroupT> &GroupsToRelease)
+      REQUIRES(Region->MMLock) EXCLUDES(Region->FLLock) {
+    ScopedLock L(Region->FLLock);
+
     // After merging two freelists, we may have redundant `BatchGroup`s that
     // need to be recycled. The number of unused `BatchGroup`s is expected to be
     // small. Pick a constant which is inferred from real programs.
@@ -1419,8 +1557,8 @@ private:
     // Merge GroupsToRelease back to the Region::FreeListInfo.BlockList. Note
     // that both `Region->FreeListInfo.BlockList` and `GroupsToRelease` are
     // sorted.
-    for (BatchGroup *BG = Region->FreeListInfo.BlockList.front(),
-                    *Prev = nullptr;
+    for (BatchGroupT *BG = Region->FreeListInfo.BlockList.front(),
+                     *Prev = nullptr;
          ;) {
       if (BG == nullptr || GroupsToRelease.empty()) {
         if (!GroupsToRelease.empty())
@@ -1437,8 +1575,8 @@ private:
         continue;
       }
 
-      BatchGroup *Cur = GroupsToRelease.front();
-      TransferBatch *UnusedTransferBatch = nullptr;
+      BatchGroupT *Cur = GroupsToRelease.front();
+      TransferBatchT *UnusedTransferBatch = nullptr;
       GroupsToRelease.pop_front();
 
       if (BG->CompactPtrGroupBase == Cur->CompactPtrGroupBase) {
@@ -1454,7 +1592,7 @@ private:
         if (Cur->Batches.front()->getCount() == MaxCachedPerBatch) {
           BG->Batches.append_back(&Cur->Batches);
         } else {
-          TransferBatch *NonFullBatch = Cur->Batches.front();
+          TransferBatchT *NonFullBatch = Cur->Batches.front();
           Cur->Batches.pop_front();
           const u16 NonFullBatchCount = NonFullBatch->getCount();
           // The remaining Batches in `Cur` are full.
@@ -1481,6 +1619,8 @@ private:
         if (UNLIKELY(Idx + NeededSlots > MaxUnusedSize)) {
           ScopedLock L(BatchClassRegion->FLLock);
           pushBatchClassBlocks(BatchClassRegion, Blocks, Idx);
+          if (conditionVariableEnabled())
+            BatchClassRegion->FLLockCV.notifyAll(BatchClassRegion->FLLock);
           Idx = 0;
         }
         Blocks[Idx++] =
@@ -1516,15 +1656,20 @@ private:
     if (Idx != 0) {
       ScopedLock L(BatchClassRegion->FLLock);
       pushBatchClassBlocks(BatchClassRegion, Blocks, Idx);
+      if (conditionVariableEnabled())
+        BatchClassRegion->FLLockCV.notifyAll(BatchClassRegion->FLLock);
     }
 
     if (SCUDO_DEBUG) {
-      BatchGroup *Prev = Region->FreeListInfo.BlockList.front();
-      for (BatchGroup *Cur = Prev->Next; Cur != nullptr;
+      BatchGroupT *Prev = Region->FreeListInfo.BlockList.front();
+      for (BatchGroupT *Cur = Prev->Next; Cur != nullptr;
            Prev = Cur, Cur = Cur->Next) {
         CHECK_LT(Prev->CompactPtrGroupBase, Cur->CompactPtrGroupBase);
       }
     }
+
+    if (conditionVariableEnabled())
+      Region->FLLockCV.notifyAll(Region->FLLock);
   }
 
   // TODO: `PrimaryBase` can be obtained from ReservedMemory. This needs to be
diff --git a/Telegram/ThirdParty/scudo/release.cpp b/Telegram/ThirdParty/scudo/release.cpp
index 938bb41fa..875a2b0c1 100644
--- a/Telegram/ThirdParty/scudo/release.cpp
+++ b/Telegram/ThirdParty/scudo/release.cpp
@@ -10,7 +10,8 @@
 
 namespace scudo {
 
-BufferPool<RegionPageMap::StaticBufferCount, RegionPageMap::StaticBufferSize>
+BufferPool<RegionPageMap::StaticBufferCount,
+           RegionPageMap::StaticBufferNumElements>
     RegionPageMap::Buffers;
 
 } // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/release.h b/Telegram/ThirdParty/scudo/release.h
index 5bf963d0f..b6f76a4d2 100644
--- a/Telegram/ThirdParty/scudo/release.h
+++ b/Telegram/ThirdParty/scudo/release.h
@@ -80,20 +80,53 @@ private:
   MapPlatformData *Data = nullptr;
 };
 
-// A buffer pool which holds a fixed number of static buffers for fast buffer
-// allocation. If the request size is greater than `StaticBufferSize`, it'll
+class FragmentationRecorder {
+public:
+  FragmentationRecorder() = default;
+
+  uptr getReleasedPagesCount() const { return ReleasedPagesCount; }
+
+  void releasePageRangeToOS(uptr From, uptr To) {
+    DCHECK_EQ((To - From) % getPageSizeCached(), 0U);
+    ReleasedPagesCount += (To - From) / getPageSizeCached();
+  }
+
+private:
+  uptr ReleasedPagesCount = 0;
+};
+
+// A buffer pool which holds a fixed number of static buffers of `uptr` elements
+// for fast buffer allocation. If the request size is greater than
+// `StaticBufferNumElements` or if all the static buffers are in use, it'll
 // delegate the allocation to map().
-template <uptr StaticBufferCount, uptr StaticBufferSize> class BufferPool {
+template <uptr StaticBufferCount, uptr StaticBufferNumElements>
+class BufferPool {
 public:
   // Preserve 1 bit in the `Mask` so that we don't need to do zero-check while
   // extracting the least significant bit from the `Mask`.
   static_assert(StaticBufferCount < SCUDO_WORDSIZE, "");
-  static_assert(isAligned(StaticBufferSize, SCUDO_CACHE_LINE_SIZE), "");
+  static_assert(isAligned(StaticBufferNumElements * sizeof(uptr),
+                          SCUDO_CACHE_LINE_SIZE),
+                "");
 
-  // Return a buffer which is at least `BufferSize`.
-  uptr *getBuffer(const uptr BufferSize) {
-    if (UNLIKELY(BufferSize > StaticBufferSize))
-      return getDynamicBuffer(BufferSize);
+  struct Buffer {
+    // Pointer to the buffer's memory, or nullptr if no buffer was allocated.
+    uptr *Data = nullptr;
+
+    // The index of the underlying static buffer, or StaticBufferCount if this
+    // buffer was dynamically allocated. This value is initially set to a poison
+    // value to aid debugging.
+    uptr BufferIndex = ~static_cast<uptr>(0);
+
+    // Only valid if BufferIndex == StaticBufferCount.
+    MemMapT MemMap = {};
+  };
+
+  // Return a zero-initialized buffer which can contain at least the given
+  // number of elements, or nullptr on failure.
+  Buffer getBuffer(const uptr NumElements) {
+    if (UNLIKELY(NumElements > StaticBufferNumElements))
+      return getDynamicBuffer(NumElements);
 
     uptr index;
     {
@@ -108,69 +141,55 @@ public:
     }
 
     if (index >= StaticBufferCount)
-      return getDynamicBuffer(BufferSize);
+      return getDynamicBuffer(NumElements);
 
-    const uptr Offset = index * StaticBufferSize;
-    memset(&RawBuffer[Offset], 0, StaticBufferSize);
-    return &RawBuffer[Offset];
+    Buffer Buf;
+    Buf.Data = &RawBuffer[index * StaticBufferNumElements];
+    Buf.BufferIndex = index;
+    memset(Buf.Data, 0, StaticBufferNumElements * sizeof(uptr));
+    return Buf;
   }
 
-  void releaseBuffer(uptr *Buffer, const uptr BufferSize) {
-    const uptr index = getStaticBufferIndex(Buffer, BufferSize);
-    if (index < StaticBufferCount) {
+  void releaseBuffer(Buffer Buf) {
+    DCHECK_NE(Buf.Data, nullptr);
+    DCHECK_LE(Buf.BufferIndex, StaticBufferCount);
+    if (Buf.BufferIndex != StaticBufferCount) {
       ScopedLock L(Mutex);
-      DCHECK_EQ((Mask & (static_cast<uptr>(1) << index)), 0U);
-      Mask |= static_cast<uptr>(1) << index;
+      DCHECK_EQ((Mask & (static_cast<uptr>(1) << Buf.BufferIndex)), 0U);
+      Mask |= static_cast<uptr>(1) << Buf.BufferIndex;
     } else {
-      unmap(reinterpret_cast<void *>(Buffer),
-            roundUp(BufferSize, getPageSizeCached()));
+      Buf.MemMap.unmap(Buf.MemMap.getBase(), Buf.MemMap.getCapacity());
     }
   }
 
-  bool isStaticBufferTestOnly(uptr *Buffer, uptr BufferSize) {
-    return getStaticBufferIndex(Buffer, BufferSize) < StaticBufferCount;
+  bool isStaticBufferTestOnly(const Buffer &Buf) {
+    DCHECK_NE(Buf.Data, nullptr);
+    DCHECK_LE(Buf.BufferIndex, StaticBufferCount);
+    return Buf.BufferIndex != StaticBufferCount;
   }
 
 private:
-  uptr getStaticBufferIndex(uptr *Buffer, uptr BufferSize) {
-    if (UNLIKELY(BufferSize > StaticBufferSize))
-      return StaticBufferCount;
-
-    const uptr BufferBase = reinterpret_cast<uptr>(Buffer);
-    const uptr RawBufferBase = reinterpret_cast<uptr>(RawBuffer);
-
-    if (BufferBase < RawBufferBase ||
-        BufferBase >= RawBufferBase + sizeof(RawBuffer)) {
-      return StaticBufferCount;
-    }
-
-    DCHECK_LE(BufferSize, StaticBufferSize);
-    DCHECK_LE(BufferBase + BufferSize, RawBufferBase + sizeof(RawBuffer));
-    DCHECK_EQ((BufferBase - RawBufferBase) % StaticBufferSize, 0U);
-
-    const uptr index =
-        (BufferBase - RawBufferBase) / (StaticBufferSize * sizeof(uptr));
-    DCHECK_LT(index, StaticBufferCount);
-    return index;
-  }
-
-  uptr *getDynamicBuffer(const uptr BufferSize) {
+  Buffer getDynamicBuffer(const uptr NumElements) {
     // When using a heap-based buffer, precommit the pages backing the
     // Vmar by passing |MAP_PRECOMMIT| flag. This allows an optimization
     // where page fault exceptions are skipped as the allocated memory
     // is accessed. So far, this is only enabled on Fuchsia. It hasn't proven a
     // performance benefit on other platforms.
     const uptr MmapFlags = MAP_ALLOWNOMEM | (SCUDO_FUCHSIA ? MAP_PRECOMMIT : 0);
-    return reinterpret_cast<uptr *>(
-        map(nullptr, roundUp(BufferSize, getPageSizeCached()), "scudo:counters",
-            MmapFlags, &MapData));
+    const uptr MappedSize =
+        roundUp(NumElements * sizeof(uptr), getPageSizeCached());
+    Buffer Buf;
+    if (Buf.MemMap.map(/*Addr=*/0, MappedSize, "scudo:counters", MmapFlags)) {
+      Buf.Data = reinterpret_cast<uptr *>(Buf.MemMap.getBase());
+      Buf.BufferIndex = StaticBufferCount;
+    }
+    return Buf;
   }
 
   HybridMutex Mutex;
   // '1' means that buffer index is not used. '0' means the buffer is in use.
   uptr Mask GUARDED_BY(Mutex) = ~static_cast<uptr>(0);
-  uptr RawBuffer[StaticBufferCount * StaticBufferSize] GUARDED_BY(Mutex);
-  [[no_unique_address]] MapPlatformData MapData = {};
+  uptr RawBuffer[StaticBufferCount * StaticBufferNumElements] GUARDED_BY(Mutex);
 };
 
 // A Region page map is used to record the usage of pages in the regions. It
@@ -185,23 +204,17 @@ private:
 class RegionPageMap {
 public:
   RegionPageMap()
-      : Regions(0),
-        NumCounters(0),
-        CounterSizeBitsLog(0),
-        CounterMask(0),
-        PackingRatioLog(0),
-        BitOffsetMask(0),
-        SizePerRegion(0),
-        BufferSize(0),
-        Buffer(nullptr) {}
+      : Regions(0), NumCounters(0), CounterSizeBitsLog(0), CounterMask(0),
+        PackingRatioLog(0), BitOffsetMask(0), SizePerRegion(0),
+        BufferNumElements(0) {}
   RegionPageMap(uptr NumberOfRegions, uptr CountersPerRegion, uptr MaxValue) {
     reset(NumberOfRegions, CountersPerRegion, MaxValue);
   }
   ~RegionPageMap() {
     if (!isAllocated())
       return;
-    Buffers.releaseBuffer(Buffer, BufferSize);
-    Buffer = nullptr;
+    Buffers.releaseBuffer(Buffer);
+    Buffer = {};
   }
 
   // Lock of `StaticBuffer` is acquired conditionally and there's no easy way to
@@ -216,7 +229,7 @@ public:
     Regions = NumberOfRegion;
     NumCounters = CountersPerRegion;
 
-    constexpr uptr MaxCounterBits = sizeof(*Buffer) * 8UL;
+    constexpr uptr MaxCounterBits = sizeof(*Buffer.Data) * 8UL;
     // Rounding counter storage size up to the power of two allows for using
     // bit shifts calculating particular counter's Index and offset.
     const uptr CounterSizeBits =
@@ -233,11 +246,11 @@ public:
     SizePerRegion =
         roundUp(NumCounters, static_cast<uptr>(1U) << PackingRatioLog) >>
         PackingRatioLog;
-    BufferSize = SizePerRegion * sizeof(*Buffer) * Regions;
-    Buffer = Buffers.getBuffer(BufferSize);
+    BufferNumElements = SizePerRegion * Regions;
+    Buffer = Buffers.getBuffer(BufferNumElements);
   }
 
-  bool isAllocated() const { return !!Buffer; }
+  bool isAllocated() const { return Buffer.Data != nullptr; }
 
   uptr getCount() const { return NumCounters; }
 
@@ -246,7 +259,8 @@ public:
     DCHECK_LT(I, NumCounters);
     const uptr Index = I >> PackingRatioLog;
     const uptr BitOffset = (I & BitOffsetMask) << CounterSizeBitsLog;
-    return (Buffer[Region * SizePerRegion + Index] >> BitOffset) & CounterMask;
+    return (Buffer.Data[Region * SizePerRegion + Index] >> BitOffset) &
+           CounterMask;
   }
 
   void inc(uptr Region, uptr I) const {
@@ -255,8 +269,8 @@ public:
     const uptr BitOffset = (I & BitOffsetMask) << CounterSizeBitsLog;
     DCHECK_LT(BitOffset, SCUDO_WORDSIZE);
     DCHECK_EQ(isAllCounted(Region, I), false);
-    Buffer[Region * SizePerRegion + Index] += static_cast<uptr>(1U)
-                                              << BitOffset;
+    Buffer.Data[Region * SizePerRegion + Index] += static_cast<uptr>(1U)
+                                                   << BitOffset;
   }
 
   void incN(uptr Region, uptr I, uptr N) const {
@@ -267,7 +281,7 @@ public:
     const uptr BitOffset = (I & BitOffsetMask) << CounterSizeBitsLog;
     DCHECK_LT(BitOffset, SCUDO_WORDSIZE);
     DCHECK_EQ(isAllCounted(Region, I), false);
-    Buffer[Region * SizePerRegion + Index] += N << BitOffset;
+    Buffer.Data[Region * SizePerRegion + Index] += N << BitOffset;
   }
 
   void incRange(uptr Region, uptr From, uptr To) const {
@@ -286,7 +300,7 @@ public:
     const uptr Index = I >> PackingRatioLog;
     const uptr BitOffset = (I & BitOffsetMask) << CounterSizeBitsLog;
     DCHECK_LT(BitOffset, SCUDO_WORDSIZE);
-    Buffer[Region * SizePerRegion + Index] |= CounterMask << BitOffset;
+    Buffer.Data[Region * SizePerRegion + Index] |= CounterMask << BitOffset;
   }
   void setAsAllCountedRange(uptr Region, uptr From, uptr To) const {
     DCHECK_LE(From, To);
@@ -309,9 +323,16 @@ public:
     return get(Region, I) == CounterMask;
   }
 
-  uptr getBufferSize() const { return BufferSize; }
+  uptr getBufferNumElements() const { return BufferNumElements; }
 
 private:
+  // We may consider making this configurable if there are cases which may
+  // benefit from this.
+  static const uptr StaticBufferCount = 2U;
+  static const uptr StaticBufferNumElements = 512U;
+  using BufferPoolT = BufferPool<StaticBufferCount, StaticBufferNumElements>;
+  static BufferPoolT Buffers;
+
   uptr Regions;
   uptr NumCounters;
   uptr CounterSizeBitsLog;
@@ -320,14 +341,8 @@ private:
   uptr BitOffsetMask;
 
   uptr SizePerRegion;
-  uptr BufferSize;
-  uptr *Buffer;
-
-  // We may consider making this configurable if there are cases which may
-  // benefit from this.
-  static const uptr StaticBufferCount = 2U;
-  static const uptr StaticBufferSize = 512U;
-  static BufferPool<StaticBufferCount, StaticBufferSize> Buffers;
+  uptr BufferNumElements;
+  BufferPoolT::Buffer Buffer;
 };
 
 template <class ReleaseRecorderT> class FreePagesRangeTracker {
diff --git a/Telegram/ThirdParty/scudo/report.cpp b/Telegram/ThirdParty/scudo/report.cpp
index 81b3dce4e..9cef0adc0 100644
--- a/Telegram/ThirdParty/scudo/report.cpp
+++ b/Telegram/ThirdParty/scudo/report.cpp
@@ -24,11 +24,7 @@ public:
     Message.vappend(Format, Args);
     va_end(Args);
   }
-  NORETURN ~ScopedErrorReport() {
-    outputRaw(Message.data());
-    setAbortMessage(Message.data());
-    die();
-  }
+  NORETURN ~ScopedErrorReport() { reportRawError(Message.data()); }
 
 private:
   ScopedString Message;
@@ -36,18 +32,6 @@ private:
 
 inline void NORETURN trap() { __builtin_trap(); }
 
-void NORETURN reportSoftRSSLimit(uptr RssLimitMb) {
-  ScopedErrorReport Report;
-  Report.append("Soft RSS limit of %zu MB exhausted, current RSS is %zu MB\n",
-                RssLimitMb, GetRSS() >> 20);
-}
-
-void NORETURN reportHardRSSLimit(uptr RssLimitMb) {
-  ScopedErrorReport Report;
-  Report.append("Hard RSS limit of %zu MB exhausted, current RSS is %zu MB\n",
-                RssLimitMb, GetRSS() >> 20);
-}
-
 // This could potentially be called recursively if a CHECK fails in the reports.
 void NORETURN reportCheckFailed(const char *File, int Line,
                                 const char *Condition, u64 Value1, u64 Value2) {
@@ -67,6 +51,13 @@ void NORETURN reportError(const char *Message) {
   Report.append("%s\n", Message);
 }
 
+// Generic fatal error message without ScopedString.
+void NORETURN reportRawError(const char *Message) {
+  outputRaw(Message);
+  setAbortMessage(Message);
+  die();
+}
+
 void NORETURN reportInvalidFlag(const char *FlagType, const char *Value) {
   ScopedErrorReport Report;
   Report.append("invalid value for %s option: '%s'\n", FlagType, Value);
@@ -79,14 +70,6 @@ void NORETURN reportHeaderCorruption(void *Ptr) {
   Report.append("corrupted chunk header at address %p\n", Ptr);
 }
 
-// Two threads have attempted to modify a chunk header at the same time. This is
-// symptomatic of a race-condition in the application code, or general lack of
-// proper locking.
-void NORETURN reportHeaderRace(void *Ptr) {
-  ScopedErrorReport Report;
-  Report.append("race on chunk header at address %p\n", Ptr);
-}
-
 // The allocator was compiled with parameters that conflict with field size
 // requirements.
 void NORETURN reportSanityCheckError(const char *Field) {
diff --git a/Telegram/ThirdParty/scudo/report.h b/Telegram/ThirdParty/scudo/report.h
index 3a78ab64b..a510fdaeb 100644
--- a/Telegram/ThirdParty/scudo/report.h
+++ b/Telegram/ThirdParty/scudo/report.h
@@ -15,15 +15,17 @@ namespace scudo {
 
 // Reports are *fatal* unless stated otherwise.
 
-// Generic error.
+// Generic error, adds newline to end of message.
 void NORETURN reportError(const char *Message);
 
+// Generic error, but the message is not modified.
+void NORETURN reportRawError(const char *Message);
+
 // Flags related errors.
 void NORETURN reportInvalidFlag(const char *FlagType, const char *Value);
 
 // Chunk header related errors.
 void NORETURN reportHeaderCorruption(void *Ptr);
-void NORETURN reportHeaderRace(void *Ptr);
 
 // Sanity checks related error.
 void NORETURN reportSanityCheckError(const char *Field);
@@ -34,8 +36,6 @@ void NORETURN reportAllocationSizeTooBig(uptr UserSize, uptr TotalSize,
                                          uptr MaxSize);
 void NORETURN reportOutOfBatchClass();
 void NORETURN reportOutOfMemory(uptr RequestedSize);
-void NORETURN reportSoftRSSLimit(uptr RssLimitMb);
-void NORETURN reportHardRSSLimit(uptr RssLimitMb);
 enum class AllocatorAction : u8 {
   Recycling,
   Deallocating,
diff --git a/Telegram/ThirdParty/scudo/report_linux.cpp b/Telegram/ThirdParty/scudo/report_linux.cpp
new file mode 100644
index 000000000..6a983036e
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/report_linux.cpp
@@ -0,0 +1,58 @@
+//===-- report_linux.cpp ----------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "platform.h"
+
+#if SCUDO_LINUX || SCUDO_TRUSTY
+
+#include "common.h"
+#include "internal_defs.h"
+#include "report.h"
+#include "report_linux.h"
+#include "string_utils.h"
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+namespace scudo {
+
+// Fatal internal map() error (potentially OOM related).
+void NORETURN reportMapError(uptr SizeIfOOM) {
+  char Error[128] = "Scudo ERROR: internal map failure\n";
+  if (SizeIfOOM) {
+    formatString(
+        Error, sizeof(Error),
+        "Scudo ERROR: internal map failure (NO MEMORY) requesting %zuKB\n",
+        SizeIfOOM >> 10);
+  }
+  reportRawError(Error);
+}
+
+void NORETURN reportUnmapError(uptr Addr, uptr Size) {
+  char Error[128];
+  formatString(Error, sizeof(Error),
+               "Scudo ERROR: internal unmap failure (error desc=%s) Addr 0x%zx "
+               "Size %zu\n",
+               strerror(errno), Addr, Size);
+  reportRawError(Error);
+}
+
+void NORETURN reportProtectError(uptr Addr, uptr Size, int Prot) {
+  char Error[128];
+  formatString(
+      Error, sizeof(Error),
+      "Scudo ERROR: internal protect failure (error desc=%s) Addr 0x%zx "
+      "Size %zu Prot %x\n",
+      strerror(errno), Addr, Size, Prot);
+  reportRawError(Error);
+}
+
+} // namespace scudo
+
+#endif // SCUDO_LINUX || SCUDO_TRUSTY
diff --git a/Telegram/ThirdParty/scudo/report_linux.h b/Telegram/ThirdParty/scudo/report_linux.h
new file mode 100644
index 000000000..aa0bb247e
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/report_linux.h
@@ -0,0 +1,34 @@
+//===-- report_linux.h ------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SCUDO_REPORT_LINUX_H_
+#define SCUDO_REPORT_LINUX_H_
+
+#include "platform.h"
+
+#if SCUDO_LINUX || SCUDO_TRUSTY
+
+#include "internal_defs.h"
+
+namespace scudo {
+
+// Report a fatal error when a map call fails. SizeIfOOM shall
+// hold the requested size on an out-of-memory error, 0 otherwise.
+void NORETURN reportMapError(uptr SizeIfOOM = 0);
+
+// Report a fatal error when an unmap call fails.
+void NORETURN reportUnmapError(uptr Addr, uptr Size);
+
+// Report a fatal error when a mprotect call fails.
+void NORETURN reportProtectError(uptr Addr, uptr Size, int Prot);
+
+} // namespace scudo
+
+#endif // SCUDO_LINUX || SCUDO_TRUSTY
+
+#endif // SCUDO_REPORT_LINUX_H_
diff --git a/Telegram/ThirdParty/scudo/rss_limit_checker.cpp b/Telegram/ThirdParty/scudo/rss_limit_checker.cpp
deleted file mode 100644
index f428386b7..000000000
--- a/Telegram/ThirdParty/scudo/rss_limit_checker.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//===-- common.cpp ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "rss_limit_checker.h"
-#include "atomic_helpers.h"
-#include "string_utils.h"
-
-namespace scudo {
-
-void RssLimitChecker::check(u64 NextCheck) {
-  // The interval for the checks is 250ms.
-  static constexpr u64 CheckInterval = 250 * 1000000;
-
-  // Early return in case another thread already did the calculation.
-  if (!atomic_compare_exchange_strong(&RssNextCheckAtNS, &NextCheck,
-                                      getMonotonicTime() + CheckInterval,
-                                      memory_order_relaxed)) {
-    return;
-  }
-
-  const uptr CurrentRssMb = GetRSS() >> 20;
-
-  RssLimitExceeded Result = RssLimitExceeded::Neither;
-  if (UNLIKELY(HardRssLimitMb && HardRssLimitMb < CurrentRssMb))
-    Result = RssLimitExceeded::Hard;
-  else if (UNLIKELY(SoftRssLimitMb && SoftRssLimitMb < CurrentRssMb))
-    Result = RssLimitExceeded::Soft;
-
-  atomic_store_relaxed(&RssLimitStatus, static_cast<u8>(Result));
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/rss_limit_checker.h b/Telegram/ThirdParty/scudo/rss_limit_checker.h
deleted file mode 100644
index 29dc063f3..000000000
--- a/Telegram/ThirdParty/scudo/rss_limit_checker.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//===-- common.h ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_RSS_LIMIT_CHECKER_H_
-#define SCUDO_RSS_LIMIT_CHECKER_H_
-
-#include "atomic_helpers.h"
-#include "common.h"
-#include "internal_defs.h"
-
-namespace scudo {
-
-class RssLimitChecker {
-public:
-  enum RssLimitExceeded {
-    Neither,
-    Soft,
-    Hard,
-  };
-
-  void init(int SoftRssLimitMb, int HardRssLimitMb) {
-    CHECK_GE(SoftRssLimitMb, 0);
-    CHECK_GE(HardRssLimitMb, 0);
-    this->SoftRssLimitMb = static_cast<uptr>(SoftRssLimitMb);
-    this->HardRssLimitMb = static_cast<uptr>(HardRssLimitMb);
-  }
-
-  // Opportunistic RSS limit check. This will update the RSS limit status, if
-  // it can, every 250ms, otherwise it will just return the current one.
-  RssLimitExceeded getRssLimitExceeded() {
-    if (!HardRssLimitMb && !SoftRssLimitMb)
-      return RssLimitExceeded::Neither;
-
-    u64 NextCheck = atomic_load_relaxed(&RssNextCheckAtNS);
-    u64 Now = getMonotonicTime();
-
-    if (UNLIKELY(Now >= NextCheck))
-      check(NextCheck);
-
-    return static_cast<RssLimitExceeded>(atomic_load_relaxed(&RssLimitStatus));
-  }
-
-  uptr getSoftRssLimit() const { return SoftRssLimitMb; }
-  uptr getHardRssLimit() const { return HardRssLimitMb; }
-
-private:
-  void check(u64 NextCheck);
-
-  uptr SoftRssLimitMb = 0;
-  uptr HardRssLimitMb = 0;
-
-  atomic_u64 RssNextCheckAtNS = {};
-  atomic_u8 RssLimitStatus = {};
-};
-
-} // namespace scudo
-
-#endif // SCUDO_RSS_LIMIT_CHECKER_H_
diff --git a/Telegram/ThirdParty/scudo/secondary.h b/Telegram/ThirdParty/scudo/secondary.h
index 105b154b5..f52a4188b 100644
--- a/Telegram/ThirdParty/scudo/secondary.h
+++ b/Telegram/ThirdParty/scudo/secondary.h
@@ -72,11 +72,26 @@ static inline void unmap(LargeBlock::Header *H) {
   MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
 }
 
+namespace {
+struct CachedBlock {
+  uptr CommitBase = 0;
+  uptr CommitSize = 0;
+  uptr BlockBegin = 0;
+  MemMapT MemMap = {};
+  u64 Time = 0;
+
+  bool isValid() { return CommitBase != 0; }
+
+  void invalidate() { CommitBase = 0; }
+};
+} // namespace
+
 template <typename Config> class MapAllocatorNoCache {
 public:
   void init(UNUSED s32 ReleaseToOsInterval) {}
   bool retrieve(UNUSED Options Options, UNUSED uptr Size, UNUSED uptr Alignment,
-                UNUSED LargeBlock::Header **H, UNUSED bool *Zeroed) {
+                UNUSED uptr HeadersSize, UNUSED LargeBlock::Header **H,
+                UNUSED bool *Zeroed) {
     return false;
   }
   void store(UNUSED Options Options, LargeBlock::Header *H) { unmap(H); }
@@ -102,20 +117,22 @@ public:
 static const uptr MaxUnusedCachePages = 4U;
 
 template <typename Config>
-void mapSecondary(Options Options, uptr CommitBase, uptr CommitSize,
+bool mapSecondary(const Options &Options, uptr CommitBase, uptr CommitSize,
                   uptr AllocPos, uptr Flags, MemMapT &MemMap) {
+  Flags |= MAP_RESIZABLE;
+  Flags |= MAP_ALLOWNOMEM;
+
   const uptr MaxUnusedCacheBytes = MaxUnusedCachePages * getPageSizeCached();
   if (useMemoryTagging<Config>(Options) && CommitSize > MaxUnusedCacheBytes) {
     const uptr UntaggedPos = Max(AllocPos, CommitBase + MaxUnusedCacheBytes);
-    MemMap.remap(CommitBase, UntaggedPos - CommitBase, "scudo:secondary",
-                 MAP_RESIZABLE | MAP_MEMTAG | Flags);
-    MemMap.remap(UntaggedPos, CommitBase + CommitSize - UntaggedPos,
-                 "scudo:secondary", MAP_RESIZABLE | Flags);
+    return MemMap.remap(CommitBase, UntaggedPos - CommitBase, "scudo:secondary",
+                        MAP_MEMTAG | Flags) &&
+           MemMap.remap(UntaggedPos, CommitBase + CommitSize - UntaggedPos,
+                        "scudo:secondary", Flags);
   } else {
     const uptr RemapFlags =
-        MAP_RESIZABLE | (useMemoryTagging<Config>(Options) ? MAP_MEMTAG : 0) |
-        Flags;
-    MemMap.remap(CommitBase, CommitSize, "scudo:secondary", RemapFlags);
+        (useMemoryTagging<Config>(Options) ? MAP_MEMTAG : 0) | Flags;
+    return MemMap.remap(CommitBase, CommitSize, "scudo:secondary", RemapFlags);
   }
 }
 
@@ -138,17 +155,24 @@ public:
 
   void getStats(ScopedString *Str) {
     ScopedLock L(Mutex);
+    uptr Integral;
+    uptr Fractional;
+    computePercentage(SuccessfulRetrieves, CallsToRetrieve, &Integral,
+                      &Fractional);
     Str->append("Stats: MapAllocatorCache: EntriesCount: %d, "
                 "MaxEntriesCount: %u, MaxEntrySize: %zu\n",
                 EntriesCount, atomic_load_relaxed(&MaxEntriesCount),
                 atomic_load_relaxed(&MaxEntrySize));
+    Str->append("Stats: CacheRetrievalStats: SuccessRate: %u/%u "
+                "(%zu.%02zu%%)\n",
+                SuccessfulRetrieves, CallsToRetrieve, Integral, Fractional);
     for (CachedBlock Entry : Entries) {
-      if (!Entry.CommitBase)
+      if (!Entry.isValid())
         continue;
       Str->append("StartBlockAddress: 0x%zx, EndBlockAddress: 0x%zx, "
-                  "BlockSize: %zu\n",
+                  "BlockSize: %zu %s\n",
                   Entry.CommitBase, Entry.CommitBase + Entry.CommitSize,
-                  Entry.CommitSize);
+                  Entry.CommitSize, Entry.Time == 0 ? "[R]" : "");
     }
   }
 
@@ -166,7 +190,7 @@ public:
     setOption(Option::ReleaseInterval, static_cast<sptr>(ReleaseToOsInterval));
   }
 
-  void store(Options Options, LargeBlock::Header *H) EXCLUDES(Mutex) {
+  void store(const Options &Options, LargeBlock::Header *H) EXCLUDES(Mutex) {
     if (!canCache(H->CommitSize))
       return unmap(H);
 
@@ -195,7 +219,7 @@ public:
                                          MAP_NOACCESS);
       }
     } else if (Interval == 0) {
-      Entry.MemMap.releasePagesToOS(Entry.CommitBase, Entry.CommitSize);
+      Entry.MemMap.releaseAndZeroPagesToOS(Entry.CommitBase, Entry.CommitSize);
       Entry.Time = 0;
     }
     do {
@@ -210,7 +234,7 @@ public:
       if (CacheConfig::QuarantineSize && useMemoryTagging<Config>(Options)) {
         QuarantinePos =
             (QuarantinePos + 1) % Max(CacheConfig::QuarantineSize, 1u);
-        if (!Quarantine[QuarantinePos].CommitBase) {
+        if (!Quarantine[QuarantinePos].isValid()) {
           Quarantine[QuarantinePos] = Entry;
           return;
         }
@@ -225,7 +249,7 @@ public:
           EmptyCache = true;
       } else {
         for (u32 I = 0; I < MaxCount; I++) {
-          if (Entries[I].CommitBase)
+          if (Entries[I].isValid())
             continue;
           if (I != 0)
             Entries[I] = Entries[0];
@@ -246,26 +270,31 @@ public:
       Entry.MemMap.unmap(Entry.MemMap.getBase(), Entry.MemMap.getCapacity());
   }
 
-  bool retrieve(Options Options, uptr Size, uptr Alignment,
+  bool retrieve(Options Options, uptr Size, uptr Alignment, uptr HeadersSize,
                 LargeBlock::Header **H, bool *Zeroed) EXCLUDES(Mutex) {
     const uptr PageSize = getPageSizeCached();
     const u32 MaxCount = atomic_load_relaxed(&MaxEntriesCount);
+    // 10% of the requested size proved to be the optimal choice for
+    // retrieving cached blocks after testing several options.
+    constexpr u32 FragmentedBytesDivisor = 10;
     bool Found = false;
     CachedBlock Entry;
-    uptr HeaderPos = 0;
+    uptr EntryHeaderPos = 0;
     {
       ScopedLock L(Mutex);
+      CallsToRetrieve++;
       if (EntriesCount == 0)
         return false;
+      u32 OptimalFitIndex = 0;
+      uptr MinDiff = UINTPTR_MAX;
       for (u32 I = 0; I < MaxCount; I++) {
-        const uptr CommitBase = Entries[I].CommitBase;
-        if (!CommitBase)
+        if (!Entries[I].isValid())
           continue;
+        const uptr CommitBase = Entries[I].CommitBase;
         const uptr CommitSize = Entries[I].CommitSize;
         const uptr AllocPos =
             roundDown(CommitBase + CommitSize - Size, Alignment);
-        HeaderPos =
-            AllocPos - Chunk::getHeaderSize() - LargeBlock::getHeaderSize();
+        const uptr HeaderPos = AllocPos - HeadersSize;
         if (HeaderPos > CommitBase + CommitSize)
           continue;
         if (HeaderPos < CommitBase ||
@@ -273,17 +302,36 @@ public:
           continue;
         }
         Found = true;
-        Entry = Entries[I];
-        Entries[I].CommitBase = 0;
+        const uptr Diff = HeaderPos - CommitBase;
+        // immediately use a cached block if it's size is close enough to the
+        // requested size.
+        const uptr MaxAllowedFragmentedBytes =
+            (CommitBase + CommitSize - HeaderPos) / FragmentedBytesDivisor;
+        if (Diff <= MaxAllowedFragmentedBytes) {
+          OptimalFitIndex = I;
+          EntryHeaderPos = HeaderPos;
+          break;
+        }
+        // keep track of the smallest cached block
+        // that is greater than (AllocSize + HeaderSize)
+        if (Diff > MinDiff)
+          continue;
+        OptimalFitIndex = I;
+        MinDiff = Diff;
+        EntryHeaderPos = HeaderPos;
+      }
+      if (Found) {
+        Entry = Entries[OptimalFitIndex];
+        Entries[OptimalFitIndex].invalidate();
         EntriesCount--;
-        break;
+        SuccessfulRetrieves++;
       }
     }
     if (!Found)
       return false;
 
     *H = reinterpret_cast<LargeBlock::Header *>(
-        LargeBlock::addHeaderTag<Config>(HeaderPos));
+        LargeBlock::addHeaderTag<Config>(EntryHeaderPos));
     *Zeroed = Entry.Time == 0;
     if (useMemoryTagging<Config>(Options))
       Entry.MemMap.setMemoryPermission(Entry.CommitBase, Entry.CommitSize, 0);
@@ -295,8 +343,7 @@ public:
       } else if (Entry.BlockBegin < NewBlockBegin) {
         storeTags(Entry.BlockBegin, NewBlockBegin);
       } else {
-        storeTags(untagPointer(NewBlockBegin),
-                  untagPointer(Entry.BlockBegin));
+        storeTags(untagPointer(NewBlockBegin), untagPointer(Entry.BlockBegin));
       }
     }
     (*H)->CommitBase = Entry.CommitBase;
@@ -338,15 +385,15 @@ public:
   void disableMemoryTagging() EXCLUDES(Mutex) {
     ScopedLock L(Mutex);
     for (u32 I = 0; I != CacheConfig::QuarantineSize; ++I) {
-      if (Quarantine[I].CommitBase) {
+      if (Quarantine[I].isValid()) {
         MemMapT &MemMap = Quarantine[I].MemMap;
         MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
-        Quarantine[I].CommitBase = 0;
+        Quarantine[I].invalidate();
       }
     }
     const u32 MaxCount = atomic_load_relaxed(&MaxEntriesCount);
     for (u32 I = 0; I < MaxCount; I++) {
-      if (Entries[I].CommitBase) {
+      if (Entries[I].isValid()) {
         Entries[I].MemMap.setMemoryPermission(Entries[I].CommitBase,
                                               Entries[I].CommitSize, 0);
       }
@@ -367,10 +414,10 @@ private:
     {
       ScopedLock L(Mutex);
       for (uptr I = 0; I < CacheConfig::EntriesArraySize; I++) {
-        if (!Entries[I].CommitBase)
+        if (!Entries[I].isValid())
           continue;
         MapInfo[N] = Entries[I].MemMap;
-        Entries[I].CommitBase = 0;
+        Entries[I].invalidate();
         N++;
       }
       EntriesCount = 0;
@@ -382,23 +429,15 @@ private:
     }
   }
 
-  struct CachedBlock {
-    uptr CommitBase = 0;
-    uptr CommitSize = 0;
-    uptr BlockBegin = 0;
-    MemMapT MemMap = {};
-    u64 Time = 0;
-  };
-
   void releaseIfOlderThan(CachedBlock &Entry, u64 Time) REQUIRES(Mutex) {
-    if (!Entry.CommitBase || !Entry.Time)
+    if (!Entry.isValid() || !Entry.Time)
       return;
     if (Entry.Time > Time) {
       if (OldestTime == 0 || Entry.Time < OldestTime)
         OldestTime = Entry.Time;
       return;
     }
-    Entry.MemMap.releasePagesToOS(Entry.CommitBase, Entry.CommitSize);
+    Entry.MemMap.releaseAndZeroPagesToOS(Entry.CommitBase, Entry.CommitSize);
     Entry.Time = 0;
   }
 
@@ -421,6 +460,8 @@ private:
   u64 OldestTime GUARDED_BY(Mutex) = 0;
   u32 IsFullEvents GUARDED_BY(Mutex) = 0;
   atomic_s32 ReleaseToOsIntervalMs = {};
+  u32 CallsToRetrieve GUARDED_BY(Mutex) = 0;
+  u32 SuccessfulRetrieves GUARDED_BY(Mutex) = 0;
 
   CachedBlock Entries[CacheConfig::EntriesArraySize] GUARDED_BY(Mutex) = {};
   NonZeroLengthArray<CachedBlock, CacheConfig::QuarantineSize>
@@ -439,11 +480,11 @@ public:
       S->link(&Stats);
   }
 
-  void *allocate(Options Options, uptr Size, uptr AlignmentHint = 0,
+  void *allocate(const Options &Options, uptr Size, uptr AlignmentHint = 0,
                  uptr *BlockEnd = nullptr,
                  FillContentsMode FillContents = NoFill);
 
-  void deallocate(Options Options, void *Ptr);
+  void deallocate(const Options &Options, void *Ptr);
 
   static uptr getBlockEnd(void *Ptr) {
     auto *B = LargeBlock::getHeader<Config>(Ptr);
@@ -454,6 +495,10 @@ public:
     return getBlockEnd(Ptr) - reinterpret_cast<uptr>(Ptr);
   }
 
+  static constexpr uptr getHeadersSize() {
+    return Chunk::getHeaderSize() + LargeBlock::getHeaderSize();
+  }
+
   void disable() NO_THREAD_SAFETY_ANALYSIS {
     Mutex.lock();
     Cache.disable();
@@ -494,6 +539,7 @@ private:
   DoublyLinkedList<LargeBlock::Header> InUseBlocks GUARDED_BY(Mutex);
   uptr AllocatedBytes GUARDED_BY(Mutex) = 0;
   uptr FreedBytes GUARDED_BY(Mutex) = 0;
+  uptr FragmentedBytes GUARDED_BY(Mutex) = 0;
   uptr LargestSize GUARDED_BY(Mutex) = 0;
   u32 NumberOfAllocs GUARDED_BY(Mutex) = 0;
   u32 NumberOfFrees GUARDED_BY(Mutex) = 0;
@@ -512,24 +558,23 @@ private:
 // the committed memory will amount to something close to Size - AlignmentHint
 // (pending rounding and headers).
 template <typename Config>
-void *MapAllocator<Config>::allocate(Options Options, uptr Size, uptr Alignment,
-                                     uptr *BlockEndPtr,
+void *MapAllocator<Config>::allocate(const Options &Options, uptr Size,
+                                     uptr Alignment, uptr *BlockEndPtr,
                                      FillContentsMode FillContents) {
   if (Options.get(OptionBit::AddLargeAllocationSlack))
     Size += 1UL << SCUDO_MIN_ALIGNMENT_LOG;
   Alignment = Max(Alignment, uptr(1U) << SCUDO_MIN_ALIGNMENT_LOG);
   const uptr PageSize = getPageSizeCached();
-  uptr RoundedSize =
-      roundUp(roundUp(Size, Alignment) + LargeBlock::getHeaderSize() +
-                  Chunk::getHeaderSize(),
-              PageSize);
-  if (Alignment > PageSize)
-    RoundedSize += Alignment - PageSize;
 
-  if (Alignment < PageSize && Cache.canCache(RoundedSize)) {
+  // Note that cached blocks may have aligned address already. Thus we simply
+  // pass the required size (`Size` + `getHeadersSize()`) to do cache look up.
+  const uptr MinNeededSizeForCache = roundUp(Size + getHeadersSize(), PageSize);
+
+  if (Alignment < PageSize && Cache.canCache(MinNeededSizeForCache)) {
     LargeBlock::Header *H;
     bool Zeroed;
-    if (Cache.retrieve(Options, Size, Alignment, &H, &Zeroed)) {
+    if (Cache.retrieve(Options, Size, Alignment, getHeadersSize(), &H,
+                       &Zeroed)) {
       const uptr BlockEnd = H->CommitBase + H->CommitSize;
       if (BlockEndPtr)
         *BlockEndPtr = BlockEnd;
@@ -545,6 +590,7 @@ void *MapAllocator<Config>::allocate(Options Options, uptr Size, uptr Alignment,
         ScopedLock L(Mutex);
         InUseBlocks.push_back(H);
         AllocatedBytes += H->CommitSize;
+        FragmentedBytes += H->MemMap.getCapacity() - H->CommitSize;
         NumberOfAllocs++;
         Stats.add(StatAllocated, H->CommitSize);
         Stats.add(StatMapped, H->MemMap.getCapacity());
@@ -553,16 +599,22 @@ void *MapAllocator<Config>::allocate(Options Options, uptr Size, uptr Alignment,
     }
   }
 
+  uptr RoundedSize =
+      roundUp(roundUp(Size, Alignment) + getHeadersSize(), PageSize);
+  if (Alignment > PageSize)
+    RoundedSize += Alignment - PageSize;
+
   ReservedMemoryT ReservedMemory;
   const uptr MapSize = RoundedSize + 2 * PageSize;
-  ReservedMemory.create(/*Addr=*/0U, MapSize, nullptr, MAP_ALLOWNOMEM);
+  if (UNLIKELY(!ReservedMemory.create(/*Addr=*/0U, MapSize, nullptr,
+                                      MAP_ALLOWNOMEM))) {
+    return nullptr;
+  }
 
   // Take the entire ownership of reserved region.
   MemMapT MemMap = ReservedMemory.dispatch(ReservedMemory.getBase(),
                                            ReservedMemory.getCapacity());
   uptr MapBase = MemMap.getBase();
-  if (UNLIKELY(!MapBase))
-    return nullptr;
   uptr CommitBase = MapBase + PageSize;
   uptr MapEnd = MapBase + MapSize;
 
@@ -592,9 +644,12 @@ void *MapAllocator<Config>::allocate(Options Options, uptr Size, uptr Alignment,
 
   const uptr CommitSize = MapEnd - PageSize - CommitBase;
   const uptr AllocPos = roundDown(CommitBase + CommitSize - Size, Alignment);
-  mapSecondary<Config>(Options, CommitBase, CommitSize, AllocPos, 0, MemMap);
-  const uptr HeaderPos =
-      AllocPos - Chunk::getHeaderSize() - LargeBlock::getHeaderSize();
+  if (!mapSecondary<Config>(Options, CommitBase, CommitSize, AllocPos, 0,
+                            MemMap)) {
+    MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
+    return nullptr;
+  }
+  const uptr HeaderPos = AllocPos - getHeadersSize();
   LargeBlock::Header *H = reinterpret_cast<LargeBlock::Header *>(
       LargeBlock::addHeaderTag<Config>(HeaderPos));
   if (useMemoryTagging<Config>(Options))
@@ -609,6 +664,7 @@ void *MapAllocator<Config>::allocate(Options Options, uptr Size, uptr Alignment,
     ScopedLock L(Mutex);
     InUseBlocks.push_back(H);
     AllocatedBytes += CommitSize;
+    FragmentedBytes += H->MemMap.getCapacity() - CommitSize;
     if (LargestSize < CommitSize)
       LargestSize = CommitSize;
     NumberOfAllocs++;
@@ -619,7 +675,7 @@ void *MapAllocator<Config>::allocate(Options Options, uptr Size, uptr Alignment,
 }
 
 template <typename Config>
-void MapAllocator<Config>::deallocate(Options Options, void *Ptr)
+void MapAllocator<Config>::deallocate(const Options &Options, void *Ptr)
     EXCLUDES(Mutex) {
   LargeBlock::Header *H = LargeBlock::getHeader<Config>(Ptr);
   const uptr CommitSize = H->CommitSize;
@@ -627,6 +683,7 @@ void MapAllocator<Config>::deallocate(Options Options, void *Ptr)
     ScopedLock L(Mutex);
     InUseBlocks.remove(H);
     FreedBytes += CommitSize;
+    FragmentedBytes -= H->MemMap.getCapacity() - CommitSize;
     NumberOfFrees++;
     Stats.sub(StatAllocated, CommitSize);
     Stats.sub(StatMapped, H->MemMap.getCapacity());
@@ -638,10 +695,11 @@ template <typename Config>
 void MapAllocator<Config>::getStats(ScopedString *Str) EXCLUDES(Mutex) {
   ScopedLock L(Mutex);
   Str->append("Stats: MapAllocator: allocated %u times (%zuK), freed %u times "
-              "(%zuK), remains %u (%zuK) max %zuM\n",
+              "(%zuK), remains %u (%zuK) max %zuM, Fragmented %zuK\n",
               NumberOfAllocs, AllocatedBytes >> 10, NumberOfFrees,
               FreedBytes >> 10, NumberOfAllocs - NumberOfFrees,
-              (AllocatedBytes - FreedBytes) >> 10, LargestSize >> 20);
+              (AllocatedBytes - FreedBytes) >> 10, LargestSize >> 20,
+              FragmentedBytes >> 10);
   Cache.getStats(Str);
 }
 
diff --git a/Telegram/ThirdParty/scudo/size_class_map.h b/Telegram/ThirdParty/scudo/size_class_map.h
index 2a6e298f9..4138885de 100644
--- a/Telegram/ThirdParty/scudo/size_class_map.h
+++ b/Telegram/ThirdParty/scudo/size_class_map.h
@@ -254,7 +254,7 @@ struct AndroidSizeClassConfig {
   static const u16 MaxNumCachedHint = 13;
   static const uptr MaxBytesCachedLog = 13;
 
-  static constexpr u32 Classes[] = {
+  static constexpr uptr Classes[] = {
       0x00020, 0x00030, 0x00040, 0x00050, 0x00060, 0x00070, 0x00090, 0x000b0,
       0x000c0, 0x000e0, 0x00120, 0x00160, 0x001c0, 0x00250, 0x00320, 0x00450,
       0x00670, 0x00830, 0x00a10, 0x00c30, 0x01010, 0x01210, 0x01bd0, 0x02210,
@@ -269,7 +269,7 @@ struct AndroidSizeClassConfig {
   static const u16 MaxNumCachedHint = 14;
   static const uptr MaxBytesCachedLog = 13;
 
-  static constexpr u32 Classes[] = {
+  static constexpr uptr Classes[] = {
       0x00020, 0x00030, 0x00040, 0x00050, 0x00060, 0x00070, 0x00080, 0x00090,
       0x000a0, 0x000b0, 0x000c0, 0x000e0, 0x000f0, 0x00110, 0x00120, 0x00130,
       0x00150, 0x00160, 0x00170, 0x00190, 0x001d0, 0x00210, 0x00240, 0x002a0,
@@ -289,28 +289,6 @@ typedef TableSizeClassMap<AndroidSizeClassConfig> AndroidSizeClassMap;
 static_assert(AndroidSizeClassMap::usesCompressedLSBFormat(), "");
 #endif
 
-struct SvelteSizeClassConfig {
-#if SCUDO_WORDSIZE == 64U
-  static const uptr NumBits = 4;
-  static const uptr MinSizeLog = 4;
-  static const uptr MidSizeLog = 8;
-  static const uptr MaxSizeLog = 14;
-  static const u16 MaxNumCachedHint = 13;
-  static const uptr MaxBytesCachedLog = 10;
-  static const uptr SizeDelta = Chunk::getHeaderSize();
-#else
-  static const uptr NumBits = 4;
-  static const uptr MinSizeLog = 3;
-  static const uptr MidSizeLog = 7;
-  static const uptr MaxSizeLog = 14;
-  static const u16 MaxNumCachedHint = 14;
-  static const uptr MaxBytesCachedLog = 10;
-  static const uptr SizeDelta = Chunk::getHeaderSize();
-#endif
-};
-
-typedef FixedSizeClassMap<SvelteSizeClassConfig> SvelteSizeClassMap;
-
 struct TrustySizeClassConfig {
   static const uptr NumBits = 1;
   static const uptr MinSizeLog = 5;
diff --git a/Telegram/ThirdParty/scudo/stack_depot.h b/Telegram/ThirdParty/scudo/stack_depot.h
index 458198fcb..12c35eb2a 100644
--- a/Telegram/ThirdParty/scudo/stack_depot.h
+++ b/Telegram/ThirdParty/scudo/stack_depot.h
@@ -62,8 +62,7 @@ class StackDepot {
   // This is achieved by re-checking the hash of the stack trace before
   // returning the trace.
 
-#ifdef SCUDO_FUZZ
-  // Use smaller table sizes for fuzzing in order to reduce input size.
+#if SCUDO_SMALL_STACK_DEPOT
   static const uptr TabBits = 4;
 #else
   static const uptr TabBits = 16;
@@ -72,7 +71,7 @@ class StackDepot {
   static const uptr TabMask = TabSize - 1;
   atomic_u32 Tab[TabSize] = {};
 
-#ifdef SCUDO_FUZZ
+#if SCUDO_SMALL_STACK_DEPOT
   static const uptr RingBits = 4;
 #else
   static const uptr RingBits = 19;
diff --git a/Telegram/ThirdParty/scudo/tests/CMakeLists.txt b/Telegram/ThirdParty/scudo/tests/CMakeLists.txt
index cbb85ce3e..c6b6a1cb5 100644
--- a/Telegram/ThirdParty/scudo/tests/CMakeLists.txt
+++ b/Telegram/ThirdParty/scudo/tests/CMakeLists.txt
@@ -15,11 +15,15 @@ set(SCUDO_UNITTEST_CFLAGS
   -DGTEST_HAS_RTTI=0
   -g
   # Extra flags for the C++ tests
+  -Wconversion
   # TODO(kostyak): find a way to make -fsized-deallocation work
   -Wno-mismatched-new-delete)
 
 if(COMPILER_RT_DEBUG)
-  list(APPEND SCUDO_UNITTEST_CFLAGS -DSCUDO_DEBUG=1)
+  list(APPEND SCUDO_UNITTEST_CFLAGS -DSCUDO_DEBUG=1 -DSCUDO_ENABLE_HOOKS=1)
+  if (NOT FUCHSIA)
+    list(APPEND SCUDO_UNITTEST_CFLAGS -DSCUDO_ENABLE_HOOKS_TESTS=1)
+  endif()
 endif()
 
 if(ANDROID)
@@ -92,6 +96,7 @@ set(SCUDO_UNIT_TEST_SOURCES
   chunk_test.cpp
   combined_test.cpp
   common_test.cpp
+  condition_variable_test.cpp
   flags_test.cpp
   list_test.cpp
   map_test.cpp
@@ -137,11 +142,3 @@ set(SCUDO_CXX_UNIT_TEST_SOURCES
 add_scudo_unittest(ScudoCxxUnitTest
   SOURCES ${SCUDO_CXX_UNIT_TEST_SOURCES}
   ADDITIONAL_RTOBJECTS RTScudoStandaloneCWrappers RTScudoStandaloneCxxWrappers)
-
-set(SCUDO_HOOKS_UNIT_TEST_SOURCES
-  scudo_hooks_test.cpp
-  scudo_unit_test_main.cpp
-  )
-
-add_scudo_unittest(ScudoHooksUnitTest
-  SOURCES ${SCUDO_HOOKS_UNIT_TEST_SOURCES})
diff --git a/Telegram/ThirdParty/scudo/tests/chunk_test.cpp b/Telegram/ThirdParty/scudo/tests/chunk_test.cpp
index 7a29f3c11..1b2c1eb5a 100644
--- a/Telegram/ThirdParty/scudo/tests/chunk_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/chunk_test.cpp
@@ -37,29 +37,6 @@ TEST(ScudoChunkDeathTest, ChunkBasic) {
   free(Block);
 }
 
-TEST(ScudoChunkTest, ChunkCmpXchg) {
-  initChecksum();
-  const scudo::uptr Size = 0x100U;
-  scudo::Chunk::UnpackedHeader OldHeader = {};
-  OldHeader.OriginOrWasZeroed = scudo::Chunk::Origin::Malloc;
-  OldHeader.ClassId = 0x42U;
-  OldHeader.SizeOrUnusedBytes = Size;
-  OldHeader.State = scudo::Chunk::State::Allocated;
-  void *Block = malloc(HeaderSize + Size);
-  void *P = reinterpret_cast<void *>(reinterpret_cast<scudo::uptr>(Block) +
-                                     HeaderSize);
-  scudo::Chunk::storeHeader(Cookie, P, &OldHeader);
-  memset(P, 'A', Size);
-  scudo::Chunk::UnpackedHeader NewHeader = OldHeader;
-  NewHeader.State = scudo::Chunk::State::Quarantined;
-  scudo::Chunk::compareExchangeHeader(Cookie, P, &NewHeader, &OldHeader);
-  NewHeader = {};
-  EXPECT_TRUE(scudo::Chunk::isValid(Cookie, P, &NewHeader));
-  EXPECT_EQ(NewHeader.State, scudo::Chunk::State::Quarantined);
-  EXPECT_FALSE(scudo::Chunk::isValid(InvalidCookie, P, &NewHeader));
-  free(Block);
-}
-
 TEST(ScudoChunkDeathTest, CorruptHeader) {
   initChecksum();
   const scudo::uptr Size = 0x100U;
diff --git a/Telegram/ThirdParty/scudo/tests/combined_test.cpp b/Telegram/ThirdParty/scudo/tests/combined_test.cpp
index 79d327849..3dbd93cac 100644
--- a/Telegram/ThirdParty/scudo/tests/combined_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/combined_test.cpp
@@ -12,8 +12,11 @@
 #include "allocator_config.h"
 #include "chunk.h"
 #include "combined.h"
+#include "condition_variable.h"
 #include "mem_map.h"
+#include "size_class_map.h"
 
+#include <algorithm>
 #include <condition_variable>
 #include <memory>
 #include <mutex>
@@ -54,7 +57,7 @@ void checkMemoryTaggingMaybe(AllocatorT *Allocator, void *P, scudo::uptr Size,
     EXPECT_DEATH(
         {
           disableDebuggerdMaybe();
-          reinterpret_cast<char *>(P)[-1] = 0xaa;
+          reinterpret_cast<char *>(P)[-1] = 'A';
         },
         "");
   if (isPrimaryAllocation<AllocatorT>(Size, Alignment)
@@ -63,7 +66,7 @@ void checkMemoryTaggingMaybe(AllocatorT *Allocator, void *P, scudo::uptr Size,
     EXPECT_DEATH(
         {
           disableDebuggerdMaybe();
-          reinterpret_cast<char *>(P)[Size] = 0xaa;
+          reinterpret_cast<char *>(P)[Size] = 'A';
         },
         "");
   }
@@ -78,14 +81,70 @@ template <typename Config> struct TestAllocator : scudo::Allocator<Config> {
   }
   ~TestAllocator() { this->unmapTestOnly(); }
 
-  void *operator new(size_t size) {
-    void *p = nullptr;
-    EXPECT_EQ(0, posix_memalign(&p, alignof(TestAllocator), size));
-    return p;
+  void *operator new(size_t size);
+  void operator delete(void *ptr);
+};
+
+constexpr size_t kMaxAlign = std::max({
+  alignof(scudo::Allocator<scudo::DefaultConfig>),
+#if SCUDO_CAN_USE_PRIMARY64
+      alignof(scudo::Allocator<scudo::FuchsiaConfig>),
+#endif
+      alignof(scudo::Allocator<scudo::AndroidConfig>)
+});
+
+#if SCUDO_RISCV64
+// The allocator is over 4MB large. Rather than creating an instance of this on
+// the heap, keep it in a global storage to reduce fragmentation from having to
+// mmap this at the start of every test.
+struct TestAllocatorStorage {
+  static constexpr size_t kMaxSize = std::max({
+    sizeof(scudo::Allocator<scudo::DefaultConfig>),
+#if SCUDO_CAN_USE_PRIMARY64
+        sizeof(scudo::Allocator<scudo::FuchsiaConfig>),
+#endif
+        sizeof(scudo::Allocator<scudo::AndroidConfig>)
+  });
+
+  // To alleviate some problem, let's skip the thread safety analysis here.
+  static void *get(size_t size) NO_THREAD_SAFETY_ANALYSIS {
+    CHECK(size <= kMaxSize &&
+          "Allocation size doesn't fit in the allocator storage");
+    M.lock();
+    return AllocatorStorage;
   }
 
-  void operator delete(void *ptr) { free(ptr); }
+  static void release(void *ptr) NO_THREAD_SAFETY_ANALYSIS {
+    M.assertHeld();
+    M.unlock();
+    ASSERT_EQ(ptr, AllocatorStorage);
+  }
+
+  static scudo::HybridMutex M;
+  static uint8_t AllocatorStorage[kMaxSize];
 };
+scudo::HybridMutex TestAllocatorStorage::M;
+alignas(kMaxAlign) uint8_t TestAllocatorStorage::AllocatorStorage[kMaxSize];
+#else
+struct TestAllocatorStorage {
+  static void *get(size_t size) NO_THREAD_SAFETY_ANALYSIS {
+    void *p = nullptr;
+    EXPECT_EQ(0, posix_memalign(&p, kMaxAlign, size));
+    return p;
+  }
+  static void release(void *ptr) NO_THREAD_SAFETY_ANALYSIS { free(ptr); }
+};
+#endif
+
+template <typename Config>
+void *TestAllocator<Config>::operator new(size_t size) {
+  return TestAllocatorStorage::get(size);
+}
+
+template <typename Config>
+void TestAllocator<Config>::operator delete(void *ptr) {
+  TestAllocatorStorage::release(ptr);
+}
 
 template <class TypeParam> struct ScudoCombinedTest : public Test {
   ScudoCombinedTest() {
@@ -107,15 +166,60 @@ template <class TypeParam> struct ScudoCombinedTest : public Test {
 
 template <typename T> using ScudoCombinedDeathTest = ScudoCombinedTest<T>;
 
+namespace scudo {
+struct TestConditionVariableConfig {
+  static const bool MaySupportMemoryTagging = true;
+  template <class A>
+  using TSDRegistryT =
+      scudo::TSDRegistrySharedT<A, 8U, 4U>; // Shared, max 8 TSDs.
+
+  struct Primary {
+    using SizeClassMap = scudo::AndroidSizeClassMap;
+#if SCUDO_CAN_USE_PRIMARY64
+    static const scudo::uptr RegionSizeLog = 28U;
+    typedef scudo::u32 CompactPtrT;
+    static const scudo::uptr CompactPtrScale = SCUDO_MIN_ALIGNMENT_LOG;
+    static const scudo::uptr GroupSizeLog = 20U;
+    static const bool EnableRandomOffset = true;
+    static const scudo::uptr MapSizeIncrement = 1UL << 18;
+#else
+    static const scudo::uptr RegionSizeLog = 18U;
+    static const scudo::uptr GroupSizeLog = 18U;
+    typedef scudo::uptr CompactPtrT;
+#endif
+    static const scudo::s32 MinReleaseToOsIntervalMs = 1000;
+    static const scudo::s32 MaxReleaseToOsIntervalMs = 1000;
+    static const bool UseConditionVariable = true;
+#if SCUDO_LINUX
+    using ConditionVariableT = scudo::ConditionVariableLinux;
+#else
+    using ConditionVariableT = scudo::ConditionVariableDummy;
+#endif
+  };
+#if SCUDO_CAN_USE_PRIMARY64
+  template <typename Config>
+  using PrimaryT = scudo::SizeClassAllocator64<Config>;
+#else
+  template <typename Config>
+  using PrimaryT = scudo::SizeClassAllocator32<Config>;
+#endif
+
+  struct Secondary {
+    template <typename Config>
+    using CacheT = scudo::MapAllocatorNoCache<Config>;
+  };
+  template <typename Config> using SecondaryT = scudo::MapAllocator<Config>;
+};
+} // namespace scudo
+
 #if SCUDO_FUCHSIA
 #define SCUDO_TYPED_TEST_ALL_TYPES(FIXTURE, NAME)                              \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, AndroidSvelteConfig)                    \
   SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, FuchsiaConfig)
 #else
 #define SCUDO_TYPED_TEST_ALL_TYPES(FIXTURE, NAME)                              \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, AndroidSvelteConfig)                    \
   SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, DefaultConfig)                          \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, AndroidConfig)
+  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, AndroidConfig)                          \
+  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConditionVariableConfig)
 #endif
 
 #define SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TYPE)                             \
@@ -170,6 +274,7 @@ void ScudoCombinedTest<Config>::BasicTest(scudo::uptr SizeLog) {
   }
 
   Allocator->printStats();
+  Allocator->printFragmentationInfo();
 }
 
 #define SCUDO_MAKE_BASIC_TEST(SizeLog)                                         \
@@ -209,7 +314,7 @@ SCUDO_TYPED_TEST(ScudoCombinedTest, ZeroContents) {
       void *P = Allocator->allocate(Size, Origin, 1U << MinAlignLog, true);
       EXPECT_NE(P, nullptr);
       for (scudo::uptr I = 0; I < Size; I++)
-        ASSERT_EQ((reinterpret_cast<char *>(P))[I], 0);
+        ASSERT_EQ((reinterpret_cast<char *>(P))[I], '\0');
       memset(P, 0xaa, Size);
       Allocator->deallocate(P, Origin, Size);
     }
@@ -227,7 +332,7 @@ SCUDO_TYPED_TEST(ScudoCombinedTest, ZeroFill) {
       void *P = Allocator->allocate(Size, Origin, 1U << MinAlignLog, false);
       EXPECT_NE(P, nullptr);
       for (scudo::uptr I = 0; I < Size; I++)
-        ASSERT_EQ((reinterpret_cast<char *>(P))[I], 0);
+        ASSERT_EQ((reinterpret_cast<char *>(P))[I], '\0');
       memset(P, 0xaa, Size);
       Allocator->deallocate(P, Origin, Size);
     }
@@ -286,7 +391,7 @@ SCUDO_TYPED_TEST(ScudoCombinedTest, ReallocateLargeIncreasing) {
   // we preserve the data in the process.
   scudo::uptr Size = 16;
   void *P = Allocator->allocate(Size, Origin);
-  const char Marker = 0xab;
+  const char Marker = 'A';
   memset(P, Marker, Size);
   while (Size < TypeParam::Primary::SizeClassMap::MaxSize * 4) {
     void *NewP = Allocator->reallocate(P, Size * 2);
@@ -308,7 +413,7 @@ SCUDO_TYPED_TEST(ScudoCombinedTest, ReallocateLargeDecreasing) {
   scudo::uptr Size = TypeParam::Primary::SizeClassMap::MaxSize * 2;
   const scudo::uptr DataSize = 2048U;
   void *P = Allocator->allocate(Size, Origin);
-  const char Marker = 0xab;
+  const char Marker = 'A';
   memset(P, Marker, scudo::Min(Size, DataSize));
   while (Size > 1U) {
     Size /= 2U;
@@ -331,7 +436,7 @@ SCUDO_TYPED_TEST(ScudoCombinedDeathTest, ReallocateSame) {
   constexpr scudo::uptr ReallocSize =
       TypeParam::Primary::SizeClassMap::MaxSize - 64;
   void *P = Allocator->allocate(ReallocSize, Origin);
-  const char Marker = 0xab;
+  const char Marker = 'A';
   memset(P, Marker, ReallocSize);
   for (scudo::sptr Delta = -32; Delta < 32; Delta += 8) {
     const scudo::uptr NewSize =
@@ -388,7 +493,7 @@ SCUDO_TYPED_TEST(ScudoCombinedDeathTest, UseAfterFree) {
           disableDebuggerdMaybe();
           void *P = Allocator->allocate(Size, Origin);
           Allocator->deallocate(P, Origin);
-          reinterpret_cast<char *>(P)[0] = 0xaa;
+          reinterpret_cast<char *>(P)[0] = 'A';
         },
         "");
     EXPECT_DEATH(
@@ -396,7 +501,7 @@ SCUDO_TYPED_TEST(ScudoCombinedDeathTest, UseAfterFree) {
           disableDebuggerdMaybe();
           void *P = Allocator->allocate(Size, Origin);
           Allocator->deallocate(P, Origin);
-          reinterpret_cast<char *>(P)[Size - 1] = 0xaa;
+          reinterpret_cast<char *>(P)[Size - 1] = 'A';
         },
         "");
   }
@@ -408,15 +513,15 @@ SCUDO_TYPED_TEST(ScudoCombinedDeathTest, DisableMemoryTagging) {
   if (Allocator->useMemoryTaggingTestOnly()) {
     // Check that disabling memory tagging works correctly.
     void *P = Allocator->allocate(2048, Origin);
-    EXPECT_DEATH(reinterpret_cast<char *>(P)[2048] = 0xaa, "");
+    EXPECT_DEATH(reinterpret_cast<char *>(P)[2048] = 'A', "");
     scudo::ScopedDisableMemoryTagChecks NoTagChecks;
     Allocator->disableMemoryTagging();
-    reinterpret_cast<char *>(P)[2048] = 0xaa;
+    reinterpret_cast<char *>(P)[2048] = 'A';
     Allocator->deallocate(P, Origin);
 
     P = Allocator->allocate(2048, Origin);
     EXPECT_EQ(scudo::untagPointer(P), P);
-    reinterpret_cast<char *>(P)[2048] = 0xaa;
+    reinterpret_cast<char *>(P)[2048] = 'A';
     Allocator->deallocate(P, Origin);
 
     Allocator->releaseToOS(scudo::ReleaseToOS::Force);
@@ -456,6 +561,7 @@ SCUDO_TYPED_TEST(ScudoCombinedTest, CacheDrain) NO_THREAD_SAFETY_ANALYSIS {
 
   bool UnlockRequired;
   auto *TSD = Allocator->getTSDRegistry()->getTSDAndLock(&UnlockRequired);
+  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
   EXPECT_TRUE(!TSD->getCache().isEmpty());
   TSD->getCache().drain();
   EXPECT_TRUE(TSD->getCache().isEmpty());
@@ -480,6 +586,7 @@ SCUDO_TYPED_TEST(ScudoCombinedTest, ForceCacheDrain) NO_THREAD_SAFETY_ANALYSIS {
 
   bool UnlockRequired;
   auto *TSD = Allocator->getTSDRegistry()->getTSDAndLock(&UnlockRequired);
+  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
   EXPECT_TRUE(TSD->getCache().isEmpty());
   EXPECT_EQ(TSD->getQuarantineCache().getSize(), 0U);
   EXPECT_TRUE(Allocator->getQuarantine()->isEmpty());
@@ -723,7 +830,7 @@ SCUDO_TYPED_TEST(ScudoCombinedTest, DisableMemInit) {
     for (unsigned I = 0; I != Ptrs.size(); ++I) {
       Ptrs[I] = Allocator->allocate(Size, Origin, 1U << MinAlignLog, true);
       for (scudo::uptr J = 0; J < Size; ++J)
-        ASSERT_EQ((reinterpret_cast<char *>(Ptrs[I]))[J], 0);
+        ASSERT_EQ((reinterpret_cast<char *>(Ptrs[I]))[J], '\0');
     }
   }
 
@@ -786,6 +893,7 @@ TEST(ScudoCombinedTest, BasicTrustyConfig) {
 
   bool UnlockRequired;
   auto *TSD = Allocator->getTSDRegistry()->getTSDAndLock(&UnlockRequired);
+  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
   TSD->getCache().drain();
 
   Allocator->releaseToOS(scudo::ReleaseToOS::Force);
@@ -793,41 +901,3 @@ TEST(ScudoCombinedTest, BasicTrustyConfig) {
 
 #endif
 #endif
-
-#if SCUDO_LINUX
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, SoftRssLimit) {
-  auto *Allocator = this->Allocator.get();
-  Allocator->setRssLimitsTestOnly(1, 0, true);
-
-  size_t Megabyte = 1024 * 1024;
-  size_t ChunkSize = 16;
-  size_t Error = 256;
-
-  std::vector<void *> Ptrs;
-  for (size_t index = 0; index < Megabyte + Error; index += ChunkSize) {
-    void *Ptr = Allocator->allocate(ChunkSize, Origin);
-    Ptrs.push_back(Ptr);
-  }
-
-  EXPECT_EQ(nullptr, Allocator->allocate(ChunkSize, Origin));
-
-  for (void *Ptr : Ptrs)
-    Allocator->deallocate(Ptr, Origin);
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, HardRssLimit) {
-  auto *Allocator = this->Allocator.get();
-  Allocator->setRssLimitsTestOnly(0, 1, false);
-
-  size_t Megabyte = 1024 * 1024;
-
-  EXPECT_DEATH(
-      {
-        disableDebuggerdMaybe();
-        Allocator->allocate(Megabyte, Origin);
-      },
-      "");
-}
-
-#endif
diff --git a/Telegram/ThirdParty/scudo/tests/common_test.cpp b/Telegram/ThirdParty/scudo/tests/common_test.cpp
index b1e55e80d..fff7c662a 100644
--- a/Telegram/ThirdParty/scudo/tests/common_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/common_test.cpp
@@ -72,27 +72,4 @@ TEST(ScudoCommonTest, Zeros) {
   MemMap.unmap(MemMap.getBase(), Size);
 }
 
-#if 0
-// This test is temorarily disabled because it may not work as expected. E.g.,
-// it doesn't dirty the pages so the pages may not be commited and it may only
-// work on the single thread environment. As a result, this test is flaky and is
-// impacting many test scenarios.
-TEST(ScudoCommonTest, GetRssFromBuffer) {
-  constexpr int64_t AllocSize = 10000000;
-  constexpr int64_t Error = 3000000;
-  constexpr size_t Runs = 10;
-
-  int64_t Rss = scudo::GetRSS();
-  EXPECT_GT(Rss, 0);
-
-  std::vector<std::unique_ptr<char[]>> Allocs(Runs);
-  for (auto &Alloc : Allocs) {
-    Alloc.reset(new char[AllocSize]());
-    int64_t Prev = Rss;
-    Rss = scudo::GetRSS();
-    EXPECT_LE(std::abs(Rss - AllocSize - Prev), Error);
-  }
-}
-#endif
-
 } // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/tests/condition_variable_test.cpp b/Telegram/ThirdParty/scudo/tests/condition_variable_test.cpp
new file mode 100644
index 000000000..caba1f64a
--- /dev/null
+++ b/Telegram/ThirdParty/scudo/tests/condition_variable_test.cpp
@@ -0,0 +1,59 @@
+//===-- condition_variable_test.cpp -----------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "tests/scudo_unit_test.h"
+
+#include "common.h"
+#include "condition_variable.h"
+#include "mutex.h"
+
+#include <thread>
+
+template <typename ConditionVariableT> void simpleWaitAndNotifyAll() {
+  constexpr scudo::u32 NumThreads = 2;
+  constexpr scudo::u32 CounterMax = 1024;
+  std::thread Threads[NumThreads];
+
+  scudo::HybridMutex M;
+  ConditionVariableT CV;
+  CV.bindTestOnly(M);
+  scudo::u32 Counter = 0;
+
+  for (scudo::u32 I = 0; I < NumThreads; ++I) {
+    Threads[I] = std::thread(
+        [&](scudo::u32 Id) {
+          do {
+            scudo::ScopedLock L(M);
+            if (Counter % NumThreads != Id && Counter < CounterMax)
+              CV.wait(M);
+            if (Counter >= CounterMax) {
+              break;
+            } else {
+              ++Counter;
+              CV.notifyAll(M);
+            }
+          } while (true);
+        },
+        I);
+  }
+
+  for (std::thread &T : Threads)
+    T.join();
+
+  EXPECT_EQ(Counter, CounterMax);
+}
+
+TEST(ScudoConditionVariableTest, DummyCVWaitAndNotifyAll) {
+  simpleWaitAndNotifyAll<scudo::ConditionVariableDummy>();
+}
+
+#ifdef SCUDO_LINUX
+TEST(ScudoConditionVariableTest, LinuxCVWaitAndNotifyAll) {
+  simpleWaitAndNotifyAll<scudo::ConditionVariableLinux>();
+}
+#endif
diff --git a/Telegram/ThirdParty/scudo/tests/memtag_test.cpp b/Telegram/ThirdParty/scudo/tests/memtag_test.cpp
index 2488e0485..fd277f962 100644
--- a/Telegram/ThirdParty/scudo/tests/memtag_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/memtag_test.cpp
@@ -120,7 +120,15 @@ TEST_F(MemtagTest, SelectRandomTag) {
     uptr Tags = 0;
     for (uptr I = 0; I < 100000; ++I)
       Tags = Tags | (1u << extractTag(selectRandomTag(Ptr, 0)));
-    EXPECT_EQ(0xfffeull, Tags);
+    // std::popcnt is C++20
+    int PopCnt = 0;
+    while (Tags) {
+      PopCnt += Tags & 1;
+      Tags >>= 1;
+    }
+    // Random tags are not always very random, and this test is not about PRNG
+    // quality.  Anything above half would be satisfactory.
+    EXPECT_GE(PopCnt, 8);
   }
 }
 
diff --git a/Telegram/ThirdParty/scudo/tests/primary_test.cpp b/Telegram/ThirdParty/scudo/tests/primary_test.cpp
index 6e580e4fe..181715117 100644
--- a/Telegram/ThirdParty/scudo/tests/primary_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/primary_test.cpp
@@ -8,6 +8,8 @@
 
 #include "tests/scudo_unit_test.h"
 
+#include "allocator_config.h"
+#include "condition_variable.h"
 #include "primary32.h"
 #include "primary64.h"
 #include "size_class_map.h"
@@ -104,6 +106,34 @@ template <typename SizeClassMapT> struct TestConfig4 {
   };
 };
 
+// This is the only test config that enables the condition variable.
+template <typename SizeClassMapT> struct TestConfig5 {
+  static const bool MaySupportMemoryTagging = true;
+
+  struct Primary {
+    using SizeClassMap = SizeClassMapT;
+#if defined(__mips__)
+    // Unable to allocate greater size on QEMU-user.
+    static const scudo::uptr RegionSizeLog = 23U;
+#else
+    static const scudo::uptr RegionSizeLog = 24U;
+#endif
+    static const scudo::s32 MinReleaseToOsIntervalMs = INT32_MIN;
+    static const scudo::s32 MaxReleaseToOsIntervalMs = INT32_MAX;
+    static const scudo::uptr CompactPtrScale = SCUDO_MIN_ALIGNMENT_LOG;
+    static const scudo::uptr GroupSizeLog = 18U;
+    typedef scudo::u32 CompactPtrT;
+    static const bool EnableRandomOffset = true;
+    static const scudo::uptr MapSizeIncrement = 1UL << 18;
+    static const bool UseConditionVariable = true;
+#if SCUDO_LINUX
+    using ConditionVariableT = scudo::ConditionVariableLinux;
+#else
+    using ConditionVariableT = scudo::ConditionVariableDummy;
+#endif
+  };
+};
+
 template <template <typename> class BaseConfig, typename SizeClassMapT>
 struct Config : public BaseConfig<SizeClassMapT> {};
 
@@ -142,7 +172,8 @@ struct ScudoPrimaryTest : public Test {};
   SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig1)                            \
   SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig2)                            \
   SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig3)                            \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig4)
+  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig4)                            \
+  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig5)
 #endif
 
 #define SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TYPE)                             \
@@ -206,7 +237,7 @@ struct SmallRegionsConfig {
 // For the 32-bit one, it requires actually exhausting memory, so we skip it.
 TEST(ScudoPrimaryTest, Primary64OOM) {
   using Primary = scudo::SizeClassAllocator64<SmallRegionsConfig>;
-  using TransferBatch = Primary::CacheT::TransferBatch;
+  using TransferBatch = Primary::TransferBatchT;
   Primary Allocator;
   Allocator.init(/*ReleaseToOsInterval=*/-1);
   typename Primary::CacheT Cache;
@@ -232,8 +263,9 @@ TEST(ScudoPrimaryTest, Primary64OOM) {
   while (!Batches.empty()) {
     TransferBatch *B = Batches.back();
     Batches.pop_back();
-    B->copyToArray(Blocks);
-    Allocator.pushBlocks(&Cache, ClassId, Blocks, B->getCount());
+    const scudo::u16 Count = B->getCount();
+    B->moveToArray(Blocks);
+    Allocator.pushBlocks(&Cache, ClassId, Blocks, Count);
     Cache.deallocate(Primary::SizeClassMap::BatchClassId, B);
   }
   Cache.destroy(nullptr);
@@ -283,7 +315,7 @@ SCUDO_TYPED_TEST(ScudoPrimaryTest, PrimaryIterate) {
 }
 
 SCUDO_TYPED_TEST(ScudoPrimaryTest, PrimaryThreaded) {
-  using Primary = TestAllocator<TypeParam, scudo::SvelteSizeClassMap>;
+  using Primary = TestAllocator<TypeParam, scudo::Config::Primary::SizeClassMap>;
   std::unique_ptr<Primary> Allocator(new Primary);
   Allocator->init(/*ReleaseToOsInterval=*/-1);
   std::mutex Mutex;
@@ -335,6 +367,7 @@ SCUDO_TYPED_TEST(ScudoPrimaryTest, PrimaryThreaded) {
   Allocator->releaseToOS(scudo::ReleaseToOS::Force);
   scudo::ScopedString Str;
   Allocator->getStats(&Str);
+  Allocator->getFragmentationInfo(&Str);
   Str.output();
 }
 
diff --git a/Telegram/ThirdParty/scudo/tests/release_test.cpp b/Telegram/ThirdParty/scudo/tests/release_test.cpp
index 6b54c156a..14b398a91 100644
--- a/Telegram/ThirdParty/scudo/tests/release_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/release_test.cpp
@@ -23,17 +23,16 @@ TEST(ScudoReleaseTest, RegionPageMap) {
     // Various valid counter's max values packed into one word.
     scudo::RegionPageMap PageMap2N(1U, 1U, 1UL << I);
     ASSERT_TRUE(PageMap2N.isAllocated());
-    EXPECT_EQ(sizeof(scudo::uptr), PageMap2N.getBufferSize());
+    EXPECT_EQ(1U, PageMap2N.getBufferNumElements());
     // Check the "all bit set" values too.
     scudo::RegionPageMap PageMap2N1_1(1U, 1U, ~0UL >> I);
     ASSERT_TRUE(PageMap2N1_1.isAllocated());
-    EXPECT_EQ(sizeof(scudo::uptr), PageMap2N1_1.getBufferSize());
+    EXPECT_EQ(1U, PageMap2N1_1.getBufferNumElements());
     // Verify the packing ratio, the counter is Expected to be packed into the
     // closest power of 2 bits.
     scudo::RegionPageMap PageMap(1U, SCUDO_WORDSIZE, 1UL << I);
     ASSERT_TRUE(PageMap.isAllocated());
-    EXPECT_EQ(sizeof(scudo::uptr) * scudo::roundUpPowerOfTwo(I + 1),
-              PageMap.getBufferSize());
+    EXPECT_EQ(scudo::roundUpPowerOfTwo(I + 1), PageMap.getBufferNumElements());
   }
 
   // Go through 1, 2, 4, 8, .. {32,64} bits per counter.
@@ -533,7 +532,8 @@ template <class SizeClassMap> void testReleasePartialRegion() {
                                         ReleaseBase);
       Partial.ensurePageMapAllocated();
 
-      EXPECT_GE(Full.PageMap.getBufferSize(), Partial.PageMap.getBufferSize());
+      EXPECT_GE(Full.PageMap.getBufferNumElements(),
+                Partial.PageMap.getBufferNumElements());
     }
 
     while (!FreeList.empty()) {
@@ -552,22 +552,16 @@ TEST(ScudoReleaseTest, ReleaseFreeMemoryToOSAndroid) {
   testReleaseFreeMemoryToOS<scudo::AndroidSizeClassMap>();
 }
 
-TEST(ScudoReleaseTest, ReleaseFreeMemoryToOSSvelte) {
-  testReleaseFreeMemoryToOS<scudo::SvelteSizeClassMap>();
-}
-
 TEST(ScudoReleaseTest, PageMapMarkRange) {
   testPageMapMarkRange<scudo::DefaultSizeClassMap>();
   testPageMapMarkRange<scudo::AndroidSizeClassMap>();
   testPageMapMarkRange<scudo::FuchsiaSizeClassMap>();
-  testPageMapMarkRange<scudo::SvelteSizeClassMap>();
 }
 
 TEST(ScudoReleaseTest, ReleasePartialRegion) {
   testReleasePartialRegion<scudo::DefaultSizeClassMap>();
   testReleasePartialRegion<scudo::AndroidSizeClassMap>();
   testReleasePartialRegion<scudo::FuchsiaSizeClassMap>();
-  testReleasePartialRegion<scudo::SvelteSizeClassMap>();
 }
 
 template <class SizeClassMap> void testReleaseRangeWithSingleBlock() {
@@ -630,31 +624,31 @@ TEST(ScudoReleaseTest, RangeReleaseRegionWithSingleBlock) {
   testReleaseRangeWithSingleBlock<scudo::DefaultSizeClassMap>();
   testReleaseRangeWithSingleBlock<scudo::AndroidSizeClassMap>();
   testReleaseRangeWithSingleBlock<scudo::FuchsiaSizeClassMap>();
-  testReleaseRangeWithSingleBlock<scudo::SvelteSizeClassMap>();
 }
 
 TEST(ScudoReleaseTest, BufferPool) {
   constexpr scudo::uptr StaticBufferCount = SCUDO_WORDSIZE - 1;
-  constexpr scudo::uptr StaticBufferSize = 512U;
+  constexpr scudo::uptr StaticBufferNumElements = 512U;
 
   // Allocate the buffer pool on the heap because it is quite large (slightly
-  // more than StaticBufferCount * StaticBufferSize * sizeof(uptr)) and it may
-  // not fit in the stack on some platforms.
-  using BufferPool = scudo::BufferPool<StaticBufferCount, StaticBufferSize>;
+  // more than StaticBufferCount * StaticBufferNumElements * sizeof(uptr)) and
+  // it may not fit in the stack on some platforms.
+  using BufferPool =
+      scudo::BufferPool<StaticBufferCount, StaticBufferNumElements>;
   std::unique_ptr<BufferPool> Pool(new BufferPool());
 
-  std::vector<std::pair<scudo::uptr *, scudo::uptr>> Buffers;
+  std::vector<BufferPool::Buffer> Buffers;
   for (scudo::uptr I = 0; I < StaticBufferCount; ++I) {
-    scudo::uptr *P = Pool->getBuffer(StaticBufferSize);
-    EXPECT_TRUE(Pool->isStaticBufferTestOnly(P, StaticBufferSize));
-    Buffers.emplace_back(P, StaticBufferSize);
+    BufferPool::Buffer Buffer = Pool->getBuffer(StaticBufferNumElements);
+    EXPECT_TRUE(Pool->isStaticBufferTestOnly(Buffer));
+    Buffers.push_back(Buffer);
   }
 
   // The static buffer is supposed to be used up.
-  scudo::uptr *P = Pool->getBuffer(StaticBufferSize);
-  EXPECT_FALSE(Pool->isStaticBufferTestOnly(P, StaticBufferSize));
+  BufferPool::Buffer Buffer = Pool->getBuffer(StaticBufferNumElements);
+  EXPECT_FALSE(Pool->isStaticBufferTestOnly(Buffer));
 
-  Pool->releaseBuffer(P, StaticBufferSize);
+  Pool->releaseBuffer(Buffer);
   for (auto &Buffer : Buffers)
-    Pool->releaseBuffer(Buffer.first, Buffer.second);
+    Pool->releaseBuffer(Buffer);
 }
diff --git a/Telegram/ThirdParty/scudo/tests/report_test.cpp b/Telegram/ThirdParty/scudo/tests/report_test.cpp
index 81587bae6..92f1ee813 100644
--- a/Telegram/ThirdParty/scudo/tests/report_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/report_test.cpp
@@ -23,7 +23,6 @@ TEST(ScudoReportDeathTest, Generic) {
   EXPECT_DEATH(scudo::reportError("TEST123"), "Scudo ERROR.*TEST123");
   EXPECT_DEATH(scudo::reportInvalidFlag("ABC", "DEF"), "Scudo ERROR.*ABC.*DEF");
   EXPECT_DEATH(scudo::reportHeaderCorruption(P), "Scudo ERROR.*42424242");
-  EXPECT_DEATH(scudo::reportHeaderRace(P), "Scudo ERROR.*42424242");
   EXPECT_DEATH(scudo::reportSanityCheckError("XYZ"), "Scudo ERROR.*XYZ");
   EXPECT_DEATH(scudo::reportAlignmentTooBig(123, 456), "Scudo ERROR.*123.*456");
   EXPECT_DEATH(scudo::reportAllocationSizeTooBig(123, 456, 789),
diff --git a/Telegram/ThirdParty/scudo/tests/scudo_hooks_test.cpp b/Telegram/ThirdParty/scudo/tests/scudo_hooks_test.cpp
deleted file mode 100644
index 7184ec12a..000000000
--- a/Telegram/ThirdParty/scudo/tests/scudo_hooks_test.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//===-- scudo_hooks_test.cpp ------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "allocator_config.h"
-#include "combined.h"
-
-namespace {
-void *LastAllocatedPtr = nullptr;
-size_t LastRequestSize = 0;
-void *LastDeallocatedPtr = nullptr;
-} // namespace
-
-// Scudo defines weak symbols that can be defined by a client binary
-// to register callbacks at key points in the allocation timeline.  In
-// order to enforce those invariants, we provide definitions that
-// update some global state every time they are called, so that tests
-// can inspect their effects.  An unfortunate side effect of this
-// setup is that because those symbols are part of the binary, they
-// can't be selectively enabled; that means that they will get called
-// on unrelated tests in the same compilation unit. To mitigate this
-// issue, we insulate those tests in a separate compilation unit.
-extern "C" {
-__attribute__((visibility("default"))) void __scudo_allocate_hook(void *Ptr,
-                                                                  size_t Size) {
-  LastAllocatedPtr = Ptr;
-  LastRequestSize = Size;
-}
-__attribute__((visibility("default"))) void __scudo_deallocate_hook(void *Ptr) {
-  LastDeallocatedPtr = Ptr;
-}
-}
-
-// Simple check that allocation callbacks, when registered, are called:
-//   1) __scudo_allocate_hook is called when allocating.
-//   2) __scudo_deallocate_hook is called when deallocating.
-//   3) Both hooks are called when reallocating.
-//   4) Neither are called for a no-op reallocation.
-TEST(ScudoHooksTest, AllocateHooks) {
-  scudo::Allocator<scudo::DefaultConfig> Allocator;
-  constexpr scudo::uptr DefaultSize = 16U;
-  constexpr scudo::Chunk::Origin Origin = scudo::Chunk::Origin::Malloc;
-
-  // Simple allocation and deallocation.
-  {
-    LastAllocatedPtr = nullptr;
-    LastRequestSize = 0;
-
-    void *Ptr = Allocator.allocate(DefaultSize, Origin);
-
-    EXPECT_EQ(Ptr, LastAllocatedPtr);
-    EXPECT_EQ(DefaultSize, LastRequestSize);
-
-    LastDeallocatedPtr = nullptr;
-
-    Allocator.deallocate(Ptr, Origin);
-
-    EXPECT_EQ(Ptr, LastDeallocatedPtr);
-  }
-
-  // Simple no-op, same size reallocation.
-  {
-    void *Ptr = Allocator.allocate(DefaultSize, Origin);
-
-    LastAllocatedPtr = nullptr;
-    LastRequestSize = 0;
-    LastDeallocatedPtr = nullptr;
-
-    void *NewPtr = Allocator.reallocate(Ptr, DefaultSize);
-
-    EXPECT_EQ(Ptr, NewPtr);
-    EXPECT_EQ(nullptr, LastAllocatedPtr);
-    EXPECT_EQ(0U, LastRequestSize);
-    EXPECT_EQ(nullptr, LastDeallocatedPtr);
-  }
-
-  // Reallocation in increasing size classes. This ensures that at
-  // least one of the reallocations will be meaningful.
-  {
-    void *Ptr = Allocator.allocate(0, Origin);
-
-    for (scudo::uptr ClassId = 1U;
-         ClassId <= scudo::DefaultConfig::Primary::SizeClassMap::LargestClassId;
-         ++ClassId) {
-      const scudo::uptr Size =
-          scudo::DefaultConfig::Primary::SizeClassMap::getSizeByClassId(
-              ClassId);
-
-      LastAllocatedPtr = nullptr;
-      LastRequestSize = 0;
-      LastDeallocatedPtr = nullptr;
-
-      void *NewPtr = Allocator.reallocate(Ptr, Size);
-
-      if (NewPtr != Ptr) {
-        EXPECT_EQ(NewPtr, LastAllocatedPtr);
-        EXPECT_EQ(Size, LastRequestSize);
-        EXPECT_EQ(Ptr, LastDeallocatedPtr);
-      } else {
-        EXPECT_EQ(nullptr, LastAllocatedPtr);
-        EXPECT_EQ(0U, LastRequestSize);
-        EXPECT_EQ(nullptr, LastDeallocatedPtr);
-      }
-
-      Ptr = NewPtr;
-    }
-  }
-}
diff --git a/Telegram/ThirdParty/scudo/tests/scudo_unit_test.h b/Telegram/ThirdParty/scudo/tests/scudo_unit_test.h
index 1665fa87e..428341643 100644
--- a/Telegram/ThirdParty/scudo/tests/scudo_unit_test.h
+++ b/Telegram/ThirdParty/scudo/tests/scudo_unit_test.h
@@ -45,4 +45,10 @@ using Test = ::testing::Test;
 #define SKIP_NO_DEBUG(T) DISABLED_##T
 #endif
 
+#if SCUDO_FUCHSIA
+// The zxtest library provides a default main function that does the same thing
+// for Fuchsia builds.
+#define SCUDO_NO_TEST_MAIN
+#endif
+
 extern bool UseQuarantine;
diff --git a/Telegram/ThirdParty/scudo/tests/scudo_unit_test_main.cpp b/Telegram/ThirdParty/scudo/tests/scudo_unit_test_main.cpp
index fbfefa5c9..881e0265b 100644
--- a/Telegram/ThirdParty/scudo/tests/scudo_unit_test_main.cpp
+++ b/Telegram/ThirdParty/scudo/tests/scudo_unit_test_main.cpp
@@ -45,9 +45,7 @@ __scudo_default_options() {
          "dealloc_type_mismatch=" DEALLOC_TYPE_MISMATCH;
 }
 
-// The zxtest library provides a default main function that does the same thing
-// for Fuchsia builds.
-#if !SCUDO_FUCHSIA
+#if !defined(SCUDO_NO_TEST_MAIN)
 int main(int argc, char **argv) {
   EnableMemoryTaggingIfSupported();
   testing::InitGoogleTest(&argc, argv);
diff --git a/Telegram/ThirdParty/scudo/tests/size_class_map_test.cpp b/Telegram/ThirdParty/scudo/tests/size_class_map_test.cpp
index b11db1e9f..05b5835ff 100644
--- a/Telegram/ThirdParty/scudo/tests/size_class_map_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/size_class_map_test.cpp
@@ -20,10 +20,6 @@ TEST(ScudoSizeClassMapTest, DefaultSizeClassMap) {
   testSizeClassMap<scudo::DefaultSizeClassMap>();
 }
 
-TEST(ScudoSizeClassMapTest, SvelteSizeClassMap) {
-  testSizeClassMap<scudo::SvelteSizeClassMap>();
-}
-
 TEST(ScudoSizeClassMapTest, AndroidSizeClassMap) {
   testSizeClassMap<scudo::AndroidSizeClassMap>();
 }
diff --git a/Telegram/ThirdParty/scudo/tests/tsd_test.cpp b/Telegram/ThirdParty/scudo/tests/tsd_test.cpp
index 5953d759a..fad8fcf90 100644
--- a/Telegram/ThirdParty/scudo/tests/tsd_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/tsd_test.cpp
@@ -101,6 +101,7 @@ template <class AllocatorT> static void testRegistry() {
 
   bool UnlockRequired;
   auto TSD = Registry->getTSDAndLock(&UnlockRequired);
+  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
   EXPECT_NE(TSD, nullptr);
   EXPECT_EQ(TSD->getCache().Canary, 0U);
   if (UnlockRequired)
@@ -108,6 +109,7 @@ template <class AllocatorT> static void testRegistry() {
 
   Registry->initThreadMaybe(Allocator.get(), /*MinimalInit=*/false);
   TSD = Registry->getTSDAndLock(&UnlockRequired);
+  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
   EXPECT_NE(TSD, nullptr);
   EXPECT_EQ(TSD->getCache().Canary, 0U);
   memset(&TSD->getCache(), 0x42, sizeof(TSD->getCache()));
@@ -137,6 +139,7 @@ template <typename AllocatorT> static void stressCache(AllocatorT *Allocator) {
   Registry->initThreadMaybe(Allocator, /*MinimalInit=*/false);
   bool UnlockRequired;
   auto TSD = Registry->getTSDAndLock(&UnlockRequired);
+  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
   EXPECT_NE(TSD, nullptr);
   // For an exclusive TSD, the cache should be empty. We cannot guarantee the
   // same for a shared TSD.
@@ -195,6 +198,7 @@ static void stressSharedRegistry(MockAllocator<SharedCaches> *Allocator) {
   bool UnlockRequired;
   for (scudo::uptr I = 0; I < 4096U; I++) {
     auto TSD = Registry->getTSDAndLock(&UnlockRequired);
+    TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
     EXPECT_NE(TSD, nullptr);
     Set.insert(reinterpret_cast<void *>(TSD));
     if (UnlockRequired)
diff --git a/Telegram/ThirdParty/scudo/tests/wrappers_c_test.cpp b/Telegram/ThirdParty/scudo/tests/wrappers_c_test.cpp
index c921da980..f5e17d721 100644
--- a/Telegram/ThirdParty/scudo/tests/wrappers_c_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/wrappers_c_test.cpp
@@ -45,7 +45,101 @@ int malloc_iterate(uintptr_t base, size_t size,
                    void *arg);
 void *valloc(size_t size);
 void *pvalloc(size_t size);
+
+#ifndef SCUDO_ENABLE_HOOKS_TESTS
+#define SCUDO_ENABLE_HOOKS_TESTS 0
+#endif
+
+#if (SCUDO_ENABLE_HOOKS_TESTS == 1) && (SCUDO_ENABLE_HOOKS == 0)
+#error "Hooks tests should have hooks enabled as well!"
+#endif
+
+struct AllocContext {
+  void *Ptr;
+  size_t Size;
+};
+struct DeallocContext {
+  void *Ptr;
+};
+struct ReallocContext {
+  void *AllocPtr;
+  void *DeallocPtr;
+  size_t Size;
+};
+static AllocContext AC;
+static DeallocContext DC;
+static ReallocContext RC;
+
+#if (SCUDO_ENABLE_HOOKS_TESTS == 1)
+__attribute__((visibility("default"))) void __scudo_allocate_hook(void *Ptr,
+                                                                  size_t Size) {
+  AC.Ptr = Ptr;
+  AC.Size = Size;
 }
+__attribute__((visibility("default"))) void __scudo_deallocate_hook(void *Ptr) {
+  DC.Ptr = Ptr;
+}
+__attribute__((visibility("default"))) void
+__scudo_realloc_allocate_hook(void *OldPtr, void *NewPtr, size_t Size) {
+  // Verify that __scudo_realloc_deallocate_hook is called first and set the
+  // right pointer.
+  EXPECT_EQ(OldPtr, RC.DeallocPtr);
+  RC.AllocPtr = NewPtr;
+  RC.Size = Size;
+
+  // Note that this is only used for testing. In general, only one pair of hooks
+  // will be invoked in `realloc`. if __scudo_realloc_*_hook are not defined,
+  // it'll call the general hooks only. To make the test easier, we call the
+  // general one here so that either case (whether __scudo_realloc_*_hook are
+  // defined) will be verified without separating them into different tests.
+  __scudo_allocate_hook(NewPtr, Size);
+}
+__attribute__((visibility("default"))) void
+__scudo_realloc_deallocate_hook(void *Ptr) {
+  RC.DeallocPtr = Ptr;
+
+  // See the comment in the __scudo_realloc_allocate_hook above.
+  __scudo_deallocate_hook(Ptr);
+}
+#endif // (SCUDO_ENABLE_HOOKS_TESTS == 1)
+}
+
+class ScudoWrappersCTest : public Test {
+protected:
+  void SetUp() override {
+    if (SCUDO_ENABLE_HOOKS && !SCUDO_ENABLE_HOOKS_TESTS)
+      printf("Hooks are enabled but hooks tests are disabled.\n");
+  }
+
+  void invalidateHookPtrs() {
+    if (SCUDO_ENABLE_HOOKS_TESTS) {
+      void *InvalidPtr = reinterpret_cast<void *>(0xdeadbeef);
+      AC.Ptr = InvalidPtr;
+      DC.Ptr = InvalidPtr;
+      RC.AllocPtr = RC.DeallocPtr = InvalidPtr;
+    }
+  }
+  void verifyAllocHookPtr(UNUSED void *Ptr) {
+    if (SCUDO_ENABLE_HOOKS_TESTS)
+      EXPECT_EQ(Ptr, AC.Ptr);
+  }
+  void verifyAllocHookSize(UNUSED size_t Size) {
+    if (SCUDO_ENABLE_HOOKS_TESTS)
+      EXPECT_EQ(Size, AC.Size);
+  }
+  void verifyDeallocHookPtr(UNUSED void *Ptr) {
+    if (SCUDO_ENABLE_HOOKS_TESTS)
+      EXPECT_EQ(Ptr, DC.Ptr);
+  }
+  void verifyReallocHookPtrs(UNUSED void *OldPtr, void *NewPtr, size_t Size) {
+    if (SCUDO_ENABLE_HOOKS_TESTS) {
+      EXPECT_EQ(OldPtr, RC.DeallocPtr);
+      EXPECT_EQ(NewPtr, RC.AllocPtr);
+      EXPECT_EQ(Size, RC.Size);
+    }
+  }
+};
+using ScudoWrappersCDeathTest = ScudoWrappersCTest;
 
 // Note that every C allocation function in the test binary will be fulfilled
 // by Scudo (this includes the gtest APIs, etc.), which is a test by itself.
@@ -59,11 +153,13 @@ void *pvalloc(size_t size);
 
 static const size_t Size = 100U;
 
-TEST(ScudoWrappersCDeathTest, Malloc) {
+TEST_F(ScudoWrappersCDeathTest, Malloc) {
   void *P = malloc(Size);
   EXPECT_NE(P, nullptr);
   EXPECT_LE(Size, malloc_usable_size(P));
   EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % FIRST_32_SECOND_64(8U, 16U), 0U);
+  verifyAllocHookPtr(P);
+  verifyAllocHookSize(Size);
 
   // An update to this warning in Clang now triggers in this line, but it's ok
   // because the check is expecting a bad pointer and should fail.
@@ -78,6 +174,7 @@ TEST(ScudoWrappersCDeathTest, Malloc) {
 #endif
 
   free(P);
+  verifyDeallocHookPtr(P);
   EXPECT_DEATH(free(P), "");
 
   P = malloc(0U);
@@ -89,13 +186,16 @@ TEST(ScudoWrappersCDeathTest, Malloc) {
   EXPECT_EQ(errno, ENOMEM);
 }
 
-TEST(ScudoWrappersCTest, Calloc) {
+TEST_F(ScudoWrappersCTest, Calloc) {
   void *P = calloc(1U, Size);
   EXPECT_NE(P, nullptr);
   EXPECT_LE(Size, malloc_usable_size(P));
+  verifyAllocHookPtr(P);
+  verifyAllocHookSize(Size);
   for (size_t I = 0; I < Size; I++)
     EXPECT_EQ((reinterpret_cast<uint8_t *>(P))[I], 0U);
   free(P);
+  verifyDeallocHookPtr(P);
 
   P = calloc(1U, 0U);
   EXPECT_NE(P, nullptr);
@@ -116,7 +216,7 @@ TEST(ScudoWrappersCTest, Calloc) {
   EXPECT_EQ(errno, ENOMEM);
 }
 
-TEST(ScudoWrappersCTest, SmallAlign) {
+TEST_F(ScudoWrappersCTest, SmallAlign) {
   // Allocating pointers by the powers of 2 from 1 to 0x10000
   // Using powers of 2 due to memalign using powers of 2 and test more sizes
   constexpr size_t MaxSize = 0x10000;
@@ -137,7 +237,7 @@ TEST(ScudoWrappersCTest, SmallAlign) {
     free(ptr);
 }
 
-TEST(ScudoWrappersCTest, Memalign) {
+TEST_F(ScudoWrappersCTest, Memalign) {
   void *P;
   for (size_t I = FIRST_32_SECOND_64(2U, 3U); I <= 18U; I++) {
     const size_t Alignment = 1U << I;
@@ -146,14 +246,20 @@ TEST(ScudoWrappersCTest, Memalign) {
     EXPECT_NE(P, nullptr);
     EXPECT_LE(Size, malloc_usable_size(P));
     EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
+    verifyAllocHookPtr(P);
+    verifyAllocHookSize(Size);
     free(P);
+    verifyDeallocHookPtr(P);
 
     P = nullptr;
     EXPECT_EQ(posix_memalign(&P, Alignment, Size), 0);
     EXPECT_NE(P, nullptr);
     EXPECT_LE(Size, malloc_usable_size(P));
     EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
+    verifyAllocHookPtr(P);
+    verifyAllocHookSize(Size);
     free(P);
+    verifyDeallocHookPtr(P);
   }
 
   EXPECT_EQ(memalign(4096U, SIZE_MAX), nullptr);
@@ -165,18 +271,24 @@ TEST(ScudoWrappersCTest, Memalign) {
     for (size_t Alignment = 0U; Alignment <= 128U; Alignment++) {
       P = memalign(Alignment, 1024U);
       EXPECT_NE(P, nullptr);
+      verifyAllocHookPtr(P);
+      verifyAllocHookSize(Size);
       free(P);
+      verifyDeallocHookPtr(P);
     }
   }
 }
 
-TEST(ScudoWrappersCTest, AlignedAlloc) {
+TEST_F(ScudoWrappersCTest, AlignedAlloc) {
   const size_t Alignment = 4096U;
   void *P = aligned_alloc(Alignment, Alignment * 4U);
   EXPECT_NE(P, nullptr);
   EXPECT_LE(Alignment * 4U, malloc_usable_size(P));
   EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
+  verifyAllocHookPtr(P);
+  verifyAllocHookSize(Alignment * 4U);
   free(P);
+  verifyDeallocHookPtr(P);
 
   errno = 0;
   P = aligned_alloc(Alignment, Size);
@@ -184,33 +296,60 @@ TEST(ScudoWrappersCTest, AlignedAlloc) {
   EXPECT_EQ(errno, EINVAL);
 }
 
-TEST(ScudoWrappersCDeathTest, Realloc) {
+TEST_F(ScudoWrappersCDeathTest, Realloc) {
+  invalidateHookPtrs();
   // realloc(nullptr, N) is malloc(N)
-  void *P = realloc(nullptr, 0U);
+  void *P = realloc(nullptr, Size);
   EXPECT_NE(P, nullptr);
+  verifyAllocHookPtr(P);
+  verifyAllocHookSize(Size);
   free(P);
+  verifyDeallocHookPtr(P);
 
+  invalidateHookPtrs();
   P = malloc(Size);
   EXPECT_NE(P, nullptr);
   // realloc(P, 0U) is free(P) and returns nullptr
   EXPECT_EQ(realloc(P, 0U), nullptr);
+  verifyDeallocHookPtr(P);
 
   P = malloc(Size);
   EXPECT_NE(P, nullptr);
   EXPECT_LE(Size, malloc_usable_size(P));
   memset(P, 0x42, Size);
 
+  invalidateHookPtrs();
+  void *OldP = P;
   P = realloc(P, Size * 2U);
   EXPECT_NE(P, nullptr);
   EXPECT_LE(Size * 2U, malloc_usable_size(P));
   for (size_t I = 0; I < Size; I++)
     EXPECT_EQ(0x42, (reinterpret_cast<uint8_t *>(P))[I]);
+  if (OldP == P) {
+    verifyDeallocHookPtr(OldP);
+    verifyAllocHookPtr(OldP);
+  } else {
+    verifyAllocHookPtr(P);
+    verifyAllocHookSize(Size * 2U);
+    verifyDeallocHookPtr(OldP);
+  }
+  verifyReallocHookPtrs(OldP, P, Size * 2U);
 
+  invalidateHookPtrs();
+  OldP = P;
   P = realloc(P, Size / 2U);
   EXPECT_NE(P, nullptr);
   EXPECT_LE(Size / 2U, malloc_usable_size(P));
   for (size_t I = 0; I < Size / 2U; I++)
     EXPECT_EQ(0x42, (reinterpret_cast<uint8_t *>(P))[I]);
+  if (OldP == P) {
+    verifyDeallocHookPtr(OldP);
+    verifyAllocHookPtr(OldP);
+  } else {
+    verifyAllocHookPtr(P);
+    verifyAllocHookSize(Size / 2U);
+  }
+  verifyReallocHookPtrs(OldP, P, Size / 2U);
   free(P);
 
   EXPECT_DEATH(P = realloc(P, Size), "");
@@ -244,7 +383,7 @@ TEST(ScudoWrappersCDeathTest, Realloc) {
 }
 
 #if !SCUDO_FUCHSIA
-TEST(ScudoWrappersCTest, MallOpt) {
+TEST_F(ScudoWrappersCTest, MallOpt) {
   errno = 0;
   EXPECT_EQ(mallopt(-1000, 1), 0);
   // mallopt doesn't set errno.
@@ -265,7 +404,7 @@ TEST(ScudoWrappersCTest, MallOpt) {
 }
 #endif
 
-TEST(ScudoWrappersCTest, OtherAlloc) {
+TEST_F(ScudoWrappersCTest, OtherAlloc) {
 #if HAVE_PVALLOC
   const size_t PageSize = static_cast<size_t>(sysconf(_SC_PAGESIZE));
 
@@ -273,7 +412,11 @@ TEST(ScudoWrappersCTest, OtherAlloc) {
   EXPECT_NE(P, nullptr);
   EXPECT_EQ(reinterpret_cast<uintptr_t>(P) & (PageSize - 1), 0U);
   EXPECT_LE(PageSize, malloc_usable_size(P));
+  verifyAllocHookPtr(P);
+  // Size will be rounded up to PageSize.
+  verifyAllocHookSize(PageSize);
   free(P);
+  verifyDeallocHookPtr(P);
 
   EXPECT_EQ(pvalloc(SIZE_MAX), nullptr);
 
@@ -288,29 +431,39 @@ TEST(ScudoWrappersCTest, OtherAlloc) {
 #endif
 }
 
-#if !SCUDO_FUCHSIA
-TEST(ScudoWrappersCTest, MallInfo) {
+template<typename FieldType>
+void MallInfoTest() {
   // mallinfo is deprecated.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  const size_t BypassQuarantineSize = 1024U;
+  const FieldType BypassQuarantineSize = 1024U;
   struct mallinfo MI = mallinfo();
-  size_t Allocated = MI.uordblks;
+  FieldType Allocated = MI.uordblks;
   void *P = malloc(BypassQuarantineSize);
   EXPECT_NE(P, nullptr);
   MI = mallinfo();
-  EXPECT_GE(static_cast<size_t>(MI.uordblks), Allocated + BypassQuarantineSize);
-  EXPECT_GT(static_cast<size_t>(MI.hblkhd), 0U);
-  size_t Free = MI.fordblks;
+  EXPECT_GE(MI.uordblks, Allocated + BypassQuarantineSize);
+  EXPECT_GT(MI.hblkhd, static_cast<FieldType>(0));
+  FieldType Free = MI.fordblks;
   free(P);
   MI = mallinfo();
-  EXPECT_GE(static_cast<size_t>(MI.fordblks), Free + BypassQuarantineSize);
+  EXPECT_GE(MI.fordblks, Free + BypassQuarantineSize);
 #pragma clang diagnostic pop
 }
+
+#if !SCUDO_FUCHSIA
+TEST_F(ScudoWrappersCTest, MallInfo) {
+#if SCUDO_ANDROID
+  // Android accidentally set the fields to size_t instead of int.
+  MallInfoTest<size_t>();
+#else
+  MallInfoTest<int>();
+#endif
+}
 #endif
 
-#if __GLIBC_PREREQ(2, 33)
-TEST(ScudoWrappersCTest, MallInfo2) {
+#if __GLIBC_PREREQ(2, 33) || SCUDO_ANDROID
+TEST_F(ScudoWrappersCTest, MallInfo2) {
   const size_t BypassQuarantineSize = 1024U;
   struct mallinfo2 MI = mallinfo2();
   size_t Allocated = MI.uordblks;
@@ -342,7 +495,7 @@ static void callback(uintptr_t Base, UNUSED size_t Size, UNUSED void *Arg) {
 // To achieve this, we allocate a chunk for which the backing block will be
 // aligned on a page, then run the malloc_iterate on both the pages that the
 // block is a boundary for. It must only be seen once by the callback function.
-TEST(ScudoWrappersCTest, MallocIterateBoundary) {
+TEST_F(ScudoWrappersCTest, MallocIterateBoundary) {
   const size_t PageSize = static_cast<size_t>(sysconf(_SC_PAGESIZE));
 #if SCUDO_ANDROID
   // Android uses a 16 byte alignment for both 32 bit and 64 bit.
@@ -394,7 +547,7 @@ TEST(ScudoWrappersCTest, MallocIterateBoundary) {
 
 // Fuchsia doesn't have alarm, fork or malloc_info.
 #if !SCUDO_FUCHSIA
-TEST(ScudoWrappersCDeathTest, MallocDisableDeadlock) {
+TEST_F(ScudoWrappersCDeathTest, MallocDisableDeadlock) {
   // We expect heap operations within a disable/enable scope to deadlock.
   EXPECT_DEATH(
       {
@@ -409,7 +562,7 @@ TEST(ScudoWrappersCDeathTest, MallocDisableDeadlock) {
       "");
 }
 
-TEST(ScudoWrappersCTest, MallocInfo) {
+TEST_F(ScudoWrappersCTest, MallocInfo) {
   // Use volatile so that the allocations don't get optimized away.
   void *volatile P1 = malloc(1234);
   void *volatile P2 = malloc(4321);
@@ -429,7 +582,7 @@ TEST(ScudoWrappersCTest, MallocInfo) {
   free(P2);
 }
 
-TEST(ScudoWrappersCDeathTest, Fork) {
+TEST_F(ScudoWrappersCDeathTest, Fork) {
   void *P;
   pid_t Pid = fork();
   EXPECT_GE(Pid, 0) << strerror(errno);
@@ -481,7 +634,7 @@ static void *enableMalloc(UNUSED void *Unused) {
   return nullptr;
 }
 
-TEST(ScudoWrappersCTest, DisableForkEnable) {
+TEST_F(ScudoWrappersCTest, DisableForkEnable) {
   pthread_t ThreadId;
   Ready = false;
   EXPECT_EQ(pthread_create(&ThreadId, nullptr, &enableMalloc, nullptr), 0);
diff --git a/Telegram/ThirdParty/scudo/tests/wrappers_cpp_test.cpp b/Telegram/ThirdParty/scudo/tests/wrappers_cpp_test.cpp
index 987e4099a..c802ed22f 100644
--- a/Telegram/ThirdParty/scudo/tests/wrappers_cpp_test.cpp
+++ b/Telegram/ThirdParty/scudo/tests/wrappers_cpp_test.cpp
@@ -27,45 +27,109 @@
 void operator delete(void *, size_t) noexcept;
 void operator delete[](void *, size_t) noexcept;
 
-// Note that every Cxx allocation function in the test binary will be fulfilled
-// by Scudo. See the comment in the C counterpart of this file.
+extern "C" {
+#ifndef SCUDO_ENABLE_HOOKS_TESTS
+#define SCUDO_ENABLE_HOOKS_TESTS 0
+#endif
 
-template <typename T> static void testCxxNew() {
-  T *P = new T;
-  EXPECT_NE(P, nullptr);
-  memset(P, 0x42, sizeof(T));
-  EXPECT_DEATH(delete[] P, "");
-  delete P;
-  EXPECT_DEATH(delete P, "");
+#if (SCUDO_ENABLE_HOOKS_TESTS == 1) && (SCUDO_ENABLE_HOOKS == 0)
+#error "Hooks tests should have hooks enabled as well!"
+#endif
 
-  P = new T;
-  EXPECT_NE(P, nullptr);
-  memset(P, 0x42, sizeof(T));
-  operator delete(P, sizeof(T));
+struct AllocContext {
+  void *Ptr;
+  size_t Size;
+};
+struct DeallocContext {
+  void *Ptr;
+};
+static AllocContext AC;
+static DeallocContext DC;
 
-  P = new (std::nothrow) T;
-  EXPECT_NE(P, nullptr);
-  memset(P, 0x42, sizeof(T));
-  delete P;
-
-  const size_t N = 16U;
-  T *A = new T[N];
-  EXPECT_NE(A, nullptr);
-  memset(A, 0x42, sizeof(T) * N);
-  EXPECT_DEATH(delete A, "");
-  delete[] A;
-  EXPECT_DEATH(delete[] A, "");
-
-  A = new T[N];
-  EXPECT_NE(A, nullptr);
-  memset(A, 0x42, sizeof(T) * N);
-  operator delete[](A, sizeof(T) * N);
-
-  A = new (std::nothrow) T[N];
-  EXPECT_NE(A, nullptr);
-  memset(A, 0x42, sizeof(T) * N);
-  delete[] A;
+#if (SCUDO_ENABLE_HOOKS_TESTS == 1)
+__attribute__((visibility("default"))) void __scudo_allocate_hook(void *Ptr,
+                                                                  size_t Size) {
+  AC.Ptr = Ptr;
+  AC.Size = Size;
 }
+__attribute__((visibility("default"))) void __scudo_deallocate_hook(void *Ptr) {
+  DC.Ptr = Ptr;
+}
+#endif // (SCUDO_ENABLE_HOOKS_TESTS == 1)
+}
+
+class ScudoWrappersCppTest : public Test {
+protected:
+  void SetUp() override {
+    if (SCUDO_ENABLE_HOOKS && !SCUDO_ENABLE_HOOKS_TESTS)
+      printf("Hooks are enabled but hooks tests are disabled.\n");
+  }
+
+  void verifyAllocHookPtr(UNUSED void *Ptr) {
+    if (SCUDO_ENABLE_HOOKS_TESTS)
+      EXPECT_EQ(Ptr, AC.Ptr);
+  }
+  void verifyAllocHookSize(UNUSED size_t Size) {
+    if (SCUDO_ENABLE_HOOKS_TESTS)
+      EXPECT_EQ(Size, AC.Size);
+  }
+  void verifyDeallocHookPtr(UNUSED void *Ptr) {
+    if (SCUDO_ENABLE_HOOKS_TESTS)
+      EXPECT_EQ(Ptr, DC.Ptr);
+  }
+
+  template <typename T> void testCxxNew() {
+    T *P = new T;
+    EXPECT_NE(P, nullptr);
+    verifyAllocHookPtr(P);
+    verifyAllocHookSize(sizeof(T));
+    memset(P, 0x42, sizeof(T));
+    EXPECT_DEATH(delete[] P, "");
+    delete P;
+    verifyDeallocHookPtr(P);
+    EXPECT_DEATH(delete P, "");
+
+    P = new T;
+    EXPECT_NE(P, nullptr);
+    memset(P, 0x42, sizeof(T));
+    operator delete(P, sizeof(T));
+    verifyDeallocHookPtr(P);
+
+    P = new (std::nothrow) T;
+    verifyAllocHookPtr(P);
+    verifyAllocHookSize(sizeof(T));
+    EXPECT_NE(P, nullptr);
+    memset(P, 0x42, sizeof(T));
+    delete P;
+    verifyDeallocHookPtr(P);
+
+    const size_t N = 16U;
+    T *A = new T[N];
+    EXPECT_NE(A, nullptr);
+    verifyAllocHookPtr(A);
+    verifyAllocHookSize(sizeof(T) * N);
+    memset(A, 0x42, sizeof(T) * N);
+    EXPECT_DEATH(delete A, "");
+    delete[] A;
+    verifyDeallocHookPtr(A);
+    EXPECT_DEATH(delete[] A, "");
+
+    A = new T[N];
+    EXPECT_NE(A, nullptr);
+    memset(A, 0x42, sizeof(T) * N);
+    operator delete[](A, sizeof(T) * N);
+    verifyDeallocHookPtr(A);
+
+    A = new (std::nothrow) T[N];
+    verifyAllocHookPtr(A);
+    verifyAllocHookSize(sizeof(T) * N);
+    EXPECT_NE(A, nullptr);
+    memset(A, 0x42, sizeof(T) * N);
+    delete[] A;
+    verifyDeallocHookPtr(A);
+  }
+};
+using ScudoWrappersCppDeathTest = ScudoWrappersCppTest;
 
 class Pixel {
 public:
@@ -75,7 +139,10 @@ public:
   Color C = Color::Red;
 };
 
-TEST(ScudoWrappersCppDeathTest, New) {
+// Note that every Cxx allocation function in the test binary will be fulfilled
+// by Scudo. See the comment in the C counterpart of this file.
+
+TEST_F(ScudoWrappersCppDeathTest, New) {
   if (getenv("SKIP_TYPE_MISMATCH") || SKIP_MISMATCH_TESTS) {
     printf("Skipped type mismatch tests.\n");
     return;
@@ -116,7 +183,7 @@ static void stressNew() {
   }
 }
 
-TEST(ScudoWrappersCppTest, ThreadedNew) {
+TEST_F(ScudoWrappersCppTest, ThreadedNew) {
   // TODO: Investigate why libc sometimes crashes with tag missmatch in
   // __pthread_clockjoin_ex.
   std::unique_ptr<scudo::ScopedDisableMemoryTagChecks> NoTags;
@@ -138,7 +205,7 @@ TEST(ScudoWrappersCppTest, ThreadedNew) {
 }
 
 #if !SCUDO_FUCHSIA
-TEST(ScudoWrappersCppTest, AllocAfterFork) {
+TEST_F(ScudoWrappersCppTest, AllocAfterFork) {
   // This test can fail flakily when ran as a part of large number of
   // other tests if the maxmimum number of mappings allowed is low.
   // We tried to reduce the number of iterations of the loops with
diff --git a/Telegram/ThirdParty/scudo/trusty.cpp b/Telegram/ThirdParty/scudo/trusty.cpp
index 3191091e1..26b349c6e 100644
--- a/Telegram/ThirdParty/scudo/trusty.cpp
+++ b/Telegram/ThirdParty/scudo/trusty.cpp
@@ -12,6 +12,7 @@
 
 #include "common.h"
 #include "mutex.h"
+#include "report_linux.h"
 #include "trusty.h"
 
 #include <errno.h>           // for errno
@@ -50,7 +51,8 @@ void *map(void *Addr, uptr Size, const char *Name, uptr Flags,
 
   if (IS_ERR(P)) {
     errno = lk_err_to_errno(PTR_ERR(P));
-    dieOnMapUnmapError(Size);
+    if (!(Flags & MAP_ALLOWNOMEM) || errno != ENOMEM)
+      reportMapError(Size);
     return nullptr;
   }
 
@@ -60,7 +62,7 @@ void *map(void *Addr, uptr Size, const char *Name, uptr Flags,
 void unmap(UNUSED void *Addr, UNUSED uptr Size, UNUSED uptr Flags,
            UNUSED MapPlatformData *Data) {
   if (_trusty_munmap(Addr, Size) != 0)
-    dieOnMapUnmapError();
+    reportUnmapError(reinterpret_cast<uptr>(Addr), Size);
 }
 
 void setMemoryPermission(UNUSED uptr Addr, UNUSED uptr Size, UNUSED uptr Flags,
diff --git a/Telegram/ThirdParty/scudo/tsd.h b/Telegram/ThirdParty/scudo/tsd.h
index f4fa545de..b2108a019 100644
--- a/Telegram/ThirdParty/scudo/tsd.h
+++ b/Telegram/ThirdParty/scudo/tsd.h
@@ -53,8 +53,14 @@ template <class Allocator> struct alignas(SCUDO_CACHE_LINE_SIZE) TSD {
   inline void unlock() NO_THREAD_SAFETY_ANALYSIS { Mutex.unlock(); }
   inline uptr getPrecedence() { return atomic_load_relaxed(&Precedence); }
 
-  void commitBack(Allocator *Instance) ASSERT_CAPABILITY(Mutex) {
-    Instance->commitBack(this);
+  void commitBack(Allocator *Instance) { Instance->commitBack(this); }
+
+  // As the comments attached to `getCache()`, the TSD doesn't always need to be
+  // locked. In that case, we would only skip the check before we have all TSDs
+  // locked in all paths.
+  void assertLocked(bool BypassCheck) ASSERT_CAPABILITY(Mutex) {
+    if (SCUDO_DEBUG && !BypassCheck)
+      Mutex.assertHeld();
   }
 
   // Ideally, we may want to assert that all the operations on
@@ -66,11 +72,8 @@ template <class Allocator> struct alignas(SCUDO_CACHE_LINE_SIZE) TSD {
   // TODO(chiahungduan): Ideally, we want to do `Mutex.assertHeld` but acquiring
   // TSD doesn't always require holding the lock. Add this assertion while the
   // lock is always acquired.
-  typename Allocator::CacheT &getCache() ASSERT_CAPABILITY(Mutex) {
-    return Cache;
-  }
-  typename Allocator::QuarantineCacheT &getQuarantineCache()
-      ASSERT_CAPABILITY(Mutex) {
+  typename Allocator::CacheT &getCache() REQUIRES(Mutex) { return Cache; }
+  typename Allocator::QuarantineCacheT &getQuarantineCache() REQUIRES(Mutex) {
     return QuarantineCache;
   }
 
diff --git a/Telegram/ThirdParty/scudo/tsd_shared.h b/Telegram/ThirdParty/scudo/tsd_shared.h
index dcb0948ad..1bca578ee 100644
--- a/Telegram/ThirdParty/scudo/tsd_shared.h
+++ b/Telegram/ThirdParty/scudo/tsd_shared.h
@@ -120,6 +120,11 @@ struct TSDRegistrySharedT {
                 TSDsArraySize);
     for (uptr I = 0; I < NumberOfTSDs; ++I) {
       TSDs[I].lock();
+      // Theoretically, we want to mark TSD::lock()/TSD::unlock() with proper
+      // thread annotations. However, given the TSD is only locked on shared
+      // path, do the assertion in a separate path to avoid confusing the
+      // analyzer.
+      TSDs[I].assertLocked(/*BypassCheck=*/true);
       Str->append("  Shared TSD[%zu]:\n", I);
       TSDs[I].getCache().getStats(Str);
       TSDs[I].unlock();
diff --git a/Telegram/ThirdParty/scudo/vector.h b/Telegram/ThirdParty/scudo/vector.h
index 9f2c20095..c0f1ba0ed 100644
--- a/Telegram/ThirdParty/scudo/vector.h
+++ b/Telegram/ThirdParty/scudo/vector.h
@@ -9,26 +9,20 @@
 #ifndef SCUDO_VECTOR_H_
 #define SCUDO_VECTOR_H_
 
-#include "common.h"
+#include "mem_map.h"
 
 #include <string.h>
 
 namespace scudo {
 
-// A low-level vector based on map. May incur a significant memory overhead for
-// small vectors. The current implementation supports only POD types.
+// A low-level vector based on map. It stores the contents inline up to a fixed
+// capacity, or in an external memory buffer if it grows bigger than that. May
+// incur a significant memory overhead for small vectors. The current
+// implementation supports only POD types.
+//
+// NOTE: This class is not meant to be used directly, use Vector<T> instead.
 template <typename T> class VectorNoCtor {
 public:
-  constexpr void init(uptr InitialCapacity = 0) {
-    Data = &LocalData[0];
-    CapacityBytes = sizeof(LocalData);
-    if (InitialCapacity > capacity())
-      reserve(InitialCapacity);
-  }
-  void destroy() {
-    if (Data != &LocalData[0])
-      unmap(Data, CapacityBytes, 0, &MapData);
-  }
   T &operator[](uptr I) {
     DCHECK_LT(I, Size);
     return Data[I];
@@ -78,24 +72,43 @@ public:
   const T *end() const { return data() + size(); }
   T *end() { return data() + size(); }
 
+protected:
+  constexpr void init(uptr InitialCapacity = 0) {
+    Data = &LocalData[0];
+    CapacityBytes = sizeof(LocalData);
+    if (InitialCapacity > capacity())
+      reserve(InitialCapacity);
+  }
+  void destroy() {
+    if (Data != &LocalData[0])
+      ExternalBuffer.unmap(ExternalBuffer.getBase(),
+                           ExternalBuffer.getCapacity());
+  }
+
 private:
   void reallocate(uptr NewCapacity) {
     DCHECK_GT(NewCapacity, 0);
     DCHECK_LE(Size, NewCapacity);
+
+    MemMapT NewExternalBuffer;
     NewCapacity = roundUp(NewCapacity * sizeof(T), getPageSizeCached());
-    T *NewData = reinterpret_cast<T *>(
-        map(nullptr, NewCapacity, "scudo:vector", 0, &MapData));
-    memcpy(NewData, Data, Size * sizeof(T));
+    NewExternalBuffer.map(/*Addr=*/0U, NewCapacity, "scudo:vector");
+    T *NewExternalData = reinterpret_cast<T *>(NewExternalBuffer.getBase());
+
+    memcpy(NewExternalData, Data, Size * sizeof(T));
     destroy();
-    Data = NewData;
+
+    Data = NewExternalData;
     CapacityBytes = NewCapacity;
+    ExternalBuffer = NewExternalBuffer;
   }
 
   T *Data = nullptr;
-  T LocalData[256 / sizeof(T)] = {};
   uptr CapacityBytes = 0;
   uptr Size = 0;
-  [[no_unique_address]] MapPlatformData MapData = {};
+
+  T LocalData[256 / sizeof(T)] = {};
+  MemMapT ExternalBuffer;
 };
 
 template <typename T> class Vector : public VectorNoCtor<T> {
diff --git a/Telegram/ThirdParty/scudo/wrappers_c.cpp b/Telegram/ThirdParty/scudo/wrappers_c.cpp
index b4d51be71..60014a0f6 100644
--- a/Telegram/ThirdParty/scudo/wrappers_c.cpp
+++ b/Telegram/ThirdParty/scudo/wrappers_c.cpp
@@ -12,6 +12,9 @@
 #if !SCUDO_ANDROID || !_BIONIC
 
 #include "allocator_config.h"
+#include "internal_defs.h"
+#include "platform.h"
+#include "scudo/interface.h"
 #include "wrappers_c.h"
 #include "wrappers_c_checks.h"
 
diff --git a/Telegram/ThirdParty/scudo/wrappers_c.inc b/Telegram/ThirdParty/scudo/wrappers_c.inc
index 2c8e382db..56d8ef201 100644
--- a/Telegram/ThirdParty/scudo/wrappers_c.inc
+++ b/Telegram/ThirdParty/scudo/wrappers_c.inc
@@ -17,6 +17,35 @@
 #define SCUDO_MALLOC_ALIGNMENT FIRST_32_SECOND_64(8U, 16U)
 #endif
 
+static void reportAllocation(void *ptr, size_t size) {
+  if (SCUDO_ENABLE_HOOKS)
+    if (__scudo_allocate_hook && ptr)
+      __scudo_allocate_hook(ptr, size);
+}
+static void reportDeallocation(void *ptr) {
+  if (SCUDO_ENABLE_HOOKS)
+    if (__scudo_deallocate_hook)
+      __scudo_deallocate_hook(ptr);
+}
+static void reportReallocAllocation(void *old_ptr, void *new_ptr, size_t size) {
+  DCHECK_NE(new_ptr, nullptr);
+
+  if (SCUDO_ENABLE_HOOKS) {
+    if (__scudo_realloc_allocate_hook)
+      __scudo_realloc_allocate_hook(old_ptr, new_ptr, size);
+    else if (__scudo_allocate_hook)
+      __scudo_allocate_hook(new_ptr, size);
+  }
+}
+static void reportReallocDeallocation(void *old_ptr) {
+  if (SCUDO_ENABLE_HOOKS) {
+    if (__scudo_realloc_deallocate_hook)
+      __scudo_realloc_deallocate_hook(old_ptr);
+    else if (__scudo_deallocate_hook)
+      __scudo_deallocate_hook(old_ptr);
+  }
+}
+
 extern "C" {
 
 INTERFACE WEAK void *SCUDO_PREFIX(calloc)(size_t nmemb, size_t size) {
@@ -28,11 +57,14 @@ INTERFACE WEAK void *SCUDO_PREFIX(calloc)(size_t nmemb, size_t size) {
     }
     scudo::reportCallocOverflow(nmemb, size);
   }
-  return scudo::setErrnoOnNull(SCUDO_ALLOCATOR.allocate(
-      Product, scudo::Chunk::Origin::Malloc, SCUDO_MALLOC_ALIGNMENT, true));
+  void *Ptr = SCUDO_ALLOCATOR.allocate(Product, scudo::Chunk::Origin::Malloc,
+                                       SCUDO_MALLOC_ALIGNMENT, true);
+  reportAllocation(Ptr, Product);
+  return scudo::setErrnoOnNull(Ptr);
 }
 
 INTERFACE WEAK void SCUDO_PREFIX(free)(void *ptr) {
+  reportDeallocation(ptr);
   SCUDO_ALLOCATOR.deallocate(ptr, scudo::Chunk::Origin::Malloc);
 }
 
@@ -75,8 +107,10 @@ INTERFACE WEAK struct __scudo_mallinfo2 SCUDO_PREFIX(mallinfo2)(void) {
 #endif
 
 INTERFACE WEAK void *SCUDO_PREFIX(malloc)(size_t size) {
-  return scudo::setErrnoOnNull(SCUDO_ALLOCATOR.allocate(
-      size, scudo::Chunk::Origin::Malloc, SCUDO_MALLOC_ALIGNMENT));
+  void *Ptr = SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc,
+                                       SCUDO_MALLOC_ALIGNMENT);
+  reportAllocation(Ptr, size);
+  return scudo::setErrnoOnNull(Ptr);
 }
 
 #if SCUDO_ANDROID
@@ -105,8 +139,10 @@ INTERFACE WEAK void *SCUDO_PREFIX(memalign)(size_t alignment, size_t size) {
       scudo::reportAlignmentNotPowerOfTwo(alignment);
     }
   }
-  return SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign,
-                                  alignment);
+  void *Ptr =
+      SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign, alignment);
+  reportAllocation(Ptr, size);
+  return Ptr;
 }
 
 INTERFACE WEAK int SCUDO_PREFIX(posix_memalign)(void **memptr, size_t alignment,
@@ -120,6 +156,8 @@ INTERFACE WEAK int SCUDO_PREFIX(posix_memalign)(void **memptr, size_t alignment,
       SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign, alignment);
   if (UNLIKELY(!Ptr))
     return ENOMEM;
+  reportAllocation(Ptr, size);
+
   *memptr = Ptr;
   return 0;
 }
@@ -134,26 +172,57 @@ INTERFACE WEAK void *SCUDO_PREFIX(pvalloc)(size_t size) {
     scudo::reportPvallocOverflow(size);
   }
   // pvalloc(0) should allocate one page.
-  return scudo::setErrnoOnNull(
+  void *Ptr =
       SCUDO_ALLOCATOR.allocate(size ? scudo::roundUp(size, PageSize) : PageSize,
-                               scudo::Chunk::Origin::Memalign, PageSize));
+                               scudo::Chunk::Origin::Memalign, PageSize);
+  reportAllocation(Ptr, scudo::roundUp(size, PageSize));
+
+  return scudo::setErrnoOnNull(Ptr);
 }
 
 INTERFACE WEAK void *SCUDO_PREFIX(realloc)(void *ptr, size_t size) {
-  if (!ptr)
-    return scudo::setErrnoOnNull(SCUDO_ALLOCATOR.allocate(
-        size, scudo::Chunk::Origin::Malloc, SCUDO_MALLOC_ALIGNMENT));
+  if (!ptr) {
+    void *Ptr = SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc,
+                                         SCUDO_MALLOC_ALIGNMENT);
+    reportAllocation(Ptr, size);
+    return scudo::setErrnoOnNull(Ptr);
+  }
   if (size == 0) {
+    reportDeallocation(ptr);
     SCUDO_ALLOCATOR.deallocate(ptr, scudo::Chunk::Origin::Malloc);
     return nullptr;
   }
-  return scudo::setErrnoOnNull(
-      SCUDO_ALLOCATOR.reallocate(ptr, size, SCUDO_MALLOC_ALIGNMENT));
+
+  // Given that the reporting of deallocation and allocation are not atomic, we
+  // always pretend the old pointer will be released so that the user doesn't
+  // need to worry about the false double-use case from the view of hooks.
+  //
+  // For example, assume that `realloc` releases the old pointer and allocates a
+  // new pointer. Before the reporting of both operations has been done, another
+  // thread may get the old pointer from `malloc`. It may be misinterpreted as
+  // double-use if it's not handled properly on the hook side.
+  reportReallocDeallocation(ptr);
+  void *NewPtr = SCUDO_ALLOCATOR.reallocate(ptr, size, SCUDO_MALLOC_ALIGNMENT);
+  if (NewPtr != nullptr) {
+    // Note that even if NewPtr == ptr, the size has changed. We still need to
+    // report the new size.
+    reportReallocAllocation(/*OldPtr=*/ptr, NewPtr, size);
+  } else {
+    // If `realloc` fails, the old pointer is not released. Report the old
+    // pointer as allocated again.
+    reportReallocAllocation(/*OldPtr=*/ptr, /*NewPtr=*/ptr,
+                            SCUDO_ALLOCATOR.getAllocSize(ptr));
+  }
+
+  return scudo::setErrnoOnNull(NewPtr);
 }
 
 INTERFACE WEAK void *SCUDO_PREFIX(valloc)(size_t size) {
-  return scudo::setErrnoOnNull(SCUDO_ALLOCATOR.allocate(
-      size, scudo::Chunk::Origin::Memalign, scudo::getPageSizeCached()));
+  void *Ptr = SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign,
+                                       scudo::getPageSizeCached());
+  reportAllocation(Ptr, size);
+
+  return scudo::setErrnoOnNull(Ptr);
 }
 
 INTERFACE WEAK int SCUDO_PREFIX(malloc_iterate)(
@@ -198,6 +267,7 @@ INTERFACE WEAK int SCUDO_PREFIX(mallopt)(int param, int value) {
     return 1;
   } else if (param == M_LOG_STATS) {
     SCUDO_ALLOCATOR.printStats();
+    SCUDO_ALLOCATOR.printFragmentationInfo();
     return 1;
   } else {
     scudo::Option option;
@@ -233,8 +303,12 @@ INTERFACE WEAK void *SCUDO_PREFIX(aligned_alloc)(size_t alignment,
     }
     scudo::reportInvalidAlignedAllocAlignment(alignment, size);
   }
-  return scudo::setErrnoOnNull(
-      SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc, alignment));
+
+  void *Ptr =
+      SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc, alignment);
+  reportAllocation(Ptr, size);
+
+  return scudo::setErrnoOnNull(Ptr);
 }
 
 INTERFACE WEAK int SCUDO_PREFIX(malloc_info)(UNUSED int options, FILE *stream) {
diff --git a/Telegram/ThirdParty/scudo/wrappers_c_bionic.cpp b/Telegram/ThirdParty/scudo/wrappers_c_bionic.cpp
index 1b9fe67d9..21694c3f1 100644
--- a/Telegram/ThirdParty/scudo/wrappers_c_bionic.cpp
+++ b/Telegram/ThirdParty/scudo/wrappers_c_bionic.cpp
@@ -12,6 +12,9 @@
 #if SCUDO_ANDROID && _BIONIC
 
 #include "allocator_config.h"
+#include "internal_defs.h"
+#include "platform.h"
+#include "scudo/interface.h"
 #include "wrappers_c.h"
 #include "wrappers_c_checks.h"
 
@@ -24,7 +27,7 @@
 
 extern "C" void SCUDO_PREFIX(malloc_postinit)();
 SCUDO_REQUIRE_CONSTANT_INITIALIZATION
-static scudo::Allocator<scudo::AndroidConfig, SCUDO_PREFIX(malloc_postinit)>
+static scudo::Allocator<scudo::Config, SCUDO_PREFIX(malloc_postinit)>
     SCUDO_ALLOCATOR;
 
 #include "wrappers_c.inc"
@@ -35,15 +38,15 @@ static scudo::Allocator<scudo::AndroidConfig, SCUDO_PREFIX(malloc_postinit)>
 // TODO(kostyak): support both allocators.
 INTERFACE void __scudo_print_stats(void) { Allocator.printStats(); }
 
-INTERFACE void
-__scudo_get_error_info(struct scudo_error_info *error_info,
-                       uintptr_t fault_addr, const char *stack_depot,
-                       const char *region_info, const char *ring_buffer,
-                       const char *memory, const char *memory_tags,
-                       uintptr_t memory_addr, size_t memory_size) {
+INTERFACE void __scudo_get_error_info(
+    struct scudo_error_info *error_info, uintptr_t fault_addr,
+    const char *stack_depot, size_t stack_depot_size, const char *region_info,
+    const char *ring_buffer, size_t ring_buffer_size, const char *memory,
+    const char *memory_tags, uintptr_t memory_addr, size_t memory_size) {
+  (void)(stack_depot_size);
   Allocator.getErrorInfo(error_info, fault_addr, stack_depot, region_info,
-                         ring_buffer, memory, memory_tags, memory_addr,
-                         memory_size);
+                         ring_buffer, ring_buffer_size, memory, memory_tags,
+                         memory_addr, memory_size);
 }
 
 INTERFACE const char *__scudo_get_stack_depot_addr() {
diff --git a/Telegram/ThirdParty/scudo/wrappers_cpp.cpp b/Telegram/ThirdParty/scudo/wrappers_cpp.cpp
index 374e36d72..098d4f71a 100644
--- a/Telegram/ThirdParty/scudo/wrappers_cpp.cpp
+++ b/Telegram/ThirdParty/scudo/wrappers_cpp.cpp
@@ -12,6 +12,9 @@
 #if !SCUDO_ANDROID || !_BIONIC
 
 #include "allocator_config.h"
+#include "internal_defs.h"
+#include "platform.h"
+#include "scudo/interface.h"
 #include "wrappers_c.h"
 
 #include <stdint.h>
@@ -21,86 +24,125 @@ struct nothrow_t {};
 enum class align_val_t : size_t {};
 } // namespace std
 
+static void reportAllocation(void *ptr, size_t size) {
+  if (SCUDO_ENABLE_HOOKS)
+    if (__scudo_allocate_hook && ptr)
+      __scudo_allocate_hook(ptr, size);
+}
+static void reportDeallocation(void *ptr) {
+  if (SCUDO_ENABLE_HOOKS)
+    if (__scudo_deallocate_hook)
+      __scudo_deallocate_hook(ptr);
+}
+
 INTERFACE WEAK void *operator new(size_t size) {
-  return Allocator.allocate(size, scudo::Chunk::Origin::New);
+  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New);
+  reportAllocation(Ptr, size);
+  return Ptr;
 }
 INTERFACE WEAK void *operator new[](size_t size) {
-  return Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
+  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
+  reportAllocation(Ptr, size);
+  return Ptr;
 }
 INTERFACE WEAK void *operator new(size_t size,
                                   std::nothrow_t const &) NOEXCEPT {
-  return Allocator.allocate(size, scudo::Chunk::Origin::New);
+  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New);
+  reportAllocation(Ptr, size);
+  return Ptr;
 }
 INTERFACE WEAK void *operator new[](size_t size,
                                     std::nothrow_t const &) NOEXCEPT {
-  return Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
+  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
+  reportAllocation(Ptr, size);
+  return Ptr;
 }
 INTERFACE WEAK void *operator new(size_t size, std::align_val_t align) {
-  return Allocator.allocate(size, scudo::Chunk::Origin::New,
-                            static_cast<scudo::uptr>(align));
+  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New,
+                                 static_cast<scudo::uptr>(align));
+  reportAllocation(Ptr, size);
+  return Ptr;
 }
 INTERFACE WEAK void *operator new[](size_t size, std::align_val_t align) {
-  return Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
-                            static_cast<scudo::uptr>(align));
+  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
+                                 static_cast<scudo::uptr>(align));
+  reportAllocation(Ptr, size);
+  return Ptr;
 }
 INTERFACE WEAK void *operator new(size_t size, std::align_val_t align,
                                   std::nothrow_t const &) NOEXCEPT {
-  return Allocator.allocate(size, scudo::Chunk::Origin::New,
-                            static_cast<scudo::uptr>(align));
+  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New,
+                                 static_cast<scudo::uptr>(align));
+  reportAllocation(Ptr, size);
+  return Ptr;
 }
 INTERFACE WEAK void *operator new[](size_t size, std::align_val_t align,
                                     std::nothrow_t const &) NOEXCEPT {
-  return Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
-                            static_cast<scudo::uptr>(align));
+  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
+                                 static_cast<scudo::uptr>(align));
+  reportAllocation(Ptr, size);
+  return Ptr;
 }
 
 INTERFACE WEAK void operator delete(void *ptr) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::New);
 }
 INTERFACE WEAK void operator delete[](void *ptr) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray);
 }
 INTERFACE WEAK void operator delete(void *ptr,
                                     std::nothrow_t const &) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::New);
 }
 INTERFACE WEAK void operator delete[](void *ptr,
                                       std::nothrow_t const &) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray);
 }
 INTERFACE WEAK void operator delete(void *ptr, size_t size) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::New, size);
 }
 INTERFACE WEAK void operator delete[](void *ptr, size_t size) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, size);
 }
 INTERFACE WEAK void operator delete(void *ptr,
                                     std::align_val_t align) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::New, 0,
                        static_cast<scudo::uptr>(align));
 }
 INTERFACE WEAK void operator delete[](void *ptr,
                                       std::align_val_t align) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, 0,
                        static_cast<scudo::uptr>(align));
 }
 INTERFACE WEAK void operator delete(void *ptr, std::align_val_t align,
                                     std::nothrow_t const &) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::New, 0,
                        static_cast<scudo::uptr>(align));
 }
 INTERFACE WEAK void operator delete[](void *ptr, std::align_val_t align,
                                       std::nothrow_t const &) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, 0,
                        static_cast<scudo::uptr>(align));
 }
 INTERFACE WEAK void operator delete(void *ptr, size_t size,
                                     std::align_val_t align) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::New, size,
                        static_cast<scudo::uptr>(align));
 }
 INTERFACE WEAK void operator delete[](void *ptr, size_t size,
                                       std::align_val_t align) NOEXCEPT {
+  reportDeallocation(ptr);
   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, size,
                        static_cast<scudo::uptr>(align));
 }

From 529eb4e9547fbf2d63252e22a40150df3b28ae13 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Mar 2024 11:03:39 +0400
Subject: [PATCH 052/596] Fix window shadow on Linux.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 0e175983d..0999c7f70 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 0e175983d97605c20ee0321ca4485345536087b0
+Subproject commit 0999c7f70eba183624077c411a7545769cec1016

From 8982a4919279004c39091e2fba90a319ddcf3a13 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Mar 2024 11:04:11 +0400
Subject: [PATCH 053/596] Fix repetitive phone formatting.

---
 Telegram/SourceFiles/ui/text/format_values.cpp | 3 ++-
 Telegram/SourceFiles/ui/text/format_values.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp
index e792e6560..dec5eb312 100644
--- a/Telegram/SourceFiles/ui/text/format_values.cpp
+++ b/Telegram/SourceFiles/ui/text/format_values.cpp
@@ -381,13 +381,14 @@ QString FormatImageSizeText(const QSize &size) {
 		+ QString::number(size.height());
 }
 
-QString FormatPhone(const QString &phone) {
+QString FormatPhone(QString phone) {
 	if (phone.isEmpty()) {
 		return QString();
 	}
 	if (phone.at(0) == '0') {
 		return phone;
 	}
+	phone = phone.remove(QChar::Space);
 	return Countries::Instance().format({
 		.phone = (phone.at(0) == '+') ? phone.mid(1) : phone,
 	}).formatted;
diff --git a/Telegram/SourceFiles/ui/text/format_values.h b/Telegram/SourceFiles/ui/text/format_values.h
index abe6739f7..d4ac31b9e 100644
--- a/Telegram/SourceFiles/ui/text/format_values.h
+++ b/Telegram/SourceFiles/ui/text/format_values.h
@@ -24,7 +24,7 @@ inline constexpr auto FileStatusSizeFailed = 0xFFFFFFF2LL;
 [[nodiscard]] QString FormatGifAndSizeText(qint64 size);
 [[nodiscard]] QString FormatPlayedText(qint64 played, qint64 duration);
 [[nodiscard]] QString FormatImageSizeText(const QSize &size);
-[[nodiscard]] QString FormatPhone(const QString &phone);
+[[nodiscard]] QString FormatPhone(QString phone);
 [[nodiscard]] QString FormatTTL(float64 ttl);
 [[nodiscard]] QString FormatTTLAfter(float64 ttl);
 [[nodiscard]] QString FormatTTLTiny(float64 ttl);

From 98abb3aa005c3c6e81c4e10339c04b9f9f0ae538 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Mar 2024 10:53:29 +0400
Subject: [PATCH 054/596] Fix possible crash in join channel toast.

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

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 972f1fe15..a71ad72ce 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -1746,7 +1746,7 @@ void ApiWrap::joinChannel(not_null<ChannelData*> channel) {
 					}
 					return QString();
 				}();
-				if (!text.isEmpty()) {
+				if (show && !text.isEmpty()) {
 					show->showToast(text, kJoinErrorDuration);
 				}
 			}

From a0e0fd5b98ae28ecb2e006b67124f4390c7d4218 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 19 Mar 2024 20:09:12 +0400
Subject: [PATCH 055/596] Don't build libheif tests

That would save some build time
---
 Telegram/build/docker/centos_env/Dockerfile | 1 +
 Telegram/build/prepare/prepare.py           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index f7b674422..2c7116e12 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -257,6 +257,7 @@ RUN git clone -b v1.16.2 --depth=1 {{ GIT }}/strukturag/libheif.git \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \
 		-DBUILD_SHARED_LIBS=OFF \
+		-DBUILD_TESTING=OFF \
 		-DENABLE_PLUGIN_LOADING=OFF \
 		-DWITH_X265=OFF \
 		-DWITH_AOM_DECODER=OFF \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 7ce74596b..68b422b74 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -894,6 +894,7 @@ win:
         -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
         -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
         -DBUILD_SHARED_LIBS=OFF ^
+        -DBUILD_TESTING=OFF ^
         -DENABLE_PLUGIN_LOADING=OFF ^
         -DWITH_LIBDE265=ON ^
         -DWITH_SvtEnc=OFF ^
@@ -912,6 +913,7 @@ mac:
         -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX \\
         -D BUILD_SHARED_LIBS=OFF \\
+        -D BUILD_TESTING=OFF \\
         -D ENABLE_PLUGIN_LOADING=OFF \\
         -D WITH_AOM_ENCODER=OFF \\
         -D WITH_AOM_DECODER=OFF \\

From 893c09c848df7adb10d4f935ec3499afc8f35bd6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Mar 2024 18:58:20 +0300
Subject: [PATCH 056/596] Fixed showing of rate call box in appropriate window.

---
 Telegram/SourceFiles/calls/calls_call.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 486d5af2a..205a4c2d7 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/mtproto_config.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "window/window_controller.h"
 #include "media/audio/media_audio_track.h"
 #include "base/platform/base_platform_info.h"
 #include "calls/calls_panel.h"
@@ -706,11 +707,15 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 			}
 		}
 		if (data.is_need_rating() && _id && _accessHash) {
+			const auto window = Core::App().windowFor(_user);
 			const auto session = &_user->session();
 			const auto callId = _id;
 			const auto callAccessHash = _accessHash;
-			const auto box = Ui::show(Box<Ui::RateCallBox>(
-				Core::App().settings().sendSubmitWay()));
+			auto owned = Box<Ui::RateCallBox>(
+				Core::App().settings().sendSubmitWay());
+			const auto box = window
+				? window->show(std::move(owned))
+				: Ui::show(std::move(owned));
 			const auto sender = box->lifetime().make_state<MTP::Sender>(
 				&session->mtp());
 			box->sends(
@@ -1377,7 +1382,11 @@ void Call::handleRequestError(const QString &error) {
 			_user->name())
 		: QString();
 	if (!inform.isEmpty()) {
-		Ui::show(Ui::MakeInformBox(inform));
+		if (const auto window = Core::App().windowFor(_user)) {
+			window->show(Ui::MakeInformBox(inform));
+		} else {
+			Ui::show(Ui::MakeInformBox(inform));
+		}
 	}
 	finish(FinishType::Failed);
 }
@@ -1391,7 +1400,11 @@ void Call::handleControllerError(const QString &error) {
 		? tr::lng_call_error_audio_io(tr::now)
 		: QString();
 	if (!inform.isEmpty()) {
-		Ui::show(Ui::MakeInformBox(inform));
+		if (const auto window = Core::App().windowFor(_user)) {
+			window->show(Ui::MakeInformBox(inform));
+		} else {
+			Ui::show(Ui::MakeInformBox(inform));
+		}
 	}
 	finish(FinishType::Failed);
 }

From d6e4613144af8854aad4f3f69d49d6e3bd9ef796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
Date: Wed, 20 Mar 2024 12:05:57 +0100
Subject: [PATCH 057/596] Upgrade dav1d, libavif, libde265, libheif on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 2c7116e12..ae0c03859 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -171,7 +171,7 @@ RUN git clone -b v1.4 --depth=1 {{ GIT }}/xiph/opus.git \
 FROM builder AS dav1d
 COPY --link --from=nasm {{ LibrariesPath }}/nasm-cache /
 
-RUN git clone -b 1.2.1 --depth=1 {{ GIT }}/videolan/dav1d.git \
+RUN git clone -b 1.4.1 --depth=1 {{ GIT }}/videolan/dav1d.git \
 	&& cd dav1d \
 	&& meson build \
 		--buildtype=plain \
@@ -184,7 +184,7 @@ RUN git clone -b 1.2.1 --depth=1 {{ GIT }}/videolan/dav1d.git \
 	&& rm -rf dav1d
 
 FROM builder AS libde265
-RUN git clone -b v1.0.12 --depth=1 {{ GIT }}/strukturag/libde265.git \
+RUN git clone -b v1.0.15 --depth=1 {{ GIT }}/strukturag/libde265.git \
 	&& cd libde265 \
 	&& cmake -GNinja . \
 		-DCMAKE_BUILD_TYPE=None \
@@ -238,7 +238,7 @@ RUN git clone -b chrome-m116-5845 --depth=1 {{ GIT }}/webmproject/libwebp.git \
 FROM builder AS libavif
 COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
 
-RUN git clone -b v1.0.1 --depth=1 {{ GIT }}/AOMediaCodec/libavif.git \
+RUN git clone -b v1.0.4 --depth=1 {{ GIT }}/AOMediaCodec/libavif.git \
 	&& cd libavif \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \
@@ -252,7 +252,7 @@ RUN git clone -b v1.0.1 --depth=1 {{ GIT }}/AOMediaCodec/libavif.git \
 FROM builder AS libheif
 COPY --link --from=libde265 {{ LibrariesPath }}/libde265-cache /
 
-RUN git clone -b v1.16.2 --depth=1 {{ GIT }}/strukturag/libheif.git \
+RUN git clone -b v1.17.6 --depth=1 {{ GIT }}/strukturag/libheif.git \
 	&& cd libheif \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \

From 88dab47d2c58e0811594a614653627d6ddcbe87f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 21 Mar 2024 20:17:33 +0300
Subject: [PATCH 058/596] Changed behavior to open section with scheduled
 messages at top.

---
 .../history/view/history_view_scheduled_section.cpp           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 59ee93ae9..188d11338 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -1154,7 +1154,9 @@ Context ScheduledWidget::listContext() {
 }
 
 bool ScheduledWidget::listScrollTo(int top, bool syntetic) {
-	top = std::clamp(top, 0, _scroll->scrollTopMax());
+	top = (top == ScrollMax && syntetic)
+		? 0
+		: std::clamp(top, 0, _scroll->scrollTopMax());
 	if (_scroll->scrollTop() == top) {
 		updateInnerVisibleArea();
 		return false;

From cb9adad6607f3334006a9f8d40327b9ffb57ad60 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 21 Mar 2024 21:03:21 +0300
Subject: [PATCH 059/596] Added label to call panel when recipient has low
 level of battery.

---
 Telegram/Resources/langs/lang.strings      |   1 +
 Telegram/SourceFiles/calls/calls_call.cpp  |  10 ++
 Telegram/SourceFiles/calls/calls_call.h    |  14 +++
 Telegram/SourceFiles/calls/calls_panel.cpp | 131 +++++++++++++++++++--
 Telegram/SourceFiles/calls/calls_panel.h   |   4 +
 5 files changed, 147 insertions(+), 13 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 190958942..b70b8eacb 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3512,6 +3512,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_call_cancel" = "Cancel";
 
 "lng_call_microphone_off" = "{user}'s microphone is off";
+"lng_call_battery_level_low" = "{user}'s battery level is low";
 
 "lng_group_call_title" = "Voice Chat";
 "lng_group_call_title_channel" = "Live Stream";
diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 205a4c2d7..6b459e2ad 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -982,6 +982,16 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 				updateRemoteMediaState(audio, video);
 			});
 		},
+		.remoteBatteryLevelIsLowUpdated = [=](bool isLow) {
+#ifdef _DEBUG
+			isLow = true;
+#endif
+			crl::on_main(weak, [=] {
+				_remoteBatteryState = isLow
+					? RemoteBatteryState::Low
+					: RemoteBatteryState::Normal;
+			});
+		},
 		.signalingDataEmitted = [=](const std::vector<uint8_t> &data) {
 			const auto bytes = QByteArray(
 				reinterpret_cast<const char*>(data.data()),
diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 69c2d94da..55f48237a 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -162,6 +162,18 @@ public:
 		return _remoteVideoState.value();
 	}
 
+	enum class RemoteBatteryState {
+		Low,
+		Normal,
+	};
+	[[nodiscard]] RemoteBatteryState remoteBatteryState() const {
+		return _remoteBatteryState.current();
+	}
+	[[nodiscard]] auto remoteBatteryStateValue() const
+	-> rpl::producer<RemoteBatteryState> {
+		return _remoteBatteryState.value();
+	}
+
 	static constexpr auto kSignalBarStarting = -1;
 	static constexpr auto kSignalBarFinished = -2;
 	static constexpr auto kSignalBarCount = 4;
@@ -268,6 +280,8 @@ private:
 	rpl::variable<RemoteAudioState> _remoteAudioState =
 		RemoteAudioState::Active;
 	rpl::variable<Webrtc::VideoState> _remoteVideoState;
+	rpl::variable<RemoteBatteryState> _remoteBatteryState =
+		RemoteBatteryState::Normal;
 	rpl::event_stream<Error> _errors;
 	FinishType _finishAfterRequestingCall = FinishType::None;
 	bool _answerAfterDhConfigReceived = false;
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 05fdaaff2..4b92ee075 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -39,6 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/empty_userpic.h"
 #include "ui/emoji_config.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "core/application.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
@@ -57,8 +58,35 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QApplication>
 #include <QtGui/QWindow>
 #include <QtCore/QTimer>
+#include <QtSvg/QSvgRenderer>
 
 namespace Calls {
+namespace {
+
+[[nodiscard]] QByteArray BatterySvg(
+		const QSize &s,
+		const QColor &c) {
+	const auto color = u"rgb(%1,%2,%3)"_q
+		.arg(c.red())
+		.arg(c.green())
+		.arg(c.blue())
+		.toUtf8();
+	const auto width = QString::number(s.width()).toUtf8();
+	const auto height = QString::number(s.height()).toUtf8();
+	return R"(
+<svg width=")" + width + R"(" height=")" + height
+	+ R"(" viewBox="0 0 )" + width + R"( )" + height + R"(" fill="none">
+	<rect x="1.33598" y="0.5" width="24" height="12" rx="4" stroke=")" + color + R"("/>
+	<path
+		d="M26.836 4.66666V8.66666C27.6407 8.32788 28.164 7.53979 28.164 6.66666C28.164 5.79352 27.6407 5.00543 26.836 4.66666Z"
+		fill=")" + color + R"("/>
+	<path
+		d="M 5.5 3.5 H 5.5 A 0.5 0.5 0 0 1 6 4 V 9 A 0.5 0.5 0 0 1 5.5 9.5 H 5.5 A 0.5 0.5 0 0 1 5 9 V 4 A 0.5 0.5 0 0 1 5.5 3.5 Z M 5 4 V 9 A 0.5 0.5 0 0 0 5.5 9.5 H 5.5 A 0.5 0.5 0 0 0 6 9 V 4 A 0.5 0.5 0 0 0 5.5 3.5 H 5.5 A 0.5 0.5 0 0 0 5 4 Z"
+		transform="matrix(1, 0, 0, 1, 0, 0)" + ")\" stroke=\"" + color + R"("/>
+</svg>)";
+}
+
+} // namespace
 
 Panel::Panel(not_null<Call*> call)
 : _call(call)
@@ -392,9 +420,7 @@ void Panel::reinitWithCall(Call *call) {
 	_user = _call->user();
 
 	auto remoteMuted = _call->remoteAudioStateValue(
-	) | rpl::map([=](Call::RemoteAudioState state) {
-		return (state == Call::RemoteAudioState::Muted);
-	});
+	) | rpl::map(rpl::mappers::_1 == Call::RemoteAudioState::Muted);
 	rpl::duplicate(
 		remoteMuted
 	) | rpl::start_with_next([=](bool muted) {
@@ -402,6 +428,15 @@ void Panel::reinitWithCall(Call *call) {
 			createRemoteAudioMute();
 		} else {
 			_remoteAudioMute.destroy();
+			showRemoteLowBattery();
+		}
+	}, _callLifetime);
+	_call->remoteBatteryStateValue(
+	) | rpl::start_with_next([=](Call::RemoteBatteryState state) {
+		if (state == Call::RemoteBatteryState::Low) {
+			createRemoteLowBattery();
+		} else {
+			_remoteLowBattery.destroy();
 		}
 	}, _callLifetime);
 	_userpic = std::make_unique<Userpic>(
@@ -550,7 +585,10 @@ void Panel::createRemoteAudioMute() {
 			widget(),
 			tr::lng_call_microphone_off(
 				lt_user,
-				rpl::single(_user->shortName())),
+				_user->session().changes().peerFlagsValue(
+					_user,
+					Data::PeerUpdate::Flag::Name
+				) | rpl::map([=] { return _user->shortName(); })),
 			st::callRemoteAudioMute),
 		st::callTooltipPadding);
 	_remoteAudioMute->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -558,12 +596,12 @@ void Panel::createRemoteAudioMute() {
 	_remoteAudioMute->paintRequest(
 	) | rpl::start_with_next([=] {
 		auto p = QPainter(_remoteAudioMute);
-		const auto height = _remoteAudioMute->height();
+		const auto r = _remoteAudioMute->rect();
 
 		auto hq = PainterHighQualityEnabler(p);
 		p.setBrush(st::videoPlayIconBg);
 		p.setPen(Qt::NoPen);
-		p.drawRoundedRect(_remoteAudioMute->rect(), height / 2, height / 2);
+		p.drawRoundedRect(r, r.height() / 2, r.height() / 2);
 
 		st::callTooltipMutedIcon.paint(
 			p,
@@ -575,6 +613,71 @@ void Panel::createRemoteAudioMute() {
 	updateControlsGeometry();
 }
 
+void Panel::createRemoteLowBattery() {
+	_remoteLowBattery.create(
+		widget(),
+		object_ptr<Ui::FlatLabel>(
+			widget(),
+			tr::lng_call_battery_level_low(
+				lt_user,
+				_user->session().changes().peerFlagsValue(
+					_user,
+					Data::PeerUpdate::Flag::Name
+				) | rpl::map([=] { return _user->shortName(); })),
+			st::callRemoteAudioMute),
+		st::callTooltipPadding);
+	_remoteLowBattery->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		_remoteLowBattery.destroy();
+		createRemoteLowBattery();
+	}, _remoteLowBattery->lifetime());
+
+	constexpr auto kBatterySize = QSize(29, 13);
+
+	const auto icon = [&] {
+		auto svg = QSvgRenderer(
+			BatterySvg(kBatterySize, st::videoPlayIconFg->c));
+		auto image = QImage(
+			kBatterySize * style::DevicePixelRatio(),
+			QImage::Format_ARGB32_Premultiplied);
+		image.setDevicePixelRatio(style::DevicePixelRatio());
+		image.fill(Qt::transparent);
+		{
+			auto p = QPainter(&image);
+			svg.render(&p, Rect(kBatterySize));
+		}
+		return image;
+	}();
+
+	_remoteLowBattery->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(_remoteLowBattery);
+		const auto r = _remoteLowBattery->rect();
+
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::videoPlayIconBg);
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(r, r.height() / 2, r.height() / 2);
+
+		p.drawImage(
+			st::callTooltipMutedIconPosition.x(),
+			(r.height() - kBatterySize.height()) / 2,
+			icon);
+	}, _remoteLowBattery->lifetime());
+
+	showControls();
+	updateControlsGeometry();
+}
+
+void Panel::showRemoteLowBattery() {
+	if (_remoteLowBattery) {
+		_remoteLowBattery->setVisible(!_remoteAudioMute
+			|| _remoteAudioMute->isHidden());
+	}
+}
+
 void Panel::initLayout() {
 	initGeometry();
 
@@ -613,6 +716,7 @@ void Panel::showControls() {
 	if (_remoteAudioMute) {
 		_remoteAudioMute->setVisible(shown);
 	}
+	showRemoteLowBattery();
 }
 
 void Panel::closeBeforeDestroy() {
@@ -749,6 +853,13 @@ void Panel::updateControlsGeometry() {
 				- st::callRemoteAudioMuteSkip
 				- _remoteAudioMute->height()));
 	}
+	if (_remoteLowBattery) {
+		_remoteLowBattery->moveToLeft(
+			(widget()->width() - _remoteLowBattery->width()) / 2,
+			(_buttonsTop
+				- st::callRemoteAudioMuteSkip
+				- _remoteLowBattery->height()));
+	}
 
 	if (_outgoingPreviewInBody) {
 		_outgoingVideoBubble->updateGeometry(
@@ -768,16 +879,10 @@ void Panel::updateControlsGeometry() {
 void Panel::updateOutgoingVideoBubbleGeometry() {
 	Expects(!_outgoingPreviewInBody);
 
-	const auto margins = QMargins{
-		st::callInnerPadding,
-		st::callInnerPadding,
-		st::callInnerPadding,
-		st::callInnerPadding,
-	};
 	const auto size = st::callOutgoingDefaultSize;
 	_outgoingVideoBubble->updateGeometry(
 		VideoBubble::DragMode::SnapToCorners,
-		widget()->rect().marginsRemoved(margins),
+		widget()->rect() - Margins(st::callInnerPadding),
 		size);
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_panel.h b/Telegram/SourceFiles/calls/calls_panel.h
index c98537eb9..f6c8666d8 100644
--- a/Telegram/SourceFiles/calls/calls_panel.h
+++ b/Telegram/SourceFiles/calls/calls_panel.h
@@ -122,6 +122,8 @@ private:
 	void refreshOutgoingPreviewInBody(State state);
 	void toggleFullScreen(bool fullscreen);
 	void createRemoteAudioMute();
+	void createRemoteLowBattery();
+	void showRemoteLowBattery();
 	void refreshAnswerHangupRedialLabel();
 
 	[[nodiscard]] QRect incomingFrameGeometry() const;
@@ -160,6 +162,8 @@ private:
 	object_ptr<Ui::FlatLabel> _status;
 	object_ptr<Ui::RpWidget> _fingerprint = { nullptr };
 	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>> _remoteAudioMute = { nullptr };
+	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>> _remoteLowBattery =
+		{ nullptr };
 	std::unique_ptr<Userpic> _userpic;
 	std::unique_ptr<VideoBubble> _outgoingVideoBubble;
 	QPixmap _bottomShadow;

From f135676d363fd4b2c81b0fd8c19f0ce429f2fbeb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 22 Mar 2024 00:12:57 +0300
Subject: [PATCH 060/596] Added support for sending state of low level of
 battery.

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

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 6b459e2ad..107ca4eeb 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/rate_call_box.h"
 #include "calls/calls_instance.h"
+#include "base/battery_saving.h"
 #include "base/openssl_help.h"
 #include "base/random.h"
 #include "mtproto/mtproto_dh_utils.h"
@@ -1070,6 +1071,15 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 	_muted.value() | rpl::start_with_next([=](bool muted) {
 		Core::App().mediaDevices().setCaptureMuted(muted);
 	}, _instanceLifetime);
+
+	Core::App().batterySaving().value(
+	) | rpl::start_with_next([=](bool isSaving) {
+		crl::on_main(weak, [=] {
+			if (_instance) {
+				_instance->setIsLowBatteryLevel(isSaving);
+			}
+		});
+	}, _instanceLifetime);
 }
 
 void Call::handleControllerStateChange(tgcalls::State state) {

From 4b4de9d5aa949eba1d40e3beee7c0dd0b64242f2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 23 Mar 2024 02:55:33 +0400
Subject: [PATCH 061/596] Don't mark as read when unexposed

There's a yet another another visility state called "exposed" and the window could be unexposed while being not hidden and not minimized.

When the window is unexposed, Qt doesn't draw and the user can't see changes for sure.
---
 Telegram/SourceFiles/mainwindow.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index d0f67b583..5e8724b37 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -517,6 +517,7 @@ bool MainWindow::markingAsRead() const {
 		&& !_layer
 		&& !isHidden()
 		&& !isMinimized()
+		&& windowHandle()->isExposed()
 		&& (AutoScrollInactiveChat.value()
 			|| (isActive() && !_main->session().updates().isIdle()));
 }

From 5e11c43f84e3527c232f8d3eefc45f8cfbaca599 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 00:14:37 +0300
Subject: [PATCH 062/596] Moved out Stickers::EmojiImageLoader to td_ui.

---
 Telegram/CMakeLists.txt                                        | 2 --
 .../SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp   | 2 +-
 .../SourceFiles/chat_helpers/stickers_emoji_image_loader.h     | 1 +
 Telegram/cmake/td_ui.cmake                                     | 3 +++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 46e061a09..d7809bd3e 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -392,8 +392,6 @@ PRIVATE
     chat_helpers/spellchecker_common.h
     chat_helpers/stickers_dice_pack.cpp
     chat_helpers/stickers_dice_pack.h
-    chat_helpers/stickers_emoji_image_loader.cpp
-    chat_helpers/stickers_emoji_image_loader.h
     chat_helpers/stickers_emoji_pack.cpp
     chat_helpers/stickers_emoji_pack.h
     chat_helpers/stickers_gift_box_pack.cpp
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
index b4fec27de..c670c7d46 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
@@ -28,7 +28,7 @@ void EmojiImageLoader::init(
 
 QImage EmojiImageLoader::prepare(EmojiPtr emoji) const {
 	const auto loaded = _images->ensureLoaded();
-	const auto factor = cIntRetinaFactor();
+	const auto factor = style::DevicePixelRatio();
 	const auto side = st::largeEmojiSize + 2 * st::largeEmojiOutline;
 	auto tinted = QImage(
 		QSize(st::largeEmojiSize, st::largeEmojiSize) * factor,
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.h b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.h
index 09aa1310e..dfab93955 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include <crl/crl_object_on_queue.h>
 #include "ui/emoji_config.h"
 
 namespace Stickers {
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 7aa713ec0..885598b7c 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -63,6 +63,9 @@ PRIVATE
     calls/group/ui/desktop_capture_choose_source.cpp
     calls/group/ui/desktop_capture_choose_source.h
 
+    chat_helpers/stickers_emoji_image_loader.cpp
+    chat_helpers/stickers_emoji_image_loader.h
+
     core/file_location.cpp
     core/file_location.h
     core/mime_type.cpp

From 58fcedab64f15b4281e017b3383ef6790ecc6af2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 00:34:39 +0300
Subject: [PATCH 063/596] Moved out Window::SlideAnimation to td_ui.

---
 Telegram/CMakeLists.txt                                | 2 --
 Telegram/SourceFiles/window/window_slide_animation.cpp | 7 ++++---
 Telegram/cmake/td_ui.cmake                             | 3 +++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index d7809bd3e..55c5cbf82 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1495,8 +1495,6 @@ PRIVATE
     window/window_session_controller.cpp
     window/window_session_controller.h
     window/window_session_controller_link_info.h
-    window/window_slide_animation.cpp
-    window/window_slide_animation.h
     window/window_top_bar_wrap.h
     window/themes/window_theme.cpp
     window/themes/window_theme.h
diff --git a/Telegram/SourceFiles/window/window_slide_animation.cpp b/Telegram/SourceFiles/window/window_slide_animation.cpp
index 5f32d481d..54a843559 100644
--- a/Telegram/SourceFiles/window/window_slide_animation.cpp
+++ b/Telegram/SourceFiles/window/window_slide_animation.cpp
@@ -53,9 +53,10 @@ void SlideAnimation::paintContents(QPainter &p) const {
 					0,
 					0,
 					_cacheUnder,
-					(_cacheUnder.width() - leftWidth * cIntRetinaFactor()),
+					_cacheUnder.width()
+						- leftWidth * style::DevicePixelRatio(),
 					0,
-					leftWidth * cIntRetinaFactor(),
+					leftWidth * style::DevicePixelRatio(),
 					_topSkip * retina);
 			}
 
@@ -67,7 +68,7 @@ void SlideAnimation::paintContents(QPainter &p) const {
 					_cacheOver,
 					0,
 					0,
-					rightWidth * cIntRetinaFactor(),
+					rightWidth * style::DevicePixelRatio(),
 					_topSkip * retina);
 			}
 
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 885598b7c..eb1c7d79c 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -402,6 +402,9 @@ PRIVATE
     ui/widgets/fields/time_part_input_with_placeholder.cpp
     ui/widgets/fields/time_part_input_with_placeholder.h
 
+    window/window_slide_animation.cpp
+    window/window_slide_animation.h
+
     ui/ui_pch.h
 )
 

From d03d50ef0d398123e64931a1b69804e94172f7cd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 01:04:33 +0300
Subject: [PATCH 064/596] Removed cIntRetinaFactor and cRetinaFactor.

---
 Telegram/SourceFiles/boxes/background_box.cpp |  12 +-
 .../boxes/background_preview_box.cpp          |   6 +-
 .../boxes/peers/edit_peer_invite_link.cpp     |   4 +-
 .../SourceFiles/boxes/sticker_set_box.cpp     |   4 +-
 Telegram/SourceFiles/boxes/stickers_box.cpp   |   4 +-
 .../calls/calls_emoji_fingerprint.cpp         |   8 +-
 Telegram/SourceFiles/calls/calls_userpic.cpp  |   6 +-
 .../SourceFiles/calls/calls_video_bubble.cpp  |   6 +-
 .../calls/calls_video_incoming.cpp            |   4 +-
 .../calls/group/calls_group_members.cpp       |   6 +-
 .../calls/group/calls_group_members_row.cpp   |   6 +-
 .../calls/group/calls_group_panel.cpp         |   4 +-
 .../group/calls_group_viewport_opengl.cpp     |   9 +-
 .../chat_helpers/emoji_sets_manager.cpp       |   4 +-
 .../chat_helpers/field_autocomplete.cpp       |   6 +-
 .../chat_helpers/stickers_emoji_pack.cpp      |   6 +-
 .../chat_helpers/stickers_list_footer.cpp     |  10 +-
 .../chat_helpers/stickers_list_widget.cpp     |  10 +-
 .../SourceFiles/chat_helpers/tabbed_panel.cpp |  10 +-
 .../chat_helpers/tabbed_selector.cpp          |  63 +++++-----
 Telegram/SourceFiles/data/data_location.cpp   |   2 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   7 +-
 .../dialogs/ui/dialogs_video_userpic.cpp      |   2 +-
 .../editor/photo_editor_controls.cpp          |   8 +-
 .../editor/scene/scene_item_sticker.cpp       |   2 +-
 .../view/history_view_group_call_bar.cpp      |   6 +-
 .../history/view/history_view_pinned_bar.cpp  |   5 +-
 .../view/history_view_service_message.cpp     |   8 +-
 .../history/view/media/history_view_gif.cpp   |   6 +-
 .../view/media/history_view_large_emoji.cpp   |   4 +-
 .../view/media/history_view_sticker.cpp       |   2 +-
 .../media/history_view_theme_document.cpp     |   6 +-
 .../inline_bot_layout_internal.cpp            |  33 ++---
 .../inline_bots/inline_bot_layout_item.cpp    |   4 +-
 .../inline_bots/inline_bot_result.cpp         |   2 +-
 .../inline_bots/inline_results_widget.cpp     |  12 +-
 Telegram/SourceFiles/intro/intro_qr.cpp       |   2 +-
 Telegram/SourceFiles/intro/intro_step.cpp     |  27 +++-
 .../media/view/media_view_group_thumbs.cpp    |   8 +-
 .../media/view/media_view_overlay_widget.cpp  |  10 +-
 .../media/view/media_view_pip_opengl.cpp      |   6 +-
 .../SourceFiles/overview/overview_layout.cpp  |   9 +-
 .../SourceFiles/payments/payments_form.cpp    |   6 +-
 .../platform/mac/specific_mac_p.mm            |   2 +-
 .../touchbar/items/mac_pinned_chats_item.mm   |  18 +--
 .../mac/touchbar/items/mac_scrubber_item.mm   |   4 +-
 .../mac/touchbar/mac_touchbar_common.mm       |   2 +-
 .../platform/mac/window_title_mac.mm          |  35 ++++--
 Telegram/SourceFiles/settings.h               |   8 --
 .../SourceFiles/settings/settings_chat.cpp    |   8 +-
 .../settings/settings_notifications.cpp       |  21 ++--
 .../storage/storage_media_prepare.cpp         |  10 +-
 .../attach_item_single_media_preview.cpp      |   4 +-
 .../ui/controls/userpic_button.cpp            |   8 +-
 Telegram/SourceFiles/ui/filter_icon_panel.cpp |  10 +-
 Telegram/SourceFiles/ui/image/image.cpp       |   8 +-
 .../window/notifications_manager_default.cpp  |  16 ++-
 .../SourceFiles/window/section_widget.cpp     |   6 +-
 .../window/themes/window_theme.cpp            |   4 +-
 .../window/themes/window_theme_editor_box.cpp |   6 +-
 .../window/themes/window_theme_preview.cpp    | 119 ++++++++++++++----
 .../themes/window_themes_cloud_list.cpp       |  15 +--
 .../window/window_connecting_widget.cpp       |   4 +-
 .../window/window_media_preview.cpp           |   8 +-
 64 files changed, 411 insertions(+), 270 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index 877cf556e..59729b7fe 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -40,11 +40,11 @@ namespace {
 constexpr auto kBackgroundsInRow = 3;
 
 QImage TakeMiddleSample(QImage original, QSize size) {
-	size *= cIntRetinaFactor();
+	size *= style::DevicePixelRatio();
 	const auto from = original.size();
 	if (from.isEmpty()) {
 		auto result = original.scaled(size);
-		result.setDevicePixelRatio(cRetinaFactor());
+		result.setDevicePixelRatio(style::DevicePixelRatio());
 		return result;
 	}
 
@@ -58,7 +58,7 @@ QImage TakeMiddleSample(QImage original, QSize size) {
 		take.width(),
 		take.height()
 	).scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-	result.setDevicePixelRatio(cRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	return result;
 }
 
@@ -657,10 +657,10 @@ void BackgroundBox::Inner::validatePaperThumbnail(
 		} else if (!paper.data.backgroundColors().empty()) {
 			paper.thumbnail = Ui::PixmapFromImage(
 				Ui::GenerateBackgroundImage(
-					st::backgroundSize * cIntRetinaFactor(),
+					st::backgroundSize * style::DevicePixelRatio(),
 					paper.data.backgroundColors(),
 					paper.data.gradientRotation()));
-			paper.thumbnail.setDevicePixelRatio(cRetinaFactor());
+			paper.thumbnail.setDevicePixelRatio(style::DevicePixelRatio());
 			return;
 		} else {
 			return;
@@ -680,7 +680,7 @@ void BackgroundBox::Inner::validatePaperThumbnail(
 	paper.thumbnail = Ui::PixmapFromImage(TakeMiddleSample(
 		original,
 		st::backgroundSize));
-	paper.thumbnail.setDevicePixelRatio(cRetinaFactor());
+	paper.thumbnail.setDevicePixelRatio(style::DevicePixelRatio());
 }
 
 bool BackgroundBox::Inner::forChannel() const {
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index d445ce1f5..3a9917719 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -467,14 +467,14 @@ void BackgroundPreviewBox::generateBackground() {
 		return;
 	}
 	const auto size = QSize(st::boxWideWidth, st::boxWideWidth)
-		* cIntRetinaFactor();
+		* style::DevicePixelRatio();
 	_generated = Ui::PixmapFromImage((_paper.patternOpacity() >= 0.)
 		? Ui::GenerateBackgroundImage(
 			size,
 			_paper.backgroundColors(),
 			_paper.gradientRotation())
 		: BlackImage(size));
-	_generated.setDevicePixelRatio(cRetinaFactor());
+	_generated.setDevicePixelRatio(style::DevicePixelRatio());
 }
 
 not_null<HistoryView::ElementDelegate*> BackgroundPreviewBox::delegate() {
@@ -889,7 +889,7 @@ void BackgroundPreviewBox::paintEvent(QPaintEvent *e) {
 void BackgroundPreviewBox::paintImage(Painter &p) {
 	Expects(!_scaled.isNull());
 
-	const auto factor = cIntRetinaFactor();
+	const auto factor = style::DevicePixelRatio();
 	const auto size = st::boxWideWidth;
 	const auto from = QRect(
 		0,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index a9c92c745..fcdc646a5 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -228,8 +228,8 @@ QImage QrExact(const Qr::Data &data, int pixel, QColor color) {
 				skip,
 				skip,
 				Intro::details::TelegramLogoImage().scaled(
-					logoSize * cIntRetinaFactor(),
-					logoSize * cIntRetinaFactor(),
+					logoSize * style::DevicePixelRatio(),
+					logoSize * style::DevicePixelRatio(),
 					Qt::IgnoreAspectRatio,
 					Qt::SmoothTransformation));
 		}
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 82e4e3deb..6f5966de6 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -1221,7 +1221,7 @@ void StickerSetBox::Inner::setupLottie(int index) {
 		getLottiePlayer(),
 		element.documentMedia.get(),
 		ChatHelpers::StickerLottieSize::StickerSet,
-		boundingBoxSize() * cIntRetinaFactor());
+		boundingBoxSize() * style::DevicePixelRatio());
 }
 
 void StickerSetBox::Inner::setupWebm(int index) {
@@ -1345,7 +1345,7 @@ void StickerSetBox::Inner::paintSticker(
 	} else if (element.lottie && element.lottie->ready()) {
 		lottieFrame = element.lottie->frame();
 		p.drawImage(
-			QRect(ppos, lottieFrame.size() / cIntRetinaFactor()),
+			QRect(ppos, lottieFrame.size() / style::DevicePixelRatio()),
 			lottieFrame);
 
 		_lottiePlayer->unpause(element.lottie);
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 7d72ebf5a..94c11d00f 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -1539,7 +1539,7 @@ void StickersBox::Inner::paintRowThumbnail(
 	const auto y = _st.photoPosition.y() + (_st.photoSize - row->pixh) / 2;
 	if (row->lottie && row->lottie->ready()) {
 		const auto frame = row->lottie->frame();
-		const auto size = frame.size() / cIntRetinaFactor();
+		const auto size = frame.size() / style::DevicePixelRatio();
 		p.drawImage(
 			QRect(
 				left + (_st.photoSize - size.width()) / 2,
@@ -1578,7 +1578,7 @@ void StickersBox::Inner::validateLottieAnimation(not_null<Row*> row) {
 		row->thumbnailMedia.get(),
 		row->stickerMedia.get(),
 		ChatHelpers::StickerLottieSize::SetsListThumbnail,
-		QSize(_st.photoSize, _st.photoSize) * cIntRetinaFactor());
+		QSize(_st.photoSize, _st.photoSize) * style::DevicePixelRatio());
 	if (!player) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
index a39ae87ed..d6b6ca32a 100644
--- a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
+++ b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
@@ -210,7 +210,7 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 	// Geometry.
 	const auto print = ComputeEmojiFingerprint(call);
 	auto realSize = Ui::Emoji::GetSizeNormal();
-	auto size = realSize / cIntRetinaFactor();
+	auto size = realSize / style::DevicePixelRatio();
 	auto count = print.size();
 	const auto printSize = QSize(
 		count * size + (count - 1) * st::callFingerprintSkip,
@@ -234,9 +234,9 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 
 	// Paint.
 	const auto background = raw->lifetime().make_state<QImage>(
-		fullSize * cIntRetinaFactor(),
+		fullSize * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	background->setDevicePixelRatio(cRetinaFactor());
+	background->setDevicePixelRatio(style::DevicePixelRatio());
 	rpl::merge(
 		rpl::single(rpl::empty),
 		Ui::Emoji::Updated(),
@@ -274,7 +274,7 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 
 		// Emoji.
 		const auto realSize = Ui::Emoji::GetSizeNormal();
-		const auto size = realSize / cIntRetinaFactor();
+		const auto size = realSize / style::DevicePixelRatio();
 		auto left = st::callFingerprintPadding.left();
 		const auto top = st::callFingerprintPadding.top();
 		p.setClipping(false);
diff --git a/Telegram/SourceFiles/calls/calls_userpic.cpp b/Telegram/SourceFiles/calls/calls_userpic.cpp
index 38f467170..a57b6ff19 100644
--- a/Telegram/SourceFiles/calls/calls_userpic.cpp
+++ b/Telegram/SourceFiles/calls/calls_userpic.cpp
@@ -170,7 +170,7 @@ void Userpic::refreshPhoto() {
 
 void Userpic::createCache(Image *image) {
 	const auto size = this->size();
-	const auto real = size * cIntRetinaFactor();
+	const auto real = size * style::DevicePixelRatio();
 	//_useTransparency
 	//	? (Images::Option::RoundLarge
 	//		| Images::Option::RoundSkipBottomLeft
@@ -192,12 +192,12 @@ void Userpic::createCache(Image *image) {
 				.options = Images::Option::RoundCircle,
 				.outer = { size, size },
 			});
-		_userPhoto.setDevicePixelRatio(cRetinaFactor());
+		_userPhoto.setDevicePixelRatio(style::DevicePixelRatio());
 	} else {
 		auto filled = QImage(
 			QSize(real, real),
 			QImage::Format_ARGB32_Premultiplied);
-		filled.setDevicePixelRatio(cRetinaFactor());
+		filled.setDevicePixelRatio(style::DevicePixelRatio());
 		filled.fill(Qt::transparent);
 		{
 			auto p = QPainter(&filled);
diff --git a/Telegram/SourceFiles/calls/calls_video_bubble.cpp b/Telegram/SourceFiles/calls/calls_video_bubble.cpp
index 043ee8c41..b6866e9fd 100644
--- a/Telegram/SourceFiles/calls/calls_video_bubble.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_bubble.cpp
@@ -126,7 +126,7 @@ void VideoBubble::paint() {
 		const auto padding = st::boxRoundShadow.extend;
 		const auto inner = _content.rect().marginsRemoved(padding);
 		Ui::Shadow::paint(p, inner, _content.width(), st::boxRoundShadow);
-		const auto factor = cIntRetinaFactor();
+		const auto factor = style::DevicePixelRatio();
 		const auto left = _mirrored
 			? (_frame.width() - (inner.width() * factor))
 			: 0;
@@ -145,8 +145,8 @@ void VideoBubble::prepareFrame() {
 		return;
 	}
 	const auto padding = st::boxRoundShadow.extend;
-	const auto size = _content.rect().marginsRemoved(padding).size()
-		* cIntRetinaFactor();
+	const auto size = (_content.rect() - padding).size()
+		* style::DevicePixelRatio();
 
 	// Should we check 'original' and 'size' aspect ratios?..
 	const auto request = Webrtc::FrameRequest{
diff --git a/Telegram/SourceFiles/calls/calls_video_incoming.cpp b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
index 9ea9fe41c..9ab16d73d 100644
--- a/Telegram/SourceFiles/calls/calls_video_incoming.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
@@ -472,7 +472,7 @@ void Panel::Incoming::RendererSW::paintFallback(
 
 void Panel::Incoming::RendererSW::initBottomShadow() {
 	auto image = QImage(
-		QSize(1, st::callBottomShadowSize) * cIntRetinaFactor(),
+		QSize(1, st::callBottomShadowSize) * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
 	const auto colorFrom = uint32(0);
 	const auto colorTill = uint32(kBottomShadowAlphaMax);
@@ -527,7 +527,7 @@ void Panel::Incoming::RendererSW::fillBottomShadow(QPainter &p) {
 	if (fill.isEmpty()) {
 		return;
 	}
-	const auto factor = cIntRetinaFactor();
+	const auto factor = style::DevicePixelRatio();
 	p.drawImage(
 		fill,
 		_bottomShadow,
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members.cpp b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
index 73ac7d1b9..ce806928c 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
@@ -1865,11 +1865,11 @@ void Members::updateControlsGeometry() {
 void Members::setupFakeRoundCorners() {
 	const auto size = st::roundRadiusLarge;
 	const auto full = 3 * size;
-	const auto imagePartSize = size * cIntRetinaFactor();
-	const auto imageSize = full * cIntRetinaFactor();
+	const auto imagePartSize = size * style::DevicePixelRatio();
+	const auto imageSize = full * style::DevicePixelRatio();
 	const auto image = std::make_shared<QImage>(
 		QImage(imageSize, imageSize, QImage::Format_ARGB32_Premultiplied));
-	image->setDevicePixelRatio(cRetinaFactor());
+	image->setDevicePixelRatio(style::DevicePixelRatio());
 
 	const auto refreshImage = [=] {
 		image->fill(st::groupCallBg->c);
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
index 78484dadc..a9f41b35a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
@@ -356,11 +356,13 @@ void MembersRow::ensureUserpicCache(
 
 	const auto user = peer();
 	const auto key = user->userpicUniqueKey(view);
-	const auto full = QSize(size, size) * kWideScale * cIntRetinaFactor();
+	const auto full = QSize(size, size)
+		* kWideScale
+		* style::DevicePixelRatio();
 	auto &cache = _blobsAnimation->userpicCache;
 	if (cache.isNull()) {
 		cache = QImage(full, QImage::Format_ARGB32_Premultiplied);
-		cache.setDevicePixelRatio(cRetinaFactor());
+		cache.setDevicePixelRatio(style::DevicePixelRatio());
 	} else if (_blobsAnimation->userpicKey == key
 		&& cache.size() == full) {
 		return;
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index f0720b885..9e967b50e 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -1871,7 +1871,7 @@ void Panel::setupControlsBackgroundNarrow() {
 	_controlsBackgroundNarrow->blocker.show();
 	auto &lifetime = _controlsBackgroundNarrow->shadow.lifetime();
 
-	const auto factor = cIntRetinaFactor();
+	const auto factor = style::DevicePixelRatio();
 	const auto height = std::max(
 		st::groupCallMembersShadowHeight,
 		st::groupCallMembersFadeSkip + st::groupCallMembersFadeHeight);
@@ -1929,7 +1929,7 @@ void Panel::setupControlsBackgroundNarrow() {
 			_members->y() - _controlsBackgroundNarrow->shadow.y());
 		const auto faded = clip.intersected(inner);
 		if (!faded.isEmpty()) {
-			const auto factor = cIntRetinaFactor();
+			const auto factor = style::DevicePixelRatio();
 			p.drawImage(
 				faded,
 				*full,
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
index e11644e68..63e5105fa 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
@@ -585,11 +585,12 @@ void Viewport::RendererGL::paintTile(
 		_paused);
 	const auto pauseRect = transformRect(pauseIcon.geometry);
 
+	const auto factor = style::DevicePixelRatio();
 	const auto pausedPosition = QPoint(
-		x + (width - (_pausedTextRect.width() / cIntRetinaFactor())) / 2,
+		x + (width - (_pausedTextRect.width() / factor)) / 2,
 		pauseTextTop);
 	const auto pausedText = _names.texturedRect(
-		QRect(pausedPosition, _pausedTextRect.size() / cIntRetinaFactor()),
+		QRect(pausedPosition, _pausedTextRect.size() / factor),
 		_pausedTextRect);
 	const auto pausedRect = transformRect(pausedText.geometry);
 
@@ -627,7 +628,7 @@ void Viewport::RendererGL::paintTile(
 		x + st.namePosition.x(),
 		nameTop + nameShift);
 	const auto name = _names.texturedRect(
-		QRect(namePosition, tileData.nameRect.size() / cIntRetinaFactor()),
+		QRect(namePosition, tileData.nameRect.size() / factor),
 		tileData.nameRect,
 		geometry);
 	const auto nameRect = transformRect(name.geometry);
@@ -1194,7 +1195,7 @@ void Viewport::RendererGL::validateDatas() {
 	const auto &tiles = _owner->_tiles;
 	const auto &st = st::groupCallVideoTile;
 	const auto count = int(tiles.size());
-	const auto factor = cIntRetinaFactor();
+	const auto factor = style::DevicePixelRatio();
 	const auto nameHeight = st::semiboldFont->height * factor;
 	const auto pausedText = tr::lng_group_call_video_paused(tr::now);
 	const auto pausedBottom = nameHeight;
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
index fed24fc5b..f620f700f 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
@@ -449,7 +449,7 @@ void Row::setupLabels(const Set &set) {
 }
 
 void Row::setupPreview(const Set &set) {
-	const auto size = st::manageEmojiPreview * cIntRetinaFactor();
+	const auto size = st::manageEmojiPreview * style::DevicePixelRatio();
 	const auto original = QImage(set.previewPath);
 	const auto full = original.height();
 	auto &&preview = ranges::views::zip(_preview, ranges::views::ints(0, int(_preview.size())));
@@ -457,7 +457,7 @@ void Row::setupPreview(const Set &set) {
 		pixmap = Ui::PixmapFromImage(original.copy(
 			{ full * index, 0, full, full }
 		).scaledToWidth(size, Qt::SmoothTransformation));
-		pixmap.setDevicePixelRatio(cRetinaFactor());
+		pixmap.setDevicePixelRatio(style::DevicePixelRatio());
 	}
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index d5aba296b..e82ab9b9f 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -972,7 +972,9 @@ void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
 				if (sticker.lottie && sticker.lottie->ready()) {
 					lottieFrame = sticker.lottie->frame();
 					p.drawImage(
-						QRect(ppos, lottieFrame.size() / cIntRetinaFactor()),
+						QRect(
+							ppos,
+							lottieFrame.size() / style::DevicePixelRatio()),
 						lottieFrame);
 					if (!paused) {
 						sticker.lottie->markFrameShown();
@@ -1465,7 +1467,7 @@ void FieldAutocomplete::Inner::setupLottie(StickerSuggestion &suggestion) {
 	suggestion.lottie = ChatHelpers::LottiePlayerFromDocument(
 		suggestion.documentMedia.get(),
 		ChatHelpers::StickerLottieSize::InlineResults,
-		stickerBoundingBox() * cIntRetinaFactor(),
+		stickerBoundingBox() * style::DevicePixelRatio(),
 		Lottie::Quality::Default,
 		getLottieRenderer());
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
index 35af9b1d5..f4cc13c4c 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/emoji_config.h"
 #include "ui/text/text_isolated_emoji.h"
 #include "ui/image/image.h"
+#include "ui/rect.h"
 #include "main/main_session.h"
 #include "data/data_file_origin.h"
 #include "data/data_session.h"
@@ -53,10 +54,7 @@ constexpr auto kPremiumCachesCount = 8;
 [[nodiscard]] QSize SingleSize() {
 	const auto single = st::largeEmojiSize;
 	const auto outline = st::largeEmojiOutline;
-	return QSize(
-		2 * outline + single,
-		2 * outline + single
-	) * cIntRetinaFactor();
+	return Size(2 * outline + single) * style::DevicePixelRatio();
 }
 
 [[nodiscard]] const Lottie::ColorReplacements *ColorReplacements(int index) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index 6659343d2..d77a7cafd 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -1191,7 +1191,7 @@ void StickersListFooter::validateIconLottieAnimation(
 		icon.thumbnailMedia.get(),
 		icon.stickerMedia.get(),
 		StickerLottieSize::StickersFooter,
-		QSize(icon.pixw, icon.pixh) * cIntRetinaFactor(),
+		QSize(icon.pixw, icon.pixh) * style::DevicePixelRatio(),
 		_renderer());
 	if (!player) {
 		return;
@@ -1357,10 +1357,11 @@ void StickersListFooter::paintSetIconToCache(
 			});
 		} else if (icon.lottie && icon.lottie->ready()) {
 			const auto frame = icon.lottie->frame();
-			const auto size = frame.size() / cIntRetinaFactor();
+			const auto size = frame.size() / style::DevicePixelRatio();
 			if (icon.savedFrame.isNull()) {
 				icon.savedFrame = frame;
-				icon.savedFrame.setDevicePixelRatio(cRetinaFactor());
+				icon.savedFrame.setDevicePixelRatio(
+					style::DevicePixelRatio());
 			}
 			p.drawImage(
 				QRect(
@@ -1378,7 +1379,8 @@ void StickersListFooter::paintSetIconToCache(
 				paused ? 0 : now);
 			if (icon.savedFrame.isNull()) {
 				icon.savedFrame = frame;
-				icon.savedFrame.setDevicePixelRatio(cRetinaFactor());
+				icon.savedFrame.setDevicePixelRatio(
+					style::DevicePixelRatio());
 			}
 			p.drawImage(x, y, frame);
 		} else if (!icon.savedFrame.isNull()) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 543ce497d..a6a52f4be 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -1187,7 +1187,7 @@ void StickersListWidget::setupLottie(Set &set, int section, int index) {
 		set.lottiePlayer.get(),
 		sticker.documentMedia.get(),
 		StickerLottieSize::StickersPanel,
-		boundingBoxSize() * cIntRetinaFactor());
+		boundingBoxSize() * style::DevicePixelRatio());
 }
 
 void StickersListWidget::setupWebm(Set &set, int section, int index) {
@@ -1385,14 +1385,14 @@ void StickersListWidget::paintSticker(
 	auto lottieFrame = QImage();
 	if (sticker.lottie && sticker.lottie->ready()) {
 		auto request = Lottie::FrameRequest();
-		request.box = boundingBoxSize() * cIntRetinaFactor();
+		request.box = boundingBoxSize() * style::DevicePixelRatio();
 		lottieFrame = sticker.lottie->frame(request);
 		p.drawImage(
-			QRect(ppos, lottieFrame.size() / cIntRetinaFactor()),
+			QRect(ppos, lottieFrame.size() / style::DevicePixelRatio()),
 			lottieFrame);
 		if (sticker.savedFrame.isNull()) {
 			sticker.savedFrame = lottieFrame;
-			sticker.savedFrame.setDevicePixelRatio(cRetinaFactor());
+			sticker.savedFrame.setDevicePixelRatio(style::DevicePixelRatio());
 			sticker.savedFrameFor = _singleSize;
 		}
 		set.lottiePlayer->unpause(sticker.lottie);
@@ -1402,7 +1402,7 @@ void StickersListWidget::paintSticker(
 			paused ? 0 : now);
 		if (sticker.savedFrame.isNull()) {
 			sticker.savedFrame = frame;
-			sticker.savedFrame.setDevicePixelRatio(cRetinaFactor());
+			sticker.savedFrame.setDevicePixelRatio(style::DevicePixelRatio());
 			sticker.savedFrameFor = _singleSize;
 		}
 		p.drawImage(ppos, frame);
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index e8ec060fb..7d399a596 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -368,7 +368,11 @@ void TabbedPanel::startShowAnimation() {
 				? Ui::PanelAnimation::Origin::TopRight
 				: Ui::PanelAnimation::Origin::BottomRight));
 		auto inner = rect().marginsRemoved(st::emojiPanMargins);
-		_showAnimation->setFinalImage(std::move(image), QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
+		_showAnimation->setFinalImage(
+			std::move(image),
+			QRect(
+				inner.topLeft() * style::DevicePixelRatio(),
+				inner.size() * style::DevicePixelRatio()));
 		_showAnimation->setCornerMasks(Images::CornersMask(st::emojiPanRadius));
 		_showAnimation->start();
 	}
@@ -386,9 +390,9 @@ QImage TabbedPanel::grabForAnimation() {
 	Ui::SendPendingMoveResizeEvents(this);
 
 	auto result = QImage(
-		size() * cIntRetinaFactor(),
+		size() * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(cRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	result.fill(Qt::transparent);
 	if (_selector) {
 		QPainter p(&result);
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 5841f2c9e..aef9d7406 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -87,8 +87,8 @@ void TabbedSelector::SlideAnimation::setFinalImages(Direction direction, QImage
 	Assert(!_rightImage.isNull());
 	_width = _leftImage.width();
 	_height = _rightImage.height();
-	Assert(!(_width % cIntRetinaFactor()));
-	Assert(!(_height % cIntRetinaFactor()));
+	Assert(!(_width % style::DevicePixelRatio()));
+	Assert(!(_height % style::DevicePixelRatio()));
 	Assert(_leftImage.devicePixelRatio() == _rightImage.devicePixelRatio());
 	Assert(_rightImage.width() == _width);
 	Assert(_rightImage.height() == _height);
@@ -97,19 +97,19 @@ void TabbedSelector::SlideAnimation::setFinalImages(Direction direction, QImage
 	_innerTop = inner.y();
 	_innerWidth = inner.width();
 	_innerHeight = inner.height();
-	Assert(!(_innerLeft % cIntRetinaFactor()));
-	Assert(!(_innerTop % cIntRetinaFactor()));
-	Assert(!(_innerWidth % cIntRetinaFactor()));
-	Assert(!(_innerHeight % cIntRetinaFactor()));
+	Assert(!(_innerLeft % style::DevicePixelRatio()));
+	Assert(!(_innerTop % style::DevicePixelRatio()));
+	Assert(!(_innerWidth % style::DevicePixelRatio()));
+	Assert(!(_innerHeight % style::DevicePixelRatio()));
 	_innerRight = _innerLeft + _innerWidth;
 	_innerBottom = _innerTop + _innerHeight;
 
-	_painterInnerLeft = _innerLeft / cIntRetinaFactor();
-	_painterInnerTop = _innerTop / cIntRetinaFactor();
-	_painterInnerRight = _innerRight / cIntRetinaFactor();
-	_painterInnerBottom = _innerBottom / cIntRetinaFactor();
-	_painterInnerWidth = _innerWidth / cIntRetinaFactor();
-	_painterInnerHeight = _innerHeight / cIntRetinaFactor();
+	_painterInnerLeft = _innerLeft / style::DevicePixelRatio();
+	_painterInnerTop = _innerTop / style::DevicePixelRatio();
+	_painterInnerRight = _innerRight / style::DevicePixelRatio();
+	_painterInnerBottom = _innerBottom / style::DevicePixelRatio();
+	_painterInnerWidth = _innerWidth / style::DevicePixelRatio();
+	_painterInnerHeight = _innerHeight / style::DevicePixelRatio();
 	_painterCategoriesTop = _painterInnerBottom - st::defaultEmojiPan.footer;
 
 	_wasSectionIcons = wasSectionIcons;
@@ -148,10 +148,10 @@ void TabbedSelector::SlideAnimation::paintFrame(
 
 	auto arrivingCoord = anim::interpolate(_innerWidth, 0, easeOut);
 	auto departingCoord = anim::interpolate(0, _innerWidth, easeIn);
-	if (auto decrease = (arrivingCoord % cIntRetinaFactor())) {
+	if (auto decrease = (arrivingCoord % style::DevicePixelRatio())) {
 		arrivingCoord -= decrease;
 	}
-	if (auto decrease = (departingCoord % cIntRetinaFactor())) {
+	if (auto decrease = (departingCoord % style::DevicePixelRatio())) {
 		departingCoord -= decrease;
 	}
 	auto arrivingAlpha = easeIn;
@@ -165,7 +165,7 @@ void TabbedSelector::SlideAnimation::paintFrame(
 	auto leftTo = _innerLeft
 		+ std::clamp(_innerWidth + leftCoord, 0, _innerWidth);
 	auto rightFrom = _innerLeft + std::clamp(rightCoord, 0, _innerWidth);
-	auto painterRightFrom = rightFrom / cIntRetinaFactor();
+	auto painterRightFrom = rightFrom / style::DevicePixelRatio();
 	if (opacity < 1.) {
 		_frame.fill(Qt::transparent);
 	}
@@ -202,18 +202,18 @@ void TabbedSelector::SlideAnimation::paintFrame(
 		outerRight += _shadow.extend.right();
 		outerBottom += _shadow.extend.bottom();
 	}
-	if (cIntRetinaFactor() > 1) {
-		if (auto skipLeft = (outerLeft % cIntRetinaFactor())) {
+	if (style::DevicePixelRatio() > 1) {
+		if (auto skipLeft = (outerLeft % style::DevicePixelRatio())) {
 			outerLeft -= skipLeft;
 		}
-		if (auto skipTop = (outerTop % cIntRetinaFactor())) {
+		if (auto skipTop = (outerTop % style::DevicePixelRatio())) {
 			outerTop -= skipTop;
 		}
-		if (auto skipRight = (outerRight % cIntRetinaFactor())) {
-			outerRight += (cIntRetinaFactor() - skipRight);
+		if (auto skipRight = (outerRight % style::DevicePixelRatio())) {
+			outerRight += (style::DevicePixelRatio() - skipRight);
 		}
-		if (auto skipBottom = (outerBottom % cIntRetinaFactor())) {
-			outerBottom += (cIntRetinaFactor() - skipBottom);
+		if (auto skipBottom = (outerBottom % style::DevicePixelRatio())) {
+			outerBottom += (style::DevicePixelRatio() - skipBottom);
 		}
 	}
 
@@ -262,7 +262,14 @@ void TabbedSelector::SlideAnimation::paintFrame(
 	//	frameInts += _frameIntsPerLineAdded;
 	//}
 
-	p.drawImage(outerLeft / cIntRetinaFactor(), outerTop / cIntRetinaFactor(), _frame, outerLeft, outerTop, outerRight - outerLeft, outerBottom - outerTop);
+	p.drawImage(
+		outerLeft / style::DevicePixelRatio(),
+		outerTop / style::DevicePixelRatio(),
+		_frame,
+		outerLeft,
+		outerTop,
+		outerRight - outerLeft,
+		outerBottom - outerTop);
 }
 
 TabbedSelector::Tab::Tab(
@@ -893,9 +900,9 @@ QImage TabbedSelector::grabForAnimation() {
 	Ui::SendPendingMoveResizeEvents(this);
 
 	auto result = QImage(
-		size() * cIntRetinaFactor(),
+		size() * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(cRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	result.fill(Qt::transparent);
 	render(&result);
 
@@ -1179,9 +1186,9 @@ void TabbedSelector::switchTab() {
 	_slideAnimation = std::make_unique<SlideAnimation>();
 	const auto slidingRect = QRect(
 		0,
-		_scroll->y() * cIntRetinaFactor(),
-		width() * cIntRetinaFactor(),
-		(height() - _scroll->y()) * cIntRetinaFactor());
+		_scroll->y() * style::DevicePixelRatio(),
+		width() * style::DevicePixelRatio(),
+		(height() - _scroll->y()) * style::DevicePixelRatio());
 	_slideAnimation->setFinalImages(
 		direction,
 		std::move(wasCache),
diff --git a/Telegram/SourceFiles/data/data_location.cpp b/Telegram/SourceFiles/data/data_location.cpp
index c08c6688f..80727b3ba 100644
--- a/Telegram/SourceFiles/data/data_location.cpp
+++ b/Telegram/SourceFiles/data/data_location.cpp
@@ -62,7 +62,7 @@ size_t LocationPoint::hash() const {
 }
 
 GeoPointLocation ComputeLocation(const LocationPoint &point) {
-	const auto scale = 1 + (cScale() * cIntRetinaFactor()) / 200;
+	const auto scale = 1 + (cScale() * style::DevicePixelRatio()) / 200;
 	const auto zoom = 13 + (scale - 1);
 	const auto w = st::locationSize.width() / scale;
 	const auto h = st::locationSize.height() / scale;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6d85f7cef..8ac5c91b3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1479,9 +1479,9 @@ void Widget::startWidthAnimation() {
 	_inner->setNarrowRatio(0.);
 	Ui::SendPendingMoveResizeEvents(_scroll);
 	auto image = QImage(
-		grabGeometry.size() * cIntRetinaFactor(),
+		grabGeometry.size() * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	image.setDevicePixelRatio(cRetinaFactor());
+	image.setDevicePixelRatio(style::DevicePixelRatio());
 	image.fill(Qt::transparent);
 	{
 		QPainter p(&image);
@@ -3097,7 +3097,8 @@ void Widget::paintEvent(QPaintEvent *e) {
 	auto belowTop = _scroll->y() + _scroll->height();
 	if (!_widthAnimationCache.isNull()) {
 		p.drawPixmapLeft(0, _scroll->y(), width(), _widthAnimationCache);
-		belowTop = _scroll->y() + (_widthAnimationCache.height() / cIntRetinaFactor());
+		belowTop = _scroll->y()
+			+ (_widthAnimationCache.height() / style::DevicePixelRatio());
 	}
 
 	auto below = QRect(0, belowTop, width(), height() - belowTop);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp
index bfc056243..188d512e8 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp
@@ -99,7 +99,7 @@ Media::Clip::FrameRequest VideoUserpic::request(int size) const {
 	return {
 		.frame = { size, size },
 		.outer = { size, size },
-		.factor = cIntRetinaFactor(),
+		.factor = style::DevicePixelRatio(),
 		.radius = ImageRoundRadius::Ellipse,
 	};
 }
diff --git a/Telegram/SourceFiles/editor/photo_editor_controls.cpp b/Telegram/SourceFiles/editor/photo_editor_controls.cpp
index ae0f3355d..72a433865 100644
--- a/Telegram/SourceFiles/editor/photo_editor_controls.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_controls.cpp
@@ -87,9 +87,9 @@ void EdgeButton::init() {
 
 QImage EdgeButton::rounded(std::optional<QColor> color) const {
 	auto result = QImage(
-		_rippleRect.size() * cIntRetinaFactor(),
+		_rippleRect.size() * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(cIntRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	result.fill(color.value_or(Qt::white));
 
 	const auto parts = RectPart::None
@@ -170,9 +170,9 @@ ButtonBar::ButtonBar(
 		}
 
 		auto result = QImage(
-			size * cIntRetinaFactor(),
+			size * style::DevicePixelRatio(),
 			QImage::Format_ARGB32_Premultiplied);
-		result.setDevicePixelRatio(cIntRetinaFactor());
+		result.setDevicePixelRatio(style::DevicePixelRatio());
 		result.fill(bg->c);
 
 		_roundedBg = Images::Round(
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp b/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
index c678452e9..2cf42d10c 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
@@ -43,7 +43,7 @@ ItemSticker::ItemSticker(
 				_mediaView.get(),
 				ChatHelpers::StickerLottieSize::MessageHistory,
 				QSize(kStickerSideSize, kStickerSideSize)
-					* cIntRetinaFactor(),
+					* style::DevicePixelRatio(),
 				Lottie::Quality::High);
 			_lottie.player->updates(
 			) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
index 7fc19532a..0b978acb3 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
@@ -38,13 +38,13 @@ void GenerateUserpicsInRow(
 	const auto single = st.size;
 	const auto shift = st.shift;
 	const auto width = single + (limit - 1) * (single - shift);
-	if (result.width() != width * cIntRetinaFactor()) {
+	if (result.width() != width * style::DevicePixelRatio()) {
 		result = QImage(
-			QSize(width, single) * cIntRetinaFactor(),
+			QSize(width, single) * style::DevicePixelRatio(),
 			QImage::Format_ARGB32_Premultiplied);
 	}
 	result.fill(Qt::transparent);
-	result.setDevicePixelRatio(cRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 
 	auto q = Painter(&result);
 	auto hq = PainterHighQualityEnabler(q);
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 2b82db6f2..d530e4779 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -44,12 +44,13 @@ namespace {
 	auto result = ContentWithoutPreview(item, repaint);
 	if (!preview) {
 		static const auto kEmpty = [&] {
-			const auto size = st::historyReplyHeight * cIntRetinaFactor();
+			const auto size = st::historyReplyHeight
+				* style::DevicePixelRatio();
 			auto result = QImage(
 				QSize(size, size),
 				QImage::Format_ARGB32_Premultiplied);
 			result.fill(Qt::transparent);
-			result.setDevicePixelRatio(cRetinaFactor());
+			result.setDevicePixelRatio(style::DevicePixelRatio());
 			return result;
 		}();
 		result.preview = kEmpty;
diff --git a/Telegram/SourceFiles/history/view/history_view_service_message.cpp b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
index acd5929f6..ee07aa326 100644
--- a/Telegram/SourceFiles/history/view/history_view_service_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
@@ -73,14 +73,14 @@ int PaintBubbleSide(
 	if (style == SideStyle::Rounded) {
 		const auto &corners = st->serviceBgCornersNormal();
 		const auto left = corners.p[(side == CornerTop) ? 0 : 2];
-		const auto leftWidth = left.width() / cIntRetinaFactor();
+		const auto leftWidth = left.width() / style::DevicePixelRatio();
 		p.drawPixmap(x, y, left);
 
 		const auto right = corners.p[(side == CornerTop) ? 1 : 3];
-		const auto rightWidth = right.width() / cIntRetinaFactor();
+		const auto rightWidth = right.width() / style::DevicePixelRatio();
 		p.drawPixmap(x + width - rightWidth, y, right);
 
-		const auto cornerHeight = left.height() / cIntRetinaFactor();
+		const auto cornerHeight = left.height() / style::DevicePixelRatio();
 		p.fillRect(
 			x + leftWidth,
 			y,
@@ -92,7 +92,7 @@ int PaintBubbleSide(
 		// CornerLeft and CornerRight are inverted in the top part.
 		const auto &corners = st->serviceBgCornersInverted();
 		const auto left = corners.p[(side == CornerTop) ? 1 : 2];
-		const auto leftWidth = left.width() / cIntRetinaFactor();
+		const auto leftWidth = left.width() / style::DevicePixelRatio();
 		p.drawPixmap(x - leftWidth, y, left);
 
 		const auto right = corners.p[(side == CornerTop) ? 0 : 3];
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 9b5ff9e12..bda09fe8d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -536,7 +536,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	if (streamed && !skipDrawingContent && !fullHiddenBySpoiler) {
 		auto paused = context.paused;
 		auto request = ::Media::Streaming::FrameRequest{
-			.outer = QSize(usew, painth) * cIntRetinaFactor(),
+			.outer = QSize(usew, painth) * style::DevicePixelRatio(),
 			.blurredBackground = true,
 		};
 		if (isRound) {
@@ -1384,8 +1384,8 @@ void Gif::drawGrouped(
 			{ originalWidth, originalHeight },
 			{ geometry.width(), geometry.height() });
 		auto request = ::Media::Streaming::FrameRequest{
-			.resize = pixSize * cIntRetinaFactor(),
-			.outer = geometry.size() * cIntRetinaFactor(),
+			.resize = pixSize * style::DevicePixelRatio(),
+			.outer = geometry.size() * style::DevicePixelRatio(),
 			.rounding = MediaRoundingMask(rounding),
 		};
 		if (activeOwnPlaying->instance.playerLocked()) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_large_emoji.cpp b/Telegram/SourceFiles/history/view/media/history_view_large_emoji.cpp
index 320f6e22c..0f77af125 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_large_emoji.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_large_emoji.cpp
@@ -75,7 +75,7 @@ QSize LargeEmoji::countOptimalSize() {
 	const auto count = _images.size()
 		- ranges::count(_images, LargeEmojiMedia());
 
-	const auto single = LargeEmojiImage::Size() / cIntRetinaFactor();
+	const auto single = LargeEmojiImage::Size() / style::DevicePixelRatio();
 	const auto skip = st::largeEmojiSkip - 2 * st::largeEmojiOutline;
 	const auto inner = count * single.width() + (count - 1) * skip;
 	const auto &padding = st::largeEmojiPadding;
@@ -95,7 +95,7 @@ void LargeEmoji::draw(
 	auto x = r.x() + (r.width() - _size.width()) / 2 + padding.left();
 	const auto y = r.y() + (r.height() - _size.height()) / 2 + padding.top();
 	const auto skip = st::largeEmojiSkip - 2 * st::largeEmojiOutline;
-	const auto size = LargeEmojiImage::Size() / cIntRetinaFactor();
+	const auto size = LargeEmojiImage::Size() / style::DevicePixelRatio();
 	const auto selected = context.selected();
 	if (!selected) {
 		_selectedFrame = QImage();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index 6f182e171..cefaad0c2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -276,7 +276,7 @@ void Sticker::paintAnimationFrame(
 			base::duplicate(image),
 			context.st->msgStickerOverlay()->c)
 		: image;
-	const auto size = prepared.size() / cIntRetinaFactor();
+	const auto size = prepared.size() / style::DevicePixelRatio();
 	p.drawImage(
 		QRect(
 			QPoint(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 96bd885f3..ef72e8f08 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -352,7 +352,7 @@ QImage ThemeDocument::finishServiceThumbnail(QImage image) const {
 	if (!_serviceWidth) {
 		return image;
 	} else if (_isDark && _dimmingIntensity > 0) {
-		image.setDevicePixelRatio(cIntRetinaFactor());
+		image.setDevicePixelRatio(style::DevicePixelRatio());
 		auto p = QPainter(&image);
 		const auto alpha = 255 * _dimmingIntensity / 100;
 		p.fillRect(0, 0, _pixw, _pixh, QColor(0, 0, 0, alpha));
@@ -366,13 +366,13 @@ QImage ThemeDocument::finishServiceThumbnail(QImage image) const {
 
 void ThemeDocument::generateThumbnail() const {
 	auto image = Ui::GenerateBackgroundImage(
-		QSize(_pixw, _pixh) * cIntRetinaFactor(),
+		QSize(_pixw, _pixh) * style::DevicePixelRatio(),
 		_background,
 		_gradientRotation,
 		_patternOpacity);
 	_thumbnail = Ui::PixmapFromImage(
 		finishServiceThumbnail(std::move(image)));
-	_thumbnail.setDevicePixelRatio(cRetinaFactor());
+	_thumbnail.setDevicePixelRatio(style::DevicePixelRatio());
 	_thumbnailGood = 1;
 }
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index e8b6181fb..616280a7e 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -330,7 +330,7 @@ void Gif::validateThumbnail(
 		bool good) const {
 	if (!image || (_thumbGood && !good)) {
 		return;
-	} else if ((_thumb.size() == size * cIntRetinaFactor())
+	} else if ((_thumb.size() == size * style::DevicePixelRatio())
 		&& (_thumbGood || !good)) {
 		return;
 	}
@@ -503,7 +503,7 @@ void Sticker::paint(Painter &p, const QRect &clip, const PaintContext *context)
 	prepareThumbnail();
 	if (_lottie && _lottie->ready()) {
 		const auto frame = _lottie->frame();
-		const auto size = frame.size() / cIntRetinaFactor();
+		const auto size = frame.size() / style::DevicePixelRatio();
 		const auto pos = QPoint(
 			(st::stickerPanSize.width() - size.width()) / 2,
 			(st::stickerPanSize.height() - size.height()) / 2);
@@ -524,8 +524,11 @@ void Sticker::paint(Painter &p, const QRect &clip, const PaintContext *context)
 			(st::stickerPanSize.height() - size.width()) / 2,
 			frame);
 	} else if (!_thumb.isNull()) {
-		int w = _thumb.width() / cIntRetinaFactor(), h = _thumb.height() / cIntRetinaFactor();
-		QPoint pos = QPoint((st::stickerPanSize.width() - w) / 2, (st::stickerPanSize.height() - h) / 2);
+		const auto w = _thumb.width() / style::DevicePixelRatio();
+		const auto h = _thumb.height() / style::DevicePixelRatio();
+		const auto pos = QPoint(
+			(st::stickerPanSize.width() - w) / 2,
+			(st::stickerPanSize.height() - h) / 2);
 		p.drawPixmap(pos, _thumb);
 	} else if (context->pathGradient) {
 		const auto thumbSize = getThumbSize();
@@ -583,7 +586,7 @@ void Sticker::setupLottie() const {
 	_lottie = ChatHelpers::LottiePlayerFromDocument(
 		_dataMedia.get(),
 		ChatHelpers::StickerLottieSize::InlineResults,
-		boundingBox() * cIntRetinaFactor());
+		boundingBox() * style::DevicePixelRatio());
 
 	_lottie->updates(
 	) | rpl::start_with_next([=] {
@@ -736,7 +739,7 @@ void Photo::validateThumbnail(
 		bool good) const {
 	if (!image || (_thumbGood && !good)) {
 		return;
-	} else if ((_thumb.size() == size * cIntRetinaFactor())
+	} else if ((_thumb.size() == size * style::DevicePixelRatio())
 		&& (_thumbGood || !good)) {
 		return;
 	}
@@ -893,7 +896,7 @@ void Video::prepareThumbnail(QSize size) const {
 	if (!thumb) {
 		return;
 	}
-	if (_thumb.size() != size * cIntRetinaFactor()) {
+	if (_thumb.size() != size * style::DevicePixelRatio()) {
 		const auto width = size.width();
 		const auto height = size.height();
 		auto w = qMax(style::ConvertScale(thumb->width()), 1);
@@ -1225,7 +1228,8 @@ TextState Contact::getState(
 
 void Contact::prepareThumbnail(int width, int height) const {
 	if (!hasResultThumb()) {
-		if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) {
+		if ((_thumb.width() != width * style::DevicePixelRatio())
+			|| (_thumb.height() != height * style::DevicePixelRatio())) {
 			_thumb = getResultContactAvatar(width, height);
 		}
 		return;
@@ -1234,8 +1238,8 @@ void Contact::prepareThumbnail(int width, int height) const {
 	const auto origin = fileOrigin();
 	const auto thumb = getResultThumb(origin);
 	if (!thumb
-		|| ((_thumb.width() == width * cIntRetinaFactor())
-			&& (_thumb.height() == height * cIntRetinaFactor()))) {
+		|| ((_thumb.width() == width * style::DevicePixelRatio())
+			&& (_thumb.height() == height * style::DevicePixelRatio()))) {
 		return;
 	}
 	auto w = qMax(style::ConvertScale(thumb->width()), 1);
@@ -1383,7 +1387,8 @@ TextState Article::getState(
 
 void Article::prepareThumbnail(int width, int height) const {
 	if (!hasResultThumb()) {
-		if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) {
+		if ((_thumb.width() != width * style::DevicePixelRatio())
+			|| (_thumb.height() != height * style::DevicePixelRatio())) {
 			_thumb = getResultContactAvatar(width, height);
 		}
 		return;
@@ -1392,8 +1397,8 @@ void Article::prepareThumbnail(int width, int height) const {
 	const auto origin = fileOrigin();
 	const auto thumb = getResultThumb(origin);
 	if (!thumb
-		|| ((_thumb.width() == width * cIntRetinaFactor())
-			&& (_thumb.height() == height * cIntRetinaFactor()))) {
+		|| ((_thumb.width() == width * style::DevicePixelRatio())
+			&& (_thumb.height() == height * style::DevicePixelRatio()))) {
 		return;
 	}
 	auto w = qMax(style::ConvertScale(thumb->width()), 1);
@@ -1609,7 +1614,7 @@ void Game::ensureDataMediaCreated(not_null<PhotoData*> photo) const {
 void Game::validateThumbnail(Image *image, QSize size, bool good) const {
 	if (!image || (_thumbGood && !good)) {
 		return;
-	} else if ((_thumb.size() == size * cIntRetinaFactor())
+	} else if ((_thumb.size() == size * style::DevicePixelRatio())
 		&& (_thumbGood || !good)) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
index 2f5242e85..34acc4093 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
@@ -165,9 +165,9 @@ QPixmap ItemBase::getResultContactAvatar(int width, int height) const {
 				BareId(qHash(_result->_id)))),
 			_result->getLayoutTitle()
 		).generate(width);
-		if (result.height() != height * cIntRetinaFactor()) {
+		if (result.height() != height * style::DevicePixelRatio()) {
 			result = result.scaled(
-				QSize(width, height) * cIntRetinaFactor(),
+				QSize(width, height) * style::DevicePixelRatio(),
 				Qt::IgnoreAspectRatio,
 				Qt::SmoothTransformation);
 		}
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
index 5931c22c4..612d35769 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
@@ -284,7 +284,7 @@ std::unique_ptr<Result> Result::Create(
 	});
 
 	if (const auto point = result->getLocationPoint()) {
-		const auto scale = 1 + (cScale() * cIntRetinaFactor()) / 200;
+		const auto scale = 1 + (cScale() * style::DevicePixelRatio()) / 200;
 		const auto zoom = 15 + (scale - 1);
 		const auto w = st::inlineThumbSize / scale;
 		const auto h = st::inlineThumbSize / scale;
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index 3808ed989..c6e4b3380 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -236,7 +236,11 @@ void Widget::startShowAnimation() {
 
 		_showAnimation = std::make_unique<Ui::PanelAnimation>(st::emojiPanAnimation, Ui::PanelAnimation::Origin::BottomLeft);
 		auto inner = rect().marginsRemoved(st::emojiPanMargins);
-		_showAnimation->setFinalImage(std::move(image), QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
+		_showAnimation->setFinalImage(
+			std::move(image),
+			QRect(
+				inner.topLeft() * style::DevicePixelRatio(),
+				inner.size() * style::DevicePixelRatio()));
 		_showAnimation->setCornerMasks(Images::CornersMask(ImageRoundRadius::Small));
 		_showAnimation->start();
 	}
@@ -246,8 +250,10 @@ void Widget::startShowAnimation() {
 
 QImage Widget::grabForPanelAnimation() {
 	Ui::SendPendingMoveResizeEvents(this);
-	auto result = QImage(size() * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(cRetinaFactor());
+	auto result = QImage(
+		size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	result.fill(Qt::transparent);
 	_inPanelGrab = true;
 	render(&result);
diff --git a/Telegram/SourceFiles/intro/intro_qr.cpp b/Telegram/SourceFiles/intro/intro_qr.cpp
index 3ad8aead8..a76f7539d 100644
--- a/Telegram/SourceFiles/intro/intro_qr.cpp
+++ b/Telegram/SourceFiles/intro/intro_qr.cpp
@@ -119,7 +119,7 @@ namespace {
 			1,
 			st::introQrPixel);
 		const auto size = has
-			? (state->qr.size() / cIntRetinaFactor())
+			? (state->qr.size() / style::DevicePixelRatio())
 			: QSize(usualSize * pixel, usualSize * pixel);
 		const auto qr = QRect(
 			(result->width() - size.width()) / 2,
diff --git a/Telegram/SourceFiles/intro/intro_step.cpp b/Telegram/SourceFiles/intro/intro_step.cpp
index 6c8a18227..9c408f412 100644
--- a/Telegram/SourceFiles/intro/intro_step.cpp
+++ b/Telegram/SourceFiles/intro/intro_step.cpp
@@ -383,10 +383,20 @@ void Step::hideDescription() {
 
 void Step::paintContentSnapshot(QPainter &p, const QPixmap &snapshot, float64 alpha, float64 howMuchHidden) {
 	if (!snapshot.isNull()) {
-		auto contentTop = anim::interpolate(height() - (snapshot.height() / cIntRetinaFactor()), height(), howMuchHidden);
+		const auto contentTop = anim::interpolate(
+			height() - (snapshot.height() / style::DevicePixelRatio()),
+			height(),
+			howMuchHidden);
 		if (contentTop < height()) {
 			p.setOpacity(alpha);
-			p.drawPixmap(QPoint(contentLeft(), contentTop), snapshot, QRect(0, 0, snapshot.width(), (height() - contentTop) * cIntRetinaFactor()));
+			p.drawPixmap(
+				QPoint(contentLeft(), contentTop),
+				snapshot,
+				QRect(
+					0,
+					0,
+					snapshot.width(),
+					(height() - contentTop) * style::DevicePixelRatio()));
 		}
 	}
 }
@@ -394,8 +404,8 @@ void Step::paintContentSnapshot(QPainter &p, const QPixmap &snapshot, float64 al
 void Step::prepareCoverMask() {
 	if (!_coverMask.isNull()) return;
 
-	auto maskWidth = cIntRetinaFactor();
-	auto maskHeight = st::introCoverHeight * cIntRetinaFactor();
+	auto maskWidth = style::DevicePixelRatio();
+	auto maskHeight = st::introCoverHeight * style::DevicePixelRatio();
 	auto mask = QImage(maskWidth, maskHeight, QImage::Format_ARGB32_Premultiplied);
 	auto maskInts = reinterpret_cast<uint32*>(mask.bits());
 	Assert(mask.depth() == (sizeof(uint32) << 3));
@@ -416,7 +426,14 @@ void Step::prepareCoverMask() {
 void Step::paintCover(QPainter &p, int top) {
 	auto coverHeight = top + st::introCoverHeight;
 	if (coverHeight > 0) {
-		p.drawPixmap(QRect(0, 0, width(), coverHeight), _coverMask, QRect(0, -top * cIntRetinaFactor(), _coverMask.width(), coverHeight * cIntRetinaFactor()));
+		p.drawPixmap(
+			QRect(0, 0, width(), coverHeight),
+			_coverMask,
+			QRect(
+				0,
+				-top * style::DevicePixelRatio(),
+				_coverMask.width(),
+				coverHeight * style::DevicePixelRatio()));
 	}
 
 	auto left = 0;
diff --git a/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp b/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
index 6568df3b0..2aff46067 100644
--- a/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
@@ -289,15 +289,15 @@ void GroupThumbs::Thumb::validateImage() {
 		const auto takeWidth = originalWidth * st::mediaviewGroupWidthMax
 			/ pixSize.width();
 		auto original = _image->original();
-		original.setDevicePixelRatio(cRetinaFactor());
+		original.setDevicePixelRatio(style::DevicePixelRatio());
 		_full = Ui::PixmapFromImage(original.copy(
 			(originalWidth - takeWidth) / 2,
 			0,
 			takeWidth,
 			originalHeight
 		).scaled(
-			st::mediaviewGroupWidthMax * cIntRetinaFactor(),
-			pixSize.height() * cIntRetinaFactor(),
+			st::mediaviewGroupWidthMax * style::DevicePixelRatio(),
+			pixSize.height() * style::DevicePixelRatio(),
 			Qt::IgnoreAspectRatio,
 			Qt::SmoothTransformation));
 	} else {
@@ -428,7 +428,7 @@ void GroupThumbs::Thumb::paint(
 	if (width == _fullWidth) {
 		p.drawPixmap(left, y, _full);
 	} else {
-		const auto takeWidth = width * cIntRetinaFactor();
+		const auto takeWidth = width * style::DevicePixelRatio();
 		const auto from = QRect(
 			(_full.width() - takeWidth) / 2,
 			0,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index b4965fe6f..b1a1539ec 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -443,9 +443,9 @@ OverlayWidget::OverlayWidget()
 	});
 
 	_docRectImage = QImage(
-		st::mediaviewFileSize * cIntRetinaFactor(),
+		st::mediaviewFileSize * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	_docRectImage.setDevicePixelRatio(cIntRetinaFactor());
+	_docRectImage.setDevicePixelRatio(style::DevicePixelRatio());
 
 	Shortcuts::Requests(
 	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
@@ -1129,7 +1129,7 @@ void OverlayWidget::setStaticContent(QImage image) {
 		&& image.format() != QImage::Format_RGB32) {
 		image = std::move(image).convertToFormat(kGood);
 	}
-	image.setDevicePixelRatio(cRetinaFactor());
+	image.setDevicePixelRatio(style::DevicePixelRatio());
 	_staticContent = std::move(image);
 	_staticContentTransparent = IsSemitransparent(_staticContent);
 }
@@ -4496,7 +4496,7 @@ void OverlayWidget::validatePhotoImage(Image *image, bool blurred) {
 		return;
 	}
 	const auto use = flipSizeByRotation({ _width, _height })
-		* cIntRetinaFactor();
+		* style::DevicePixelRatio();
 	setStaticContent(image->pixNoCache(
 		use,
 		{ .options = (blurred ? Images::Option::Blur : Images::Option()) }
@@ -4833,7 +4833,7 @@ void OverlayWidget::paintDocumentBubbleContent(
 				}
 			}
 		} else if (const auto thumbnail = _documentMedia->thumbnail()) {
-			int32 rf(cIntRetinaFactor());
+			int32 rf(style::DevicePixelRatio());
 			p.drawPixmap(icon.topLeft(), thumbnail->pix(_docThumbw), QRect(_docThumbx * rf, _docThumby * rf, st::mediaviewFileIconSize * rf, st::mediaviewFileIconSize * rf));
 		}
 	}
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
index 8fa5f1d13..8e4e8e7c2 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
@@ -251,9 +251,9 @@ void Pip::RendererGL::createShadowTexture() {
 	const auto size = 2 * st::callShadow.topLeft.size()
 		+ QSize(st::roundRadiusLarge, st::roundRadiusLarge);
 	auto image = QImage(
-		size * cIntRetinaFactor(),
+		size * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	image.setDevicePixelRatio(cRetinaFactor());
+	image.setDevicePixelRatio(style::DevicePixelRatio());
 	image.fill(Qt::transparent);
 	{
 		auto p = QPainter(&image);
@@ -433,7 +433,7 @@ void Pip::RendererGL::paintTransformedContent(
 	_f->glActiveTexture(rgbaFrame ? GL_TEXTURE1 : GL_TEXTURE3);
 	_shadowImage.bind(*_f);
 
-	const auto globalFactor = cIntRetinaFactor();
+	const auto globalFactor = style::DevicePixelRatio();
 	const auto fadeAlpha = st::radialBg->c.alphaF() * geometry.fade;
 	const auto roundRect = transformRect(RoundingRect(geometry));
 	program->setUniformValue("roundRect", Uniform(roundRect));
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index a7eee4c19..69fc9f292 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -365,7 +365,8 @@ int32 Photo::resizeGetHeight(int32 width) {
 
 void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const PaintContext *context) {
 	const auto selected = (selection == FullSelection);
-	const auto widthChanged = _pix.width() != _width * cIntRetinaFactor();
+	const auto widthChanged = (_pix.width()
+		!= (_width * style::DevicePixelRatio()));
 	if (!_goodLoaded || widthChanged) {
 		ensureDataMediaCreated();
 		const auto good = !_spoiler
@@ -515,7 +516,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 	const auto radialOpacity = radial ? _radial->opacity() : 0.;
 
 	if ((blurred || thumbnail || good)
-		&& ((_pix.width() != _width * cIntRetinaFactor())
+		&& ((_pix.width() != _width * style::DevicePixelRatio())
 			|| (_pixBlurred && (thumbnail || good)))) {
 		auto img = good
 			? good->original()
@@ -1847,7 +1848,7 @@ void Link::validateThumbnail() {
 		delegate()->unregisterHeavyItem(this);
 	} else {
 		const auto size = QSize(st::linksPhotoSize, st::linksPhotoSize);
-		_thumbnail = QPixmap(size * cIntRetinaFactor());
+		_thumbnail = QPixmap(size * style::DevicePixelRatio());
 		_thumbnail.fill(Qt::transparent);
 		auto p = Painter(&_thumbnail);
 		const auto index = _letter.isEmpty()
@@ -2061,7 +2062,7 @@ void Gif::validateThumbnail(
 		bool good) {
 	if (!image || (_thumbGood && !good)) {
 		return;
-	} else if ((_thumb.size() == size * cIntRetinaFactor())
+	} else if ((_thumb.size() == size * style::DevicePixelRatio())
 		&& (_thumbGood || !good)) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index 9ca9bc668..d39b17737 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -294,15 +294,15 @@ QImage Form::prepareThumbnail(
 		Qt::KeepAspectRatio,
 		Qt::SmoothTransformation);
 	result = Images::Round(std::move(result), ImageRoundRadius::Large);
-	result.setDevicePixelRatio(cRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	return result;
 }
 
 QImage Form::prepareEmptyThumbnail() const {
 	auto result = QImage(
-		st::paymentsThumbnailSize * cIntRetinaFactor(),
+		st::paymentsThumbnailSize * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(cRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	result.fill(Qt::transparent);
 	return result;
 }
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index 5ec2ed4a0..48c0cdab0 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -267,7 +267,7 @@ void SetApplicationIcon(const QIcon &icon) {
 	NSImage *image = nil;
 	if (!icon.isNull()) {
 		auto pixmap = icon.pixmap(1024, 1024);
-		pixmap.setDevicePixelRatio(cRetinaFactor());
+		pixmap.setDevicePixelRatio(style::DevicePixelRatio());
 		image = Q2NSImage(pixmap.toImage());
 	}
 	[[NSApplication sharedApplication] setApplicationIconImage:image];
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
index 3c6bfd25e..477075719 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
@@ -57,7 +57,7 @@ inline bool IsRepliesPeer(PeerData *peer) {
 }
 
 QImage PrepareImage() {
-	const auto s = kCircleDiameter * cIntRetinaFactor();
+	const auto s = kCircleDiameter * style::DevicePixelRatio();
 	auto result = QImage(QSize(s, s), QImage::Format_ARGB32_Premultiplied);
 	result.fill(Qt::transparent);
 	return result;
@@ -102,15 +102,15 @@ QImage UnreadBadge(not_null<PeerData*> peer) {
 	unreadSt.sizeId = Ui::UnreadBadgeSize::TouchBar;
 	unreadSt.muted = state.unreadMuted;
 	// Use constant values to draw badge regardless of cConfigScale().
-	unreadSt.size = kUnreadBadgeSize * cRetinaFactor();
-	unreadSt.padding = 4 * cRetinaFactor();
+	unreadSt.size = kUnreadBadgeSize * float64(style::DevicePixelRatio());
+	unreadSt.padding = 4 * float64(style::DevicePixelRatio());
 	unreadSt.font = style::font(
-		9.5 * cRetinaFactor(),
+		9.5 * float64(style::DevicePixelRatio()),
 		unreadSt.font->flags(),
 		unreadSt.font->family());
 
 	auto result = QImage(
-		QSize(kCircleDiameter, kUnreadBadgeSize) * cIntRetinaFactor(),
+		QSize(kCircleDiameter, kUnreadBadgeSize) * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
 	result.fill(Qt::transparent);
 	Painter p(&result);
@@ -516,7 +516,7 @@ NSRect PeerRectByIndex(int index) {
 		Painter p(&userpic);
 
 		pin->peer->paintUserpic(p, pin->userpicView, 0, 0, userpic.width());
-		userpic.setDevicePixelRatio(cRetinaFactor());
+		userpic.setDevicePixelRatio(style::DevicePixelRatio());
 		pin->userpic = std::move(userpic);
 		const auto userpicIndex = pin->index + [self shift];
 		[self setNeedsDisplayInRect:PeerRectByIndex(userpicIndex)];
@@ -816,12 +816,14 @@ NSRect PeerRectByIndex(int index) {
 		const auto rectRight = NSMaxX(rect);
 		if (!pin->unreadBadge.isNull()) {
 			CGImageRef image = pin->unreadBadge.toCGImage();
-			const auto w = CGImageGetWidth(image) / cRetinaFactor();
+			const auto w = CGImageGetWidth(image)
+				/ float64(style::DevicePixelRatio());
 			const auto borderRect = CGRectMake(
 				rectRight - w,
 				0,
 				w,
-				CGImageGetHeight(image) / cRetinaFactor());
+				CGImageGetHeight(image)
+					/ float64(style::DevicePixelRatio()));
 			CGContextDrawImage(context, borderRect, image);
 			CGImageRelease(image);
 			return;
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 7ec68e337..ac97db92d 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
@@ -146,9 +146,9 @@ using Platform::Q2NSImage;
 
 NSImage *CreateNSImageFromEmoji(EmojiPtr emoji) {
 	auto image = QImage(
-		QSize(kIdealIconSize, kIdealIconSize) * cIntRetinaFactor(),
+		QSize(kIdealIconSize, kIdealIconSize) * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	image.setDevicePixelRatio(cRetinaFactor());
+	image.setDevicePixelRatio(style::DevicePixelRatio());
 	image.fill(Qt::black);
 	{
 		Painter paint(&image);
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.mm
index 5a7e8ed37..3f749a22b 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.mm
@@ -20,7 +20,7 @@ int WidthFromString(NSString *s) {
 
 NSImage *CreateNSImageFromStyleIcon(const style::icon &icon, int size) {
 	auto instance = icon.instance(QColor(255, 255, 255, 255), 100);
-	instance.setDevicePixelRatio(cRetinaFactor());
+	instance.setDevicePixelRatio(style::DevicePixelRatio());
 	NSImage *image = Platform::Q2NSImage(instance);
 	[image setSize:NSMakeSize(size, size)];
 	return image;
diff --git a/Telegram/SourceFiles/platform/mac/window_title_mac.mm b/Telegram/SourceFiles/platform/mac/window_title_mac.mm
index b18d8c287..946312280 100644
--- a/Telegram/SourceFiles/platform/mac/window_title_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/window_title_mac.mm
@@ -32,7 +32,7 @@ int PreviewTitleHeight() {
 
 QImage PreviewWindowSystemButton(QColor inner, QColor border) {
 	auto buttonSize = 12;
-	auto fullSize = buttonSize * cIntRetinaFactor();
+	auto fullSize = buttonSize * style::DevicePixelRatio();
 	auto result = QImage(fullSize, fullSize, QImage::Format_ARGB32_Premultiplied);
 	result.fill(Qt::transparent);
 	{
@@ -43,7 +43,7 @@ QImage PreviewWindowSystemButton(QColor inner, QColor border) {
 		p.setBrush(inner);
 		p.drawEllipse(QRectF(0.5, 0.5, fullSize - 1., fullSize - 1.));
 	}
-	result.setDevicePixelRatio(cRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	return result;
 }
 
@@ -93,17 +93,32 @@ void PreviewWindowTitle(Painter &p, const style::palette &palette, QRect body, i
 	auto maximizeBorder = isGraphite ? graphiteBorder : QColor(21, 164, 41);
 	auto close = PreviewWindowSystemButton(closeInner, closeBorder);
 	auto left = buttonSkip;
-	p.drawImage(titleRect.x() + left, titleRect.y() + (titleRect.height() - (close.height() / cIntRetinaFactor())) / 2, close);
-	left += (close.width() / cIntRetinaFactor()) + buttonSkip;
+	p.drawImage(
+		titleRect.x() + left,
+		titleRect.y()
+			+ (titleRect.height()
+				- (close.height() / style::DevicePixelRatio())) / 2,
+		close);
+	left += (close.width() / style::DevicePixelRatio()) + buttonSkip;
 	auto minimize = PreviewWindowSystemButton(minimizeInner, minimizeBorder);
-	p.drawImage(titleRect.x() + left, titleRect.y() + (titleRect.height() - (minimize.height() / cIntRetinaFactor())) / 2, minimize);
-	left += (minimize.width() / cIntRetinaFactor()) + buttonSkip;
+	p.drawImage(
+		titleRect.x() + left,
+		titleRect.y()
+			+ (titleRect.height()
+				- (minimize.height() / style::DevicePixelRatio())) / 2,
+		minimize);
+	left += (minimize.width() / style::DevicePixelRatio()) + buttonSkip;
 	auto maximize = PreviewWindowSystemButton(maximizeInner, maximizeBorder);
-	p.drawImage(titleRect.x() + left, titleRect.y() + (titleRect.height() - (maximize.height() / cIntRetinaFactor())) / 2, maximize);
+	p.drawImage(
+		titleRect.x() + left,
+		titleRect.y()
+			+ (titleRect.height()
+				- (maximize.height() / style::DevicePixelRatio())) / 2,
+		maximize);
 }
 
 void PreviewWindowFramePaint(QImage &preview, const style::palette &palette, QRect body, int outerWidth) {
-	auto retina = cIntRetinaFactor();
+	auto retina = style::DevicePixelRatio();
 	auto titleHeight = PreviewTitleHeight();
 	{
 		Painter p(&preview);
@@ -113,7 +128,7 @@ void PreviewWindowFramePaint(QImage &preview, const style::palette &palette, QRe
 
 	auto retinaRadius = st::macWindowRoundRadius * retina;
 	auto roundMask = QImage(2 * retinaRadius, 2 * retinaRadius, QImage::Format_ARGB32_Premultiplied);
-	roundMask.setDevicePixelRatio(cRetinaFactor());
+	roundMask.setDevicePixelRatio(style::DevicePixelRatio());
 	roundMask.fill(Qt::transparent);
 	{
 		Painter p(&roundMask);
@@ -135,7 +150,7 @@ void PreviewWindowFramePaint(QImage &preview, const style::palette &palette, QRe
 			inner.width() * retina,
 			inner.height() * retina),
 			corners);
-	rounded.setDevicePixelRatio(cRetinaFactor());
+	rounded.setDevicePixelRatio(style::DevicePixelRatio());
 	preview.fill(st::themePreviewBg->c);
 
 	auto topLeft = st::macWindowShadowTopLeft.instance(QColor(0, 0, 0), 100);
diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h
index c99ad9597..c0d6f1cbb 100644
--- a/Telegram/SourceFiles/settings.h
+++ b/Telegram/SourceFiles/settings.h
@@ -126,14 +126,6 @@ inline bool passcodeCanTry() {
 	return dt >= 30000;
 }
 
-inline float64 cRetinaFactor() {
-	return style::DevicePixelRatio();
-}
-
-inline int32 cIntRetinaFactor() {
-	return style::DevicePixelRatio();
-}
-
 inline int cEvalScale(int scale) {
 	return (scale == style::kScaleAuto) ? cScreenScale() : scale;
 }
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index d4f1e8b7e..d7c977df6 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -478,7 +478,7 @@ void BackgroundRow::paintEvent(QPaintEvent *e) {
 			const auto &pix = backThumb->pix(
 				st::settingsBackgroundThumb,
 				{ .options = Images::Option::Blur });
-			const auto factor = cIntRetinaFactor();
+			const auto factor = style::DevicePixelRatio();
 			p.drawPixmap(
 				0,
 				0,
@@ -585,7 +585,7 @@ void BackgroundRow::radialAnimationCallback(crl::time now) {
 
 void BackgroundRow::updateImage() {
 	const auto size = st::settingsBackgroundThumb;
-	const auto fullsize = size * cIntRetinaFactor();
+	const auto fullsize = size * style::DevicePixelRatio();
 
 	const auto &background = *Window::Theme::Background();
 	const auto &paper = background.paper();
@@ -619,7 +619,7 @@ void BackgroundRow::updateImage() {
 		auto result = QImage(
 			QSize{ fullsize, fullsize },
 			QImage::Format_ARGB32_Premultiplied);
-		result.setDevicePixelRatio(cRetinaFactor());
+		result.setDevicePixelRatio(style::DevicePixelRatio());
 		if (const auto color = background.colorForFill()) {
 			result.fill(*color);
 			return result;
@@ -644,7 +644,7 @@ void BackgroundRow::updateImage() {
 		: prepareNormal();
 	_background = Ui::PixmapFromImage(
 		Images::Round(std::move(back), ImageRoundRadius::Small));
-	_background.setDevicePixelRatio(cRetinaFactor());
+	_background.setDevicePixelRatio(style::DevicePixelRatio());
 
 	rtlupdate(radialRect());
 
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index ddfb849f8..fdfe37148 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -390,8 +390,10 @@ int NotificationsCount::resizeGetHeight(int newWidth) {
 void NotificationsCount::prepareNotificationSampleSmall() {
 	auto width = st::notificationSampleSize.width();
 	auto height = st::notificationSampleSize.height();
-	auto sampleImage = QImage(width * cIntRetinaFactor(), height * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
-	sampleImage.setDevicePixelRatio(cRetinaFactor());
+	auto sampleImage = QImage(
+		QSize(width, height) * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	sampleImage.setDevicePixelRatio(style::DevicePixelRatio());
 	sampleImage.fill(st::notificationBg->c);
 	{
 		Painter p(&sampleImage);
@@ -422,28 +424,29 @@ void NotificationsCount::prepareNotificationSampleSmall() {
 		p.fillRect(style::rtlrect(closeLeft, padding, padding, padding, width), st::notificationSampleCloseFg);
 	}
 	_notificationSampleSmall = Ui::PixmapFromImage(std::move(sampleImage));
-	_notificationSampleSmall.setDevicePixelRatio(cRetinaFactor());
+	_notificationSampleSmall.setDevicePixelRatio(style::DevicePixelRatio());
 }
 
 void NotificationsCount::prepareNotificationSampleUserpic() {
 	if (_notificationSampleUserpic.isNull()) {
 		_notificationSampleUserpic = Ui::PixmapFromImage(
 			Window::LogoNoMargin().scaled(
-				st::notifyPhotoSize * cIntRetinaFactor(),
-				st::notifyPhotoSize * cIntRetinaFactor(),
+				st::notifyPhotoSize * style::DevicePixelRatio(),
+				st::notifyPhotoSize * style::DevicePixelRatio(),
 				Qt::IgnoreAspectRatio,
 				Qt::SmoothTransformation));
-		_notificationSampleUserpic.setDevicePixelRatio(cRetinaFactor());
+		_notificationSampleUserpic.setDevicePixelRatio(
+			style::DevicePixelRatio());
 	}
 }
 
 void NotificationsCount::prepareNotificationSampleLarge() {
 	int w = st::notifyWidth, h = st::notifyMinHeight;
 	auto sampleImage = QImage(
-		w * cIntRetinaFactor(),
-		h * cIntRetinaFactor(),
+		w * style::DevicePixelRatio(),
+		h * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	sampleImage.setDevicePixelRatio(cRetinaFactor());
+	sampleImage.setDevicePixelRatio(style::DevicePixelRatio());
 	sampleImage.fill(st::notificationBg->c);
 	{
 		Painter p(&sampleImage);
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index 17ebe996f..8b04450cf 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -306,10 +306,10 @@ void PrepareDetails(PreparedFile &file, int previewWidth, int sideLimit) {
 				video->thumbnail,
 				sideLimit);
 			file.preview = std::move(blurred).scaledToWidth(
-				previewWidth * cIntRetinaFactor(),
+				previewWidth * style::DevicePixelRatio(),
 				Qt::SmoothTransformation);
 			Assert(!file.preview.isNull());
-			file.preview.setDevicePixelRatio(cRetinaFactor());
+			file.preview.setDevicePixelRatio(style::DevicePixelRatio());
 			file.type = PreparedFile::Type::Video;
 		}
 	} else if (const auto song = std::get_if<Song>(&file.information->media)) {
@@ -335,14 +335,14 @@ void UpdateImageDetails(
 	const auto toWidth = std::min(
 		previewWidth,
 		style::ConvertScale(preview.width())
-	) * cIntRetinaFactor();
+	) * style::DevicePixelRatio();
 	auto scaled = preview.scaledToWidth(
 		toWidth,
 		Qt::SmoothTransformation);
 	if (scaled.isNull()) {
 		CrashReports::SetAnnotation("Info", QString("%1x%2:%3*%4->%5;%6x%7"
 		).arg(preview.width()).arg(preview.height()
-		).arg(previewWidth).arg(cIntRetinaFactor()
+		).arg(previewWidth).arg(style::DevicePixelRatio()
 		).arg(toWidth
 		).arg(scaled.width()).arg(scaled.height()));
 		Unexpected("Scaled is null.");
@@ -350,7 +350,7 @@ void UpdateImageDetails(
 	Assert(!scaled.isNull());
 	file.preview = Images::Opaque(std::move(scaled));
 	Assert(!file.preview.isNull());
-	file.preview.setDevicePixelRatio(cRetinaFactor());
+	file.preview.setDevicePixelRatio(style::DevicePixelRatio());
 }
 
 bool ApplyModifications(PreparedList &list) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
index eb06d363b..b686ee6fe 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
@@ -208,8 +208,8 @@ bool ItemSingleMediaPreview::tryPaintAnimation(QPainter &p) {
 		const auto paused = _gifPaused();
 
 		auto request = ::Media::Streaming::FrameRequest();
-		request.outer = s * cIntRetinaFactor();
-		request.resize = s * cIntRetinaFactor();
+		request.outer = s * style::DevicePixelRatio();
+		request.resize = s * style::DevicePixelRatio();
 		p.drawImage(
 			QRect(
 				previewLeft(),
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index c1d0965b8..1b86567b3 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -109,9 +109,9 @@ void CameraBox(
 
 template <typename Callback>
 QPixmap CreateSquarePixmap(int width, Callback &&paintCallback) {
-	auto size = QSize(width, width) * cIntRetinaFactor();
+	const auto size = QSize(width, width) * style::DevicePixelRatio();
 	auto image = QImage(size, QImage::Format_ARGB32_Premultiplied);
-	image.setDevicePixelRatio(cRetinaFactor());
+	image.setDevicePixelRatio(style::DevicePixelRatio());
 	image.fill(Qt::transparent);
 	{
 		Painter p(&image);
@@ -931,7 +931,7 @@ void UserpicButton::showCustom(QImage &&image) {
 	if (_userpicHasImage) {
 		auto size = QSize(_st.photoSize, _st.photoSize);
 		auto small = image.scaled(
-			size * cIntRetinaFactor(),
+			size * style::DevicePixelRatio(),
 			Qt::IgnoreAspectRatio,
 			Qt::SmoothTransformation);
 		_userpic = Ui::PixmapFromImage(useForumShape()
@@ -945,7 +945,7 @@ void UserpicButton::showCustom(QImage &&image) {
 			fillShape(p, _st.changeButton.textBg);
 		});
 	}
-	_userpic.setDevicePixelRatio(cRetinaFactor());
+	_userpic.setDevicePixelRatio(style::DevicePixelRatio());
 	_userpicUniqueKey = {};
 	_result = std::move(image);
 
diff --git a/Telegram/SourceFiles/ui/filter_icon_panel.cpp b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
index f0de41e3c..34299d15c 100644
--- a/Telegram/SourceFiles/ui/filter_icon_panel.cpp
+++ b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
@@ -377,7 +377,11 @@ void FilterIconPanel::startShowAnimation() {
 
 		_showAnimation = std::make_unique<Ui::PanelAnimation>(st::emojiPanAnimation, Ui::PanelAnimation::Origin::TopRight);
 		auto inner = rect().marginsRemoved(st::emojiPanMargins);
-		_showAnimation->setFinalImage(std::move(image), QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
+		_showAnimation->setFinalImage(
+			std::move(image),
+			QRect(
+				inner.topLeft() * style::DevicePixelRatio(),
+				inner.size() * style::DevicePixelRatio()));
 		_showAnimation->setCornerMasks(Images::CornersMask(ImageRoundRadius::Small));
 		_showAnimation->start();
 	}
@@ -395,9 +399,9 @@ QImage FilterIconPanel::grabForAnimation() {
 	Ui::SendPendingMoveResizeEvents(this);
 
 	auto result = QImage(
-		size() * cIntRetinaFactor(),
+		size() * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(cRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	result.fill(Qt::transparent);
 	if (_inner) {
 		QPainter p(&result);
diff --git a/Telegram/SourceFiles/ui/image/image.cpp b/Telegram/SourceFiles/ui/image/image.cpp
index 14cefdb5a..1ef41f67a 100644
--- a/Telegram/SourceFiles/ui/image/image.cpp
+++ b/Telegram/SourceFiles/ui/image/image.cpp
@@ -58,13 +58,13 @@ Image::Image(QImage &&data)
 
 not_null<Image*> Image::Empty() {
 	static auto result = Image([] {
-		const auto factor = cIntRetinaFactor();
+		const auto factor = style::DevicePixelRatio();
 		auto data = QImage(
 			factor,
 			factor,
 			QImage::Format_ARGB32_Premultiplied);
 		data.fill(Qt::transparent);
-		data.setDevicePixelRatio(cRetinaFactor());
+		data.setDevicePixelRatio(style::DevicePixelRatio());
 		return data;
 	}());
 	return &result;
@@ -72,13 +72,13 @@ not_null<Image*> Image::Empty() {
 
 not_null<Image*> Image::BlankMedia() {
 	static auto result = Image([] {
-		const auto factor = cIntRetinaFactor();
+		const auto factor = style::DevicePixelRatio();
 		auto data = QImage(
 			factor,
 			factor,
 			QImage::Format_ARGB32_Premultiplied);
 		data.fill(Qt::black);
-		data.setDevicePixelRatio(cRetinaFactor());
+		data.setDevicePixelRatio(style::DevicePixelRatio());
 		return data;
 	}());
 	return &result;
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index c1d484374..2ce56b113 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -715,8 +715,11 @@ void Notification::prepareActionsCache() {
 	auto replyRight = _replyPadding - st::notifyBorderWidth;
 	auto actionsCacheWidth = _reply->width() + replyRight + fadeWidth;
 	auto actionsCacheHeight = height() - actionsTop - st::notifyBorderWidth;
-	auto actionsCacheImg = QImage(QSize(actionsCacheWidth, actionsCacheHeight) * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
-	actionsCacheImg.setDevicePixelRatio(cRetinaFactor());
+	auto actionsCacheImg = QImage(
+		QSize(actionsCacheWidth, actionsCacheHeight)
+			* style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	actionsCacheImg.setDevicePixelRatio(style::DevicePixelRatio());
 	actionsCacheImg.fill(Qt::transparent);
 	{
 		Painter p(&actionsCacheImg);
@@ -858,8 +861,10 @@ void Notification::updateNotifyDisplay() {
 	_hideReplyButton = options.hideReplyButton;
 
 	int32 w = width(), h = height();
-	QImage img(w * cIntRetinaFactor(), h * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
-	img.setDevicePixelRatio(cRetinaFactor());
+	auto img = QImage(
+		size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	img.setDevicePixelRatio(style::DevicePixelRatio());
 	img.fill(st::notificationBg->c);
 
 	{
@@ -893,7 +898,8 @@ void Notification::updateNotifyDisplay() {
 		if (!options.hideNameAndPhoto) {
 			if (_fromScheduled) {
 				static const auto emoji = Ui::Emoji::Find(QString::fromUtf8("\xF0\x9F\x93\x85"));
-				const auto size = Ui::Emoji::GetSizeNormal() / cIntRetinaFactor();
+				const auto size = Ui::Emoji::GetSizeNormal()
+					/ style::DevicePixelRatio();
 				const auto top = rectForName.top() + (st::semiboldFont->height - size) / 2;
 				Ui::Emoji::Draw(p, emoji, Ui::Emoji::GetSizeNormal(), rectForName.left(), top);
 				rectForName.setLeft(rectForName.left() + size + st::semiboldFont->spacew);
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 4d7a48c7f..18f3f7d05 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -357,7 +357,7 @@ void SectionWidget::PaintBackground(
 	const auto paintCache = [&](const Ui::CachedBackground &cache) {
 		const auto to = QRect(
 			QPoint(cache.x, cache.y),
-			cache.pixmap.size() / cIntRetinaFactor());
+			cache.pixmap.size() / style::DevicePixelRatio());
 		if (cache.waitingForNegativePattern) {
 			// While we wait for pattern being loaded we paint just gradient.
 			// But in case of negative patter opacity we just fill-black.
@@ -416,8 +416,8 @@ void SectionWidget::PaintBackground(
 		const auto top = clip.top();
 		const auto right = clip.left() + clip.width();
 		const auto bottom = clip.top() + clip.height();
-		const auto w = tiled.width() / cRetinaFactor();
-		const auto h = tiled.height() / cRetinaFactor();
+		const auto w = tiled.width() / float64(style::DevicePixelRatio());
+		const auto h = tiled.height() / float64(style::DevicePixelRatio());
 		const auto sx = qFloor(left / w);
 		const auto sy = qFloor(top / h);
 		const auto cx = qCeil(right / w);
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 53b0c4b81..7409a95ee 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -450,7 +450,7 @@ bool InitializeFromSaved(Saved &&saved) {
 		image = std::move(image).convertToFormat(
 			QImage::Format_ARGB32_Premultiplied);
 	}
-	image.setDevicePixelRatio(cRetinaFactor());
+	image.setDevicePixelRatio(style::DevicePixelRatio());
 	if (Data::IsLegacy3DefaultWallPaper(paper)) {
 		return Images::DitherImage(std::move(image));
 	}
@@ -662,7 +662,7 @@ void ChatBackground::set(const Data::WallPaper &paper, QImage image) {
 	} else {
 		if (Data::IsLegacy1DefaultWallPaper(_paper)) {
 			image.load(u":/gui/art/bg_initial.jpg"_q);
-			const auto scale = cScale() * cIntRetinaFactor();
+			const auto scale = cScale() * style::DevicePixelRatio();
 			if (scale != 100) {
 				image = image.scaledToWidth(
 					style::ConvertScale(image.width(), scale),
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
index f101a38c4..d448ca185 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
@@ -156,9 +156,9 @@ int BackgroundSelector::resizeGetHeight(int newWidth) {
 void BackgroundSelector::updateThumbnail() {
 	const auto size = _thumbnailSize;
 	auto back = QImage(
-		QSize(size, size) * cIntRetinaFactor(),
+		QSize(size, size) * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	back.setDevicePixelRatio(cRetinaFactor());
+	back.setDevicePixelRatio(style::DevicePixelRatio());
 	{
 		Painter p(&back);
 		PainterHighQualityEnabler hq(p);
@@ -171,7 +171,7 @@ void BackgroundSelector::updateThumbnail() {
 	}
 	_thumbnail = Ui::PixmapFromImage(
 		Images::Round(std::move(back), ImageRoundRadius::Small));
-	_thumbnail.setDevicePixelRatio(cRetinaFactor());
+	_thumbnail.setDevicePixelRatio(style::DevicePixelRatio());
 	update();
 }
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index a77de2d7f..d486e81b3 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/empty_userpic.h"
 #include "ui/emoji_config.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/message_bubble.h"
@@ -413,9 +414,9 @@ QImage Generator::generate() {
 	prepare();
 
 	auto result = QImage(
-		_rect.size() * cIntRetinaFactor(),
+		_rect.size() * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(cRetinaFactor());
+	result.setDevicePixelRatio(style::DevicePixelRatio());
 	result.fill(st::themePreviewBg->c);
 
 	{
@@ -482,13 +483,17 @@ void Generator::paintHistoryBackground() {
 	}
 	background = std::move(background).convertToFormat(
 		QImage::Format_ARGB32_Premultiplied);
-	background.setDevicePixelRatio(cRetinaFactor());
+	background.setDevicePixelRatio(style::DevicePixelRatio());
 	_p->setClipRect(_history);
 	if (tiled) {
 		auto width = background.width();
 		auto height = background.height();
-		auto repeatTimesX = qCeil(_history.width() * cIntRetinaFactor() / float64(width));
-		auto repeatTimesY = qCeil((_history.height() - fromy) * cIntRetinaFactor() / float64(height));
+		auto repeatTimesX = qCeil(_history.width()
+			* style::DevicePixelRatio()
+			/ float64(width));
+		auto repeatTimesY = qCeil((_history.height() - fromy)
+			* style::DevicePixelRatio()
+			/ float64(height));
 		auto imageForTiled = QImage(
 			width * repeatTimesX,
 			height * repeatTimesY,
@@ -993,8 +998,12 @@ void Generator::paintBubble(const Bubble &bubble) {
 	_historyBottom = y - (bubble.attachToTop ? st::msgMarginTopAttached : st::msgMargin.top());
 
 	if (isPhoto) {
-		auto image = bubble.photo.scaled(bubble.photoWidth * cIntRetinaFactor(), bubble.photoHeight * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-		image.setDevicePixelRatio(cRetinaFactor());
+		auto image = bubble.photo.scaled(
+			QSize(bubble.photoWidth, bubble.photoHeight)
+				* style::DevicePixelRatio(),
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+		image.setDevicePixelRatio(style::DevicePixelRatio());
 		_p->drawImage(x, y - bubble.photoHeight, image);
 		_historyBottom -= bubble.photoHeight;
 	}
@@ -1025,7 +1034,7 @@ void Generator::paintUserpic(int x, int y, Row::Type type, int index, QString le
 	auto image = QImage(
 		QSize(size, size) * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
-	image.setDevicePixelRatio(cRetinaFactor());
+	image.setDevicePixelRatio(style::DevicePixelRatio());
 	image.fill(Qt::transparent);
 	{
 		Painter p(&image);
@@ -1139,8 +1148,10 @@ void DefaultPreviewWindowTitle(Painter &p, const style::palette &palette, QRect
 }
 
 void DefaultPreviewWindowFramePaint(QImage &preview, const style::palette &palette, QRect body, int outerWidth) {
-	auto mask = QImage(st::windowShadow.size() * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
-	mask.setDevicePixelRatio(cRetinaFactor());
+	auto mask = QImage(
+		st::windowShadow.size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	mask.setDevicePixelRatio(style::DevicePixelRatio());
 	{
 		Painter p(&mask);
 		p.setCompositionMode(QPainter::CompositionMode_Source);
@@ -1156,18 +1167,20 @@ void DefaultPreviewWindowFramePaint(QImage &preview, const style::palette &palet
 		currentInt = *lastLineInts;
 		++maxSize;
 	}
-	if (maxSize % cIntRetinaFactor()) {
-		maxSize -= (maxSize % cIntRetinaFactor());
+	if (maxSize % style::DevicePixelRatio()) {
+		maxSize -= (maxSize % style::DevicePixelRatio());
 	}
-	auto size = maxSize / cIntRetinaFactor();
+	auto size = maxSize / style::DevicePixelRatio();
 	auto bottom = size;
 	auto left = size - st::windowShadowShift;
 	auto right = left;
 	auto top = size - 2 * st::windowShadowShift;
 
 	auto sprite = st::windowShadow[palette];
-	auto topLeft = QImage(sprite.size() * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
-	topLeft.setDevicePixelRatio(cRetinaFactor());
+	auto topLeft = QImage(
+		sprite.size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	topLeft.setDevicePixelRatio(style::DevicePixelRatio());
 	{
 		Painter p(&topLeft);
 		p.setCompositionMode(QPainter::CompositionMode_Source);
@@ -1182,16 +1195,74 @@ void DefaultPreviewWindowFramePaint(QImage &preview, const style::palette &palet
 	Painter p(&preview);
 	DefaultPreviewWindowTitle(p, palette, body, outerWidth);
 
-	auto inner = QRect(body.x(), body.y() - st::defaultWindowTitle.height, body.width(), body.height() + st::defaultWindowTitle.height);
-	p.setClipRegion(QRegion(inner.marginsAdded(QMargins(size, size, size, size))) - inner);
+	auto inner = QRect(
+		body.x(),
+		body.y() - st::defaultWindowTitle.height,
+		body.width(),
+		body.height() + st::defaultWindowTitle.height);
+	p.setClipRegion(QRegion(inner + Margins(size)) - inner);
 	p.drawImage(inner.x() - left, inner.y() - top, topLeft);
-	p.drawImage(inner.x() + inner.width() + right - width, inner.y() - top, topRight);
-	p.drawImage(inner.x() + inner.width() + right - width, inner.y() + inner.height() + bottom - height, bottomRight);
-	p.drawImage(inner.x() - left, inner.y() + inner.height() + bottom - height, bottomLeft);
-	p.drawImage(QRect(inner.x() - left, inner.y() - top + height, left, top + inner.height() + bottom - 2 * height), topLeft, QRect(0, topLeft.height() - cIntRetinaFactor(), left * cIntRetinaFactor(), cIntRetinaFactor()));
-	p.drawImage(QRect(inner.x() - left + width, inner.y() - top, left + inner.width() + right - 2 * width, top), topLeft, QRect(topLeft.width() - cIntRetinaFactor(), 0, cIntRetinaFactor(), top * cIntRetinaFactor()));
-	p.drawImage(QRect(inner.x() + inner.width(), inner.y() - top + height, right, top + inner.height() + bottom - 2 * height), topRight, QRect(topRight.width() - right * cIntRetinaFactor(), topRight.height() - cIntRetinaFactor(), right * cIntRetinaFactor(), cIntRetinaFactor()));
-	p.drawImage(QRect(inner.x() - left + width, inner.y() + inner.height(), left + inner.width() + right - 2 * width, bottom), bottomRight, QRect(0, bottomRight.height() - bottom * cIntRetinaFactor(), cIntRetinaFactor(), bottom * cIntRetinaFactor()));
+	p.drawImage(
+		inner.x() + inner.width() + right - width,
+		inner.y() - top,
+		topRight);
+	p.drawImage(
+		inner.x() + inner.width() + right - width,
+		inner.y() + inner.height() + bottom - height,
+		bottomRight);
+	p.drawImage(
+		inner.x() - left,
+		inner.y() + inner.height() + bottom - height,
+		bottomLeft);
+	p.drawImage(
+		QRect(
+			inner.x() - left,
+			inner.y() - top + height,
+			left,
+			top + inner.height() + bottom - 2 * height),
+		topLeft,
+		QRect(
+			0,
+			topLeft.height() - style::DevicePixelRatio(),
+			left * style::DevicePixelRatio(),
+			style::DevicePixelRatio()));
+	p.drawImage(
+		QRect(
+			inner.x() - left + width,
+			inner.y() - top,
+			left + inner.width() + right - 2 * width,
+			top),
+		topLeft,
+		QRect(
+			topLeft.width() - style::DevicePixelRatio(),
+			0,
+			style::DevicePixelRatio(),
+			top * style::DevicePixelRatio()));
+	p.drawImage(
+		QRect(
+			inner.x() + inner.width(),
+			inner.y() - top + height,
+			right,
+			top + inner.height() + bottom - 2 * height),
+		topRight,
+		QRect(
+			topRight.width() - right * style::DevicePixelRatio(),
+			topRight.height() - style::DevicePixelRatio(),
+			right * style::DevicePixelRatio(),
+			style::DevicePixelRatio()));
+	p.drawImage(
+		QRect(
+			inner.x() - left + width,
+			inner.y() + inner.height(),
+			left + inner.width() + right - 2 * width,
+			bottom),
+		bottomRight,
+		QRect(
+			0,
+			bottomRight.height() - bottom * style::DevicePixelRatio(),
+			style::DevicePixelRatio(),
+			bottom * style::DevicePixelRatio()));
+
 }
 
 } // namespace Theme
diff --git a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
index 4001edae4..0971a1aef 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
+++ b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
@@ -54,7 +54,7 @@ constexpr auto kShowPerRow = 4;
 		return source;
 	}
 	const auto from = source.size();
-	const auto to = st::settingsThemePreviewSize * cIntRetinaFactor();
+	const auto to = st::settingsThemePreviewSize * style::DevicePixelRatio();
 	if (to.width() * from.height() > to.height() * from.width()) {
 		const auto small = (from.width() > to.width())
 			? source.scaledToWidth(to.width(), Qt::SmoothTransformation)
@@ -130,7 +130,7 @@ CloudListColors ColorsFromScheme(const EmbeddedScheme &scheme) {
 	result.radiobuttonActive = scheme.radiobuttonActive;
 	result.radiobuttonInactive = scheme.radiobuttonInactive;
 	result.background = QImage(
-		QSize(1, 1) * cIntRetinaFactor(),
+		QSize(1, 1) * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
 	result.background.fill(scheme.background);
 	return result;
@@ -160,7 +160,8 @@ CloudListCheck::CloudListCheck(bool checked)
 void CloudListCheck::setColors(const Colors &colors) {
 	_colors = colors;
 	if (!_colors->background.isNull()) {
-		const auto size = st::settingsThemePreviewSize * cIntRetinaFactor();
+		const auto size = st::settingsThemePreviewSize
+			* style::DevicePixelRatio();
 		_backgroundFull = (_colors->background.size() == size)
 			? _colors->background
 			: _colors->background.scaled(
@@ -183,8 +184,8 @@ void CloudListCheck::ensureContrast() {
 		- radio.height()
 		- st::settingsThemeRadioBottom;
 	const auto under = QRect(
-		QPoint(x, y) * cIntRetinaFactor(),
-		radio * cIntRetinaFactor());
+		QPoint(x, y) * style::DevicePixelRatio(),
+		radio * style::DevicePixelRatio());
 	const auto image = _backgroundFull.copy(under).convertToFormat(
 		QImage::Format_ARGB32_Premultiplied);
 	const auto active = style::internal::EnsureContrast(
@@ -207,7 +208,7 @@ void CloudListCheck::validateBackgroundCache(int width) {
 		return;
 	}
 	_backgroundCacheWidth = width;
-	const auto imageWidth = width * cIntRetinaFactor();
+	const auto imageWidth = width * style::DevicePixelRatio();
 	_backgroundCache = (width == st::settingsThemePreviewSize.width())
 		? _backgroundFull
 		: _backgroundFull.copy(
@@ -218,7 +219,7 @@ void CloudListCheck::validateBackgroundCache(int width) {
 	_backgroundCache = Images::Round(
 		std::move(_backgroundCache),
 		ImageRoundRadius::Large);
-	_backgroundCache.setDevicePixelRatio(cRetinaFactor());
+	_backgroundCache.setDevicePixelRatio(style::DevicePixelRatio());
 }
 
 void CloudListCheck::paint(QPainter &p, int left, int top, int outerWidth) {
diff --git a/Telegram/SourceFiles/window/window_connecting_widget.cpp b/Telegram/SourceFiles/window/window_connecting_widget.cpp
index 7a757df68..a7b1f3a1f 100644
--- a/Telegram/SourceFiles/window/window_connecting_widget.cpp
+++ b/Telegram/SourceFiles/window/window_connecting_widget.cpp
@@ -155,9 +155,9 @@ ConnectionState::Widget::ProxyIcon::ProxyIcon(QWidget *parent) : RpWidget(parent
 void ConnectionState::Widget::ProxyIcon::refreshCacheImages() {
 	const auto prepareCache = [&](const style::icon &icon) {
 		auto image = QImage(
-			size() * cIntRetinaFactor(),
+			size() * style::DevicePixelRatio(),
 			QImage::Format_ARGB32_Premultiplied);
-		image.setDevicePixelRatio(cRetinaFactor());
+		image.setDevicePixelRatio(style::DevicePixelRatio());
 		image.fill(st::windowBg->c);
 		{
 			auto p = QPainter(&image);
diff --git a/Telegram/SourceFiles/window/window_media_preview.cpp b/Telegram/SourceFiles/window/window_media_preview.cpp
index be931148b..3aa79501d 100644
--- a/Telegram/SourceFiles/window/window_media_preview.cpp
+++ b/Telegram/SourceFiles/window/window_media_preview.cpp
@@ -40,7 +40,7 @@ MediaPreviewWidget::MediaPreviewWidget(
 	not_null<Window::SessionController*> controller)
 : RpWidget(parent)
 , _controller(controller)
-, _emojiSize(Ui::Emoji::GetSizeLarge() / cIntRetinaFactor()) {
+, _emojiSize(Ui::Emoji::GetSizeLarge() / style::DevicePixelRatio()) {
 	setAttribute(Qt::WA_TransparentForMouseEvents);
 	_controller->session().downloaderTaskFinished(
 	) | rpl::start_with_next([=] {
@@ -72,7 +72,7 @@ void MediaPreviewWidget::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
 	const auto r = e->rect();
-	const auto factor = cIntRetinaFactor();
+	const auto factor = style::DevicePixelRatio();
 	const auto dimensions = currentDimensions();
 	const auto frame = (_lottie && _lottie->ready())
 		? _lottie->frameInfo({
@@ -266,7 +266,7 @@ QSize MediaPreviewWidget::currentDimensions() const {
 		return _cachedSize;
 	}
 	if (!_document && !_photo) {
-		_cachedSize = QSize(_cache.width() / cIntRetinaFactor(), _cache.height() / cIntRetinaFactor());
+		_cachedSize = _cache.size() * style::DevicePixelRatio();
 		return _cachedSize;
 	}
 
@@ -325,7 +325,7 @@ void MediaPreviewWidget::createLottieIfReady(
 void MediaPreviewWidget::setupLottie() {
 	Expects(_document != nullptr);
 
-	const auto factor = cIntRetinaFactor();
+	const auto factor = style::DevicePixelRatio();
 	if (_document->isPremiumSticker()) {
 		const auto size = HistoryView::Sticker::Size(_document);
 		_cachedSize = size;

From fa02e521f96aec5027263b51fd2bd9b0932020e8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 06:56:50 +0300
Subject: [PATCH 065/596] Added ability to view all of user's own channels.

---
 .../SourceFiles/window/window_main_menu.cpp   | 112 +++++++++++++++++-
 1 file changed, 109 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index e4f941d9e..f15aeb484 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -57,6 +57,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_changes.h"
+#include "data/data_channel.h"
 #include "data/data_stories.h"
 #include "mainwidget.h"
 #include "styles/style_chat.h" // popupMenuExpandedSeparator
@@ -108,6 +109,109 @@ public:
 
 };
 
+not_null<Ui::SettingsButton*> AddMyChannelsBox(
+		not_null<Ui::SettingsButton*> button,
+		not_null<SessionController*> controller) {
+	button->setAcceptBoth(true);
+
+	const auto myChannelsBox = [=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_notification_channels());
+
+		const auto st = box->lifetime().make_state<style::UserpicButton>(
+			st::defaultUserpicButton);
+		st->photoSize = st::defaultPeerListItem.photoSize;
+		st->size = QSize(st->photoSize, st->photoSize);
+
+		class Button final : public Ui::SettingsButton {
+		public:
+			using Ui::SettingsButton::SettingsButton;
+
+			void setPeer(not_null<ChannelData*> c) {
+				_text.setText(st::defaultPeerListItem.nameStyle, c->name());
+				_status.setText(
+					st::defaultTextStyle,
+					!c->username().isEmpty()
+						? ('@' + c->username())
+						: tr::lng_chat_status_subscribers(
+							tr::now,
+							lt_count,
+							c->membersCount()));
+			}
+
+			int resizeGetHeight(int) override {
+				return st::defaultPeerListItem.height;
+			}
+
+			void paintEvent(QPaintEvent *e) override {
+				Ui::SettingsButton::paintEvent(e);
+				auto p = Painter(this);
+				const auto &st = st::defaultPeerListItem;
+				const auto availableWidth = width()
+					- st::boxRowPadding.right()
+					- st.namePosition.x();
+				p.setPen(st.nameFg);
+				auto context = Ui::Text::PaintContext{
+					.position = st.namePosition,
+					.outerWidth = availableWidth,
+					.availableWidth = availableWidth,
+					.elisionLines = 1,
+				};
+				_text.draw(p, context);
+				p.setPen(st.statusFg);
+				context.position = st.statusPosition;
+				_status.draw(p, context);
+			}
+
+		private:
+			Ui::Text::String _text;
+			Ui::Text::String _status;
+
+		};
+
+		controller->session().data().enumerateBroadcasts([&](
+				not_null<ChannelData*> channel) {
+			if (!channel->amCreator()) {
+				return;
+			}
+
+			const auto row = box->addRow(
+				object_ptr<Button>(box, rpl::single(QString())),
+				{});
+			row->setPeer(channel);
+			row->setClickedCallback([=] {
+				controller->showPeerHistory(channel);
+			});
+			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+				row,
+				channel,
+				*st);
+			userpic->move(st::defaultPeerListItem.photoPosition);
+			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		});
+	};
+
+	using Menu = base::unique_qptr<Ui::PopupMenu>;
+	const auto menu = button->lifetime().make_state<Menu>();
+	button->addClickHandler([=](Qt::MouseButton which) {
+		if ((which != Qt::RightButton)
+			|| !((button->clickModifiers() & Qt::ShiftModifier)
+				&& (button->clickModifiers() & Qt::AltModifier))) {
+			return;
+		}
+
+		(*menu) = base::make_unique_q<Ui::PopupMenu>(
+			button,
+			st::defaultPopupMenu);
+		(*menu)->addAction(
+			u"My Channels"_q,
+			[=] { controller->uiShow()->showBox(Box(myChannelsBox)); },
+			nullptr);
+		(*menu)->popup(QCursor::pos());
+	});
+
+	return button;
+}
+
 [[nodiscard]] bool CanCheckSpecialEvent() {
 	static const auto result = [] {
 		const auto now = QDate::currentDate();
@@ -859,11 +963,13 @@ void MainMenu::setupMenu() {
 		)->setClickedCallback([=] {
 			controller->showNewGroup();
 		});
-		addAction(
+		AddMyChannelsBox(addAction(
 			tr::lng_create_channel_title(),
 			{ &st::menuIconChannel }
-		)->setClickedCallback([=] {
-			controller->showNewChannel();
+		), controller)->addClickHandler([=](Qt::MouseButton which) {
+			if (which == Qt::LeftButton) {
+				controller->showNewChannel();
+			}
 		});
 
 		const auto wrap = _menu->add(

From 9d0457d208daa7cdb4f776e0341b533282446675 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 20 Mar 2024 16:59:10 +0400
Subject: [PATCH 066/596] Add "Terms of Use" menu item to all miniapps.

---
 Telegram/Resources/langs/lang.strings                      | 1 +
 Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index b70b8eacb..6b501c4db 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2883,6 +2883,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_remove_from_side_menu_done" = "Bot removed from the main menu.";
 "lng_bot_settings" = "Settings";
 "lng_bot_open" = "Open Bot";
+"lng_bot_terms" = "Terms of Use";
 "lng_bot_reload_page" = "Reload Page";
 "lng_bot_add_to_menu" = "{bot} asks your permission to be added as an option to your attachments menu so you can access it from any chat.";
 "lng_bot_add_to_menu_done" = "Bot added to the menu.";
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index a84890032..42eac21de 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -525,6 +525,9 @@ bool Panel::showWebview(
 				_webview->window.navigate(url);
 			}
 		}, &st::menuIconRestore);
+		callback(tr::lng_bot_terms(tr::now), [=] {
+			File::OpenUrl(tr::lng_mini_apps_tos_url(tr::now));
+		}, &st::menuIconGroupLog);
 		const auto main = (_menuButtons & MenuButton::RemoveFromMainMenu);
 		if (main || (_menuButtons & MenuButton::RemoveFromMenu)) {
 			const auto handler = [=] {

From b8ce79467fa8786f1ea97765a842868af3ec454f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Mar 2024 11:11:54 +0400
Subject: [PATCH 067/596] Fix crash on "History cleared" delete in Saved
 Messages.

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

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 43bebb226..bfa68bed5 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1698,6 +1698,7 @@ void HistoryItem::setStoryFields(not_null<Data::Story*> story) {
 }
 
 void HistoryItem::applyEdition(const MTPDmessageService &message) {
+	const auto wasSublist = savedSublist();
 	if (message.vaction().type() == mtpc_messageActionHistoryClear) {
 		const auto wasGrouped = history()->owner().groups().isGrouped(this);
 		setReplyMarkup({});
@@ -1729,6 +1730,11 @@ void HistoryItem::applyEdition(const MTPDmessageService &message) {
 		finishEdition(-1);
 		_flags &= ~MessageFlag::DisplayFromChecked;
 	}
+	const auto nowSublist = savedSublist();
+	if (wasSublist && nowSublist != wasSublist) {
+		wasSublist->removeOne(this);
+		nowSublist->applyMaybeLast(this);
+	}
 }
 
 void HistoryItem::applyEdition(const MTPMessageExtendedMedia &media) {
@@ -3097,6 +3103,13 @@ bool HistoryItem::isEmpty() const {
 Data::SavedSublist *HistoryItem::savedSublist() const {
 	if (const auto saved = Get<HistoryMessageSaved>()) {
 		return saved->sublist;
+	} else if (_history->peer->isSelf()) {
+		const auto sublist = _history->owner().savedMessages().sublist(
+			_history->peer);
+		const auto that = const_cast<HistoryItem*>(this);
+		that->AddComponents(HistoryMessageSaved::Bit());
+		that->Get<HistoryMessageSaved>()->sublist = sublist;
+		return sublist;
 	}
 	return nullptr;
 }

From d9ed3a7d3f4a6407027d4e95046a4f12a9646594 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Mar 2024 12:46:03 +0400
Subject: [PATCH 068/596] Remove for-development-only save document action.

Regression was introduced in 205479fccc.
---
 .../SourceFiles/history/history_inner_widget.cpp    | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index c5f201f51..5a8f09ffd 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/history_inner_widget.h"
 
-#include "chat_helpers/stickers_emoji_pack.h"
 #include "core/file_utilities.h"
 #include "core/click_handler_types.h"
 #include "history/history_item_helpers.h"
@@ -33,7 +32,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/message_sending_animation_controller.h"
 #include "ui/effects/reaction_fly_animation.h"
 #include "ui/text/text_options.h"
-#include "ui/text/text_isolated_emoji.h"
 #include "ui/boxes/report_box.h"
 #include "ui/layers/generic_box.h"
 #include "ui/controls/delete_message_context_action.h"
@@ -2251,17 +2249,6 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 	};
 
-	if (const auto item = _dragStateItem) {
-		const auto emojiStickers = &session->emojiStickersPack();
-		if (const auto view = item->mainView()) {
-			if (const auto isolated = view->isolatedEmoji()) {
-				if (const auto sticker = emojiStickers->stickerForEmoji(isolated)) {
-					addDocumentActions(sticker.document, item);
-				}
-			}
-		}
-	}
-
 	const auto asGroup = !Element::Moused()
 		|| (Element::Moused() != Element::Hovered())
 		|| (Element::Moused()->pointState(

From fd833dff350a988d75a9bf43f0a8ce3f6cb61a46 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 23 Mar 2024 12:42:22 +0400
Subject: [PATCH 069/596] Save IV window geometry.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/SourceFiles/core/application.cpp     |  23 +++-
 Telegram/SourceFiles/core/application.h       |   3 +
 Telegram/SourceFiles/core/core_settings.cpp   |  15 ++-
 Telegram/SourceFiles/core/core_settings.h     |   8 ++
 .../view/media/history_view_web_page.cpp      |   2 +-
 Telegram/SourceFiles/iv/iv_controller.cpp     |  15 ++-
 Telegram/SourceFiles/iv/iv_controller.h       |   7 +-
 Telegram/SourceFiles/iv/iv_delegate.h         |  19 +++
 Telegram/SourceFiles/iv/iv_delegate_impl.cpp  | 120 ++++++++++++++++++
 Telegram/SourceFiles/iv/iv_delegate_impl.h    |  27 ++++
 Telegram/SourceFiles/iv/iv_instance.cpp       |  23 +++-
 Telegram/SourceFiles/iv/iv_instance.h         |  14 +-
 Telegram/SourceFiles/window/window.style      |   5 +
 Telegram/cmake/td_iv.cmake                    |   1 +
 15 files changed, 271 insertions(+), 13 deletions(-)
 create mode 100644 Telegram/SourceFiles/iv/iv_delegate.h
 create mode 100644 Telegram/SourceFiles/iv/iv_delegate_impl.cpp
 create mode 100644 Telegram/SourceFiles/iv/iv_delegate_impl.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 55c5cbf82..41489fffa 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -995,6 +995,8 @@ PRIVATE
     intro/intro_step.h
     intro/intro_widget.cpp
     intro/intro_widget.h
+    iv/iv_delegate_impl.cpp
+    iv/iv_delegate_impl.h
     iv/iv_instance.cpp
     iv/iv_instance.h
     lang/lang_cloud_manager.cpp
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 06691b5c9..3f643b6dd 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -44,6 +44,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_updates.h"
 #include "calls/calls_instance.h"
 #include "countries/countries_manager.h"
+#include "iv/iv_delegate_impl.h"
 #include "iv/iv_instance.h"
 #include "lang/lang_file_parser.h"
 #include "lang/lang_translator.h"
@@ -163,7 +164,8 @@ Application::Application()
 , _domain(std::make_unique<Main::Domain>(cDataFile()))
 , _exportManager(std::make_unique<Export::Manager>())
 , _calls(std::make_unique<Calls::Instance>())
-, _iv(std::make_unique<Iv::Instance>())
+, _iv(std::make_unique<Iv::Instance>(
+	Ui::CreateChild<Iv::DelegateImpl>(this)))
 , _langpack(std::make_unique<Lang::Instance>())
 , _langCloudManager(std::make_unique<Lang::CloudManager>(langpack()))
 , _emojiKeywords(std::make_unique<ChatHelpers::EmojiKeywords>())
@@ -1368,6 +1370,25 @@ Window::Controller *Application::windowFor(
 	return activePrimaryWindow();
 }
 
+Window::Controller *Application::findWindow(
+		not_null<QWidget*> widget) const {
+	const auto window = widget->window();
+	if (_lastActiveWindow && _lastActiveWindow->widget() == window) {
+		return _lastActiveWindow;
+	}
+	for (const auto &[account, primary] : _primaryWindows) {
+		if (primary->widget() == window) {
+			return primary.get();
+		}
+	}
+	for (const auto &[history, secondary] : _secondaryWindows) {
+		if (secondary->widget() == window) {
+			return secondary.get();
+		}
+	}
+	return nullptr;
+}
+
 Window::Controller *Application::activeWindow() const {
 	return _lastActiveWindow;
 }
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index 123d1010a..08a29a35e 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -47,6 +47,7 @@ class Session;
 
 namespace Iv {
 class Instance;
+class DelegateImpl;
 } // namespace Iv
 
 namespace Ui {
@@ -165,6 +166,8 @@ public:
 	bool hasActiveWindow(not_null<Main::Session*> session) const;
 	[[nodiscard]] bool savingPositionFor(
 		not_null<Window::Controller*> window) const;
+	[[nodiscard]] Window::Controller *findWindow(
+		not_null<QWidget*> widget) const;
 	[[nodiscard]] Window::Controller *activeWindow() const;
 	[[nodiscard]] Window::Controller *activePrimaryWindow() const;
 	[[nodiscard]] Window::Controller *separateWindowForAccount(
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 787339246..b4f770876 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -134,6 +134,8 @@ QByteArray Settings::serialize() const {
 	LogPosition(_windowPosition, u"Window"_q);
 	const auto mediaViewPosition = Serialize(_mediaViewPosition);
 	LogPosition(_mediaViewPosition, u"Viewer"_q);
+	const auto ivPosition = Serialize(_ivPosition);
+	LogPosition(_ivPosition, u"IV"_q);
 	const auto proxy = _proxy.serialize();
 	const auto skipLanguages = _skipTranslationLanguages.current();
 
@@ -209,7 +211,8 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_playbackDeviceId.current())
 		+ Serialize::stringSize(_captureDeviceId.current())
 		+ Serialize::stringSize(_callPlaybackDeviceId.current())
-		+ Serialize::stringSize(_callCaptureDeviceId.current());
+		+ Serialize::stringSize(_callCaptureDeviceId.current())
+		+ Serialize::bytearraySize(ivPosition);
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -353,7 +356,8 @@ QByteArray Settings::serialize() const {
 			<< _playbackDeviceId.current()
 			<< _captureDeviceId.current()
 			<< _callPlaybackDeviceId.current()
-			<< _callCaptureDeviceId.current();
+			<< _callCaptureDeviceId.current()
+			<< ivPosition;
 	}
 
 	Ensures(result.size() == size);
@@ -469,6 +473,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	base::flat_set<QString> recentEmojiSkip;
 	qint32 trayIconMonochrome = (_trayIconMonochrome.current() ? 1 : 0);
 	qint32 ttlVoiceClickTooltipHidden = _ttlVoiceClickTooltipHidden.current() ? 1 : 0;
+	QByteArray ivPosition;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -747,6 +752,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 			? QString()
 			: legacyCallCaptureDeviceId;
 	}
+	if (!stream.atEnd()) {
+		stream >> ivPosition;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -945,6 +953,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_recentEmojiSkip = std::move(recentEmojiSkip);
 	_trayIconMonochrome = (trayIconMonochrome == 1);
 	_ttlVoiceClickTooltipHidden = (ttlVoiceClickTooltipHidden == 1);
+	if (!ivPosition.isEmpty()) {
+		_ivPosition = Deserialize(ivPosition);
+	}
 }
 
 QString Settings::getSoundPath(const QString &key) const {
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 82aa7c427..93e0727d7 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -863,6 +863,13 @@ public:
 		_ttlVoiceClickTooltipHidden = value;
 	}
 
+	[[nodiscard]] const WindowPosition &ivPosition() const {
+		return _ivPosition;
+	}
+	void setIvPosition(const WindowPosition &position) {
+		_ivPosition = position;
+	}
+
 	[[nodiscard]] static bool ThirdColumnByDefault();
 	[[nodiscard]] static float64 DefaultDialogsWidthRatio();
 
@@ -990,6 +997,7 @@ private:
 	std::optional<uint64> _macRoundIconDigest;
 	rpl::variable<bool> _storiesClickTooltipHidden = false;
 	rpl::variable<bool> _ttlVoiceClickTooltipHidden = false;
+	WindowPosition _ivPosition;
 
 	bool _tabbedReplacedWithInfo = false; // per-window
 	rpl::event_stream<bool> _tabbedReplacedWithInfoValue; // per-window
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 c50c9ddf7..2cf19510a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -127,7 +127,7 @@ constexpr auto kMaxOriginalEntryLines = 8192;
 		if (const auto controller = my.sessionWindow.get()) {
 			if (const auto iv = webpage->iv.get()) {
 				const auto hash = ExtractHash(webpage, text);
-				Core::App().iv().show(controller->uiShow(), iv, hash);
+				Core::App().iv().show(controller, iv, hash);
 				return;
 			} else {
 				HiddenUrlClickHandler::Open(webpage->url, context.other);
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 66eef977d..fcbab153a 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -194,8 +194,11 @@ namespace {
 
 } // namespace
 
-Controller::Controller(Fn<ShareBoxResult(ShareBoxDescriptor)> showShareBox)
-: _updateStyles([=] {
+Controller::Controller(
+	not_null<Delegate*> delegate,
+	Fn<ShareBoxResult(ShareBoxDescriptor)> showShareBox)
+: _delegate(delegate)
+, _updateStyles([=] {
 	const auto str = EscapeForScriptString(ComputeStyles());
 	if (_webview) {
 		_webview->eval("IV.updateStyles('" + str + "');");
@@ -359,9 +362,15 @@ void Controller::createWindow() {
 		updateTitleGeometry(width);
 	}, _subtitle->lifetime());
 
-	window->setGeometry({ 200, 200, 600, 800 });
+	window->setGeometry(_delegate->ivGeometry());
 	window->setMinimumSize({ st::windowMinWidth, st::windowMinHeight });
 
+	window->geometryValue(
+	) | rpl::distinct_until_changed(
+	) | rpl::skip(1) | rpl::start_with_next([=] {
+		_delegate->ivSaveGeometry(window);
+	}, window->lifetime());
+
 	_container = Ui::CreateChild<Ui::RpWidget>(window->window());
 	rpl::combine(
 		window->sizeValue(),
diff --git a/Telegram/SourceFiles/iv/iv_controller.h b/Telegram/SourceFiles/iv/iv_controller.h
index f8352f0d3..85132b12b 100644
--- a/Telegram/SourceFiles/iv/iv_controller.h
+++ b/Telegram/SourceFiles/iv/iv_controller.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/invoke_queued.h"
 #include "base/object_ptr.h"
 #include "base/unique_qptr.h"
+#include "iv/iv_delegate.h"
 #include "ui/effects/animations.h"
 #include "ui/text/text.h"
 
@@ -46,7 +47,9 @@ struct ShareBoxDescriptor {
 
 class Controller final {
 public:
-	explicit Controller(Fn<ShareBoxResult(ShareBoxDescriptor)> showShareBox);
+	Controller(
+		not_null<Delegate*> delegate,
+		Fn<ShareBoxResult(ShareBoxDescriptor)> showShareBox);
 	~Controller();
 
 	struct Event {
@@ -115,6 +118,8 @@ private:
 	void showShareMenu();
 	void destroyShareMenu();
 
+	const not_null<Delegate*> _delegate;
+
 	std::unique_ptr<Ui::RpWindow> _window;
 	std::unique_ptr<Ui::RpWidget> _subtitleWrap;
 	rpl::variable<QString> _subtitleText;
diff --git a/Telegram/SourceFiles/iv/iv_delegate.h b/Telegram/SourceFiles/iv/iv_delegate.h
new file mode 100644
index 000000000..fd94cac0a
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_delegate.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
+
+namespace Iv {
+
+class Delegate {
+public:
+	virtual void ivSetLastSourceWindow(not_null<QWidget*> window) = 0;
+	[[nodiscard]] virtual QRect ivGeometry() const = 0;
+	virtual void ivSaveGeometry(not_null<QWidget*> window) = 0;
+};
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_delegate_impl.cpp b/Telegram/SourceFiles/iv/iv_delegate_impl.cpp
new file mode 100644
index 000000000..5ac753d17
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_delegate_impl.cpp
@@ -0,0 +1,120 @@
+/*
+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 "iv/iv_delegate_impl.h"
+
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "mainwindow.h"
+#include "window/main_window.h"
+#include "window/window_controller.h"
+#include "styles/style_window.h"
+
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+#include <QtGui/QWindow>
+
+namespace Iv {
+namespace {
+
+[[nodiscard]] Core::WindowPosition DefaultPosition() {
+	auto center = qApp->primaryScreen()->geometry().center();
+	const auto moncrc = [&] {
+		if (const auto active = Core::App().activeWindow()) {
+			const auto widget = active->widget();
+			center = widget->geometry().center();
+			if (const auto screen = widget->screen()) {
+				return Platform::ScreenNameChecksum(screen->name());
+			}
+		}
+		return Core::App().settings().windowPosition().moncrc;
+	}();
+	return {
+		.moncrc = moncrc,
+		.scale = cScale(),
+		.x = (center.x() - st::ivWidthDefault / 2),
+		.y = (center.y() - st::ivHeightDefault / 2),
+		.w = st::ivWidthDefault,
+		.h = st::ivHeightDefault,
+	};
+}
+
+} // namespace
+
+void DelegateImpl::ivSetLastSourceWindow(not_null<QWidget*> window) {
+	_lastSourceWindow = window;
+}
+
+QRect DelegateImpl::ivGeometry() const {
+	const auto found = _lastSourceWindow
+		? Core::App().findWindow(_lastSourceWindow)
+		: nullptr;
+
+	const auto saved = Core::App().settings().ivPosition();
+	const auto adjusted = Core::AdjustToScale(saved, u"IV"_q);
+	const auto initial = DefaultPosition();
+	auto result = initial.rect();
+	if (const auto window = found ? found : Core::App().activeWindow()) {
+		result = window->widget()->countInitialGeometry(
+			adjusted,
+			initial,
+			{ st::ivWidthMin, st::ivHeightMin });
+	}
+	return result;
+}
+
+void DelegateImpl::ivSaveGeometry(not_null<QWidget*> window) {
+	if (!window->windowHandle()) {
+		return;
+	}
+	const auto state = window->windowHandle()->windowState();
+	if (state == Qt::WindowMinimized) {
+		return;
+	}
+	const auto &savedPosition = Core::App().settings().ivPosition();
+	auto realPosition = savedPosition;
+	if (state == Qt::WindowMaximized) {
+		realPosition.maximized = 1;
+		realPosition.moncrc = 0;
+		DEBUG_LOG(("IV Pos: Saving maximized position."));
+	} else {
+		auto r = window->geometry();
+		realPosition.x = r.x();
+		realPosition.y = r.y();
+		realPosition.w = r.width();
+		realPosition.h = r.height();
+		realPosition.scale = cScale();
+		realPosition.maximized = 0;
+		realPosition.moncrc = 0;
+		DEBUG_LOG(("IV Pos: "
+			"Saving non-maximized position: %1, %2, %3, %4"
+			).arg(realPosition.x
+			).arg(realPosition.y
+			).arg(realPosition.w
+			).arg(realPosition.h));
+	}
+	realPosition = Window::PositionWithScreen(
+		realPosition,
+		window,
+		{ st::ivWidthMin, st::ivHeightMin });
+	if (realPosition.w >= st::ivWidthMin
+		&& realPosition.h >= st::ivHeightMin
+		&& realPosition != savedPosition) {
+		DEBUG_LOG(("IV Pos: "
+			"Writing: %1, %2, %3, %4 (scale %5%, maximized %6)")
+			.arg(realPosition.x)
+			.arg(realPosition.y)
+			.arg(realPosition.w)
+			.arg(realPosition.h)
+			.arg(realPosition.scale)
+			.arg(Logs::b(realPosition.maximized)));
+		Core::App().settings().setIvPosition(realPosition);
+		Core::App().saveSettingsDelayed();
+	}
+}
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_delegate_impl.h b/Telegram/SourceFiles/iv/iv_delegate_impl.h
new file mode 100644
index 000000000..32b15ae8f
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_delegate_impl.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/iv_delegate.h"
+
+namespace Iv {
+
+class DelegateImpl final : public Delegate {
+public:
+	DelegateImpl() = default;
+
+	void ivSetLastSourceWindow(not_null<QWidget*> window) override;
+	[[nodiscard]] QRect ivGeometry() const override;
+	void ivSaveGeometry(not_null<QWidget*> window) override;
+
+private:
+	QPointer<QWidget> _lastSourceWindow;
+
+};
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 50545ed32..517415435 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -62,6 +62,7 @@ constexpr auto kKeepLoadingParts = 8;
 class Shown final : public base::has_weak_ptr {
 public:
 	Shown(
+		not_null<Delegate*> delegate,
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Data*> data,
 		QString hash);
@@ -143,6 +144,7 @@ private:
 		int64 total = 0);
 	void requestFail(Webview::DataRequest request);
 
+	const not_null<Delegate*> _delegate;
 	const not_null<Main::Session*> _session;
 	std::shared_ptr<Main::SessionShow> _show;
 	QString _id;
@@ -166,10 +168,12 @@ private:
 };
 
 Shown::Shown(
+	not_null<Delegate*> delegate,
 	std::shared_ptr<Main::SessionShow> show,
 	not_null<Data*> data,
 	QString hash)
-: _session(&show->session())
+: _delegate(delegate)
+, _session(&show->session())
 , _show(show) {
 	prepare(data, hash);
 }
@@ -398,7 +402,9 @@ void Shown::createController() {
 	const auto showShareBox = [=](ShareBoxDescriptor &&descriptor) {
 		return shareBox(std::move(descriptor));
 	};
-	_controller = std::make_unique<Controller>(std::move(showShareBox));
+	_controller = std::make_unique<Controller>(
+		_delegate,
+		std::move(showShareBox));
 
 	_controller->events(
 	) | rpl::start_to_stream(_events, _controller->lifetime());
@@ -795,10 +801,19 @@ void Shown::minimize() {
 	}
 }
 
-Instance::Instance() = default;
+Instance::Instance(not_null<Delegate*> delegate) : _delegate(delegate) {
+}
 
 Instance::~Instance() = default;
 
+void Instance::show(
+		not_null<Window::SessionController*> controller,
+		not_null<Data*> data,
+		QString hash) {
+	_delegate->ivSetLastSourceWindow(controller->widget());
+	show(controller->uiShow(), data, hash);
+}
+
 void Instance::show(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Data*> data,
@@ -813,7 +828,7 @@ void Instance::show(
 		_shown->moveTo(data, hash);
 		return;
 	}
-	_shown = std::make_unique<Shown>(show, data, hash);
+	_shown = std::make_unique<Shown>(_delegate, show, data, hash);
 	_shownSession = session;
 	_shown->events() | rpl::start_with_next([=](Controller::Event event) {
 		using Type = Controller::Event::Type;
diff --git a/Telegram/SourceFiles/iv/iv_instance.h b/Telegram/SourceFiles/iv/iv_instance.h
index 6e14527e6..ba3d8f72c 100644
--- a/Telegram/SourceFiles/iv/iv_instance.h
+++ b/Telegram/SourceFiles/iv/iv_instance.h
@@ -7,11 +7,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "iv/iv_delegate.h"
+
 namespace Main {
 class Session;
 class SessionShow;
 } // namespace Main
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Iv {
 
 class Data;
@@ -19,9 +25,13 @@ class Shown;
 
 class Instance final {
 public:
-	Instance();
+	explicit Instance(not_null<Delegate*> delegate);
 	~Instance();
 
+	void show(
+		not_null<Window::SessionController*> controller,
+		not_null<Data*> data,
+		QString hash);
 	void show(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Data*> data,
@@ -42,6 +52,8 @@ private:
 	void processJoinChannel(const QString &context);
 	void requestFull(not_null<Main::Session*> session, const QString &id);
 
+	const not_null<Delegate*> _delegate;
+
 	std::unique_ptr<Shown> _shown;
 	Main::Session *_shownSession = nullptr;
 	base::flat_set<not_null<Main::Session*>> _tracking;
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 8afc8d243..8b13c0a36 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -319,6 +319,11 @@ windowArchiveToast: Toast(defaultToast) {
 	maxWidth: boxWideWidth;
 }
 
+ivWidthMin: 380px;
+ivHeightMin: 480px;
+ivWidthDefault: 600px;
+ivHeightDefault: 800px;
+
 // Windows specific
 
 winQuitIcon: icon {{ "win_quit", windowFg }};
diff --git a/Telegram/cmake/td_iv.cmake b/Telegram/cmake/td_iv.cmake
index 1ef5a9604..602abf41c 100644
--- a/Telegram/cmake/td_iv.cmake
+++ b/Telegram/cmake/td_iv.cmake
@@ -15,6 +15,7 @@ PRIVATE
     iv/iv_controller.h
     iv/iv_data.cpp
     iv/iv_data.h
+    iv/iv_delegate.h
     iv/iv_pch.h
     iv/iv_prepare.cpp
     iv/iv_prepare.h

From b97d243978c1110a9a0b589021fc182674bdf3f5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 24 Mar 2024 09:58:50 +0400
Subject: [PATCH 070/596] Fix jump to hash with accents in IV.

---
 Telegram/Resources/iv_html/page.js        | 2 +-
 Telegram/SourceFiles/iv/iv_controller.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/iv_html/page.js b/Telegram/Resources/iv_html/page.js
index 26cab565c..0139f4c91 100644
--- a/Telegram/Resources/iv_html/page.js
+++ b/Telegram/Resources/iv_html/page.js
@@ -42,7 +42,7 @@ var IV = {
 		} else if (target.hash.length < 2) {
 			IV.jumpToHash('');
 		} else {
-			IV.jumpToHash(target.hash.substr(1));
+			IV.jumpToHash(decodeURIComponent(target.hash.substr(1)));
 		}
 		e.preventDefault();
 	},
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index fcbab153a..c62debebf 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/base_platform_info.h"
 #include "base/invoke_queued.h"
 #include "base/qt_signal_producer.h"
+#include "base/qthelp_url.h"
 #include "iv/iv_data.h"
 #include "lang/lang_keys.h"
 #include "ui/platform/ui_platform_window_title.h"
@@ -615,7 +616,7 @@ QByteArray Controller::navigateScript(int index, const QString &hash) {
 	return "IV.navigateTo("
 		+ QByteArray::number(index)
 		+ ", '"
-		+ EscapeForScriptString(hash.toUtf8())
+		+ EscapeForScriptString(qthelp::url_decode(hash).toUtf8())
 		+ "');";
 }
 

From d481008fdb59d98fe183dba49a036815ef954481 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 24 Mar 2024 10:19:20 +0400
Subject: [PATCH 071/596] Fix possible crash in ElasticScroll destructor.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 0999c7f70..fa8de8b19 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 0999c7f70eba183624077c411a7545769cec1016
+Subproject commit fa8de8b199ae8b7569f8dec1c054325eff27ce45

From ebe331a7e48845394d6b24b98001b3713050f454 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 24 Mar 2024 10:23:52 +0400
Subject: [PATCH 072/596] Fix build on Windows.

---
 .../SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
index c670c7d46..b5f0b20f9 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "styles/style_chat.h"
 
+#include <QtCore/QtMath>
+
 namespace Stickers {
 
 EmojiImageLoader::EmojiImageLoader(crl::weak_on_queue<EmojiImageLoader> weak)

From 58caec8d053efcb0d7224ab296bb17dc9ab8a04d Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org.ru>
Date: Sat, 23 Mar 2024 16:22:19 -0400
Subject: [PATCH 073/596] Fix build on FreeBSD

---
 Telegram/SourceFiles/platform/linux/integration_linux.cpp | 1 +
 Telegram/SourceFiles/platform/linux/specific_linux.cpp    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 47b6e63ef..b2a8cf611 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -26,6 +26,7 @@ namespace Platform {
 namespace {
 
 using namespace gi::repository;
+namespace GObject = gi::repository::GObject;
 
 std::vector<std::any> AnyVectorFromVariant(GLib::Variant value) {
 	std::vector<std::any> result;
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 8d662cdc4..b99100dce 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -52,6 +52,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace {
 
 using namespace gi::repository;
+namespace GObject = gi::repository::GObject;
 using namespace Platform;
 using Platform::internal::WaylandIntegration;
 

From 24498bc95fae09b78651263f8aeff71abf6eef78 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 00:03:31 +0300
Subject: [PATCH 074/596] Changed behavior to hide field buttons in
 HistoryWidget with typed text.

---
 .../field_characters_count_manager.cpp        | 36 ++++++++++++++++
 .../field_characters_count_manager.h          | 26 ++++++++++++
 .../SourceFiles/history/history_widget.cpp    | 42 ++++++++++++++-----
 Telegram/SourceFiles/history/history_widget.h |  4 ++
 Telegram/cmake/td_ui.cmake                    |  2 +
 5 files changed, 100 insertions(+), 10 deletions(-)
 create mode 100644 Telegram/SourceFiles/chat_helpers/field_characters_count_manager.cpp
 create mode 100644 Telegram/SourceFiles/chat_helpers/field_characters_count_manager.h

diff --git a/Telegram/SourceFiles/chat_helpers/field_characters_count_manager.cpp b/Telegram/SourceFiles/chat_helpers/field_characters_count_manager.cpp
new file mode 100644
index 000000000..87d1f61ab
--- /dev/null
+++ b/Telegram/SourceFiles/chat_helpers/field_characters_count_manager.cpp
@@ -0,0 +1,36 @@
+/*
+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 "chat_helpers/field_characters_count_manager.h"
+
+FieldCharsCountManager::FieldCharsCountManager() = default;
+
+void FieldCharsCountManager::setCount(int count) {
+	_previous = _current;
+	_current = count;
+	if (_previous != _current) {
+		constexpr auto kMax = 15;
+		const auto was = (_previous > kMax);
+		const auto now = (_current > kMax);
+		if (was != now) {
+			_isLimitExceeded = now;
+			_limitExceeds.fire({});
+		}
+	}
+}
+
+int FieldCharsCountManager::count() const {
+	return _current;
+}
+
+bool FieldCharsCountManager::isLimitExceeded() const {
+	return _isLimitExceeded;
+}
+
+rpl::producer<> FieldCharsCountManager::limitExceeds() const {
+	return _limitExceeds.events();
+}
diff --git a/Telegram/SourceFiles/chat_helpers/field_characters_count_manager.h b/Telegram/SourceFiles/chat_helpers/field_characters_count_manager.h
new file mode 100644
index 000000000..eba367818
--- /dev/null
+++ b/Telegram/SourceFiles/chat_helpers/field_characters_count_manager.h
@@ -0,0 +1,26 @@
+/*
+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 FieldCharsCountManager final {
+public:
+	FieldCharsCountManager();
+
+	void setCount(int count);
+	[[nodiscard]] int count() const;
+	[[nodiscard]] bool isLimitExceeded() const;
+	[[nodiscard]] rpl::producer<> limitExceeds() const;
+
+private:
+	int _current = 0;
+	int _previous = 0;
+	bool _isLimitExceeded = false;
+
+	rpl::event_stream<> _limitExceeds;
+
+};
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 1bc4ac21f..5ce512bf6 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -423,6 +423,22 @@ HistoryWidget::HistoryWidget(
 	});
 	InitMessageFieldFade(_field, st::historyComposeField.textBg);
 
+	_fieldCharsCountManager.limitExceeds(
+	) | rpl::start_with_next([=] {
+		const auto hide = _fieldCharsCountManager.isLimitExceeded();
+		if (_silent) {
+			_silent->setVisible(!hide);
+		}
+		if (_ttlInfo) {
+			_ttlInfo->setVisible(!hide);
+		}
+		if (_scheduled) {
+			_scheduled->setVisible(!hide);
+		}
+		updateFieldSize();
+		moveFieldControls();
+	}, lifetime());
+
 	_keyboard->sendCommandRequests(
 	) | rpl::start_with_next([=](Bot::SendCommandRequest r) {
 		sendBotCommand(r);
@@ -1673,7 +1689,7 @@ void HistoryWidget::fieldChanged() {
 		}
 	});
 
-	checkCharsLimitation();
+	checkCharsCount();
 
 	updateSendButtonType();
 	if (!HasSendText(_field)) {
@@ -1998,7 +2014,6 @@ bool HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	updateControlsVisibility();
 	updateControlsGeometry();
 	refreshTopBarActiveChat();
-	checkCharsLimitation();
 	if (_editMsgId) {
 		updateReplyEditTexts();
 		if (!_replyEditMsg) {
@@ -2388,6 +2403,7 @@ void HistoryWidget::showHistory(
 		if (!applyDraft()) {
 			clearFieldText();
 		}
+		checkCharsCount();
 		_send->finishAnimating();
 
 		updateControlsGeometry();
@@ -2813,6 +2829,7 @@ bool HistoryWidget::canWriteMessage() const {
 
 void HistoryWidget::updateControlsVisibility() {
 	auto fieldDisabledRemoved = (_fieldDisabled != nullptr);
+	const auto hideExtraButtons = _fieldCharsCountManager.isLimitExceeded();
 	const auto guard = gsl::finally([&] {
 		if (fieldDisabledRemoved) {
 			_fieldDisabled = nullptr;
@@ -2999,7 +3016,7 @@ void HistoryWidget::updateControlsVisibility() {
 			auto rightButtonsChanged = false;
 			if (_silent) {
 				const auto was = _silent->isVisible();
-				const auto now = (!_editMsgId);
+				const auto now = (!_editMsgId) && (!hideExtraButtons);
 				if (was != now) {
 					_silent->setVisible(now);
 					rightButtonsChanged = true;
@@ -3007,7 +3024,7 @@ void HistoryWidget::updateControlsVisibility() {
 			}
 			if (_scheduled) {
 				const auto was = _scheduled->isVisible();
-				const auto now = (!_editMsgId);
+				const auto now = (!_editMsgId) && (!hideExtraButtons);
 				if (was != now) {
 					_scheduled->setVisible(now);
 					rightButtonsChanged = true;
@@ -3015,7 +3032,7 @@ void HistoryWidget::updateControlsVisibility() {
 			}
 			if (_ttlInfo) {
 				const auto was = _ttlInfo->isVisible();
-				const auto now = (!_editMsgId);
+				const auto now = (!_editMsgId) && (!hideExtraButtons);
 				if (was != now) {
 					_ttlInfo->setVisible(now);
 					rightButtonsChanged = true;
@@ -3936,7 +3953,7 @@ void HistoryWidget::saveEditMsg() {
 		const auto maxCaptionSize = !hasMediaWithCaption
 			? MaxMessageSize
 			: Data::PremiumLimits(&session()).captionLengthCurrent();
-		const auto remove = Ui::FieldCharacterCount(_field) - maxCaptionSize;
+		const auto remove = _fieldCharsCountManager.count() - maxCaptionSize;
 		if (remove > 0) {
 			controller()->showToast(
 				tr::lng_edit_limit_reached(tr::now, lt_count, remove));
@@ -4826,7 +4843,7 @@ bool HistoryWidget::updateCmdStartShown() {
 	} else if (!_botMenu.button) {
 		buttonChanged = true;
 		_botMenu.text = bot->botInfo->botMenuButtonText;
-		_botMenu.small = (Ui::FieldCharacterCount(_field) > kSmallMenuAfter);
+		_botMenu.small = (_fieldCharsCountManager.count() > kSmallMenuAfter);
 		if (_botMenu.small) {
 			if (const auto e = FirstEmoji(_botMenu.text); !e.isEmpty()) {
 				_botMenu.text = e;
@@ -4863,7 +4880,7 @@ bool HistoryWidget::updateCmdStartShown() {
 			}
 		}, _botMenu.button->lifetime());
 	}
-	const auto textSmall = Ui::FieldCharacterCount(_field) > kSmallMenuAfter;
+	const auto textSmall = _fieldCharsCountManager.count() > kSmallMenuAfter;
 	const auto textChanged = _botMenu.button
 		&& ((_botMenu.text != bot->botInfo->botMenuButtonText)
 		|| (_botMenu.small != textSmall));
@@ -7378,6 +7395,11 @@ void HistoryWidget::showPremiumToast(not_null<DocumentData*> document) {
 	_stickerToast->showFor(document);
 }
 
+void HistoryWidget::checkCharsCount() {
+	_fieldCharsCountManager.setCount(Ui::FieldCharacterCount(_field));
+	checkCharsLimitation();
+}
+
 void HistoryWidget::checkCharsLimitation() {
 	if (!_history || !_editMsgId) {
 		_charsLimitation = nullptr;
@@ -7393,7 +7415,7 @@ void HistoryWidget::checkCharsLimitation() {
 	const auto maxCaptionSize = !hasMediaWithCaption
 		? MaxMessageSize
 		: Data::PremiumLimits(&session()).captionLengthCurrent();
-	const auto remove = Ui::FieldCharacterCount(_field) - maxCaptionSize;
+	const auto remove = _fieldCharsCountManager.count() - maxCaptionSize;
 	if (remove > 0) {
 		if (!_charsLimitation) {
 			_charsLimitation = base::make_unique_q<CharactersLimitLabel>(
@@ -7425,7 +7447,7 @@ void HistoryWidget::setFieldText(
 	_textUpdateEvents = TextUpdateEvent::SaveDraft
 		| TextUpdateEvent::SendTyping;
 
-	checkCharsLimitation();
+	checkCharsCount();
 
 	if (_preview) {
 		_preview->checkNow(false);
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index eafa19ac9..a61e74fff 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_view_top_toast.h"
 #include "history/history.h"
 #include "chat_helpers/field_autocomplete.h"
+#include "chat_helpers/field_characters_count_manager.h"
 #include "window/section_widget.h"
 #include "ui/widgets/fields/input_field.h"
 #include "mtproto/sender.h"
@@ -646,6 +647,7 @@ private:
 
 	void switchToSearch(QString query);
 
+	void checkCharsCount();
 	void checkCharsLimitation();
 
 	MTP::Sender _api;
@@ -785,6 +787,8 @@ private:
 	object_ptr<Ui::ScrollArea> _kbScroll;
 	const not_null<BotKeyboard*> _keyboard;
 
+	FieldCharsCountManager _fieldCharsCountManager;
+
 	std::unique_ptr<Ui::ChooseThemeController> _chooseTheme;
 
 	object_ptr<Ui::InnerDropdown> _membersDropdown = { nullptr };
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index eb1c7d79c..0e98ad7b8 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -63,6 +63,8 @@ PRIVATE
     calls/group/ui/desktop_capture_choose_source.cpp
     calls/group/ui/desktop_capture_choose_source.h
 
+    chat_helpers/field_characters_count_manager.cpp
+    chat_helpers/field_characters_count_manager.h
     chat_helpers/stickers_emoji_image_loader.cpp
     chat_helpers/stickers_emoji_image_loader.h
 

From 5509c1810b7fc2ebcda7bea5c5bc09492f683017 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 16:28:25 +0300
Subject: [PATCH 075/596] Added ability to set shortcut to open section with
 scheduled messages.

---
 Telegram/SourceFiles/core/shortcuts.cpp         | 1 +
 Telegram/SourceFiles/core/shortcuts.h           | 2 ++
 Telegram/SourceFiles/history/history_widget.cpp | 8 ++++++++
 3 files changed, 11 insertions(+)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 545c9b55a..04a251017 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -105,6 +105,7 @@ const auto CommandByName = base::flat_map<QString, Command>{
 	{ u"message_silently"_q              , Command::SendSilentMessage },
 	{ u"message_scheduled"_q             , Command::ScheduleMessage },
 	{ u"media_viewer_video_fullscreen"_q , Command::MediaViewerFullscreen },
+	{ u"show_scheduled"_q                , Command::ShowScheduled },
 	//
 };
 
diff --git a/Telegram/SourceFiles/core/shortcuts.h b/Telegram/SourceFiles/core/shortcuts.h
index b562517d5..0472c1be8 100644
--- a/Telegram/SourceFiles/core/shortcuts.h
+++ b/Telegram/SourceFiles/core/shortcuts.h
@@ -57,6 +57,8 @@ enum class Command {
 	FolderNext,
 	FolderPrevious,
 
+	ShowScheduled,
+
 	ShowArchive,
 	ShowContacts,
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 5ce512bf6..e24f131ee 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1915,6 +1915,14 @@ void HistoryWidget::setupShortcuts() {
 			controller()->searchInChat(_history);
 			return true;
 		});
+		_canSendMessages
+			&& request->check(Command::ShowScheduled, 1)
+			&& request->handle([=] {
+				using Scheduled = HistoryView::ScheduledMemento;
+				controller()->showSection(
+					std::make_shared<Scheduled>(_history));
+				return true;
+			});
 		if (session().supportMode()) {
 			request->check(
 				Command::SupportToggleMuted

From 00a89883fd39d41b07e7fb072cd079eb922d37ca Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 17:36:59 +0300
Subject: [PATCH 076/596] Added ability to set shortcut to archive chat from
 dialogs list.

---
 Telegram/SourceFiles/core/shortcuts.cpp        |  1 +
 Telegram/SourceFiles/core/shortcuts.h          |  1 +
 .../dialogs/dialogs_inner_widget.cpp           | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 04a251017..b47563311 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -106,6 +106,7 @@ const auto CommandByName = base::flat_map<QString, Command>{
 	{ u"message_scheduled"_q             , Command::ScheduleMessage },
 	{ u"media_viewer_video_fullscreen"_q , Command::MediaViewerFullscreen },
 	{ u"show_scheduled"_q                , Command::ShowScheduled },
+	{ u"archive_chat"_q                  , Command::ArchiveChat },
 	//
 };
 
diff --git a/Telegram/SourceFiles/core/shortcuts.h b/Telegram/SourceFiles/core/shortcuts.h
index 0472c1be8..562c54e44 100644
--- a/Telegram/SourceFiles/core/shortcuts.h
+++ b/Telegram/SourceFiles/core/shortcuts.h
@@ -67,6 +67,7 @@ enum class Command {
 	ScheduleMessage,
 
 	ReadChat,
+	ArchiveChat,
 
 	MediaViewerFullscreen,
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index dab3e303a..354a148eb 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -4011,6 +4011,24 @@ void InnerWidget::setupShortcuts() {
 			return true;
 		});
 
+		(!_openedForum)
+			&& request->check(Command::ArchiveChat)
+			&& request->handle([=] {
+				const auto thread = _selected ? _selected->thread() : nullptr;
+				if (!thread) {
+					return false;
+				}
+				const auto history = thread->owningHistory();
+				const auto isArchived = history->folder()
+					&& (history->folder()->id() == Data::Folder::kId);
+				
+				Window::ToggleHistoryArchived(
+					_controller->uiShow(),
+					history,
+					!isArchived);
+				return true;
+			});
+
 		request->check(Command::ShowContacts) && request->handle([=] {
 			_controller->show(PrepareContactsBox(_controller));
 			return true;

From aad2961646aa52cc38876e20c113955a427c72d2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 18:01:44 +0300
Subject: [PATCH 077/596] Added all unused shortcuts to json of default
 shortcuts.

---
 Telegram/SourceFiles/core/shortcuts.cpp | 39 +++++++++++--------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index b47563311..270785fcb 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -135,13 +135,6 @@ const auto CommandNames = base::flat_map<Command, QString>{
 	{ Command::FolderNext     , u"next_folder"_q },
 	{ Command::ShowAllChats   , u"all_chats"_q },
 
-	{ Command::ShowAccount1   , u"account1"_q },
-	{ Command::ShowAccount2   , u"account2"_q },
-	{ Command::ShowAccount3   , u"account3"_q },
-	{ Command::ShowAccount4   , u"account4"_q },
-	{ Command::ShowAccount5   , u"account5"_q },
-	{ Command::ShowAccount6   , u"account6"_q },
-
 	{ Command::ShowFolder1    , u"folder1"_q },
 	{ Command::ShowFolder2    , u"folder2"_q },
 	{ Command::ShowFolder3    , u"folder3"_q },
@@ -156,6 +149,15 @@ const auto CommandNames = base::flat_map<Command, QString>{
 	{ Command::ReadChat       , u"read_chat"_q },
 };
 
+[[maybe_unused]] constexpr auto kNoValue = {
+	Command::JustSendMessage,
+	Command::SendSilentMessage,
+	Command::ScheduleMessage,
+	Command::MediaViewerFullscreen,
+	Command::ShowScheduled,
+	Command::ArchiveChat,
+};
+
 class Manager {
 public:
 	void fill();
@@ -408,14 +410,6 @@ void Manager::fillDefaults() {
 		set(u"%1+%2"_q.arg(ctrl).arg(index), command);
 	}
 
-	//auto &&accounts = ranges::views::zip(
-	//	kShowAccount,
-	//	ranges::views::ints(1, ranges::unreachable));
-
-	//for (const auto &[command, index] : accounts) {
-	//	set(u"%1+shift+%2"_q.arg(ctrl).arg(index), command);
-	//}
-
 	set(u"%1+shift+down"_q.arg(ctrl), Command::FolderNext);
 	set(u"%1+shift+up"_q.arg(ctrl), Command::FolderPrevious);
 
@@ -461,13 +455,14 @@ void Manager::writeDefaultFile() {
 	}
 
 	// Commands without a default value.
-	for (const auto command : kShowAccount) {
-		const auto j = CommandNames.find(command);
-		if (j != CommandNames.end()) {
-			QJsonObject entry;
-			entry.insert(u"keys"_q, QJsonValue());
-			entry.insert(u"command"_q, j->second);
-			shortcuts.append(entry);
+	for (const auto c : ranges::views::concat(kShowAccount, kNoValue)) {
+		for (const auto &[name, command] : CommandByName) {
+			if (c == command) {
+				auto entry = QJsonObject();
+				entry.insert(u"keys"_q, QJsonValue());
+				entry.insert(u"command"_q, name);
+				shortcuts.append(entry);
+			}
 		}
 	}
 

From 386fb07017d269f3ff1df000e1d322dd03f84083 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Mar 2024 10:16:12 +0400
Subject: [PATCH 078/596] Update lib_base submodule.

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 216aed4e8..66d8f07ca 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 216aed4e8d518571e33df26fef918edcac8122f9
+Subproject commit 66d8f07caa7d6ff0b57f2aec1cfb38eade5a8e55

From c71c24a6bca2db0b836910264047a24630f8ffea Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Mar 2024 10:25:34 +0400
Subject: [PATCH 079/596] Re-revert "Disable system proxy support on Linux".

This reverts commit 55b2b04e2ea67078731e932c045622b465e4854a.
---
 Telegram/SourceFiles/core/sandbox.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index fb145f7f1..6feacdb5b 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -33,7 +33,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QSessionManager>
 #include <QtGui/QScreen>
 #include <QtGui/qpa/qplatformscreen.h>
-#include <ksandbox.h>
 
 namespace Core {
 namespace {
@@ -518,10 +517,8 @@ void Sandbox::refreshGlobalProxy() {
 		|| proxy.type == MTP::ProxyData::Type::Http) {
 		QNetworkProxy::setApplicationProxy(
 			MTP::ToNetworkProxy(MTP::ToDirectIpProxy(proxy)));
-	} else if ((!Core::IsAppLaunched()
-		|| Core::App().settings().proxy().isSystem())
-		// this works stable only in sandboxed environment where it works through portal
-		&& (!Platform::IsLinux() || KSandbox::isInside() || cDebugMode())) {
+	} else if (!Core::IsAppLaunched()
+		|| Core::App().settings().proxy().isSystem()) {
 		QNetworkProxyFactory::setUseSystemConfiguration(true);
 	} else {
 		QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);

From 8708598daa1a2e941092b999d03c051bc8183acf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Mar 2024 10:26:23 +0400
Subject: [PATCH 080/596] Beta version 4.15.6.

- Save the Instant View window geometry.
- Fix jump to anchors with accents in the Instant View.
- Fix possible crash in the ElasticScroll destructor.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 1149de562..5310aaf56 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.15.5.0" />
+    Version="4.15.6.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index fe116dd6d..88ea79d54 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 4,15,5,0
- PRODUCTVERSION 4,15,5,0
+ FILEVERSION 4,15,6,0
+ PRODUCTVERSION 4,15,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.15.5.0"
+            VALUE "FileVersion", "4.15.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.5.0"
+            VALUE "ProductVersion", "4.15.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 93b6c21de..564861ecf 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 4,15,5,0
- PRODUCTVERSION 4,15,5,0
+ FILEVERSION 4,15,6,0
+ PRODUCTVERSION 4,15,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.15.5.0"
+            VALUE "FileVersion", "4.15.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.5.0"
+            VALUE "ProductVersion", "4.15.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index fbb996b7c..e328ba4cd 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 = 4015005;
-constexpr auto AppVersionStr = "4.15.5";
+constexpr auto AppVersion = 4015006;
+constexpr auto AppVersionStr = "4.15.6";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 24dca8f50..2e78422bb 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4015005
+AppVersion         4015006
 AppVersionStrMajor 4.15
-AppVersionStrSmall 4.15.5
-AppVersionStr      4.15.5
+AppVersionStrSmall 4.15.6
+AppVersionStr      4.15.6
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 4.15.5.beta
+AppVersionOriginal 4.15.6.beta
diff --git a/changelog.txt b/changelog.txt
index 191239576..5e459c74f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+4.15.6 beta (25.03.24)
+
+- Save the Instant View window geometry.
+- Fix jump to anchors with accents in the Instant View.
+- Fix possible crash in the ElasticScroll destructor.
+
 4.15.5 beta (16.03.24)
 
 - Fix a crash in Instant View article parsing.

From 89c6bb163eac63d5688106f7b34d9ede49b914e5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Mar 2024 11:19:31 +0400
Subject: [PATCH 081/596] Beta version 4.15.6: Fix build with GCC.

---
 Telegram/SourceFiles/calls/calls_call.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 107ca4eeb..3f6c2a7a8 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -976,16 +976,9 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 				handleControllerBarCountChange(count);
 			});
 		},
-		.remoteMediaStateUpdated = [=](
-				tgcalls::AudioState audio,
-				tgcalls::VideoState video) {
-			crl::on_main(weak, [=] {
-				updateRemoteMediaState(audio, video);
-			});
-		},
 		.remoteBatteryLevelIsLowUpdated = [=](bool isLow) {
 #ifdef _DEBUG
-			isLow = true;
+//			isLow = true;
 #endif
 			crl::on_main(weak, [=] {
 				_remoteBatteryState = isLow
@@ -993,6 +986,13 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 					: RemoteBatteryState::Normal;
 			});
 		},
+		.remoteMediaStateUpdated = [=](
+				tgcalls::AudioState audio,
+				tgcalls::VideoState video) {
+			crl::on_main(weak, [=] {
+				updateRemoteMediaState(audio, video);
+			});
+		},
 		.signalingDataEmitted = [=](const std::vector<uint8_t> &data) {
 			const auto bytes = QByteArray(
 				reinterpret_cast<const char*>(data.data()),

From 0edf14f3a95074c9cf26147074b8cf0d553200a5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 25 Mar 2024 17:41:11 +0400
Subject: [PATCH 082/596] Update Qt to 6.7.0-rc2 on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index ae0c03859..7ddfb5c42 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -1,7 +1,7 @@
 {%- set GIT = "https://github.com" -%}
 {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
 {%- set QT = "6.7.0" -%}
-{%- set QT_TAG = "v" ~ QT ~ "-rc1" -%}
+{%- set QT_TAG = "v" ~ QT ~ "-rc2" -%}
 {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
 {%- set OPENSSL_VER = "1_1_1" -%}
 {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
@@ -54,7 +54,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 75140a10eefcecaad7b3f3aa4586b880a39007ff \
+	&& git fetch --depth=1 origin b85bc8bb1ba866dfa3d1ee983dc642fa6ccff12a \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 

From 8830fb70a48122cd7239a73c30875806ce008f33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Mar 2024 13:28:25 +0400
Subject: [PATCH 083/596] Beta version 4.15.6: OpenSSL 3.2.1.

---
 README.md                                   |  3 +--
 Telegram/build/docker/centos_env/Dockerfile | 10 +++++-----
 Telegram/build/prepare/prepare.py           | 18 +++++++++---------
 cmake                                       |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index b09c6bd73..6016f9cd4 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Version **1.8.15** was the last that supports older systems
 ## Third-party
 
 * Qt 6 ([LGPL](http://doc.qt.io/qt-6/lgpl.html)) and Qt 5.15 ([LGPL](http://doc.qt.io/qt-5/lgpl.html)) slightly patched
-* OpenSSL 1.1.1 and 1.0.1 ([OpenSSL License](https://www.openssl.org/source/license.html))
+* OpenSSL 3.2.1 ([Apache License 2.0](https://www.openssl.org/source/apache-license-2.0.txt))
 * 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))
@@ -60,7 +60,6 @@ Version **1.8.15** was the last that supports older systems
 * Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html))
 * Vazir font ([SIL Open Font License 1.1](https://github.com/rastikerdar/vazir-font/blob/master/OFL.txt))
 * Emoji alpha codes ([MIT License](https://github.com/emojione/emojione/blob/master/extras/alpha-codes/LICENSE.md))
-* Catch test framework ([Boost License](https://github.com/philsquared/Catch/blob/master/LICENSE.txt))
 * xxHash ([BSD License](https://github.com/Cyan4973/xxHash/blob/dev/LICENSE))
 * QR Code generator ([MIT License](https://github.com/nayuki/QR-Code-generator#license))
 * CMake ([New BSD License](https://github.com/Kitware/CMake/blob/master/Copyright.txt))
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 7ddfb5c42..da6a41df2 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -3,8 +3,8 @@
 {%- set QT = "6.7.0" -%}
 {%- set QT_TAG = "v" ~ QT ~ "-rc2" -%}
 {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
-{%- set OPENSSL_VER = "1_1_1" -%}
-{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
+{%- set OPENSSL_VER = "3.2.1" -%}
+{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-3.2.1" -%}
 {%- set CMAKE_VER = "3.27.6" -%}
 {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
 {%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%}
@@ -23,7 +23,7 @@ RUN dnf -y install epel-release \
 	&& dnf config-manager --set-enabled powertools \
 	&& dnf -y install autoconf automake libtool pkgconfig make patch git \
 		python3.11-pip python3.11-devel gperf flex bison clang lld yasm \
-		file which perl-open perl-XML-Parser xorg-x11-util-macros \
+		file which perl-open perl-XML-Parser perl-IPC-Cmd xorg-x11-util-macros \
 		gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils \
 		libffi-devel fontconfig-devel freetype-devel libX11-devel \
 		alsa-lib-devel pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel \
@@ -661,8 +661,8 @@ RUN git clone -b 1.23.1 --depth=1 {{ GIT }}/kcat/openal-soft.git \
 	&& rm -rf openal-soft
 
 FROM builder AS openssl
-ENV opensslDir openssl_{{ OPENSSL_VER }}
-RUN git clone -b OpenSSL_{{ OPENSSL_VER }}-stable --depth=1 {{ GIT }}/openssl/openssl.git $opensslDir \
+ENV opensslDir openssl-{{ OPENSSL_VER }}
+RUN git clone -b openssl-{{ OPENSSL_VER }} --depth=1 {{ GIT }}/openssl/openssl.git $opensslDir \
 	&& cd $opensslDir \
 	&& ./config \
 		--prefix="{{ OPENSSL_PREFIX }}" \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 68b422b74..9a2ef4944 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -578,9 +578,9 @@ mac:
     cmake --install build
 """)
 
-stage('openssl', """
-    git clone -b OpenSSL_1_1_1-stable https://github.com/openssl/openssl openssl
-    cd openssl
+stage('openssl3', """
+    git clone -b openssl-3.2.1 https://github.com/openssl/openssl openssl3
+    cd openssl3
 win32:
     perl Configure no-shared no-tests debug-VC-WIN32
 win64:
@@ -1420,7 +1420,7 @@ win:
     SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
     SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
     SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
-    SET OPENSSL_DIR=%LIBS_DIR%\\openssl
+    SET OPENSSL_DIR=%LIBS_DIR%\\openssl3
     SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
     SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
     SET WEBP_DIR=%LIBS_DIR%\\libwebp
@@ -1534,7 +1534,7 @@ stage('tg_owt', """
 win:
     SET MOZJPEG_PATH=$LIBS_DIR/mozjpeg
     SET OPUS_PATH=$USED_PREFIX/include/opus
-    SET OPENSSL_PATH=$LIBS_DIR/openssl/include
+    SET OPENSSL_PATH=$LIBS_DIR/openssl3/include
     SET LIBVPX_PATH=$USED_PREFIX/include
     SET FFMPEG_PATH=$LIBS_DIR/ffmpeg
     mkdir out
@@ -1580,7 +1580,7 @@ mac:
         -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \
         -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \
         -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \
-        -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl3/include \
         -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \
         -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
         -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
@@ -1594,7 +1594,7 @@ mac:
         -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \
         -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \
         -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \
-        -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl3/include \
         -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \
         -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
         -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
@@ -1610,7 +1610,7 @@ release:
         -DCMAKE_OSX_ARCHITECTURES=x86_64 \
         -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \
         -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \
-        -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl3/include \
         -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \
         -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
         -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
@@ -1623,7 +1623,7 @@ release:
         -DCMAKE_OSX_ARCHITECTURES=arm64 \
         -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \
         -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \
-        -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl3/include \
         -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \
         -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
         -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
diff --git a/cmake b/cmake
index 95c83fd26..161b986c3 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 95c83fd26424c26d4fc4454cef601529616683aa
+Subproject commit 161b986c32e0da76aa2d3ae16d316ab55cad9bcc

From ea42f9545f3173b997096822cd790616bb58ac36 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 25 Mar 2024 21:17:23 +0400
Subject: [PATCH 084/596] Move OpenSSL to system directories on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index da6a41df2..3203eb2c9 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -3,8 +3,6 @@
 {%- set QT = "6.7.0" -%}
 {%- set QT_TAG = "v" ~ QT ~ "-rc2" -%}
 {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
-{%- set OPENSSL_VER = "3.2.1" -%}
-{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-3.2.1" -%}
 {%- set CMAKE_VER = "3.27.6" -%}
 {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
 {%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%}
@@ -661,18 +659,16 @@ RUN git clone -b 1.23.1 --depth=1 {{ GIT }}/kcat/openal-soft.git \
 	&& rm -rf openal-soft
 
 FROM builder AS openssl
-ENV opensslDir openssl-{{ OPENSSL_VER }}
-RUN git clone -b openssl-{{ OPENSSL_VER }} --depth=1 {{ GIT }}/openssl/openssl.git $opensslDir \
-	&& cd $opensslDir \
+RUN git clone -b openssl-3.2.1 --depth=1 {{ GIT }}/openssl/openssl.git \
+	&& cd openssl \
 	&& ./config \
-		--prefix="{{ OPENSSL_PREFIX }}" \
 		--openssldir=/etc/ssl \
 		no-tests \
 		no-dso \
 	&& make -j$(nproc) \
 	&& make DESTDIR="{{ LibrariesPath }}/openssl-cache" install_sw \
 	&& cd .. \
-	&& rm -rf $opensslDir
+	&& rm -rf openssl
 
 FROM builder AS xkbcommon
 COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
@@ -733,8 +729,6 @@ COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
 COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
 COPY --link --from=libwebp {{ LibrariesPath }}/libwebp-cache /
 
-ENV OPENSSL_ROOT_DIR {{ OPENSSL_PREFIX }}
-
 RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git qt_{{ QT }} \
 	&& cd qt_{{ QT }} \
 	&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
@@ -798,7 +792,7 @@ RUN git init tg_owt \
 		-DCMAKE_CXX_FLAGS_DEBUG="{{ CFLAGS_DEBUG }}" \
 		-DTG_OWT_SPECIAL_TARGET=linux \
 		-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
-		-DTG_OWT_OPENSSL_INCLUDE_PATH={{ OPENSSL_PREFIX }}/include \
+		-DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/include \
 		-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
 		-DTG_OWT_LIBVPX_INCLUDE_PATH=/usr/local/include \
 		-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include
@@ -866,7 +860,6 @@ COPY --link --from=webrtc_debug {{ LibrariesPath }}/tg_owt/out/Debug tg_owt/out/
 
 WORKDIR ../tdesktop
 ENV QT {{ QT }}
-ENV OPENSSL_ROOT_DIR {{ OPENSSL_PREFIX }}
 ENV BOOST_INCLUDEDIR /usr/include/boost1.78
 ENV BOOST_LIBRARYDIR /usr/lib64/boost1.78
 

From 5fa89c22bd55774bb29277b5d7ffb855be51e95b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 25 Mar 2024 21:18:26 +0400
Subject: [PATCH 085/596] Use default Qt prefix on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 3203eb2c9..c1f3eafef 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -2,7 +2,6 @@
 {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
 {%- set QT = "6.7.0" -%}
 {%- set QT_TAG = "v" ~ QT ~ "-rc2" -%}
-{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
 {%- set CMAKE_VER = "3.27.6" -%}
 {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
 {%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%}
@@ -729,15 +728,15 @@ COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
 COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
 COPY --link --from=libwebp {{ LibrariesPath }}/libwebp-cache /
 
-RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git qt_{{ QT }} \
-	&& cd qt_{{ QT }} \
+RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git \
+	&& cd qt5 \
 	&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
 	&& cd qtbase \
 	&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
 	&& cd ../qtwayland \
 	&& find ../../patches/qtwayland_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
 	&& cd .. \
-	&& ./configure -prefix "{{ QT_PREFIX }}" \
+	&& ./configure \
 		CMAKE_BUILD_TYPE=None \
 		-opensource \
 		-confirm-license \
@@ -756,7 +755,7 @@ RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git qt_{{ QT }} \
 	&& cmake --build . --parallel \
 	&& DESTDIR="{{ LibrariesPath }}/qt-cache" cmake --install . \
 	&& cd .. \
-	&& rm -rf qt_{{ QT }}
+	&& rm -rf qt5
 
 FROM builder AS breakpad
 RUN git clone -b v2023.06.01 --depth=1 https://chromium.googlesource.com/breakpad/breakpad.git \

From d3db52ce9c262e8f54fa9d8561416020056251d5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 25 Mar 2024 22:12:58 +0400
Subject: [PATCH 086/596] Update cmake_helpers

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

diff --git a/cmake b/cmake
index 161b986c3..e4d3cc2c9 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 161b986c32e0da76aa2d3ae16d316ab55cad9bcc
+Subproject commit e4d3cc2c969a5a285c2f2e89ff759b9e32ca0db9

From 887f10059d13dcb0b4fb0974359c14c34239a684 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 25 Mar 2024 22:13:12 +0400
Subject: [PATCH 087/596] Update Qt to 6.7.0-rc2 in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index dbb12885e..6fc333dfe 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -168,7 +168,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 75140a10eefcecaad7b3f3aa4586b880a39007ff
+    source-commit: b85bc8bb1ba866dfa3d1ee983dc642fa6ccff12a
     plugin: dump
     override-pull: |
       craftctl default
@@ -440,7 +440,7 @@ parts:
     override-pull: |
       QT=6.7.0
 
-      git clone -b v${QT}-rc1 --depth=1 https://github.com/qt/qt5.git .
+      git clone -b v${QT}-rc2 --depth=1 https://github.com/qt/qt5.git .
       git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools
 
       cd qtbase

From 8803dfcee6bbb33303ffcb4b2293d1da7083bd92 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 26 Mar 2024 01:47:45 +0400
Subject: [PATCH 088/596] Add Plasma 6 sound settings support

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

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index b99100dce..87c561d66 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -733,6 +733,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
 			if (type == Type::Unity) {
 				add("unity-control-center", "sound");
 			} else if (type == Type::KDE) {
+				add("kcmshell6", "kcm_pulseaudio");
 				add("kcmshell5", "kcm_pulseaudio");
 				add("kcmshell4", "phonon");
 			} else if (type == Type::Gnome) {

From e7a7c2d26755578921ab9ee1526cdc101d0516c0 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 26 Mar 2024 01:49:33 +0400
Subject: [PATCH 089/596] Get rid of XDG_CURRENT_DESKTOP dependent logic

Just try all the commands and use the one that works first
---
 Telegram/CMakeLists.txt                       |   2 -
 .../linux/linux_desktop_environment.cpp       | 130 ------------------
 .../linux/linux_desktop_environment.h         |  44 ------
 .../platform/linux/specific_linux.cpp         |  24 +---
 4 files changed, 7 insertions(+), 193 deletions(-)
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_desktop_environment.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 41489fffa..573a6dbf5 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1187,8 +1187,6 @@ PRIVATE
     payments/payments_checkout_process.h
     payments/payments_form.cpp
     payments/payments_form.h
-    platform/linux/linux_desktop_environment.cpp
-    platform/linux/linux_desktop_environment.h
     platform/linux/linux_wayland_integration_dummy.cpp
     platform/linux/linux_wayland_integration.cpp
     platform/linux/linux_wayland_integration.h
diff --git a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
deleted file mode 100644
index 32d7f4e38..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
+++ /dev/null
@@ -1,130 +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 "platform/linux/linux_desktop_environment.h"
-
-#include "base/platform/base_platform_info.h"
-
-namespace Platform {
-namespace DesktopEnvironment {
-namespace {
-
-QString GetEnv(const char *name) {
-	const auto value = qEnvironmentVariable(name);
-	LOG(("Getting DE, %1: '%2'").arg(name, value));
-	return value;
-}
-
-QString GetWM() {
-	const auto result = Platform::GetWindowManager();
-	LOG(("Getting DE via WM: '%1'").arg(result));
-	return result;
-}
-
-std::vector<Type> Compute() {
-	auto result = std::vector<Type>();
-
-	const auto xdgCurrentDesktop = GetEnv(
-		"XDG_CURRENT_DESKTOP").toLower().split(':', Qt::SkipEmptyParts);
-
-	const auto xdgSessionDesktop = GetEnv("XDG_SESSION_DESKTOP").toLower();
-
-	const auto desktopSession = [] {
-		const auto result = GetEnv("DESKTOP_SESSION").toLower();
-		const auto slash = result.lastIndexOf('/');
-		// DESKTOP_SESSION can contain a path
-		if (slash != -1) {
-			return result.mid(slash + 1);
-		}
-		return result;
-	}();
-
-	const auto windowManager = GetWM().toLower();
-
-	const auto desktopToType = [&](const QString &desktop) {
-		if (desktop == qstr("unity")) {
-			// gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity
-			// DESKTOP_SESSION can be gnome-fallback or gnome-fallback-compiz
-			if (desktopSession.contains(qstr("gnome-fallback"))) {
-				result.push_back(Type::Gnome);
-			}
-			result.push_back(Type::Unity);
-		} else if (desktop == qstr("gnome")) {
-			result.push_back(Type::Gnome);
-		} else if (desktop == qstr("x-cinnamon") || desktop == qstr("cinnamon")) {
-			result.push_back(Type::Cinnamon);
-		} else if (desktop == qstr("kde")) {
-			result.push_back(Type::KDE);
-		} else if (desktop == qstr("mate")) {
-			result.push_back(Type::MATE);
-		}
-	};
-
-	for (const auto &current : xdgCurrentDesktop) {
-		desktopToType(current);
-	}
-
-	if (!xdgSessionDesktop.isEmpty()) {
-		desktopToType(xdgSessionDesktop);
-	}
-
-	if (!desktopSession.isEmpty()) {
-		desktopToType(desktopSession);
-	}
-
-	// Fall back on some older environment variables.
-	// Useful particularly in the DESKTOP_SESSION=default case.
-	if (!GetEnv("GNOME_DESKTOP_SESSION_ID").isEmpty()) {
-		result.push_back(Type::Gnome);
-	}
-	if (!GetEnv("KDE_FULL_SESSION").isEmpty()) {
-		result.push_back(Type::KDE);
-	}
-
-	// Some DEs could be detected via X11
-	if (!windowManager.isEmpty()) {
-		if (windowManager == qstr("gnome shell")) {
-			result.push_back(Type::Gnome);
-		}
-	}
-
-	result = result | ranges::views::unique | ranges::to_vector;
-	return result;
-}
-
-std::vector<Type> ComputeAndLog() {
-	const auto result = Compute();
-	if (result.empty()) {
-		LOG(("DE: Other"));
-		return {};
-	}
-	const auto names = ranges::accumulate(
-		result | ranges::views::transform([](auto type) {
-			switch (type) {
-			case Type::Gnome: return u"Gnome, "_q;
-			case Type::Cinnamon: return u"Cinnamon, "_q;
-			case Type::KDE: return u"KDE, "_q;
-			case Type::Unity: return u"Unity, "_q;
-			case Type::MATE: return u"MATE, "_q;
-			}
-			Unexpected("Type in Platform::DesktopEnvironment::ComputeAndLog");
-		}),
-		QString()).chopped(2);
-	LOG(("DE: %1").arg(names));
-	return result;
-}
-
-} // namespace
-
-// Thanks Chromium.
-std::vector<Type> Get() {
-	static const auto result = ComputeAndLog();
-	return result;
-}
-
-} // namespace DesktopEnvironment
-} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.h b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.h
deleted file mode 100644
index 121c97064..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-namespace Platform {
-namespace DesktopEnvironment {
-
-enum class Type {
-	Gnome,
-	Cinnamon,
-	KDE,
-	Unity,
-	MATE,
-};
-
-std::vector<Type> Get();
-
-inline bool IsGnome() {
-	return ranges::contains(Get(), Type::Gnome);
-}
-
-inline bool IsCinnamon() {
-	return ranges::contains(Get(), Type::Cinnamon);
-}
-
-inline bool IsKDE() {
-	return ranges::contains(Get(), Type::KDE);
-}
-
-inline bool IsUnity() {
-	return ranges::contains(Get(), Type::Unity);
-}
-
-inline bool IsMATE() {
-	return ranges::contains(Get(), Type::MATE);
-}
-
-} // namespace DesktopEnvironment
-} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 87c561d66..7b390c29c 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/linux/base_linux_dbus_utilities.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
 #include "ui/platform/ui_platform_window_title.h"
-#include "platform/linux/linux_desktop_environment.h"
 #include "platform/linux/linux_wayland_integration.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
@@ -728,22 +727,13 @@ bool OpenSystemSettings(SystemSettingsType type) {
 			}
 			options.push_back(std::move(command));
 		};
-		for (const auto &type : DesktopEnvironment::Get()) {
-			using DesktopEnvironment::Type;
-			if (type == Type::Unity) {
-				add("unity-control-center", "sound");
-			} else if (type == Type::KDE) {
-				add("kcmshell6", "kcm_pulseaudio");
-				add("kcmshell5", "kcm_pulseaudio");
-				add("kcmshell4", "phonon");
-			} else if (type == Type::Gnome) {
-				add("gnome-control-center", "sound");
-			} else if (type == Type::Cinnamon) {
-				add("cinnamon-settings", "sound");
-			} else if (type == Type::MATE) {
-				add("mate-volume-control");
-			}
-		}
+		add("unity-control-center", "sound");
+		add("kcmshell6", "kcm_pulseaudio");
+		add("kcmshell5", "kcm_pulseaudio");
+		add("kcmshell4", "phonon");
+		add("gnome-control-center", "sound");
+		add("cinnamon-settings", "sound");
+		add("mate-volume-control");
 		add("pavucontrol-qt");
 		add("pavucontrol");
 		add("alsamixergui");

From 8534d6d7d7fd0b484fee1fbc4e7168a1a5a26df5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 27 Mar 2024 18:32:26 +0400
Subject: [PATCH 090/596] Fix build on Windows.

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

diff --git a/cmake b/cmake
index e4d3cc2c9..199ce0e7c 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit e4d3cc2c969a5a285c2f2e89ff759b9e32ca0db9
+Subproject commit 199ce0e7c8b6e6ce939491ac7ee5973129e6e2eb

From 001b055ee8c6f59fe887a30a24706a307feb8221 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 28 Mar 2024 04:13:43 +0400
Subject: [PATCH 091/596] Let Wayland to use QGuiApplication::screenAt

Looks like it works correctly nowadays
---
 .../SourceFiles/media/view/media_view_overlay_widget.cpp    | 6 ++----
 Telegram/SourceFiles/media/view/media_view_pip.cpp          | 6 ++----
 Telegram/lib_ui                                             | 2 +-
 3 files changed, 5 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 b1a1539ec..229b37636 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -794,11 +794,9 @@ void OverlayWidget::moveToScreen(bool inMove) {
 		if (!widget) {
 			return nullptr;
 		}
-		if (!Platform::IsWayland()) {
-			if (const auto screen = QGuiApplication::screenAt(
+		if (const auto screen = QGuiApplication::screenAt(
 				widget->geometry().center())) {
-				return screen;
-			}
+			return screen;
 		}
 		return widget->screen();
 	};
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index 655e7cf41..f2bc74550 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -505,11 +505,9 @@ void PipPanel::setPositionDefault() {
 		if (!widget) {
 			return nullptr;
 		}
-		if (!Platform::IsWayland()) {
-			if (const auto screen = QGuiApplication::screenAt(
+		if (const auto screen = QGuiApplication::screenAt(
 				widget->geometry().center())) {
-				return screen;
-			}
+			return screen;
 		}
 		return widget->screen();
 	};
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index fa8de8b19..476d75125 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit fa8de8b199ae8b7569f8dec1c054325eff27ce45
+Subproject commit 476d751251c8571e11260b7c712c885f4191d717

From 1d7dbc4d1790aa595993bb7a45fdcc1b08c7d793 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 29 Mar 2024 12:42:34 +0400
Subject: [PATCH 092/596] Update patches & lib_base

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 Telegram/lib_base                           | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index c1f3eafef..cb0fcbaa6 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin b85bc8bb1ba866dfa3d1ee983dc642fa6ccff12a \
+	&& git fetch --depth=1 origin 7b8f30b787691a325d17e20ddd455e87738e7432 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 66d8f07ca..f95154033 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 66d8f07caa7d6ff0b57f2aec1cfb38eade5a8e55
+Subproject commit f95154033c670cf786fce82b005abde8a5d3922f
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6fc333dfe..b464b4e91 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -168,7 +168,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: b85bc8bb1ba866dfa3d1ee983dc642fa6ccff12a
+    source-commit: 7b8f30b787691a325d17e20ddd455e87738e7432
     plugin: dump
     override-pull: |
       craftctl default

From 439f8d0914f9cb9f5f092675b9f01a9ee42a645b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 30 Mar 2024 04:52:52 +0400
Subject: [PATCH 093/596] Implement monochrome icon setting on Linux

---
 .../SourceFiles/platform/linux/tray_linux.cpp | 61 +++++++++++++------
 .../SourceFiles/platform/linux/tray_linux.h   |  4 --
 2 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
index a9e1de383..9753556c4 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
@@ -22,6 +22,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QSystemTrayIcon>
 
 namespace Platform {
+namespace {
+
+[[nodiscard]] QString PanelIconName(int counter, bool muted) {
+	return (counter > 0)
+		? (muted
+			? u"telegram-mute-panel"_q
+			: u"telegram-attention-panel"_q)
+		: u"telegram-panel"_q;
+}
+
+} // namespace
 
 class IconGraphic final {
 public:
@@ -35,29 +46,27 @@ public:
 		bool muted) const;
 	[[nodiscard]] QIcon systemIcon(
 		const QString &iconThemeName,
+		bool monochrome,
 		int counter,
 		bool muted) const;
 	[[nodiscard]] QIcon trayIcon(
 		const QIcon &systemIcon,
 		const QString &iconThemeName,
+		bool monochrome,
 		int counter,
 		bool muted);
 
 private:
-	[[nodiscard]] QString panelIconName(int counter, bool muted) const;
 	[[nodiscard]] int counterSlice(int counter) const;
 	void updateIconRegenerationNeeded(
 		const QIcon &icon,
 		const QIcon &systemIcon,
 		const QString &iconThemeName,
+		bool monochrome,
 		int counter,
 		bool muted);
 	[[nodiscard]] QSize dprSize(const QImage &image) const;
 
-	const QString _panelTrayIconName;
-	const QString _mutePanelTrayIconName;
-	const QString _attentionPanelTrayIconName;
-
 	const int _iconSizes[7];
 
 	bool _muted = true;
@@ -66,42 +75,37 @@ private:
 	QIcon _trayIcon;
 	QIcon _systemIcon;
 	QString _themeName;
+	bool _monochrome;
 
 };
 
 IconGraphic::IconGraphic()
-: _panelTrayIconName("telegram-panel")
-, _mutePanelTrayIconName("telegram-mute-panel")
-, _attentionPanelTrayIconName("telegram-attention-panel")
-, _iconSizes{ 16, 22, 32, 48, 64, 128, 256 } {
+: _iconSizes{ 16, 22, 32, 48, 64, 128, 256 } {
 }
 
 IconGraphic::~IconGraphic() = default;
 
-QString IconGraphic::panelIconName(int counter, bool muted) const {
-	return (counter > 0)
-		? (muted
-			? _mutePanelTrayIconName
-			: _attentionPanelTrayIconName)
-		: _panelTrayIconName;
-}
-
 QIcon IconGraphic::systemIcon(
 		const QString &iconThemeName,
+		bool monochrome,
 		int counter,
 		bool muted) const {
 	if (iconThemeName == _themeName
+		&& monochrome == _monochrome
 		&& (counter > 0) == (_count > 0)
 		&& muted == _muted) {
 		return _systemIcon;
 	}
 
 	const auto candidates = {
-		panelIconName(counter, muted),
+		monochrome ? PanelIconName(counter, muted) : QString(),
 		base::IconName(),
 	};
 
 	for (const auto &candidate : candidates) {
+		if (candidate.isEmpty()) {
+			continue;
+		}
 		const auto icon = QIcon::fromTheme(candidate);
 		if (icon.name() == candidate) {
 			return icon;
@@ -134,11 +138,13 @@ void IconGraphic::updateIconRegenerationNeeded(
 		const QIcon &icon,
 		const QIcon &systemIcon,
 		const QString &iconThemeName,
+		bool monochrome,
 		int counter,
 		bool muted) {
 	_trayIcon = icon;
 	_systemIcon = systemIcon;
 	_themeName = iconThemeName;
+	_monochrome = monochrome;
 	_count = counterSlice(counter);
 	_muted = muted;
 }
@@ -150,18 +156,19 @@ QSize IconGraphic::dprSize(const QImage &image) const {
 QIcon IconGraphic::trayIcon(
 		const QIcon &systemIcon,
 		const QString &iconThemeName,
+		bool monochrome,
 		int counter,
 		bool muted) {
 	if (!isRefreshNeeded(systemIcon, iconThemeName, counter, muted)) {
 		return _trayIcon;
 	}
 
-
-	if (systemIcon.name() == panelIconName(counter, muted)) {
+	if (systemIcon.name() == PanelIconName(counter, muted)) {
 		updateIconRegenerationNeeded(
 			systemIcon,
 			systemIcon,
 			iconThemeName,
+			monochrome,
 			counter,
 			muted);
 
@@ -227,6 +234,7 @@ QIcon IconGraphic::trayIcon(
 		result,
 		systemIcon,
 		iconThemeName,
+		monochrome,
 		counter,
 		muted);
 
@@ -290,6 +298,7 @@ void Tray::createIcon() {
 		};
 
 		const auto iconThemeName = QIcon::themeName();
+		const auto monochrome = Core::App().settings().trayIconMonochrome();
 		const auto counter = Core::App().unreadBadge();
 		const auto muted = Core::App().unreadBadgeMuted();
 
@@ -297,9 +306,11 @@ void Tray::createIcon() {
 		_icon->setIcon(_iconGraphic->trayIcon(
 			_iconGraphic->systemIcon(
 				iconThemeName,
+				monochrome,
 				counter,
 				muted),
 			iconThemeName,
+			monochrome,
 			counter,
 			muted));
 		_icon->setToolTip(AppName.utf16());
@@ -342,9 +353,11 @@ void Tray::updateIcon() {
 	}
 	const auto counter = Core::App().unreadBadge();
 	const auto muted = Core::App().unreadBadgeMuted();
+	const auto monochrome = Core::App().settings().trayIconMonochrome();
 	const auto iconThemeName = QIcon::themeName();
 	const auto systemIcon = _iconGraphic->systemIcon(
 		iconThemeName,
+		monochrome,
 		counter,
 		muted);
 
@@ -356,6 +369,7 @@ void Tray::updateIcon() {
 		_icon->setIcon(_iconGraphic->trayIcon(
 			systemIcon,
 			iconThemeName,
+			monochrome,
 			counter,
 			muted));
 	}
@@ -436,4 +450,11 @@ rpl::lifetime &Tray::lifetime() {
 
 Tray::~Tray() = default;
 
+bool HasMonochromeSetting() {
+	return QIcon::hasThemeIcon(
+		PanelIconName(
+			Core::App().unreadBadge(),
+			Core::App().unreadBadgeMuted()));
+}
+
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.h b/Telegram/SourceFiles/platform/linux/tray_linux.h
index 769fe4409..dd0175a2c 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.h
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.h
@@ -67,8 +67,4 @@ private:
 
 };
 
-inline bool HasMonochromeSetting() {
-	return false;
-}
-
 } // namespace Platform

From 1b589a35cf4311e19e0b7600095d7c18b63952ba Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 30 Mar 2024 13:21:40 +0400
Subject: [PATCH 094/596] Don't check the count when it's not going to painted

---
 Telegram/SourceFiles/platform/linux/tray_linux.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
index 9753556c4..ab1e34df8 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
@@ -130,8 +130,9 @@ bool IconGraphic::isRefreshNeeded(
 	return _trayIcon.isNull()
 		|| iconThemeName != _themeName
 		|| systemIcon.name() != _systemIcon.name()
-		|| muted != _muted
-		|| counterSlice(counter) != _count;
+		|| (systemIcon.name() != PanelIconName(counter, muted)
+			? muted != _muted || counterSlice(counter) != _count
+			: false);
 }
 
 void IconGraphic::updateIconRegenerationNeeded(

From e07d53725c121ab55633aad54c580802d801eb92 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 1 Apr 2024 09:44:53 +0400
Subject: [PATCH 095/596] Strip notification service start error

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

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 34e9a07eb..1242c751f 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -100,14 +100,15 @@ void StartServiceAsync(Gio::DBusConnection connection, Fn<void()> callback) {
 			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
 				// get the error if any
 				if (const auto ret = result(); !ret) {
-					const auto error = static_cast<GLib::Error*>(
+					const auto &error = *static_cast<GLib::Error*>(
 						ret.error().get());
 
-					if (error->gobj_()->domain != G_DBUS_ERROR
-							|| error->code_()
+					if (error.gobj_()->domain != G_DBUS_ERROR
+							|| error.code_()
 								!= G_DBUS_ERROR_SERVICE_UNKNOWN) {
+						Gio::DBusErrorNS_::strip_remote_error(error);
 						LOG(("Native Notification Error: %1").arg(
-							error->what()));
+							error.message_().c_str()));
 					}
 				}
 

From ed70675e1d401ee1f54ce7976eb66d869bfa092b Mon Sep 17 00:00:00 2001
From: wention <xuyi.828@gmail.com>
Date: Sun, 31 Mar 2024 12:51:43 +0800
Subject: [PATCH 096/596] Fix build Qt error on non-english windows os

---
 Telegram/build/prepare/prepare.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 9a2ef4944..8d472eef3 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -59,6 +59,7 @@ for arg in sys.argv[1:]:
         options.append(arg)
     elif arg == 'run':
         customRunCommand = True
+
 buildQt5 = not 'skip-qt5' in options if win else 'build-qt5' in options
 buildQt6 = 'build-qt6' in options if win else not 'skip-qt6' in options
 
@@ -1405,7 +1406,7 @@ if buildQt5:
     stage('qt_5_15_13', """
     git clone -b v5.15.13-lts-lgpl https://github.com/qt/qt5.git qt_5_15_13
     cd qt_5_15_13
-    perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
+    git submodule update --init --recursive qtbase qtimageformats qtsvg
 depends:patches/qtbase_5.15.13/*.patch
     cd qtbase
 win:
@@ -1491,7 +1492,7 @@ if buildQt6:
 mac:
     git clone -b v6.2.7-lts-lgpl https://github.com/qt/qt5.git qt_6_2_7
     cd qt_6_2_7
-    perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
+    git submodule update --init --recursive qtbase qtimageformats qtsvg
 depends:patches/qtbase_6.2.7/*.patch
     cd qtbase
     find ../../patches/qtbase_6.2.7 -type f -print0 | sort -z | xargs -0 git apply -v

From bd827d844b3267d8e2988436b3c9bbc1d3130b80 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Mon, 1 Apr 2024 00:25:32 +0000
Subject: [PATCH 097/596] Update User-Agent for DNS to Chrome 123.0.0.0.

---
 .../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 ea0a53f30..1491174e3 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/122.0.0.0 Safari/537.36");
+		"Chrome/123.0.0.0 Safari/537.36");
 	return kResult;
 }
 

From 962c64b33ccff3a82688cbf34706be9928238ffc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 11:58:24 +0400
Subject: [PATCH 098/596] Beta version 4.15.7: Linux fix test.

---
 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 5310aaf56..6c57abb3e 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.15.6.0" />
+    Version="4.15.7.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 88ea79d54..9e4970334 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 4,15,6,0
- PRODUCTVERSION 4,15,6,0
+ FILEVERSION 4,15,7,0
+ PRODUCTVERSION 4,15,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.15.6.0"
+            VALUE "FileVersion", "4.15.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.6.0"
+            VALUE "ProductVersion", "4.15.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 564861ecf..6c5fb5b1d 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 4,15,6,0
- PRODUCTVERSION 4,15,6,0
+ FILEVERSION 4,15,7,0
+ PRODUCTVERSION 4,15,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.15.6.0"
+            VALUE "FileVersion", "4.15.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.6.0"
+            VALUE "ProductVersion", "4.15.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index e328ba4cd..7dcf0938e 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 = 4015006;
-constexpr auto AppVersionStr = "4.15.6";
+constexpr auto AppVersion = 4015007;
+constexpr auto AppVersionStr = "4.15.7";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 2e78422bb..a9c7b538f 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4015006
+AppVersion         4015007
 AppVersionStrMajor 4.15
-AppVersionStrSmall 4.15.6
-AppVersionStr      4.15.6
+AppVersionStrSmall 4.15.7
+AppVersionStr      4.15.7
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 4.15.6.beta
+AppVersionOriginal 4.15.7.beta
diff --git a/changelog.txt b/changelog.txt
index 5e459c74f..17ff9b6e3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.15.7 beta (01.04.24)
+
+- Test crashfix on Linux.
+
 4.15.6 beta (25.03.24)
 
 - Save the Instant View window geometry.

From b1795f8c5a02a734008a827d3997baf32a21ff25 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Mar 2024 16:57:21 +0400
Subject: [PATCH 099/596] Update API scheme to layer 177.

---
 Telegram/SourceFiles/api/api_updates.cpp      |  2 +
 Telegram/SourceFiles/apiwrap.cpp              |  9 +++-
 .../data/business/data_shortcut_messages.cpp  |  1 +
 .../data/data_scheduled_messages.cpp          |  2 +
 Telegram/SourceFiles/data/data_session.cpp    |  1 +
 .../data/stickers/data_stickers_set.cpp       |  2 +-
 .../admin_log/history_admin_log_item.cpp      |  1 +
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 42 +++++++++++++++----
 .../settings/settings_privacy_controllers.cpp |  1 +
 9 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index ab4b5f30b..839584713 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1120,6 +1120,7 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				MTPPeer(), // saved_peer_id
 				d.vfwd_from() ? *d.vfwd_from() : MTPMessageFwdHeader(),
 				MTP_long(d.vvia_bot_id().value_or_empty()),
+				MTPlong(), // via_business_bot_id
 				d.vreply_to() ? *d.vreply_to() : MTPMessageReplyHeader(),
 				d.vdate(),
 				d.vmessage(),
@@ -1154,6 +1155,7 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				MTPPeer(), // saved_peer_id
 				d.vfwd_from() ? *d.vfwd_from() : MTPMessageFwdHeader(),
 				MTP_long(d.vvia_bot_id().value_or_empty()),
+				MTPlong(), // via_business_bot_id
 				d.vreply_to() ? *d.vreply_to() : MTPMessageReplyHeader(),
 				d.vdate(),
 				d.vmessage(),
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index a71ad72ce..63cfcd5f9 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3614,11 +3614,16 @@ void ApiWrap::cancelLocalItem(not_null<HistoryItem*> item) {
 void ApiWrap::sendShortcutMessages(
 		not_null<PeerData*> peer,
 		BusinessShortcutId id) {
+	auto ids = QVector<MTPint>();
+	auto randomIds = QVector<MTPlong>();
 	request(MTPmessages_SendQuickReplyMessages(
 		peer->input,
-		MTP_int(id)
+		MTP_int(id),
+		MTP_vector<MTPint>(ids),
+		MTP_vector<MTPlong>(randomIds)
 	)).done([=](const MTPUpdates &result) {
 		applyUpdates(result);
+	}).fail([=](const MTP::Error &error) {
 	}).send();
 }
 
@@ -4002,6 +4007,8 @@ void ApiWrap::uploadAlbumMedia(
 
 	};
 	request(MTPmessages_UploadMedia(
+		MTP_flags(0),
+		MTPstring(), // business_connection_id
 		item->history()->peer->input,
 		media
 	)).done([=](const MTPMessageMedia &result) {
diff --git a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
index 75b27a25b..fbe30449b 100644
--- a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
@@ -69,6 +69,7 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			data.vsaved_peer_id() ? *data.vsaved_peer_id() : MTPPeer(),
 			data.vfwd_from() ? *data.vfwd_from() : MTPMessageFwdHeader(),
 			MTP_long(data.vvia_bot_id().value_or_empty()),
+			MTP_long(data.vvia_business_bot_id().value_or_empty()),
 			data.vreply_to() ? *data.vreply_to() : MTPMessageReplyHeader(),
 			data.vdate(),
 			data.vmessage(),
diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.cpp b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
index 3277cb44a..ffe4ab436 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
@@ -73,6 +73,7 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			data.vsaved_peer_id() ? *data.vsaved_peer_id() : MTPPeer(),
 			data.vfwd_from() ? *data.vfwd_from() : MTPMessageFwdHeader(),
 			MTP_long(data.vvia_bot_id().value_or_empty()),
+			MTP_long(data.vvia_business_bot_id().value_or_empty()),
 			data.vreply_to() ? *data.vreply_to() : MTPMessageReplyHeader(),
 			data.vdate(),
 			data.vmessage(),
@@ -233,6 +234,7 @@ void ScheduledMessages::sendNowSimpleMessage(
 			MTPPeer(), // saved_peer_id
 			MTPMessageFwdHeader(),
 			MTPlong(), // via_bot_id
+			MTPlong(), // via_business_bot_id
 			replyHeader,
 			update.vdate(),
 			MTP_string(local->originalText().text),
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index b088bfee9..0e1259c6a 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -4509,6 +4509,7 @@ void Session::insertCheckedServiceNotification(
 				MTPPeer(), // saved_peer_id
 				MTPMessageFwdHeader(),
 				MTPlong(), // via_bot_id
+				MTPlong(), // via_business_bot_id
 				MTPMessageReplyHeader(),
 				MTP_int(date),
 				MTP_string(sending.text),
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers_set.cpp b/Telegram/SourceFiles/data/stickers/data_stickers_set.cpp
index 3639e436a..dc53c0a35 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers_set.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers_set.cpp
@@ -53,7 +53,7 @@ StickersSetFlags ParseStickersSetFlags(const MTPDstickerSet &data) {
 		| (data.is_masks() ? Flag::Masks : Flag())
 		| (data.is_emojis() ? Flag::Emoji : Flag())
 		| (data.vinstalled_date() ? Flag::Installed : Flag())
-		| (data.is_videos() ? Flag::Webm : Flag())
+		//| (data.is_videos() ? Flag::Webm : Flag())
 		| (data.is_text_color() ? Flag::TextColor : Flag())
 		| (data.is_channel_emoji_status() ? Flag::ChannelStatus : Flag());
 }
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 14f9718fc..ab1f19958 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -121,6 +121,7 @@ MTPMessage PrepareLogMessage(const MTPMessage &message, TimeId newDate) {
 			MTPPeer(), // saved_peer_id
 			data.vfwd_from() ? *data.vfwd_from() : MTPMessageFwdHeader(),
 			MTP_long(data.vvia_bot_id().value_or_empty()),
+			MTP_long(data.vvia_business_bot_id().value_or_empty()),
 			MTPMessageReplyHeader(),
 			MTP_int(newDate),
 			data.vmessage(),
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index af421910b..de9325fa5 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -114,7 +114,7 @@ chatPhotoEmpty#37c1011c = ChatPhoto;
 chatPhoto#1c6e1c11 flags:# has_video:flags.0?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = ChatPhoto;
 
 messageEmpty#90a6ca84 flags:# id:int peer_id:flags.0?Peer = Message;
-message#a66c7efc flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true pinned:flags.24?true noforwards:flags.26?true invert_media:flags.27?true id:int from_id:flags.8?Peer from_boosts_applied:flags.29?int peer_id:Peer saved_peer_id:flags.28?Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?long reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long reactions:flags.20?MessageReactions restriction_reason:flags.22?Vector<RestrictionReason> ttl_period:flags.25?int quick_reply_shortcut_id:flags.30?int = Message;
+message#2357bf25 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true pinned:flags.24?true noforwards:flags.26?true invert_media:flags.27?true flags2:# id:int from_id:flags.8?Peer from_boosts_applied:flags.29?int peer_id:Peer saved_peer_id:flags.28?Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?long via_business_bot_id:flags2.0?long reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long reactions:flags.20?MessageReactions restriction_reason:flags.22?Vector<RestrictionReason> ttl_period:flags.25?int quick_reply_shortcut_id:flags.30?int = Message;
 messageService#2b085862 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true legacy:flags.19?true id:int from_id:flags.8?Peer peer_id:Peer reply_to:flags.3?MessageReplyHeader date:int action:MessageAction ttl_period:flags.25?int = Message;
 
 messageMediaEmpty#3ded6320 = MessageMedia;
@@ -211,7 +211,7 @@ inputPeerNotifySettings#cacb6ae2 flags:# show_previews:flags.0?Bool silent:flags
 
 peerNotifySettings#99622c0c flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int ios_sound:flags.3?NotificationSound android_sound:flags.4?NotificationSound other_sound:flags.5?NotificationSound stories_muted:flags.6?Bool stories_hide_sender:flags.7?Bool stories_ios_sound:flags.8?NotificationSound stories_android_sound:flags.9?NotificationSound stories_other_sound:flags.10?NotificationSound = PeerNotifySettings;
 
-peerSettings#a518110d flags:# report_spam:flags.0?true add_contact:flags.1?true block_contact:flags.2?true share_contact:flags.3?true need_contacts_exception:flags.4?true report_geo:flags.5?true autoarchived:flags.7?true invite_members:flags.8?true request_chat_broadcast:flags.10?true geo_distance:flags.6?int request_chat_title:flags.9?string request_chat_date:flags.9?int = PeerSettings;
+peerSettings#acd66c5e flags:# report_spam:flags.0?true add_contact:flags.1?true block_contact:flags.2?true share_contact:flags.3?true need_contacts_exception:flags.4?true report_geo:flags.5?true autoarchived:flags.7?true invite_members:flags.8?true request_chat_broadcast:flags.10?true business_bot_paused:flags.11?true business_bot_can_reply:flags.12?true geo_distance:flags.6?int request_chat_title:flags.9?string request_chat_date:flags.9?int business_bot_id:flags.13?long business_bot_manage_url:flags.13?string = PeerSettings;
 
 wallPaper#a437c3ed id:long flags:# creator:flags.0?true default:flags.1?true pattern:flags.3?true dark:flags.4?true access_hash:long slug:string document:Document settings:flags.2?WallPaperSettings = WallPaper;
 wallPaperNoFile#e0804116 id:long flags:# default:flags.1?true dark:flags.4?true settings:flags.2?WallPaperSettings = WallPaper;
@@ -227,7 +227,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#22ff3e85 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage = UserFull;
+userFull#670bbc9c flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -408,6 +408,10 @@ updateNewQuickReply#f53da717 quick_reply:QuickReply = Update;
 updateDeleteQuickReply#53e6f1ec shortcut_id:int = Update;
 updateQuickReplyMessage#3e050d0f message:Message = Update;
 updateDeleteQuickReplyMessages#566fe7cd shortcut_id:int messages:Vector<int> = Update;
+updateBotBusinessConnect#8ae5c97a connection:BotBusinessConnection qts:int = Update;
+updateBotNewBusinessMessage#9ddb347c flags:# connection_id:string message:Message reply_to_message:flags.0?Message qts:int = Update;
+updateBotEditBusinessMessage#7df587c flags:# connection_id:string message:Message reply_to_message:flags.0?Message qts:int = Update;
+updateBotDeleteBusinessMessage#a02a982e connection_id:string peer:Peer messages:Vector<int> qts:int = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -606,7 +610,7 @@ inputStickerSetEmojiDefaultStatuses#29d0f5ee = InputStickerSet;
 inputStickerSetEmojiDefaultTopicIcons#44c1f8e9 = InputStickerSet;
 inputStickerSetEmojiChannelDefaultStatuses#49748553 = InputStickerSet;
 
-stickerSet#2dd14edc flags:# archived:flags.1?true official:flags.2?true masks:flags.3?true animated:flags.5?true videos:flags.6?true emojis:flags.7?true text_color:flags.9?true channel_emoji_status:flags.10?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 thumb_version:flags.4?int thumb_document_id:flags.8?long count:int hash:int = StickerSet;
+stickerSet#2dd14edc flags:# archived:flags.1?true official:flags.2?true masks:flags.3?true emojis:flags.7?true text_color:flags.9?true channel_emoji_status:flags.10?true creator:flags.11?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 thumb_version:flags.4?int thumb_document_id:flags.8?long count:int hash:int = StickerSet;
 
 messages.stickerSet#6e153f16 set:StickerSet packs:Vector<StickerPack> keywords:Vector<StickerKeyword> documents:Vector<Document> = messages.StickerSet;
 messages.stickerSetNotModified#d3f924eb = messages.StickerSet;
@@ -1706,6 +1710,19 @@ account.connectedBots#17d7f87b connected_bots:Vector<ConnectedBot> users:Vector<
 
 messages.dialogFilters#2ad93719 flags:# tags_enabled:flags.0?true filters:Vector<DialogFilter> = messages.DialogFilters;
 
+botBusinessConnection#896433b4 flags:# can_reply:flags.0?true disabled:flags.1?true connection_id:string user_id:long dc_id:int date:int = BotBusinessConnection;
+
+inputBusinessIntro#9c469cd flags:# title:string description:string sticker:flags.0?InputDocument = InputBusinessIntro;
+
+businessIntro#5a0a066d flags:# title:string description:string sticker:flags.0?Document = BusinessIntro;
+
+messages.myStickers#faff629d count:int sets:Vector<StickerSetCovered> = messages.MyStickers;
+
+inputCollectibleUsername#e39460a9 username:string = InputCollectible;
+inputCollectiblePhone#a2e214a4 phone:string = InputCollectible;
+
+fragment.collectibleInfo#6ebdff91 purchase_date:int currency:string amount:long crypto_currency:string crypto_amount:long url:string = fragment.CollectibleInfo;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1715,6 +1732,7 @@ invokeWithLayer#da9b0d0d {X:Type} layer:int query:!X = X;
 invokeWithoutUpdates#bf9459b7 {X:Type} query:!X = X;
 invokeWithMessagesRange#365275f2 {X:Type} range:MessageRange query:!X = X;
 invokeWithTakeout#aca9fd2e {X:Type} takeout_id:long query:!X = X;
+invokeWithBusinessConnection#dd289f8e {X:Type} connection_id:string query:!X = X;
 
 auth.sendCode#a677244f phone_number:string api_id:int api_hash:string settings:CodeSettings = auth.SentCode;
 auth.signUp#aac7b717 flags:# no_joined_notifications:flags.0?true phone_number:string phone_code_hash:string first_name:string last_name:string = auth.Authorization;
@@ -1837,6 +1855,10 @@ account.updateBusinessGreetingMessage#66cdafc4 flags:# message:flags.0?InputBusi
 account.updateBusinessAwayMessage#a26a7fa5 flags:# message:flags.0?InputBusinessAwayMessage = Bool;
 account.updateConnectedBot#9c2d527d flags:# can_reply:flags.0?true deleted:flags.1?true bot:InputUser recipients:InputBusinessRecipients = Updates;
 account.getConnectedBots#4ea4c80f = account.ConnectedBots;
+account.getBotBusinessConnection#76a86270 connection_id:string = Updates;
+account.updateBusinessIntro#a614d034 flags:# intro:flags.0?InputBusinessIntro = Bool;
+account.toggleConnectedBotPaused#646e1097 peer:InputPeer paused:Bool = Bool;
+account.disablePeerConnectedBot#5e437ed9 peer:InputPeer = Bool;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#b60f5918 id:InputUser = users.UserFull;
@@ -1951,7 +1973,7 @@ messages.reorderPinnedDialogs#3b1adf37 flags:# force:flags.0?true folder_id:int
 messages.getPinnedDialogs#d6b94df2 folder_id:int = messages.PeerDialogs;
 messages.setBotShippingResults#e5f672fa flags:# query_id:long error:flags.0?string shipping_options:flags.1?Vector<ShippingOption> = Bool;
 messages.setBotPrecheckoutResults#9c2dd95 flags:# success:flags.1?true query_id:long error:flags.0?string = Bool;
-messages.uploadMedia#519bc2b1 peer:InputPeer media:InputMedia = MessageMedia;
+messages.uploadMedia#14967978 flags:# business_connection_id:flags.0?string peer:InputPeer media:InputMedia = MessageMedia;
 messages.sendScreenshotNotification#a1405817 peer:InputPeer reply_to:InputReplyTo random_id:long = Updates;
 messages.getFavedStickers#4f1aaa9 hash:long = messages.FavedStickers;
 messages.faveSticker#b9ffc55b id:InputDocument unfave:Bool = Bool;
@@ -2073,9 +2095,10 @@ messages.checkQuickReplyShortcut#f1d0fbd3 shortcut:string = Bool;
 messages.editQuickReplyShortcut#5c003cef shortcut_id:int shortcut:string = Bool;
 messages.deleteQuickReplyShortcut#3cc04740 shortcut_id:int = Bool;
 messages.getQuickReplyMessages#94a495c3 flags:# shortcut_id:int id:flags.0?Vector<int> hash:long = messages.Messages;
-messages.sendQuickReplyMessages#33153ad4 peer:InputPeer shortcut_id:int = Updates;
+messages.sendQuickReplyMessages#6c750de1 peer:InputPeer shortcut_id:int id:Vector<int> random_id:Vector<long> = Updates;
 messages.deleteQuickReplyMessages#e105e910 shortcut_id:int id:Vector<int> = Updates;
 messages.toggleDialogFilterTags#fd2dda49 enabled:Bool = Bool;
+messages.getMyStickers#d0b5e1fc offset_id:long limit:int = messages.MyStickers;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#19c2f763 flags:# pts:int pts_limit:flags.1?int pts_total_limit:flags.0?int date:int qts:int qts_limit:flags.2?int = updates.Difference;
@@ -2219,7 +2242,7 @@ payments.applyGiftCode#f6e26854 slug:string = Updates;
 payments.getGiveawayInfo#f4239425 peer:InputPeer msg_id:int = payments.GiveawayInfo;
 payments.launchPrepaidGiveaway#5ff58f20 peer:InputPeer giveaway_id:long purpose:InputStorePaymentPurpose = Updates;
 
-stickers.createStickerSet#9021ab67 flags:# masks:flags.0?true animated:flags.1?true videos:flags.4?true emojis:flags.5?true text_color:flags.6?true user_id:InputUser title:string short_name:string thumb:flags.2?InputDocument stickers:Vector<InputStickerSetItem> software:flags.3?string = messages.StickerSet;
+stickers.createStickerSet#9021ab67 flags:# masks:flags.0?true emojis:flags.5?true text_color:flags.6?true user_id:InputUser title:string short_name:string thumb:flags.2?InputDocument stickers:Vector<InputStickerSetItem> software:flags.3?string = messages.StickerSet;
 stickers.removeStickerFromSet#f7760f51 sticker:InputDocument = messages.StickerSet;
 stickers.changeStickerPosition#ffb6d4ca sticker:InputDocument position:int = messages.StickerSet;
 stickers.addStickerToSet#8653febe stickerset:InputStickerSet sticker:InputStickerSetItem = messages.StickerSet;
@@ -2229,6 +2252,7 @@ stickers.suggestShortName#4dafc503 title:string = stickers.SuggestedShortName;
 stickers.changeSticker#f5537ebc flags:# sticker:InputDocument emoji:flags.0?string mask_coords:flags.1?MaskCoords keywords:flags.2?string = messages.StickerSet;
 stickers.renameStickerSet#124b1c00 stickerset:InputStickerSet title:string = messages.StickerSet;
 stickers.deleteStickerSet#87704394 stickerset:InputStickerSet = Bool;
+stickers.replaceSticker#4696459a sticker:InputDocument new_sticker:InputStickerSetItem = messages.StickerSet;
 
 phone.getCallConfig#55451fa9 = DataJSON;
 phone.requestCall#42ff96ed flags:# video:flags.0?true user_id:InputUser random_id:int g_a_hash:bytes protocol:PhoneCallProtocol = phone.PhoneCall;
@@ -2329,4 +2353,6 @@ smsjobs.getStatus#10a698e8 = smsjobs.Status;
 smsjobs.getSmsJob#778d902f job_id:string = SmsJob;
 smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
-// LAYER 176
+fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
+
+// LAYER 177
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 5f7cb56b1..36a4ef35a 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -181,6 +181,7 @@ AdminLog::OwnedItem GenerateForwardedItem(
 			MTPint(), // saved_date
 			MTPstring()), // psa_type
 		MTPlong(), // via_bot_id
+		MTPlong(), // via_business_bot_id
 		MTPMessageReplyHeader(),
 		MTP_int(base::unixtime::now()), // date
 		MTP_string(text),

From 90e572c8b18088248b8a1a47d720c7bd50887eea Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 16 Mar 2024 10:58:07 +0400
Subject: [PATCH 100/596] Improve mixed stickerpacks support.

---
 .../SourceFiles/boxes/sticker_set_box.cpp     |  7 ++-
 Telegram/SourceFiles/boxes/stickers_box.cpp   |  9 +--
 .../calls/group/calls_group_call.cpp          | 23 ++++----
 .../chat_helpers/stickers_list_footer.cpp     |  4 +-
 .../chat_helpers/stickers_lottie.cpp          |  8 +--
 .../chat_helpers/stickers_lottie.h            |  8 ++-
 .../data/stickers/data_stickers.cpp           | 21 ++++++-
 .../SourceFiles/data/stickers/data_stickers.h |  2 +
 .../data/stickers/data_stickers_set.cpp       |  9 ++-
 .../data/stickers/data_stickers_set.h         | 12 +++-
 .../SourceFiles/storage/storage_account.cpp   | 56 ++++++++++++++++---
 11 files changed, 117 insertions(+), 42 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 6f5966de6..414f098e2 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -353,6 +353,7 @@ private:
 	int _perRow = 0;
 	QSize _singleSize;
 	TimeId _setInstallDate = TimeId(0);
+	StickerType _setThumbnailType = StickerType::Webp;
 	ImageWithLocation _setThumbnail;
 
 	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
@@ -755,6 +756,8 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 							set,
 							thumb);
 						if (result.location.valid()) {
+							_setThumbnailType
+								= Data::ThumbnailTypeFromPhotoSize(thumb);
 							return result;
 						}
 					}
@@ -775,7 +778,7 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 				set->installDate = _setInstallDate;
 				set->stickers = _pack;
 				set->emoji = _emoji;
-				set->setThumbnail(_setThumbnail);
+				set->setThumbnail(_setThumbnail, _setThumbnailType);
 			}
 		});
 	}, [&](const MTPDmessages_stickerSetNotModified &data) {
@@ -855,7 +858,7 @@ void StickerSetBox::Inner::installDone(
 	}
 	const auto set = it->second.get();
 	set->thumbnailDocumentId = _setThumbnailDocumentId;
-	set->setThumbnail(_setThumbnail);
+	set->setThumbnail(_setThumbnail, _setThumbnailType);
 	set->stickers = _pack;
 	set->emoji = _emoji;
 
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 94c11d00f..01f6a1ed1 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -178,7 +178,6 @@ private:
 		[[nodiscard]] bool isRecentSet() const;
 		[[nodiscard]] bool isMasksSet() const;
 		[[nodiscard]] bool isEmojiSet() const;
-		[[nodiscard]] bool isWebm() const;
 		[[nodiscard]] bool isInstalled() const;
 		[[nodiscard]] bool isUnread() const;
 		[[nodiscard]] bool isArchived() const;
@@ -1174,10 +1173,6 @@ bool StickersBox::Inner::Row::isEmojiSet() const {
 	return (set->type() == Data::StickersType::Emoji);
 }
 
-bool StickersBox::Inner::Row::isWebm() const {
-	return (set->flags & SetFlag::Webm);
-}
-
 bool StickersBox::Inner::Row::isInstalled() const {
 	return (flagsOverride & SetFlag::Installed);
 }
@@ -1569,7 +1564,7 @@ void StickersBox::Inner::paintRowThumbnail(
 void StickersBox::Inner::validateLottieAnimation(not_null<Row*> row) {
 	if (row->lottie
 		|| !ChatHelpers::HasLottieThumbnail(
-			row->set->flags,
+			row->set->thumbnailType(),
 			row->thumbnailMedia.get(),
 			row->stickerMedia.get())) {
 		return;
@@ -1592,7 +1587,7 @@ void StickersBox::Inner::validateLottieAnimation(not_null<Row*> row) {
 void StickersBox::Inner::validateWebmAnimation(not_null<Row*> row) {
 	if (row->webm
 		|| !ChatHelpers::HasWebmThumbnail(
-			row->set->flags,
+			row->set->thumbnailType(),
 			row->thumbnailMedia.get(),
 			row->stickerMedia.get())) {
 		return;
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.cpp b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
index 5f7346913..fda260064 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
@@ -668,8 +668,9 @@ GroupCall::GroupCall(
 GroupCall::~GroupCall() {
 	destroyScreencast();
 	destroyController();
-
-	Core::App().mediaDevices().setCaptureMuteTracker(this, false);
+	if (!_rtmp) {
+		Core::App().mediaDevices().setCaptureMuteTracker(this, false);
+	}
 }
 
 bool GroupCall::isSharingScreen() const {
@@ -2091,14 +2092,16 @@ void GroupCall::setupMediaDevices() {
 		_cameraCapture->switchToDevice(deviceId.value.toStdString(), false);
 	}, _lifetime);
 
-	_muted.value() | rpl::start_with_next([=](MuteState state) {
-		const auto devices = &Core::App().mediaDevices();
-		const auto muted = (state != MuteState::Active)
-			&& (state != MuteState::PushToTalk);
-		const auto track = !muted || (state == MuteState::Muted);
-		devices->setCaptureMuteTracker(this, track);
-		devices->setCaptureMuted(muted);
-	}, _lifetime);
+	if (!_rtmp) {
+		_muted.value() | rpl::start_with_next([=](MuteState state) {
+			const auto devices = &Core::App().mediaDevices();
+			const auto muted = (state != MuteState::Active)
+				&& (state != MuteState::PushToTalk);
+			const auto track = !muted || (state == MuteState::Muted);
+			devices->setCaptureMuteTracker(this, track);
+			devices->setCaptureMuted(muted);
+		}, _lifetime);
+	}
 }
 
 void GroupCall::captureMuteChanged(bool mute) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index d77a7cafd..a33462f4a 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -1182,7 +1182,7 @@ void StickersListFooter::validateIconLottieAnimation(
 	if (icon.lottie
 		|| !icon.sticker
 		|| !HasLottieThumbnail(
-			icon.set ? icon.set->flags : Data::StickersSetFlags(),
+			icon.set ? icon.set->thumbnailType() : StickerType(),
 			icon.thumbnailMedia.get(),
 			icon.stickerMedia.get())) {
 		return;
@@ -1211,7 +1211,7 @@ void StickersListFooter::validateIconWebmAnimation(
 	if (icon.webm
 		|| !icon.sticker
 		|| !HasWebmThumbnail(
-			icon.set ? icon.set->flags : Data::StickersSetFlags(),
+			icon.set ? icon.set->thumbnailType() : StickerType(),
 			icon.thumbnailMedia.get(),
 			icon.stickerMedia.get())) {
 		return;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp b/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp
index fe36c825c..5e2aceb7a 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp
@@ -138,11 +138,11 @@ not_null<Lottie::Animation*> LottieAnimationFromDocument(
 }
 
 bool HasLottieThumbnail(
-		Data::StickersSetFlags flags,
+		StickerType thumbType,
 		Data::StickersSetThumbnailView *thumb,
 		Data::DocumentMedia *media) {
 	if (thumb) {
-		return !(flags & Data::StickersSetFlag::Webm)
+		return (thumbType == StickerType::Tgs)
 			&& !thumb->content().isEmpty();
 	} else if (!media) {
 		return false;
@@ -200,11 +200,11 @@ std::unique_ptr<Lottie::SinglePlayer> LottieThumbnail(
 }
 
 bool HasWebmThumbnail(
-		Data::StickersSetFlags flags,
+		StickerType thumbType,
 		Data::StickersSetThumbnailView *thumb,
 		Data::DocumentMedia *media) {
 	if (thumb) {
-		return (flags & Data::StickersSetFlag::Webm)
+		return (thumbType == StickerType::Webm)
 			&& !thumb->content().isEmpty();
 	} else if (!media) {
 		return false;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_lottie.h b/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
index d1581374f..156d0a9bb 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+enum class StickerType : uchar;
+
 namespace base {
 template <typename Enum>
 class Flags;
@@ -43,7 +45,7 @@ class PathShiftGradient;
 namespace Data {
 class DocumentMedia;
 class StickersSetThumbnailView;
-enum class StickersSetFlag;
+enum class StickersSetFlag : ushort;
 using StickersSetFlags = base::flags<StickersSetFlag>;
 } // namespace Data
 
@@ -90,7 +92,7 @@ enum class StickerLottieSize : uint8 {
 	QSize box);
 
 [[nodiscard]] bool HasLottieThumbnail(
-	Data::StickersSetFlags flags,
+	StickerType thumbType,
 	Data::StickersSetThumbnailView *thumb,
 	Data::DocumentMedia *media);
 [[nodiscard]] std::unique_ptr<Lottie::SinglePlayer> LottieThumbnail(
@@ -101,7 +103,7 @@ enum class StickerLottieSize : uint8 {
 	std::shared_ptr<Lottie::FrameRenderer> renderer = nullptr);
 
 [[nodiscard]] bool HasWebmThumbnail(
-	Data::StickersSetFlags flags,
+	StickerType thumbType,
 	Data::StickersSetThumbnailView *thumb,
 	Data::DocumentMedia *media);
 [[nodiscard]] Media::Clip::ReaderPointer WebmThumbnail(
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index c18a1c3bf..11c410da3 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -1003,6 +1003,7 @@ void Stickers::featuredReceived(
 		auto it = sets.find(data->vid().v);
 		const auto title = getSetTitle(*data);
 		const auto installDate = data->vinstalled_date().value_or_empty();
+		auto thumbnailType = StickerType::Webp;
 		const auto thumbnail = [&] {
 			if (const auto thumbs = data->vthumbs()) {
 				for (const auto &thumb : thumbs->v) {
@@ -1011,6 +1012,7 @@ void Stickers::featuredReceived(
 						*data,
 						thumb);
 					if (result.location.valid()) {
+						thumbnailType = ThumbnailTypeFromPhotoSize(thumb);
 						return result;
 					}
 				}
@@ -1046,7 +1048,7 @@ void Stickers::featuredReceived(
 				set->flags |= SetFlag::NotLoaded; // need to request this set
 			}
 		}
-		it->second->setThumbnail(thumbnail);
+		it->second->setThumbnail(thumbnail, thumbnailType);
 		it->second->thumbnailDocumentId = data->vthumb_document_id().value_or_empty();
 		featuredOrder.push_back(data->vid().v);
 		if (it->second->stickers.isEmpty()
@@ -1415,6 +1417,7 @@ not_null<StickersSet*> Stickers::feedSet(const MTPStickerSet &info) {
 	auto it = sets.find(data.vid().v);
 	auto title = getSetTitle(data);
 	auto oldFlags = StickersSetFlags(0);
+	auto thumbnailType = StickerType::Webp;
 	const auto thumbnail = [&] {
 		if (const auto thumbs = data.vthumbs()) {
 			for (const auto &thumb : thumbs->v) {
@@ -1423,6 +1426,7 @@ not_null<StickersSet*> Stickers::feedSet(const MTPStickerSet &info) {
 					data,
 					thumb);
 				if (result.location.valid()) {
+					thumbnailType = Data::ThumbnailTypeFromPhotoSize(thumb);
 					return result;
 				}
 			}
@@ -1467,7 +1471,7 @@ not_null<StickersSet*> Stickers::feedSet(const MTPStickerSet &info) {
 		}
 	}
 	const auto set = it->second.get();
-	set->setThumbnail(thumbnail);
+	set->setThumbnail(thumbnail, thumbnailType);
 	set->thumbnailDocumentId = data.vthumb_document_id().value_or_empty();
 	auto changedFlags = (oldFlags ^ set->flags);
 	if (changedFlags & SetFlag::Archived) {
@@ -1683,4 +1687,17 @@ RecentStickerPack &Stickers::getRecentPack() const {
 	return cRefRecentStickers();
 }
 
+StickerType ThumbnailTypeFromPhotoSize(const MTPPhotoSize &size) {
+	const auto &type = size.match([&](const auto &data) {
+		return data.vtype().v;
+	});
+	const auto ch = type.isEmpty() ? char() : type[0];
+	switch (ch) {
+	case 's': return StickerType::Webp;
+	case 'a': return StickerType::Tgs;
+	case 'v': return StickerType::Webm;
+	}
+	return StickerType::Webp;
+}
+
 } // namespace Stickers
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.h b/Telegram/SourceFiles/data/stickers/data_stickers.h
index f469f173c..7b8937846 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.h
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.h
@@ -36,6 +36,8 @@ enum class StickersType : uchar {
 	Masks,
 	Emoji,
 };
+[[nodiscard]] StickerType ThumbnailTypeFromPhotoSize(
+	const MTPPhotoSize &size);
 
 class Stickers final {
 public:
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers_set.cpp b/Telegram/SourceFiles/data/stickers/data_stickers_set.cpp
index dc53c0a35..324377242 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers_set.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers_set.cpp
@@ -118,7 +118,10 @@ bool StickersSet::channelStatus() const {
 	return flags & StickersSetFlag::ChannelStatus;
 }
 
-void StickersSet::setThumbnail(const ImageWithLocation &data) {
+void StickersSet::setThumbnail(
+		const ImageWithLocation &data,
+		StickerType type) {
+	_thumbnailType = type;
 	Data::UpdateCloudFile(
 		_thumbnail,
 		data,
@@ -139,6 +142,10 @@ bool StickersSet::hasThumbnail() const {
 	return _thumbnail.location.valid();
 }
 
+StickerType StickersSet::thumbnailType() const {
+	return _thumbnailType;
+}
+
 bool StickersSet::thumbnailLoading() const {
 	return (_thumbnail.loader != nullptr);
 }
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers_set.h b/Telegram/SourceFiles/data/stickers/data_stickers_set.h
index e9124471c..e77ee46b5 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers_set.h
+++ b/Telegram/SourceFiles/data/stickers/data_stickers_set.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_cloud_file.h"
 
 class DocumentData;
+enum class StickerType : uchar;
 
 namespace Main {
 class Session;
@@ -46,7 +47,7 @@ private:
 
 };
 
-enum class StickersSetFlag {
+enum class StickersSetFlag : ushort {
 	Installed = (1 << 0),
 	Archived = (1 << 1),
 	Masks = (1 << 2),
@@ -55,7 +56,6 @@ enum class StickersSetFlag {
 	Featured = (1 << 5),
 	Unread = (1 << 6),
 	Special = (1 << 7),
-	Webm = (1 << 8),
 	Emoji = (1 << 9),
 	TextColor = (1 << 10),
 	ChannelStatus = (1 << 11),
@@ -89,9 +89,10 @@ public:
 	[[nodiscard]] bool textColor() const;
 	[[nodiscard]] bool channelStatus() const;
 
-	void setThumbnail(const ImageWithLocation &data);
+	void setThumbnail(const ImageWithLocation &data, StickerType type);
 
 	[[nodiscard]] bool hasThumbnail() const;
+	[[nodiscard]] StickerType thumbnailType() const;
 	[[nodiscard]] bool thumbnailLoading() const;
 	[[nodiscard]] bool thumbnailFailed() const;
 	void loadThumbnail();
@@ -111,6 +112,11 @@ public:
 	int count = 0;
 	int locked = 0;
 	StickersSetFlags flags;
+
+private:
+	StickerType _thumbnailType = {};
+
+public:
 	TimeId installDate = 0;
 	StickersPack covers;
 	StickersPack stickers;
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index c961c891b..ca04135e8 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -44,7 +44,7 @@ using Database = Cache::Database;
 constexpr auto kDelayedWriteTimeout = crl::time(1000);
 
 constexpr auto kStickersVersionTag = quint32(-1);
-constexpr auto kStickersSerializeVersion = 3;
+constexpr auto kStickersSerializeVersion = 4;
 constexpr auto kMaxSavedStickerSetsCount = 1000;
 constexpr auto kDefaultStickerInstallDate = TimeId(1);
 
@@ -1683,7 +1683,8 @@ void Account::writeStickerSet(
 			<< qint32(count)
 			<< qint32(set.flags)
 			<< qint32(set.installDate)
-			<< quint64(set.thumbnailDocumentId);
+			<< quint64(set.thumbnailDocumentId)
+			<< qint32(set.thumbnailType());
 		Serialize::writeImageLocation(stream, set.thumbnailLocation());
 	};
 	if (set.flags & SetFlag::NotLoaded) {
@@ -1752,11 +1753,23 @@ void Account::writeStickerSets(
 			continue;
 		}
 
-		// id + accessHash + hash + title + shortName + stickersCount + flags + installDate
+		// id
+		// + accessHash
+		// + hash
+		// + title
+		// + shortName
+		// + stickersCount
+		// + flags
+		// + installDate
+		// + thumbnailDocumentId
+		// + thumbnailType
+		// + thumbnailLocation
 		size += sizeof(quint64) * 3
 			+ Serialize::stringSize(raw->title)
 			+ Serialize::stringSize(raw->shortName)
 			+ sizeof(qint32) * 3
+			+ sizeof(quint64)
+			+ sizeof(qint32)
 			+ Serialize::imageLocationSize(raw->thumbnailLocation());
 		if (raw->flags & SetFlag::NotLoaded) {
 			continue;
@@ -1838,8 +1851,7 @@ void Account::readStickerSets(
 	quint32 versionTag = 0;
 	qint32 version = 0;
 	stickers.stream >> versionTag >> version;
-	if (versionTag != kStickersVersionTag
-		|| (version != 2 && version != kStickersSerializeVersion)) {
+	if (versionTag != kStickersVersionTag || version < 2) {
 		// Old data, without sticker set thumbnails.
 		return failed();
 	}
@@ -1858,6 +1870,7 @@ void Account::readStickerSets(
 		qint32 setInstallDate = 0;
 		Data::StickersSetFlags setFlags = 0;
 		qint32 setFlagsValue = 0;
+		qint32 setThumbnailType = qint32(StickerType::Webp);
 		ImageLocation setThumbnail;
 
 		stickers.stream
@@ -1871,6 +1884,14 @@ void Account::readStickerSets(
 			>> setInstallDate;
 		if (version > 2) {
 			stickers.stream >> setThumbnailDocumentId;
+			if (version > 3) {
+				stickers.stream >> setThumbnailType;
+			}
+		}
+
+		constexpr auto kLegacyFlagWebm = (1 << 8);
+		if ((version < 4) && (setFlagsValue & kLegacyFlagWebm)) {
+			setThumbnailType = qint32(StickerType::Webm);
 		}
 		const auto thumbnail = Serialize::readImageLocation(
 			stickers.version,
@@ -1903,7 +1924,8 @@ void Account::readStickerSets(
 		}
 
 		auto it = sets.find(setId);
-		if (it == sets.cend()) {
+		auto settingSet = (it == sets.cend());
+		if (settingSet) {
 			// We will set this flags from order lists when reading those stickers.
 			setFlags &= ~(SetFlag::Installed | SetFlag::Featured);
 			it = sets.emplace(setId, std::make_unique<Data::StickersSet>(
@@ -1916,8 +1938,6 @@ void Account::readStickerSets(
 				0,
 				setFlags,
 				setInstallDate)).first;
-			it->second->setThumbnail(
-				ImageWithLocation{ .location = setThumbnail });
 			it->second->thumbnailDocumentId = setThumbnailDocumentId;
 		}
 		const auto set = it->second.get();
@@ -2014,6 +2034,26 @@ void Account::readStickerSets(
 				}
 			}
 		}
+
+		if (settingSet) {
+			if (version < 4
+				&& setThumbnailType == qint32(StickerType::Webp)
+				&& !set->stickers.empty()
+				&& set->stickers.front()->sticker()) {
+				const auto first = set->stickers.front();
+				setThumbnailType = qint32(first->sticker()->type);
+			}
+			const auto thumbType = [&] {
+				switch (setThumbnailType) {
+				case qint32(StickerType::Webp): return StickerType::Webp;
+				case qint32(StickerType::Tgs): return StickerType::Tgs;
+				case qint32(StickerType::Webm): return StickerType::Webm;
+				}
+				return StickerType::Webp;
+			}();
+			set->setThumbnail(
+				ImageWithLocation{ .location = setThumbnail }, thumbType);
+		}
 	}
 
 	// Read orders of installed and featured stickers.

From caa4c5428a2b6dd9e0d7475e274a932b7917b1ae Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Mar 2024 10:02:14 +0400
Subject: [PATCH 101/596] Show via_business_bot name in signature.

---
 Telegram/SourceFiles/history/history_item.cpp | 32 ++++++++++++-------
 .../history/history_item_components.h         |  3 +-
 .../history/view/history_view_bottom_info.cpp |  2 +-
 .../history/view/history_view_element.cpp     |  2 +-
 .../history/view/history_view_message.cpp     |  6 ++--
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index bfa68bed5..cec1042d5 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -146,6 +146,7 @@ struct HistoryItem::CreateConfig {
 	ReplyFields reply;
 
 	UserId viaBotId = 0;
+	UserId viaBusinessBotId = 0;
 	int viewsCount = -1;
 	int forwardsCount = -1;
 	int boostsApplied = 0;
@@ -2577,8 +2578,8 @@ QString HistoryItem::originalPostAuthor() const {
 	if (const auto forwarded = Get<HistoryMessageForwarded>()) {
 		return forwarded->originalPostAuthor;
 	} else if (const auto msgsigned = Get<HistoryMessageSigned>()) {
-		if (!msgsigned->isAnonymousRank) {
-			return msgsigned->postAuthor;
+		if (!msgsigned->isAnonymousRank && !msgsigned->viaBusinessBot) {
+			return msgsigned->author;
 		}
 	}
 	return QString();
@@ -2650,7 +2651,9 @@ void HistoryItem::setForwardsCount(int count) {
 
 void HistoryItem::setPostAuthor(const QString &postAuthor) {
 	auto msgsigned = Get<HistoryMessageSigned>();
-	if (postAuthor.isEmpty()) {
+	if (msgsigned && msgsigned->viaBusinessBot) {
+		return;
+	} else if (postAuthor.isEmpty()) {
 		if (!msgsigned) {
 			return;
 		}
@@ -2661,10 +2664,10 @@ void HistoryItem::setPostAuthor(const QString &postAuthor) {
 	if (!msgsigned) {
 		AddComponents(HistoryMessageSigned::Bit());
 		msgsigned = Get<HistoryMessageSigned>();
-	} else if (msgsigned->postAuthor == postAuthor) {
+	} else if (msgsigned->author == postAuthor) {
 		return;
 	}
-	msgsigned->postAuthor = postAuthor;
+	msgsigned->author = postAuthor;
 	msgsigned->isAnonymousRank = !isDiscussionPost()
 		&& this->author()->isMegagroup();
 	history()->owner().requestItemResize(this);
@@ -3272,7 +3275,7 @@ void HistoryItem::createComponents(CreateConfig &&config) {
 	if (config.viewsCount >= 0 || !config.replies.isNull) {
 		mask |= HistoryMessageViews::Bit();
 	}
-	if (!config.postAuthor.isEmpty()) {
+	if (!config.postAuthor.isEmpty() || config.viaBusinessBotId) {
 		mask |= HistoryMessageSigned::Bit();
 	} else if (_history->peer->isMegagroup() // Discussion posts signatures.
 		&& config.savedFromPeer
@@ -3345,11 +3348,17 @@ void HistoryItem::createComponents(CreateConfig &&config) {
 		edited->date = config.editDate;
 	}
 	if (const auto msgsigned = Get<HistoryMessageSigned>()) {
-		msgsigned->postAuthor = config.postAuthor.isEmpty()
-			? config.originalPostAuthor
-			: config.postAuthor;
-		msgsigned->isAnonymousRank = !isDiscussionPost()
-			&& author()->isMegagroup();
+		if (config.viaBusinessBotId) {
+			msgsigned->viaBusinessBot = _history->owner().user(
+				config.viaBusinessBotId);
+			msgsigned->author = msgsigned->viaBusinessBot->name();
+		} else {
+			msgsigned->author = config.postAuthor.isEmpty()
+				? config.originalPostAuthor
+				: config.postAuthor;
+			msgsigned->isAnonymousRank = !isDiscussionPost()
+				&& author()->isMegagroup();
+		}
 	}
 	setupForwardedComponent(config);
 	if (const auto markup = Get<HistoryMessageReplyMarkup>()) {
@@ -3636,6 +3645,7 @@ void HistoryItem::createComponents(const MTPDmessage &data) {
 		config.reply = ReplyFieldsFromMTP(this, *reply);
 	}
 	config.viaBotId = data.vvia_bot_id().value_or_empty();
+	config.viaBusinessBotId = data.vvia_business_bot_id().value_or_empty();
 	config.viewsCount = data.vviews().value_or(-1);
 	config.forwardsCount = data.vforwards().value_or(-1);
 	config.replies = isScheduled()
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 4d60ff9a3..61b1d86f4 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -78,7 +78,8 @@ struct HistoryMessageViews : public RuntimeComponent<HistoryMessageViews, Histor
 };
 
 struct HistoryMessageSigned : public RuntimeComponent<HistoryMessageSigned, HistoryItem> {
-	QString postAuthor;
+	QString author;
+	UserData *viaBusinessBot = nullptr;
 	bool isAnonymousRank = false;
 };
 
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index a13eb3fe5..a4000efe1 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -663,7 +663,7 @@ BottomInfo::Data BottomInfoDataFromMessage(not_null<Message*> message) {
 	}
 	if (const auto msgsigned = item->Get<HistoryMessageSigned>()) {
 		 if (!msgsigned->isAnonymousRank) {
-			result.author = msgsigned->postAuthor;
+			result.author = msgsigned->author;
 		 }
 	}
 	if (message->displayedEditDate()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 3e142d0c9..1f99b66c7 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -279,7 +279,7 @@ QString DateTooltipText(not_null<Element*> view) {
 			dateText += '\n' + tr::lng_signed_author(
 				tr::now,
 				lt_user,
-				msgsigned->postAuthor);
+				msgsigned->author);
 		}
 	}
 	if (item->isScheduled() && item->isSilent()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 2e8f79f30..419644095 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -462,8 +462,10 @@ void Message::refreshRightBadge() {
 				: tr::lng_channel_badge(tr::now);
 		} else if (item->author()->isMegagroup()) {
 			if (const auto msgsigned = item->Get<HistoryMessageSigned>()) {
-				Assert(msgsigned->isAnonymousRank);
-				return msgsigned->postAuthor;
+				if (!msgsigned->viaBusinessBot) {
+					Assert(msgsigned->isAnonymousRank);
+					return msgsigned->author;
+				}
 			}
 		}
 		const auto channel = item->history()->peer->asMegagroup();

From 3d97ea6f96c2d301f088d244b6f973fa7b83ea48 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Mar 2024 13:17:34 +0400
Subject: [PATCH 102/596] Track chat business bot state.

---
 Telegram/SourceFiles/api/api_updates.cpp      |  2 +-
 Telegram/SourceFiles/apiwrap.cpp              |  2 +-
 .../boxes/peers/edit_contact_box.cpp          | 14 ++---
 Telegram/SourceFiles/data/data_peer.cpp       | 47 ++++++++++++++--
 Telegram/SourceFiles/data/data_peer.h         | 56 ++++++++++---------
 Telegram/SourceFiles/data/data_user.cpp       |  2 +-
 .../view/history_view_contact_status.cpp      | 44 +++++++--------
 .../SourceFiles/window/window_peer_menu.cpp   |  4 +-
 8 files changed, 106 insertions(+), 65 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 839584713..c9c000782 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1943,7 +1943,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		const auto &d = update.c_updatePeerSettings();
 		const auto peerId = peerFromMTP(d.vpeer());
 		if (const auto peer = session().data().peerLoaded(peerId)) {
-			peer->setSettings(d.vsettings());
+			peer->setBarSettings(d.vsettings());
 		}
 	} break;
 
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 63cfcd5f9..a9960a1dd 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -1229,7 +1229,7 @@ void ApiWrap::requestPeerSettings(not_null<PeerData*> peer) {
 		result.match([&](const MTPDmessages_peerSettings &data) {
 			_session->data().processUsers(data.vusers());
 			_session->data().processChats(data.vchats());
-			peer->setSettings(data.vsettings());
+			peer->setBarSettings(data.vsettings());
 			_requestedPeerSettings.erase(peer);
 		});
 	}).fail([=] {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
index 19af19ac6..4bc2848c7 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
@@ -61,11 +61,11 @@ void SendRequest(
 			user->nameOrPhone,
 			user->username());
 		user->session().api().applyUpdates(result);
-		if (const auto settings = user->settings()) {
-			const auto flags = PeerSetting::AddContact
-				| PeerSetting::BlockContact
-				| PeerSetting::ReportSpam;
-			user->setSettings(*settings & ~flags);
+		if (const auto settings = user->barSettings()) {
+			const auto flags = PeerBarSetting::AddContact
+				| PeerBarSetting::BlockContact
+				| PeerBarSetting::ReportSpam;
+			user->setBarSettings(*settings & ~flags);
 		}
 		if (box) {
 			if (!wasContact) {
@@ -258,9 +258,9 @@ void Controller::setupWarning() {
 }
 
 void Controller::setupSharePhoneNumber() {
-	const auto settings = _user->settings();
+	const auto settings = _user->barSettings();
 	if (!settings
-		|| !((*settings) & PeerSetting::NeedContactsException)) {
+		|| !((*settings) & PeerBarSetting::NeedContactsException)) {
 		return;
 	}
 	_sharePhone = _box->addRow(
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 78c2051a0..00cb5fd2d 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -634,13 +634,26 @@ void PeerData::saveTranslationDisabled(bool disabled) {
 	)).send();
 }
 
-void PeerData::setSettings(const MTPPeerSettings &data) {
+void PeerData::setBarSettings(const MTPPeerSettings &data) {
 	data.match([&](const MTPDpeerSettings &data) {
-		_requestChatTitle = data.vrequest_chat_title().value_or_empty();
-		_requestChatDate = data.vrequest_chat_date().value_or_empty();
-
-		using Flag = PeerSetting;
-		setSettings((data.is_add_contact() ? Flag::AddContact : Flag())
+		if (!data.vbusiness_bot_id() && !data.vrequest_chat_title()) {
+			_barDetails = nullptr;
+		} else if (!_barDetails) {
+			_barDetails = std::make_unique<PeerBarDetails>();
+		}
+		if (_barDetails) {
+			_barDetails->requestChatTitle
+				= qs(data.vrequest_chat_title().value_or_empty());
+			_barDetails->requestChatDate
+				= data.vrequest_chat_date().value_or_empty();
+			_barDetails->businessBot = data.vbusiness_bot_id()
+				? _owner->user(data.vbusiness_bot_id()->v).get()
+				: nullptr;
+			_barDetails->businessBotManageUrl
+				= qs(data.vbusiness_bot_manage_url().value_or_empty());
+		}
+		using Flag = PeerBarSetting;
+		setBarSettings((data.is_add_contact() ? Flag::AddContact : Flag())
 			| (data.is_autoarchived() ? Flag::AutoArchived : Flag())
 			| (data.is_block_contact() ? Flag::BlockContact : Flag())
 			//| (data.is_invite_members() ? Flag::InviteMembers : Flag())
@@ -651,11 +664,33 @@ void PeerData::setSettings(const MTPPeerSettings &data) {
 			| (data.is_report_spam() ? Flag::ReportSpam : Flag())
 			| (data.is_share_contact() ? Flag::ShareContact : Flag())
 			| (data.vrequest_chat_title() ? Flag::RequestChat : Flag())
+			| (data.vbusiness_bot_id() ? Flag::HasBusinessBot : Flag())
 			| (data.is_request_chat_broadcast()
 				? Flag::RequestChatIsBroadcast
+				: Flag())
+			| (data.is_business_bot_paused()
+				? Flag::BusinessBotPaused
+				: Flag())
+			| (data.is_business_bot_can_reply()
+				? Flag::BusinessBotCanReply
 				: Flag()));
 	});
 }
+QString PeerData::requestChatTitle() const {
+	return _barDetails ? _barDetails->requestChatTitle : QString();
+}
+
+TimeId PeerData::requestChatDate() const {
+	return _barDetails ? _barDetails->requestChatDate : 0;
+}
+
+UserData *PeerData::businessBot() const {
+	return _barDetails ? _barDetails->businessBot : nullptr;
+}
+
+QString PeerData::businessBotManageUrl() const {
+	return _barDetails ? _barDetails->businessBotManageUrl : QString();
+}
 
 bool PeerData::changeColorIndex(
 		const tl::conditional<MTPint> &cloudColorIndex) {
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 0252063f4..ab309ec1b 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -139,7 +139,7 @@ private:
 
 };
 
-enum class PeerSetting {
+enum class PeerBarSetting {
 	ReportSpam = (1 << 0),
 	AddContact = (1 << 1),
 	BlockContact = (1 << 2),
@@ -148,10 +148,20 @@ enum class PeerSetting {
 	AutoArchived = (1 << 5),
 	RequestChat = (1 << 6),
 	RequestChatIsBroadcast = (1 << 7),
-	Unknown = (1 << 8),
+	HasBusinessBot = (1 << 8),
+	BusinessBotPaused = (1 << 9),
+	BusinessBotCanReply = (1 << 10),
+	Unknown = (1 << 11),
+};
+inline constexpr bool is_flag_type(PeerBarSetting) { return true; };
+using PeerBarSettings = base::flags<PeerBarSetting>;
+
+struct PeerBarDetails {
+	QString requestChatTitle;
+	TimeId requestChatDate;
+	UserData *businessBot = nullptr;
+	QString businessBotManageUrl;
 };
-inline constexpr bool is_flag_type(PeerSetting) { return true; };
-using PeerSettings = base::flags<PeerSetting>;
 
 class PeerData {
 protected:
@@ -160,7 +170,7 @@ protected:
 	PeerData &operator=(const PeerData &other) = delete;
 
 public:
-	using Settings = Data::Flags<PeerSettings>;
+	using BarSettings = Data::Flags<PeerBarSettings>;
 
 	virtual ~PeerData();
 
@@ -346,25 +356,23 @@ public:
 
 	void checkFolder(FolderId folderId);
 
-	void setSettings(PeerSettings which) {
-		_settings.set(which);
+	void setBarSettings(PeerBarSettings which) {
+		_barSettings.set(which);
 	}
-	[[nodiscard]] auto settings() const {
-		return (_settings.current() & PeerSetting::Unknown)
+	[[nodiscard]] auto barSettings() const {
+		return (_barSettings.current() & PeerBarSetting::Unknown)
 			? std::nullopt
-			: std::make_optional(_settings.current());
+			: std::make_optional(_barSettings.current());
 	}
-	[[nodiscard]] auto settingsValue() const {
-		return (_settings.current() & PeerSetting::Unknown)
-			? _settings.changes()
-			: (_settings.value() | rpl::type_erased());
-	}
-	[[nodiscard]] QString requestChatTitle() const {
-		return _requestChatTitle;
-	}
-	[[nodiscard]] TimeId requestChatDate() const {
-		return _requestChatDate;
+	[[nodiscard]] auto barSettingsValue() const {
+		return (_barSettings.current() & PeerBarSetting::Unknown)
+			? _barSettings.changes()
+			: (_barSettings.value() | rpl::type_erased());
 	}
+	[[nodiscard]] QString requestChatTitle() const;
+	[[nodiscard]] TimeId requestChatDate() const;
+	[[nodiscard]] UserData *businessBot() const;
+	[[nodiscard]] QString businessBotManageUrl() const;
 
 	enum class TranslationFlag : uchar {
 		Unknown,
@@ -375,7 +383,7 @@ public:
 	[[nodiscard]] TranslationFlag translationFlag() const;
 	void saveTranslationDisabled(bool disabled);
 
-	void setSettings(const MTPPeerSettings &data);
+	void setBarSettings(const MTPPeerSettings &data);
 	bool changeColorIndex(const tl::conditional<MTPint> &cloudColorIndex);
 	bool changeBackgroundEmojiId(
 		const tl::conditional<MTPlong> &cloudBackgroundEmoji);
@@ -485,10 +493,8 @@ private:
 
 	TimeId _ttlPeriod = 0;
 
-	QString _requestChatTitle;
-	TimeId _requestChatDate = 0;
-
-	Settings _settings = PeerSettings(PeerSetting::Unknown);
+	BarSettings _barSettings = PeerBarSettings(PeerBarSetting::Unknown);
+	std::unique_ptr<PeerBarDetails> _barDetails;
 
 	BlockStatus _blockStatus = BlockStatus::Unknown;
 	LoadedStatus _loadedStatus = LoadedStatus::Not;
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index a5c2a705d..313ed21bd 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -512,7 +512,7 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 			));
 		}
 	}
-	user->setSettings(update.vsettings());
+	user->setBarSettings(update.vsettings());
 	user->owner().notifySettings().apply(user, update.vnotify_settings());
 
 	user->setMessagesTTL(update.vttl_period().value_or_empty());
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index 5767831e2..5403cc656 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -49,7 +49,7 @@ namespace HistoryView {
 namespace {
 
 [[nodiscard]] bool BarCurrentlyHidden(not_null<PeerData*> peer) {
-	const auto settings = peer->settings();
+	const auto settings = peer->barSettings();
 	if (!settings) {
 		return false;
 	} else if (!(*settings)) {
@@ -59,10 +59,10 @@ namespace {
 		if (user->isBlocked()) {
 			return true;
 		} else if (user->isContact()
-			&& !((*settings) & PeerSetting::ShareContact)) {
+			&& !((*settings) & PeerBarSetting::ShareContact)) {
 			return true;
 		}
-	} else if (!((*settings) & PeerSetting::ReportSpam)) {
+	} else if (!((*settings) & PeerBarSetting::ReportSpam)) {
 		return true;
 	}
 	return false;
@@ -557,7 +557,7 @@ ContactStatus::ContactStatus(
 
 auto ContactStatus::PeerState(not_null<PeerData*> peer)
 -> rpl::producer<State> {
-	using SettingsChange = PeerData::Settings::Change;
+	using SettingsChange = PeerData::BarSettings::Change;
 	using Type = State::Type;
 	if (const auto user = peer->asUser()) {
 		using FlagsChange = UserData::Flags::Change;
@@ -570,31 +570,31 @@ auto ContactStatus::PeerState(not_null<PeerData*> peer)
 		});
 		return rpl::combine(
 			std::move(changes),
-			user->settingsValue()
+			user->barSettingsValue()
 		) | rpl::map([=](
 				FlagsChange flags,
 				SettingsChange settings) -> State {
 			if (flags.value & Flag::Blocked) {
 				return { Type::None };
 			} else if (user->isContact()) {
-				if (settings.value & PeerSetting::ShareContact) {
+				if (settings.value & PeerBarSetting::ShareContact) {
 					return { Type::SharePhoneNumber };
 				} else {
 					return { Type::None };
 				}
-			} else if (settings.value & PeerSetting::RequestChat) {
+			} else if (settings.value & PeerBarSetting::RequestChat) {
 				return {
 					.type = Type::RequestChatInfo,
 					.requestChatName = peer->requestChatTitle(),
 					.requestChatIsBroadcast = !!(settings.value
-						& PeerSetting::RequestChatIsBroadcast),
+						& PeerBarSetting::RequestChatIsBroadcast),
 					.requestDate = peer->requestChatDate(),
 				};
-			} else if (settings.value & PeerSetting::AutoArchived) {
+			} else if (settings.value & PeerBarSetting::AutoArchived) {
 				return { Type::UnarchiveOrBlock };
-			} else if (settings.value & PeerSetting::BlockContact) {
+			} else if (settings.value & PeerBarSetting::BlockContact) {
 				return { Type::AddOrBlock };
-			} else if (settings.value & PeerSetting::AddContact) {
+			} else if (settings.value & PeerBarSetting::AddContact) {
 				return { Type::Add };
 			} else {
 				return { Type::None };
@@ -602,12 +602,12 @@ auto ContactStatus::PeerState(not_null<PeerData*> peer)
 		});
 	}
 
-	return peer->settingsValue(
+	return peer->barSettingsValue(
 	) | rpl::map([=](SettingsChange settings) {
 		using Type = State::Type;
-		return (settings.value & PeerSetting::AutoArchived)
+		return (settings.value & PeerBarSetting::AutoArchived)
 			? State{ Type::UnarchiveOrReport }
-			: (settings.value & PeerSetting::ReportSpam)
+			: (settings.value & PeerBarSetting::ReportSpam)
 			? State{ Type::ReportSpam }
 			: State{ Type::None };
 	});
@@ -685,7 +685,7 @@ void ContactStatus::setupShareHandler(not_null<UserData*> user) {
 	) | rpl::start_with_next([=] {
 		const auto show = _controller->uiShow();
 		const auto share = [=](Fn<void()> &&close) {
-			user->setSettings(0);
+			user->setBarSettings(0);
 			user->session().api().request(MTPcontacts_AcceptContact(
 				user->inputUser
 			)).done([=](const MTPUpdates &result) {
@@ -718,11 +718,11 @@ void ContactStatus::setupUnarchiveHandler(not_null<PeerData*> peer) {
 		using namespace Window;
 		ToggleHistoryArchived(show, peer->owner().history(peer), false);
 		peer->owner().notifySettings().resetToDefault(peer);
-		if (const auto settings = peer->settings()) {
-			const auto flags = PeerSetting::AutoArchived
-				| PeerSetting::BlockContact
-				| PeerSetting::ReportSpam;
-			peer->setSettings(*settings & ~flags);
+		if (const auto settings = peer->barSettings()) {
+			const auto flags = PeerBarSetting::AutoArchived
+				| PeerBarSetting::BlockContact
+				| PeerBarSetting::ReportSpam;
+			peer->setBarSettings(*settings & ~flags);
 		}
 	}, _bar.lifetime());
 }
@@ -773,7 +773,7 @@ void ContactStatus::setupCloseHandler(not_null<PeerData*> peer) {
 	) | rpl::filter([=] {
 		return !(*request);
 	}) | rpl::start_with_next([=] {
-		peer->setSettings(0);
+		peer->setBarSettings(0);
 		*request = peer->session().api().request(
 			MTPmessages_HidePeerSettingsBar(peer->input)
 		).send();
@@ -807,7 +807,7 @@ void ContactStatus::setupRequestInfoHandler(not_null<PeerData*> peer) {
 				if (*request) {
 					return;
 				}
-				peer->setSettings(0);
+				peer->setBarSettings(0);
 				*request = peer->session().api().request(
 					MTPmessages_HidePeerSettingsBar(peer->input)
 				).send();
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 44ddebc9d..bd32747ce 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1584,9 +1584,9 @@ void PeerMenuBlockUserBox(
 		not_null<PeerData*> peer,
 		std::variant<v::null_t, bool> suggestReport,
 		std::variant<v::null_t, ClearChat, ClearReply> suggestClear) {
-	const auto settings = peer->settings().value_or(PeerSettings(0));
+	const auto settings = peer->barSettings().value_or(PeerBarSettings(0));
 	const auto reportNeeded = v::is_null(suggestReport)
-		? ((settings & PeerSetting::ReportSpam) != 0)
+		? ((settings & PeerBarSetting::ReportSpam) != 0)
 		: v::get<bool>(suggestReport);
 
 	const auto user = peer->asUser();

From cf1d0677d1f298a0c14b69977cfa0c9ffcd9d54f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Mar 2024 15:02:12 +0400
Subject: [PATCH 103/596] Support business bot state in chat.

---
 Telegram/Resources/langs/lang.strings         |   8 +
 .../boxes/filters/edit_filter_chats_list.cpp  |   9 +-
 .../chat_helpers/chat_helpers.style           |  25 ++
 .../data/business/data_business_chatbots.cpp  |  70 ++++-
 .../data/business/data_business_chatbots.h    |  15 ++
 .../data/business/data_business_common.cpp    |  74 +++++-
 .../data/business/data_business_common.h      |  12 +-
 .../data/business/data_business_info.cpp      |   4 +-
 Telegram/SourceFiles/data/data_peer.cpp       |  17 ++
 Telegram/SourceFiles/data/data_peer.h         |   1 +
 .../SourceFiles/history/history_widget.cpp    |  36 ++-
 Telegram/SourceFiles/history/history_widget.h |   2 +
 .../view/history_view_contact_status.cpp      | 240 ++++++++++++++++++
 .../view/history_view_contact_status.h        |  37 +++
 Telegram/SourceFiles/mtproto/scheme/api.tl    |   8 +-
 .../business/settings_away_message.cpp        |   1 +
 .../settings/business/settings_chatbots.cpp   |   1 +
 .../settings/business/settings_greeting.cpp   |   1 +
 .../business/settings_recipients_helper.cpp   |  76 ++++--
 .../business/settings_recipients_helper.h     |   3 +
 20 files changed, 588 insertions(+), 52 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6b501c4db..5aeac265d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2288,6 +2288,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chatbots_not_found" = "Chatbot not found.";
 "lng_chatbots_add" = "Add";
 "lng_chatbots_info_url" = "https://telegram.org/privacy";
+"lng_chatbot_status_can_reply" = "bot manages this chat";
+"lng_chatbot_status_paused" = "bot stopped";
+"lng_chatbot_status_views" = "bot has access to this chat";
+"lng_chatbot_button_pause" = "Stop";
+"lng_chatbot_button_resume" = "Start";
+"lng_chatbot_menu_manage" = "Manage bot";
+"lng_chatbot_menu_remove" = "Remove bot from this chat";
+"lng_chatbot_menu_revoke" = "Revoke access to this chat";
 
 "lng_boost_channel_button" = "Boost Channel";
 "lng_boost_group_button" = "Boost Group";
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
index 0ee2bace0..dd694585c 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
@@ -351,9 +351,9 @@ Main::Session &EditFilterChatsListController::session() const {
 }
 
 int EditFilterChatsListController::selectedTypesCount() const {
-	Expects(_chatlist || _typesDelegate != nullptr);
+	Expects(_chatlist || !_options || _typesDelegate != nullptr);
 
-	if (_chatlist) {
+	if (_chatlist || !_options) {
 		return 0;
 	}
 	auto result = 0;
@@ -396,7 +396,7 @@ bool EditFilterChatsListController::handleDeselectForeignRow(
 
 void EditFilterChatsListController::prepareViewHook() {
 	delegate()->peerListSetTitle(std::move(_title));
-	if (!_chatlist) {
+	if (!_chatlist && _options) {
 		delegate()->peerListSetAboveWidget(prepareTypesList());
 	}
 
@@ -479,7 +479,8 @@ object_ptr<Ui::RpWidget> EditFilterChatsListController::prepareTypesList() {
 
 auto EditFilterChatsListController::createRow(not_null<History*> history)
 -> std::unique_ptr<Row> {
-	const auto business = _options & (Flag::NewChats | Flag::ExistingChats);
+	const auto business = (_options & (Flag::NewChats | Flag::ExistingChats))
+		|| (!_options && !_chatlist);
 	if (business && (history->peer->isSelf() || !history->peer->isUser())) {
 		return nullptr;
 	}
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index a622c37ea..d5a443d8e 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -857,6 +857,31 @@ historyEmojiStatusInfoLabel: FlatLabel(historyContactStatusLabel) {
 }
 historyContactStatusMinSkip: 16px;
 
+historyBusinessBotPhoto: UserpicButton(defaultUserpicButton) {
+	size: size(46px, 46px);
+	photoSize: 46px;
+	photoPosition: point(0px, 0px);
+}
+historyBusinessBotName: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+}
+historyBusinessBotStatus: FlatLabel(historyContactStatusLabel) {
+	textFg: windowSubTextFg;
+}
+historyBusinessBotToggle: defaultActiveButton;
+historyBusinessBotSettings: IconButton(defaultIconButton) {
+	icon: icon{{ "menu/customize", menuIconFg }};
+	iconOver: icon{{ "menu/customize", menuIconFgOver }};
+	iconPosition: point(-1px, -1px);
+	rippleAreaSize: 40px;
+	rippleAreaPosition: point(4px, 9px);
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgOver;
+	}
+	height: 58px;
+	width: 48px;
+}
+
 historyReplyCancelIcon: icon {{ "box_button_close", historyReplyCancelFg }};
 historyReplyCancelIconOver: icon {{ "box_button_close", historyReplyCancelFgOver }};
 
diff --git a/Telegram/SourceFiles/data/business/data_business_chatbots.cpp b/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
index 5c8c9f895..4cf252bc9 100644
--- a/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
@@ -87,7 +87,7 @@ void Chatbots::save(
 				? Flag::f_can_reply
 				: Flag()),
 			(settings.bot ? settings.bot : was.bot)->inputUser,
-			ToMTP(settings.recipients)
+			ForBotsToMTP(settings.recipients)
 		)).done([=](const MTPUpdates &result) {
 			api->applyUpdates(result);
 			if (done) {
@@ -103,4 +103,72 @@ void Chatbots::save(
 	_settings = settings;
 }
 
+void Chatbots::togglePaused(not_null<PeerData*> peer, bool paused) {
+	const auto type = paused
+		? SentRequestType::Pause
+		: SentRequestType::Unpause;
+	const auto api = &_owner->session().api();
+	const auto i = _sentRequests.find(peer);
+	if (i != end(_sentRequests)) {
+		const auto already = i->second.type;
+		if (already == SentRequestType::Remove || already == type) {
+			return;
+		}
+		api->request(i->second.requestId).cancel();
+		_sentRequests.erase(i);
+	}
+	const auto id = api->request(MTPaccount_ToggleConnectedBotPaused(
+		peer->input,
+		MTP_bool(paused)
+	)).done([=] {
+		if (_sentRequests[peer].type != type) {
+			return;
+		} else if (const auto settings = peer->barSettings()) {
+			peer->setBarSettings(paused
+				? (*settings | PeerBarSetting::BusinessBotPaused)
+				: (*settings & ~PeerBarSetting::BusinessBotPaused));
+		} else {
+			api->requestPeerSettings(peer);
+		}
+		_sentRequests.remove(peer);
+	}).fail([=] {
+		if (_sentRequests[peer].type != type) {
+			return;
+		}
+		api->requestPeerSettings(peer);
+		_sentRequests.remove(peer);
+	}).send();
+	_sentRequests[peer] = SentRequest{ type, id };
+}
+
+void Chatbots::removeFrom(not_null<PeerData*> peer) {
+	const auto type = SentRequestType::Remove;
+	const auto api = &_owner->session().api();
+	const auto i = _sentRequests.find(peer);
+	if (i != end(_sentRequests)) {
+		const auto already = i->second.type;
+		if (already == type) {
+			return;
+		}
+		api->request(i->second.requestId).cancel();
+		_sentRequests.erase(i);
+	}
+	const auto id = api->request(MTPaccount_DisablePeerConnectedBot(
+		peer->input
+	)).done([=] {
+		if (_sentRequests[peer].type != type) {
+			return;
+		} else if (const auto settings = peer->barSettings()) {
+			peer->clearBusinessBot();
+		} else {
+			api->requestPeerSettings(peer);
+		}
+		_sentRequests.remove(peer);
+	}).fail([=] {
+		api->requestPeerSettings(peer);
+		_sentRequests.remove(peer);
+	}).send();
+	_sentRequests[peer] = SentRequest{ type, id };
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/business/data_business_chatbots.h b/Telegram/SourceFiles/data/business/data_business_chatbots.h
index 6328b487d..27befd6df 100644
--- a/Telegram/SourceFiles/data/business/data_business_chatbots.h
+++ b/Telegram/SourceFiles/data/business/data_business_chatbots.h
@@ -41,13 +41,28 @@ public:
 		Fn<void()> done,
 		Fn<void(QString)> fail);
 
+	void togglePaused(not_null<PeerData*> peer, bool paused);
+	void removeFrom(not_null<PeerData*> peer);
+
 private:
+	enum class SentRequestType {
+		Pause,
+		Unpause,
+		Remove,
+	};
+	struct SentRequest {
+		SentRequestType type = SentRequestType::Pause;
+		mtpRequestId requestId = 0;
+	};
+
 	const not_null<Session*> _owner;
 
 	rpl::variable<ChatbotsSettings> _settings;
 	mtpRequestId _requestId = 0;
 	bool _loaded = false;
 
+	base::flat_map<not_null<PeerData*>, SentRequest> _sentRequests;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/business/data_business_common.cpp b/Telegram/SourceFiles/data/business/data_business_common.cpp
index 06cb17e91..7fc092115 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_common.cpp
@@ -51,16 +51,13 @@ constexpr auto kInNextDayMax = WorkingInterval::kInNextDayMax;
 	return intervals;
 }
 
-} // namespace
-
-MTPInputBusinessRecipients ToMTP(
-		const BusinessRecipients &data) {
-	using Flag = MTPDinputBusinessRecipients::Flag;
-	using Type = BusinessChatType;
+template <typename Flag>
+auto RecipientsFlags(const BusinessRecipients &data) {
 	const auto &chats = data.allButExcluded
 		? data.excluded
 		: data.included;
-	const auto flags = Flag()
+	using Type = BusinessChatType;
+	return Flag()
 		| ((chats.types & Type::NewChats) ? Flag::f_new_chats : Flag())
 		| ((chats.types & Type::ExistingChats)
 			? Flag::f_existing_chats
@@ -69,12 +66,30 @@ MTPInputBusinessRecipients ToMTP(
 		| ((chats.types & Type::NonContacts) ? Flag::f_non_contacts : Flag())
 		| (chats.list.empty() ? Flag() : Flag::f_users)
 		| (data.allButExcluded ? Flag::f_exclude_selected : Flag());
-	const auto &users = data.allButExcluded
-		? data.excluded
-		: data.included;
+}
+
+} // namespace
+
+MTPInputBusinessRecipients ForMessagesToMTP(const BusinessRecipients &data) {
+	using Flag = MTPDinputBusinessRecipients::Flag;
+	const auto &chats = data.allButExcluded ? data.excluded : data.included;
 	return MTP_inputBusinessRecipients(
-		MTP_flags(flags),
-		MTP_vector_from_range(users.list
+		MTP_flags(RecipientsFlags<Flag>(data)),
+		MTP_vector_from_range(chats.list
+			| ranges::views::transform(&UserData::inputUser)));
+}
+
+MTPInputBusinessBotRecipients ForBotsToMTP(const BusinessRecipients &data) {
+	using Flag = MTPDinputBusinessBotRecipients::Flag;
+	const auto &chats = data.allButExcluded ? data.excluded : data.included;
+	return MTP_inputBusinessBotRecipients(
+		MTP_flags(RecipientsFlags<Flag>(data)
+			| ((data.allButExcluded || data.excluded.empty())
+				? Flag()
+				: Flag::f_exclude_users)),
+		MTP_vector_from_range(chats.list
+			| ranges::views::transform(&UserData::inputUser)),
+		MTP_vector_from_range(data.excluded.list
 			| ranges::views::transform(&UserData::inputUser)));
 }
 
@@ -103,7 +118,40 @@ BusinessRecipients FromMTP(
 	return result;
 }
 
-[[nodiscard]] BusinessDetails FromMTP(
+BusinessRecipients FromMTP(
+		not_null<Session*> owner,
+		const MTPBusinessBotRecipients &recipients) {
+	using Type = BusinessChatType;
+
+	const auto &data = recipients.data();
+	auto result = BusinessRecipients{
+		.allButExcluded = data.is_exclude_selected(),
+	};
+	auto &chats = result.allButExcluded
+		? result.excluded
+		: result.included;
+	chats.types = Type()
+		| (data.is_new_chats() ? Type::NewChats : Type())
+		| (data.is_existing_chats() ? Type::ExistingChats : Type())
+		| (data.is_contacts() ? Type::Contacts : Type())
+		| (data.is_non_contacts() ? Type::NonContacts : Type());
+	if (const auto users = data.vusers()) {
+		for (const auto &userId : users->v) {
+			chats.list.push_back(owner->user(UserId(userId.v)));
+		}
+	}
+	if (!result.allButExcluded) {
+		if (const auto excluded = data.vexclude_users()) {
+			for (const auto &userId : excluded->v) {
+				result.excluded.list.push_back(
+					owner->user(UserId(userId.v)));
+			}
+		}
+	}
+	return result;
+}
+
+BusinessDetails FromMTP(
 		const tl::conditional<MTPBusinessWorkHours> &hours,
 		const tl::conditional<MTPBusinessLocation> &location) {
 	auto result = BusinessDetails();
diff --git a/Telegram/SourceFiles/data/business/data_business_common.h b/Telegram/SourceFiles/data/business/data_business_common.h
index af3429421..3793f0b60 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.h
+++ b/Telegram/SourceFiles/data/business/data_business_common.h
@@ -49,11 +49,21 @@ struct BusinessRecipients {
 		const BusinessRecipients &b) = default;
 };
 
-[[nodiscard]] MTPInputBusinessRecipients ToMTP(
+enum class BusinessRecipientsType : uchar {
+	Messages,
+	Bots,
+};
+
+[[nodiscard]] MTPInputBusinessRecipients ForMessagesToMTP(
+	const BusinessRecipients &data);
+[[nodiscard]] MTPInputBusinessBotRecipients ForBotsToMTP(
 	const BusinessRecipients &data);
 [[nodiscard]] BusinessRecipients FromMTP(
 	not_null<Session*> owner,
 	const MTPBusinessRecipients &recipients);
+[[nodiscard]] BusinessRecipients FromMTP(
+	not_null<Session*> owner,
+	const MTPBusinessBotRecipients &recipients);
 
 struct Timezone {
 	QString id;
diff --git a/Telegram/SourceFiles/data/business/data_business_info.cpp b/Telegram/SourceFiles/data/business/data_business_info.cpp
index 151e36dcb..1e7beef88 100644
--- a/Telegram/SourceFiles/data/business/data_business_info.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_info.cpp
@@ -49,14 +49,14 @@ namespace {
 		MTP_flags(data.offlineOnly ? Flag::f_offline_only : Flag()),
 		MTP_int(data.shortcutId),
 		ToMTP(data.schedule),
-		ToMTP(data.recipients));
+		ForMessagesToMTP(data.recipients));
 }
 
 [[nodiscard]] MTPInputBusinessGreetingMessage ToMTP(
 		const GreetingSettings &data) {
 	return MTP_inputBusinessGreetingMessage(
 		MTP_int(data.shortcutId),
-		ToMTP(data.recipients),
+		ForMessagesToMTP(data.recipients),
 		MTP_int(data.noActivityDays));
 }
 
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 00cb5fd2d..9bf563f6c 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -608,6 +608,23 @@ void PeerData::checkFolder(FolderId folderId) {
 	}
 }
 
+void PeerData::clearBusinessBot() {
+	if (const auto details = _barDetails.get()) {
+		if (details->requestChatDate) {
+			details->businessBot = nullptr;
+			details->businessBotManageUrl = QString();
+		} else {
+			_barDetails = nullptr;
+		}
+	}
+	if (const auto settings = barSettings()) {
+		setBarSettings(*settings
+			& ~PeerBarSetting::BusinessBotPaused
+			& ~PeerBarSetting::BusinessBotCanReply
+			& ~PeerBarSetting::HasBusinessBot);
+	}
+}
+
 void PeerData::setTranslationDisabled(bool disabled) {
 	const auto flag = disabled
 		? TranslationFlag::Disabled
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index ab309ec1b..bf7d4e025 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -373,6 +373,7 @@ public:
 	[[nodiscard]] TimeId requestChatDate() const;
 	[[nodiscard]] UserData *businessBot() const;
 	[[nodiscard]] QString businessBotManageUrl() const;
+	void clearBusinessBot();
 
 	enum class TranslationFlag : uchar {
 		Unknown,
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index e24f131ee..cec389eb8 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1578,6 +1578,9 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 void HistoryWidget::orderWidgets() {
 	_voiceRecordBar->raise();
 	_send->raise();
+	if (_businessBotStatus) {
+		_businessBotStatus->bar().raise();
+	}
 	if (_contactStatus) {
 		_contactStatus->bar().raise();
 	}
@@ -2282,17 +2285,30 @@ void HistoryWidget::showHistory(
 	_showAtMsgHighlightPartOffsetHint = highlightPartOffsetHint;
 	_historyInited = false;
 	_contactStatus = nullptr;
+	_businessBotStatus = nullptr;
 
 	if (peerId) {
+		using namespace HistoryView;
 		_peer = session().data().peer(peerId);
-		_contactStatus = std::make_unique<HistoryView::ContactStatus>(
+		_contactStatus = std::make_unique<ContactStatus>(
 			controller(),
 			this,
 			_peer,
 			false);
-		_contactStatus->bar().heightValue() | rpl::start_with_next([=] {
+		_contactStatus->bar().heightValue(
+		) | rpl::start_with_next([=] {
 			updateControlsGeometry();
 		}, _contactStatus->bar().lifetime());
+		if (const auto user = _peer->asUser()) {
+			_businessBotStatus = std::make_unique<BusinessBotStatus>(
+				controller(),
+				this,
+				user);
+			_businessBotStatus->bar().heightValue(
+			) | rpl::start_with_next([=] {
+				updateControlsGeometry();
+			}, _businessBotStatus->bar().lifetime());
+		}
 		orderWidgets();
 		controller()->tabbedSelector()->setCurrentPeer(_peer);
 	}
@@ -2879,6 +2895,9 @@ void HistoryWidget::updateControlsVisibility() {
 	if (_contactStatus) {
 		_contactStatus->show();
 	}
+	if (_businessBotStatus) {
+		_businessBotStatus->show();
+	}
 	if (isChoosingTheme()
 		|| (!editingMessage()
 			&& (isSearching()
@@ -4059,6 +4078,9 @@ void HistoryWidget::hideChildWidgets() {
 	if (_contactStatus) {
 		_contactStatus->hide();
 	}
+	if (_businessBotStatus) {
+		_businessBotStatus->hide();
+	}
 	hideChildren();
 }
 
@@ -5840,7 +5862,11 @@ void HistoryWidget::updateControlsGeometry() {
 	if (_contactStatus) {
 		_contactStatus->bar().move(0, contactStatusTop);
 	}
-	const auto scrollAreaTop = contactStatusTop + (_contactStatus ? _contactStatus->bar().height() : 0);
+	const auto businessBotTop = contactStatusTop + (_contactStatus ? _contactStatus->bar().height() : 0);
+	if (_businessBotStatus) {
+		_businessBotStatus->bar().move(0, businessBotTop);
+	}
+	const auto scrollAreaTop = businessBotTop + (_businessBotStatus ? _businessBotStatus->bar().height() : 0);
 	if (_scroll->y() != scrollAreaTop) {
 		_scroll->moveToLeft(0, scrollAreaTop);
 		_fieldAutocomplete->setBoundings(_scroll->geometry());
@@ -6076,6 +6102,9 @@ void HistoryWidget::updateHistoryGeometry(
 	if (_contactStatus) {
 		newScrollHeight -= _contactStatus->bar().height();
 	}
+	if (_businessBotStatus) {
+		newScrollHeight -= _businessBotStatus->bar().height();
+	}
 	if (isChoosingTheme()) {
 		newScrollHeight -= _chooseTheme->height();
 	} else if (!editingMessage()
@@ -6457,6 +6486,7 @@ int HistoryWidget::computeMaxFieldHeight() const {
 	const auto available = height()
 		- _topBar->height()
 		- (_contactStatus ? _contactStatus->bar().height() : 0)
+		- (_businessBotStatus ? _businessBotStatus->bar().height() : 0)
 		- (_pinnedBar ? _pinnedBar->height() : 0)
 		- (_groupCallBar ? _groupCallBar->height() : 0)
 		- (_requestsBar ? _requestsBar->height() : 0)
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index a61e74fff..43966331e 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -89,6 +89,7 @@ namespace HistoryView {
 class StickerToast;
 class TopBarWidget;
 class ContactStatus;
+class BusinessBotStatus;
 class Element;
 class PinnedTracker;
 class TranslateBar;
@@ -744,6 +745,7 @@ private:
 	bool _isInlineBot = false;
 
 	std::unique_ptr<HistoryView::ContactStatus> _contactStatus;
+	std::unique_ptr<HistoryView::BusinessBotStatus> _businessBotStatus;
 
 	const std::shared_ptr<Ui::SendButton> _send;
 	object_ptr<Ui::FlatButton> _unblock;
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index 5403cc656..6eb5d8e40 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -8,9 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_contact_status.h"
 
 #include "lang/lang_keys.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/layers/generic_box.h"
 #include "ui/toast/toast.h"
@@ -18,7 +21,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/layers/generic_box.h"
+#include "core/click_handler_types.h"
 #include "core/ui_integration.h"
+#include "data/business/data_business_chatbots.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_peer.h"
 #include "data/data_user.h"
@@ -839,6 +844,241 @@ void ContactStatus::hide() {
 	_bar.hide();
 }
 
+class BusinessBotStatus::Bar final : public Ui::RpWidget {
+public:
+	Bar(QWidget *parent);
+
+	void showState(State state);
+
+	[[nodiscard]] rpl::producer<> pauseClicks() const;
+	[[nodiscard]] rpl::producer<> resumeClicks() const;
+	[[nodiscard]] rpl::producer<> removeClicks() const;
+	[[nodiscard]] rpl::producer<> manageClicks() const;
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	int resizeGetHeight(int newWidth) override;
+
+	void showMenu();
+
+	object_ptr<Ui::UserpicButton> _userpic = { nullptr };
+	object_ptr<Ui::FlatLabel> _name;
+	object_ptr<Ui::FlatLabel> _status;
+	object_ptr<Ui::RoundButton> _togglePaused;
+	object_ptr<Ui::IconButton> _settings;
+	rpl::event_stream<> _removeClicks;
+	rpl::event_stream<> _manageClicks;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	bool _paused = false;
+
+};
+
+BusinessBotStatus::Bar::Bar(QWidget *parent)
+: RpWidget(parent)
+, _name(this, st::historyBusinessBotName)
+, _status(this, st::historyBusinessBotStatus)
+, _togglePaused(
+	this,
+	rpl::single(QString()),
+	st::historyBusinessBotToggle)
+, _settings(this, st::historyBusinessBotSettings) {
+	_name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_status->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_settings->setClickedCallback([=] {
+		showMenu();
+	});
+}
+
+void BusinessBotStatus::Bar::showState(State state) {
+	Expects(state.bot != nullptr);
+
+	_userpic = object_ptr<Ui::UserpicButton>(
+		this,
+		state.bot,
+		st::historyBusinessBotPhoto);
+	_userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_userpic->show();
+	_name->setText(state.bot->name());
+	_status->setText(!state.canReply
+		? tr::lng_chatbot_status_views(tr::now)
+		: state.paused
+		? tr::lng_chatbot_status_paused(tr::now)
+		: tr::lng_chatbot_status_can_reply(tr::now));
+	_togglePaused->setText(state.paused
+		? tr::lng_chatbot_button_resume()
+		: tr::lng_chatbot_button_pause());
+	_togglePaused->setVisible(state.canReply);
+	_paused = state.paused;
+	resizeToWidth(width());
+}
+
+rpl::producer<> BusinessBotStatus::Bar::pauseClicks() const {
+	return _togglePaused->clicks() | rpl::filter([=] {
+		return !_paused;
+	}) | rpl::to_empty;
+}
+
+rpl::producer<> BusinessBotStatus::Bar::resumeClicks() const {
+	return _togglePaused->clicks() | rpl::filter([=] {
+		return _paused;
+	}) | rpl::to_empty;
+}
+
+rpl::producer<> BusinessBotStatus::Bar::removeClicks() const {
+	return _removeClicks.events();
+}
+
+rpl::producer<> BusinessBotStatus::Bar::manageClicks() const {
+	return _manageClicks.events();
+}
+
+void BusinessBotStatus::Bar::showMenu() {
+	if (_menu) {
+		return;
+	}
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::popupMenuExpandedSeparator);
+	_menu->setDestroyedCallback([
+		weak = Ui::MakeWeak(this),
+		weakButton = Ui::MakeWeak(_settings.data()),
+		menu = _menu.get()] {
+		if (weak && weak->_menu == menu) {
+			if (weakButton) {
+				weakButton->setForceRippled(false);
+			}
+		}
+	});
+	_settings->setForceRippled(true);
+
+	const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
+
+	addAction(tr::lng_chatbot_menu_manage(tr::now), crl::guard(this, [=] {
+		_manageClicks.fire({});
+	}), &st::menuIconSettings);
+	addAction({
+		.text = (_togglePaused->isHidden()
+			? tr::lng_chatbot_menu_revoke(tr::now)
+			: tr::lng_chatbot_menu_remove(tr::now)),
+		.handler = crl::guard(this, [=] { _removeClicks.fire({}); }),
+		.icon = &st::menuIconDisableAttention,
+		.isAttention = true,
+	});
+
+	_menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+	_menu->popup(mapToGlobal(QPoint(
+		width() + st::topBarMenuPosition.x(),
+		st::topBarMenuPosition.y())));
+}
+
+void BusinessBotStatus::Bar::paintEvent(QPaintEvent *e) {
+	QPainter p(this);
+	p.fillRect(e->rect(), st::historyContactStatusButton.bgColor);
+}
+
+int BusinessBotStatus::Bar::resizeGetHeight(int newWidth) {
+	const auto &st = st::defaultPeerList.item;
+	_settings->moveToRight(0, 0, newWidth);
+	if (_userpic) {
+		_userpic->moveToLeft(st.photoPosition.x(), st.photoPosition.y());
+	}
+	auto available = newWidth - _settings->width() - st.namePosition.x();
+	if (!_togglePaused->isHidden()) {
+		_togglePaused->moveToRight(_settings->width(), 0);
+		available -= _togglePaused->width();
+	}
+	_name->resizeToWidth(available);
+	_name->moveToLeft(st.namePosition.x(), st.namePosition.y());
+	_status->resizeToWidth(available);
+	_status->moveToLeft(st.statusPosition.x(), st.statusPosition.y());
+	return st.height;
+}
+
+BusinessBotStatus::BusinessBotStatus(
+	not_null<Window::SessionController*> window,
+	not_null<Ui::RpWidget*> parent,
+	not_null<PeerData*> peer)
+: _controller(window)
+, _inner(Ui::CreateChild<Bar>(parent.get()))
+, _bar(parent, object_ptr<Bar>::fromRaw(_inner)) {
+	setupState(peer);
+	setupHandlers(peer);
+}
+
+auto BusinessBotStatus::PeerState(not_null<PeerData*> peer)
+-> rpl::producer<State> {
+	using SettingsChange = PeerData::BarSettings::Change;
+	return peer->barSettingsValue(
+	) | rpl::map([=](SettingsChange settings) -> State {
+		using Flag = PeerBarSetting;
+		return {
+			.bot = peer->businessBot(),
+			.manageUrl = peer->businessBotManageUrl(),
+			.canReply = ((settings.value & Flag::BusinessBotCanReply) != 0),
+			.paused = ((settings.value & Flag::BusinessBotPaused) != 0),
+		};
+	});
+}
+
+void BusinessBotStatus::setupState(not_null<PeerData*> peer) {
+	if (!BarCurrentlyHidden(peer)) {
+		peer->session().api().requestPeerSettings(peer);
+	}
+	PeerState(
+		peer
+	) | rpl::start_with_next([=](State state) {
+		_state = state;
+		if (!state.bot) {
+			_bar.toggleContent(false);
+		} else {
+			_inner->showState(state);
+			_bar.toggleContent(true);
+		}
+	}, _bar.lifetime());
+}
+
+void BusinessBotStatus::setupHandlers(not_null<PeerData*> peer) {
+	_inner->pauseClicks(
+	) | rpl::start_with_next([=] {
+		peer->owner().chatbots().togglePaused(peer, true);
+	}, _bar.lifetime());
+
+	_inner->resumeClicks(
+	) | rpl::start_with_next([=] {
+		peer->owner().chatbots().togglePaused(peer, false);
+	}, _bar.lifetime());
+
+	_inner->removeClicks(
+	) | rpl::start_with_next([=] {
+		peer->owner().chatbots().removeFrom(peer);
+	}, _bar.lifetime());
+
+	_inner->manageClicks(
+	) | rpl::start_with_next([=] {
+		UrlClickHandler::Open(
+			_state.manageUrl,
+			QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = base::make_weak(_controller),
+				.botStartAutoSubmit = true,
+			}));
+	}, _bar.lifetime());
+}
+
+void BusinessBotStatus::show() {
+	if (!_shown) {
+		_shown = true;
+		if (_state.bot) {
+			_inner->showState(_state);
+			_bar.toggleContent(true);
+		}
+	}
+	_bar.show();
+}
+
+void BusinessBotStatus::hide() {
+	_bar.hide();
+}
+
 TopicReopenBar::TopicReopenBar(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Data::ForumTopic*> topic)
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.h b/Telegram/SourceFiles/history/view/history_view_contact_status.h
index 076eeeefc..aafc23a6a 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.h
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.h
@@ -124,6 +124,43 @@ private:
 
 };
 
+class BusinessBotStatus final {
+public:
+	BusinessBotStatus(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::RpWidget*> parent,
+		not_null<PeerData*> peer);
+
+	void show();
+	void hide();
+
+	[[nodiscard]] SlidingBar &bar() {
+		return _bar;
+	}
+
+private:
+	class Bar;
+
+	struct State {
+		UserData *bot = nullptr;
+		QString manageUrl;
+		bool canReply = false;
+		bool paused = false;
+	};
+
+	void setupState(not_null<PeerData*> peer);
+	void setupHandlers(not_null<PeerData*> peer);
+
+	static rpl::producer<State> PeerState(not_null<PeerData*> peer);
+
+	const not_null<Window::SessionController*> _controller;
+	State _state;
+	QPointer<Bar> _inner;
+	SlidingBar _bar;
+	bool _shown = false;
+
+};
+
 class TopicReopenBar final {
 public:
 	TopicReopenBar(
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index de9325fa5..a0146f1bc 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1704,7 +1704,7 @@ inputQuickReplyShortcutId#1190cf1 shortcut_id:int = InputQuickReplyShortcut;
 messages.quickReplies#c68d6695 quick_replies:Vector<QuickReply> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.QuickReplies;
 messages.quickRepliesNotModified#5f91eb5b = messages.QuickReplies;
 
-connectedBot#e7e999e7 flags:# can_reply:flags.0?true bot_id:long recipients:BusinessRecipients = ConnectedBot;
+connectedBot#bd068601 flags:# can_reply:flags.0?true bot_id:long recipients:BusinessBotRecipients = ConnectedBot;
 
 account.connectedBots#17d7f87b connected_bots:Vector<ConnectedBot> users:Vector<User> = account.ConnectedBots;
 
@@ -1723,6 +1723,10 @@ inputCollectiblePhone#a2e214a4 phone:string = InputCollectible;
 
 fragment.collectibleInfo#6ebdff91 purchase_date:int currency:string amount:long crypto_currency:string crypto_amount:long url:string = fragment.CollectibleInfo;
 
+inputBusinessBotRecipients#c4e5921e flags:# existing_chats:flags.0?true new_chats:flags.1?true contacts:flags.2?true non_contacts:flags.3?true exclude_selected:flags.5?true users:flags.4?Vector<InputUser> exclude_users:flags.6?Vector<InputUser> = InputBusinessBotRecipients;
+
+businessBotRecipients#b88cf373 flags:# existing_chats:flags.0?true new_chats:flags.1?true contacts:flags.2?true non_contacts:flags.3?true exclude_selected:flags.5?true users:flags.4?Vector<long> exclude_users:flags.6?Vector<long> = BusinessBotRecipients;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1853,7 +1857,7 @@ account.updateBusinessWorkHours#4b00e066 flags:# business_work_hours:flags.0?Bus
 account.updateBusinessLocation#9e6b131a flags:# geo_point:flags.1?InputGeoPoint address:flags.0?string = Bool;
 account.updateBusinessGreetingMessage#66cdafc4 flags:# message:flags.0?InputBusinessGreetingMessage = Bool;
 account.updateBusinessAwayMessage#a26a7fa5 flags:# message:flags.0?InputBusinessAwayMessage = Bool;
-account.updateConnectedBot#9c2d527d flags:# can_reply:flags.0?true deleted:flags.1?true bot:InputUser recipients:InputBusinessRecipients = Updates;
+account.updateConnectedBot#43d8521d flags:# can_reply:flags.0?true deleted:flags.1?true bot:InputUser recipients:InputBusinessBotRecipients = Updates;
 account.getConnectedBots#4ea4c80f = account.ConnectedBots;
 account.getBotBusinessConnection#76a86270 connection_id:string = Updates;
 account.updateBusinessIntro#a614d034 flags:# intro:flags.0?InputBusinessIntro = Bool;
diff --git a/Telegram/SourceFiles/settings/business/settings_away_message.cpp b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
index a5fef26a2..0caa86b34 100644
--- a/Telegram/SourceFiles/settings/business/settings_away_message.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
@@ -336,6 +336,7 @@ void AwayMessage::setupContent(
 		.controller = controller,
 		.title = tr::lng_away_recipients(),
 		.data = &_recipients,
+		.type = Data::BusinessRecipientsType::Messages,
 	});
 
 	Ui::AddSkip(inner, st::settingsChatbotsAccessSkip);
diff --git a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
index 656d49958..5b59d4987 100644
--- a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
@@ -448,6 +448,7 @@ void Chatbots::setupContent(
 		.controller = controller,
 		.title = tr::lng_chatbots_access_title(),
 		.data = &_recipients,
+		.type = Data::BusinessRecipientsType::Bots,
 	});
 
 	Ui::AddSkip(content, st::settingsChatbotsAccessSkip);
diff --git a/Telegram/SourceFiles/settings/business/settings_greeting.cpp b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
index 9809c1b71..052e97a39 100644
--- a/Telegram/SourceFiles/settings/business/settings_greeting.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
@@ -229,6 +229,7 @@ void Greeting::setupContent(
 		.controller = controller,
 		.title = tr::lng_greeting_recipients(),
 		.data = &_recipients,
+		.type = Data::BusinessRecipientsType::Messages,
 	});
 
 	Ui::AddSkip(inner);
diff --git a/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp b/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
index 160b1d83b..76d7631e7 100644
--- a/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
@@ -69,7 +69,7 @@ void EditBusinessChats(
 		(descriptor.include
 			? tr::lng_filters_include_title()
 			: tr::lng_filters_exclude_title()),
-		options,
+		(descriptor.usersOnly ? Flag() : options),
 		TypesToFlags(descriptor.current.types) & options,
 		base::flat_set<not_null<History*>>(begin(peers), end(peers)),
 		100,
@@ -162,6 +162,8 @@ void AddBusinessRecipientsSelector(
 	auto &lifetime = container->lifetime();
 	const auto controller = descriptor.controller;
 	const auto data = descriptor.data;
+	const auto includeWithExcluded = (descriptor.type
+		== Data::BusinessRecipientsType::Bots);
 	const auto change = [=](Fn<void(Data::BusinessRecipients&)> modify) {
 		auto now = data->current();
 		modify(now);
@@ -191,11 +193,17 @@ void AddBusinessRecipientsSelector(
 	Ui::AddSkip(container, st::settingsChatbotsAccessSkip);
 	Ui::AddDivider(container);
 
+	const auto includeWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container))
+	)->setDuration(0);
 	const auto excludeWrap = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
 			object_ptr<Ui::VerticalLayout>(container))
 	)->setDuration(0);
+
 	const auto excludeInner = excludeWrap->entity();
 
 	Ui::AddSkip(excludeInner);
@@ -205,18 +213,34 @@ void AddBusinessRecipientsSelector(
 		tr::lng_chatbots_exclude_button(),
 		st::settingsChatbotsAdd,
 		{ &st::settingsIconRemove, IconType::Round, &st::windowBgActive });
-	excludeAdd->setClickedCallback([=] {
+	const auto addExcluded = [=] {
 		const auto save = [=](Data::BusinessChats value) {
 			change([&](Data::BusinessRecipients &data) {
+				if (includeWithExcluded) {
+					if (!data.allButExcluded) {
+						value.types = {};
+					}
+					for (const auto &user : value.list) {
+						data.included.list.erase(
+							ranges::remove(data.included.list, user),
+							end(data.included.list));
+					}
+				}
+				if (!value.empty()) {
+					data.included = {};
+				}
 				data.excluded = std::move(value);
 			});
 		};
 		EditBusinessChats(controller, {
 			.current = data->current().excluded,
 			.save = crl::guard(excludeAdd, save),
+			.usersOnly = (includeWithExcluded
+				&& !data->current().allButExcluded),
 			.include = false,
 		});
-	});
+	};
+	excludeAdd->setClickedCallback(addExcluded);
 
 	const auto excluded = lifetime.make_state<
 		rpl::variable<Data::BusinessChats>
@@ -227,24 +251,19 @@ void AddBusinessRecipientsSelector(
 	}, lifetime);
 	excluded->changes(
 	) | rpl::start_with_next([=](Data::BusinessChats &&value) {
-		auto now = data->current();
-		now.excluded = std::move(value);
-		*data = std::move(now);
+		change([&](Data::BusinessRecipients &data) {
+			data.excluded = std::move(value);
+		});
 	}, lifetime);
 
 	SetupBusinessChatsPreview(excludeInner, excluded);
 
 	excludeWrap->toggleOn(data->value(
-	) | rpl::map([](const Data::BusinessRecipients &value) {
-		return value.allButExcluded;
+	) | rpl::map([=](const Data::BusinessRecipients &value) {
+		return value.allButExcluded || includeWithExcluded;
 	}));
 	excludeWrap->finishAnimating();
 
-	const auto includeWrap = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container))
-	)->setDuration(0);
 	const auto includeInner = includeWrap->entity();
 
 	Ui::AddSkip(includeInner);
@@ -254,18 +273,32 @@ void AddBusinessRecipientsSelector(
 		tr::lng_chatbots_include_button(),
 		st::settingsChatbotsAdd,
 		{ &st::settingsIconAdd, IconType::Round, &st::windowBgActive });
-	includeAdd->setClickedCallback([=] {
+	const auto addIncluded = [=] {
 		const auto save = [=](Data::BusinessChats value) {
 			change([&](Data::BusinessRecipients &data) {
+				if (includeWithExcluded) {
+					for (const auto &user : value.list) {
+						data.excluded.list.erase(
+							ranges::remove(data.excluded.list, user),
+							end(data.excluded.list));
+					}
+				}
+				if (!value.empty()) {
+					data.excluded.types = {};
+				}
 				data.included = std::move(value);
 			});
+			if (!data->current().included.empty()) {
+				group->setValue(kSelectedOnly);
+			}
 		};
 		EditBusinessChats(controller, {
-			.current = data->current().included ,
+			.current = data->current().included,
 			.save = crl::guard(includeAdd, save),
 			.include = true,
 		});
-	});
+	};
+	includeAdd->setClickedCallback(addIncluded);
 
 	const auto included = lifetime.make_state<
 		rpl::variable<Data::BusinessChats>
@@ -298,16 +331,7 @@ void AddBusinessRecipientsSelector(
 	group->setChangedCallback([=](int value) {
 		if (value == kSelectedOnly && data->current().included.empty()) {
 			group->setValue(kAllExcept);
-			const auto save = [=](Data::BusinessChats value) {
-				change([&](Data::BusinessRecipients &data) {
-					data.included = std::move(value);
-				});
-				group->setValue(kSelectedOnly);
-			};
-			EditBusinessChats(controller, {
-				.save = crl::guard(includeAdd, save),
-				.include = true,
-			});
+			addIncluded();
 			return;
 		}
 		change([&](Data::BusinessRecipients &data) {
diff --git a/Telegram/SourceFiles/settings/business/settings_recipients_helper.h b/Telegram/SourceFiles/settings/business/settings_recipients_helper.h
index f4432ea3b..8be1d42dc 100644
--- a/Telegram/SourceFiles/settings/business/settings_recipients_helper.h
+++ b/Telegram/SourceFiles/settings/business/settings_recipients_helper.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/required.h"
 #include "data/business/data_business_common.h"
 #include "settings/settings_common_session.h"
 
@@ -52,6 +53,7 @@ private:
 struct BusinessChatsDescriptor {
 	Data::BusinessChats current;
 	Fn<void(const Data::BusinessChats&)> save;
+	bool usersOnly = false;
 	bool include = false;
 };
 void EditBusinessChats(
@@ -66,6 +68,7 @@ struct BusinessRecipientsSelectorDescriptor {
 	not_null<Window::SessionController*> controller;
 	rpl::producer<QString> title;
 	not_null<rpl::variable<Data::BusinessRecipients>*> data;
+	base::required<Data::BusinessRecipientsType> type;
 };
 void AddBusinessRecipientsSelector(
 	not_null<Ui::VerticalLayout*> container,

From 191c35914f44df72ab4e151ee00f03cc863f0582 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Mar 2024 10:09:00 +0400
Subject: [PATCH 104/596] Start editing chat intro in Telegram Business.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../icons/settings/premium/intro.png          | Bin 0 -> 523 bytes
 .../icons/settings/premium/intro@2x.png       | Bin 0 -> 973 bytes
 .../icons/settings/premium/intro@3x.png       | Bin 0 -> 1520 bytes
 Telegram/Resources/langs/lang.strings         |  13 +
 Telegram/SourceFiles/api/api_premium.cpp      |  59 ++
 Telegram/SourceFiles/api/api_premium.h        |  13 +
 .../boxes/peers/edit_peer_color_box.cpp       |  62 +-
 .../boxes/peers/edit_peer_color_box.h         |  20 +
 .../SourceFiles/boxes/premium_preview_box.cpp |   5 +
 .../SourceFiles/boxes/premium_preview_box.h   |   1 +
 .../chat_helpers/stickers_lottie.h            |   2 +-
 .../chat_helpers/tabbed_selector.cpp          |  13 +-
 .../chat_helpers/tabbed_selector.h            |   1 +
 .../data/business/data_business_common.cpp    |  19 +
 .../data/business/data_business_common.h      |  18 +
 .../data/business/data_business_info.cpp      |  49 ++
 .../data/business/data_business_info.h        |   9 +
 Telegram/SourceFiles/data/data_user.cpp       |   2 +
 .../history/view/history_view_about_view.cpp  | 170 ++++++
 .../history/view/history_view_about_view.h    |   9 +
 .../view/history_view_contact_status.cpp      |   7 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  14 +-
 .../business/settings_away_message.cpp        |   2 +-
 .../settings/business/settings_chat_intro.cpp | 564 ++++++++++++++++++
 .../settings/business/settings_chat_intro.h   |  16 +
 .../settings/business/settings_chatbots.cpp   |   2 +-
 Telegram/SourceFiles/settings/settings.style  |   5 +
 .../settings/settings_business.cpp            |  20 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   3 +
 30 files changed, 1056 insertions(+), 44 deletions(-)
 create mode 100644 Telegram/Resources/icons/settings/premium/intro.png
 create mode 100644 Telegram/Resources/icons/settings/premium/intro@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/intro@3x.png
 create mode 100644 Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
 create mode 100644 Telegram/SourceFiles/settings/business/settings_chat_intro.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 573a6dbf5..a0a500bff 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1293,6 +1293,8 @@ PRIVATE
     settings/business/settings_away_message.h
     settings/business/settings_shortcut_messages.cpp
     settings/business/settings_shortcut_messages.h
+    settings/business/settings_chat_intro.cpp
+    settings/business/settings_chat_intro.h
     settings/business/settings_chatbots.cpp
     settings/business/settings_chatbots.h
     settings/business/settings_greeting.cpp
diff --git a/Telegram/Resources/icons/settings/premium/intro.png b/Telegram/Resources/icons/settings/premium/intro.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecb6673fc49626ec04634fa9a585cfafeee56453
GIT binary patch
literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq00009a7bBm000XU
z000XU0RWnu7ytkPy-7qtR5*>TmA$IMFcimAbCE77on3Tv5fqpD09n+{M-Znzg6|+W
z*heS`MMV5~0d=b4Bsdh8*g;T1v6V>e9fVq%^xn(W|CaOd%gM=UBcxKP%jE*z6GG@s
z!lz*fp~U-?r@rDGq9|6Y)nc)j&*uREtJP|;SPX~5+wB%x6>C&gl@Q`HB7~@_%7?HZ
zUDtz5N-4$|V@xRxjJmG>4$?F&T!QPmPrK{7VY{YjKY<iQVUH6hMNwiwhG9ga+wFFv
z(dhU4EXXhnJ_tf++jb<n)9GX~832IeI1!g^+YmwyNS0;K^Vpr&>$N0Fhr=Oa_dHLQ
z<pA^=NXKzbrxSa%yWI{#m`FrN_jo*Buh(Gta#Ko|%Owj+r_&I^VDmtxY2NSm*E-zn
zN~IF1-?FS)tp)&SHk;@3IqWKz%lu|P)$8@b(ewE{m&;*{3x&ddzYpxA(I}k7pX~8?
z%(gtN>2xXx!tWpez-F`IA|8)NtJPxT5kma0Uy>vM03l>Hn`N_E-}krMt!bLwZr8Fb
zZc4PGWHLDz41C|8OeXA2#fft?Q55U-dZ|?UBO(^`KYjA&FMR4b`UX!G(Q!K!i-Z6G
N002ovPDHLkV1num?{feE

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/intro@2x.png b/Telegram/Resources/icons/settings/premium/intro@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..43fb942276f98093a101093d215f7cb526272d8a
GIT binary patch
literal 973
zcmV;;12X)HP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00009a7bBm000XU
z000XU0RWnu7ytkRe@R3^R9J=WnL$f3K^Vtp%?>LzVQd|?Ac!E^Q1VbgP<RXa2414P
zbP^BVJbLVsr%vrB$o3Q-Di29P5Q~$QK}2kk2n%JJ)VksN9(*x*cXyn%q+alU-1*P*
z{MKijXJ?mUS+-m*gWn;i)A`c~dO-+(8sSqALfcO>{HrcdD|LZd$^MneG);Rvp7HT<
zm&*kJC=?2}x3`&0=KcM>{h)39?cHv7I2;y5QI_SJPO>bEq8JW`-EMa~FqVM4UT-`e
zuU4yi4!x??YCInIdcB<jibkU(9C}5g(QgK#X*!WenB^-Li=j{`6bcoKMKez#k)Ub%
zdw^Un7edG^ld7sdpRexp`FyIXnmG|d^|k+1pj0Y_DTge}&1S=8-cTx)`YKQ?7Q-Z{
z)oPli1p<M(IS>eFnuhnsVzKstW@l&d(Hr7<p67W&^UTaln?U$twJl8Ha6lZ#kwnks
zatNV|i;JtPD{>}|<17P3B9WGH1wo)Fs_yUY?Ok7ACj^Q_B4$9Q&2@Tu+HA;BA0Hok
zdwaE7jl_%#Zukq??RH6$NbWV4%Vo3K&CN{!z{JD^VONnP$!<63>kvZYZtrk77=|Ia
zSC(a2maXqbnx>IV0RS)z<8U}irILQgxMUPXH5LbnUS3}6vk3h*o6XE@3{<I9-rnBG
zfvl=rE>|iQ3qXpZWHOn~0U?AGMX>+`01!p7V>}?8PMZyx0wt5l&cFZw!2bTe=@_PU
z+~405Zgi)orvQMdsVNfk-Q67y1_QLRveGj8!NGyw?_XS81OW8)_4)n&U@%xH6fjd(
zS6ABv0stHzALD_RmzVXklF6i*|Lp7xlMX^iK?n^usJe!Shtuiw;NYN{;pXN>5QOF{
z48yFgt@ZTu=*_RMuO5#_k|YdJ>nFy^$;o^^-?DZsrK;-u{5(Dv=|le5*x2Re<yUBA
zSzcIJXqm{uF{r=4|MBs$J(`n~lhM&pk}THFW!u}^R#6@v9)iIjVSIq;_J$(t{{R40
zRnO1Qd7j_d*?E3`CQkv#Up5R44J|D#HDB4-*gy!4jEry`H!v`uY1-4%Q#PB;=ko}m
z>+5Sv9G@aAnIH(wwP+lDzE?zR$mw+M?(Q~Fj*gDz=H@y<0|?g;giukGt*xz6sdRXF
v*wLo@H(zHHSW)-2FoC*2|DCAc_Ic_Lam=yDgH&x?00000NkvXXu0mjfOW4Z!

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/intro@3x.png b/Telegram/Resources/icons/settings/premium/intro@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..35e11ed24ab7f566cbc183ea5d9a27f6359fafc6
GIT binary patch
literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00009a7bBm000XU
z000XU0RWnu7ytkTqDe$SRA_<in_oy;Zy3jq9WhNiko}_(BZxMN+|7hS%9cpbMM5`r
z5z$~*5e#;@t1haG1*1WCUQ`4{QFM_IF&vI*e->L|R?^Z%1e4sd(DLZfb$%B@KbdRi
zIq!K-W%#{QpZ7W6k3Q!;=Y8Izq`bU56bcddOB6*Bxw*NwZ3Dk@b8~a<E!b^)5KCFG
zOj8yt)073vG-bguO;WKBpin5(YPCY4kjZ2OK`;zM({wNxq-k2z<B9^NR;!IhV?jYd
zb#=8yqp7T{RIAnb`S}Dvgu~%rFzEC7+-|qW<2gM&wb^XJU=Y6vilQ)P>*(mPSS&7=
ziv`Q&a#<{vj*bqDHYke11Ex?YdU|>`Ha6fq>Dt)X=;`TEC=_=Etfi&J?RE=6N|oE~
zZfR+`WiX{uIXpa!3n^8@!^3%bdA9>rQ&aQ#^Jk#ZKp-$MFfcGM5C{Z-L)O;TYHDh3
z8q8=k`u%>OMZ4WzQBjc`SW!`7x7&dO{eHjEXuLVF`uckK7f;i4b8~a*@aE=bnx=un
z1A#z&ef>><6%`eI|Nb3li)GoJot^X~J3Bk@3_hQ)sHjMEFo(kd_r$X7+1Z&!qe;!6
z(P+-j&UhtpI2_`F4Gj(PGL+QJ%uMoriXaG?Og1w!gOKFSn>S*CX|-DTx$%dVmzT|E
zv)OE3US3Aa5Q#*dK7A?*nAK`U^Mp%Qs}(<(!C*lCxp0Z5X@kK41cR=}OeT|DE(ZpS
zB)ME}GMRwE5{jZYd-o3>JoxhEOIcYNUn?I!ew>?|qiLEXNtR`!(dgsHk9&K23knMO
zrb^21_iMG<A3uKlI}BQiI-L%oa=v~0_SakW=g*%f5((sj)ai7bhM}ccS62rK18R47
zSIF`iXoh<QEs;p{dOd=Js;a8R#l>VP%H{G;pFVAGZxaM@bxlK)Uax=m?j6gr9C4hb
zn3tF5^?H#j=So*s*oKCNa5#*d$LsZSu4q7|D3wYJ3kx~JAbEr*Aqb+dun>}p8%!dR
zkR&PG(C^>Bg(o2hf+R_aM8X*cnmo7*`tFGv?DFzb>>eO5(KLN|dC3{Z4Hk>V4i67;
zSi+<I{rzY(${EHD#xTsv$_frkc(lI09*@U4!$9Yl)9DoK2b=76J0uJQw!gnG%nVK)
z92`KxKww_4*JiT`^MglLtJUZ8K_Wq5kw|22Zcdn`|1Z!vIp`0U%+JpQr)cPUY<70m
z>-D0!357zTQ0V;pJoz#nkN^DnGZYFz=73b~?d>frEI^~-t$~*>U-G@LOC%Eg{rwb0
zQ51ExP9;e)`Ho(%hxaF0mVNc=6%Qz0T`H&3$qVe{<mBH82L}g%sn*xm;XZkTJ$drv
z;^G1h7K_C?J3Ft-R#sN#@pyo#;4P{o7^pRns<yT^9)(U2EX#iV`t`3Lm6Vh`eE1NO
zq`SL&VqyY*P{iK-ix)58Kbmm$_4V;}h`!s>)zx(~R6|2U2=)Z+kF~b89v>fzO7;5n
zYcy{{cQhLt8>7*v7)ar8xV^m{*%*dB=<)G!>{M2(wW_L0h%1Vsg!UnljVE0C@ZrPg
z=;+kcl<-tS!H|2pe`suM?EU-q)6>&fvJnEoWHQ-xk1j+a5r$!;QmI@nPj4#4<MC)T
z$}o(>;h3D9JUBSG?plW|L0~$aPOH_XzrVS;+1=fJczCE%scLI$A3b_hT3V`7sS=4q
zI2``<>(}n?uE*n{Y5M&99MZr*5%T0AlgYNWw$e}irKKglTgKQWXjYt<m`JC3`}Qqf
zi)cawQ!14fizSsO9*=KsZa#bVOazlCLY(e38ckDElh5b7xVT^#=IH2XWMpJ@brsST
zyE!43;$8ml2#>AWbj4yZj8?Gg-aZqY1<N#L!7@!*uuKz4;M*O(Q<4@J7vIaj3;zc}
WB3e5+KQA-@0000<MNUMnLSTXwZQWu3

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 5aeac265d..b87b38d0f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2185,6 +2185,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_business_about_away_messages" = "Define messages that are automatically sent when you are off.";
 "lng_business_subtitle_chatbots" = "Chatbots";
 "lng_business_about_chatbots" = "Add any third party chatbots that will process customer interactions.";
+"lng_business_subtitle_chat_intro" = "Intro";
+"lng_business_about_chat_intro" = "Customize the message people see before they start a chat with you.";
 
 "lng_location_title" = "Location";
 "lng_location_about" = "Display the location of your business on your account.";
@@ -2297,6 +2299,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chatbot_menu_remove" = "Remove bot from this chat";
 "lng_chatbot_menu_revoke" = "Revoke access to this chat";
 
+"lng_chat_intro_title" = "Intro";
+"lng_chat_intro_subtitle" = "Customize your intro";
+"lng_chat_intro_default_title" = "No messages here yet...";
+"lng_chat_intro_default_message" = "Send a message or tap on the greeting below";
+"lng_chat_intro_enter_title" = "Enter Title";
+"lng_chat_intro_enter_message" = "Enter Message";
+"lng_chat_intro_choose_sticker" = "Choose Sticker";
+"lng_chat_intro_random_sticker" = "Random";
+"lng_chat_intro_about" = "You can customize the message people see before they start a chat with you.";
+"lng_chat_intro_reset" = "Reset to Default";
+
 "lng_boost_channel_button" = "Boost Channel";
 "lng_boost_group_button" = "Boost Group";
 "lng_boost_again_button" = "Boost Again";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 72da2a489..3f94c8e5c 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -109,6 +109,18 @@ rpl::producer<> Premium::cloudSetUpdated() const {
 	return _cloudSetUpdated.events();
 }
 
+auto Premium::helloStickers() const
+-> const std::vector<not_null<DocumentData*>> & {
+	if (_helloStickers.empty()) {
+		const_cast<Premium*>(this)->reloadHelloStickers();
+	}
+	return _helloStickers;
+}
+
+rpl::producer<> Premium::helloStickersUpdated() const {
+	return _helloStickersUpdated.events();
+}
+
 int64 Premium::monthlyAmount() const {
 	return _monthlyAmount;
 }
@@ -225,6 +237,33 @@ void Premium::reloadCloudSet() {
 	}).send();
 }
 
+void Premium::reloadHelloStickers() {
+	if (_helloStickersRequestId) {
+		return;
+	}
+	_helloStickersRequestId = _api.request(MTPmessages_GetStickers(
+		MTP_string("\xf0\x9f\x91\x8b\xe2\xad\x90\xef\xb8\x8f"),
+		MTP_long(_helloStickersHash)
+	)).done([=](const MTPmessages_Stickers &result) {
+		_helloStickersRequestId = 0;
+		result.match([&](const MTPDmessages_stickersNotModified &) {
+		}, [&](const MTPDmessages_stickers &data) {
+			_helloStickersHash = data.vhash().v;
+			const auto owner = &_session->data();
+			_helloStickers.clear();
+			for (const auto &sticker : data.vstickers().v) {
+				const auto document = owner->processDocument(sticker);
+				if (document->sticker()) {
+					_helloStickers.push_back(document);
+				}
+			}
+			_helloStickersUpdated.fire({});
+		});
+	}).fail([=] {
+		_helloStickersRequestId = 0;
+	}).send();
+}
+
 void Premium::checkGiftCode(
 		const QString &slug,
 		Fn<void(GiftCode)> done) {
@@ -609,4 +648,24 @@ RequirePremiumState ResolveRequiresPremiumToWrite(
 	return RequirePremiumState::Unknown;
 }
 
+rpl::producer<DocumentData*> RandomHelloStickerValue(
+		not_null<Main::Session*> session) {
+	const auto premium = &session->api().premium();
+	const auto random = [=] {
+		const auto &v = premium->helloStickers();
+		Assert(!v.empty());
+		return v[base::RandomIndex(v.size())].get();
+	};
+	const auto &v = premium->helloStickers();
+	if (!v.empty()) {
+		return rpl::single(random());
+	}
+	return rpl::single<DocumentData*>(
+		nullptr
+	) | rpl::then(premium->helloStickersUpdated(
+	) | rpl::filter([=] {
+		return !premium->helloStickers().empty();
+	}) | rpl::take(1) | rpl::map(random));
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_premium.h b/Telegram/SourceFiles/api/api_premium.h
index e1c3a7b41..9bacca92d 100644
--- a/Telegram/SourceFiles/api/api_premium.h
+++ b/Telegram/SourceFiles/api/api_premium.h
@@ -85,6 +85,10 @@ public:
 		-> const std::vector<not_null<DocumentData*>> &;
 	[[nodiscard]] rpl::producer<> cloudSetUpdated() const;
 
+	[[nodiscard]] auto helloStickers() const
+		-> const std::vector<not_null<DocumentData*>> &;
+	[[nodiscard]] rpl::producer<> helloStickersUpdated() const;
+
 	[[nodiscard]] int64 monthlyAmount() const;
 	[[nodiscard]] QString monthlyCurrency() const;
 
@@ -111,6 +115,7 @@ private:
 	void reloadPromo();
 	void reloadStickers();
 	void reloadCloudSet();
+	void reloadHelloStickers();
 	void requestPremiumRequiredSlice();
 
 	const not_null<Main::Session*> _session;
@@ -133,6 +138,11 @@ private:
 	std::vector<not_null<DocumentData*>> _cloudSet;
 	rpl::event_stream<> _cloudSetUpdated;
 
+	mtpRequestId _helloStickersRequestId = 0;
+	uint64 _helloStickersHash = 0;
+	std::vector<not_null<DocumentData*>> _helloStickers;
+	rpl::event_stream<> _helloStickersUpdated;
+
 	int64 _monthlyAmount = 0;
 	QString _monthlyCurrency;
 
@@ -215,4 +225,7 @@ enum class RequirePremiumState {
 	not_null<PeerData*> peer,
 	History *maybeHistory);
 
+[[nodiscard]] rpl::producer<DocumentData*> RandomHelloStickerValue(
+	not_null<Main::Session*> session);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index a65864063..c0d26766a 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -808,34 +808,6 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	return st;
 }
 
-struct ButtonWithEmoji {
-	not_null<const style::SettingsButton*> st;
-	int emojiWidth = 0;
-	int noneWidth = 0;
-	int added = 0;
-};
-
-[[nodiscard]] ButtonWithEmoji ButtonStyleWithRightEmoji(
-		not_null<Ui::RpWidget*> parent) {
-	const auto ratio = style::DevicePixelRatio();
-	const auto emojiWidth = Data::FrameSizeFromTag({}) / ratio;
-
-	const auto noneWidth = st::normalFont->width(
-		tr::lng_settings_color_emoji_off(tr::now));
-
-	const auto added = st::normalFont->spacew;
-	const auto rightAdded = std::max(noneWidth, emojiWidth);
-	return {
-		.st = ButtonStyleWithAddedPadding(
-			parent,
-			st::peerAppearanceButton,
-			QMargins(0, 0, added + rightAdded, 0)),
-		.emojiWidth = emojiWidth,
-		.noneWidth = noneWidth,
-		.added = added,
-	};
-}
-
 [[nodiscard]] object_ptr<Ui::SettingsButton> CreateEmojiIconButton(
 		not_null<Ui::RpWidget*> parent,
 		std::shared_ptr<ChatHelpers::Show> show,
@@ -844,7 +816,9 @@ struct ButtonWithEmoji {
 		rpl::producer<uint8> colorIndexValue,
 		rpl::producer<DocumentId> emojiIdValue,
 		Fn<void(DocumentId)> emojiIdChosen) {
-	const auto button = ButtonStyleWithRightEmoji(parent);
+	const auto button = ButtonStyleWithRightEmoji(
+		parent,
+		tr::lng_settings_color_emoji_off(tr::now));
 	auto result = Settings::CreateButtonWithIcon(
 		parent,
 		tr::lng_settings_color_emoji(),
@@ -962,7 +936,9 @@ struct ButtonWithEmoji {
 		rpl::producer<DocumentId> statusIdValue,
 		Fn<void(DocumentId,TimeId)> statusIdChosen,
 		bool group) {
-	const auto button = ButtonStyleWithRightEmoji(parent);
+	const auto button = ButtonStyleWithRightEmoji(
+		parent,
+		tr::lng_settings_color_emoji_off(tr::now));
 	const auto &phrase = group
 		? tr::lng_edit_channel_status_group
 		: tr::lng_edit_channel_status;
@@ -1073,7 +1049,9 @@ struct ButtonWithEmoji {
 		not_null<ChannelData*> channel) {
 	Expects(channel->mgInfo != nullptr);
 
-	const auto button = ButtonStyleWithRightEmoji(parent);
+	const auto button = ButtonStyleWithRightEmoji(
+		parent,
+		tr::lng_settings_color_emoji_off(tr::now));
 	auto result = Settings::CreateButtonWithIcon(
 		parent,
 		tr::lng_group_emoji(),
@@ -1509,3 +1487,25 @@ void CheckBoostLevel(
 		cancel();
 	}).send();
 }
+
+ButtonWithEmoji ButtonStyleWithRightEmoji(
+		not_null<Ui::RpWidget*> parent,
+		const QString &noneString,
+		const style::SettingsButton &parentSt) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto emojiWidth = Data::FrameSizeFromTag({}) / ratio;
+
+	const auto noneWidth = st::normalFont->width(noneString);
+
+	const auto added = st::normalFont->spacew;
+	const auto rightAdded = std::max(noneWidth, emojiWidth);
+	return {
+		.st = ButtonStyleWithAddedPadding(
+			parent,
+			parentSt,
+			QMargins(0, 0, added + rightAdded, 0)),
+		.emojiWidth = emojiWidth,
+		.noneWidth = noneWidth,
+		.added = added,
+	};
+}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
index 6b7284449..cf83bfc74 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
@@ -7,6 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+namespace style {
+struct SettingsButton;
+} // namespace style
+
+namespace st {
+extern const style::SettingsButton &peerAppearanceButton;
+} // namespace st
+
 namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
@@ -17,6 +25,7 @@ class ChatStyle;
 class ChatTheme;
 class VerticalLayout;
 struct AskBoostReason;
+class RpWidget;
 } // namespace Ui
 
 void EditPeerColorBox(
@@ -36,3 +45,14 @@ void CheckBoostLevel(
 	not_null<PeerData*> peer,
 	Fn<std::optional<Ui::AskBoostReason>(int level)> askMore,
 	Fn<void()> cancel);
+
+struct ButtonWithEmoji {
+	not_null<const style::SettingsButton*> st;
+	int emojiWidth = 0;
+	int noneWidth = 0;
+	int added = 0;
+};
+[[nodiscard]] ButtonWithEmoji ButtonStyleWithRightEmoji(
+	not_null<Ui::RpWidget*> parent,
+	const QString &noneString,
+	const style::SettingsButton &parentSt = st::peerAppearanceButton);
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index 76df0c2d7..dc977468c 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -144,6 +144,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_business_subtitle_away_messages();
 	case PremiumFeature::BusinessBots:
 		return tr::lng_business_subtitle_chatbots();
+	case PremiumFeature::ChatIntro:
+		return tr::lng_business_subtitle_chat_intro();
 	}
 	Unexpected("PremiumFeature in SectionTitle.");
 }
@@ -201,6 +203,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_business_about_away_messages();
 	case PremiumFeature::BusinessBots:
 		return tr::lng_business_about_chatbots();
+	case PremiumFeature::ChatIntro:
+		return tr::lng_business_about_chat_intro();
 	}
 	Unexpected("PremiumFeature in SectionTitle.");
 }
@@ -528,6 +532,7 @@ struct VideoPreviewDocument {
 		case PremiumFeature::GreetingMessage: return "greeting_message";
 		case PremiumFeature::AwayMessage: return "away_message";
 		case PremiumFeature::BusinessBots: return "business_bots";
+		case PremiumFeature::ChatIntro: return "chat_intro";
 		}
 		return "";
 	}();
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.h b/Telegram/SourceFiles/boxes/premium_preview_box.h
index 80400a6ee..fa520caaf 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.h
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.h
@@ -74,6 +74,7 @@ enum class PremiumFeature {
 	GreetingMessage,
 	AwayMessage,
 	BusinessBots,
+	ChatIntro,
 
 	kCount,
 };
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_lottie.h b/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
index 156d0a9bb..17ae65c9d 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
@@ -66,7 +66,7 @@ enum class StickerLottieSize : uint8 {
 	EmojiInteractionReserved5,
 	EmojiInteractionReserved6,
 	EmojiInteractionReserved7,
-	PremiumReactionPreview,
+	ChatIntroHelloSticker,
 };
 [[nodiscard]] uint8 LottieCacheKeyShift(
 	uint8 replacementsTag,
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index aef9d7406..5b32ea14c 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -378,6 +378,9 @@ TabbedSelector::TabbedSelector(
 		tabs.reserve(2);
 		tabs.push_back(createTab(SelectorTab::Stickers, 0));
 		tabs.push_back(createTab(SelectorTab::Masks, 1));
+	} else if (_mode == Mode::StickersOnly) {
+		tabs.reserve(1);
+		tabs.push_back(createTab(SelectorTab::Stickers, 0));
 	} else {
 		tabs.reserve(1);
 		tabs.push_back(createTab(SelectorTab::Emoji, 0));
@@ -385,10 +388,10 @@ TabbedSelector::TabbedSelector(
 	return tabs;
 }())
 , _currentTabType(full()
-		? session().settings().selectorTab()
-		: mediaEditor()
-		? SelectorTab::Stickers
-		: SelectorTab::Emoji)
+	? session().settings().selectorTab()
+	: (mediaEditor() || _mode == Mode::StickersOnly)
+	? SelectorTab::Stickers
+	: SelectorTab::Emoji)
 , _hasEmojiTab(ranges::contains(_tabs, SelectorTab::Emoji, &Tab::type))
 , _hasStickersTab(ranges::contains(_tabs, SelectorTab::Stickers, &Tab::type))
 , _hasGifsTab(ranges::contains(_tabs, SelectorTab::Gifs, &Tab::type))
@@ -661,7 +664,7 @@ void TabbedSelector::updateTabsSliderGeometry() {
 	if (!_tabsSlider) {
 		return;
 	}
-	const auto w = mediaEditor() && hasMasksTab() && masks()->mySetsEmpty()
+	const auto w = (mediaEditor() && hasMasksTab() && masks()->mySetsEmpty())
 		? width() / 2
 		: width();
 	_tabsSlider->resizeToWidth(w);
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index 3b2f45d5d..adfee5361 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -79,6 +79,7 @@ using InlineChosen = InlineBots::ResultSelected;
 enum class TabbedSelectorMode {
 	Full,
 	EmojiOnly,
+	StickersOnly,
 	MediaEditor,
 	EmojiStatus,
 	ChannelStatus,
diff --git a/Telegram/SourceFiles/data/business/data_business_common.cpp b/Telegram/SourceFiles/data/business/data_business_common.cpp
index 7fc092115..bdc8ffe7d 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_common.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/business/data_business_common.h"
 
+#include "data/data_document.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 
@@ -333,4 +334,22 @@ WorkingIntervals ReplaceDayIntervals(
 	return result.normalized();
 }
 
+ChatIntro FromMTP(
+		not_null<Session*> owner,
+		const tl::conditional<MTPBusinessIntro> &intro) {
+	auto result = ChatIntro();
+	if (intro) {
+		const auto &data = intro->data();
+		result.title = qs(data.vtitle());
+		result.description = qs(data.vdescription());
+		if (const auto document = data.vsticker()) {
+			result.sticker = owner->processDocument(*document);
+			if (!result.sticker->sticker()) {
+				result.sticker = nullptr;
+			}
+		}
+	}
+	return result;
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/business/data_business_common.h b/Telegram/SourceFiles/data/business/data_business_common.h
index 3793f0b60..86754c56f 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.h
+++ b/Telegram/SourceFiles/data/business/data_business_common.h
@@ -252,4 +252,22 @@ struct GreetingSettings {
 	not_null<Session*> owner,
 	const tl::conditional<MTPBusinessGreetingMessage> &message);
 
+struct ChatIntro {
+	QString title;
+	QString description;
+	DocumentData *sticker = nullptr;
+
+	explicit operator bool() const {
+		return !title.isEmpty() || !description.isEmpty();
+	}
+
+	friend inline bool operator==(
+		const ChatIntro &a,
+		const ChatIntro &b) = default;
+};
+
+[[nodiscard]] ChatIntro FromMTP(
+	not_null<Session*> owner,
+	const tl::conditional<MTPBusinessIntro> &intro);
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/business/data_business_info.cpp b/Telegram/SourceFiles/data/business/data_business_info.cpp
index 1e7beef88..66c7e0be9 100644
--- a/Telegram/SourceFiles/data/business/data_business_info.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_info.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "base/unixtime.h"
 #include "data/business/data_business_common.h"
+#include "data/data_document.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "main/main_session.h"
@@ -183,6 +184,54 @@ rpl::producer<> BusinessInfo::greetingSettingsChanged() const {
 	return _greetingSettingsChanged.events();
 }
 
+void BusinessInfo::saveChatIntro(ChatIntro data, Fn<void(QString)> fail) {
+	const auto &was = _chatIntro;
+	if (was == data) {
+		return;
+	} else {
+		const auto session = &_owner->session();
+		using Flag = MTPaccount_UpdateBusinessIntro::Flag;
+		session->api().request(MTPaccount_UpdateBusinessIntro(
+			MTP_flags(data ? Flag::f_intro : Flag()),
+			MTP_inputBusinessIntro(
+				MTP_flags(data.sticker ? MTPDinputBusinessIntro::Flag::f_sticker : MTPDinputBusinessIntro::Flag()),
+				MTP_string(data.title),
+				MTP_string(data.description),
+				(data.sticker
+					? data.sticker->mtpInput()
+					: MTP_inputDocumentEmpty()))
+		)).fail([=](const MTP::Error &error) {
+			_chatIntro = was;
+			_chatIntroChanged.fire({});
+			if (fail) {
+				fail(error.type());
+			}
+		}).send();
+	}
+	_chatIntro = std::move(data);
+	_chatIntroChanged.fire({});
+}
+
+void BusinessInfo::applyChatIntro(ChatIntro data) {
+	if (_chatIntro == data) {
+		return;
+	}
+	_chatIntro = data;
+	_chatIntroChanged.fire({});
+}
+
+ChatIntro BusinessInfo::chatIntro() const {
+	return _chatIntro.value_or(ChatIntro());
+}
+
+bool BusinessInfo::chatIntroLoaded() const {
+	return _chatIntro.has_value();
+}
+
+rpl::producer<> BusinessInfo::chatIntroChanged() const {
+	return _chatIntroChanged.events();
+}
+
 void BusinessInfo::preload() {
 	preloadTimezones();
 }
diff --git a/Telegram/SourceFiles/data/business/data_business_info.h b/Telegram/SourceFiles/data/business/data_business_info.h
index 933d86910..bdae99e35 100644
--- a/Telegram/SourceFiles/data/business/data_business_info.h
+++ b/Telegram/SourceFiles/data/business/data_business_info.h
@@ -36,6 +36,12 @@ public:
 	[[nodiscard]] bool greetingSettingsLoaded() const;
 	[[nodiscard]] rpl::producer<> greetingSettingsChanged() const;
 
+	void saveChatIntro(ChatIntro data, Fn<void(QString)> fail);
+	void applyChatIntro(ChatIntro data);
+	[[nodiscard]] ChatIntro chatIntro() const;
+	[[nodiscard]] bool chatIntroLoaded() const;
+	[[nodiscard]] rpl::producer<> chatIntroChanged() const;
+
 	void preloadTimezones();
 	[[nodiscard]] bool timezonesLoaded() const;
 	[[nodiscard]] rpl::producer<Timezones> timezonesValue() const;
@@ -51,6 +57,9 @@ private:
 	std::optional<GreetingSettings> _greetingSettings;
 	rpl::event_stream<> _greetingSettingsChanged;
 
+	std::optional<ChatIntro> _chatIntro;
+	rpl::event_stream<> _chatIntroChanged;
+
 	mtpRequestId _timezonesRequestId = 0;
 	int32 _timezonesHash = 0;
 
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 313ed21bd..a1219380c 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -601,6 +601,8 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 			FromMTP(&user->owner(), update.vbusiness_away_message()));
 		user->owner().businessInfo().applyGreetingSettings(
 			FromMTP(&user->owner(), update.vbusiness_greeting_message()));
+		user->owner().businessInfo().applyChatIntro(
+			FromMTP(&user->owner(), update.vbusiness_intro()));
 	}
 
 	user->owner().stories().apply(user, update.vstories());
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index c017d8842..0252ccc68 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -7,10 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_about_view.h"
 
+#include "chat_helpers/stickers_lottie.h"
 #include "core/click_handler_types.h"
+#include "data/business/data_business_common.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
 #include "data/data_user.h"
 #include "history/view/media/history_view_service_box.h"
 #include "history/view/media/history_view_sticker_player_abstract.h"
+#include "history/view/media/history_view_sticker.h"
 #include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -64,6 +69,43 @@ private:
 
 };
 
+class ChatIntroBox final : public ServiceBoxContent {
+public:
+	ChatIntroBox(not_null<Element*> parent, Data::ChatIntro data);
+	~ChatIntroBox();
+
+	int width() override;
+	int top() override;
+	QSize size() override;
+	QString title() override;
+	TextWithEntities subtitle() override;
+	int buttonSkip() override;
+	rpl::producer<QString> button() override;
+	void draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) override;
+	ClickHandlerPtr createViewLink() override;
+
+	bool hideServiceText() override {
+		return true;
+	}
+
+	void stickerClearLoopPlayed() override;
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
+	bool hasHeavyPart() override;
+	void unloadHeavyPart() override;
+
+private:
+	const not_null<Element*> _parent;
+	const Data::ChatIntro _data;
+	mutable std::optional<Sticker> _sticker;
+
+};
+
 PremiumRequiredBox::PremiumRequiredBox(not_null<Element*> parent)
 : _parent(parent) {
 }
@@ -133,6 +175,99 @@ bool PremiumRequiredBox::hasHeavyPart() {
 void PremiumRequiredBox::unloadHeavyPart() {
 }
 
+ChatIntroBox::ChatIntroBox(not_null<Element*> parent, Data::ChatIntro data)
+: _parent(parent)
+, _data(data) {
+	if (const auto document = data.sticker) {
+		if (const auto sticker = document->sticker()) {
+			const auto skipPremiumEffect = false;
+			_sticker.emplace(_parent, document, skipPremiumEffect, _parent);
+			_sticker->setDiceIndex(sticker->alt, 0);
+			_sticker->setGiftBoxSticker(true);
+			_sticker->initSize();
+			_sticker->setCustomEmojiPart(
+				st::chatIntroStickerSize,
+				ChatHelpers::StickerLottieSize::ChatIntroHelloSticker);
+		}
+	}
+}
+
+ChatIntroBox::~ChatIntroBox() = default;
+
+int ChatIntroBox::width() {
+	return st::chatIntroWidth;
+}
+
+int ChatIntroBox::top() {
+	return st::msgServiceGiftBoxButtonMargins.top();
+}
+
+QSize ChatIntroBox::size() {
+	return { st::msgServicePhotoWidth, st::msgServicePhotoWidth };
+}
+
+QString ChatIntroBox::title() {
+	return _data ? _data.title : tr::lng_chat_intro_default_title(tr::now);
+}
+
+int ChatIntroBox::buttonSkip() {
+	return st::storyMentionButtonSkip;
+}
+
+rpl::producer<QString> ChatIntroBox::button() {
+	return nullptr;
+}
+
+TextWithEntities ChatIntroBox::subtitle() {
+	return {
+		(_data
+			? _data.description
+			: tr::lng_chat_intro_default_message(tr::now))
+	};
+}
+
+ClickHandlerPtr ChatIntroBox::createViewLink() {
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto controller = my.sessionWindow.get()) {
+			Settings::ShowPremium(controller, u"require_premium"_q);
+		}
+	});
+}
+
+void ChatIntroBox::draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) {
+	if (_sticker) {
+		_sticker->draw(p, context, geometry);
+	}
+}
+
+void ChatIntroBox::stickerClearLoopPlayed() {
+	if (_sticker) {
+		_sticker->stickerClearLoopPlayed();
+	}
+}
+
+std::unique_ptr<StickerPlayer> ChatIntroBox::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	return _sticker
+		? _sticker->stickerTakePlayer(data, replacements)
+		: nullptr;
+}
+
+bool ChatIntroBox::hasHeavyPart() {
+	return _sticker && _sticker->hasHeavyPart();
+}
+
+void ChatIntroBox::unloadHeavyPart() {
+	if (_sticker) {
+		_sticker->unloadHeavyPart();
+	}
+}
+
 } // namespace
 
 AboutView::AboutView(
@@ -142,6 +277,10 @@ AboutView::AboutView(
 , _delegate(delegate) {
 }
 
+AboutView::~AboutView() {
+	setItem({}, nullptr);
+}
+
 not_null<History*> AboutView::history() const {
 	return _history;
 }
@@ -187,6 +326,37 @@ bool AboutView::refresh() {
 	return true;
 }
 
+void AboutView::make(Data::ChatIntro data) {
+	const auto item = _history->makeMessage({
+		.id = _history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeAboutView
+			| MessageFlag::FakeHistoryItem
+			| MessageFlag::Local),
+		.from = _history->peer->id,
+	}, PreparedServiceText{ { data.description } });
+
+	setItem(AdminLog::OwnedItem(_delegate, item), data.sticker);
+
+	_item->overrideMedia(std::make_unique<ServiceBox>(
+		_item.get(),
+		std::make_unique<ChatIntroBox>(_item.get(), data)));
+}
+
+void AboutView::setItem(AdminLog::OwnedItem item, DocumentData *sticker) {
+	if (const auto was = _item ? _item->data().get() : nullptr) {
+		if (_sticker) {
+			was->history()->owner().unregisterDocumentItem(_sticker, was);
+		}
+	}
+	_item = std::move(item);
+	_sticker = sticker;
+	if (const auto now = _item ? _item->data().get() : nullptr) {
+		if (_sticker) {
+			now->history()->owner().registerDocumentItem(_sticker, now);
+		}
+	}
+}
+
 AdminLog::OwnedItem AboutView::makeAboutBot(not_null<BotInfo*> info) {
 	const auto textWithEntities = TextUtilities::ParseEntities(
 		info->description,
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.h b/Telegram/SourceFiles/history/view/history_view_about_view.h
index bf162f451..cd1528b75 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.h
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.h
@@ -9,6 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "history/admin_log/history_admin_log_item.h"
 
+namespace Data {
+struct ChatIntro;
+} // namespace Data
+
 namespace HistoryView {
 
 class AboutView final : public ClickHandlerHost {
@@ -16,6 +20,7 @@ public:
 	AboutView(
 		not_null<History*> history,
 		not_null<ElementDelegate*> delegate);
+	~AboutView();
 
 	[[nodiscard]] not_null<History*> history() const;
 	[[nodiscard]] Element *view() const;
@@ -23,16 +28,20 @@ public:
 
 	bool refresh();
 
+	void make(Data::ChatIntro data);
+
 	int top = 0;
 	int height = 0;
 
 private:
 	[[nodiscard]] AdminLog::OwnedItem makeAboutBot(not_null<BotInfo*> info);
 	[[nodiscard]] AdminLog::OwnedItem makePremiumRequired();
+	void setItem(AdminLog::OwnedItem item, DocumentData *sticker);
 
 	const not_null<History*> _history;
 	const not_null<ElementDelegate*> _delegate;
 	AdminLog::OwnedItem _item;
+	DocumentData *_sticker = nullptr;
 	int _version = 0;
 
 };
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index 6eb5d8e40..858b89fbc 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -884,6 +884,9 @@ BusinessBotStatus::Bar::Bar(QWidget *parent)
 , _settings(this, st::historyBusinessBotSettings) {
 	_name->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_status->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_togglePaused->setFullRadius(true);
+	_togglePaused->setTextTransform(
+		Ui::RoundButton::TextTransform::NoTransform);
 	_settings->setClickedCallback([=] {
 		showMenu();
 	});
@@ -984,7 +987,9 @@ int BusinessBotStatus::Bar::resizeGetHeight(int newWidth) {
 	}
 	auto available = newWidth - _settings->width() - st.namePosition.x();
 	if (!_togglePaused->isHidden()) {
-		_togglePaused->moveToRight(_settings->width(), 0);
+		_togglePaused->moveToRight(
+			_settings->width(),
+			(st.height - _togglePaused->height()) / 2);
 		available -= _togglePaused->width();
 	}
 	_name->resizeToWidth(available);
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index a0146f1bc..50df28580 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -114,7 +114,7 @@ chatPhotoEmpty#37c1011c = ChatPhoto;
 chatPhoto#1c6e1c11 flags:# has_video:flags.0?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = ChatPhoto;
 
 messageEmpty#90a6ca84 flags:# id:int peer_id:flags.0?Peer = Message;
-message#2357bf25 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true pinned:flags.24?true noforwards:flags.26?true invert_media:flags.27?true flags2:# id:int from_id:flags.8?Peer from_boosts_applied:flags.29?int peer_id:Peer saved_peer_id:flags.28?Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?long via_business_bot_id:flags2.0?long reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long reactions:flags.20?MessageReactions restriction_reason:flags.22?Vector<RestrictionReason> ttl_period:flags.25?int quick_reply_shortcut_id:flags.30?int = Message;
+message#2357bf25 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true pinned:flags.24?true noforwards:flags.26?true invert_media:flags.27?true flags2:# offline:flags2.1?true id:int from_id:flags.8?Peer from_boosts_applied:flags.29?int peer_id:Peer saved_peer_id:flags.28?Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?long via_business_bot_id:flags2.0?long reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long reactions:flags.20?MessageReactions restriction_reason:flags.22?Vector<RestrictionReason> ttl_period:flags.25?int quick_reply_shortcut_id:flags.30?int = Message;
 messageService#2b085862 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true legacy:flags.19?true id:int from_id:flags.8?Peer peer_id:Peer reply_to:flags.3?MessageReplyHeader date:int action:MessageAction ttl_period:flags.25?int = Message;
 
 messageMediaEmpty#3ded6320 = MessageMedia;
@@ -227,7 +227,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#670bbc9c flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro = UserFull;
+userFull#ecdadceb flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -517,6 +517,7 @@ inputPrivacyKeyPhoneNumber#352dafa = InputPrivacyKey;
 inputPrivacyKeyAddedByPhone#d1219bdd = InputPrivacyKey;
 inputPrivacyKeyVoiceMessages#aee69d68 = InputPrivacyKey;
 inputPrivacyKeyAbout#3823cc40 = InputPrivacyKey;
+inputPrivacyKeyBirthday#d65a11cc = InputPrivacyKey;
 
 privacyKeyStatusTimestamp#bc2eab30 = PrivacyKey;
 privacyKeyChatInvite#500e6dfa = PrivacyKey;
@@ -528,6 +529,7 @@ privacyKeyPhoneNumber#d19ae46d = PrivacyKey;
 privacyKeyAddedByPhone#42ffd42b = PrivacyKey;
 privacyKeyVoiceMessages#697f414 = PrivacyKey;
 privacyKeyAbout#a486b761 = PrivacyKey;
+privacyKeyBirthday#2000a518 = PrivacyKey;
 
 inputPrivacyValueAllowContacts#d09e07b = InputPrivacyRule;
 inputPrivacyValueAllowAll#184b35ce = InputPrivacyRule;
@@ -1710,6 +1712,8 @@ account.connectedBots#17d7f87b connected_bots:Vector<ConnectedBot> users:Vector<
 
 messages.dialogFilters#2ad93719 flags:# tags_enabled:flags.0?true filters:Vector<DialogFilter> = messages.DialogFilters;
 
+birthday#6c8e1e06 flags:# day:int month:int year:flags.0?int = Birthday;
+
 botBusinessConnection#896433b4 flags:# can_reply:flags.0?true disabled:flags.1?true connection_id:string user_id:long dc_id:int date:int = BotBusinessConnection;
 
 inputBusinessIntro#9c469cd flags:# title:string description:string sticker:flags.0?InputDocument = InputBusinessIntro;
@@ -1727,6 +1731,10 @@ inputBusinessBotRecipients#c4e5921e flags:# existing_chats:flags.0?true new_chat
 
 businessBotRecipients#b88cf373 flags:# existing_chats:flags.0?true new_chats:flags.1?true contacts:flags.2?true non_contacts:flags.3?true exclude_selected:flags.5?true users:flags.4?Vector<long> exclude_users:flags.6?Vector<long> = BusinessBotRecipients;
 
+contactBirthday#1d998733 contact_id:long birthday:Birthday = ContactBirthday;
+
+contacts.contactBirthdays#114ff30d contacts:Vector<ContactBirthday> users:Vector<User> = contacts.ContactBirthdays;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1863,6 +1871,7 @@ account.getBotBusinessConnection#76a86270 connection_id:string = Updates;
 account.updateBusinessIntro#a614d034 flags:# intro:flags.0?InputBusinessIntro = Bool;
 account.toggleConnectedBotPaused#646e1097 peer:InputPeer paused:Bool = Bool;
 account.disablePeerConnectedBot#5e437ed9 peer:InputPeer = Bool;
+account.updateBirthday#cc6e0c11 flags:# birthday:flags.0?Birthday = Bool;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#b60f5918 id:InputUser = users.UserFull;
@@ -1894,6 +1903,7 @@ contacts.exportContactToken#f8654027 = ExportedContactToken;
 contacts.importContactToken#13005788 token:string = User;
 contacts.editCloseFriends#ba6705f0 id:Vector<long> = Bool;
 contacts.setBlocked#94c65c76 flags:# my_stories_from:flags.0?true id:Vector<InputPeer> limit:int = Bool;
+contacts.getBirthdays#daeda864 = contacts.ContactBirthdays;
 
 messages.getMessages#63c66506 id:Vector<InputMessage> = messages.Messages;
 messages.getDialogs#a0f4cb4f flags:# exclude_pinned:flags.0?true folder_id:flags.1?int offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:long = messages.Dialogs;
diff --git a/Telegram/SourceFiles/settings/business/settings_away_message.cpp b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
index 0caa86b34..afaeb3a2b 100644
--- a/Telegram/SourceFiles/settings/business/settings_away_message.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
@@ -31,7 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Settings {
 namespace {
 
-class AwayMessage : public BusinessSection<AwayMessage> {
+class AwayMessage final : public BusinessSection<AwayMessage> {
 public:
 	AwayMessage(
 		QWidget *parent,
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
new file mode 100644
index 000000000..28a223039
--- /dev/null
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -0,0 +1,564 @@
+/*
+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 "settings/business/settings_chat_intro.h"
+
+#include "api/api_premium.h"
+#include "boxes/peers/edit_peer_color_box.h" // ButtonStyleWithRightEmoji
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "core/application.h"
+#include "data/business/data_business_info.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
+#include "history/view/history_view_about_view.h"
+#include "history/view/history_view_element.h"
+#include "history/history.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/business/settings_recipients_helper.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/effects/path_shift_gradient.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/buttons.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
+#include "window/themes/window_theme.h"
+#include "window/section_widget.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
+
+namespace Settings {
+namespace {
+
+using namespace HistoryView;
+
+class PreviewDelegate final : public DefaultElementDelegate {
+public:
+	PreviewDelegate(
+		not_null<QWidget*> parent,
+		not_null<Ui::ChatStyle*> st,
+		Fn<void()> update);
+
+	bool elementAnimationsPaused() override;
+	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override;
+	Context elementContext() override;
+
+private:
+	const not_null<QWidget*> _parent;
+	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
+
+};
+
+class PreviewWrap final : public Ui::RpWidget {
+public:
+	PreviewWrap(
+		not_null<QWidget*> parent,
+		not_null<Main::Session*> session,
+		rpl::producer<Data::ChatIntro> value);
+	~PreviewWrap();
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	void resizeTo(int width);
+	void prepare(rpl::producer<Data::ChatIntro> value);
+
+	const not_null<History*> _history;
+	const std::unique_ptr<Ui::ChatTheme> _theme;
+	const std::unique_ptr<Ui::ChatStyle> _style;
+	const std::unique_ptr<PreviewDelegate> _delegate;
+
+	std::unique_ptr<AboutView> _view;
+	QPoint _position;
+
+};
+
+class StickerPanel final {
+public:
+	StickerPanel();
+	~StickerPanel();
+
+	struct Descriptor {
+		not_null<Window::SessionController*> controller;
+		not_null<QWidget*> button;
+		DocumentId ensureAddedId = 0;
+	};
+	void show(Descriptor &&descriptor);
+	void repaint();
+
+	[[nodiscard]] bool hasFocus() const;
+
+	struct CustomChosen {
+		not_null<DocumentData*> sticker;
+	};
+	[[nodiscard]] rpl::producer<CustomChosen> someCustomChosen() const {
+		return _someCustomChosen.events();
+	}
+
+private:
+	void create(const Descriptor &descriptor);
+
+	base::unique_qptr<ChatHelpers::TabbedPanel> _panel;
+	QPointer<QWidget> _panelButton;
+	rpl::event_stream<CustomChosen> _someCustomChosen;
+
+};
+
+class ChatIntro final : public BusinessSection<ChatIntro> {
+public:
+	ChatIntro(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+	~ChatIntro();
+
+	[[nodiscard]] bool closeByOutsideClick() const override;
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	void setInnerFocus() override {
+		_setFocus();
+	}
+
+private:
+	void setupContent(not_null<Window::SessionController*> controller);
+	void save();
+
+	Fn<void()> _setFocus;
+
+	rpl::variable<Data::ChatIntro> _intro;
+
+};
+
+[[nodiscard]] object_ptr<Ui::SettingsButton> CreateIntroStickerButton(
+		not_null<Ui::RpWidget*> parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		rpl::producer<DocumentData*> stickerValue,
+		Fn<void(DocumentData*)> stickerChosen) {
+	const auto button = ButtonStyleWithRightEmoji(
+		parent,
+		tr::lng_chat_intro_random_sticker(tr::now),
+		st::settingsButtonNoIcon);
+	auto result = Settings::CreateButtonWithIcon(
+		parent,
+		tr::lng_chat_intro_choose_sticker(),
+		*button.st);
+	const auto raw = result.data();
+
+	const auto right = Ui::CreateChild<Ui::RpWidget>(raw);
+	right->show();
+
+	struct State {
+		StickerPanel panel;
+		DocumentId stickerId = 0;
+	};
+	const auto state = right->lifetime().make_state<State>();
+	state->panel.someCustomChosen(
+	) | rpl::start_with_next([=](StickerPanel::CustomChosen chosen) {
+		stickerChosen(chosen.sticker);
+	}, raw->lifetime());
+
+	const auto session = &show->session();
+	std::move(
+		stickerValue
+	) | rpl::start_with_next([=](DocumentData *sticker) {
+		state->stickerId = sticker ? sticker->id : 0;
+		right->resize(
+			(sticker ? button.emojiWidth : button.noneWidth) + button.added,
+			right->height());
+		right->update();
+	}, right->lifetime());
+
+	rpl::combine(
+		raw->sizeValue(),
+		right->widthValue()
+	) | rpl::start_with_next([=](QSize outer, int width) {
+		right->resize(width, outer.height());
+		const auto skip = st::settingsButton.padding.right();
+		right->moveToRight(skip - button.added, 0, outer.width());
+	}, right->lifetime());
+
+	right->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(right);
+		const auto height = right->height();
+		if (false) {
+			// #TODO paint small sticker
+		} else {
+			const auto &font = st::normalFont;
+			p.setFont(font);
+			p.setPen(st::windowActiveTextFg);
+			p.drawText(
+				QPoint(
+					button.added,
+					(height - font->height) / 2 + font->ascent),
+				tr::lng_chat_intro_random_sticker(tr::now));
+		}
+	}, right->lifetime());
+
+	raw->setClickedCallback([=] {
+		const auto controller = show->resolveWindow(
+			ChatHelpers::WindowUsage::PremiumPromo);
+		if (controller) {
+			state->panel.show({
+				.controller = controller,
+				.button = right,
+				.ensureAddedId = state->stickerId,
+			});
+		}
+	});
+
+	return result;
+}
+
+PreviewDelegate::PreviewDelegate(
+	not_null<QWidget*> parent,
+	not_null<Ui::ChatStyle*> st,
+	Fn<void()> update)
+: _parent(parent)
+, _pathGradient(MakePathShiftGradient(st, update)) {
+}
+
+bool PreviewDelegate::elementAnimationsPaused() {
+	return _parent->window()->isActiveWindow();
+}
+
+auto PreviewDelegate::elementPathShiftGradient()
+-> not_null<Ui::PathShiftGradient*> {
+	return _pathGradient.get();
+}
+
+Context PreviewDelegate::elementContext() {
+	return Context::History;
+}
+
+PreviewWrap::PreviewWrap(
+	not_null<QWidget*> parent,
+	not_null<Main::Session*> session,
+	rpl::producer<Data::ChatIntro> value)
+: RpWidget(parent)
+, _history(session->data().history(session->userPeerId()))
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
+, _style(std::make_unique<Ui::ChatStyle>(
+	_history->session().colorIndicesValue()))
+, _delegate(std::make_unique<PreviewDelegate>(
+	parent,
+	_style.get(),
+	[=] { update(); }))
+, _position(0, st::msgMargin.bottom()) {
+	_style->apply(_theme.get());
+
+	session->data().viewRepaintRequest(
+	) | rpl::start_with_next([=](not_null<const Element*> view) {
+		if (view == _view->view()) {
+			update();
+		}
+	}, lifetime());
+
+	prepare(std::move(value));
+}
+
+PreviewWrap::~PreviewWrap() {
+	_view = nullptr;
+}
+
+void PreviewWrap::prepare(rpl::producer<Data::ChatIntro> value) {
+	_view = std::make_unique<AboutView>(
+		_history.get(),
+		_delegate.get());
+
+	std::move(value) | rpl::start_with_next([=](Data::ChatIntro intro) {
+		_view->make(std::move(intro));
+		if (width() >= st::msgMinWidth) {
+			resizeTo(width());
+		}
+		update();
+	}, lifetime());
+
+	widthValue(
+	) | rpl::filter([=](int width) {
+		return width >= st::msgMinWidth;
+	}) | rpl::start_with_next([=](int width) {
+		resizeTo(width);
+	}, lifetime());
+}
+
+void PreviewWrap::resizeTo(int width) {
+	const auto height = _position.y()
+		+ _view->view()->resizeGetHeight(width)
+		+ _position.y()
+		+ st::msgServiceMargin.top()
+		+ st::msgServiceGiftBoxTopSkip
+		- st::msgServiceMargin.bottom();
+	resize(width, height);
+}
+
+void PreviewWrap::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+
+	const auto clip = e->rect();
+	if (!clip.isEmpty()) {
+		p.setClipRect(clip);
+		Window::SectionWidget::PaintBackground(
+			p,
+			_theme.get(),
+			QSize(width(), window()->height()),
+			clip);
+	}
+
+	auto context = _theme->preparePaintContext(
+		_style.get(),
+		rect(),
+		e->rect(),
+		!window()->isActiveWindow());
+	p.translate(_position);
+	_view->view()->draw(p, context);
+}
+
+StickerPanel::StickerPanel() = default;
+
+StickerPanel::~StickerPanel() = default;
+
+void StickerPanel::show(Descriptor &&descriptor) {
+	const auto controller = descriptor.controller;
+	if (!_panel) {
+		create(descriptor);
+
+		_panel->shownValue(
+		) | rpl::filter([=] {
+			return (_panelButton != nullptr);
+		}) | rpl::start_with_next([=](bool shown) {
+			if (shown) {
+				_panelButton->installEventFilter(_panel.get());
+			} else {
+				_panelButton->removeEventFilter(_panel.get());
+			}
+		}, _panel->lifetime());
+	}
+	const auto button = descriptor.button;
+	if (const auto previous = _panelButton.data()) {
+		if (previous != button) {
+			previous->removeEventFilter(_panel.get());
+		}
+	}
+	_panelButton = button;
+	const auto feed = [=, now = descriptor.ensureAddedId](
+			std::vector<DocumentId> list) {
+		list.insert(begin(list), 0);
+		if (now && !ranges::contains(list, now)) {
+			list.push_back(now);
+		}
+		_panel->selector()->provideRecentEmoji(list);
+	};
+	const auto parent = _panel->parentWidget();
+	const auto global = button->mapToGlobal(QPoint());
+	const auto local = parent->mapFromGlobal(global);
+	_panel->moveBottomRight(
+		local.y() + (st::normalFont->height / 2),
+		local.x() + button->width() * 3);
+	_panel->toggleAnimated();
+}
+
+bool StickerPanel::hasFocus() const {
+	return _panel && Ui::InFocusChain(_panel.get());
+}
+
+void StickerPanel::repaint() {
+	_panel->selector()->update();
+}
+
+void StickerPanel::create(const Descriptor &descriptor) {
+	using Selector = ChatHelpers::TabbedSelector;
+	using Descriptor = ChatHelpers::TabbedSelectorDescriptor;
+	using Mode = ChatHelpers::TabbedSelector::Mode;
+	const auto controller = descriptor.controller;
+	const auto body = controller->window().widget()->bodyWidget();
+	_panel = base::make_unique_q<ChatHelpers::TabbedPanel>(
+		body,
+		controller,
+		object_ptr<Selector>(
+			nullptr,
+			Descriptor{
+				.show = controller->uiShow(),
+				.st = st::backgroundEmojiPan,
+				.level = Window::GifPauseReason::Layer,
+				.mode = Mode::StickersOnly,
+				.features = {
+					.megagroupSet = false,
+					.stickersSettings = false,
+					.openStickerSets = false,
+				},
+			}));
+	_panel->setDropDown(false);
+	_panel->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	_panel->hide();
+
+	_panel->selector()->fileChosen(
+	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+		_someCustomChosen.fire({ data.document });
+		_panel->hideAnimated();
+	}, _panel->lifetime());
+}
+
+ChatIntro::ChatIntro(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: BusinessSection(parent, controller) {
+	setupContent(controller);
+}
+
+ChatIntro::~ChatIntro() {
+	if (!Core::Quitting()) {
+		save();
+	}
+}
+
+bool ChatIntro::closeByOutsideClick() const {
+	return false;
+}
+
+rpl::producer<QString> ChatIntro::title() {
+	return tr::lng_chat_intro_title();
+}
+
+[[nodiscard]] rpl::producer<Data::ChatIntro> IntroWithRandomSticker(
+		not_null<Main::Session*> session,
+		rpl::producer<Data::ChatIntro> intro) {
+	return std::move(intro) | rpl::map([=](Data::ChatIntro intro)
+	-> rpl::producer<Data::ChatIntro> {
+		if (intro.sticker) {
+			return rpl::single(std::move(intro));
+		}
+		return Api::RandomHelloStickerValue(
+			session
+		) | rpl::map([=](DocumentData *sticker) {
+			auto copy = intro;
+			copy.sticker = sticker;
+			return copy;
+		});
+	}) | rpl::flatten_latest();
+}
+
+void ChatIntro::setupContent(
+		not_null<Window::SessionController*> controller) {
+	using namespace rpl::mappers;
+
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	const auto info = &controller->session().data().businessInfo();
+	const auto current = info->chatIntro();
+
+	_intro = info->chatIntro();
+	const auto change = [=](Fn<void(Data::ChatIntro &)> modify) {
+		auto intro = _intro.current();
+		modify(intro);
+		_intro = intro;
+	};
+
+	const auto preview = content->add(
+		object_ptr<PreviewWrap>(
+			content,
+			&controller->session(),
+			IntroWithRandomSticker(&controller->session(), _intro.value())),
+		{});
+
+	const auto title = content->add(
+		object_ptr<Ui::InputField>(
+			content,
+			st::settingsChatIntroField,
+			tr::lng_chat_intro_enter_title(),
+			current.title),
+		st::settingsChatIntroFieldMargins);
+	const auto description = content->add(
+		object_ptr<Ui::InputField>(
+			content,
+			st::settingsChatIntroField,
+			tr::lng_chat_intro_enter_message(),
+			current.description),
+		st::settingsChatIntroFieldMargins);
+	content->add(CreateIntroStickerButton(
+		content,
+		controller->uiShow(),
+		_intro.value() | rpl::map([](const Data::ChatIntro &intro) {
+			return intro.sticker;
+		}) | rpl::distinct_until_changed(),
+		[=](DocumentData *sticker) {
+			change([&](Data::ChatIntro &intro) {
+				intro.sticker = sticker;
+			});
+		}));
+	Ui::AddSkip(content);
+
+	title->changes() | rpl::start_with_next([=] {
+		change([&](Data::ChatIntro &intro) {
+			intro.title = title->getLastText();
+		});
+	}, title->lifetime());
+
+	description->changes() | rpl::start_with_next([=] {
+		change([&](Data::ChatIntro &intro) {
+			intro.description = description->getLastText();
+		});
+	}, description->lifetime());
+
+	_setFocus = [=] {
+		title->setFocusFast();
+	};
+
+	Ui::AddDividerText(
+		content,
+		tr::lng_chat_intro_about(),
+		st::peerAppearanceDividerTextMargin);
+	Ui::AddSkip(content);
+
+	const auto resetWrap = content->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			content,
+			object_ptr<Ui::SettingsButton>(
+				content,
+				tr::lng_chat_intro_reset(),
+				st::settingsAttentionButton
+			)));
+	resetWrap->toggleOn(
+		_intro.value() | rpl::map([](const Data::ChatIntro &intro) {
+			return !!intro;
+		}));
+	resetWrap->entity()->setClickedCallback([=] {
+		_intro = Data::ChatIntro();
+	});
+
+	Ui::ResizeFitChild(this, content);
+}
+
+void ChatIntro::save() {
+	const auto show = controller()->uiShow();
+	const auto fail = [=](QString error) {
+		if (error == u"BUSINESS_RECIPIENTS_EMPTY"_q) {
+			show->showToast(tr::lng_greeting_recipients_empty(tr::now));
+		}
+	};
+	controller()->session().data().businessInfo().saveChatIntro(
+		_intro.current(),
+		fail);
+}
+
+} // namespace
+
+Type ChatIntroId() {
+	return ChatIntro::Id();
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.h b/Telegram/SourceFiles/settings/business/settings_chat_intro.h
new file mode 100644
index 000000000..f44105dd1
--- /dev/null
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.h
@@ -0,0 +1,16 @@
+/*
+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 "settings/settings_type.h"
+
+namespace Settings {
+
+[[nodiscard]] Type ChatIntroId();
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
index 5b59d4987..cb11074ab 100644
--- a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
@@ -46,7 +46,7 @@ struct BotState {
 	LookupState state = LookupState::Empty;
 };
 
-class Chatbots : public BusinessSection<Chatbots> {
+class Chatbots final : public BusinessSection<Chatbots> {
 public:
 	Chatbots(
 		QWidget *parent,
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 2ab04e1e6..2060cdd93 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -110,6 +110,7 @@ settingsBusinessIconReplies: icon {{ "settings/premium/business/business_quick",
 settingsBusinessIconGreeting: icon {{ "settings/premium/status", settingsIconFg }};
 settingsBusinessIconAway: icon {{ "settings/premium/business/business_away", settingsIconFg }};
 settingsBusinessIconChatbots: icon {{ "settings/premium/business/business_chatbots", settingsIconFg }};
+settingsBusinessIconChatIntro: icon {{ "settings/premium/intro", settingsIconFg }};
 
 settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(semiboldTextStyle) {
@@ -638,3 +639,7 @@ settingsChatbotsNotFound: FlatLabel(defaultFlatLabel) {
 }
 settingsChatbotsDeleteIcon: icon {{ "dialogs/dialogs_cancel_search", dialogsMenuIconFg }};
 settingsChatbotsDeleteIconOver: icon {{ "dialogs/dialogs_cancel_search", dialogsMenuIconFgOver }};
+
+settingsChatIntroField: InputField(defaultMultiSelectSearchField) {
+}
+settingsChatIntroFieldMargins: margins(20px, 8px, 20px, 8px);
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index c9123c528..0e185869f 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "settings/business/settings_away_message.h"
+#include "settings/business/settings_chat_intro.h"
 #include "settings/business/settings_chatbots.h"
 #include "settings/business/settings_greeting.h"
 #include "settings/business/settings_location.h"
@@ -69,6 +70,7 @@ using Order = std::vector<QString>;
 		u"business_hours"_q,
 		u"business_location"_q,
 		u"business_bots"_q,
+		u"intro"_q,
 	};
 }
 
@@ -128,6 +130,15 @@ using Order = std::vector<QString>;
 				PremiumFeature::BusinessBots,
 			},
 		},
+		{
+			u"intro"_q,
+			Entry{
+				&st::settingsBusinessIconChatIntro,
+				tr::lng_business_subtitle_chat_intro(),
+				tr::lng_business_about_chat_intro(),
+				PremiumFeature::ChatIntro,
+			},
+		},
 	};
 }
 
@@ -227,9 +238,9 @@ void AddBusinessSummary(
 	icons.reserve(int(entryMap.size()));
 	{
 		const auto &account = controller->session().account();
-		const auto mtpOrder = account.appConfig().get<Order>(
+		const auto mtpOrder = /*account.appConfig().get<Order>(
 			"business_promo_order",
-			FallbackOrder());
+			FallbackOrder())*/FallbackOrder(); AssertIsDebug();
 		const auto processEntry = [&](Entry &entry) {
 			icons.push_back(entry.icon);
 			addRow(entry);
@@ -375,6 +386,7 @@ void Business::setupContent() {
 			case PremiumFeature::GreetingMessage: return GreetingId();
 			case PremiumFeature::QuickReplies: return QuickRepliesId();
 			case PremiumFeature::BusinessBots: return ChatbotsId();
+			case PremiumFeature::ChatIntro: return ChatIntroId();
 			}
 			Unexpected("Feature in showFeature.");
 		}());
@@ -396,6 +408,8 @@ void Business::setupContent() {
 			return owner->shortcutMessages().shortcutsLoaded();
 		case PremiumFeature::BusinessBots:
 			return owner->chatbots().loaded();
+		case PremiumFeature::ChatIntro:
+			return owner->session().user()->isFullLoaded();
 		}
 		Unexpected("Feature in isReady.");
 	};
@@ -670,6 +684,8 @@ std::vector<PremiumFeature> BusinessFeaturesOrder(
 			return PremiumFeature::BusinessLocation;
 		} else if (s == u"business_bots"_q) {
 			return PremiumFeature::BusinessBots;
+		} else if (s == u"chat_intro"_q) {
+			return PremiumFeature::ChatIntro;
 		}
 		return PremiumFeature::kCount;
 	}) | ranges::views::filter([](PremiumFeature feature) {
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index c2ebb2f2a..a18af8cd4 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1061,3 +1061,6 @@ boostsMessageIconPadding: margins(0px, 2px, 0px, 0px);
 
 historyIvIcon: icon{{ "boosts/boost_mini2", windowFg }};
 historyIvIconPadding: margins(2px, 2px, 2px, 0px);
+
+chatIntroStickerSize: 96px;
+chatIntroWidth: 224px;

From 98ce91df3945db86e8662c14b721b3c1baf01d2b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 20 Mar 2024 11:59:05 +0400
Subject: [PATCH 105/596] Fix intro hello sticker playback in editing.

---
 .../history/view/history_view_about_view.cpp  |  9 ++---
 .../history/view/history_view_element.cpp     | 14 ++++---
 .../view/media/history_view_custom_emoji.cpp  |  4 +-
 .../view/media/history_view_giveaway.cpp      | 13 ++++---
 .../view/media/history_view_premium_gift.cpp  |  7 ++--
 .../view/media/history_view_sticker.cpp       | 37 +++++++++----------
 .../history/view/media/history_view_sticker.h | 14 ++++---
 Telegram/SourceFiles/ui/chat/chat.style       |  2 +-
 8 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index 0252ccc68..d26a8818a 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -180,13 +180,10 @@ ChatIntroBox::ChatIntroBox(not_null<Element*> parent, Data::ChatIntro data)
 , _data(data) {
 	if (const auto document = data.sticker) {
 		if (const auto sticker = document->sticker()) {
-			const auto skipPremiumEffect = false;
+			const auto skipPremiumEffect = true;
 			_sticker.emplace(_parent, document, skipPremiumEffect, _parent);
-			_sticker->setDiceIndex(sticker->alt, 0);
-			_sticker->setGiftBoxSticker(true);
-			_sticker->initSize();
-			_sticker->setCustomEmojiPart(
-				st::chatIntroStickerSize,
+			_sticker->initSize(st::chatIntroStickerSize);
+			_sticker->setCustomCachingTag(
 				ChatHelpers::StickerLottieSize::ChatIntroHelloSticker);
 		}
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 1f99b66c7..ce25da4dd 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -753,14 +753,16 @@ void Element::refreshMedia(Element *replacing) {
 		const auto emojiStickers = &history()->session().emojiStickersPack();
 		const auto skipPremiumEffect = false;
 		if (const auto sticker = emojiStickers->stickerForEmoji(emoji)) {
+			auto content = std::make_unique<Sticker>(
+				this,
+				sticker.document,
+				skipPremiumEffect,
+				replacing,
+				sticker.replacements);
+			content->setEmojiSticker();
 			_media = std::make_unique<UnwrappedMedia>(
 				this,
-				std::make_unique<Sticker>(
-					this,
-					sticker.document,
-					skipPremiumEffect,
-					replacing,
-					sticker.replacements));
+				std::move(content));
 		} else {
 			_media = std::make_unique<UnwrappedMedia>(
 				this,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp b/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp
index acd836fc1..51c69c89b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp
@@ -128,7 +128,9 @@ std::unique_ptr<Sticker> CustomEmoji::createStickerPart(
 		_parent,
 		document,
 		skipPremiumEffect);
-	result->setCustomEmojiPart(_singleSize, _cachingTag);
+	result->initSize(_singleSize);
+	result->setCustomCachingTag(_cachingTag);
+	result->setCustomEmojiPart();
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
index 859ab201e..663d3a04e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
@@ -310,10 +310,10 @@ void StickerWithBadgePart::draw(
 		int outerWidth) const {
 	const auto stickerSize = st::msgServiceGiftBoxStickerSize;
 	const auto sticker = QRect(
-		(outerWidth - stickerSize.width()) / 2,
+		(outerWidth - stickerSize) / 2,
 		st::chatGiveawayStickerTop + _skipTop,
-		stickerSize.width(),
-		stickerSize.height());
+		stickerSize,
+		stickerSize);
 
 	if (_sticker) {
 		_sticker->draw(p, context, sticker);
@@ -335,7 +335,7 @@ void StickerWithBadgePart::unloadHeavyPart() {
 
 QSize StickerWithBadgePart::countOptimalSize() {
 	const auto size = st::msgServiceGiftBoxStickerSize;
-	return { size.width(), st::chatGiveawayStickerTop + size.height() };
+	return { size, st::chatGiveawayStickerTop + size };
 }
 
 QSize StickerWithBadgePart::countCurrentSize(int newWidth) {
@@ -352,8 +352,9 @@ void StickerWithBadgePart::ensureCreated() const {
 			_skipTop = data.skipTop;
 			_sticker.emplace(_parent, document, skipPremiumEffect, _parent);
 			_sticker->setDiceIndex(sticker->alt, 1);
-			_sticker->setGiftBoxSticker(data.isGiftBoxSticker);
-			_sticker->initSize();
+			_sticker->initSize(data.isGiftBoxSticker
+				? st::msgServiceGiftBoxStickerSize
+				: 0);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
index 7701f6db8..b832a6dc3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -39,7 +39,9 @@ int PremiumGift::top() {
 }
 
 QSize PremiumGift::size() {
-	return st::msgServiceGiftBoxStickerSize;
+	return QSize(
+		st::msgServiceGiftBoxStickerSize,
+		st::msgServiceGiftBoxStickerSize);
 }
 
 QString PremiumGift::title() {
@@ -172,8 +174,7 @@ void PremiumGift::ensureStickerCreated() const {
 			const auto skipPremiumEffect = false;
 			_sticker.emplace(_parent, document, skipPremiumEffect, _parent);
 			_sticker->setDiceIndex(sticker->alt, 1);
-			_sticker->setGiftBoxSticker(true);
-			_sticker->initSize();
+			_sticker->initSize(st::msgServiceGiftBoxStickerSize);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index cefaad0c2..338c163fa 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -130,20 +130,18 @@ bool Sticker::hasPremiumEffect() const {
 }
 
 bool Sticker::customEmojiPart() const {
-	return (_cachingTag != ChatHelpers::StickerLottieSize::MessageHistory);
+	return _customEmojiPart;
 }
 
-bool Sticker::isEmojiSticker() const {
-	return (_parent->data()->media() == nullptr);
+bool Sticker::emojiSticker() const {
+	return _emojiSticker;
 }
 
-void Sticker::initSize() {
-	if (isEmojiSticker() || _diceIndex >= 0) {
-		if (_giftBoxSticker) {
-			_size = st::msgServiceGiftBoxStickerSize;
-		} else {
-			_size = EmojiSize();
-		}
+void Sticker::initSize(int customSize) {
+	if (customSize > 0) {
+		_size = { customSize, customSize };
+	} else if (emojiSticker() || _diceIndex >= 0) {
+		_size = EmojiSize();
 		if (_diceIndex > 0) {
 			[[maybe_unused]] bool result = readyToDrawAnimationFrame();
 		}
@@ -252,7 +250,7 @@ void Sticker::paintAnimationFrame(
 		: (context.selected() && !_nextLastDiceFrame)
 		? context.st->msgStickerOverlay()->c
 		: QColor(0, 0, 0, 0);
-	const auto powerSavingFlag = (isEmojiSticker() || _diceIndex >= 0)
+	const auto powerSavingFlag = (emojiSticker() || _diceIndex >= 0)
 		? PowerSaving::kEmojiChat
 		: PowerSaving::kStickersChat;
 	const auto paused = context.paused || On(powerSavingFlag);
@@ -298,7 +296,7 @@ void Sticker::paintAnimationFrame(
 		? true
 		: (_diceIndex == 0)
 		? false
-		: ((!customEmojiPart() && isEmojiSticker())
+		: ((!customEmojiPart() && emojiSticker())
 			|| !Core::App().settings().loopAnimatedStickers());
 	const auto lastDiceFrame = (_diceIndex > 0) && atTheEnd();
 	const auto switchToNext = !playOnce
@@ -421,7 +419,7 @@ void Sticker::refreshLink() {
 		return;
 	}
 	const auto sticker = _data->sticker();
-	if (isEmojiSticker()) {
+	if (emojiSticker()) {
 		const auto weak = base::make_weak(this);
 		_link = std::make_shared<LambdaClickHandler>([weak] {
 			if (const auto that = weak.get()) {
@@ -499,15 +497,16 @@ void Sticker::setDiceIndex(const QString &emoji, int index) {
 	_diceIndex = index;
 }
 
-void Sticker::setCustomEmojiPart(
-		int size,
-		ChatHelpers::StickerLottieSize tag) {
-	_size = { size, size };
+void Sticker::setCustomCachingTag(ChatHelpers::StickerLottieSize tag) {
 	_cachingTag = tag;
 }
 
-void Sticker::setGiftBoxSticker(bool giftBoxSticker) {
-	_giftBoxSticker = giftBoxSticker;
+void Sticker::setCustomEmojiPart() {
+	_customEmojiPart = true;
+}
+
+void Sticker::setEmojiSticker() {
+	_emojiSticker = true;
 }
 
 void Sticker::setupPlayer() {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.h b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
index 86c637390..1cbd7ea82 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
@@ -42,7 +42,7 @@ public:
 		const Lottie::ColorReplacements *replacements = nullptr);
 	~Sticker();
 
-	void initSize();
+	void initSize(int customSize = 0);
 	QSize countOptimalSize() override;
 	void draw(
 		Painter &p,
@@ -62,12 +62,13 @@ public:
 
 	void refreshLink() override;
 	bool hasTextForCopy() const override {
-		return isEmojiSticker();
+		return emojiSticker();
 	}
 
 	void setDiceIndex(const QString &emoji, int index);
-	void setCustomEmojiPart(int size, ChatHelpers::StickerLottieSize tag);
-	void setGiftBoxSticker(bool giftBoxSticker);
+	void setCustomCachingTag(ChatHelpers::StickerLottieSize tag);
+	void setCustomEmojiPart();
+	void setEmojiSticker();
 	[[nodiscard]] bool atTheEnd() const {
 		return 	(_frameIndex >= 0) && (_frameIndex + 1 == _framesCount);
 	}
@@ -96,7 +97,7 @@ public:
 private:
 	[[nodiscard]] bool hasPremiumEffect() const;
 	[[nodiscard]] bool customEmojiPart() const;
-	[[nodiscard]] bool isEmojiSticker() const;
+	[[nodiscard]] bool emojiSticker() const;
 	void paintAnimationFrame(
 		Painter &p,
 		const PaintContext &context,
@@ -134,7 +135,8 @@ private:
 	mutable bool _premiumEffectSkipped : 1 = false;
 	mutable bool _nextLastDiceFrame : 1 = false;
 	bool _skipPremiumEffect : 1 = false;
-	bool _giftBoxSticker : 1 = false;
+	bool _customEmojiPart : 1 = false;
+	bool _emojiSticker : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index a18af8cd4..92b68860f 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -923,7 +923,7 @@ msgServiceGiftBoxButtonPadding: margins(2px, 0px, 2px, 0px);
 msgServiceGiftBoxButtonMargins: margins(0px, 13px, 0px, 17px);
 msgServiceGiftBoxTitlePadding: margins(0px, 5px, 0px, 2px);
 msgServiceGiftBoxStickerTop: -19px;
-msgServiceGiftBoxStickerSize: size(140px, 140px);
+msgServiceGiftBoxStickerSize: 140px;
 
 historySponsorInfoItem: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {

From 08873486115d8103386022ed27a4fa9e58979546 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 20 Mar 2024 13:17:05 +0400
Subject: [PATCH 106/596] Show length limit in chat intro fields.

---
 .../view/history_view_context_menu.cpp        | 66 +++++++------
 .../history/view/history_view_context_menu.h  |  2 +
 .../settings/business/settings_chat_intro.cpp | 98 +++++++++++++------
 .../business/settings_quick_replies.cpp       | 33 +------
 Telegram/SourceFiles/settings/settings.style  |  3 +-
 5 files changed, 113 insertions(+), 89 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 5a7852b82..22d3292a3 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1019,14 +1019,8 @@ void EditTagBox(
 	struct State {
 		std::unique_ptr<Ui::Text::CustomEmoji> custom;
 		QImage image;
-		rpl::variable<int> length;
 	};
 	const auto state = field->lifetime().make_state<State>();
-	state->length = rpl::single(
-		int(title.size())
-	) | rpl::then(field->changes() | rpl::map([=] {
-		return int(field->getLastText().size());
-	}));
 
 	if (const auto customId = id.custom()) {
 		state->custom = owner->customEmojiManager().create(
@@ -1059,28 +1053,8 @@ void EditTagBox(
 			}
 		}
 	}, field->lifetime());
-	const auto warning = Ui::CreateChild<Ui::FlatLabel>(
-		field,
-		state->length.value() | rpl::map([](int count) {
-			return (count > kTagNameLimit / 2)
-				? QString::number(kTagNameLimit - count)
-				: QString();
-			}),
-		st::editTagLimit);
-	state->length.value() | rpl::map(
-		rpl::mappers::_1 > kTagNameLimit
-	) | rpl::start_with_next([=](bool exceeded) {
-		warning->setTextColorOverride(exceeded
-			? st::attentionButtonFg->c
-			: std::optional<QColor>());
-	}, warning->lifetime());
-	rpl::combine(
-		field->sizeValue(),
-		warning->sizeValue()
-	) | rpl::start_with_next([=] {
-		warning->moveToRight(0, st::editTagField.textMargins.top());
-	}, warning->lifetime());
-	warning->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	AddLengthLimitLabel(field, kTagNameLimit);
 
 	const auto save = [=] {
 		const auto text = field->getLastText();
@@ -1840,4 +1814,40 @@ bool ItemHasTtl(HistoryItem *item) {
 		: false;
 }
 
+void AddLengthLimitLabel(not_null<Ui::InputField*> field, int limit) {
+	struct State {
+		rpl::variable<int> length;
+	};
+	const auto state = field->lifetime().make_state<State>();
+	state->length = rpl::single(
+		rpl::empty
+	) | rpl::then(field->changes()) | rpl::map([=] {
+		return int(field->getLastText().size());
+	});
+	auto warningText = state->length.value() | rpl::map([=](int count) {
+		const auto threshold = std::min(limit / 2, 9);
+		const auto left = limit - count;
+		return (left < threshold) ? QString::number(left) : QString();
+	});
+	const auto warning = Ui::CreateChild<Ui::FlatLabel>(
+		field.get(),
+		std::move(warningText),
+		st::editTagLimit);
+	state->length.value() | rpl::map(
+		rpl::mappers::_1 > limit
+	) | rpl::start_with_next([=](bool exceeded) {
+		warning->setTextColorOverride(exceeded
+			? st::attentionButtonFg->c
+			: std::optional<QColor>());
+	}, warning->lifetime());
+	rpl::combine(
+		field->sizeValue(),
+		warning->sizeValue()
+	) | rpl::start_with_next([=] {
+		warning->moveToRight(0, 0);
+	}, warning->lifetime());
+	warning->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.h b/Telegram/SourceFiles/history/view/history_view_context_menu.h
index 8f00f4da8..8582a57fb 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.h
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.h
@@ -123,4 +123,6 @@ void AddEmojiPacksAction(
 
 [[nodiscard]] bool ItemHasTtl(HistoryItem *item);
 
+void AddLengthLimitLabel(not_null<Ui::InputField*> field, int limit);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 28a223039..6ce2ddfad 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -16,9 +16,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_session.h"
 #include "history/view/history_view_about_view.h"
+#include "history/view/history_view_context_menu.h"
 #include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
+#include "main/main_account.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "settings/business/settings_recipients_helper.h"
 #include "ui/chat/chat_style.h"
@@ -141,6 +144,30 @@ private:
 
 };
 
+[[nodiscard]] int PartLimit(
+		not_null<Main::Session*> session,
+		const QString &key,
+		int defaultValue) {
+	return session->account().appConfig().get<int>(key, defaultValue);
+}
+
+[[nodiscard]] not_null<Ui::InputField*> AddPartInput(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<QString> placeholder,
+		QString current,
+		int limit) {
+	const auto field = container->add(
+		object_ptr<Ui::InputField>(
+			container,
+			st::settingsChatIntroField,
+			tr::lng_chat_intro_enter_title(),
+			current),
+		st::settingsChatIntroFieldMargins);
+	field->setMaxLength(limit);
+	HistoryView::AddLengthLimitLabel(field, limit);
+	return field;
+}
+
 [[nodiscard]] object_ptr<Ui::SettingsButton> CreateIntroStickerButton(
 		not_null<Ui::RpWidget*> parent,
 		std::shared_ptr<ChatHelpers::Show> show,
@@ -266,6 +293,10 @@ PreviewWrap::PreviewWrap(
 		}
 	}, lifetime());
 
+	session->downloaderTaskFinished() | rpl::start_with_next([=] {
+		update();
+	}, lifetime());
+
 	prepare(std::move(value));
 }
 
@@ -438,19 +469,28 @@ rpl::producer<QString> ChatIntro::title() {
 [[nodiscard]] rpl::producer<Data::ChatIntro> IntroWithRandomSticker(
 		not_null<Main::Session*> session,
 		rpl::producer<Data::ChatIntro> intro) {
-	return std::move(intro) | rpl::map([=](Data::ChatIntro intro)
-	-> rpl::producer<Data::ChatIntro> {
-		if (intro.sticker) {
-			return rpl::single(std::move(intro));
+	auto random = rpl::single(
+		Api::RandomHelloStickerValue(session)
+	) | rpl::then(rpl::duplicate(
+		intro
+	) | rpl::map([=](const Data::ChatIntro &intro) {
+		return intro.sticker;
+	}) | rpl::distinct_until_changed(
+	) | rpl::filter([](DocumentData *sticker) {
+		return !sticker;
+	}) | rpl::map([=] {
+		return Api::RandomHelloStickerValue(session);
+	})) | rpl::flatten_latest();
+
+	return rpl::combine(
+		std::move(intro),
+		std::move(random)
+	) | rpl::map([=](Data::ChatIntro intro, DocumentData *hello) {
+		if (!intro.sticker) {
+			intro.sticker = hello;
 		}
-		return Api::RandomHelloStickerValue(
-			session
-		) | rpl::map([=](DocumentData *sticker) {
-			auto copy = intro;
-			copy.sticker = sticker;
-			return copy;
-		});
-	}) | rpl::flatten_latest();
+		return intro;
+	});
 }
 
 void ChatIntro::setupContent(
@@ -458,7 +498,8 @@ void ChatIntro::setupContent(
 	using namespace rpl::mappers;
 
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-	const auto info = &controller->session().data().businessInfo();
+	const auto session = &controller->session();
+	const auto info = &session->data().businessInfo();
 	const auto current = info->chatIntro();
 
 	_intro = info->chatIntro();
@@ -471,24 +512,20 @@ void ChatIntro::setupContent(
 	const auto preview = content->add(
 		object_ptr<PreviewWrap>(
 			content,
-			&controller->session(),
-			IntroWithRandomSticker(&controller->session(), _intro.value())),
+			session,
+			IntroWithRandomSticker(session, _intro.value())),
 		{});
 
-	const auto title = content->add(
-		object_ptr<Ui::InputField>(
-			content,
-			st::settingsChatIntroField,
-			tr::lng_chat_intro_enter_title(),
-			current.title),
-		st::settingsChatIntroFieldMargins);
-	const auto description = content->add(
-		object_ptr<Ui::InputField>(
-			content,
-			st::settingsChatIntroField,
-			tr::lng_chat_intro_enter_message(),
-			current.description),
-		st::settingsChatIntroFieldMargins);
+	const auto title = AddPartInput(
+		content,
+		tr::lng_chat_intro_enter_title(),
+		current.title,
+		PartLimit(session, u"intro_title_length_limit"_q, 32));
+	const auto description = AddPartInput(
+		content,
+		tr::lng_chat_intro_enter_message(),
+		current.description,
+		PartLimit(session, u"intro_description_length_limit"_q, 70));
 	content->add(CreateIntroStickerButton(
 		content,
 		controller->uiShow(),
@@ -538,6 +575,9 @@ void ChatIntro::setupContent(
 		}));
 	resetWrap->entity()->setClickedCallback([=] {
 		_intro = Data::ChatIntro();
+		title->clear();
+		description->clear();
+		title->setFocus();
 	});
 
 	Ui::ResizeFitChild(this, content);
diff --git a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
index d46d05615..b8c990d03 100644
--- a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/data_session.h"
+#include "history/view/history_view_context_menu.h" // AddLengthLimitLabel.
 #include "lang/lang_keys.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
@@ -211,37 +212,7 @@ void EditShortcutNameBox(
 	field->selectAll();
 	field->setMaxLength(kShortcutLimit * 2);
 
-	struct State {
-		rpl::variable<int> length;
-	};
-	const auto state = field->lifetime().make_state<State>();
-	state->length = rpl::single(
-		int(name.size())
-	) | rpl::then(field->changes() | rpl::map([=] {
-		return int(field->getLastText().size());
-	}));
-	const auto warning = Ui::CreateChild<Ui::FlatLabel>(
-		field,
-		state->length.value() | rpl::map([](int count) {
-		return (count > kShortcutLimit * 3 / 4)
-			? QString::number(kShortcutLimit - count)
-			: QString();
-	}),
-		st::editTagLimit);
-	state->length.value() | rpl::map(
-		rpl::mappers::_1 > kShortcutLimit
-	) | rpl::start_with_next([=](bool exceeded) {
-		warning->setTextColorOverride(exceeded
-			? st::attentionButtonFg->c
-			: std::optional<QColor>());
-	}, warning->lifetime());
-	rpl::combine(
-		field->sizeValue(),
-		warning->sizeValue()
-	) | rpl::start_with_next([=] {
-		warning->moveToRight(0, 0);
-	}, warning->lifetime());
-	warning->setAttribute(Qt::WA_TransparentForMouseEvents);
+	HistoryView::AddLengthLimitLabel(field, kShortcutLimit);
 
 	const auto callback = [=] {
 		const auto name = field->getLastText().trimmed();
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 2060cdd93..2545afbf9 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -641,5 +641,6 @@ settingsChatbotsDeleteIcon: icon {{ "dialogs/dialogs_cancel_search", dialogsMenu
 settingsChatbotsDeleteIconOver: icon {{ "dialogs/dialogs_cancel_search", dialogsMenuIconFgOver }};
 
 settingsChatIntroField: InputField(defaultMultiSelectSearchField) {
+	textMargins: margins(2px, 0px, 32px, 0px);
 }
-settingsChatIntroFieldMargins: margins(20px, 8px, 20px, 8px);
+settingsChatIntroFieldMargins: margins(20px, 15px, 20px, 8px);

From 5381fe5a1a684e5cccc87846da47e2e1213ce3c1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 20 Mar 2024 16:50:29 +0400
Subject: [PATCH 107/596] Use MediaInBubble for chat intro fake-message.

---
 .../history/view/history_view_about_view.cpp  |  61 +++++-
 .../history/view/history_view_element.h       |   2 -
 .../view/media/history_view_giveaway.cpp      | 173 ++++++++++++++----
 .../view/media/history_view_giveaway.h        |  93 ++++++++--
 Telegram/SourceFiles/ui/chat/chat.style       |   2 +
 5 files changed, 277 insertions(+), 54 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index d26a8818a..2fe291427 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "history/view/media/history_view_giveaway.h"
 #include "history/view/media/history_view_service_box.h"
 #include "history/view/media/history_view_sticker_player_abstract.h"
 #include "history/view/media/history_view_sticker.h"
@@ -106,6 +107,49 @@ private:
 
 };
 
+auto GenerateChatIntro(
+	not_null<Element*> parent,
+	Element *replacing,
+	const Data::ChatIntro &data)
+-> Fn<void(Fn<void(std::unique_ptr<MediaInBubble::Part>)>)> {
+	return [=](Fn<void(std::unique_ptr<MediaInBubble::Part>)> push) {
+		auto pushText = [&](
+				TextWithEntities text,
+				QMargins margins = {},
+				const base::flat_map<uint16, ClickHandlerPtr> &links = {}) {
+			if (text.empty()) {
+				return;
+			}
+			push(std::make_unique<TextMediaInBubblePart>(
+				std::move(text),
+				margins,
+				links));
+		};
+		const auto title = data
+			? data.title
+			: tr::lng_chat_intro_default_title(tr::now);
+		const auto description = data
+			? data.description
+			: tr::lng_chat_intro_default_message(tr::now);
+		pushText(Ui::Text::Bold(title), st::chatIntroTitleMargin);
+		pushText({ description }, title.isEmpty()
+			? st::chatIntroTitleMargin
+			: st::chatIntroMargin);
+		const auto sticker = [=] {
+			using Tag = ChatHelpers::StickerLottieSize;
+			return StickerInBubblePart::Data{
+				.sticker = data.sticker,
+				.size = st::chatIntroStickerSize,
+				.cacheTag = Tag::ChatIntroHelloSticker,
+			};
+		};
+		push(std::make_unique<StickerInBubblePart>(
+			parent,
+			replacing,
+			sticker));
+	};
+}
+
 PremiumRequiredBox::PremiumRequiredBox(not_null<Element*> parent)
 : _parent(parent) {
 }
@@ -330,13 +374,18 @@ void AboutView::make(Data::ChatIntro data) {
 			| MessageFlag::FakeHistoryItem
 			| MessageFlag::Local),
 		.from = _history->peer->id,
-	}, PreparedServiceText{ { data.description } });
+	}, PreparedServiceText{ { } });
 
-	setItem(AdminLog::OwnedItem(_delegate, item), data.sticker);
-
-	_item->overrideMedia(std::make_unique<ServiceBox>(
-		_item.get(),
-		std::make_unique<ChatIntroBox>(_item.get(), data)));
+	auto owned = AdminLog::OwnedItem(_delegate, item);
+	owned->overrideMedia(std::make_unique<HistoryView::MediaInBubble>(
+		owned.get(),
+		GenerateChatIntro(owned.get(), _item.get(), data),
+		HistoryView::MediaInBubbleDescriptor{
+			.maxWidth = st::chatIntroWidth,
+			.service = true,
+			.hideServiceText = true,
+		}));
+	setItem(std::move(owned), data.sticker);
 }
 
 void AboutView::setItem(AdminLog::OwnedItem item, DocumentData *sticker) {
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index f47937516..6db33ff4b 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -632,6 +632,4 @@ private:
 
 };
 
-constexpr auto size = sizeof(Element);
-
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
index 663d3a04e..544ff717f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
@@ -73,10 +73,21 @@ bool MediaInBubble::Part::hasHeavyPart() {
 void MediaInBubble::Part::unloadHeavyPart() {
 }
 
+auto MediaInBubble::Part::stickerTakePlayer(
+	not_null<DocumentData*> data,
+	const Lottie::ColorReplacements *replacements
+) -> std::unique_ptr<StickerPlayer> {
+	return nullptr;
+}
+
 MediaInBubble::MediaInBubble(
 	not_null<Element*> parent,
-	Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate)
-: Media(parent) {
+	Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate,
+	MediaInBubbleDescriptor &&descriptor)
+: Media(parent)
+, _maxWidthCap(descriptor.maxWidth)
+, _service(descriptor.service)
+, _hideServiceText(descriptor.hideServiceText) {
 	generate([&](std::unique_ptr<Part> part) {
 		_entries.push_back({
 			.object = std::move(part),
@@ -92,7 +103,9 @@ MediaInBubble::~MediaInBubble() {
 }
 
 QSize MediaInBubble::countOptimalSize() {
-	const auto maxWidth = st::chatGiveawayWidth;
+	const auto maxWidth = _maxWidthCap
+		? _maxWidthCap
+		: st::chatGiveawayWidth;
 
 	auto top = 0;
 	for (auto &entry : _entries) {
@@ -104,19 +117,26 @@ QSize MediaInBubble::countOptimalSize() {
 }
 
 QSize MediaInBubble::countCurrentSize(int newWidth) {
-	return { maxWidth(), minHeight()};
+	return { maxWidth(), minHeight() };
 }
 
 void MediaInBubble::draw(Painter &p, const PaintContext &context) const {
 	const auto outer = width();
 	if (outer < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		return;
+	} else {
+		PainterHighQualityEnabler hq(p);
+		const auto radius = st::msgServiceGiftBoxRadius;
+		p.setPen(Qt::NoPen);
+		p.setBrush(context.st->msgServiceBg());
+		p.drawRoundedRect(QRect(0, 0, width(), height()), radius, radius);
 	}
+
 	auto translated = 0;
 	for (const auto &entry : _entries) {
 		const auto raw = entry.object.get();
 		const auto height = raw->height();
-		raw->draw(p, context, outer);
+		raw->draw(p, this, context, outer);
 		translated += height;
 		p.translate(0, height);
 	}
@@ -159,10 +179,28 @@ void MediaInBubble::clickHandlerPressedChanged(
 	}
 }
 
+
+std::unique_ptr<StickerPlayer> MediaInBubble::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	for (const auto &entry : _entries) {
+		if (auto result = entry.object->stickerTakePlayer(
+				data,
+				replacements)) {
+			return result;
+		}
+	}
+	return nullptr;
+}
+
 bool MediaInBubble::hideFromName() const {
 	return !parent()->data()->Has<HistoryMessageForwarded>();
 }
 
+bool MediaInBubble::hideServiceText() const {
+	return _hideServiceText;
+}
+
 bool MediaInBubble::hasHeavyPart() const {
 	for (const auto &entry : _entries) {
 		if (entry.object->hasHeavyPart()) {
@@ -200,15 +238,21 @@ TextMediaInBubblePart::TextMediaInBubblePart(
 
 void TextMediaInBubblePart::draw(
 		Painter &p,
+		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const {
-	p.setPen(context.messageStyle()->historyTextFg);
+	const auto service = owner->service();
+	p.setPen(service
+		? context.st->msgServiceFg()
+		: context.messageStyle()->historyTextFg);
 	_text.draw(p, {
 		.position = { (outerWidth - width()) / 2, _margins.top() },
 		.outerWidth = outerWidth,
 		.availableWidth = width(),
 		.align = style::al_top,
-		.palette = &context.messageStyle()->textPalette,
+		.palette = &(service
+			? context.st->serviceTextPalette()
+			: context.messageStyle()->textPalette),
 		.now = context.now,
 	});
 }
@@ -253,6 +297,7 @@ TextDelimeterPart::TextDelimeterPart(
 
 void TextDelimeterPart::draw(
 		Painter &p,
+		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const {
 	const auto stm = context.messageStyle();
@@ -294,18 +339,18 @@ QSize TextDelimeterPart::countCurrentSize(int newWidth) {
 	return { newWidth, minHeight() };
 }
 
-StickerWithBadgePart::StickerWithBadgePart(
+StickerInBubblePart::StickerInBubblePart(
 	not_null<Element*> parent,
-	Fn<Data()> lookup,
-	QString badge)
+	Element *replacing,
+	Fn<Data()> lookup)
 : _parent(parent)
-, _lookup(std::move(lookup))
-, _badgeText(badge) {
-	ensureCreated();
+, _lookup(std::move(lookup)) {
+	ensureCreated(replacing);
 }
 
-void StickerWithBadgePart::draw(
+void StickerInBubblePart::draw(
 		Painter &p,
+		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const {
 	const auto stickerSize = st::msgServiceGiftBoxStickerSize;
@@ -314,51 +359,99 @@ void StickerWithBadgePart::draw(
 		st::chatGiveawayStickerTop + _skipTop,
 		stickerSize,
 		stickerSize);
-
+	ensureCreated();
 	if (_sticker) {
 		_sticker->draw(p, context, sticker);
-		paintBadge(p, context);
-	} else {
-		ensureCreated();
 	}
 }
 
-bool StickerWithBadgePart::hasHeavyPart() {
+bool StickerInBubblePart::hasHeavyPart() {
 	return _sticker && _sticker->hasHeavyPart();
 }
 
-void StickerWithBadgePart::unloadHeavyPart() {
+void StickerInBubblePart::unloadHeavyPart() {
 	if (_sticker) {
 		_sticker->unloadHeavyPart();
 	}
 }
 
-QSize StickerWithBadgePart::countOptimalSize() {
+std::unique_ptr<StickerPlayer> StickerInBubblePart::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	return _sticker
+		? _sticker->stickerTakePlayer(data, replacements)
+		: nullptr;
+}
+
+QSize StickerInBubblePart::countOptimalSize() {
 	const auto size = st::msgServiceGiftBoxStickerSize;
 	return { size, st::chatGiveawayStickerTop + size };
 }
 
-QSize StickerWithBadgePart::countCurrentSize(int newWidth) {
+QSize StickerInBubblePart::countCurrentSize(int newWidth) {
 	return { newWidth, minHeight() };
 }
 
-void StickerWithBadgePart::ensureCreated() const {
+void StickerInBubblePart::ensureCreated(Element *replacing) const {
 	if (_sticker) {
 		return;
 	} else if (const auto data = _lookup()) {
-		const auto document = data.sticker;
-		if (const auto sticker = document->sticker()) {
-			const auto skipPremiumEffect = false;
+		const auto sticker = data.sticker;
+		if (const auto info = sticker->sticker()) {
+			const auto skipPremiumEffect = true;
 			_skipTop = data.skipTop;
-			_sticker.emplace(_parent, document, skipPremiumEffect, _parent);
-			_sticker->setDiceIndex(sticker->alt, 1);
-			_sticker->initSize(data.isGiftBoxSticker
-				? st::msgServiceGiftBoxStickerSize
-				: 0);
+			_sticker.emplace(_parent, sticker, skipPremiumEffect, replacing);
+			if (data.singleTimePlayback) {
+				_sticker->setDiceIndex(info->alt, 1);
+			}
+			_sticker->initSize(data.size);
+			_sticker->setCustomCachingTag(data.cacheTag);
 		}
 	}
 }
 
+StickerWithBadgePart::StickerWithBadgePart(
+	not_null<Element*> parent,
+	Element *replacing,
+	Fn<Data()> lookup,
+	QString badge)
+: _sticker(parent, replacing, std::move(lookup))
+, _badgeText(badge) {
+}
+
+void StickerWithBadgePart::draw(
+		Painter &p,
+		not_null<const MediaInBubble*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	_sticker.draw(p, owner, context, outerWidth);
+	if (_sticker.resolved()) {
+		paintBadge(p, context);
+	}
+}
+
+bool StickerWithBadgePart::hasHeavyPart() {
+	return _sticker.hasHeavyPart();
+}
+
+void StickerWithBadgePart::unloadHeavyPart() {
+	_sticker.unloadHeavyPart();
+}
+
+std::unique_ptr<StickerPlayer> StickerWithBadgePart::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	return _sticker.stickerTakePlayer(data, replacements);
+}
+
+QSize StickerWithBadgePart::countOptimalSize() {
+	return _sticker.countOptimalSize();
+}
+
+QSize StickerWithBadgePart::countCurrentSize(int newWidth) {
+	return _sticker.countCurrentSize(newWidth);
+}
+
 void StickerWithBadgePart::paintBadge(
 		Painter &p,
 		const PaintContext &context) const {
@@ -383,7 +476,7 @@ void StickerWithBadgePart::paintBadge(
 		p.drawRoundedRect(inner, radius, radius);
 	}
 
-	if (!_parent->usesBubblePattern(context)) {
+	if (!_sticker.parent()->usesBubblePattern(context)) {
 		paintContent(p);
 	} else {
 		Ui::PaintPatternBubblePart(
@@ -458,6 +551,7 @@ PeerBubbleListPart::~PeerBubbleListPart() = default;
 
 void PeerBubbleListPart::draw(
 		Painter &p,
+		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const {
 	if (_peers.empty()) {
@@ -647,10 +741,15 @@ auto GenerateGiveawayStart(
 		const auto sticker = [=] {
 			const auto &session = parent->history()->session();
 			auto &packs = session.giftBoxStickersPacks();
-			return Data{ packs.lookup(months), 0, true };
+			return Data{
+				.sticker = packs.lookup(months),
+				.size = st::msgServiceGiftBoxStickerSize,
+				.singleTimePlayback = true,
+			};
 		};
 		push(std::make_unique<StickerWithBadgePart>(
 			parent,
+			nullptr,
 			sticker,
 			tr::lng_prizes_badge(
 				tr::now,
@@ -778,11 +877,15 @@ auto GenerateGiveawayResults(
 			const auto &session = parent->history()->session();
 			auto &packs = session.diceStickersPacks();
 			const auto &emoji = Stickers::DicePacks::kPartyPopper;
-			const auto skip = st::chatGiveawayWinnersTopSkip;
-			return Data{ packs.lookup(emoji, 0), skip };
+			return Data{
+				.sticker = packs.lookup(emoji, 0),
+				.skipTop = st::chatGiveawayWinnersTopSkip,
+				.singleTimePlayback = true,
+			};
 		};
 		push(std::make_unique<StickerWithBadgePart>(
 			parent,
+			nullptr,
 			sticker,
 			tr::lng_prizes_badge(
 				tr::now,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
index 1aae9340d..33b84f23d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
@@ -22,6 +22,12 @@ class RippleAnimation;
 
 namespace HistoryView {
 
+struct MediaInBubbleDescriptor {
+	int maxWidth = 0;
+	bool service = false;
+	bool hideServiceText = false;
+};
+
 class MediaInBubble final : public Media {
 public:
 	class Part : public Object {
@@ -30,6 +36,7 @@ public:
 
 		virtual void draw(
 			Painter &p,
+			not_null<const MediaInBubble*> owner,
 			const PaintContext &context,
 			int outerWidth) const = 0;
 		[[nodiscard]] virtual TextState textState(
@@ -41,13 +48,22 @@ public:
 			bool pressed);
 		[[nodiscard]] virtual bool hasHeavyPart();
 		virtual void unloadHeavyPart();
+		[[nodiscard]] virtual auto stickerTakePlayer(
+			not_null<DocumentData*> data,
+			const Lottie::ColorReplacements *replacements
+		) -> std::unique_ptr<StickerPlayer>;
 	};
 
 	MediaInBubble(
 		not_null<Element*> parent,
-		Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate);
+		Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate,
+		MediaInBubbleDescriptor &&descriptor = {});
 	~MediaInBubble();
 
+	[[nodiscard]] bool service() const {
+		return _service;
+	}
+
 	void draw(Painter &p, const PaintContext &context) const override;
 	TextState textState(QPoint point, StateRequest request) const override;
 
@@ -59,12 +75,16 @@ public:
 		bool pressed) override;
 
 	bool needsBubble() const override {
-		return true;
+		return !_service;;
 	}
 	bool customInfoLayout() const override {
 		return false;
 	}
 
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
 	bool toggleSelectionByHandlerClick(
 		const ClickHandlerPtr &p) const override {
 		return true;
@@ -74,6 +94,7 @@ public:
 	}
 
 	bool hideFromName() const override;
+	bool hideServiceText() const override;
 
 	void unloadHeavyPart() override;
 	bool hasHeavyPart() const override;
@@ -89,6 +110,9 @@ private:
 	[[nodiscard]] QMargins inBubblePadding() const;
 
 	std::vector<Entry> _entries;
+	int _maxWidthCap = 0;
+	bool _service : 1 = false;
+	bool _hideServiceText : 1 = false;
 
 };
 
@@ -101,6 +125,7 @@ public:
 
 	void draw(
 		Painter &p,
+		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const override;
 	TextState textState(
@@ -123,6 +148,7 @@ public:
 
 	void draw(
 		Painter &p,
+		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const override;
 
@@ -135,24 +161,34 @@ private:
 
 };
 
-class StickerWithBadgePart final : public MediaInBubble::Part {
+class StickerInBubblePart final : public MediaInBubble::Part {
 public:
 	struct Data {
 		DocumentData *sticker = nullptr;
 		int skipTop = 0;
-		bool isGiftBoxSticker = false;
+		int size = 0;
+		ChatHelpers::StickerLottieSize cacheTag = {};
+		bool singleTimePlayback = false;
 
 		explicit operator bool() const {
 			return sticker != nullptr;
 		}
 	};
-	StickerWithBadgePart(
+	StickerInBubblePart(
 		not_null<Element*> parent,
-		Fn<Data()> lookup,
-		QString badge);
+		Element *replacing,
+		Fn<Data()> lookup);
+
+	[[nodiscard]] not_null<Element*> parent() const {
+		return _parent;
+	}
+	[[nodiscard]] bool resolved() const {
+		return _sticker.has_value();
+	}
 
 	void draw(
 		Painter &p,
+		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const override;
 	bool hasHeavyPart() override;
@@ -161,16 +197,50 @@ public:
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
 
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
 private:
-	void ensureCreated() const;
-	void validateBadge(const PaintContext &context) const;
-	void paintBadge(Painter &p, const PaintContext &context) const;
+	void ensureCreated(Element *replacing = nullptr) const;
 
 	const not_null<Element*> _parent;
 	Fn<Data()> _lookup;
-	QString _badgeText;
 	mutable int _skipTop = 0;
 	mutable std::optional<Sticker> _sticker;
+
+};
+
+class StickerWithBadgePart final : public MediaInBubble::Part {
+public:
+	using Data = StickerInBubblePart::Data;
+	StickerWithBadgePart(
+		not_null<Element*> parent,
+		Element *replacing,
+		Fn<Data()> lookup,
+		QString badge);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaInBubble*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	bool hasHeavyPart() override;
+	void unloadHeavyPart() override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
+private:
+	void validateBadge(const PaintContext &context) const;
+	void paintBadge(Painter &p, const PaintContext &context) const;
+
+	StickerInBubblePart _sticker;
+	QString _badgeText;
 	mutable QColor _badgeFg;
 	mutable QColor _badgeBorder;
 	mutable QImage _badge;
@@ -187,6 +257,7 @@ public:
 
 	void draw(
 		Painter &p,
+		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const override;
 	TextState textState(
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 92b68860f..16dcf7f14 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1064,3 +1064,5 @@ historyIvIconPadding: margins(2px, 2px, 2px, 0px);
 
 chatIntroStickerSize: 96px;
 chatIntroWidth: 224px;
+chatIntroTitleMargin: margins(11px, 16px, 11px, 4px);
+chatIntroMargin: margins(11px, 0px, 11px, 0px);

From 9f67b9ba2fe424039e79724a01f5505846c9418d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 20 Mar 2024 16:58:52 +0400
Subject: [PATCH 108/596] Reload chatbot rules after adding an exception.

---
 .../SourceFiles/data/business/data_business_chatbots.cpp   | 7 +++++++
 .../SourceFiles/data/business/data_business_chatbots.h     | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/Telegram/SourceFiles/data/business/data_business_chatbots.cpp b/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
index 4cf252bc9..dd95482db 100644
--- a/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
@@ -164,6 +164,7 @@ void Chatbots::removeFrom(not_null<PeerData*> peer) {
 			api->requestPeerSettings(peer);
 		}
 		_sentRequests.remove(peer);
+		reload();
 	}).fail([=] {
 		api->requestPeerSettings(peer);
 		_sentRequests.remove(peer);
@@ -171,4 +172,10 @@ void Chatbots::removeFrom(not_null<PeerData*> peer) {
 	_sentRequests[peer] = SentRequest{ type, id };
 }
 
+void Chatbots::reload() {
+	_loaded = false;
+	_owner->session().api().request(base::take(_requestId)).cancel();
+	preload();
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/business/data_business_chatbots.h b/Telegram/SourceFiles/data/business/data_business_chatbots.h
index 27befd6df..902cdd420 100644
--- a/Telegram/SourceFiles/data/business/data_business_chatbots.h
+++ b/Telegram/SourceFiles/data/business/data_business_chatbots.h
@@ -55,6 +55,8 @@ private:
 		mtpRequestId requestId = 0;
 	};
 
+	void reload();
+
 	const not_null<Session*> _owner;
 
 	rpl::variable<ChatbotsSettings> _settings;

From 7f4d13c54a58f0e36bda4c2f4df233a285bbadaf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 20 Mar 2024 18:09:37 +0400
Subject: [PATCH 109/596] Fix chat intro sticker aspect ratio.

---
 .../chat_helpers/stickers_lottie.h            |   1 +
 .../history/view/history_view_about_view.cpp  |   3 +-
 .../view/media/history_view_giveaway.cpp      |  34 ++++--
 .../view/media/history_view_giveaway.h        |   5 +-
 .../view/media/history_view_sticker.cpp       |   6 +-
 .../settings/business/settings_chat_intro.cpp | 103 ++++++++++++++----
 Telegram/SourceFiles/ui/chat/chat.style       |   1 +
 7 files changed, 120 insertions(+), 33 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/stickers_lottie.h b/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
index 17ae65c9d..7bd24ac8f 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
@@ -67,6 +67,7 @@ enum class StickerLottieSize : uint8 {
 	EmojiInteractionReserved6,
 	EmojiInteractionReserved7,
 	ChatIntroHelloSticker,
+	StickerEmojiSize,
 };
 [[nodiscard]] uint8 LottieCacheKeyShift(
 	uint8 replacementsTag,
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index 2fe291427..6fe6bba3d 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -146,7 +146,8 @@ auto GenerateChatIntro(
 		push(std::make_unique<StickerInBubblePart>(
 			parent,
 			replacing,
-			sticker));
+			sticker,
+			st::chatIntroStickerPadding));
 	};
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
index 544ff717f..38a04b6ee 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
@@ -342,9 +342,11 @@ QSize TextDelimeterPart::countCurrentSize(int newWidth) {
 StickerInBubblePart::StickerInBubblePart(
 	not_null<Element*> parent,
 	Element *replacing,
-	Fn<Data()> lookup)
+	Fn<Data()> lookup,
+	QMargins padding)
 : _parent(parent)
-, _lookup(std::move(lookup)) {
+, _lookup(std::move(lookup))
+, _padding(padding) {
 	ensureCreated(replacing);
 }
 
@@ -353,14 +355,14 @@ void StickerInBubblePart::draw(
 		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const {
-	const auto stickerSize = st::msgServiceGiftBoxStickerSize;
-	const auto sticker = QRect(
-		(outerWidth - stickerSize) / 2,
-		st::chatGiveawayStickerTop + _skipTop,
-		stickerSize,
-		stickerSize);
 	ensureCreated();
 	if (_sticker) {
+		const auto stickerSize = _sticker->countOptimalSize();
+		const auto sticker = QRect(
+			(outerWidth - stickerSize.width()) / 2,
+			_padding.top() + _skipTop,
+			stickerSize.width(),
+			stickerSize.height());
 		_sticker->draw(p, context, sticker);
 	}
 }
@@ -384,8 +386,15 @@ std::unique_ptr<StickerPlayer> StickerInBubblePart::stickerTakePlayer(
 }
 
 QSize StickerInBubblePart::countOptimalSize() {
-	const auto size = st::msgServiceGiftBoxStickerSize;
-	return { size, st::chatGiveawayStickerTop + size };
+	ensureCreated();
+	const auto size = _sticker ? _sticker->countOptimalSize() : [&] {
+		const auto fallback = _lookup().size;
+		return QSize{ fallback, fallback };
+	}();
+	return {
+		_padding.left() + size.width() + _padding.right(),
+		_padding.top() + size.height() + _padding.bottom(),
+	};
 }
 
 QSize StickerInBubblePart::countCurrentSize(int newWidth) {
@@ -414,8 +423,9 @@ StickerWithBadgePart::StickerWithBadgePart(
 	not_null<Element*> parent,
 	Element *replacing,
 	Fn<Data()> lookup,
+	QMargins padding,
 	QString badge)
-: _sticker(parent, replacing, std::move(lookup))
+: _sticker(parent, replacing, std::move(lookup), padding)
 , _badgeText(badge) {
 }
 
@@ -751,6 +761,7 @@ auto GenerateGiveawayStart(
 			parent,
 			nullptr,
 			sticker,
+			QMargins(0, st::chatGiveawayStickerTop, 0, 0),
 			tr::lng_prizes_badge(
 				tr::now,
 				lt_amount,
@@ -887,6 +898,7 @@ auto GenerateGiveawayResults(
 			parent,
 			nullptr,
 			sticker,
+			QMargins(0, st::chatGiveawayStickerTop, 0, 0),
 			tr::lng_prizes_badge(
 				tr::now,
 				lt_amount,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
index 33b84f23d..54db41cc8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
@@ -177,7 +177,8 @@ public:
 	StickerInBubblePart(
 		not_null<Element*> parent,
 		Element *replacing,
-		Fn<Data()> lookup);
+		Fn<Data()> lookup,
+		QMargins padding);
 
 	[[nodiscard]] not_null<Element*> parent() const {
 		return _parent;
@@ -207,6 +208,7 @@ private:
 	const not_null<Element*> _parent;
 	Fn<Data()> _lookup;
 	mutable int _skipTop = 0;
+	mutable QMargins _padding;
 	mutable std::optional<Sticker> _sticker;
 
 };
@@ -218,6 +220,7 @@ public:
 		not_null<Element*> parent,
 		Element *replacing,
 		Fn<Data()> lookup,
+		QMargins padding,
 		QString badge);
 
 	void draw(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index 338c163fa..0fe8f1b26 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -139,7 +139,11 @@ bool Sticker::emojiSticker() const {
 
 void Sticker::initSize(int customSize) {
 	if (customSize > 0) {
-		_size = { customSize, customSize };
+		const auto original = Size(_data);
+		const auto proposed = QSize{ customSize, customSize };
+		_size = original.isEmpty()
+			? proposed
+			: DownscaledSize(original, proposed);
 	} else if (emojiSticker() || _diceIndex >= 0) {
 		_size = EmojiSize();
 		if (_diceIndex > 0) {
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 6ce2ddfad..2e84f4d45 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -9,12 +9,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_premium.h"
 #include "boxes/peers/edit_peer_color_box.h" // ButtonStyleWithRightEmoji
+#include "chat_helpers/stickers_lottie.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "core/application.h"
 #include "data/business/data_business_info.h"
 #include "data/data_document.h"
+#include "data/data_document_media.h"
 #include "data/data_session.h"
+#include "history/view/media/history_view_media_common.h"
+#include "history/view/media/history_view_sticker_player.h"
 #include "history/view/history_view_about_view.h"
 #include "history/view/history_view_context_menu.h"
 #include "history/view/history_view_element.h"
@@ -97,7 +101,6 @@ public:
 	struct Descriptor {
 		not_null<Window::SessionController*> controller;
 		not_null<QWidget*> button;
-		DocumentId ensureAddedId = 0;
 	};
 	void show(Descriptor &&descriptor);
 	void repaint();
@@ -164,10 +167,49 @@ private:
 			current),
 		st::settingsChatIntroFieldMargins);
 	field->setMaxLength(limit);
-	HistoryView::AddLengthLimitLabel(field, limit);
+	AddLengthLimitLabel(field, limit);
 	return field;
 }
 
+
+rpl::producer<std::shared_ptr<StickerPlayer>> IconPlayerValue(
+		not_null<DocumentData*> sticker,
+		Fn<void()> update) {
+	const auto media = sticker->createMediaView();
+	media->checkStickerLarge();
+	media->goodThumbnailWanted();
+
+	return rpl::single() | rpl::then(
+		sticker->owner().session().downloaderTaskFinished()
+	) | rpl::filter([=] {
+		return media->loaded();
+	}) | rpl::take(1) | rpl::map([=] {
+		auto result = std::shared_ptr<StickerPlayer>();
+		const auto info = sticker->sticker();
+		const auto box = QSize(st::emojiSize, st::emojiSize);
+		if (info->isLottie()) {
+			result = std::make_shared<LottiePlayer>(
+				ChatHelpers::LottiePlayerFromDocument(
+					media.get(),
+					ChatHelpers::StickerLottieSize::StickerEmojiSize,
+					box,
+					Lottie::Quality::High));
+		} else if (info->isWebm()) {
+			result = std::make_shared<WebmPlayer>(
+				media->owner()->location(),
+				media->bytes(),
+				box);
+		} else {
+			result = std::make_shared<StaticStickerPlayer>(
+				media->owner()->location(),
+				media->bytes(),
+				box);
+		}
+		result->setRepaintCallback(update);
+		return result;
+	});
+}
+
 [[nodiscard]] object_ptr<Ui::SettingsButton> CreateIntroStickerButton(
 		not_null<Ui::RpWidget*> parent,
 		std::shared_ptr<ChatHelpers::Show> show,
@@ -188,7 +230,9 @@ private:
 
 	struct State {
 		StickerPanel panel;
-		DocumentId stickerId = 0;
+		DocumentData *sticker = nullptr;
+		std::shared_ptr<StickerPlayer> player;
+		rpl::lifetime playerLifetime;
 	};
 	const auto state = right->lifetime().make_state<State>();
 	state->panel.someCustomChosen(
@@ -200,11 +244,23 @@ private:
 	std::move(
 		stickerValue
 	) | rpl::start_with_next([=](DocumentData *sticker) {
-		state->stickerId = sticker ? sticker->id : 0;
-		right->resize(
-			(sticker ? button.emojiWidth : button.noneWidth) + button.added,
-			right->height());
-		right->update();
+		state->sticker = sticker;
+		if (sticker) {
+			right->resize(button.emojiWidth + button.added, right->height());
+			IconPlayerValue(
+				sticker,
+				[=] { right->update(); }
+			) | rpl::start_with_next([=](
+					std::shared_ptr<StickerPlayer> player) {
+				state->player = std::move(player);
+				right->update();
+			}, state->playerLifetime);
+		} else {
+			state->playerLifetime.destroy();
+			state->player = nullptr;
+			right->resize(button.noneWidth + button.added, right->height());
+			right->update();
+		}
 	}, right->lifetime());
 
 	rpl::combine(
@@ -220,8 +276,26 @@ private:
 	) | rpl::start_with_next([=] {
 		auto p = QPainter(right);
 		const auto height = right->height();
-		if (false) {
-			// #TODO paint small sticker
+		if (state->player) {
+			if (state->player->ready()) {
+				const auto frame = state->player->frame(
+					QSize(st::emojiSize, st::emojiSize),
+					QColor(0, 0, 0, 0),
+					false,
+					crl::now(),
+					!right->window()->isActiveWindow()).image;
+				const auto target = DownscaledSize(
+					frame.size(),
+					QSize(st::emojiSize, st::emojiSize));
+				p.drawImage(
+					QRect(
+						button.added + (st::emojiSize - target.width()) / 2,
+						(height - target.height()) / 2,
+						target.width(),
+						target.height()),
+					frame);
+				state->player->markFrameShown();
+			}
 		} else {
 			const auto &font = st::normalFont;
 			p.setFont(font);
@@ -241,7 +315,6 @@ private:
 			state->panel.show({
 				.controller = controller,
 				.button = right,
-				.ensureAddedId = state->stickerId,
 			});
 		}
 	});
@@ -384,14 +457,6 @@ void StickerPanel::show(Descriptor &&descriptor) {
 		}
 	}
 	_panelButton = button;
-	const auto feed = [=, now = descriptor.ensureAddedId](
-			std::vector<DocumentId> list) {
-		list.insert(begin(list), 0);
-		if (now && !ranges::contains(list, now)) {
-			list.push_back(now);
-		}
-		_panel->selector()->provideRecentEmoji(list);
-	};
 	const auto parent = _panel->parentWidget();
 	const auto global = button->mapToGlobal(QPoint());
 	const auto local = parent->mapFromGlobal(global);
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 16dcf7f14..dba8a16ea 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1066,3 +1066,4 @@ chatIntroStickerSize: 96px;
 chatIntroWidth: 224px;
 chatIntroTitleMargin: margins(11px, 16px, 11px, 4px);
 chatIntroMargin: margins(11px, 0px, 11px, 0px);
+chatIntroStickerPadding: margins(10px, 8px, 10px, 16px);

From 85554d19e4dda1bdf0b10e2e7483642fa0f13560 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Mar 2024 12:03:02 +0400
Subject: [PATCH 110/596] Show chat intro in an empty chat.

---
 Telegram/Resources/langs/lang.strings         |   2 +-
 .../data/business/data_business_common.cpp    |  33 ++-
 .../data/business/data_business_common.h      |  39 ++--
 .../data/business/data_business_info.cpp      |  82 +++----
 .../data/business/data_business_info.h        |  10 +-
 Telegram/SourceFiles/data/data_user.cpp       |   6 +-
 .../data/stickers/data_stickers.cpp           |   2 +-
 .../SourceFiles/data/stickers/data_stickers.h |  73 +++---
 .../history/history_inner_widget.cpp          |  13 +-
 .../history/view/history_view_about_view.cpp  | 214 ++++++------------
 .../history/view/history_view_about_view.h    |   4 +
 .../settings/business/settings_chat_intro.cpp |   9 +-
 12 files changed, 194 insertions(+), 293 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index b87b38d0f..64d657908 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2302,7 +2302,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chat_intro_title" = "Intro";
 "lng_chat_intro_subtitle" = "Customize your intro";
 "lng_chat_intro_default_title" = "No messages here yet...";
-"lng_chat_intro_default_message" = "Send a message or tap on the greeting below";
+"lng_chat_intro_default_message" = "Send a message or click on the greeting below";
 "lng_chat_intro_enter_title" = "Enter Title";
 "lng_chat_intro_enter_message" = "Enter Message";
 "lng_chat_intro_choose_sticker" = "Choose Sticker";
diff --git a/Telegram/SourceFiles/data/business/data_business_common.cpp b/Telegram/SourceFiles/data/business/data_business_common.cpp
index bdc8ffe7d..52c545bc4 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_common.cpp
@@ -153,8 +153,10 @@ BusinessRecipients FromMTP(
 }
 
 BusinessDetails FromMTP(
+		not_null<Session*> owner,
 		const tl::conditional<MTPBusinessWorkHours> &hours,
-		const tl::conditional<MTPBusinessLocation> &location) {
+		const tl::conditional<MTPBusinessLocation> &location,
+		const tl::conditional<MTPBusinessIntro> &intro) {
 	auto result = BusinessDetails();
 	if (hours) {
 		const auto &data = hours->data();
@@ -179,6 +181,17 @@ BusinessDetails FromMTP(
 			});
 		}
 	}
+	if (intro) {
+		const auto &data = intro->data();
+		result.intro.title = qs(data.vtitle());
+		result.intro.description = qs(data.vdescription());
+		if (const auto document = data.vsticker()) {
+			result.intro.sticker = owner->processDocument(*document);
+			if (!result.intro.sticker->sticker()) {
+				result.intro.sticker = nullptr;
+			}
+		}
+	}
 	return result;
 }
 
@@ -334,22 +347,4 @@ WorkingIntervals ReplaceDayIntervals(
 	return result.normalized();
 }
 
-ChatIntro FromMTP(
-		not_null<Session*> owner,
-		const tl::conditional<MTPBusinessIntro> &intro) {
-	auto result = ChatIntro();
-	if (intro) {
-		const auto &data = intro->data();
-		result.title = qs(data.vtitle());
-		result.description = qs(data.vdescription());
-		if (const auto document = data.vsticker()) {
-			result.sticker = owner->processDocument(*document);
-			if (!result.sticker->sticker()) {
-				result.sticker = nullptr;
-			}
-		}
-	}
-	return result;
-}
-
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/business/data_business_common.h b/Telegram/SourceFiles/data/business/data_business_common.h
index 86754c56f..dc9f65256 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.h
+++ b/Telegram/SourceFiles/data/business/data_business_common.h
@@ -182,12 +182,27 @@ struct BusinessLocation {
 		const BusinessLocation &b) = default;
 };
 
+struct ChatIntro {
+	QString title;
+	QString description;
+	DocumentData *sticker = nullptr;
+
+	explicit operator bool() const {
+		return !title.isEmpty() || !description.isEmpty();
+	}
+
+	friend inline bool operator==(
+		const ChatIntro &a,
+		const ChatIntro &b) = default;
+};
+
 struct BusinessDetails {
 	WorkingHours hours;
 	BusinessLocation location;
+	ChatIntro intro;
 
 	explicit operator bool() const {
-		return hours || location;
+		return hours || location || intro;
 	}
 
 	friend inline bool operator==(
@@ -196,8 +211,10 @@ struct BusinessDetails {
 };
 
 [[nodiscard]] BusinessDetails FromMTP(
+	not_null<Session*> owner,
 	const tl::conditional<MTPBusinessWorkHours> &hours,
-	const tl::conditional<MTPBusinessLocation> &location);
+	const tl::conditional<MTPBusinessLocation> &location,
+	const tl::conditional<MTPBusinessIntro> &intro);
 
 enum class AwayScheduleType : uchar {
 	Never = 0,
@@ -252,22 +269,4 @@ struct GreetingSettings {
 	not_null<Session*> owner,
 	const tl::conditional<MTPBusinessGreetingMessage> &message);
 
-struct ChatIntro {
-	QString title;
-	QString description;
-	DocumentData *sticker = nullptr;
-
-	explicit operator bool() const {
-		return !title.isEmpty() || !description.isEmpty();
-	}
-
-	friend inline bool operator==(
-		const ChatIntro &a,
-		const ChatIntro &b) = default;
-};
-
-[[nodiscard]] ChatIntro FromMTP(
-	not_null<Session*> owner,
-	const tl::conditional<MTPBusinessIntro> &intro);
-
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/business/data_business_info.cpp b/Telegram/SourceFiles/data/business/data_business_info.cpp
index 66c7e0be9..e158c7a3a 100644
--- a/Telegram/SourceFiles/data/business/data_business_info.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_info.cpp
@@ -96,6 +96,40 @@ void BusinessInfo::saveWorkingHours(
 	session->user()->setBusinessDetails(std::move(details));
 }
 
+void BusinessInfo::saveChatIntro(ChatIntro data, Fn<void(QString)> fail) {
+	const auto session = &_owner->session();
+	auto details = session->user()->businessDetails();
+	const auto &was = details.intro;
+	if (was == data) {
+		return;
+	} else {
+		const auto session = &_owner->session();
+		using Flag = MTPaccount_UpdateBusinessIntro::Flag;
+		session->api().request(MTPaccount_UpdateBusinessIntro(
+			MTP_flags(data ? Flag::f_intro : Flag()),
+			MTP_inputBusinessIntro(
+				MTP_flags(data.sticker
+					? MTPDinputBusinessIntro::Flag::f_sticker
+					: MTPDinputBusinessIntro::Flag()),
+				MTP_string(data.title),
+				MTP_string(data.description),
+				(data.sticker
+					? data.sticker->mtpInput()
+					: MTP_inputDocumentEmpty()))
+		)).fail([=](const MTP::Error &error) {
+			auto details = session->user()->businessDetails();
+			details.intro = was;
+			session->user()->setBusinessDetails(std::move(details));
+			if (fail) {
+				fail(error.type());
+			}
+		}).send();
+	}
+
+	details.intro = std::move(data);
+	session->user()->setBusinessDetails(std::move(details));
+}
+
 void BusinessInfo::applyAwaySettings(AwaySettings data) {
 	if (_awaySettings == data) {
 		return;
@@ -184,54 +218,6 @@ rpl::producer<> BusinessInfo::greetingSettingsChanged() const {
 	return _greetingSettingsChanged.events();
 }
 
-void BusinessInfo::saveChatIntro(ChatIntro data, Fn<void(QString)> fail) {
-	const auto &was = _chatIntro;
-	if (was == data) {
-		return;
-	} else {
-		const auto session = &_owner->session();
-		using Flag = MTPaccount_UpdateBusinessIntro::Flag;
-		session->api().request(MTPaccount_UpdateBusinessIntro(
-			MTP_flags(data ? Flag::f_intro : Flag()),
-			MTP_inputBusinessIntro(
-				MTP_flags(data.sticker ? MTPDinputBusinessIntro::Flag::f_sticker : MTPDinputBusinessIntro::Flag()),
-				MTP_string(data.title),
-				MTP_string(data.description),
-				(data.sticker
-					? data.sticker->mtpInput()
-					: MTP_inputDocumentEmpty()))
-		)).fail([=](const MTP::Error &error) {
-			_chatIntro = was;
-			_chatIntroChanged.fire({});
-			if (fail) {
-				fail(error.type());
-			}
-		}).send();
-	}
-	_chatIntro = std::move(data);
-	_chatIntroChanged.fire({});
-}
-
-void BusinessInfo::applyChatIntro(ChatIntro data) {
-	if (_chatIntro == data) {
-		return;
-	}
-	_chatIntro = data;
-	_chatIntroChanged.fire({});
-}
-
-ChatIntro BusinessInfo::chatIntro() const {
-	return _chatIntro.value_or(ChatIntro());
-}
-
-bool BusinessInfo::chatIntroLoaded() const {
-	return _chatIntro.has_value();
-}
-
-rpl::producer<> BusinessInfo::chatIntroChanged() const {
-	return _chatIntroChanged.events();
-}
-
 void BusinessInfo::preload() {
 	preloadTimezones();
 }
diff --git a/Telegram/SourceFiles/data/business/data_business_info.h b/Telegram/SourceFiles/data/business/data_business_info.h
index bdae99e35..7b99e4c8f 100644
--- a/Telegram/SourceFiles/data/business/data_business_info.h
+++ b/Telegram/SourceFiles/data/business/data_business_info.h
@@ -21,6 +21,7 @@ public:
 	void preload();
 
 	void saveWorkingHours(WorkingHours data, Fn<void(QString)> fail);
+	void saveChatIntro(ChatIntro data, Fn<void(QString)> fail);
 
 	void saveAwaySettings(AwaySettings data, Fn<void(QString)> fail);
 	void applyAwaySettings(AwaySettings data);
@@ -36,12 +37,6 @@ public:
 	[[nodiscard]] bool greetingSettingsLoaded() const;
 	[[nodiscard]] rpl::producer<> greetingSettingsChanged() const;
 
-	void saveChatIntro(ChatIntro data, Fn<void(QString)> fail);
-	void applyChatIntro(ChatIntro data);
-	[[nodiscard]] ChatIntro chatIntro() const;
-	[[nodiscard]] bool chatIntroLoaded() const;
-	[[nodiscard]] rpl::producer<> chatIntroChanged() const;
-
 	void preloadTimezones();
 	[[nodiscard]] bool timezonesLoaded() const;
 	[[nodiscard]] rpl::producer<Timezones> timezonesValue() const;
@@ -57,9 +52,6 @@ private:
 	std::optional<GreetingSettings> _greetingSettings;
 	rpl::event_stream<> _greetingSettingsChanged;
 
-	std::optional<ChatIntro> _chatIntro;
-	rpl::event_stream<> _chatIntroChanged;
-
 	mtpRequestId _timezonesRequestId = 0;
 	int32 _timezonesHash = 0;
 
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index a1219380c..ebe681ac3 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -594,15 +594,15 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	}
 
 	user->setBusinessDetails(FromMTP(
+		&user->owner(),
 		update.vbusiness_work_hours(),
-		update.vbusiness_location()));
+		update.vbusiness_location(),
+		update.vbusiness_intro()));
 	if (user->isSelf()) {
 		user->owner().businessInfo().applyAwaySettings(
 			FromMTP(&user->owner(), update.vbusiness_away_message()));
 		user->owner().businessInfo().applyGreetingSettings(
 			FromMTP(&user->owner(), update.vbusiness_greeting_message()));
-		user->owner().businessInfo().applyChatIntro(
-			FromMTP(&user->owner(), update.vbusiness_intro()));
 	}
 
 	user->owner().stories().apply(user, update.vstories());
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index 11c410da3..5981e5258 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -502,7 +502,7 @@ void Stickers::undoInstallLocally(uint64 setId) {
 		Ui::LayerOption::KeepOther);
 }
 
-bool Stickers::isFaved(not_null<const DocumentData*> document) {
+bool Stickers::isFaved(not_null<const DocumentData*> document) const {
 	const auto &sets = this->sets();
 	const auto it = sets.find(FavedSetId);
 	if (it == sets.cend()) {
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.h b/Telegram/SourceFiles/data/stickers/data_stickers.h
index 7b8937846..d5a192b4b 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.h
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.h
@@ -80,13 +80,13 @@ public:
 
 	void incrementSticker(not_null<DocumentData*> document);
 
-	bool updateNeeded(crl::time now) const {
+	[[nodiscard]] bool updateNeeded(crl::time now) const {
 		return updateNeeded(_lastUpdate, now);
 	}
 	void setLastUpdate(crl::time update) {
 		_lastUpdate = update;
 	}
-	bool recentUpdateNeeded(crl::time now) const {
+	[[nodiscard]] bool recentUpdateNeeded(crl::time now) const {
 		return updateNeeded(_lastRecentUpdate, now);
 	}
 	void setLastRecentUpdate(crl::time update) {
@@ -95,19 +95,19 @@ public:
 		}
 		_lastRecentUpdate = update;
 	}
-	bool masksUpdateNeeded(crl::time now) const {
+	[[nodiscard]] bool masksUpdateNeeded(crl::time now) const {
 		return updateNeeded(_lastMasksUpdate, now);
 	}
 	void setLastMasksUpdate(crl::time update) {
 		_lastMasksUpdate = update;
 	}
-	bool emojiUpdateNeeded(crl::time now) const {
+	[[nodiscard]] bool emojiUpdateNeeded(crl::time now) const {
 		return updateNeeded(_lastEmojiUpdate, now);
 	}
 	void setLastEmojiUpdate(crl::time update) {
 		_lastEmojiUpdate = update;
 	}
-	bool recentAttachedUpdateNeeded(crl::time now) const {
+	[[nodiscard]] bool recentAttachedUpdateNeeded(crl::time now) const {
 		return updateNeeded(_lastRecentAttachedUpdate, now);
 	}
 	void setLastRecentAttachedUpdate(crl::time update) {
@@ -116,31 +116,31 @@ public:
 		}
 		_lastRecentAttachedUpdate = update;
 	}
-	bool favedUpdateNeeded(crl::time now) const {
+	[[nodiscard]] bool favedUpdateNeeded(crl::time now) const {
 		return updateNeeded(_lastFavedUpdate, now);
 	}
 	void setLastFavedUpdate(crl::time update) {
 		_lastFavedUpdate = update;
 	}
-	bool featuredUpdateNeeded(crl::time now) const {
+	[[nodiscard]] bool featuredUpdateNeeded(crl::time now) const {
 		return updateNeeded(_lastFeaturedUpdate, now);
 	}
 	void setLastFeaturedUpdate(crl::time update) {
 		_lastFeaturedUpdate = update;
 	}
-	bool featuredEmojiUpdateNeeded(crl::time now) const {
+	[[nodiscard]] bool featuredEmojiUpdateNeeded(crl::time now) const {
 		return updateNeeded(_lastFeaturedEmojiUpdate, now);
 	}
 	void setLastFeaturedEmojiUpdate(crl::time update) {
 		_lastFeaturedEmojiUpdate = update;
 	}
-	bool savedGifsUpdateNeeded(crl::time now) const {
+	[[nodiscard]] bool savedGifsUpdateNeeded(crl::time now) const {
 		return updateNeeded(_lastSavedGifsUpdate, now);
 	}
 	void setLastSavedGifsUpdate(crl::time update) {
 		_lastSavedGifsUpdate = update;
 	}
-	int featuredSetsUnreadCount() const {
+	[[nodiscard]] int featuredSetsUnreadCount() const {
 		return _featuredSetsUnreadCount.current();
 	}
 	void setFeaturedSetsUnreadCount(int count) {
@@ -149,58 +149,58 @@ public:
 	[[nodiscard]] rpl::producer<int> featuredSetsUnreadCountValue() const {
 		return _featuredSetsUnreadCount.value();
 	}
-	const StickersSets &sets() const {
+	[[nodiscard]] const StickersSets &sets() const {
 		return _sets;
 	}
-	StickersSets &setsRef() {
+	[[nodiscard]] StickersSets &setsRef() {
 		return _sets;
 	}
-	const StickersSetsOrder &setsOrder() const {
+	[[nodiscard]] const StickersSetsOrder &setsOrder() const {
 		return _setsOrder;
 	}
-	StickersSetsOrder &setsOrderRef() {
+	[[nodiscard]] StickersSetsOrder &setsOrderRef() {
 		return _setsOrder;
 	}
-	const StickersSetsOrder &maskSetsOrder() const {
+	[[nodiscard]] const StickersSetsOrder &maskSetsOrder() const {
 		return _maskSetsOrder;
 	}
-	StickersSetsOrder &maskSetsOrderRef() {
+	[[nodiscard]] StickersSetsOrder &maskSetsOrderRef() {
 		return _maskSetsOrder;
 	}
-	const StickersSetsOrder &emojiSetsOrder() const {
+	[[nodiscard]] const StickersSetsOrder &emojiSetsOrder() const {
 		return _emojiSetsOrder;
 	}
-	StickersSetsOrder &emojiSetsOrderRef() {
+	[[nodiscard]] StickersSetsOrder &emojiSetsOrderRef() {
 		return _emojiSetsOrder;
 	}
-	const StickersSetsOrder &featuredSetsOrder() const {
+	[[nodiscard]] const StickersSetsOrder &featuredSetsOrder() const {
 		return _featuredSetsOrder;
 	}
-	StickersSetsOrder &featuredSetsOrderRef() {
+	[[nodiscard]] StickersSetsOrder &featuredSetsOrderRef() {
 		return _featuredSetsOrder;
 	}
-	const StickersSetsOrder &featuredEmojiSetsOrder() const {
+	[[nodiscard]] const StickersSetsOrder &featuredEmojiSetsOrder() const {
 		return _featuredEmojiSetsOrder;
 	}
-	StickersSetsOrder &featuredEmojiSetsOrderRef() {
+	[[nodiscard]] StickersSetsOrder &featuredEmojiSetsOrderRef() {
 		return _featuredEmojiSetsOrder;
 	}
-	const StickersSetsOrder &archivedSetsOrder() const {
+	[[nodiscard]] const StickersSetsOrder &archivedSetsOrder() const {
 		return _archivedSetsOrder;
 	}
-	StickersSetsOrder &archivedSetsOrderRef() {
+	[[nodiscard]] StickersSetsOrder &archivedSetsOrderRef() {
 		return _archivedSetsOrder;
 	}
-	const StickersSetsOrder &archivedMaskSetsOrder() const {
+	[[nodiscard]] const StickersSetsOrder &archivedMaskSetsOrder() const {
 		return _archivedMaskSetsOrder;
 	}
-	StickersSetsOrder &archivedMaskSetsOrderRef() {
+	[[nodiscard]] StickersSetsOrder &archivedMaskSetsOrderRef() {
 		return _archivedMaskSetsOrder;
 	}
-	const SavedGifs &savedGifs() const {
+	[[nodiscard]] const SavedGifs &savedGifs() const {
 		return _savedGifs;
 	}
-	SavedGifs &savedGifsRef() {
+	[[nodiscard]] SavedGifs &savedGifsRef() {
 		return _savedGifs;
 	}
 	void removeFromRecentSet(not_null<DocumentData*> document);
@@ -214,7 +214,7 @@ public:
 		const MTPDmessages_stickerSetInstallResultArchive &d);
 	void installLocally(uint64 setId);
 	void undoInstallLocally(uint64 setId);
-	bool isFaved(not_null<const DocumentData*> document);
+	[[nodiscard]] bool isFaved(not_null<const DocumentData*> document) const;
 	void setFaved(
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
@@ -235,12 +235,12 @@ public:
 		const MTPmessages_FeaturedStickers &result);
 	void gifsReceived(const QVector<MTPDocument> &items, uint64 hash);
 
-	std::vector<not_null<DocumentData*>> getListByEmoji(
+	[[nodiscard]] std::vector<not_null<DocumentData*>> getListByEmoji(
 		std::vector<EmojiPtr> emoji,
 		uint64 seed,
 		bool forceAllResults = false);
-	std::optional<std::vector<not_null<EmojiPtr>>> getEmojiListFromSet(
-		not_null<DocumentData*> document);
+	[[nodiscard]] auto getEmojiListFromSet(not_null<DocumentData*> document)
+		-> std::optional<std::vector<not_null<EmojiPtr>>>;
 
 	not_null<StickersSet*> feedSet(const MTPStickerSet &data);
 	not_null<StickersSet*> feedSet(const MTPStickerSetCovered &data);
@@ -254,15 +254,14 @@ public:
 		const QVector<MTPDocument> &documents);
 	void newSetReceived(const MTPDmessages_stickerSet &set);
 
-	QString getSetTitle(const MTPDstickerSet &s);
+	[[nodiscard]] QString getSetTitle(const MTPDstickerSet &s);
 
-	RecentStickerPack &getRecentPack() const;
+	[[nodiscard]] RecentStickerPack &getRecentPack() const;
 
 private:
-	bool updateNeeded(crl::time lastUpdate, crl::time now) const {
+	[[nodiscard]] bool updateNeeded(crl::time last, crl::time now) const {
 		constexpr auto kUpdateTimeout = crl::time(3600'000);
-		return (lastUpdate == 0)
-			|| (now >= lastUpdate + kUpdateTimeout);
+		return (last == 0) || (now >= last + kUpdateTimeout);
 	}
 	void checkFavedLimit(
 		StickersSet &set,
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 5a8f09ffd..3b3dd87d9 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -4072,7 +4072,7 @@ void HistoryInner::refreshAboutView() {
 					_history->delegateMixin()->delegate());
 			}
 			if (!info->inited) {
-				session().api().requestFullPeer(_peer);
+				session().api().requestFullPeer(user);
 			}
 		} else if (user->meRequiresPremiumToWrite()
 			&& !user->session().premium()
@@ -4082,8 +4082,15 @@ void HistoryInner::refreshAboutView() {
 					_history,
 					_history->delegateMixin()->delegate());
 			}
-		} else {
-			_aboutView = nullptr;
+		} else if (!historyHeight()) {
+			if (!_aboutView) {
+				_aboutView = std::make_unique<HistoryView::AboutView>(
+					_history,
+					_history->delegateMixin()->delegate());
+			}
+			if (!user->isFullLoaded()) {
+				session().api().requestFullPeer(user);
+			}
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index 6fe6bba3d..461dfd49a 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -7,6 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_about_view.h"
 
+#include "api/api_premium.h"
+#include "apiwrap.h"
+#include "base/random.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "core/click_handler_types.h"
 #include "data/business/data_business_common.h"
@@ -70,47 +73,11 @@ private:
 
 };
 
-class ChatIntroBox final : public ServiceBoxContent {
-public:
-	ChatIntroBox(not_null<Element*> parent, Data::ChatIntro data);
-	~ChatIntroBox();
-
-	int width() override;
-	int top() override;
-	QSize size() override;
-	QString title() override;
-	TextWithEntities subtitle() override;
-	int buttonSkip() override;
-	rpl::producer<QString> button() override;
-	void draw(
-		Painter &p,
-		const PaintContext &context,
-		const QRect &geometry) override;
-	ClickHandlerPtr createViewLink() override;
-
-	bool hideServiceText() override {
-		return true;
-	}
-
-	void stickerClearLoopPlayed() override;
-	std::unique_ptr<StickerPlayer> stickerTakePlayer(
-		not_null<DocumentData*> data,
-		const Lottie::ColorReplacements *replacements) override;
-
-	bool hasHeavyPart() override;
-	void unloadHeavyPart() override;
-
-private:
-	const not_null<Element*> _parent;
-	const Data::ChatIntro _data;
-	mutable std::optional<Sticker> _sticker;
-
-};
-
 auto GenerateChatIntro(
 	not_null<Element*> parent,
 	Element *replacing,
-	const Data::ChatIntro &data)
+	const Data::ChatIntro &data,
+	Fn<void(not_null<DocumentData*>)> helloChosen)
 -> Fn<void(Fn<void(std::unique_ptr<MediaInBubble::Part>)>)> {
 	return [=](Fn<void(std::unique_ptr<MediaInBubble::Part>)> push) {
 		auto pushText = [&](
@@ -137,8 +104,19 @@ auto GenerateChatIntro(
 			: st::chatIntroMargin);
 		const auto sticker = [=] {
 			using Tag = ChatHelpers::StickerLottieSize;
+			auto sticker = data.sticker;
+			if (!sticker) {
+				const auto api = &parent->history()->session().api();
+				const auto &list = api->premium().helloStickers();
+				if (!list.empty()) {
+					sticker = list[base::RandomIndex(list.size())];
+					if (helloChosen) {
+						helloChosen(sticker);
+					}
+				}
+			}
 			return StickerInBubblePart::Data{
-				.sticker = data.sticker,
+				.sticker = sticker,
 				.size = st::chatIntroStickerSize,
 				.cacheTag = Tag::ChatIntroHelloSticker,
 			};
@@ -220,96 +198,6 @@ bool PremiumRequiredBox::hasHeavyPart() {
 void PremiumRequiredBox::unloadHeavyPart() {
 }
 
-ChatIntroBox::ChatIntroBox(not_null<Element*> parent, Data::ChatIntro data)
-: _parent(parent)
-, _data(data) {
-	if (const auto document = data.sticker) {
-		if (const auto sticker = document->sticker()) {
-			const auto skipPremiumEffect = true;
-			_sticker.emplace(_parent, document, skipPremiumEffect, _parent);
-			_sticker->initSize(st::chatIntroStickerSize);
-			_sticker->setCustomCachingTag(
-				ChatHelpers::StickerLottieSize::ChatIntroHelloSticker);
-		}
-	}
-}
-
-ChatIntroBox::~ChatIntroBox() = default;
-
-int ChatIntroBox::width() {
-	return st::chatIntroWidth;
-}
-
-int ChatIntroBox::top() {
-	return st::msgServiceGiftBoxButtonMargins.top();
-}
-
-QSize ChatIntroBox::size() {
-	return { st::msgServicePhotoWidth, st::msgServicePhotoWidth };
-}
-
-QString ChatIntroBox::title() {
-	return _data ? _data.title : tr::lng_chat_intro_default_title(tr::now);
-}
-
-int ChatIntroBox::buttonSkip() {
-	return st::storyMentionButtonSkip;
-}
-
-rpl::producer<QString> ChatIntroBox::button() {
-	return nullptr;
-}
-
-TextWithEntities ChatIntroBox::subtitle() {
-	return {
-		(_data
-			? _data.description
-			: tr::lng_chat_intro_default_message(tr::now))
-	};
-}
-
-ClickHandlerPtr ChatIntroBox::createViewLink() {
-	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
-		const auto my = context.other.value<ClickHandlerContext>();
-		if (const auto controller = my.sessionWindow.get()) {
-			Settings::ShowPremium(controller, u"require_premium"_q);
-		}
-	});
-}
-
-void ChatIntroBox::draw(
-		Painter &p,
-		const PaintContext &context,
-		const QRect &geometry) {
-	if (_sticker) {
-		_sticker->draw(p, context, geometry);
-	}
-}
-
-void ChatIntroBox::stickerClearLoopPlayed() {
-	if (_sticker) {
-		_sticker->stickerClearLoopPlayed();
-	}
-}
-
-std::unique_ptr<StickerPlayer> ChatIntroBox::stickerTakePlayer(
-		not_null<DocumentData*> data,
-		const Lottie::ColorReplacements *replacements) {
-	return _sticker
-		? _sticker->stickerTakePlayer(data, replacements)
-		: nullptr;
-}
-
-bool ChatIntroBox::hasHeavyPart() {
-	return _sticker && _sticker->hasHeavyPart();
-}
-
-void ChatIntroBox::unloadHeavyPart() {
-	if (_sticker) {
-		_sticker->unloadHeavyPart();
-	}
-}
-
 } // namespace
 
 AboutView::AboutView(
@@ -339,21 +227,22 @@ HistoryItem *AboutView::item() const {
 }
 
 bool AboutView::refresh() {
-	const auto bot = _history->peer->asUser();
-	const auto info = bot ? bot->botInfo.get() : nullptr;
+	const auto user = _history->peer->asUser();
+	const auto info = user ? user->botInfo.get() : nullptr;
 	if (!info) {
-		if (bot
-			&& bot->meRequiresPremiumToWrite()
-			&& !bot->session().premium()
-			&& _history->isDisplayedEmpty()) {
+		if (user && _history->isDisplayedEmpty()) {
 			if (_item) {
 				return false;
+			} else if (user->meRequiresPremiumToWrite()
+				&& !user->session().premium()) {
+				setItem(makePremiumRequired(), nullptr);
+			} else {
+				makeIntro(user);
 			}
-			_item = makePremiumRequired();
 			return true;
 		}
 		if (_item) {
-			_item = {};
+			setItem({}, nullptr);
 			return true;
 		}
 		_version = 0;
@@ -364,10 +253,14 @@ bool AboutView::refresh() {
 		return false;
 	}
 	_version = version;
-	_item = makeAboutBot(info);
+	setItem(makeAboutBot(info), nullptr);
 	return true;
 }
 
+void AboutView::makeIntro(not_null<UserData*> user) {
+	make(user->businessDetails().intro);
+}
+
 void AboutView::make(Data::ChatIntro data) {
 	const auto item = _history->makeMessage({
 		.id = _history->nextNonHistoryEntryId(),
@@ -377,31 +270,58 @@ void AboutView::make(Data::ChatIntro data) {
 		.from = _history->peer->id,
 	}, PreparedServiceText{ { } });
 
+	if (data.sticker) {
+		_helloChosen = nullptr;
+	} else if (_helloChosen) {
+		data.sticker = _helloChosen;
+	}
+
 	auto owned = AdminLog::OwnedItem(_delegate, item);
+	const auto helloChosen = [=](not_null<DocumentData*> sticker) {
+		setHelloChosen(sticker);
+	};
 	owned->overrideMedia(std::make_unique<HistoryView::MediaInBubble>(
 		owned.get(),
-		GenerateChatIntro(owned.get(), _item.get(), data),
+		GenerateChatIntro(owned.get(), _item.get(), data, helloChosen),
 		HistoryView::MediaInBubbleDescriptor{
 			.maxWidth = st::chatIntroWidth,
 			.service = true,
 			.hideServiceText = true,
 		}));
+	if (!data.sticker && _helloChosen) {
+		data.sticker = _helloChosen;
+	}
 	setItem(std::move(owned), data.sticker);
 }
 
-void AboutView::setItem(AdminLog::OwnedItem item, DocumentData *sticker) {
-	if (const auto was = _item ? _item->data().get() : nullptr) {
+void AboutView::toggleStickerRegistered(bool registered) {
+	if (const auto item = _item ? _item->data().get() : nullptr) {
 		if (_sticker) {
-			was->history()->owner().unregisterDocumentItem(_sticker, was);
+			const auto owner = &item->history()->owner();
+			if (registered) {
+				owner->registerDocumentItem(_sticker, item);
+			} else {
+				owner->unregisterDocumentItem(_sticker, item);
+			}
 		}
 	}
+	if (!registered) {
+		_sticker = nullptr;
+	}
+}
+
+void AboutView::setHelloChosen(not_null<DocumentData*> sticker) {
+	_helloChosen = sticker;
+	toggleStickerRegistered(false);
+	_sticker = sticker;
+	toggleStickerRegistered(true);
+}
+
+void AboutView::setItem(AdminLog::OwnedItem item, DocumentData *sticker) {
+	toggleStickerRegistered(false);
 	_item = std::move(item);
 	_sticker = sticker;
-	if (const auto now = _item ? _item->data().get() : nullptr) {
-		if (_sticker) {
-			now->history()->owner().registerDocumentItem(_sticker, now);
-		}
-	}
+	toggleStickerRegistered(true);
 }
 
 AdminLog::OwnedItem AboutView::makeAboutBot(not_null<BotInfo*> info) {
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.h b/Telegram/SourceFiles/history/view/history_view_about_view.h
index cd1528b75..681b93e7f 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.h
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.h
@@ -36,11 +36,15 @@ public:
 private:
 	[[nodiscard]] AdminLog::OwnedItem makeAboutBot(not_null<BotInfo*> info);
 	[[nodiscard]] AdminLog::OwnedItem makePremiumRequired();
+	void makeIntro(not_null<UserData*> user);
 	void setItem(AdminLog::OwnedItem item, DocumentData *sticker);
+	void setHelloChosen(not_null<DocumentData*> sticker);
+	void toggleStickerRegistered(bool registered);
 
 	const not_null<History*> _history;
 	const not_null<ElementDelegate*> _delegate;
 	AdminLog::OwnedItem _item;
+	DocumentData *_helloChosen = nullptr;
 	DocumentData *_sticker = nullptr;
 	int _version = 0;
 
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 2e84f4d45..175538428 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "history/view/media/history_view_media_common.h"
 #include "history/view/media/history_view_sticker_player.h"
 #include "history/view/history_view_about_view.h"
@@ -564,10 +565,8 @@ void ChatIntro::setupContent(
 
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 	const auto session = &controller->session();
-	const auto info = &session->data().businessInfo();
-	const auto current = info->chatIntro();
+	_intro = controller->session().user()->businessDetails().intro;
 
-	_intro = info->chatIntro();
 	const auto change = [=](Fn<void(Data::ChatIntro &)> modify) {
 		auto intro = _intro.current();
 		modify(intro);
@@ -584,12 +583,12 @@ void ChatIntro::setupContent(
 	const auto title = AddPartInput(
 		content,
 		tr::lng_chat_intro_enter_title(),
-		current.title,
+		_intro.current().title,
 		PartLimit(session, u"intro_title_length_limit"_q, 32));
 	const auto description = AddPartInput(
 		content,
 		tr::lng_chat_intro_enter_message(),
-		current.description,
+		_intro.current().description,
 		PartLimit(session, u"intro_description_length_limit"_q, 70));
 	content->add(CreateIntroStickerButton(
 		content,

From d1a995a8633ba838c0074bf905198103e039444e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Mar 2024 13:07:22 +0400
Subject: [PATCH 111/596] Allow sending the sticker from the intro.

---
 .../history/view/history_view_about_view.cpp  |  7 +++++
 .../view/media/history_view_giveaway.cpp      | 29 ++++++++++++++++++-
 .../view/media/history_view_giveaway.h        | 12 +++++++-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index 461dfd49a..e2f5083fc 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_about_view.h"
 
 #include "api/api_premium.h"
+#include "api/api_sending.h"
 #include "apiwrap.h"
 #include "base/random.h"
 #include "chat_helpers/stickers_lottie.h"
@@ -115,10 +116,16 @@ auto GenerateChatIntro(
 					}
 				}
 			}
+			const auto send = [=] {
+				Api::SendExistingDocument(Api::MessageToSend(
+					Api::SendAction(parent->history())
+				), sticker);
+			};
 			return StickerInBubblePart::Data{
 				.sticker = sticker,
 				.size = st::chatIntroStickerSize,
 				.cacheTag = Tag::ChatIntroHelloSticker,
+				.link = std::make_shared<LambdaClickHandler>(send),
 			};
 		};
 		push(std::make_unique<StickerInBubblePart>(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
index 38a04b6ee..5942f3d69 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
@@ -124,7 +124,7 @@ void MediaInBubble::draw(Painter &p, const PaintContext &context) const {
 	const auto outer = width();
 	if (outer < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		return;
-	} else {
+	} else if (_service) {
 		PainterHighQualityEnabler hq(p);
 		const auto radius = st::msgServiceGiftBoxRadius;
 		p.setPen(Qt::NoPen);
@@ -367,6 +367,25 @@ void StickerInBubblePart::draw(
 	}
 }
 
+TextState StickerInBubblePart::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	auto result = TextState(_parent);
+	if (_sticker) {
+		const auto stickerSize = _sticker->countOptimalSize();
+		const auto sticker = QRect(
+			(outerWidth - stickerSize.width()) / 2,
+			_padding.top() + _skipTop,
+			stickerSize.width(),
+			stickerSize.height());
+		if (sticker.contains(point)) {
+			result.link = _link;
+		}
+	}
+	return result;
+}
+
 bool StickerInBubblePart::hasHeavyPart() {
 	return _sticker && _sticker->hasHeavyPart();
 }
@@ -408,6 +427,7 @@ void StickerInBubblePart::ensureCreated(Element *replacing) const {
 		const auto sticker = data.sticker;
 		if (const auto info = sticker->sticker()) {
 			const auto skipPremiumEffect = true;
+			_link = data.link;
 			_skipTop = data.skipTop;
 			_sticker.emplace(_parent, sticker, skipPremiumEffect, replacing);
 			if (data.singleTimePlayback) {
@@ -440,6 +460,13 @@ void StickerWithBadgePart::draw(
 	}
 }
 
+TextState StickerWithBadgePart::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	return _sticker.textState(point, request, outerWidth);
+}
+
 bool StickerWithBadgePart::hasHeavyPart() {
 	return _sticker.hasHeavyPart();
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
index 54db41cc8..2efe86d59 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
@@ -75,7 +75,7 @@ public:
 		bool pressed) override;
 
 	bool needsBubble() const override {
-		return !_service;;
+		return !_service;
 	}
 	bool customInfoLayout() const override {
 		return false;
@@ -169,6 +169,7 @@ public:
 		int size = 0;
 		ChatHelpers::StickerLottieSize cacheTag = {};
 		bool singleTimePlayback = false;
+		ClickHandlerPtr link;
 
 		explicit operator bool() const {
 			return sticker != nullptr;
@@ -192,6 +193,10 @@ public:
 		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
 	bool hasHeavyPart() override;
 	void unloadHeavyPart() override;
 
@@ -210,6 +215,7 @@ private:
 	mutable int _skipTop = 0;
 	mutable QMargins _padding;
 	mutable std::optional<Sticker> _sticker;
+	mutable ClickHandlerPtr _link;
 
 };
 
@@ -228,6 +234,10 @@ public:
 		not_null<const MediaInBubble*> owner,
 		const PaintContext &context,
 		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
 	bool hasHeavyPart() override;
 	void unloadHeavyPart() override;
 

From 7886a2179f5ae719827acf946362476bf07ca725 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Mar 2024 13:43:10 +0400
Subject: [PATCH 112/596] Fix giveaway messages layout.

---
 .../history/view/media/history_view_giveaway.cpp           | 7 ++++---
 Telegram/SourceFiles/ui/chat/chat.style                    | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
index 5942f3d69..041b1c256 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
@@ -482,7 +482,8 @@ std::unique_ptr<StickerPlayer> StickerWithBadgePart::stickerTakePlayer(
 }
 
 QSize StickerWithBadgePart::countOptimalSize() {
-	return _sticker.countOptimalSize();
+	_sticker.initDimensions();
+	return { _sticker.maxWidth(), _sticker.minHeight() };
 }
 
 QSize StickerWithBadgePart::countCurrentSize(int newWidth) {
@@ -788,7 +789,7 @@ auto GenerateGiveawayStart(
 			parent,
 			nullptr,
 			sticker,
-			QMargins(0, st::chatGiveawayStickerTop, 0, 0),
+			st::chatGiveawayStickerPadding,
 			tr::lng_prizes_badge(
 				tr::now,
 				lt_amount,
@@ -925,7 +926,7 @@ auto GenerateGiveawayResults(
 			parent,
 			nullptr,
 			sticker,
-			QMargins(0, st::chatGiveawayStickerTop, 0, 0),
+			st::chatGiveawayStickerPadding,
 			tr::lng_prizes_badge(
 				tr::now,
 				lt_amount,
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index dba8a16ea..8b294604d 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1001,6 +1001,7 @@ storyMentionButtonSkip: 5px;
 
 chatGiveawayWidth: 292px;
 chatGiveawayStickerTop: -16px;
+chatGiveawayStickerPadding: margins(14px, -2px, 14px, 14px);
 chatGiveawayWinnersTopSkip: 25px;
 chatGiveawayBadgeFont: font(12px bold);
 chatGiveawayBadgeTop: 106px;

From b31c30b9b6e751a5a87480c84d196b007a59f6b7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Mar 2024 14:09:52 +0400
Subject: [PATCH 113/596] Wait for full user info before intro creation.

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

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 3b3dd87d9..26ca88b58 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -4083,14 +4083,13 @@ void HistoryInner::refreshAboutView() {
 					_history->delegateMixin()->delegate());
 			}
 		} else if (!historyHeight()) {
-			if (!_aboutView) {
+			if (!user->isFullLoaded()) {
+				session().api().requestFullPeer(user);
+			} else if (!_aboutView) {
 				_aboutView = std::make_unique<HistoryView::AboutView>(
 					_history,
 					_history->delegateMixin()->delegate());
 			}
-			if (!user->isFullLoaded()) {
-				session().api().requestFullPeer(user);
-			}
 		}
 	}
 }

From 1e1a48865f01805a685089831abfdebf63c4758e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Mar 2024 14:35:58 +0400
Subject: [PATCH 114/596] Extract history/view/media/history_view_media_generic
 module.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../SourceFiles/data/data_media_types.cpp     |   5 +-
 .../history/view/history_view_about_view.cpp  |  12 +-
 .../view/media/history_view_giveaway.cpp      | 757 +----------------
 .../view/media/history_view_giveaway.h        | 298 +------
 .../view/media/history_view_media_generic.cpp | 760 ++++++++++++++++++
 .../view/media/history_view_media_generic.h   | 309 +++++++
 7 files changed, 1092 insertions(+), 1051 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
 create mode 100644 Telegram/SourceFiles/history/view/media/history_view_media_generic.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index a0a500bff..1fecca354 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -718,6 +718,8 @@ PRIVATE
     history/view/media/history_view_media.h
     history/view/media/history_view_media_common.cpp
     history/view/media/history_view_media_common.h
+    history/view/media/history_view_media_generic.cpp
+    history/view/media/history_view_media_generic.h
     history/view/media/history_view_media_grouped.cpp
     history/view/media/history_view_media_grouped.h
     history/view/media/history_view_media_spoiler.cpp
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 3e43cd47a..f82b4522f 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_game.h"
 #include "history/view/media/history_view_giveaway.h"
 #include "history/view/media/history_view_invoice.h"
+#include "history/view/media/history_view_media_generic.h"
 #include "history/view/media/history_view_call.h"
 #include "history/view/media/history_view_web_page.h"
 #include "history/view/media/history_view_poll.h"
@@ -2321,7 +2322,7 @@ std::unique_ptr<HistoryView::Media> MediaGiveawayStart::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
-	return std::make_unique<HistoryView::MediaInBubble>(
+	return std::make_unique<HistoryView::MediaGeneric>(
 		message,
 		HistoryView::GenerateGiveawayStart(message, &_data));
 }
@@ -2370,7 +2371,7 @@ std::unique_ptr<HistoryView::Media> MediaGiveawayResults::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
-	return std::make_unique<HistoryView::MediaInBubble>(
+	return std::make_unique<HistoryView::MediaGeneric>(
 		message,
 		HistoryView::GenerateGiveawayResults(message, &_data));
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index e2f5083fc..9d1cb9ed2 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
-#include "history/view/media/history_view_giveaway.h"
+#include "history/view/media/history_view_media_generic.h"
 #include "history/view/media/history_view_service_box.h"
 #include "history/view/media/history_view_sticker_player_abstract.h"
 #include "history/view/media/history_view_sticker.h"
@@ -79,8 +79,8 @@ auto GenerateChatIntro(
 	Element *replacing,
 	const Data::ChatIntro &data,
 	Fn<void(not_null<DocumentData*>)> helloChosen)
--> Fn<void(Fn<void(std::unique_ptr<MediaInBubble::Part>)>)> {
-	return [=](Fn<void(std::unique_ptr<MediaInBubble::Part>)> push) {
+-> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
 		auto pushText = [&](
 				TextWithEntities text,
 				QMargins margins = {},
@@ -88,7 +88,7 @@ auto GenerateChatIntro(
 			if (text.empty()) {
 				return;
 			}
-			push(std::make_unique<TextMediaInBubblePart>(
+			push(std::make_unique<MediaGenericTextPart>(
 				std::move(text),
 				margins,
 				links));
@@ -287,10 +287,10 @@ void AboutView::make(Data::ChatIntro data) {
 	const auto helloChosen = [=](not_null<DocumentData*> sticker) {
 		setHelloChosen(sticker);
 	};
-	owned->overrideMedia(std::make_unique<HistoryView::MediaInBubble>(
+	owned->overrideMedia(std::make_unique<HistoryView::MediaGeneric>(
 		owned.get(),
 		GenerateChatIntro(owned.get(), _item.get(), data, helloChosen),
-		HistoryView::MediaInBubbleDescriptor{
+		HistoryView::MediaGenericDescriptor{
 			.maxWidth = st::chatIntroWidth,
 			.service = true,
 			.hideServiceText = true,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
index 041b1c256..310af8fa6 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
@@ -13,765 +13,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/stickers_dice_pack.h"
 #include "countries/countries_instance.h"
 #include "data/data_channel.h"
-#include "data/data_document.h"
 #include "data/data_media_types.h"
+#include "history/view/media/history_view_media_generic.h"
+#include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
-#include "history/view/history_view_element.h"
-#include "history/view/history_view_cursor_state.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "ui/chat/chat_style.h"
-#include "ui/chat/message_bubble.h"
-#include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h"
-#include "ui/widgets/tooltip.h"
-#include "ui/dynamic_image.h"
-#include "ui/dynamic_thumbnails.h"
-#include "ui/painter.h"
-#include "ui/round_rect.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
-namespace {
-
-constexpr auto kAdditionalPrizesWithLineOpacity = 0.6;
-
-[[nodiscard]] QSize CountOptimalTextSize(
-		const Ui::Text::String &text,
-		int minWidth,
-		int maxWidth) {
-	if (text.maxWidth() <= maxWidth) {
-		return { text.maxWidth(), text.minHeight() };
-	}
-	const auto height = text.countHeight(maxWidth);
-	return { Ui::FindNiceTooltipWidth(minWidth, maxWidth, [&](int width) {
-		return text.countHeight(width);
-	}), height };
-}
-
-} // namespace
-
-TextState MediaInBubble::Part::textState(
-		QPoint point,
-		StateRequest request,
-		int outerWidth) const {
-	return {};
-}
-
-void MediaInBubble::Part::clickHandlerPressedChanged(
-	const ClickHandlerPtr &p,
-	bool pressed) {
-}
-
-bool MediaInBubble::Part::hasHeavyPart() {
-	return false;
-}
-
-void MediaInBubble::Part::unloadHeavyPart() {
-}
-
-auto MediaInBubble::Part::stickerTakePlayer(
-	not_null<DocumentData*> data,
-	const Lottie::ColorReplacements *replacements
-) -> std::unique_ptr<StickerPlayer> {
-	return nullptr;
-}
-
-MediaInBubble::MediaInBubble(
-	not_null<Element*> parent,
-	Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate,
-	MediaInBubbleDescriptor &&descriptor)
-: Media(parent)
-, _maxWidthCap(descriptor.maxWidth)
-, _service(descriptor.service)
-, _hideServiceText(descriptor.hideServiceText) {
-	generate([&](std::unique_ptr<Part> part) {
-		_entries.push_back({
-			.object = std::move(part),
-		});
-	});
-}
-
-MediaInBubble::~MediaInBubble() {
-	if (hasHeavyPart()) {
-		unloadHeavyPart();
-		_parent->checkHeavyPart();
-	}
-}
-
-QSize MediaInBubble::countOptimalSize() {
-	const auto maxWidth = _maxWidthCap
-		? _maxWidthCap
-		: st::chatGiveawayWidth;
-
-	auto top = 0;
-	for (auto &entry : _entries) {
-		const auto raw = entry.object.get();
-		raw->initDimensions();
-		top += raw->resizeGetHeight(maxWidth);
-	}
-	return { maxWidth, top };
-}
-
-QSize MediaInBubble::countCurrentSize(int newWidth) {
-	return { maxWidth(), minHeight() };
-}
-
-void MediaInBubble::draw(Painter &p, const PaintContext &context) const {
-	const auto outer = width();
-	if (outer < st::msgPadding.left() + st::msgPadding.right() + 1) {
-		return;
-	} else if (_service) {
-		PainterHighQualityEnabler hq(p);
-		const auto radius = st::msgServiceGiftBoxRadius;
-		p.setPen(Qt::NoPen);
-		p.setBrush(context.st->msgServiceBg());
-		p.drawRoundedRect(QRect(0, 0, width(), height()), radius, radius);
-	}
-
-	auto translated = 0;
-	for (const auto &entry : _entries) {
-		const auto raw = entry.object.get();
-		const auto height = raw->height();
-		raw->draw(p, this, context, outer);
-		translated += height;
-		p.translate(0, height);
-	}
-	p.translate(0, -translated);
-}
-
-TextState MediaInBubble::textState(
-		QPoint point,
-		StateRequest request) const {
-	auto result = TextState(_parent);
-
-	const auto outer = width();
-	if (outer < st::msgPadding.left() + st::msgPadding.right() + 1) {
-		return result;
-	}
-
-	for (const auto &entry : _entries) {
-		const auto raw = entry.object.get();
-		const auto height = raw->height();
-		if (point.y() >= 0 && point.y() < height) {
-			const auto part = raw->textState(point, request, outer);
-			result.link = part.link;
-			return result;
-		}
-		point.setY(point.y() - height);
-	}
-	return result;
-}
-
-void MediaInBubble::clickHandlerActiveChanged(
-		const ClickHandlerPtr &p,
-		bool active) {
-}
-
-void MediaInBubble::clickHandlerPressedChanged(
-		const ClickHandlerPtr &p,
-		bool pressed) {
-	for (const auto &entry : _entries) {
-		entry.object->clickHandlerPressedChanged(p, pressed);
-	}
-}
-
-
-std::unique_ptr<StickerPlayer> MediaInBubble::stickerTakePlayer(
-		not_null<DocumentData*> data,
-		const Lottie::ColorReplacements *replacements) {
-	for (const auto &entry : _entries) {
-		if (auto result = entry.object->stickerTakePlayer(
-				data,
-				replacements)) {
-			return result;
-		}
-	}
-	return nullptr;
-}
-
-bool MediaInBubble::hideFromName() const {
-	return !parent()->data()->Has<HistoryMessageForwarded>();
-}
-
-bool MediaInBubble::hideServiceText() const {
-	return _hideServiceText;
-}
-
-bool MediaInBubble::hasHeavyPart() const {
-	for (const auto &entry : _entries) {
-		if (entry.object->hasHeavyPart()) {
-			return true;
-		}
-	}
-	return false;
-}
-
-void MediaInBubble::unloadHeavyPart() {
-	for (const auto &entry : _entries) {
-		entry.object->unloadHeavyPart();
-	}
-}
-
-QMargins MediaInBubble::inBubblePadding() const {
-	auto lshift = st::msgPadding.left();
-	auto rshift = st::msgPadding.right();
-	auto bshift = isBubbleBottom() ? st::msgPadding.top() : st::mediaInBubbleSkip;
-	auto tshift = isBubbleTop() ? st::msgPadding.bottom() : st::mediaInBubbleSkip;
-	return QMargins(lshift, tshift, rshift, bshift);
-}
-
-TextMediaInBubblePart::TextMediaInBubblePart(
-	TextWithEntities text,
-	QMargins margins,
-	const base::flat_map<uint16, ClickHandlerPtr> &links)
-: _text(st::msgMinWidth)
-, _margins(margins) {
-	_text.setMarkedText(st::defaultTextStyle, text);
-	for (const auto &[index, link] : links) {
-		_text.setLink(index, link);
-	}
-}
-
-void TextMediaInBubblePart::draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const {
-	const auto service = owner->service();
-	p.setPen(service
-		? context.st->msgServiceFg()
-		: context.messageStyle()->historyTextFg);
-	_text.draw(p, {
-		.position = { (outerWidth - width()) / 2, _margins.top() },
-		.outerWidth = outerWidth,
-		.availableWidth = width(),
-		.align = style::al_top,
-		.palette = &(service
-			? context.st->serviceTextPalette()
-			: context.messageStyle()->textPalette),
-		.now = context.now,
-	});
-}
-
-TextState TextMediaInBubblePart::textState(
-		QPoint point,
-		StateRequest request,
-		int outerWidth) const {
-	point -= QPoint{ (outerWidth - width()) / 2, _margins.top() };
-	auto result = TextState();
-	auto forText = request.forText();
-	forText.align = style::al_top;
-	result.link = _text.getState(point, width(), forText).link;
-	return result;
-}
-
-QSize TextMediaInBubblePart::countOptimalSize() {
-	return {
-		_margins.left() + _text.maxWidth() + _margins.right(),
-		_margins.top() + _text.minHeight() + _margins.bottom(),
-	};
-}
-
-QSize TextMediaInBubblePart::countCurrentSize(int newWidth) {
-	auto skip = _margins.left() + _margins.right();
-	const auto size = CountOptimalTextSize(
-		_text,
-		st::msgMinWidth,
-		newWidth - skip);
-	return {
-		size.width() + skip,
-		_margins.top() + size.height() + _margins.bottom(),
-	};
-}
-
-TextDelimeterPart::TextDelimeterPart(
-	const QString &text,
-	QMargins margins)
-: _margins(margins) {
-	_text.setText(st::defaultTextStyle, text);
-}
-
-void TextDelimeterPart::draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const {
-	const auto stm = context.messageStyle();
-	const auto available = outerWidth - _margins.left() - _margins.right();
-	p.setPen(stm->msgDateFg);
-	_text.draw(p, {
-		.position = { _margins.left(), _margins.top() },
-		.outerWidth = outerWidth,
-		.availableWidth = available,
-		.align = style::al_top,
-		.palette = &stm->textPalette,
-		.now = context.now,
-		.elisionLines = 1,
-	});
-	const auto skip = st::chatGiveawayPrizesWithSkip;
-	const auto inner = available - 2 * skip;
-	const auto sub = _text.maxWidth();
-	if (inner > sub + 1) {
-		const auto fill = (inner - sub) / 2;
-		const auto stroke = st::lineWidth;
-		const auto top = _margins.top()
-			+ st::chatGiveawayPrizesWithLineTop;
-		p.setOpacity(kAdditionalPrizesWithLineOpacity);
-		p.fillRect(_margins.left(), top, fill, stroke, stm->msgDateFg);
-		const auto start = outerWidth - _margins.right() - fill;
-		p.fillRect(start, top, fill, stroke, stm->msgDateFg);
-		p.setOpacity(1.);
-	}
-}
-
-QSize TextDelimeterPart::countOptimalSize() {
-	return {
-		_margins.left() + _text.maxWidth() + _margins.right(),
-		_margins.top() + st::normalFont->height + _margins.bottom(),
-	};
-}
-
-QSize TextDelimeterPart::countCurrentSize(int newWidth) {
-	return { newWidth, minHeight() };
-}
-
-StickerInBubblePart::StickerInBubblePart(
-	not_null<Element*> parent,
-	Element *replacing,
-	Fn<Data()> lookup,
-	QMargins padding)
-: _parent(parent)
-, _lookup(std::move(lookup))
-, _padding(padding) {
-	ensureCreated(replacing);
-}
-
-void StickerInBubblePart::draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const {
-	ensureCreated();
-	if (_sticker) {
-		const auto stickerSize = _sticker->countOptimalSize();
-		const auto sticker = QRect(
-			(outerWidth - stickerSize.width()) / 2,
-			_padding.top() + _skipTop,
-			stickerSize.width(),
-			stickerSize.height());
-		_sticker->draw(p, context, sticker);
-	}
-}
-
-TextState StickerInBubblePart::textState(
-		QPoint point,
-		StateRequest request,
-		int outerWidth) const {
-	auto result = TextState(_parent);
-	if (_sticker) {
-		const auto stickerSize = _sticker->countOptimalSize();
-		const auto sticker = QRect(
-			(outerWidth - stickerSize.width()) / 2,
-			_padding.top() + _skipTop,
-			stickerSize.width(),
-			stickerSize.height());
-		if (sticker.contains(point)) {
-			result.link = _link;
-		}
-	}
-	return result;
-}
-
-bool StickerInBubblePart::hasHeavyPart() {
-	return _sticker && _sticker->hasHeavyPart();
-}
-
-void StickerInBubblePart::unloadHeavyPart() {
-	if (_sticker) {
-		_sticker->unloadHeavyPart();
-	}
-}
-
-std::unique_ptr<StickerPlayer> StickerInBubblePart::stickerTakePlayer(
-		not_null<DocumentData*> data,
-		const Lottie::ColorReplacements *replacements) {
-	return _sticker
-		? _sticker->stickerTakePlayer(data, replacements)
-		: nullptr;
-}
-
-QSize StickerInBubblePart::countOptimalSize() {
-	ensureCreated();
-	const auto size = _sticker ? _sticker->countOptimalSize() : [&] {
-		const auto fallback = _lookup().size;
-		return QSize{ fallback, fallback };
-	}();
-	return {
-		_padding.left() + size.width() + _padding.right(),
-		_padding.top() + size.height() + _padding.bottom(),
-	};
-}
-
-QSize StickerInBubblePart::countCurrentSize(int newWidth) {
-	return { newWidth, minHeight() };
-}
-
-void StickerInBubblePart::ensureCreated(Element *replacing) const {
-	if (_sticker) {
-		return;
-	} else if (const auto data = _lookup()) {
-		const auto sticker = data.sticker;
-		if (const auto info = sticker->sticker()) {
-			const auto skipPremiumEffect = true;
-			_link = data.link;
-			_skipTop = data.skipTop;
-			_sticker.emplace(_parent, sticker, skipPremiumEffect, replacing);
-			if (data.singleTimePlayback) {
-				_sticker->setDiceIndex(info->alt, 1);
-			}
-			_sticker->initSize(data.size);
-			_sticker->setCustomCachingTag(data.cacheTag);
-		}
-	}
-}
-
-StickerWithBadgePart::StickerWithBadgePart(
-	not_null<Element*> parent,
-	Element *replacing,
-	Fn<Data()> lookup,
-	QMargins padding,
-	QString badge)
-: _sticker(parent, replacing, std::move(lookup), padding)
-, _badgeText(badge) {
-}
-
-void StickerWithBadgePart::draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const {
-	_sticker.draw(p, owner, context, outerWidth);
-	if (_sticker.resolved()) {
-		paintBadge(p, context);
-	}
-}
-
-TextState StickerWithBadgePart::textState(
-		QPoint point,
-		StateRequest request,
-		int outerWidth) const {
-	return _sticker.textState(point, request, outerWidth);
-}
-
-bool StickerWithBadgePart::hasHeavyPart() {
-	return _sticker.hasHeavyPart();
-}
-
-void StickerWithBadgePart::unloadHeavyPart() {
-	_sticker.unloadHeavyPart();
-}
-
-std::unique_ptr<StickerPlayer> StickerWithBadgePart::stickerTakePlayer(
-		not_null<DocumentData*> data,
-		const Lottie::ColorReplacements *replacements) {
-	return _sticker.stickerTakePlayer(data, replacements);
-}
-
-QSize StickerWithBadgePart::countOptimalSize() {
-	_sticker.initDimensions();
-	return { _sticker.maxWidth(), _sticker.minHeight() };
-}
-
-QSize StickerWithBadgePart::countCurrentSize(int newWidth) {
-	return _sticker.countCurrentSize(newWidth);
-}
-
-void StickerWithBadgePart::paintBadge(
-		Painter &p,
-		const PaintContext &context) const {
-	validateBadge(context);
-
-	const auto badge = _badge.size() / _badge.devicePixelRatio();
-	const auto left = (width() - badge.width()) / 2;
-	const auto top = st::chatGiveawayBadgeTop;
-	const auto rect = QRect(left, top, badge.width(), badge.height());
-	const auto paintContent = [&](QPainter &q) {
-		q.drawImage(rect.topLeft(), _badge);
-	};
-
-	{
-		auto hq = PainterHighQualityEnabler(p);
-		p.setPen(Qt::NoPen);
-		p.setBrush(context.messageStyle()->msgFileBg);
-		const auto half = st::chatGiveawayBadgeStroke / 2.;
-		const auto inner = QRectF(rect).marginsRemoved(
-			{ half, half, half, half });
-		const auto radius = inner.height() / 2.;
-		p.drawRoundedRect(inner, radius, radius);
-	}
-
-	if (!_sticker.parent()->usesBubblePattern(context)) {
-		paintContent(p);
-	} else {
-		Ui::PaintPatternBubblePart(
-			p,
-			context.viewport,
-			context.bubblesPattern->pixmap,
-			rect,
-			paintContent,
-			_badgeCache);
-	}
-}
-
-void StickerWithBadgePart::validateBadge(
-		const PaintContext &context) const {
-	const auto stm = context.messageStyle();
-	const auto &badgeFg = stm->historyFileRadialFg->c;
-	const auto &badgeBorder = stm->msgBg->c;
-	if (!_badge.isNull()
-		&& _badgeFg == badgeFg
-		&& _badgeBorder == badgeBorder) {
-		return;
-	}
-	const auto &font = st::chatGiveawayBadgeFont;
-	_badgeFg = badgeFg;
-	_badgeBorder = badgeBorder;
-	const auto width = font->width(_badgeText);
-	const auto inner = QRect(0, 0, width, font->height);
-	const auto rect = inner.marginsAdded(st::chatGiveawayBadgePadding);
-	const auto size = rect.size();
-	const auto ratio = style::DevicePixelRatio();
-	_badge = QImage(size * ratio, QImage::Format_ARGB32_Premultiplied);
-	_badge.setDevicePixelRatio(ratio);
-	_badge.fill(Qt::transparent);
-
-	auto p = QPainter(&_badge);
-	auto hq = PainterHighQualityEnabler(p);
-	p.setPen(QPen(_badgeBorder, st::chatGiveawayBadgeStroke * 1.));
-	p.setBrush(Qt::NoBrush);
-	const auto half = st::chatGiveawayBadgeStroke / 2.;
-	const auto smaller = QRectF(
-		rect.translated(-rect.topLeft())
-	).marginsRemoved({ half, half, half, half });
-	const auto radius = smaller.height() / 2.;
-	p.drawRoundedRect(smaller, radius, radius);
-	p.setPen(_badgeFg);
-	p.setFont(font);
-	p.drawText(
-		st::chatGiveawayBadgePadding.left(),
-		st::chatGiveawayBadgePadding.top() + font->ascent,
-		_badgeText);
-}
-
-PeerBubbleListPart::PeerBubbleListPart(
-	not_null<Element*> parent,
-	const std::vector<not_null<PeerData*>> &list)
-: _parent(parent) {
-	for (const auto &peer : list) {
-		_peers.push_back({
-			.name = Ui::Text::String(
-				st::semiboldTextStyle,
-				peer->name(),
-				kDefaultTextOptions,
-				st::msgMinWidth),
-			.thumbnail = Ui::MakeUserpicThumbnail(peer),
-			.link = peer->openLink(),
-			.colorIndex = peer->colorIndex(),
-		});
-	}
-}
-
-PeerBubbleListPart::~PeerBubbleListPart() = default;
-
-void PeerBubbleListPart::draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const {
-	if (_peers.empty()) {
-		return;
-	}
-
-	const auto size = _peers[0].geometry.height();
-	const auto st = context.st;
-	const auto stm = context.messageStyle();
-	const auto selected = context.selected();
-	const auto padding = st::chatGiveawayPeerPadding;
-	for (const auto &peer : _peers) {
-		const auto &thumbnail = peer.thumbnail;
-		const auto &geometry = peer.geometry;
-		if (!_subscribed) {
-			thumbnail->subscribeToUpdates([=] { _parent->repaint(); });
-		}
-
-		const auto colorIndex = peer.colorIndex;
-		const auto cache = context.outbg
-			? stm->replyCache[st->colorPatternIndex(colorIndex)].get()
-			: st->coloredReplyCache(selected, colorIndex).get();
-		if (peer.corners[0].isNull() || peer.bg != cache->bg) {
-			peer.bg = cache->bg;
-			peer.corners = Images::CornersMask(size / 2);
-			for (auto &image : peer.corners) {
-				style::colorizeImage(image, cache->bg, &image);
-			}
-		}
-		p.setPen(cache->icon);
-		Ui::DrawRoundedRect(p, geometry, peer.bg, peer.corners);
-		if (peer.ripple) {
-			peer.ripple->paint(
-				p,
-				geometry.x(),
-				geometry.y(),
-				width(),
-				&cache->bg);
-			if (peer.ripple->empty()) {
-				peer.ripple = nullptr;
-			}
-		}
-
-		p.drawImage(geometry.topLeft(), thumbnail->image(size));
-		const auto left = size + padding.left();
-		const auto top = padding.top();
-		const auto available = geometry.width() - left - padding.right();
-		peer.name.draw(p, {
-			.position = { geometry.left() + left, geometry.top() + top },
-			.outerWidth = width(),
-			.availableWidth = available,
-			.align = style::al_left,
-			.palette = &stm->textPalette,
-			.now = context.now,
-			.elisionLines = 1,
-			.elisionBreakEverywhere = true,
-		});
-	}
-	_subscribed = true;
-}
-
-int PeerBubbleListPart::layout(int x, int y, int available) {
-	const auto size = st::chatGiveawayPeerSize;
-	const auto skip = st::chatGiveawayPeerSkip;
-	const auto padding = st::chatGiveawayPeerPadding;
-	auto left = available;
-	const auto shiftRow = [&](int i, int top, int shift) {
-		for (auto j = i; j != 0; --j) {
-			auto &geometry = _peers[j - 1].geometry;
-			if (geometry.top() != top) {
-				break;
-			}
-			geometry.moveLeft(geometry.x() + shift);
-		}
-	};
-	const auto count = int(_peers.size());
-	for (auto i = 0; i != count; ++i) {
-		const auto desired = size
-			+ padding.left()
-			+ _peers[i].name.maxWidth()
-			+ padding.right();
-		const auto width = std::min(desired, available);
-		if (left < width) {
-			shiftRow(i, y, (left + skip) / 2);
-			left = available;
-			y += size + skip;
-		}
-		_peers[i].geometry = { x + available - left, y, width, size };
-		left -= width + skip;
-	}
-	shiftRow(count, y, (left + skip) / 2);
-	return y + size + skip;
-}
-
-TextState PeerBubbleListPart::textState(
-		QPoint point,
-		StateRequest request,
-		int outerWidth) const {
-	auto result = TextState(_parent);
-	for (const auto &peer : _peers) {
-		if (peer.geometry.contains(point)) {
-			result.link = peer.link;
-			_lastPoint = point;
-			break;
-		}
-	}
-	return result;
-}
-
-void PeerBubbleListPart::clickHandlerPressedChanged(
-		const ClickHandlerPtr &p,
-		bool pressed) {
-	for (auto &peer : _peers) {
-		if (peer.link != p) {
-			continue;
-		}
-		if (pressed) {
-			if (!peer.ripple) {
-				peer.ripple = std::make_unique<Ui::RippleAnimation>(
-				st::defaultRippleAnimation,
-				Ui::RippleAnimation::RoundRectMask(
-					peer.geometry.size(),
-					peer.geometry.height() / 2),
-					[=] { _parent->repaint(); });
-			}
-			peer.ripple->add(_lastPoint - peer.geometry.topLeft());
-		} else if (peer.ripple) {
-			peer.ripple->lastStop();
-		}
-		break;
-	}
-}
-
-bool PeerBubbleListPart::hasHeavyPart() {
-	return _subscribed;
-}
-
-void PeerBubbleListPart::unloadHeavyPart() {
-	if (_subscribed) {
-		_subscribed = false;
-		for (const auto &peer : _peers) {
-			peer.thumbnail->subscribeToUpdates(nullptr);
-		}
-	}
-}
-
-QSize PeerBubbleListPart::countOptimalSize() {
-	if (_peers.empty()) {
-		return {};
-	}
-	const auto size = st::chatGiveawayPeerSize;
-	const auto skip = st::chatGiveawayPeerSkip;
-	const auto padding = st::chatGiveawayPeerPadding;
-	auto left = st::msgPadding.left();
-	for (const auto &peer : _peers) {
-		const auto desired = size
-			+ padding.left()
-			+ peer.name.maxWidth()
-			+ padding.right();
-		left += desired + skip;
-	}
-	return { left - skip + st::msgPadding.right(), size };
-}
-
-QSize PeerBubbleListPart::countCurrentSize(int newWidth) {
-	if (_peers.empty()) {
-		return {};
-	}
-	const auto padding = st::msgPadding;
-	const auto available = newWidth - padding.left() - padding.right();
-	const auto channelsBottom = layout(
-		padding.left(),
-		0,
-		available);
-	return { newWidth, channelsBottom };
-}
 
 auto GenerateGiveawayStart(
 	not_null<Element*> parent,
 	not_null<Data::GiveawayStart*> data)
--> Fn<void(Fn<void(std::unique_ptr<MediaInBubble::Part>)>)> {
-	return [=](Fn<void(std::unique_ptr<MediaInBubble::Part>)> push) {
+-> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
 		const auto months = data->months;
 		const auto quantity = data->quantity;
 
@@ -799,7 +58,7 @@ auto GenerateGiveawayStart(
 				TextWithEntities text,
 				QMargins margins = {},
 				const base::flat_map<uint16, ClickHandlerPtr> &links = {}) {
-			push(std::make_unique<TextMediaInBubblePart>(
+			push(std::make_unique<MediaGenericTextPart>(
 				std::move(text),
 				margins,
 				links));
@@ -907,8 +166,8 @@ auto GenerateGiveawayStart(
 auto GenerateGiveawayResults(
 	not_null<Element*> parent,
 	not_null<Data::GiveawayResults*> data)
--> Fn<void(Fn<void(std::unique_ptr<MediaInBubble::Part>)>)> {
-	return [=](Fn<void(std::unique_ptr<MediaInBubble::Part>)> push) {
+-> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
 		const auto quantity = data->winnersCount;
 
 		using Data = StickerWithBadgePart::Data;
@@ -936,7 +195,7 @@ auto GenerateGiveawayResults(
 				TextWithEntities text,
 				QMargins margins = {},
 				const base::flat_map<uint16, ClickHandlerPtr> &links = {}) {
-			push(std::make_unique<TextMediaInBubblePart>(
+			push(std::make_unique<MediaGenericTextPart>(
 				std::move(text),
 				margins,
 				links));
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
index 2efe86d59..23f223bd2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
@@ -7,314 +7,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "history/view/media/history_view_media.h"
-#include "history/view/media/history_view_sticker.h"
-
 namespace Data {
 struct GiveawayStart;
 struct GiveawayResults;
 } // namespace Data
 
-namespace Ui {
-class DynamicImage;
-class RippleAnimation;
-} // namespace Ui
-
 namespace HistoryView {
 
-struct MediaInBubbleDescriptor {
-	int maxWidth = 0;
-	bool service = false;
-	bool hideServiceText = false;
-};
-
-class MediaInBubble final : public Media {
-public:
-	class Part : public Object {
-	public:
-		virtual ~Part() = default;
-
-		virtual void draw(
-			Painter &p,
-			not_null<const MediaInBubble*> owner,
-			const PaintContext &context,
-			int outerWidth) const = 0;
-		[[nodiscard]] virtual TextState textState(
-			QPoint point,
-			StateRequest request,
-			int outerWidth) const;
-		virtual void clickHandlerPressedChanged(
-			const ClickHandlerPtr &p,
-			bool pressed);
-		[[nodiscard]] virtual bool hasHeavyPart();
-		virtual void unloadHeavyPart();
-		[[nodiscard]] virtual auto stickerTakePlayer(
-			not_null<DocumentData*> data,
-			const Lottie::ColorReplacements *replacements
-		) -> std::unique_ptr<StickerPlayer>;
-	};
-
-	MediaInBubble(
-		not_null<Element*> parent,
-		Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate,
-		MediaInBubbleDescriptor &&descriptor = {});
-	~MediaInBubble();
-
-	[[nodiscard]] bool service() const {
-		return _service;
-	}
-
-	void draw(Painter &p, const PaintContext &context) const override;
-	TextState textState(QPoint point, StateRequest request) const override;
-
-	void clickHandlerActiveChanged(
-		const ClickHandlerPtr &p,
-		bool active) override;
-	void clickHandlerPressedChanged(
-		const ClickHandlerPtr &p,
-		bool pressed) override;
-
-	bool needsBubble() const override {
-		return !_service;
-	}
-	bool customInfoLayout() const override {
-		return false;
-	}
-
-	std::unique_ptr<StickerPlayer> stickerTakePlayer(
-		not_null<DocumentData*> data,
-		const Lottie::ColorReplacements *replacements) override;
-
-	bool toggleSelectionByHandlerClick(
-		const ClickHandlerPtr &p) const override {
-		return true;
-	}
-	bool dragItemByHandler(const ClickHandlerPtr &p) const override {
-		return true;
-	}
-
-	bool hideFromName() const override;
-	bool hideServiceText() const override;
-
-	void unloadHeavyPart() override;
-	bool hasHeavyPart() const override;
-
-private:
-	struct Entry {
-		std::unique_ptr<Part> object;
-	};
-
-	QSize countOptimalSize() override;
-	QSize countCurrentSize(int newWidth) override;
-
-	[[nodiscard]] QMargins inBubblePadding() const;
-
-	std::vector<Entry> _entries;
-	int _maxWidthCap = 0;
-	bool _service : 1 = false;
-	bool _hideServiceText : 1 = false;
-
-};
-
-class TextMediaInBubblePart final : public MediaInBubble::Part {
-public:
-	TextMediaInBubblePart(
-		TextWithEntities text,
-		QMargins margins,
-		const base::flat_map<uint16, ClickHandlerPtr> &links = {});
-
-	void draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const override;
-	TextState textState(
-		QPoint point,
-		StateRequest request,
-		int outerWidth) const override;
-
-	QSize countOptimalSize() override;
-	QSize countCurrentSize(int newWidth) override;
-
-private:
-	Ui::Text::String _text;
-	QMargins _margins;
-
-};
-
-class TextDelimeterPart final : public MediaInBubble::Part {
-public:
-	TextDelimeterPart(const QString &text, QMargins margins);
-
-	void draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const override;
-
-	QSize countOptimalSize() override;
-	QSize countCurrentSize(int newWidth) override;
-
-private:
-	Ui::Text::String _text;
-	QMargins _margins;
-
-};
-
-class StickerInBubblePart final : public MediaInBubble::Part {
-public:
-	struct Data {
-		DocumentData *sticker = nullptr;
-		int skipTop = 0;
-		int size = 0;
-		ChatHelpers::StickerLottieSize cacheTag = {};
-		bool singleTimePlayback = false;
-		ClickHandlerPtr link;
-
-		explicit operator bool() const {
-			return sticker != nullptr;
-		}
-	};
-	StickerInBubblePart(
-		not_null<Element*> parent,
-		Element *replacing,
-		Fn<Data()> lookup,
-		QMargins padding);
-
-	[[nodiscard]] not_null<Element*> parent() const {
-		return _parent;
-	}
-	[[nodiscard]] bool resolved() const {
-		return _sticker.has_value();
-	}
-
-	void draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const override;
-	TextState textState(
-		QPoint point,
-		StateRequest request,
-		int outerWidth) const override;
-	bool hasHeavyPart() override;
-	void unloadHeavyPart() override;
-
-	QSize countOptimalSize() override;
-	QSize countCurrentSize(int newWidth) override;
-
-	std::unique_ptr<StickerPlayer> stickerTakePlayer(
-		not_null<DocumentData*> data,
-		const Lottie::ColorReplacements *replacements) override;
-
-private:
-	void ensureCreated(Element *replacing = nullptr) const;
-
-	const not_null<Element*> _parent;
-	Fn<Data()> _lookup;
-	mutable int _skipTop = 0;
-	mutable QMargins _padding;
-	mutable std::optional<Sticker> _sticker;
-	mutable ClickHandlerPtr _link;
-
-};
-
-class StickerWithBadgePart final : public MediaInBubble::Part {
-public:
-	using Data = StickerInBubblePart::Data;
-	StickerWithBadgePart(
-		not_null<Element*> parent,
-		Element *replacing,
-		Fn<Data()> lookup,
-		QMargins padding,
-		QString badge);
-
-	void draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const override;
-	TextState textState(
-		QPoint point,
-		StateRequest request,
-		int outerWidth) const override;
-	bool hasHeavyPart() override;
-	void unloadHeavyPart() override;
-
-	QSize countOptimalSize() override;
-	QSize countCurrentSize(int newWidth) override;
-
-	std::unique_ptr<StickerPlayer> stickerTakePlayer(
-		not_null<DocumentData*> data,
-		const Lottie::ColorReplacements *replacements) override;
-
-private:
-	void validateBadge(const PaintContext &context) const;
-	void paintBadge(Painter &p, const PaintContext &context) const;
-
-	StickerInBubblePart _sticker;
-	QString _badgeText;
-	mutable QColor _badgeFg;
-	mutable QColor _badgeBorder;
-	mutable QImage _badge;
-	mutable QImage _badgeCache;
-
-};
-
-class PeerBubbleListPart final : public MediaInBubble::Part {
-public:
-	PeerBubbleListPart(
-		not_null<Element*> parent,
-		const std::vector<not_null<PeerData*>> &list);
-	~PeerBubbleListPart();
-
-	void draw(
-		Painter &p,
-		not_null<const MediaInBubble*> owner,
-		const PaintContext &context,
-		int outerWidth) const override;
-	TextState textState(
-		QPoint point,
-		StateRequest request,
-		int outerWidth) const override;
-	void clickHandlerPressedChanged(
-		const ClickHandlerPtr &p,
-		bool pressed) override;
-	bool hasHeavyPart() override;
-	void unloadHeavyPart() override;
-
-	QSize countOptimalSize() override;
-	QSize countCurrentSize(int newWidth) override;
-
-private:
-	int layout(int x, int y, int available);
-
-	struct Peer {
-		Ui::Text::String name;
-		std::shared_ptr<Ui::DynamicImage> thumbnail;
-		QRect geometry;
-		ClickHandlerPtr link;
-		mutable std::unique_ptr<Ui::RippleAnimation> ripple;
-		mutable std::array<QImage, 4> corners;
-		mutable QColor bg;
-		uint8 colorIndex = 0;
-	};
-
-	const not_null<Element*> _parent;
-	std::vector<Peer> _peers;
-	mutable QPoint _lastPoint;
-	mutable bool _subscribed = false;
-
-};
+class Element;
+class MediaGenericPart;
 
 [[nodiscard]] auto GenerateGiveawayStart(
 	not_null<Element*> parent,
 	not_null<Data::GiveawayStart*> data)
--> Fn<void(Fn<void(std::unique_ptr<MediaInBubble::Part>)>)>;
+-> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
 
 [[nodiscard]] auto GenerateGiveawayResults(
 	not_null<Element*> parent,
 	not_null<Data::GiveawayResults*> data)
--> Fn<void(Fn<void(std::unique_ptr<MediaInBubble::Part>)>)>;
+-> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
new file mode 100644
index 000000000..98c3616a8
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
@@ -0,0 +1,760 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_media_generic.h"
+
+#include "data/data_document.h"
+#include "data/data_peer.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "history/view/history_view_element.h"
+#include "history/view/history_view_cursor_state.h"
+#include "ui/chat/chat_style.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/painter.h"
+#include "ui/round_rect.h"
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+namespace {
+
+constexpr auto kAdditionalPrizesWithLineOpacity = 0.6;
+
+[[nodiscard]] QSize CountOptimalTextSize(
+		const Ui::Text::String &text,
+		int minWidth,
+		int maxWidth) {
+	if (text.maxWidth() <= maxWidth) {
+		return { text.maxWidth(), text.minHeight() };
+	}
+	const auto height = text.countHeight(maxWidth);
+	return { Ui::FindNiceTooltipWidth(minWidth, maxWidth, [&](int width) {
+		return text.countHeight(width);
+	}), height };
+}
+
+} // namespace
+
+TextState MediaGenericPart::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	return {};
+}
+
+void MediaGenericPart::clickHandlerPressedChanged(
+	const ClickHandlerPtr &p,
+	bool pressed) {
+}
+
+bool MediaGenericPart::hasHeavyPart() {
+	return false;
+}
+
+void MediaGenericPart::unloadHeavyPart() {
+}
+
+auto MediaGenericPart::stickerTakePlayer(
+	not_null<DocumentData*> data,
+	const Lottie::ColorReplacements *replacements
+) -> std::unique_ptr<StickerPlayer> {
+	return nullptr;
+}
+
+MediaGeneric::MediaGeneric(
+	not_null<Element*> parent,
+	Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate,
+	MediaGenericDescriptor &&descriptor)
+: Media(parent)
+, _maxWidthCap(descriptor.maxWidth)
+, _service(descriptor.service)
+, _hideServiceText(descriptor.hideServiceText) {
+	generate([&](std::unique_ptr<Part> part) {
+		_entries.push_back({
+			.object = std::move(part),
+		});
+	});
+}
+
+MediaGeneric::~MediaGeneric() {
+	if (hasHeavyPart()) {
+		unloadHeavyPart();
+		_parent->checkHeavyPart();
+	}
+}
+
+QSize MediaGeneric::countOptimalSize() {
+	const auto maxWidth = _maxWidthCap
+		? _maxWidthCap
+		: st::chatGiveawayWidth;
+
+	auto top = 0;
+	for (auto &entry : _entries) {
+		const auto raw = entry.object.get();
+		raw->initDimensions();
+		top += raw->resizeGetHeight(maxWidth);
+	}
+	return { maxWidth, top };
+}
+
+QSize MediaGeneric::countCurrentSize(int newWidth) {
+	return { maxWidth(), minHeight() };
+}
+
+void MediaGeneric::draw(Painter &p, const PaintContext &context) const {
+	const auto outer = width();
+	if (outer < st::msgPadding.left() + st::msgPadding.right() + 1) {
+		return;
+	} else if (_service) {
+		PainterHighQualityEnabler hq(p);
+		const auto radius = st::msgServiceGiftBoxRadius;
+		p.setPen(Qt::NoPen);
+		p.setBrush(context.st->msgServiceBg());
+		p.drawRoundedRect(QRect(0, 0, width(), height()), radius, radius);
+	}
+
+	auto translated = 0;
+	for (const auto &entry : _entries) {
+		const auto raw = entry.object.get();
+		const auto height = raw->height();
+		raw->draw(p, this, context, outer);
+		translated += height;
+		p.translate(0, height);
+	}
+	p.translate(0, -translated);
+}
+
+TextState MediaGeneric::textState(
+		QPoint point,
+		StateRequest request) const {
+	auto result = TextState(_parent);
+
+	const auto outer = width();
+	if (outer < st::msgPadding.left() + st::msgPadding.right() + 1) {
+		return result;
+	}
+
+	for (const auto &entry : _entries) {
+		const auto raw = entry.object.get();
+		const auto height = raw->height();
+		if (point.y() >= 0 && point.y() < height) {
+			const auto part = raw->textState(point, request, outer);
+			result.link = part.link;
+			return result;
+		}
+		point.setY(point.y() - height);
+	}
+	return result;
+}
+
+void MediaGeneric::clickHandlerActiveChanged(
+		const ClickHandlerPtr &p,
+		bool active) {
+}
+
+void MediaGeneric::clickHandlerPressedChanged(
+		const ClickHandlerPtr &p,
+		bool pressed) {
+	for (const auto &entry : _entries) {
+		entry.object->clickHandlerPressedChanged(p, pressed);
+	}
+}
+
+std::unique_ptr<StickerPlayer> MediaGeneric::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	for (const auto &entry : _entries) {
+		if (auto result = entry.object->stickerTakePlayer(
+				data,
+				replacements)) {
+			return result;
+		}
+	}
+	return nullptr;
+}
+
+bool MediaGeneric::hideFromName() const {
+	return !parent()->data()->Has<HistoryMessageForwarded>();
+}
+
+bool MediaGeneric::hideServiceText() const {
+	return _hideServiceText;
+}
+
+bool MediaGeneric::hasHeavyPart() const {
+	for (const auto &entry : _entries) {
+		if (entry.object->hasHeavyPart()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void MediaGeneric::unloadHeavyPart() {
+	for (const auto &entry : _entries) {
+		entry.object->unloadHeavyPart();
+	}
+}
+
+QMargins MediaGeneric::inBubblePadding() const {
+	auto lshift = st::msgPadding.left();
+	auto rshift = st::msgPadding.right();
+	auto bshift = isBubbleBottom()
+		? st::msgPadding.top()
+		: st::mediaInBubbleSkip;
+	auto tshift = isBubbleTop()
+		? st::msgPadding.bottom()
+		: st::mediaInBubbleSkip;
+	return QMargins(lshift, tshift, rshift, bshift);
+}
+
+MediaGenericTextPart::MediaGenericTextPart(
+	TextWithEntities text,
+	QMargins margins,
+	const base::flat_map<uint16, ClickHandlerPtr> &links)
+: _text(st::msgMinWidth)
+, _margins(margins) {
+	_text.setMarkedText(st::defaultTextStyle, text);
+	for (const auto &[index, link] : links) {
+		_text.setLink(index, link);
+	}
+}
+
+void MediaGenericTextPart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	const auto service = owner->service();
+	p.setPen(service
+		? context.st->msgServiceFg()
+		: context.messageStyle()->historyTextFg);
+	_text.draw(p, {
+		.position = { (outerWidth - width()) / 2, _margins.top() },
+		.outerWidth = outerWidth,
+		.availableWidth = width(),
+		.align = style::al_top,
+		.palette = &(service
+			? context.st->serviceTextPalette()
+			: context.messageStyle()->textPalette),
+		.now = context.now,
+	});
+}
+
+TextState MediaGenericTextPart::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	point -= QPoint{ (outerWidth - width()) / 2, _margins.top() };
+	auto result = TextState();
+	auto forText = request.forText();
+	forText.align = style::al_top;
+	result.link = _text.getState(point, width(), forText).link;
+	return result;
+}
+
+QSize MediaGenericTextPart::countOptimalSize() {
+	return {
+		_margins.left() + _text.maxWidth() + _margins.right(),
+		_margins.top() + _text.minHeight() + _margins.bottom(),
+	};
+}
+
+QSize MediaGenericTextPart::countCurrentSize(int newWidth) {
+	auto skip = _margins.left() + _margins.right();
+	const auto size = CountOptimalTextSize(
+		_text,
+		st::msgMinWidth,
+		newWidth - skip);
+	return {
+		size.width() + skip,
+		_margins.top() + size.height() + _margins.bottom(),
+	};
+}
+
+TextDelimeterPart::TextDelimeterPart(
+	const QString &text,
+	QMargins margins)
+: _margins(margins) {
+	_text.setText(st::defaultTextStyle, text);
+}
+
+void TextDelimeterPart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	const auto stm = context.messageStyle();
+	const auto available = outerWidth - _margins.left() - _margins.right();
+	p.setPen(stm->msgDateFg);
+	_text.draw(p, {
+		.position = { _margins.left(), _margins.top() },
+		.outerWidth = outerWidth,
+		.availableWidth = available,
+		.align = style::al_top,
+		.palette = &stm->textPalette,
+		.now = context.now,
+		.elisionLines = 1,
+	});
+	const auto skip = st::chatGiveawayPrizesWithSkip;
+	const auto inner = available - 2 * skip;
+	const auto sub = _text.maxWidth();
+	if (inner > sub + 1) {
+		const auto fill = (inner - sub) / 2;
+		const auto stroke = st::lineWidth;
+		const auto top = _margins.top()
+			+ st::chatGiveawayPrizesWithLineTop;
+		p.setOpacity(kAdditionalPrizesWithLineOpacity);
+		p.fillRect(_margins.left(), top, fill, stroke, stm->msgDateFg);
+		const auto start = outerWidth - _margins.right() - fill;
+		p.fillRect(start, top, fill, stroke, stm->msgDateFg);
+		p.setOpacity(1.);
+	}
+}
+
+QSize TextDelimeterPart::countOptimalSize() {
+	return {
+		_margins.left() + _text.maxWidth() + _margins.right(),
+		_margins.top() + st::normalFont->height + _margins.bottom(),
+	};
+}
+
+QSize TextDelimeterPart::countCurrentSize(int newWidth) {
+	return { newWidth, minHeight() };
+}
+
+StickerInBubblePart::StickerInBubblePart(
+	not_null<Element*> parent,
+	Element *replacing,
+	Fn<Data()> lookup,
+	QMargins padding)
+: _parent(parent)
+, _lookup(std::move(lookup))
+, _padding(padding) {
+	ensureCreated(replacing);
+}
+
+void StickerInBubblePart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	ensureCreated();
+	if (_sticker) {
+		const auto stickerSize = _sticker->countOptimalSize();
+		const auto sticker = QRect(
+			(outerWidth - stickerSize.width()) / 2,
+			_padding.top() + _skipTop,
+			stickerSize.width(),
+			stickerSize.height());
+		_sticker->draw(p, context, sticker);
+	}
+}
+
+TextState StickerInBubblePart::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	auto result = TextState(_parent);
+	if (_sticker) {
+		const auto stickerSize = _sticker->countOptimalSize();
+		const auto sticker = QRect(
+			(outerWidth - stickerSize.width()) / 2,
+			_padding.top() + _skipTop,
+			stickerSize.width(),
+			stickerSize.height());
+		if (sticker.contains(point)) {
+			result.link = _link;
+		}
+	}
+	return result;
+}
+
+bool StickerInBubblePart::hasHeavyPart() {
+	return _sticker && _sticker->hasHeavyPart();
+}
+
+void StickerInBubblePart::unloadHeavyPart() {
+	if (_sticker) {
+		_sticker->unloadHeavyPart();
+	}
+}
+
+std::unique_ptr<StickerPlayer> StickerInBubblePart::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	return _sticker
+		? _sticker->stickerTakePlayer(data, replacements)
+		: nullptr;
+}
+
+QSize StickerInBubblePart::countOptimalSize() {
+	ensureCreated();
+	const auto size = _sticker ? _sticker->countOptimalSize() : [&] {
+		const auto fallback = _lookup().size;
+		return QSize{ fallback, fallback };
+	}();
+	return {
+		_padding.left() + size.width() + _padding.right(),
+		_padding.top() + size.height() + _padding.bottom(),
+	};
+}
+
+QSize StickerInBubblePart::countCurrentSize(int newWidth) {
+	return { newWidth, minHeight() };
+}
+
+void StickerInBubblePart::ensureCreated(Element *replacing) const {
+	if (_sticker) {
+		return;
+	} else if (const auto data = _lookup()) {
+		const auto sticker = data.sticker;
+		if (const auto info = sticker->sticker()) {
+			const auto skipPremiumEffect = true;
+			_link = data.link;
+			_skipTop = data.skipTop;
+			_sticker.emplace(_parent, sticker, skipPremiumEffect, replacing);
+			if (data.singleTimePlayback) {
+				_sticker->setDiceIndex(info->alt, 1);
+			}
+			_sticker->initSize(data.size);
+			_sticker->setCustomCachingTag(data.cacheTag);
+		}
+	}
+}
+
+StickerWithBadgePart::StickerWithBadgePart(
+	not_null<Element*> parent,
+	Element *replacing,
+	Fn<Data()> lookup,
+	QMargins padding,
+	QString badge)
+: _sticker(parent, replacing, std::move(lookup), padding)
+, _badgeText(badge) {
+}
+
+void StickerWithBadgePart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	_sticker.draw(p, owner, context, outerWidth);
+	if (_sticker.resolved()) {
+		paintBadge(p, context);
+	}
+}
+
+TextState StickerWithBadgePart::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	return _sticker.textState(point, request, outerWidth);
+}
+
+bool StickerWithBadgePart::hasHeavyPart() {
+	return _sticker.hasHeavyPart();
+}
+
+void StickerWithBadgePart::unloadHeavyPart() {
+	_sticker.unloadHeavyPart();
+}
+
+std::unique_ptr<StickerPlayer> StickerWithBadgePart::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	return _sticker.stickerTakePlayer(data, replacements);
+}
+
+QSize StickerWithBadgePart::countOptimalSize() {
+	_sticker.initDimensions();
+	return { _sticker.maxWidth(), _sticker.minHeight() };
+}
+
+QSize StickerWithBadgePart::countCurrentSize(int newWidth) {
+	return _sticker.countCurrentSize(newWidth);
+}
+
+void StickerWithBadgePart::paintBadge(
+		Painter &p,
+		const PaintContext &context) const {
+	validateBadge(context);
+
+	const auto badge = _badge.size() / _badge.devicePixelRatio();
+	const auto left = (width() - badge.width()) / 2;
+	const auto top = st::chatGiveawayBadgeTop;
+	const auto rect = QRect(left, top, badge.width(), badge.height());
+	const auto paintContent = [&](QPainter &q) {
+		q.drawImage(rect.topLeft(), _badge);
+	};
+
+	{
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(context.messageStyle()->msgFileBg);
+		const auto half = st::chatGiveawayBadgeStroke / 2.;
+		const auto inner = QRectF(rect).marginsRemoved(
+			{ half, half, half, half });
+		const auto radius = inner.height() / 2.;
+		p.drawRoundedRect(inner, radius, radius);
+	}
+
+	if (!_sticker.parent()->usesBubblePattern(context)) {
+		paintContent(p);
+	} else {
+		Ui::PaintPatternBubblePart(
+			p,
+			context.viewport,
+			context.bubblesPattern->pixmap,
+			rect,
+			paintContent,
+			_badgeCache);
+	}
+}
+
+void StickerWithBadgePart::validateBadge(
+		const PaintContext &context) const {
+	const auto stm = context.messageStyle();
+	const auto &badgeFg = stm->historyFileRadialFg->c;
+	const auto &badgeBorder = stm->msgBg->c;
+	if (!_badge.isNull()
+		&& _badgeFg == badgeFg
+		&& _badgeBorder == badgeBorder) {
+		return;
+	}
+	const auto &font = st::chatGiveawayBadgeFont;
+	_badgeFg = badgeFg;
+	_badgeBorder = badgeBorder;
+	const auto width = font->width(_badgeText);
+	const auto inner = QRect(0, 0, width, font->height);
+	const auto rect = inner.marginsAdded(st::chatGiveawayBadgePadding);
+	const auto size = rect.size();
+	const auto ratio = style::DevicePixelRatio();
+	_badge = QImage(size * ratio, QImage::Format_ARGB32_Premultiplied);
+	_badge.setDevicePixelRatio(ratio);
+	_badge.fill(Qt::transparent);
+
+	auto p = QPainter(&_badge);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(QPen(_badgeBorder, st::chatGiveawayBadgeStroke * 1.));
+	p.setBrush(Qt::NoBrush);
+	const auto half = st::chatGiveawayBadgeStroke / 2.;
+	const auto smaller = QRectF(
+		rect.translated(-rect.topLeft())
+	).marginsRemoved({ half, half, half, half });
+	const auto radius = smaller.height() / 2.;
+	p.drawRoundedRect(smaller, radius, radius);
+	p.setPen(_badgeFg);
+	p.setFont(font);
+	p.drawText(
+		st::chatGiveawayBadgePadding.left(),
+		st::chatGiveawayBadgePadding.top() + font->ascent,
+		_badgeText);
+}
+
+PeerBubbleListPart::PeerBubbleListPart(
+	not_null<Element*> parent,
+	const std::vector<not_null<PeerData*>> &list)
+: _parent(parent) {
+	for (const auto &peer : list) {
+		_peers.push_back({
+			.name = Ui::Text::String(
+				st::semiboldTextStyle,
+				peer->name(),
+				kDefaultTextOptions,
+				st::msgMinWidth),
+			.thumbnail = Ui::MakeUserpicThumbnail(peer),
+			.link = peer->openLink(),
+			.colorIndex = peer->colorIndex(),
+		});
+	}
+}
+
+PeerBubbleListPart::~PeerBubbleListPart() = default;
+
+void PeerBubbleListPart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	if (_peers.empty()) {
+		return;
+	}
+
+	const auto size = _peers[0].geometry.height();
+	const auto st = context.st;
+	const auto stm = context.messageStyle();
+	const auto selected = context.selected();
+	const auto padding = st::chatGiveawayPeerPadding;
+	for (const auto &peer : _peers) {
+		const auto &thumbnail = peer.thumbnail;
+		const auto &geometry = peer.geometry;
+		if (!_subscribed) {
+			thumbnail->subscribeToUpdates([=] { _parent->repaint(); });
+		}
+
+		const auto colorIndex = peer.colorIndex;
+		const auto cache = context.outbg
+			? stm->replyCache[st->colorPatternIndex(colorIndex)].get()
+			: st->coloredReplyCache(selected, colorIndex).get();
+		if (peer.corners[0].isNull() || peer.bg != cache->bg) {
+			peer.bg = cache->bg;
+			peer.corners = Images::CornersMask(size / 2);
+			for (auto &image : peer.corners) {
+				style::colorizeImage(image, cache->bg, &image);
+			}
+		}
+		p.setPen(cache->icon);
+		Ui::DrawRoundedRect(p, geometry, peer.bg, peer.corners);
+		if (peer.ripple) {
+			peer.ripple->paint(
+				p,
+				geometry.x(),
+				geometry.y(),
+				width(),
+				&cache->bg);
+			if (peer.ripple->empty()) {
+				peer.ripple = nullptr;
+			}
+		}
+
+		p.drawImage(geometry.topLeft(), thumbnail->image(size));
+		const auto left = size + padding.left();
+		const auto top = padding.top();
+		const auto available = geometry.width() - left - padding.right();
+		peer.name.draw(p, {
+			.position = { geometry.left() + left, geometry.top() + top },
+			.outerWidth = width(),
+			.availableWidth = available,
+			.align = style::al_left,
+			.palette = &stm->textPalette,
+			.now = context.now,
+			.elisionLines = 1,
+			.elisionBreakEverywhere = true,
+		});
+	}
+	_subscribed = true;
+}
+
+int PeerBubbleListPart::layout(int x, int y, int available) {
+	const auto size = st::chatGiveawayPeerSize;
+	const auto skip = st::chatGiveawayPeerSkip;
+	const auto padding = st::chatGiveawayPeerPadding;
+	auto left = available;
+	const auto shiftRow = [&](int i, int top, int shift) {
+		for (auto j = i; j != 0; --j) {
+			auto &geometry = _peers[j - 1].geometry;
+			if (geometry.top() != top) {
+				break;
+			}
+			geometry.moveLeft(geometry.x() + shift);
+		}
+	};
+	const auto count = int(_peers.size());
+	for (auto i = 0; i != count; ++i) {
+		const auto desired = size
+			+ padding.left()
+			+ _peers[i].name.maxWidth()
+			+ padding.right();
+		const auto width = std::min(desired, available);
+		if (left < width) {
+			shiftRow(i, y, (left + skip) / 2);
+			left = available;
+			y += size + skip;
+		}
+		_peers[i].geometry = { x + available - left, y, width, size };
+		left -= width + skip;
+	}
+	shiftRow(count, y, (left + skip) / 2);
+	return y + size + skip;
+}
+
+TextState PeerBubbleListPart::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	auto result = TextState(_parent);
+	for (const auto &peer : _peers) {
+		if (peer.geometry.contains(point)) {
+			result.link = peer.link;
+			_lastPoint = point;
+			break;
+		}
+	}
+	return result;
+}
+
+void PeerBubbleListPart::clickHandlerPressedChanged(
+		const ClickHandlerPtr &p,
+		bool pressed) {
+	for (auto &peer : _peers) {
+		if (peer.link != p) {
+			continue;
+		}
+		if (pressed) {
+			if (!peer.ripple) {
+				peer.ripple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				Ui::RippleAnimation::RoundRectMask(
+					peer.geometry.size(),
+					peer.geometry.height() / 2),
+					[=] { _parent->repaint(); });
+			}
+			peer.ripple->add(_lastPoint - peer.geometry.topLeft());
+		} else if (peer.ripple) {
+			peer.ripple->lastStop();
+		}
+		break;
+	}
+}
+
+bool PeerBubbleListPart::hasHeavyPart() {
+	return _subscribed;
+}
+
+void PeerBubbleListPart::unloadHeavyPart() {
+	if (_subscribed) {
+		_subscribed = false;
+		for (const auto &peer : _peers) {
+			peer.thumbnail->subscribeToUpdates(nullptr);
+		}
+	}
+}
+
+QSize PeerBubbleListPart::countOptimalSize() {
+	if (_peers.empty()) {
+		return {};
+	}
+	const auto size = st::chatGiveawayPeerSize;
+	const auto skip = st::chatGiveawayPeerSkip;
+	const auto padding = st::chatGiveawayPeerPadding;
+	auto left = st::msgPadding.left();
+	for (const auto &peer : _peers) {
+		const auto desired = size
+			+ padding.left()
+			+ peer.name.maxWidth()
+			+ padding.right();
+		left += desired + skip;
+	}
+	return { left - skip + st::msgPadding.right(), size };
+}
+
+QSize PeerBubbleListPart::countCurrentSize(int newWidth) {
+	if (_peers.empty()) {
+		return {};
+	}
+	const auto padding = st::msgPadding;
+	const auto available = newWidth - padding.left() - padding.right();
+	const auto channelsBottom = layout(
+		padding.left(),
+		0,
+		available);
+	return { newWidth, channelsBottom };
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_generic.h b/Telegram/SourceFiles/history/view/media/history_view_media_generic.h
new file mode 100644
index 000000000..0d16bf40d
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_generic.h
@@ -0,0 +1,309 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "history/view/media/history_view_media.h"
+#include "history/view/media/history_view_sticker.h"
+
+namespace Ui {
+class DynamicImage;
+class RippleAnimation;
+} // namespace Ui
+
+namespace HistoryView {
+
+class MediaGeneric;
+
+class MediaGenericPart : public Object {
+public:
+	virtual ~MediaGenericPart() = default;
+
+	virtual void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const = 0;
+	[[nodiscard]] virtual TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const;
+	virtual void clickHandlerPressedChanged(
+		const ClickHandlerPtr &p,
+		bool pressed);
+	[[nodiscard]] virtual bool hasHeavyPart();
+	virtual void unloadHeavyPart();
+	[[nodiscard]] virtual auto stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements
+	) -> std::unique_ptr<StickerPlayer>;
+};
+
+struct MediaGenericDescriptor {
+	int maxWidth = 0;
+	bool service = false;
+	bool hideServiceText = false;
+};
+
+class MediaGeneric final : public Media {
+public:
+	using Part = MediaGenericPart;
+
+	MediaGeneric(
+		not_null<Element*> parent,
+		Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate,
+		MediaGenericDescriptor &&descriptor = {});
+	~MediaGeneric();
+
+	[[nodiscard]] bool service() const {
+		return _service;
+	}
+
+	void draw(Painter &p, const PaintContext &context) const override;
+	TextState textState(QPoint point, StateRequest request) const override;
+
+	void clickHandlerActiveChanged(
+		const ClickHandlerPtr &p,
+		bool active) override;
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &p,
+		bool pressed) override;
+
+	bool needsBubble() const override {
+		return !_service;
+	}
+	bool customInfoLayout() const override {
+		return false;
+	}
+
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
+	bool toggleSelectionByHandlerClick(
+		const ClickHandlerPtr &p) const override {
+		return true;
+	}
+	bool dragItemByHandler(const ClickHandlerPtr &p) const override {
+		return true;
+	}
+
+	bool hideFromName() const override;
+	bool hideServiceText() const override;
+
+	void unloadHeavyPart() override;
+	bool hasHeavyPart() const override;
+
+private:
+	struct Entry {
+		std::unique_ptr<Part> object;
+	};
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+	[[nodiscard]] QMargins inBubblePadding() const;
+
+	std::vector<Entry> _entries;
+	int _maxWidthCap = 0;
+	bool _service : 1 = false;
+	bool _hideServiceText : 1 = false;
+
+};
+
+class MediaGenericTextPart final : public MediaGenericPart {
+public:
+	MediaGenericTextPart(
+		TextWithEntities text,
+		QMargins margins,
+		const base::flat_map<uint16, ClickHandlerPtr> &links = {});
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+private:
+	Ui::Text::String _text;
+	QMargins _margins;
+
+};
+
+class TextDelimeterPart final : public MediaGenericPart {
+public:
+	TextDelimeterPart(const QString &text, QMargins margins);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+private:
+	Ui::Text::String _text;
+	QMargins _margins;
+
+};
+
+class StickerInBubblePart final : public MediaGenericPart {
+public:
+	struct Data {
+		DocumentData *sticker = nullptr;
+		int skipTop = 0;
+		int size = 0;
+		ChatHelpers::StickerLottieSize cacheTag = {};
+		bool singleTimePlayback = false;
+		ClickHandlerPtr link;
+
+		explicit operator bool() const {
+			return sticker != nullptr;
+		}
+	};
+	StickerInBubblePart(
+		not_null<Element*> parent,
+		Element *replacing,
+		Fn<Data()> lookup,
+		QMargins padding);
+
+	[[nodiscard]] not_null<Element*> parent() const {
+		return _parent;
+	}
+	[[nodiscard]] bool resolved() const {
+		return _sticker.has_value();
+	}
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
+	bool hasHeavyPart() override;
+	void unloadHeavyPart() override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
+private:
+	void ensureCreated(Element *replacing = nullptr) const;
+
+	const not_null<Element*> _parent;
+	Fn<Data()> _lookup;
+	mutable int _skipTop = 0;
+	mutable QMargins _padding;
+	mutable std::optional<Sticker> _sticker;
+	mutable ClickHandlerPtr _link;
+
+};
+
+class StickerWithBadgePart final : public MediaGenericPart {
+public:
+	using Data = StickerInBubblePart::Data;
+	StickerWithBadgePart(
+		not_null<Element*> parent,
+		Element *replacing,
+		Fn<Data()> lookup,
+		QMargins padding,
+		QString badge);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
+	bool hasHeavyPart() override;
+	void unloadHeavyPart() override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
+private:
+	void validateBadge(const PaintContext &context) const;
+	void paintBadge(Painter &p, const PaintContext &context) const;
+
+	StickerInBubblePart _sticker;
+	QString _badgeText;
+	mutable QColor _badgeFg;
+	mutable QColor _badgeBorder;
+	mutable QImage _badge;
+	mutable QImage _badgeCache;
+
+};
+
+class PeerBubbleListPart final : public MediaGenericPart {
+public:
+	PeerBubbleListPart(
+		not_null<Element*> parent,
+		const std::vector<not_null<PeerData*>> &list);
+	~PeerBubbleListPart();
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &p,
+		bool pressed) override;
+	bool hasHeavyPart() override;
+	void unloadHeavyPart() override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+private:
+	int layout(int x, int y, int available);
+
+	struct Peer {
+		Ui::Text::String name;
+		std::shared_ptr<Ui::DynamicImage> thumbnail;
+		QRect geometry;
+		ClickHandlerPtr link;
+		mutable std::unique_ptr<Ui::RippleAnimation> ripple;
+		mutable std::array<QImage, 4> corners;
+		mutable QColor bg;
+		uint8 colorIndex = 0;
+	};
+
+	const not_null<Element*> _parent;
+	std::vector<Peer> _peers;
+	mutable QPoint _lastPoint;
+	mutable bool _subscribed = false;
+
+};
+
+} // namespace HistoryView

From 3a5b3ff3bd7ea2f58361d99e45b153a1566b54d8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Mar 2024 10:38:52 +0400
Subject: [PATCH 115/596] Show description about custom chat intro.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/history/history_item.cpp |  6 +++++
 Telegram/SourceFiles/history/history_item.h   |  1 +
 .../history/history_item_components.h         |  5 ++++
 .../history/view/history_view_about_view.cpp  | 24 ++++++++++++++++---
 .../view/history_view_service_message.cpp     |  2 ++
 .../view/media/history_view_media_generic.cpp |  4 ++++
 .../view/media/history_view_media_generic.h   |  1 +
 .../settings/settings_business.cpp            |  2 +-
 9 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 64d657908..02ba53c30 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1760,6 +1760,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_giveaway_results_none" = "No winners of the giveaway could be selected.";
 "lng_action_boost_apply#one" = "{from} boosted the group";
 "lng_action_boost_apply#other" = "{from} boosted the group {count} times";
+"lng_action_set_chat_intro" = "{from} added the message below for all empty chats. How?";
 
 "lng_similar_channels_title" = "Similar channels";
 "lng_similar_channels_view_all" = "View all";
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index cec1042d5..dc5ad0b86 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1549,6 +1549,11 @@ void HistoryItem::setRealShortcutId(BusinessShortcutId id) {
 	_shortcutId = id;
 }
 
+void HistoryItem::setCustomServiceLink(ClickHandlerPtr link) {
+	AddComponents(HistoryServiceCustomLink::Bit());
+	Get<HistoryServiceCustomLink>()->link = std::move(link);
+}
+
 void HistoryItem::destroy() {
 	_history->destroyMessage(this);
 }
@@ -4849,6 +4854,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		prepareGiveawayLaunch,
 		prepareGiveawayResults,
 		prepareBoostApply,
+		PrepareEmptyText<MTPDmessageActionRequestedPeerSentMe>,
 		PrepareErrorText<MTPDmessageActionEmpty>));
 
 	// Additional information.
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index d75182680..c8963b707 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -197,6 +197,7 @@ public:
 	[[nodiscard]] BusinessShortcutId shortcutId() const;
 	[[nodiscard]] bool isBusinessShortcut() const;
 	void setRealShortcutId(BusinessShortcutId id);
+	void setCustomServiceLink(ClickHandlerPtr link);
 
 	void addLogEntryOriginal(
 		WebPageId localId,
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 61b1d86f4..e35a804a2 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -629,6 +629,11 @@ struct HistoryServiceGiveawayResults
 , public HistoryServiceDependentData {
 };
 
+struct HistoryServiceCustomLink
+: public RuntimeComponent<HistoryServiceCustomLink, HistoryItem> {
+	ClickHandlerPtr link;
+};
+
 enum class HistorySelfDestructType {
 	Photo,
 	Video,
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index 9d1cb9ed2..18c692118 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_sending.h"
 #include "apiwrap.h"
 #include "base/random.h"
+#include "boxes/premium_preview_box.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "core/click_handler_types.h"
 #include "data/business/data_business_common.h"
@@ -28,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_reply_markup.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "settings/business/settings_chat_intro.h"
 #include "settings/settings_premium.h"
 #include "ui/chat/chat_style.h"
 #include "ui/text/text_utilities.h"
@@ -237,7 +239,7 @@ bool AboutView::refresh() {
 	const auto user = _history->peer->asUser();
 	const auto info = user ? user->botInfo.get() : nullptr;
 	if (!info) {
-		if (user && _history->isDisplayedEmpty()) {
+		if (user && !user->isSelf() && _history->isDisplayedEmpty()) {
 			if (_item) {
 				return false;
 			} else if (user->meRequiresPremiumToWrite()
@@ -269,13 +271,16 @@ void AboutView::makeIntro(not_null<UserData*> user) {
 }
 
 void AboutView::make(Data::ChatIntro data) {
+	const auto text = data
+		? tr::lng_action_set_chat_intro(tr::now, lt_from, _history->peer->name())
+		: QString();
 	const auto item = _history->makeMessage({
 		.id = _history->nextNonHistoryEntryId(),
 		.flags = (MessageFlag::FakeAboutView
 			| MessageFlag::FakeHistoryItem
 			| MessageFlag::Local),
 		.from = _history->peer->id,
-	}, PreparedServiceText{ { } });
+	}, PreparedServiceText{ { text }});
 
 	if (data.sticker) {
 		_helloChosen = nullptr;
@@ -287,13 +292,26 @@ void AboutView::make(Data::ChatIntro data) {
 	const auto helloChosen = [=](not_null<DocumentData*> sticker) {
 		setHelloChosen(sticker);
 	};
+	const auto handler = [=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto controller = my.sessionWindow.get()) {
+			if (controller->session().premium()) {
+				controller->showSettings(Settings::ChatIntroId());
+			} else {
+				ShowPremiumPreviewBox(
+					controller->uiShow(),
+					PremiumFeature::ChatIntro);
+			}
+		}
+	};
 	owned->overrideMedia(std::make_unique<HistoryView::MediaGeneric>(
 		owned.get(),
 		GenerateChatIntro(owned.get(), _item.get(), data, helloChosen),
 		HistoryView::MediaGenericDescriptor{
 			.maxWidth = st::chatIntroWidth,
+			.serviceLink = std::make_shared<LambdaClickHandler>(handler),
 			.service = true,
-			.hideServiceText = true,
+			.hideServiceText = text.isEmpty(),
 		}));
 	if (!data.sticker && _helloChosen) {
 		data.sticker = _helloChosen;
diff --git a/Telegram/SourceFiles/history/view/history_view_service_message.cpp b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
index ee07aa326..107bb9416 100644
--- a/Telegram/SourceFiles/history/view/history_view_service_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
@@ -677,6 +677,8 @@ TextState Service::textState(QPoint point, StateRequest request) const {
 				result.link = same->lnk;
 			} else if (const auto results = item->Get<HistoryServiceGiveawayResults>()) {
 				result.link = results->lnk;
+			} else if (const auto custom = item->Get<HistoryServiceCustomLink>()) {
+				result.link = custom->link;
 			} else if (media && data()->showSimilarChannels()) {
 				result = media->textState(mediaPoint, request);
 			}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
index 98c3616a8..97ab60180 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
@@ -80,6 +80,10 @@ MediaGeneric::MediaGeneric(
 			.object = std::move(part),
 		});
 	});
+	if (descriptor.serviceLink) {
+		parent->data()->setCustomServiceLink(
+			std::move(descriptor.serviceLink));
+	}
 }
 
 MediaGeneric::~MediaGeneric() {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_generic.h b/Telegram/SourceFiles/history/view/media/history_view_media_generic.h
index 0d16bf40d..bdc9f328f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_generic.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_generic.h
@@ -45,6 +45,7 @@ public:
 
 struct MediaGenericDescriptor {
 	int maxWidth = 0;
+	ClickHandlerPtr serviceLink;
 	bool service = false;
 	bool hideServiceText = false;
 };
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index 0e185869f..e6ae4de18 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -684,7 +684,7 @@ std::vector<PremiumFeature> BusinessFeaturesOrder(
 			return PremiumFeature::BusinessLocation;
 		} else if (s == u"business_bots"_q) {
 			return PremiumFeature::BusinessBots;
-		} else if (s == u"chat_intro"_q) {
+		} else if (s == u"business_intro"_q) {
 			return PremiumFeature::ChatIntro;
 		}
 		return PremiumFeature::kCount;

From fcc9e0b2dbc4c0b9371ac764837d62205949ebb0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Mar 2024 10:39:04 +0400
Subject: [PATCH 116/596] Update API scheme on layer 177.

---
 .../SourceFiles/api/api_chat_participants.cpp | 10 ++--
 Telegram/SourceFiles/api/api_user_privacy.cpp |  8 +++-
 Telegram/SourceFiles/api/api_user_privacy.h   |  1 +
 .../SourceFiles/boxes/add_contact_box.cpp     | 11 +++--
 .../boxes/peers/add_participants_box.cpp      | 35 ++++----------
 .../boxes/peers/add_participants_box.h        |  2 +-
 .../boxes/peers/edit_participants_box.cpp     |  5 +-
 .../SourceFiles/boxes/premium_preview_box.cpp |  2 +-
 Telegram/SourceFiles/data/data_histories.cpp  |  5 +-
 .../export/data/export_data_types.cpp         |  3 ++
 .../history/history_item_reply_markup.cpp     |  3 ++
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 46 ++++++++++++++++---
 12 files changed, 83 insertions(+), 48 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
index 1714d9e2b..7195ee990 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.cpp
+++ b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -498,8 +498,9 @@ void ChatParticipants::add(
 				chat->inputChat,
 				user->inputUser,
 				MTP_int(passGroupHistory ? kForwardMessagesOnAdd : 0)
-			)).done([=](const MTPUpdates &result) {
-				chat->session().api().applyUpdates(result);
+			)).done([=](const MTPmessages_InvitedUsers &result) {
+				const auto &data = result.data();
+				chat->session().api().applyUpdates(data.vupdates());
 				if (done) done(true);
 			}).fail([=](const MTP::Error &error) {
 				const auto type = error.type();
@@ -520,8 +521,9 @@ void ChatParticipants::add(
 			_api.request(MTPchannels_InviteToChannel(
 				channel->inputChannel,
 				MTP_vector<MTPInputUser>(list)
-			)).done([=](const MTPUpdates &result) {
-				channel->session().api().applyUpdates(result);
+			)).done([=](const MTPmessages_InvitedUsers &result) {
+				const auto &data = result.data();
+				channel->session().api().applyUpdates(data.vupdates());
 				requestCountDelayed(channel);
 				if (callback) callback(true);
 				ChatInviteForbidden(
diff --git a/Telegram/SourceFiles/api/api_user_privacy.cpp b/Telegram/SourceFiles/api/api_user_privacy.cpp
index edaae7c97..eaf6b8a08 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -84,6 +84,8 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 		case Option::Contacts: return MTP_inputPrivacyValueAllowContacts();
 		case Option::CloseFriends:
 			return MTP_inputPrivacyValueAllowCloseFriends();
+		case Option::ContactsAndPremium:
+			return MTP_inputPrivacyValueAllowPremium();
 		case Option::Nobody: return MTP_inputPrivacyValueDisallowAll();
 		}
 		Unexpected("Option value in Api::UserPrivacy::RulesToTL.");
@@ -101,7 +103,9 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 	auto result = UserPrivacy::Rule();
 	auto optionSet = false;
 	const auto setOption = [&](Option option) {
-		if (optionSet) return;
+		if (optionSet) {
+			return;
+		}
 		optionSet = true;
 		result.option = option;
 	};
@@ -114,6 +118,8 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 			setOption(Option::Contacts);
 		}, [&](const MTPDprivacyValueAllowCloseFriends &) {
 			setOption(Option::CloseFriends);
+		}, [&](const MTPDprivacyValueAllowPremium &) {
+			setOption(Option::ContactsAndPremium);
 		}, [&](const MTPDprivacyValueAllowUsers &data) {
 			const auto &users = data.vusers().v;
 			always.reserve(always.size() + users.size());
diff --git a/Telegram/SourceFiles/api/api_user_privacy.h b/Telegram/SourceFiles/api/api_user_privacy.h
index be8e452d9..4dc951f6a 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.h
+++ b/Telegram/SourceFiles/api/api_user_privacy.h
@@ -35,6 +35,7 @@ public:
 		Everyone,
 		Contacts,
 		CloseFriends,
+		ContactsAndPremium,
 		Nobody,
 	};
 	struct Rule {
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index d3715e884..fc4c29a91 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -66,11 +66,12 @@ void ChatCreateDone(
 		not_null<Window::SessionNavigation*> navigation,
 		QImage image,
 		TimeId ttlPeriod,
-		const MTPUpdates &updates,
+		const MTPmessages_InvitedUsers &result,
 		Fn<void(not_null<PeerData*>)> done) {
-	navigation->session().api().applyUpdates(updates);
+	const auto &data = result.data();
+	navigation->session().api().applyUpdates(data.vupdates());
 
-	const auto success = base::make_optional(&updates)
+	const auto success = base::make_optional(&data.vupdates())
 		| [](auto updates) -> std::optional<const QVector<MTPChat>*> {
 			switch (updates->type()) {
 			case mtpc_updates:
@@ -109,7 +110,7 @@ void ChatCreateDone(
 				ChatInviteForbidden(
 					show,
 					chat,
-					CollectForbiddenUsers(&chat->session(), updates));
+					CollectForbiddenUsers(&chat->session(), result));
 			}
 		};
 	if (!success) {
@@ -708,7 +709,7 @@ void GroupInfoBox::createGroup(
 		MTP_vector<TLUsers>(inputs),
 		MTP_string(title),
 		MTP_int(ttlPeriod())
-	)).done([=](const MTPUpdates &result) {
+	)).done([=](const MTPmessages_InvitedUsers &result) {
 		auto image = _photo->takeResultImage();
 		const auto period = ttlPeriod();
 		const auto navigation = _navigation;
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index d17213ffb..578bc77bc 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -561,33 +561,18 @@ void AddParticipantsBoxController::Start(
 
 std::vector<not_null<UserData*>> CollectForbiddenUsers(
 		not_null<Main::Session*> session,
-		const MTPUpdates &updates) {
+		const MTPmessages_InvitedUsers &result) {
+	const auto &data = result.data();
 	const auto owner = &session->data();
-	auto result = std::vector<not_null<UserData*>>();
-	const auto add = [&](const MTPUpdate &update) {
-		if (update.type() == mtpc_updateGroupInvitePrivacyForbidden) {
-			const auto user = owner->userLoaded(UserId(
-				update.c_updateGroupInvitePrivacyForbidden().vuser_id()));
-			if (user) {
-				result.push_back(user);
-			}
+	auto forbidden = std::vector<not_null<UserData*>>();
+	for (const auto &missing : data.vmissing_invitees().v) {
+		const auto user = owner->userLoaded(missing.data().vuser_id());
+		if (user) {
+			// #TODO invites
+			forbidden.push_back(user);
 		}
-	};
-	const auto collect = [&](const MTPVector<MTPUpdate> &updates) {
-		for (const auto &update : updates.v) {
-			add(update);
-		}
-	};
-	updates.match([&](const MTPDupdates &data) {
-		collect(data.vupdates());
-	}, [&](const MTPDupdatesCombined &data) {
-		collect(data.vupdates());
-	}, [&](const MTPDupdateShort &data) {
-		add(data.vupdate());
-	}, [](const auto &other) {
-		LOG(("Api Error: CollectForbiddenUsers for wrong updates type."));
-	});
-	return result;
+	}
+	return forbidden;
 }
 
 bool ChatInviteForbidden(
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.h b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
index c86c99687..8ac842cf1 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
@@ -75,7 +75,7 @@ private:
 
 [[nodiscard]] std::vector<not_null<UserData*>> CollectForbiddenUsers(
 	not_null<Main::Session*> session,
-	const MTPUpdates &updates);
+	const MTPmessages_InvitedUsers &result);
 bool ChatInviteForbidden(
 	std::shared_ptr<Ui::Show> show,
 	not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index ff5926608..a3faa5711 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -80,8 +80,9 @@ void AddChatParticipant(
 		chat->inputChat,
 		user->inputUser,
 		MTP_int(kForwardMessagesOnAdd)
-	)).done([=](const MTPUpdates &result) {
-		chat->session().api().applyUpdates(result);
+	)).done([=](const MTPmessages_InvitedUsers &result) {
+		const auto &data = result.data();
+		chat->session().api().applyUpdates(data.vupdates());
 		if (onDone) {
 			onDone();
 		}
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index dc977468c..81404959c 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -532,7 +532,7 @@ struct VideoPreviewDocument {
 		case PremiumFeature::GreetingMessage: return "greeting_message";
 		case PremiumFeature::AwayMessage: return "away_message";
 		case PremiumFeature::BusinessBots: return "business_bots";
-		case PremiumFeature::ChatIntro: return "chat_intro";
+		case PremiumFeature::ChatIntro: return "business_intro";
 		}
 		return "";
 	}();
diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index a43b2f680..26fb8b864 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -729,8 +729,9 @@ void Histories::deleteAllMessages(
 						chat->inputChat,
 						MTP_inputUserSelf(),
 						MTP_int(0)
-					)).done([=](const MTPUpdates &updates) {
-						session().api().applyUpdates(updates);
+					)).done([=](const MTPmessages_InvitedUsers &result) {
+						const auto &data = result.data();
+						session().api().applyUpdates(data.vupdates());
 						deleteAllMessages(
 							history,
 							deleteTillId,
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 1f56f9ec1..2e08b24f7 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -148,6 +148,7 @@ std::vector<std::vector<HistoryMessageMarkupButton>> ButtonRowsFromTL(
 					qs(data.vtext()),
 					data.vurl().v
 				});
+			}, [&](const MTPDinputKeyboardButtonRequestPeer &data) {
 			});
 		}
 		if (!row.empty()) {
@@ -1486,6 +1487,8 @@ ServiceAction ParseServiceAction(
 		auto content = ActionBoostApply();
 		content.boosts = data.vboosts().v;
 		result.content = content;
+	}, [&](const MTPDmessageActionRequestedPeerSentMe &data) {
+		// Should not be in user inbox.
 	}, [](const MTPDmessageActionEmpty &data) {});
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/history_item_reply_markup.cpp b/Telegram/SourceFiles/history/history_item_reply_markup.cpp
index 05af27179..a24058683 100644
--- a/Telegram/SourceFiles/history/history_item_reply_markup.cpp
+++ b/Telegram/SourceFiles/history/history_item_reply_markup.cpp
@@ -209,6 +209,9 @@ void HistoryMessageMarkupData::fillRows(
 						Type::SimpleWebView,
 						qs(data.vtext()),
 						data.vurl().v);
+				}, [&](const MTPDinputKeyboardButtonRequestPeer &data) {
+					LOG(("API Error: inputKeyboardButtonRequestPeer."));
+					// Should not get those for the users.
 				});
 			}
 			if (!row.empty()) {
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 50df28580..87d7a05c8 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -176,6 +176,7 @@ messageActionGiftCode#678c2e09 flags:# via_giveaway:flags.0?true unclaimed:flags
 messageActionGiveawayLaunch#332ba9ed = MessageAction;
 messageActionGiveawayResults#2a9fadc5 winners_count:int unclaimed_count:int = MessageAction;
 messageActionBoostApply#cc02aa6d boosts:int = MessageAction;
+messageActionRequestedPeerSentMe#93b31848 button_id:int peers:Vector<RequestedPeer> = MessageAction;
 
 dialog#d58a08c6 flags:# pinned:flags.2?true unread_mark:flags.3?true view_forum_as_messages:flags.6?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int unread_reactions_count:int notify_settings:PeerNotifySettings pts:flags.0?int draft:flags.1?DraftMessage folder_id:flags.4?int ttl_period:flags.5?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;
@@ -227,7 +228,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#ecdadceb flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday = UserFull;
+userFull#cc997720 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -388,7 +389,6 @@ updateChannelPinnedTopic#192efbe3 flags:# pinned:flags.0?true channel_id:long to
 updateChannelPinnedTopics#fe198602 flags:# channel_id:long order:flags.0?Vector<int> = Update;
 updateUser#20529438 user_id:long = Update;
 updateAutoSaveSettings#ec05b097 = Update;
-updateGroupInvitePrivacyForbidden#ccf08ad6 user_id:long = Update;
 updateStory#75b3b798 peer:Peer story:StoryItem = Update;
 updateReadStories#f74e932b peer:Peer max_id:int = Update;
 updateStoryID#1bf335b9 id:int random_id:long = Update;
@@ -540,6 +540,7 @@ inputPrivacyValueDisallowUsers#90110467 users:Vector<InputUser> = InputPrivacyRu
 inputPrivacyValueAllowChatParticipants#840649cf chats:Vector<long> = InputPrivacyRule;
 inputPrivacyValueDisallowChatParticipants#e94f0f86 chats:Vector<long> = InputPrivacyRule;
 inputPrivacyValueAllowCloseFriends#2f453e49 = InputPrivacyRule;
+inputPrivacyValueAllowPremium#77cdc9f1 = InputPrivacyRule;
 
 privacyValueAllowContacts#fffe1bac = PrivacyRule;
 privacyValueAllowAll#65427b82 = PrivacyRule;
@@ -550,6 +551,7 @@ privacyValueDisallowUsers#e4621141 users:Vector<long> = PrivacyRule;
 privacyValueAllowChatParticipants#6b134e8e chats:Vector<long> = PrivacyRule;
 privacyValueDisallowChatParticipants#41c87565 chats:Vector<long> = PrivacyRule;
 privacyValueAllowCloseFriends#f7e8d89b = PrivacyRule;
+privacyValueAllowPremium#ece9814b = PrivacyRule;
 
 account.privacyRules#50a04e45 rules:Vector<PrivacyRule> chats:Vector<Chat> users:Vector<User> = account.PrivacyRules;
 
@@ -637,6 +639,7 @@ keyboardButtonUserProfile#308660c1 text:string user_id:long = KeyboardButton;
 keyboardButtonWebView#13767230 text:string url:string = KeyboardButton;
 keyboardButtonSimpleWebView#a0c0505c text:string url:string = KeyboardButton;
 keyboardButtonRequestPeer#53d7bfd8 text:string button_id:int peer_type:RequestPeerType max_quantity:int = KeyboardButton;
+inputKeyboardButtonRequestPeer#c9662d05 flags:# name_requested:flags.0?true username_requested:flags.1?true photo_requested:flags.2?true text:string button_id:int peer_type:RequestPeerType max_quantity:int = KeyboardButton;
 
 keyboardButtonRow#77608b83 buttons:Vector<KeyboardButton> = KeyboardButtonRow;
 
@@ -921,7 +924,7 @@ phoneCallEmpty#5366c915 id:long = PhoneCall;
 phoneCallWaiting#c5226f17 flags:# video:flags.6?true id:long access_hash:long date:int admin_id:long participant_id:long protocol:PhoneCallProtocol receive_date:flags.0?int = PhoneCall;
 phoneCallRequested#14b0ed0c flags:# video:flags.6?true id:long access_hash:long date:int admin_id:long participant_id:long g_a_hash:bytes protocol:PhoneCallProtocol = PhoneCall;
 phoneCallAccepted#3660c311 flags:# video:flags.6?true id:long access_hash:long date:int admin_id:long participant_id:long g_b:bytes protocol:PhoneCallProtocol = PhoneCall;
-phoneCall#967f7c67 flags:# p2p_allowed:flags.5?true video:flags.6?true id:long access_hash:long date:int admin_id:long participant_id:long g_a_or_b:bytes key_fingerprint:long protocol:PhoneCallProtocol connections:Vector<PhoneConnection> start_date:int = PhoneCall;
+phoneCall#30535af5 flags:# p2p_allowed:flags.5?true video:flags.6?true id:long access_hash:long date:int admin_id:long participant_id:long g_a_or_b:bytes key_fingerprint:long protocol:PhoneCallProtocol connections:Vector<PhoneConnection> start_date:int custom_parameters:flags.7?DataJSON = PhoneCall;
 phoneCallDiscarded#50ca4de1 flags:# need_rating:flags.2?true need_debug:flags.3?true video:flags.6?true id:long reason:flags.0?PhoneCallDiscardReason duration:flags.1?int = PhoneCall;
 
 phoneConnection#9cc123c7 flags:# tcp:flags.0?true id:long ip:string ipv6:string port:int peer_tag:bytes = PhoneConnection;
@@ -1358,7 +1361,7 @@ account.resetPasswordFailedWait#e3779861 retry_date:int = account.ResetPasswordR
 account.resetPasswordRequestedWait#e9effc7d until_date:int = account.ResetPasswordResult;
 account.resetPasswordOk#e926d63e = account.ResetPasswordResult;
 
-sponsoredMessage#ed5383f7 flags:# recommended:flags.5?true show_peer_photo:flags.6?true random_id:bytes from_id:flags.3?Peer chat_invite:flags.4?ChatInvite chat_invite_hash:flags.4?string channel_post:flags.2?int start_param:flags.0?string webpage:flags.9?SponsoredWebPage app:flags.10?BotApp message:string entities:flags.1?Vector<MessageEntity> button_text:flags.11?string sponsor_info:flags.7?string additional_info:flags.8?string = SponsoredMessage;
+sponsoredMessage#ed5383f7 flags:# recommended:flags.5?true show_peer_photo:flags.6?true can_report:flags.12?true random_id:bytes from_id:flags.3?Peer chat_invite:flags.4?ChatInvite chat_invite_hash:flags.4?string channel_post:flags.2?int start_param:flags.0?string webpage:flags.9?SponsoredWebPage app:flags.10?BotApp message:string entities:flags.1?Vector<MessageEntity> button_text:flags.11?string sponsor_info:flags.7?string additional_info:flags.8?string = SponsoredMessage;
 
 messages.sponsoredMessages#c9ee1d87 flags:# posts_between:flags.0?int messages:Vector<SponsoredMessage> chats:Vector<Chat> users:Vector<User> = messages.SponsoredMessages;
 messages.sponsoredMessagesEmpty#1839490f = messages.SponsoredMessages;
@@ -1735,6 +1738,28 @@ contactBirthday#1d998733 contact_id:long birthday:Birthday = ContactBirthday;
 
 contacts.contactBirthdays#114ff30d contacts:Vector<ContactBirthday> users:Vector<User> = contacts.ContactBirthdays;
 
+missingInvitee#628c9224 flags:# premium_would_allow_invite:flags.0?true premium_required_for_pm:flags.1?true user_id:long = MissingInvitee;
+
+messages.invitedUsers#7f5defa6 updates:Updates missing_invitees:Vector<MissingInvitee> = messages.InvitedUsers;
+
+inputBusinessChatLink#11679fa7 flags:# message:string entities:flags.0?Vector<MessageEntity> title:flags.1?string = InputBusinessChatLink;
+
+businessChatLink#b4ae666f flags:# link:string message:string entities:flags.0?Vector<MessageEntity> title:flags.1?string views:int = BusinessChatLink;
+
+account.businessChatLinks#ec43a2d1 links:Vector<BusinessChatLink> chats:Vector<Chat> users:Vector<User> = account.BusinessChatLinks;
+
+account.resolvedBusinessChatLinks#9a23af21 flags:# peer:Peer message:string entities:flags.0?Vector<MessageEntity> chats:Vector<Chat> users:Vector<User> = account.ResolvedBusinessChatLinks;
+
+requestedPeerUser#d62ff46a flags:# user_id:long first_name:flags.0?string last_name:flags.0?string username:flags.1?string photo:flags.2?Photo = RequestedPeer;
+requestedPeerChat#7307544f flags:# chat_id:long title:flags.0?string photo:flags.2?Photo = RequestedPeer;
+requestedPeerChannel#8ba403e4 flags:# channel_id:long title:flags.0?string username:flags.1?string photo:flags.2?Photo = RequestedPeer;
+
+sponsoredMessageReportOption#430d3150 text:string option:bytes = SponsoredMessageReportOption;
+
+channels.sponsoredMessageReportResultChooseOption#846f9e42 title:string options:Vector<SponsoredMessageReportOption> = channels.SponsoredMessageReportResult;
+channels.sponsoredMessageReportResultAdsHidden#3e3bcf2f = channels.SponsoredMessageReportResult;
+channels.sponsoredMessageReportResultReported#ad798849 = channels.SponsoredMessageReportResult;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1872,6 +1897,12 @@ account.updateBusinessIntro#a614d034 flags:# intro:flags.0?InputBusinessIntro =
 account.toggleConnectedBotPaused#646e1097 peer:InputPeer paused:Bool = Bool;
 account.disablePeerConnectedBot#5e437ed9 peer:InputPeer = Bool;
 account.updateBirthday#cc6e0c11 flags:# birthday:flags.0?Birthday = Bool;
+account.createBusinessChatLink#8851e68e link:InputBusinessChatLink = BusinessChatLink;
+account.editBusinessChatLink#8c3410af slug:string link:InputBusinessChatLink = BusinessChatLink;
+account.deleteBusinessChatLink#60073674 slug:string = Bool;
+account.getBusinessChatLinks#6f70dde1 = account.BusinessChatLinks;
+account.resolveBusinessChatLink#5492e5ee slug:string = account.ResolvedBusinessChatLinks;
+account.updatePersonalChannel#d94305e0 channel:InputChannel = Bool;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#b60f5918 id:InputUser = users.UserFull;
@@ -1924,9 +1955,9 @@ messages.getChats#49e9528f id:Vector<long> = messages.Chats;
 messages.getFullChat#aeb00b34 chat_id:long = messages.ChatFull;
 messages.editChatTitle#73783ffd chat_id:long title:string = Updates;
 messages.editChatPhoto#35ddd674 chat_id:long photo:InputChatPhoto = Updates;
-messages.addChatUser#f24753e3 chat_id:long user_id:InputUser fwd_limit:int = Updates;
+messages.addChatUser#cbc6d107 chat_id:long user_id:InputUser fwd_limit:int = messages.InvitedUsers;
 messages.deleteChatUser#a2185cab flags:# revoke_history:flags.0?true chat_id:long user_id:InputUser = Updates;
-messages.createChat#34a818 flags:# users:Vector<InputUser> title:string ttl_period:flags.0?int = Updates;
+messages.createChat#92ceddd4 flags:# users:Vector<InputUser> title:string ttl_period:flags.0?int = messages.InvitedUsers;
 messages.getDhConfig#26cf8950 version:int random_length:int = messages.DhConfig;
 messages.requestEncryption#f64daf43 user_id:InputUser random_id:int g_a:bytes = EncryptedChat;
 messages.acceptEncryption#3dbc0415 peer:InputEncryptedChat g_b:bytes key_fingerprint:long = EncryptedChat;
@@ -2175,7 +2206,7 @@ channels.checkUsername#10e6bd2c channel:InputChannel username:string = Bool;
 channels.updateUsername#3514b3de channel:InputChannel username:string = Bool;
 channels.joinChannel#24b524c5 channel:InputChannel = Updates;
 channels.leaveChannel#f836aa95 channel:InputChannel = Updates;
-channels.inviteToChannel#199f3a6c channel:InputChannel users:Vector<InputUser> = Updates;
+channels.inviteToChannel#c9e33d54 channel:InputChannel users:Vector<InputUser> = messages.InvitedUsers;
 channels.deleteChannel#c0111fe3 channel:InputChannel = Updates;
 channels.exportMessageLink#e63fadeb flags:# grouped:flags.0?true thread:flags.1?true channel:InputChannel id:int = ExportedMessageLink;
 channels.toggleSignatures#1f69b606 channel:InputChannel enabled:Bool = Updates;
@@ -2221,6 +2252,7 @@ channels.getChannelRecommendations#83b70d97 channel:InputChannel = messages.Chat
 channels.updateEmojiStatus#f0d3e6a8 channel:InputChannel emoji_status:EmojiStatus = Updates;
 channels.setBoostsToUnblockRestrictions#ad399cee channel:InputChannel boosts:int = Updates;
 channels.setEmojiStickers#3cd930b7 channel:InputChannel stickerset:InputStickerSet = Bool;
+channels.reportSponsoredMessage#af8ff6b9 channel:InputChannel random_id:bytes option:bytes = channels.SponsoredMessageReportResult;
 
 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;

From 5e68dace9fd31160520d3238beb627fbabfbba22 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Mar 2024 11:59:48 +0400
Subject: [PATCH 117/596] Remove description in intro settings preview.

---
 .../SourceFiles/history/view/history_view_about_view.cpp | 9 ++++++---
 .../SourceFiles/history/view/history_view_about_view.h   | 2 +-
 .../settings/business/settings_chat_intro.cpp            | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index 18c692118..a748f962d 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -270,9 +270,12 @@ void AboutView::makeIntro(not_null<UserData*> user) {
 	make(user->businessDetails().intro);
 }
 
-void AboutView::make(Data::ChatIntro data) {
+void AboutView::make(Data::ChatIntro data, bool preview) {
 	const auto text = data
-		? tr::lng_action_set_chat_intro(tr::now, lt_from, _history->peer->name())
+		? tr::lng_action_set_chat_intro(
+			tr::now,
+			lt_from,
+			_history->peer->name())
 		: QString();
 	const auto item = _history->makeMessage({
 		.id = _history->nextNonHistoryEntryId(),
@@ -311,7 +314,7 @@ void AboutView::make(Data::ChatIntro data) {
 			.maxWidth = st::chatIntroWidth,
 			.serviceLink = std::make_shared<LambdaClickHandler>(handler),
 			.service = true,
-			.hideServiceText = text.isEmpty(),
+			.hideServiceText = preview || text.isEmpty(),
 		}));
 	if (!data.sticker && _helloChosen) {
 		data.sticker = _helloChosen;
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.h b/Telegram/SourceFiles/history/view/history_view_about_view.h
index 681b93e7f..c922157c9 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.h
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.h
@@ -28,7 +28,7 @@ public:
 
 	bool refresh();
 
-	void make(Data::ChatIntro data);
+	void make(Data::ChatIntro data, bool preview = false);
 
 	int top = 0;
 	int height = 0;
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 175538428..2d71d2a60 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -384,7 +384,7 @@ void PreviewWrap::prepare(rpl::producer<Data::ChatIntro> value) {
 		_delegate.get());
 
 	std::move(value) | rpl::start_with_next([=](Data::ChatIntro intro) {
-		_view->make(std::move(intro));
+		_view->make(std::move(intro), true);
 		if (width() >= st::msgMinWidth) {
 			resizeTo(width());
 		}

From 59663d66615c4b0b049216a7d435bccfa3975d16 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Mar 2024 12:41:28 +0400
Subject: [PATCH 118/596] Track birthdays, edit birthday privacy.

---
 Telegram/Resources/langs/lang.strings         | 18 +++++
 Telegram/SourceFiles/api/api_user_privacy.cpp |  3 +
 Telegram/SourceFiles/api/api_user_privacy.h   |  1 +
 .../SourceFiles/boxes/edit_privacy_box.cpp    |  1 +
 Telegram/SourceFiles/boxes/edit_privacy_box.h |  1 +
 Telegram/SourceFiles/data/data_birthday.cpp   | 69 ++++++++++++++++
 Telegram/SourceFiles/data/data_birthday.h     | 38 +++++++++
 Telegram/SourceFiles/data/data_changes.h      | 31 +++----
 Telegram/SourceFiles/data/data_user.cpp       | 25 ++++++
 Telegram/SourceFiles/data/data_user.h         | 12 ++-
 Telegram/SourceFiles/settings/settings.style  |  4 +
 .../settings/settings_privacy_controllers.cpp | 81 +++++++++++++++++--
 .../settings/settings_privacy_controllers.h   | 25 ++++++
 .../settings/settings_privacy_security.cpp    |  6 ++
 Telegram/cmake/td_ui.cmake                    |  2 +
 15 files changed, 293 insertions(+), 24 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_birthday.cpp
 create mode 100644 Telegram/SourceFiles/data/data_birthday.h

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 02ba53c30..ca78a2d9d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -652,6 +652,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_messages_privacy" = "Messages";
 "lng_settings_voices_privacy" = "Voice messages";
 "lng_settings_bio_privacy" = "Bio";
+"lng_settings_birthday_privacy" = "Date of Birth";
 "lng_settings_privacy_premium" = "Only subscribers of {link} can restrict receiving voice messages.";
 "lng_settings_privacy_premium_link" = "Telegram Premium";
 "lng_settings_passcode_disable" = "Disable Passcode";
@@ -664,6 +665,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_phone_label" = "Phone number";
 "lng_settings_username_add" = "Add username";
 "lng_settings_username_about" = "Username lets people contact you on Telegram without needing your phone number.";
+"lng_settings_birthday_label" = "Date of Birth";
+"lng_settings_birthday_add" = "Add";
+"lng_settings_birthday_about" = "Choose who can see your birthday in {link}.";
+"lng_settings_birthday_about_link" = "Settings";
+"lng_settings_birthday_contacts" = "Only your contacts can see your birthday. {link}";
+"lng_settings_birthday_contacts_link" = "Change >";
 "lng_settings_add_account_about" = "You can add up to four accounts with different phone numbers.";
 "lng_settings_peer_to_peer_about" = "Disabling peer-to-peer will relay all calls through Telegram servers to avoid revealing your IP address, but may slightly decrease audio quality.";
 "lng_settings_advanced" = "Advanced";
@@ -1087,6 +1094,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_privacy_everyone" = "Everybody";
 "lng_edit_privacy_contacts" = "My contacts";
 "lng_edit_privacy_close_friends" = "Close friends";
+"lng_edit_privacy_contacts_and_premium" = "Contacts and Premium";
 "lng_edit_privacy_nobody" = "Nobody";
 "lng_edit_privacy_premium" = "Premium users";
 "lng_edit_privacy_exceptions" = "Add exceptions";
@@ -1136,6 +1144,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_privacy_about_always_title" = "Always allow";
 "lng_edit_privacy_about_never_title" = "Never allow";
 
+"lng_edit_privacy_birthday_title" = "Date of birth privacy";
+"lng_edit_privacy_birthday_header" = "Who can see my date of birth";
+"lng_edit_privacy_birthday_always_empty" = "Always allow";
+"lng_edit_privacy_birthday_never_empty" = "Never allow";
+"lng_edit_privacy_birthday_exceptions" = "These users will or will not be able to see your date of birth regardless of the settings above.";
+"lng_edit_privacy_birthday_always_title" = "Always allow";
+"lng_edit_privacy_birthday_never_title" = "Never allow";
+"lng_edit_privacy_birthday_yet" = "You haven't entered your date of birth yet.\n{link}";
+"lng_edit_privacy_birthday_yet_link" = "Add my birthday >";
+
 "lng_edit_privacy_calls_title" = "Voice calls privacy";
 "lng_edit_privacy_calls_header" = "Who can call you";
 "lng_edit_privacy_calls_always_empty" = "Always allow";
diff --git a/Telegram/SourceFiles/api/api_user_privacy.cpp b/Telegram/SourceFiles/api/api_user_privacy.cpp
index eaf6b8a08..ce9dc91f9 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -194,6 +194,7 @@ MTPInputPrivacyKey KeyToTL(UserPrivacy::Key key) {
 	case Key::ProfilePhoto: return MTP_inputPrivacyKeyProfilePhoto();
 	case Key::Voices: return MTP_inputPrivacyKeyVoiceMessages();
 	case Key::About: return MTP_inputPrivacyKeyAbout();
+	case Key::Birthday: return MTP_inputPrivacyKeyBirthday();
 	}
 	Unexpected("Key in Api::UserPrivacy::KetToTL.");
 }
@@ -221,6 +222,8 @@ std::optional<UserPrivacy::Key> TLToKey(mtpTypeId type) {
 	case mtpc_inputPrivacyKeyVoiceMessages: return Key::Voices;
 	case mtpc_privacyKeyAbout:
 	case mtpc_inputPrivacyKeyAbout: return Key::About;
+	case mtpc_privacyKeyBirthday:
+	case mtpc_inputPrivacyKeyBirthday: return Key::Birthday;
 	}
 	return std::nullopt;
 }
diff --git a/Telegram/SourceFiles/api/api_user_privacy.h b/Telegram/SourceFiles/api/api_user_privacy.h
index 4dc951f6a..884000fb7 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.h
+++ b/Telegram/SourceFiles/api/api_user_privacy.h
@@ -30,6 +30,7 @@ public:
 		ProfilePhoto,
 		Voices,
 		About,
+		Birthday,
 	};
 	enum class Option {
 		Everyone,
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 367742971..cd472746e 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -374,6 +374,7 @@ void EditPrivacyBox::setupContent() {
 	};
 
 	auto above = _controller->setupAboveWidget(
+		_window,
 		content,
 		rpl::duplicate(optionValue),
 		getDelegate()->outerContainer());
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.h b/Telegram/SourceFiles/boxes/edit_privacy_box.h
index cfdc14ad7..da8bc98cf 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.h
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.h
@@ -62,6 +62,7 @@ public:
 	}
 
 	[[nodiscard]] virtual object_ptr<Ui::RpWidget> setupAboveWidget(
+			not_null<Window::SessionController*> controller,
 			not_null<QWidget*> parent,
 			rpl::producer<Option> option,
 			not_null<QWidget*> outerContainer) {
diff --git a/Telegram/SourceFiles/data/data_birthday.cpp b/Telegram/SourceFiles/data/data_birthday.cpp
new file mode 100644
index 000000000..4b9df693f
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_birthday.cpp
@@ -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
+*/
+#include "data/data_birthday.h"
+
+namespace Data {
+namespace {
+
+[[nodiscard]] bool Validate(int day, int month, int year) {
+	if (year != 0 && (year < 1900 || year > 2100)) {
+		return false;
+	} else if (day < 1) {
+		return false;
+	} else if (month == 2) {
+		if (day == 29) {
+			return !year
+				|| (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0));
+		}
+		return day <= 28;
+	} else if (month == 4 || month == 6 || month == 9 || month == 11) {
+		return day <= 30;
+	} else if (month > 0 && month <= 12) {
+		return day <= 31;
+	}
+	return false;
+}
+
+[[nodiscard]] int Serialize(int day, int month, int year) {
+	return day + month * 100 + year * 10000;
+}
+
+} // namespace
+
+Birthday::Birthday() = default;
+
+Birthday::Birthday(int day, int month, int year)
+: _value(Validate(day, month, year) ? Serialize(day, month, year) : 0) {
+}
+
+Birthday Birthday::FromSerialized(int value) {
+	return Birthday(value % 100, (value / 100) % 100, value / 10000);
+}
+
+int Birthday::serialize() const {
+	return _value;
+}
+
+bool Birthday::valid() const {
+	return _value != 0;
+}
+
+int Birthday::day() const {
+	return _value % 100;
+}
+
+int Birthday::month() const {
+	return (_value / 100) % 100;
+}
+
+int Birthday::year() const {
+	return _value / 10000;
+}
+
+} // namespace Data
+
diff --git a/Telegram/SourceFiles/data/data_birthday.h b/Telegram/SourceFiles/data/data_birthday.h
new file mode 100644
index 000000000..13a5e4cfe
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_birthday.h
@@ -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
+*/
+#pragma once
+
+namespace Data {
+
+class Birthday final {
+public:
+	Birthday();
+	Birthday(int day, int month, int year = 0);
+
+	[[nodiscard]] static Birthday FromSerialized(int value);
+	[[nodiscard]] int serialize() const;
+
+	[[nodiscard]] bool valid() const;
+
+	[[nodiscard]] int day() const;
+	[[nodiscard]] int month() const;
+	[[nodiscard]] int year() const;
+
+	explicit operator bool() const {
+		return valid();
+	}
+
+	friend inline constexpr auto operator<=>(Birthday, Birthday) = default;
+	friend inline constexpr bool operator==(Birthday, Birthday) = default;
+
+private:
+	int _value = 0;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index bd85b02fa..eeb80ccb7 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -89,27 +89,28 @@ struct PeerUpdate {
 		IsBot               = (1ULL << 27),
 		EmojiStatus         = (1ULL << 28),
 		BusinessDetails     = (1ULL << 29),
+		Birthday            = (1ULL << 30),
 
 		// For chats and channels
-		InviteLinks         = (1ULL << 30),
-		Members             = (1ULL << 31),
-		Admins              = (1ULL << 32),
-		BannedUsers         = (1ULL << 33),
-		Rights              = (1ULL << 34),
-		PendingRequests     = (1ULL << 35),
-		Reactions           = (1ULL << 36),
+		InviteLinks         = (1ULL << 31),
+		Members             = (1ULL << 32),
+		Admins              = (1ULL << 33),
+		BannedUsers         = (1ULL << 34),
+		Rights              = (1ULL << 35),
+		PendingRequests     = (1ULL << 36),
+		Reactions           = (1ULL << 37),
 
 		// For channels
-		ChannelAmIn         = (1ULL << 37),
-		StickersSet         = (1ULL << 38),
-		EmojiSet            = (1ULL << 39),
-		ChannelLinkedChat   = (1ULL << 40),
-		ChannelLocation     = (1ULL << 41),
-		Slowmode            = (1ULL << 42),
-		GroupCall           = (1ULL << 43),
+		ChannelAmIn         = (1ULL << 38),
+		StickersSet         = (1ULL << 39),
+		EmojiSet            = (1ULL << 40),
+		ChannelLinkedChat   = (1ULL << 41),
+		ChannelLocation     = (1ULL << 42),
+		Slowmode            = (1ULL << 43),
+		GroupCall           = (1ULL << 44),
 
 		// For iteration
-		LastUsedBit         = (1ULL << 43),
+		LastUsedBit         = (1ULL << 44),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index ebe681ac3..ea5d0dad1 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -482,6 +482,30 @@ void UserData::setCallsStatus(CallsStatus callsStatus) {
 	}
 }
 
+
+Data::Birthday UserData::birthday() const {
+	return _birthday;
+}
+
+void UserData::setBirthday(Data::Birthday value) {
+	if (_birthday != value) {
+		_birthday = value;
+		session().changes().peerUpdated(this, UpdateFlag::Birthday);
+	}
+}
+
+void UserData::setBirthday(const tl::conditional<MTPBirthday> &value) {
+	if (!value) {
+		setBirthday(Data::Birthday());
+	} else {
+		const auto &data = value->data();
+		setBirthday(Data::Birthday(
+			data.vday().v,
+			data.vmonth().v,
+			data.vyear().value_or_empty()));
+	}
+}
+
 bool UserData::hasCalls() const {
 	return (callsStatus() != CallsStatus::Disabled)
 		&& (callsStatus() != CallsStatus::Unknown);
@@ -598,6 +622,7 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 		update.vbusiness_work_hours(),
 		update.vbusiness_location(),
 		update.vbusiness_intro()));
+	user->setBirthday(update.vbirthday());
 	if (user->isSelf()) {
 		user->owner().businessInfo().applyAwaySettings(
 			FromMTP(&user->owner(), update.vbusiness_away_message()));
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index cf9eafef7..fd992a0ef 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/data_birthday.h"
 #include "data/data_peer.h"
 #include "data/data_chat_participant_status.h"
 #include "data/data_lastseen_status.h"
@@ -179,6 +180,10 @@ public:
 	bool hasCalls() const;
 	void setCallsStatus(CallsStatus callsStatus);
 
+	[[nodiscard]] Data::Birthday birthday() const;
+	void setBirthday(Data::Birthday value);
+	void setBirthday(const tl::conditional<MTPBirthday> &value);
+
 	std::unique_ptr<BotInfo> botInfo;
 
 	void setUnavailableReasons(
@@ -204,6 +209,10 @@ private:
 
 	Flags _flags;
 	Data::LastseenStatus _lastseen;
+	Data::Birthday _birthday;
+	int _commonChatsCount = 0;
+	ContactStatus _contactStatus = ContactStatus::Unknown;
+	CallsStatus _callsStatus = CallsStatus::Unknown;
 
 	Data::UsernamesInfo _username;
 
@@ -211,9 +220,6 @@ private:
 	std::vector<Data::UnavailableReason> _unavailableReasons;
 	QString _phone;
 	QString _privateForwardName;
-	ContactStatus _contactStatus = ContactStatus::Unknown;
-	CallsStatus _callsStatus = CallsStatus::Unknown;
-	int _commonChatsCount = 0;
 
 	uint64 _accessHash = 0;
 	static constexpr auto kInaccessibleAccessHashOld
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 2545afbf9..9ad3e3954 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -152,6 +152,10 @@ settingsPrivacySecurityPadding: 12px;
 settingsPrivacySkip: 14px;
 settingsPrivacySkipTop: 4px;
 
+settingsPrivacyAddBirthday: FlatLabel(defaultFlatLabel) {
+	minWidth: 256px;
+}
+
 settingsCloudPasswordIconSize: 100px;
 
 settingLocalPasscodeInputField: InputField(defaultInputField) {
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 36a4ef35a..b0657d2b1 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -975,6 +975,7 @@ auto ForwardsPrivacyController::exceptionsDescription() const
 }
 
 object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
+		not_null<Window::SessionController*> controller,
 		not_null<QWidget*> parent,
 		rpl::producer<Option> optionValue,
 		not_null<QWidget*> outerContainer) {
@@ -982,7 +983,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 
 	auto message = GenerateForwardedItem(
 		delegate(),
-		_controller->session().data().history(
+		controller->session().data().history(
 			PeerData::kServiceNotificationsId),
 		tr::lng_edit_privacy_forwards_sample_message(tr::now));
 	const auto view = message.get();
@@ -1072,18 +1073,18 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 	) | rpl::start_with_next([=](QRect rect) {
 		// #TODO themes
 		Window::SectionWidget::PaintBackground(
-			_controller,
-			_controller->defaultChatTheme().get(), // #TODO themes
+			controller,
+			controller->defaultChatTheme().get(), // #TODO themes
 			widget,
 			rect);
 
 		Painter p(widget);
-		const auto theme = _controller->defaultChatTheme().get();
+		const auto theme = controller->defaultChatTheme().get();
 		auto context = theme->preparePaintContext(
 			_chatStyle.get(),
 			widget->rect(),
 			widget->rect(),
-			_controller->isGifPausedAtLeastFor(
+			controller->isGifPausedAtLeastFor(
 				Window::GifPauseReason::Layer));
 		p.translate(padding / 2, padding + view->marginBottom());
 		context.outbg = view->hasOutLayout();
@@ -1115,6 +1116,7 @@ rpl::producer<QString> ProfilePhotoPrivacyController::optionsTitleKey() const {
 }
 
 object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupAboveWidget(
+		not_null<Window::SessionController*> controller,
 		not_null<QWidget*> parent,
 		rpl::producer<Option> optionValue,
 		not_null<QWidget*> outerContainer) {
@@ -1475,7 +1477,74 @@ rpl::producer<QString> AboutPrivacyController::exceptionBoxTitle(
 
 auto AboutPrivacyController::exceptionsDescription() const
 -> rpl::producer<QString> {
-	return tr::lng_edit_privacy_about_exceptions();
+	return tr::lng_edit_privacy_birthday_exceptions();
+}
+
+UserPrivacy::Key BirthdayPrivacyController::key() const {
+	return Key::Birthday;
+}
+
+rpl::producer<QString> BirthdayPrivacyController::title() const {
+	return tr::lng_edit_privacy_birthday_title();
+}
+
+rpl::producer<QString> BirthdayPrivacyController::optionsTitleKey() const {
+	return tr::lng_edit_privacy_birthday_header();
+}
+
+rpl::producer<QString> BirthdayPrivacyController::exceptionButtonTextKey(
+	Exception exception) const {
+	switch (exception) {
+	case Exception::Always: return tr::lng_edit_privacy_birthday_always_empty();
+	case Exception::Never: return tr::lng_edit_privacy_birthday_never_empty();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+rpl::producer<QString> BirthdayPrivacyController::exceptionBoxTitle(
+	Exception exception) const {
+	switch (exception) {
+	case Exception::Always: return tr::lng_edit_privacy_birthday_always_title();
+	case Exception::Never: return tr::lng_edit_privacy_birthday_never_title();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+auto BirthdayPrivacyController::exceptionsDescription() const
+-> rpl::producer<QString> {
+	return tr::lng_edit_privacy_birthday_exceptions();
+}
+
+object_ptr<Ui::RpWidget> BirthdayPrivacyController::setupAboveWidget(
+		not_null<Window::SessionController*> controller,
+		not_null<QWidget*> parent,
+		rpl::producer<Option> optionValue,
+		not_null<QWidget*> outerContainer) {
+	const auto session = &controller->session();
+	const auto user = session->user();
+	auto result = object_ptr<Ui::SlideWrap<Ui::FlatLabel>>(
+		parent,
+		object_ptr<Ui::FlatLabel>(
+			parent,
+			tr::lng_edit_privacy_birthday_yet(
+				lt_link,
+				tr::lng_edit_privacy_birthday_yet_link(
+				) | Ui::Text::ToLink("internal:edit_birthday"),
+				Ui::Text::WithEntities),
+			st::settingsPrivacyAddBirthday),
+		st::boxRowPadding + style::margins(
+			0,
+			st::defaultVerticalListSkip,
+			0,
+			st::settingsPrivacySkipTop));
+	result->toggleOn(session->changes().peerFlagsValue(
+		user,
+		Data::PeerUpdate::Flag::Birthday
+	) | rpl::map([=] {
+		return !user->birthday();
+	}));
+	result->finishAnimating();
+	return result;
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
index 25920a1f0..23a727808 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
@@ -215,6 +215,7 @@ public:
 	rpl::producer<QString> exceptionsDescription() const override;
 
 	object_ptr<Ui::RpWidget> setupAboveWidget(
+		not_null<Window::SessionController*> controller,
 		not_null<QWidget*> parent,
 		rpl::producer<Option> optionValue,
 		not_null<QWidget*> outerContainer) override;
@@ -249,6 +250,7 @@ public:
 		rpl::producer<int> value) override;
 
 	object_ptr<Ui::RpWidget> setupAboveWidget(
+		not_null<Window::SessionController*> controller,
 		not_null<QWidget*> parent,
 		rpl::producer<Option> optionValue,
 		not_null<QWidget*> outerContainer) override;
@@ -314,4 +316,27 @@ public:
 
 };
 
+class BirthdayPrivacyController final : public EditPrivacyController {
+public:
+	using Option = EditPrivacyBox::Option;
+	using Exception = EditPrivacyBox::Exception;
+
+	Key key() const override;
+
+	rpl::producer<QString> title() const override;
+	rpl::producer<QString> optionsTitleKey() const override;
+	rpl::producer<QString> exceptionButtonTextKey(
+		Exception exception) const override;
+	rpl::producer<QString> exceptionBoxTitle(
+		Exception exception) const override;
+	rpl::producer<QString> exceptionsDescription() const override;
+
+	object_ptr<Ui::RpWidget> setupAboveWidget(
+		not_null<Window::SessionController*> controller,
+		not_null<QWidget*> parent,
+		rpl::producer<Option> optionValue,
+		not_null<QWidget*> outerContainer) override;
+
+};
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 6d16cac01..1b70efbb4 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -135,6 +135,8 @@ QString PrivacyBase(Privacy::Key key, Privacy::Option option) {
 		case Option::Contacts: return tr::lng_edit_privacy_contacts(tr::now);
 		case Option::CloseFriends:
 			return tr::lng_edit_privacy_close_friends(tr::now);
+		case Option::ContactsAndPremium:
+			return tr::lng_edit_privacy_contacts_and_premium(tr::now);
 		case Option::Nobody: return tr::lng_edit_privacy_nobody(tr::now);
 		}
 		Unexpected("Value in Privacy::Option.");
@@ -355,6 +357,10 @@ void SetupPrivacy(
 		tr::lng_settings_bio_privacy(),
 		Key::About,
 		[] { return std::make_unique<AboutPrivacyController>(); });
+	add(
+		tr::lng_settings_birthday_privacy(),
+		Key::Birthday,
+		[] { return std::make_unique<BirthdayPrivacyController>(); });
 	add(
 		tr::lng_settings_forwards_privacy(),
 		Key::Forwards,
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 0e98ad7b8..5a4b2bd13 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -76,6 +76,8 @@ PRIVATE
     countries/countries_instance.cpp
     countries/countries_instance.h
 
+    data/data_birthday.cpp
+    data/data_birthday.h
     data/data_statistics_chart.cpp
     data/data_statistics_chart.h
     data/data_subscription_option.h

From c82d7bd9096c785ec49cd3aff2dd75c652d06c27 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Mar 2024 14:52:10 +0400
Subject: [PATCH 119/596] Implement birthday info / privacy edit boxes.

---
 Telegram/Resources/langs/lang.strings         |   2 +
 .../SourceFiles/core/local_url_handlers.cpp   |  72 +++++-
 Telegram/SourceFiles/data/data_birthday.cpp   |   3 +-
 Telegram/SourceFiles/data/data_birthday.h     |   3 +
 .../info/profile/info_profile_values.cpp      |   9 +
 .../info/profile/info_profile_values.h        |   3 +
 .../settings/settings_information.cpp         |  81 ++++++
 .../settings/settings_privacy_controllers.cpp |  25 +-
 .../settings/settings_privacy_controllers.h   |   2 +-
 .../ui/boxes/edit_birthday_box.cpp            | 232 ++++++++++++++++++
 .../SourceFiles/ui/boxes/edit_birthday_box.h  |  23 ++
 Telegram/cmake/td_ui.cmake                    |   2 +
 12 files changed, 439 insertions(+), 18 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
 create mode 100644 Telegram/SourceFiles/ui/boxes/edit_birthday_box.h

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ca78a2d9d..df0fd736e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -671,6 +671,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_birthday_about_link" = "Settings";
 "lng_settings_birthday_contacts" = "Only your contacts can see your birthday. {link}";
 "lng_settings_birthday_contacts_link" = "Change >";
+"lng_settings_birthday_saved" = "Your date of birth was updated.";
+"lng_settings_birthday_reset" = "Reset";
 "lng_settings_add_account_about" = "You can add up to four accounts with different phone numbers.";
 "lng_settings_peer_to_peer_about" = "Disabling peer-to-peer will relay all calls through Telegram servers to avoid revealing your IP address, but may slightly decrease audio quality.";
 "lng_settings_advanced" = "Advanced";
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index d94187094..c5502085a 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -21,17 +21,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/click_handler_types.h"
 #include "boxes/background_preview_box.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/boxes/edit_birthday_box.h"
 #include "boxes/share_box.h"
 #include "boxes/connection_box.h"
+#include "boxes/edit_privacy_box.h"
 #include "boxes/premium_preview_box.h"
 #include "boxes/sticker_set_box.h"
 #include "boxes/sessions_box.h"
 #include "boxes/language_box.h"
 #include "passport/passport_form_controller.h"
 #include "ui/toast/toast.h"
-#include "data/data_session.h"
-#include "data/data_document.h"
+#include "data/data_birthday.h"
 #include "data/data_channel.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
 #include "media/player/media_player_instance.h"
 #include "media/view/media_view_open_common.h"
 #include "window/window_session_controller.h"
@@ -44,6 +48,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_global_ttl.h"
 #include "settings/settings_folders.h"
 #include "settings/settings_main.h"
+#include "settings/settings_privacy_controllers.h"
 #include "settings/settings_privacy_security.h"
 #include "settings/settings_chat.h"
 #include "settings/settings_premium.h"
@@ -669,6 +674,59 @@ bool ShowSearchTagsPromo(
 	return true;
 }
 
+bool ShowEditBirthday(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto user = controller->session().user();
+	const auto save = [=](Data::Birthday result) {
+		user->setBirthday(result);
+
+		using Flag = MTPaccount_UpdateBirthday::Flag;
+		using BFlag = MTPDbirthday::Flag;
+		user->session().api().request(MTPaccount_UpdateBirthday(
+			MTP_flags(result ? Flag::f_birthday : Flag()),
+			MTP_birthday(
+				MTP_flags(result.year() ? BFlag::f_year : BFlag()),
+				MTP_int(result.day()),
+				MTP_int(result.month()),
+				MTP_int(result.year()))
+		)).done(crl::guard(controller, [=] {
+			controller->showToast(tr::lng_settings_birthday_saved(tr::now));
+		})).fail(crl::guard(controller, [=](const MTP::Error &error) {
+			controller->showToast(u"Error: "_q + error.type());
+		})).send();
+	};
+	controller->show(Box(
+		Ui::EditBirthdayBox,
+		user->birthday(),
+		save));
+	return true;
+}
+
+bool ShowEditBirthdayPrivacy(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	auto syncLifetime = controller->session().api().userPrivacy().value(
+		Api::UserPrivacy::Key::Birthday
+	) | rpl::take(
+		1
+	) | rpl::start_with_next([=](const Api::UserPrivacy::Rule &value) {
+		controller->show(Box<EditPrivacyBox>(
+			controller,
+			std::make_unique<::Settings::BirthdayPrivacyController>(),
+			value));
+	});
+	return true;
+}
+
 void ExportTestChatTheme(
 		not_null<Window::SessionController*> controller,
 		not_null<const Data::CloudTheme*> theme) {
@@ -1034,9 +1092,17 @@ const std::vector<LocalUrlHandler> &InternalUrlHandlers() {
 			CopyPeerId
 		},
 		{
-			u"about_tags"_q,
+			u"^about_tags$"_q,
 			ShowSearchTagsPromo
 		},
+		{
+			u"^edit_birthday$"_q,
+			ShowEditBirthday,
+		},
+		{
+			u"^edit_privacy_birthday$"_q,
+			ShowEditBirthdayPrivacy,
+		},
 	};
 	return Result;
 }
diff --git a/Telegram/SourceFiles/data/data_birthday.cpp b/Telegram/SourceFiles/data/data_birthday.cpp
index 4b9df693f..e29378cbe 100644
--- a/Telegram/SourceFiles/data/data_birthday.cpp
+++ b/Telegram/SourceFiles/data/data_birthday.cpp
@@ -11,7 +11,8 @@ namespace Data {
 namespace {
 
 [[nodiscard]] bool Validate(int day, int month, int year) {
-	if (year != 0 && (year < 1900 || year > 2100)) {
+	if (year != 0
+		&& (year < Birthday::kYearMin || year > Birthday::kYearMax)) {
 		return false;
 	} else if (day < 1) {
 		return false;
diff --git a/Telegram/SourceFiles/data/data_birthday.h b/Telegram/SourceFiles/data/data_birthday.h
index 13a5e4cfe..fd36870cc 100644
--- a/Telegram/SourceFiles/data/data_birthday.h
+++ b/Telegram/SourceFiles/data/data_birthday.h
@@ -30,6 +30,9 @@ public:
 	friend inline constexpr auto operator<=>(Birthday, Birthday) = default;
 	friend inline constexpr bool operator==(Birthday, Birthday) = default;
 
+	static constexpr auto kYearMin = 1900;
+	static constexpr auto kYearMax = 2100;
+
 private:
 	int _value = 0;
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index e66a9839b..76636ddbd 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -343,6 +343,15 @@ rpl::producer<bool> CanAddContactValue(not_null<UserData*> user) {
 	) | rpl::map(!_1);
 }
 
+rpl::producer<Data::Birthday> BirthdayValue(not_null<UserData*> user) {
+	return user->session().changes().peerFlagsValue(
+		user,
+		UpdateFlag::Birthday
+	) | rpl::map([=] {
+		return user->birthday();
+	});
+}
+
 rpl::producer<bool> AmInChannelValue(not_null<ChannelData*> channel) {
 	return channel->session().changes().peerFlagsValue(
 		channel,
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h
index a74f22a42..b335949c7 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.h
@@ -17,6 +17,7 @@ struct ChannelLocation;
 namespace Data {
 class ForumTopic;
 class Thread;
+class Birthday;
 } // namespace Data
 
 namespace Main {
@@ -83,6 +84,8 @@ rpl::producer<not_null<PeerData*>> MigratedOrMeValue(
 	not_null<UserData*> user);
 [[nodiscard]] rpl::producer<bool> CanAddContactValue(
 	not_null<UserData*> user);
+[[nodiscard]] rpl::producer<Data::Birthday> BirthdayValue(
+	not_null<UserData*> user);
 [[nodiscard]] rpl::producer<bool> AmInChannelValue(
 	not_null<ChannelData*> channel);
 [[nodiscard]] rpl::producer<int> MembersCountValue(not_null<PeerData*> peer);
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index 9e4a66529..eef68335e 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/vertical_list.h"
 #include "ui/unread_badge_paint.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/core_settings.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "boxes/add_contact_box.h"
@@ -48,6 +49,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "api/api_peer_photo.h"
 #include "api/api_user_names.h"
+#include "api/api_user_privacy.h"
 #include "base/call_delayed.h"
 #include "base/options.h"
 #include "base/unixtime.h"
@@ -353,6 +355,84 @@ void AddRow(
 	}, wrap->lifetime());
 }
 
+void SetupBirthday(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> controller,
+		not_null<UserData*> self) {
+	const auto session = &self->session();
+
+	Ui::AddSkip(container);
+
+	auto value = rpl::combine(
+		Info::Profile::BirthdayValue(self),
+		tr::lng_settings_birthday_add()
+	) | rpl::map([](Data::Birthday birthday, const QString &add) {
+		const auto wrap = &Ui::Text::WithEntities;
+		if (const auto year = birthday.year()) {
+			return wrap(tr::lng_month_day_year(
+				tr::now,
+				lt_month,
+				Lang::MonthSmall(birthday.month())(tr::now),
+				lt_day,
+				QString::number(birthday.day()),
+				lt_year,
+				QString::number(year)));
+		} else if (birthday) {
+			return wrap(tr::lng_month_day(
+				tr::now,
+				lt_month,
+				Lang::MonthSmall(birthday.month())(tr::now),
+				lt_day,
+				QString::number(birthday.day())));
+		}
+		auto result = TextWithEntities{ add };
+		result.entities.push_back({
+			EntityType::CustomUrl,
+			0,
+			int(add.size()),
+			"internal:edit_username" });
+		return result;
+	});
+	const auto edit = [=] {
+		Core::App().openInternalUrl(
+			u"internal:edit_birthday"_q,
+			QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = base::make_weak(controller),
+			}));
+	};
+	AddRow(
+		container,
+		tr::lng_settings_birthday_label(),
+		std::move(value),
+		tr::lng_mediaview_copy(tr::now),
+		edit,
+		{ &st::menuIconGiftPremium });
+
+	const auto key = Api::UserPrivacy::Key::Birthday;
+	session->api().userPrivacy().reload(key);
+	auto isExactlyContacts = session->api().userPrivacy().value(
+		key
+	) | rpl::map([=](const Api::UserPrivacy::Rule &value) {
+		return (value.option == Api::UserPrivacy::Option::Contacts)
+			&& value.always.empty()
+			&& value.never.empty();
+	}) | rpl::distinct_until_changed();
+
+	Ui::AddSkip(container);
+	Ui::AddDividerText(container, rpl::conditional(
+		std::move(isExactlyContacts),
+		tr::lng_settings_birthday_contacts(
+			lt_link,
+			tr::lng_settings_birthday_contacts_link(
+			) | Ui::Text::ToLink(u"internal:edit_privacy_birthday"_q),
+			Ui::Text::WithEntities),
+		tr::lng_settings_birthday_about(
+			lt_link,
+			tr::lng_settings_birthday_about_link(
+			) | Ui::Text::ToLink(u"internal:edit_privacy_birthday"_q),
+			Ui::Text::WithEntities)));
+}
+
 void SetupRows(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
@@ -954,6 +1034,7 @@ void Information::setupContent(
 	SetupPhoto(content, controller, self);
 	SetupBio(content, self);
 	SetupRows(content, controller, self);
+	SetupBirthday(content, controller, self);
 	SetupAccountsWrap(content, controller);
 
 	Ui::ResizeFitChild(this, content);
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index b0657d2b1..5308b9cf4 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -53,6 +53,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_chat_helpers.h"
 #include "styles/style_settings.h"
 #include "styles/style_info.h"
+#include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 
 #include <QtGui/QGuiApplication>
@@ -1522,21 +1523,19 @@ object_ptr<Ui::RpWidget> BirthdayPrivacyController::setupAboveWidget(
 		not_null<QWidget*> outerContainer) {
 	const auto session = &controller->session();
 	const auto user = session->user();
-	auto result = object_ptr<Ui::SlideWrap<Ui::FlatLabel>>(
+	auto result = object_ptr<Ui::SlideWrap<Ui::DividerLabel>>(
 		parent,
-		object_ptr<Ui::FlatLabel>(
+		object_ptr<Ui::DividerLabel>(
 			parent,
-			tr::lng_edit_privacy_birthday_yet(
-				lt_link,
-				tr::lng_edit_privacy_birthday_yet_link(
-				) | Ui::Text::ToLink("internal:edit_birthday"),
-				Ui::Text::WithEntities),
-			st::settingsPrivacyAddBirthday),
-		st::boxRowPadding + style::margins(
-			0,
-			st::defaultVerticalListSkip,
-			0,
-			st::settingsPrivacySkipTop));
+			object_ptr<Ui::FlatLabel>(
+				parent,
+				tr::lng_edit_privacy_birthday_yet(
+					lt_link,
+					tr::lng_edit_privacy_birthday_yet_link(
+					) | Ui::Text::ToLink("internal:edit_birthday"),
+					Ui::Text::WithEntities),
+				st::boxDividerLabel),
+			st::defaultBoxDividerLabelPadding));
 	result->toggleOn(session->changes().peerFlagsValue(
 		user,
 		Data::PeerUpdate::Flag::Birthday
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
index 23a727808..5e1083c20 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
@@ -30,7 +30,7 @@ public:
 	explicit BlockedBoxController(
 		not_null<Window::SessionController*> window);
 
-	Main::Session &session() const override;
+	::Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 	void rowRightActionClicked(not_null<PeerListRow*> row) override;
diff --git a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
new file mode 100644
index 000000000..7d3641537
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
@@ -0,0 +1,232 @@
+/*
+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/boxes/edit_birthday_box.h"
+
+#include "base/event_filter.h"
+#include "data/data_birthday.h"
+#include "lang/lang_keys.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/vertical_drum_picker.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
+
+#include <QtCore/QDate>
+
+namespace Ui {
+
+class GenericBox;
+
+void EditBirthdayBox(
+		not_null<Ui::GenericBox*> box,
+		Data::Birthday current,
+		Fn<void(Data::Birthday)> save) {
+	box->setWidth(st::boxWideWidth);
+	const auto content = box->addRow(object_ptr<Ui::FixedHeightWidget>(
+		box,
+		st::settingsWorkingHoursPicker));
+
+	const auto font = st::boxTextFont;
+	const auto itemHeight = st::settingsWorkingHoursPickerItemHeight;
+	const auto picker = [=](
+			int count,
+			int startIndex,
+			Fn<void(QPainter &p, QRectF rect, int index)> paint) {
+		auto paintCallback = [=](
+				QPainter &p,
+				int index,
+				float64 y,
+				float64 distanceFromCenter,
+				int outerWidth) {
+			const auto r = QRectF(0, y, outerWidth, itemHeight);
+			const auto progress = std::abs(distanceFromCenter);
+			const auto revProgress = 1. - progress;
+			p.save();
+			p.translate(r.center());
+			constexpr auto kMinYScale = 0.2;
+			const auto yScale = kMinYScale
+				+ (1. - kMinYScale) * anim::easeOutCubic(1., revProgress);
+			p.scale(1., yScale);
+			p.translate(-r.center());
+			p.setOpacity(revProgress);
+			p.setFont(font);
+			p.setPen(st::defaultFlatLabel.textFg);
+			paint(p, r, index);
+			p.restore();
+		};
+		return Ui::CreateChild<Ui::VerticalDrumPicker>(
+			content,
+			std::move(paintCallback),
+			count,
+			itemHeight,
+			startIndex);
+	};
+
+	const auto nowDate = QDate::currentDate();
+	const auto nowYear = nowDate.year();
+	const auto nowMonth = nowDate.month();
+	const auto nowDay = nowDate.day();
+	const auto now = Data::Birthday(nowDay, nowMonth, nowYear);
+	const auto max = current.year() ? std::max(now, current) : now;
+	const auto maxYear = max.year();
+	const auto minYear = Data::Birthday::kYearMin;
+	const auto yearsCount = (maxYear - minYear + 2); // Last - not set.
+	const auto yearsStartIndex = current.year()
+		? (current.year() - minYear)
+		: (yearsCount - 1);
+	const auto yearsPaint = [=](QPainter &p, QRectF rect, int index) {
+		p.drawText(
+			rect,
+			(index < yearsCount - 1
+				? QString::number(minYear + index)
+				: QString::fromUtf8("\xe2\x80\x94")),
+			style::al_center);
+	};
+	const auto years = picker(yearsCount, yearsStartIndex, yearsPaint);
+
+	struct State {
+		rpl::variable<Ui::VerticalDrumPicker*> months;
+		rpl::variable<Ui::VerticalDrumPicker*> days;
+	};
+	const auto state = content->lifetime().make_state<State>();
+
+	// years->value() is valid only after size is set.
+	rpl::combine(
+		content->sizeValue(),
+		state->months.value(),
+		state->days.value()
+	) | rpl::start_with_next([=](
+			QSize s,
+			Ui::VerticalDrumPicker *months,
+			Ui::VerticalDrumPicker *days) {
+		const auto half = s.width() / 2;
+		years->setGeometry(half * 3 / 2, 0, half / 2, s.height());
+		if (months) {
+			months->setGeometry(half / 2, 0, half, s.height());
+		}
+		if (days) {
+			days->setGeometry(0, 0, half / 2, s.height());
+		}
+	}, content->lifetime());
+
+	Ui::SendPendingMoveResizeEvents(years);
+
+	years->value() | rpl::start_with_next([=](int yearsIndex) {
+		const auto year = (yearsIndex == yearsCount - 1)
+			? 0
+			: minYear + yearsIndex;
+		const auto monthsCount = (year == maxYear)
+			? max.month()
+			: 12;
+		const auto monthsStartIndex = std::clamp(
+			(state->months.current()
+				? state->months.current()->index()
+				: current.month()
+				? (current.month() - 1)
+				: (now.month() - 1)),
+			0,
+			monthsCount - 1);
+		const auto monthsPaint = [=](QPainter &p, QRectF rect, int index) {
+			p.drawText(
+				rect,
+				Lang::Month(index + 1)(tr::now),
+				style::al_center);
+		};
+		const auto updated = picker(
+			monthsCount,
+			monthsStartIndex,
+			monthsPaint);
+		delete state->months.current();
+		state->months = updated;
+		state->months.current()->show();
+	}, years->lifetime());
+
+	Ui::SendPendingMoveResizeEvents(state->months.current());
+
+	state->months.value() | rpl::map([=](Ui::VerticalDrumPicker *picker) {
+		return picker ? picker->value() : rpl::single(current.month()
+			? (current.month() - 1)
+			: (now.month() - 1));
+	}) | rpl::flatten_latest() | rpl::start_with_next([=](int monthIndex) {
+		const auto month = monthIndex + 1;
+		const auto yearsIndex = years->index();
+		const auto year = (yearsIndex == yearsCount - 1)
+			? 0
+			: minYear + yearsIndex;
+		const auto daysCount = (year == maxYear && month == max.month())
+			? max.day()
+			: (month == 2)
+			? ((!year || ((year % 4) && (!(year % 100) || (year % 400))))
+				? 29
+				: 28)
+			: ((month == 4) || (month == 6) || (month == 9) || (month == 11))
+			? 30
+			: 31;
+		const auto daysStartIndex = std::clamp(
+			(state->days.current()
+				? state->days.current()->index()
+				: current.day()
+				? (current.day() - 1)
+				: (now.day() - 1)),
+			0,
+			daysCount - 1);
+		const auto daysPaint = [=](QPainter &p, QRectF rect, int index) {
+			p.drawText(rect, QString::number(index + 1), style::al_center);
+		};
+		const auto updated = picker(
+			daysCount,
+			daysStartIndex,
+			daysPaint);
+		delete state->days.current();
+		state->days = updated;
+		state->days.current()->show();
+	}, years->lifetime());
+
+	content->paintRequest(
+	) | rpl::start_with_next([=](const QRect &r) {
+		auto p = QPainter(content);
+
+		p.fillRect(r, Qt::transparent);
+
+		const auto lineRect = QRect(
+			0,
+			content->height() / 2,
+			content->width(),
+			st::defaultInputField.borderActive);
+		p.fillRect(lineRect.translated(0, itemHeight / 2), st::activeLineFg);
+		p.fillRect(lineRect.translated(0, -itemHeight / 2), st::activeLineFg);
+	}, content->lifetime());
+
+	base::install_event_filter(box, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::KeyPress) {
+			years->handleKeyEvent(static_cast<QKeyEvent*>(e.get()));
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	box->addButton(tr::lng_settings_save(), [=] {
+		const auto result = Data::Birthday(
+			state->days.current()->index() + 1,
+			state->months.current()->index() + 1,
+			((years->index() == yearsCount - 1)
+				? 0
+				: minYear + years->index()));
+		box->closeBox();
+		save(result);
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+	if (current) {
+		box->addLeftButton(tr::lng_settings_birthday_reset(), [=] {
+			box->closeBox();
+			save(Data::Birthday());
+		});
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.h b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.h
new file mode 100644
index 000000000..bc96f8e0d
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.h
@@ -0,0 +1,23 @@
+/*
+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 Data {
+class Birthday;
+} // namespace Data
+
+namespace Ui {
+
+class GenericBox;
+
+void EditBirthdayBox(
+	not_null<Ui::GenericBox*> box,
+	Data::Birthday current,
+	Fn<void(Data::Birthday)> save);
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 5a4b2bd13..c2bb319bf 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -241,6 +241,8 @@ PRIVATE
     ui/boxes/confirm_phone_box.h
     ui/boxes/country_select_box.cpp
     ui/boxes/country_select_box.h
+    ui/boxes/edit_birthday_box.cpp
+    ui/boxes/edit_birthday_box.h
     ui/boxes/edit_invite_link.cpp
     ui/boxes/edit_invite_link.h
     ui/boxes/rate_call_box.cpp

From 08ee25deb20bcfe41c23a1a865bc05b4b896b0a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Mar 2024 19:12:11 +0400
Subject: [PATCH 120/596] Display date of birth in user profiles.

---
 Telegram/Resources/langs/lang.strings         |  5 ++
 .../boxes/peers/peer_short_info_box.cpp       | 31 ++++++++--
 .../boxes/peers/peer_short_info_box.h         |  4 ++
 .../boxes/peers/prepare_short_info_box.cpp    |  4 +-
 Telegram/SourceFiles/data/data_birthday.cpp   | 62 +++++++++++++++++++
 Telegram/SourceFiles/data/data_birthday.h     |  6 ++
 .../info/profile/info_profile_actions.cpp     |  8 +++
 .../info/profile/info_profile_values.cpp      | 43 +++++++++++++
 .../info/profile/info_profile_values.h        |  5 ++
 .../settings/settings_information.cpp         | 20 +-----
 10 files changed, 166 insertions(+), 22 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index df0fd736e..3d1ac3b3c 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1329,6 +1329,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_info_mobile_hidden" = "Hidden";
 "lng_info_username_label" = "Username";
 "lng_info_usernames_label" = "also";
+"lng_info_birthday_label" = "Date of birth";
+"lng_info_birthday_years#one" = "{date} ({count} year old)";
+"lng_info_birthday_years#other" = "{date} ({count} years old)";
+"lng_info_birthday_today_label" = "Birthday today";
+"lng_info_birthday_today" = "{emoji} {date}";
 "lng_info_bio_label" = "Bio";
 "lng_info_link_label" = "Link";
 "lng_info_location_label" = "Location";
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index bc07210f6..47afccd2f 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/painter.h"
 #include "info/profile/info_profile_text.h"
+#include "info/profile/info_profile_values.h"
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
 #include "base/event_filter.h"
@@ -788,6 +789,10 @@ void PeerShortInfoBox::prepareRows() {
 		tr::lng_info_username_label(),
 		usernameValue() | Ui::Text::ToWithEntities(),
 		tr::lng_context_copy_mention(tr::now));
+	addInfoOneLine(
+		birthdayLabel(),
+		birthdayValue() | Ui::Text::ToWithEntities(),
+		tr::lng_mediaview_copy(tr::now));
 }
 
 RectParts PeerShortInfoBox::customCornersFilling() {
@@ -827,29 +832,47 @@ void PeerShortInfoBox::refreshRoundedTopImage(const QColor &color) {
 }
 
 rpl::producer<QString> PeerShortInfoBox::nameValue() const {
-	return _fields.value() | rpl::map([](const PeerShortInfoFields &fields) {
+	return _fields.value(
+	) | rpl::map([](const PeerShortInfoFields &fields) {
 		return fields.name;
 	}) | rpl::distinct_until_changed();
 }
 
 rpl::producer<TextWithEntities> PeerShortInfoBox::linkValue() const {
-	return _fields.value() | rpl::map([](const PeerShortInfoFields &fields) {
+	return _fields.value(
+	) | rpl::map([](const PeerShortInfoFields &fields) {
 		return Ui::Text::Link(fields.link, fields.link);
 	}) | rpl::distinct_until_changed();
 }
 
 rpl::producer<QString> PeerShortInfoBox::phoneValue() const {
-	return _fields.value() | rpl::map([](const PeerShortInfoFields &fields) {
+	return _fields.value(
+	) | rpl::map([](const PeerShortInfoFields &fields) {
 		return fields.phone;
 	}) | rpl::distinct_until_changed();
 }
 
 rpl::producer<QString> PeerShortInfoBox::usernameValue() const {
-	return _fields.value() | rpl::map([](const PeerShortInfoFields &fields) {
+	return _fields.value(
+	) | rpl::map([](const PeerShortInfoFields &fields) {
 		return fields.username;
 	}) | rpl::distinct_until_changed();
 }
 
+rpl::producer<QString> PeerShortInfoBox::birthdayLabel() const {
+	return Info::Profile::BirthdayLabelText(_fields.value(
+	) | rpl::map([](const PeerShortInfoFields &fields) {
+		return fields.birthday;
+	}) | rpl::distinct_until_changed());
+}
+
+rpl::producer<QString> PeerShortInfoBox::birthdayValue() const {
+	return Info::Profile::BirthdayValueText(_fields.value(
+	) | rpl::map([](const PeerShortInfoFields &fields) {
+		return fields.birthday;
+	}) | rpl::distinct_until_changed());
+}
+
 rpl::producer<TextWithEntities> PeerShortInfoBox::aboutValue() const {
 	return _fields.value() | rpl::map([](const PeerShortInfoFields &fields) {
 		return fields.about;
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
index 13a0be40d..b5eec6c19 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/data_birthday.h"
 #include "ui/layers/box_content.h"
 
 namespace style {
@@ -40,6 +41,7 @@ struct PeerShortInfoFields {
 	QString link;
 	TextWithEntities about;
 	QString username;
+	Data::Birthday birthday;
 	bool isBio = false;
 };
 
@@ -171,6 +173,8 @@ private:
 	[[nodiscard]] rpl::producer<TextWithEntities> linkValue() const;
 	[[nodiscard]] rpl::producer<QString> phoneValue() const;
 	[[nodiscard]] rpl::producer<QString> usernameValue() const;
+	[[nodiscard]] rpl::producer<QString> birthdayLabel() const;
+	[[nodiscard]] rpl::producer<QString> birthdayValue() const;
 	[[nodiscard]] rpl::producer<TextWithEntities> aboutValue() const;
 
 	const style::ShortInfoBox &_st;
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index d71645316..a6b442aca 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -203,7 +203,8 @@ void ProcessFullPhoto(
 		(UpdateFlag::Name
 			| UpdateFlag::PhoneNumber
 			| UpdateFlag::Username
-			| UpdateFlag::About)
+			| UpdateFlag::About
+			| UpdateFlag::Birthday)
 	) | rpl::map([=] {
 		const auto user = peer->asUser();
 		const auto username = peer->userName();
@@ -217,6 +218,7 @@ void ProcessFullPhoto(
 			.username = ((user && !username.isEmpty())
 				? ('@' + username)
 				: QString()),
+			.birthday = user ? user->birthday() : Data::Birthday(),
 			.isBio = (user && !user->isBot()),
 		};
 	});
diff --git a/Telegram/SourceFiles/data/data_birthday.cpp b/Telegram/SourceFiles/data/data_birthday.cpp
index e29378cbe..679933fb1 100644
--- a/Telegram/SourceFiles/data/data_birthday.cpp
+++ b/Telegram/SourceFiles/data/data_birthday.cpp
@@ -7,6 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_birthday.h"
 
+#include "base/timer_rpl.h"
+#include "lang/lang_keys.h"
+
+#include <QtCore/QDate>
+
 namespace Data {
 namespace {
 
@@ -66,5 +71,62 @@ int Birthday::year() const {
 	return _value / 10000;
 }
 
+QString BirthdayText(Birthday date) {
+	if (const auto year = date.year()) {
+		return tr::lng_month_day_year(
+			tr::now,
+			lt_month,
+			Lang::MonthSmall(date.month())(tr::now),
+			lt_day,
+			QString::number(date.day()),
+			lt_year,
+			QString::number(year));
+	} else if (date) {
+		return tr::lng_month_day(
+			tr::now,
+			lt_month,
+			Lang::MonthSmall(date.month())(tr::now),
+			lt_day,
+			QString::number(date.day()));
+	}
+	return QString();
+}
+
+QString BirthdayCake() {
+	return QString::fromUtf8("\xf0\x9f\x8e\x82");
+}
+
+int BirthdayAge(Birthday date) {
+	if (!date.year()) {
+		return 0;
+	}
+	const auto now = QDate::currentDate();
+	const auto day = QDate(date.year(), date.month(), date.day());
+	if (!day.isValid() || day >= now) {
+		return 0;
+	}
+	auto age = now.year() - date.year();
+	if (now < QDate(date.year() + age, date.month(), date.day())) {
+		--age;
+	}
+	return age;
+}
+
+bool IsBirthdayToday(Birthday date) {
+	if (!date) {
+		return false;
+	}
+	const auto now = QDate::currentDate();
+	return date.day() == now.day() && date.month() == now.month();
+}
+
+rpl::producer<bool> IsBirthdayTodayValue(Birthday date) {
+	return rpl::single() | rpl::then(base::timer_each(
+		60 * crl::time(1000)
+	)) | rpl::map([=] {
+		return IsBirthdayToday(date);
+	}) | rpl::distinct_until_changed();
+}
+
 } // namespace Data
 
diff --git a/Telegram/SourceFiles/data/data_birthday.h b/Telegram/SourceFiles/data/data_birthday.h
index fd36870cc..064ff6cf0 100644
--- a/Telegram/SourceFiles/data/data_birthday.h
+++ b/Telegram/SourceFiles/data/data_birthday.h
@@ -38,4 +38,10 @@ private:
 
 };
 
+[[nodiscard]] QString BirthdayText(Birthday date);
+[[nodiscard]] QString BirthdayCake();
+[[nodiscard]] int BirthdayAge(Birthday date);
+[[nodiscard]] bool IsBirthdayToday(Birthday date);
+[[nodiscard]] rpl::producer<bool> IsBirthdayTodayValue(Birthday date);
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index ddcb93e45..25fc17c34 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1003,6 +1003,14 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 				return false;
 			});
 		} else {
+			addInfoOneLine(
+				BirthdayLabelText(BirthdayValue(user)),
+				BirthdayValueText(
+					BirthdayValue(user)
+				) | Ui::Text::ToWithEntities(),
+				tr::lng_mediaview_copy(tr::now),
+				st::infoProfileLabeledUsernamePadding);
+
 			tracker.track(result->add(CreateWorkingHours(result, user)));
 
 			auto locationText = user->session().changes().peerFlagsValue(
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index 76636ddbd..56b7eac84 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -635,5 +635,48 @@ rpl::producer<DocumentId> EmojiStatusIdValue(not_null<PeerData*> peer) {
 	) | rpl::map([=] { return peer->emojiStatusId(); });
 }
 
+rpl::producer<QString> BirthdayLabelText(
+		rpl::producer<Data::Birthday> birthday) {
+	return std::move(birthday) | rpl::map([](Data::Birthday value) {
+		return rpl::conditional(
+			Data::IsBirthdayTodayValue(value),
+			tr::lng_info_birthday_today_label(),
+			tr::lng_info_birthday_label());
+	}) | rpl::flatten_latest();
+}
+
+rpl::producer<QString> BirthdayValueText(
+		rpl::producer<Data::Birthday> birthday) {
+	return std::move(
+		birthday
+	) | rpl::map([](Data::Birthday value) -> rpl::producer<QString> {
+		if (!value) {
+			return rpl::single(QString());
+		}
+		return Data::IsBirthdayTodayValue(
+			value
+		) | rpl::map([=](bool today) {
+			auto text = Data::BirthdayText(value);
+			if (const auto age = Data::BirthdayAge(value)) {
+				text = tr::lng_info_birthday_years(
+					tr::now,
+					lt_count,
+					age,
+					lt_date,
+					text);
+			}
+			if (today) {
+				text = tr::lng_info_birthday_today(
+					tr::now,
+					lt_emoji,
+					Data::BirthdayCake(),
+					lt_date,
+					text);
+			}
+			return text;
+		});
+	}) | rpl::flatten_latest();
+}
+
 } // namespace Profile
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h
index b335949c7..5dac2207d 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.h
@@ -121,4 +121,9 @@ enum class BadgeType;
 [[nodiscard]] rpl::producer<DocumentId> EmojiStatusIdValue(
 	not_null<PeerData*> peer);
 
+[[nodiscard]] rpl::producer<QString> BirthdayLabelText(
+	rpl::producer<Data::Birthday> birthday);
+[[nodiscard]] rpl::producer<QString> BirthdayValueText(
+	rpl::producer<Data::Birthday> birthday);
+
 } // namespace Info::Profile
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index eef68335e..c577b0a71 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -367,23 +367,9 @@ void SetupBirthday(
 		Info::Profile::BirthdayValue(self),
 		tr::lng_settings_birthday_add()
 	) | rpl::map([](Data::Birthday birthday, const QString &add) {
-		const auto wrap = &Ui::Text::WithEntities;
-		if (const auto year = birthday.year()) {
-			return wrap(tr::lng_month_day_year(
-				tr::now,
-				lt_month,
-				Lang::MonthSmall(birthday.month())(tr::now),
-				lt_day,
-				QString::number(birthday.day()),
-				lt_year,
-				QString::number(year)));
-		} else if (birthday) {
-			return wrap(tr::lng_month_day(
-				tr::now,
-				lt_month,
-				Lang::MonthSmall(birthday.month())(tr::now),
-				lt_day,
-				QString::number(birthday.day())));
+		const auto text = Data::BirthdayText(birthday);
+		if (!text.isEmpty()) {
+			return TextWithEntities{ text };
 		}
 		auto result = TextWithEntities{ add };
 		result.entities.push_back({

From 57bd0d2674bfacb511ff9c38e607ce36fe0e1900 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 24 Mar 2024 10:24:03 +0400
Subject: [PATCH 121/596] Update API scheme on layer 177.

---
 Telegram/SourceFiles/mtproto/scheme/api.tl | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 87d7a05c8..60a32254d 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -101,7 +101,7 @@ channel#aadfc8f flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5
 channelForbidden#17d493d5 flags:# broadcast:flags.5?true megagroup:flags.8?true id:long access_hash:long title:string until_date:flags.16?int = Chat;
 
 chatFull#c9d31138 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true translations_disabled:flags.19?true id:long about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:flags.13?ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int call:flags.12?InputGroupCall ttl_period:flags.14?int groupcall_default_join_as:flags.15?Peer theme_emoticon:flags.16?string requests_pending:flags.17?int recent_requesters:flags.17?Vector<long> available_reactions:flags.18?ChatReactions = ChatFull;
-channelFull#44c054a7 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 flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true id:long 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:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long 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?long 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 ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet = ChatFull;
+channelFull#680b773c 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 flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true restricted_sponsored:flags2.11?true id:long 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:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long 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?long 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 ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet sponsored_min_cpm:flags2.12?int = ChatFull;
 
 chatParticipant#c02d4007 user_id:long inviter_id:long date:int = ChatParticipant;
 chatParticipantCreator#e46bcee4 user_id:long = ChatParticipant;
@@ -1760,6 +1760,16 @@ channels.sponsoredMessageReportResultChooseOption#846f9e42 title:string options:
 channels.sponsoredMessageReportResultAdsHidden#3e3bcf2f = channels.SponsoredMessageReportResult;
 channels.sponsoredMessageReportResultReported#ad798849 = channels.SponsoredMessageReportResult;
 
+stats.broadcastRevenueStats#d07b4bad top_hours_graph:StatsGraph revenue_graph:StatsGraph current_balance:long available_balance:long overall_revenue:long usd_rate:double = stats.BroadcastRevenueStats;
+
+stats.broadcastRevenueWithdrawalUrl#ec659737 url:string = stats.BroadcastRevenueWithdrawalUrl;
+
+broadcastRevenueTransactionProceeds#557e2cc4 amount:long from_date:int to_date:int = BroadcastRevenueTransaction;
+broadcastRevenueTransactionWithdrawal#5a590978 flags:# pending:flags.0?true failed:flags.2?true amount:long date:int provider:string transaction_date:flags.1?int transaction_url:flags.1?string = BroadcastRevenueTransaction;
+broadcastRevenueTransactionRefund#42d30d2e amount:long date:int provider:string = BroadcastRevenueTransaction;
+
+stats.broadcastRevenueTransactions#87158466 count:int transactions:Vector<BroadcastRevenueTransaction> = stats.BroadcastRevenueTransactions;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2210,7 +2220,7 @@ channels.inviteToChannel#c9e33d54 channel:InputChannel users:Vector<InputUser> =
 channels.deleteChannel#c0111fe3 channel:InputChannel = Updates;
 channels.exportMessageLink#e63fadeb flags:# grouped:flags.0?true thread:flags.1?true channel:InputChannel id:int = ExportedMessageLink;
 channels.toggleSignatures#1f69b606 channel:InputChannel enabled:Bool = Updates;
-channels.getAdminedPublicChannels#f8b036af flags:# by_location:flags.0?true check_limit:flags.1?true = messages.Chats;
+channels.getAdminedPublicChannels#f8b036af flags:# by_location:flags.0?true check_limit:flags.1?true for_personal:flags.2?true = messages.Chats;
 channels.editBanned#96e6cd81 channel:InputChannel participant:InputPeer banned_rights:ChatBannedRights = Updates;
 channels.getAdminLog#33ddf480 flags:# channel:InputChannel q:string events_filter:flags.0?ChannelAdminLogEventsFilter admins:flags.1?Vector<InputUser> max_id:long min_id:long limit:int = channels.AdminLogResults;
 channels.setStickers#ea8ca4f9 channel:InputChannel stickerset:InputStickerSet = Bool;
@@ -2253,6 +2263,7 @@ channels.updateEmojiStatus#f0d3e6a8 channel:InputChannel emoji_status:EmojiStatu
 channels.setBoostsToUnblockRestrictions#ad399cee channel:InputChannel boosts:int = Updates;
 channels.setEmojiStickers#3cd930b7 channel:InputChannel stickerset:InputStickerSet = Bool;
 channels.reportSponsoredMessage#af8ff6b9 channel:InputChannel random_id:bytes option:bytes = channels.SponsoredMessageReportResult;
+channels.restrictSponsoredMessages#39bb9241 flags:# channel:InputChannel restricted:Bool min_cpm:flags.0?int = Updates;
 
 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;
@@ -2347,6 +2358,9 @@ stats.getMessagePublicForwards#5f150144 channel:InputChannel msg_id:int offset:s
 stats.getMessageStats#b6e0a3f5 flags:# dark:flags.0?true channel:InputChannel msg_id:int = stats.MessageStats;
 stats.getStoryStats#374fef40 flags:# dark:flags.0?true peer:InputPeer id:int = stats.StoryStats;
 stats.getStoryPublicForwards#a6437ef6 peer:InputPeer id:int offset:string limit:int = stats.PublicForwards;
+stats.getBroadcastRevenueStats#75dfb671 flags:# dark:flags.0?true channel:InputChannel = stats.BroadcastRevenueStats;
+stats.getBroadcastRevenueWithdrawalUrl#2a65ef73 channel:InputChannel password:InputCheckPasswordSRP = stats.BroadcastRevenueWithdrawalUrl;
+stats.getBroadcastRevenueTransactions#69280f channel:InputChannel offset:int limit:int = stats.BroadcastRevenueTransactions;
 
 chatlists.exportChatlistInvite#8472478e chatlist:InputChatlist title:string peers:Vector<InputPeer> = chatlists.ExportedChatlistInvite;
 chatlists.deleteExportedInvite#719c5c5e chatlist:InputChatlist slug:string = Bool;

From f7d04d668bb910791f09af4ea30477847f67922b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 24 Mar 2024 14:26:24 +0400
Subject: [PATCH 122/596] Hide captions in IV slideshows.

---
 Telegram/Resources/iv_html/page.css    |  2 +-
 Telegram/Resources/iv_html/page.js     |  1 -
 Telegram/SourceFiles/iv/iv_prepare.cpp | 22 ++++++++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
index 6df26aaf9..2763760f2 100644
--- a/Telegram/Resources/iv_html/page.css
+++ b/Telegram/Resources/iv_html/page.css
@@ -652,7 +652,7 @@ figure.slideshow .video-wrap {
 	bottom: 10px;
 	white-space: nowrap;
 	overflow: hidden;
-	z-index: 3;
+	z-index: 5;
 }
 .slideshow-buttons > fieldset {
 	padding: 0;
diff --git a/Telegram/Resources/iv_html/page.js b/Telegram/Resources/iv_html/page.js
index 0139f4c91..053a6a0ab 100644
--- a/Telegram/Resources/iv_html/page.js
+++ b/Telegram/Resources/iv_html/page.js
@@ -149,7 +149,6 @@ var IV = {
 			var s = form.s;
 			const next = +s.value + delta;
 			s.value = (next == s.length) ? 0 : (next == -1) ? (s.length - 1) : next;
-			s.forEach(function(el){ el.checked && el.parentNode.scrollIntoView && el.parentNode.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'center'}); });
 			form.nextSibling.firstChild.style[marginProp] = (-100 * s.value) + '%';
 		} else {
 			el.form.nextSibling.firstChild.style[marginProp] = (-100 * el.value) + '%';
diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp
index 2d9595667..ff21e4e55 100644
--- a/Telegram/SourceFiles/iv/iv_prepare.cpp
+++ b/Telegram/SourceFiles/iv/iv_prepare.cpp
@@ -110,13 +110,11 @@ private:
 	[[nodiscard]] QByteArray block(
 		const MTPDpageBlockPhoto &data,
 		const Ui::GroupMediaLayout &layout = {},
-		QSize outer = {},
-		int slideshowIndex = -1);
+		QSize outer = {});
 	[[nodiscard]] QByteArray block(
 		const MTPDpageBlockVideo &data,
 		const Ui::GroupMediaLayout &layout = {},
-		QSize outer = {},
-		int slideshowIndex = -1);
+		QSize outer = {});
 	[[nodiscard]] QByteArray block(const MTPDpageBlockCover &data);
 	[[nodiscard]] QByteArray block(const MTPDpageBlockEmbed &data);
 	[[nodiscard]] QByteArray block(const MTPDpageBlockEmbedPost &data);
@@ -461,8 +459,7 @@ QByteArray Parser::block(const MTPDpageBlockPullquote &data) {
 QByteArray Parser::block(
 		const MTPDpageBlockPhoto &data,
 		const Ui::GroupMediaLayout &layout,
-		QSize outer,
-		int slideshowIndex) {
+		QSize outer) {
 	const auto collage = !layout.geometry.isEmpty();
 	const auto slideshow = !collage && !outer.isEmpty();
 	const auto photo = photoById(data.vphoto_id().v);
@@ -518,16 +515,19 @@ QByteArray Parser::block(
 		{ "href", href },
 		{ "oncontextmenu", data.vurl() ? QByteArray() : "return false;" },
 		{ "data-context", data.vurl() ? QByteArray() : "viewer-photo" + id },
-	}, result) + caption(data.vcaption());
+		}, result);
+	if (!slideshow) {
+		result += caption(data.vcaption());
+	}
 	return result;
 }
 
 QByteArray Parser::block(
 		const MTPDpageBlockVideo &data,
 		const Ui::GroupMediaLayout &layout,
-		QSize outer,
-		int slideshowIndex) {
+		QSize outer) {
 	const auto collage = !layout.geometry.isEmpty();
+	const auto slideshow = !collage && !outer.isEmpty();
 	const auto collageSmall = collage
 		&& (layout.geometry.width() < outer.width());
 	const auto video = documentById(data.vvideo_id().v);
@@ -581,7 +581,9 @@ QByteArray Parser::block(
 			{ "data-context", "viewer-video" + id },
 		}, result);
 	}
-	result += caption(data.vcaption());
+	if (!slideshow) {
+		result += caption(data.vcaption());
+	}
 	return result;
 }
 

From 6fe0c602040a4ae4a22477ba3b747aced194ca39 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Mar 2024 10:18:57 +0400
Subject: [PATCH 123/596] Fix build with Xcode.

---
 Telegram/SourceFiles/data/data_birthday.cpp | 2 --
 Telegram/SourceFiles/data/data_birthday.h   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_birthday.cpp b/Telegram/SourceFiles/data/data_birthday.cpp
index 679933fb1..65707664f 100644
--- a/Telegram/SourceFiles/data/data_birthday.cpp
+++ b/Telegram/SourceFiles/data/data_birthday.cpp
@@ -41,8 +41,6 @@ namespace {
 
 } // namespace
 
-Birthday::Birthday() = default;
-
 Birthday::Birthday(int day, int month, int year)
 : _value(Validate(day, month, year) ? Serialize(day, month, year) : 0) {
 }
diff --git a/Telegram/SourceFiles/data/data_birthday.h b/Telegram/SourceFiles/data/data_birthday.h
index 064ff6cf0..ebf4060c8 100644
--- a/Telegram/SourceFiles/data/data_birthday.h
+++ b/Telegram/SourceFiles/data/data_birthday.h
@@ -11,7 +11,7 @@ namespace Data {
 
 class Birthday final {
 public:
-	Birthday();
+	constexpr Birthday() = default;
 	Birthday(int day, int month, int year = 0);
 
 	[[nodiscard]] static Birthday FromSerialized(int value);

From 3d54f8ec4903ebb519368ad7919571ead86d84e6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Mar 2024 14:00:34 +0400
Subject: [PATCH 124/596] Initial chat links edition implementation.

---
 Telegram/CMakeLists.txt                       |   4 +
 Telegram/Resources/animations/chat_link.tgs   | Bin 0 -> 28567 bytes
 .../icons/settings/premium/links.png          | Bin 0 -> 610 bytes
 .../icons/settings/premium/links@2x.png       | Bin 0 -> 1253 bytes
 .../icons/settings/premium/links@3x.png       | Bin 0 -> 2121 bytes
 Telegram/Resources/langs/lang.strings         |  30 +-
 .../Resources/qrc/telegram/animations.qrc     |   1 +
 Telegram/SourceFiles/api/api_chat_links.cpp   | 171 ++++
 Telegram/SourceFiles/api/api_chat_links.h     |  64 ++
 Telegram/SourceFiles/apiwrap.cpp              |   6 +
 Telegram/SourceFiles/apiwrap.h                |   3 +
 .../boxes/filters/edit_filter_links.cpp       |  12 +-
 .../boxes/peers/edit_peer_invite_link.cpp     |  25 +-
 .../boxes/peers/edit_peer_invite_link.h       |   7 +-
 .../boxes/peers/edit_peer_invite_links.cpp    |  78 +-
 .../boxes/peers/edit_peer_invite_links.h      |   8 +
 .../SourceFiles/boxes/premium_preview_box.cpp |   5 +
 .../SourceFiles/boxes/premium_preview_box.h   |   1 +
 .../settings/business/settings_chat_links.cpp | 813 ++++++++++++++++++
 .../settings/business/settings_chat_links.h   |  16 +
 .../business/settings_quick_replies.cpp       |   6 +-
 Telegram/SourceFiles/settings/settings.style  |  21 +
 .../settings/settings_business.cpp            |  32 +-
 23 files changed, 1250 insertions(+), 53 deletions(-)
 create mode 100644 Telegram/Resources/animations/chat_link.tgs
 create mode 100644 Telegram/Resources/icons/settings/premium/links.png
 create mode 100644 Telegram/Resources/icons/settings/premium/links@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/links@3x.png
 create mode 100644 Telegram/SourceFiles/api/api_chat_links.cpp
 create mode 100644 Telegram/SourceFiles/api/api_chat_links.h
 create mode 100644 Telegram/SourceFiles/settings/business/settings_chat_links.cpp
 create mode 100644 Telegram/SourceFiles/settings/business/settings_chat_links.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 1fecca354..9f0a2493b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -110,6 +110,8 @@ PRIVATE
     api/api_chat_filters.h
     api/api_chat_invite.cpp
     api/api_chat_invite.h
+    api/api_chat_links.cpp
+    api/api_chat_links.h
     api/api_chat_participants.cpp
     api/api_chat_participants.h
     api/api_cloud_password.cpp
@@ -1297,6 +1299,8 @@ PRIVATE
     settings/business/settings_shortcut_messages.h
     settings/business/settings_chat_intro.cpp
     settings/business/settings_chat_intro.h
+    settings/business/settings_chat_links.cpp
+    settings/business/settings_chat_links.h
     settings/business/settings_chatbots.cpp
     settings/business/settings_chatbots.h
     settings/business/settings_greeting.cpp
diff --git a/Telegram/Resources/animations/chat_link.tgs b/Telegram/Resources/animations/chat_link.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..21622df3788cb21a08f7748382aad65caaf72652
GIT binary patch
literal 28567
zcmV(xK<K|8iwFP!000021MGd<vK+^C<*y*{T-}lPi{3^zOJiCdS(M}vL*W2Lh=h3o
z4M37L4t>mg#>7O-H|UdQueCF)va0JG92|6m2VmQh$kSa_UAZ%J=f1A>UyomX{_^n;
z?DY80kALtu9^=tHo*w`4#p53&Gd+Ix?c*QFKc34!tc%m*zdZgyv~GI*Mf>MBU&~D&
zJ^SX%N6)@_^us@W`sr6s<?hcu`;50edHM3`D|z@Qzn>m|_2jQlU*O;WYySG#H=pr`
zU;Xv*4}5#pFMj>eM~^=G`7i$Q5nkilCoi6U^Xl;r>h$>K3ts!BJmS9|Kga((;X}TZ
z|NYza_(l7~@)P-yXZYYh<zLOw$<NDAd}4nu7d}7z+~9Nh6<_3M<nMzG^2vYUqmc9?
zxdaz|yZYTvTnv+Q=@=(I;^l4cFtz{ocbVk>x9_vL#!P0~zMIdJ{Kp!@HynN-Pwl_A
z{D8ct{&(jG`beWaR_CW^?)xKtYX9B&k(k>k>LmZUzz?LVKM?X1@+E$t`1S*ClK=D{
zkT2w4+c#m7|L~jN|4nXs@?01Dw>pX3N=3HLOSwt@@#)uGz?)s+bXSD7D}MC+&re@G
z;yxR<Mc8bM7pvuY2yti0hI)+I$+E3S8@-O}$>y3`k0r|#8F!4;;+ka~FTZ&5?Ni;y
zc*Dn^zmOMt_G<qFj>YI$<j%+aMfWy|ITr6JaQ@pcCFW>TZr{kitv3W8@CkO0mz{Am
zvbI0TM;V#TN1xK~f6wQ9^2tH&jcz))aEwNF*e8c93w=7+a&#%;vOnW8mycN%(INU{
zad?)k#~O=VXVWp8j0^wp_y>P{^3}_ye_JiCH+=tKSMMK>)r!Q^(UyW=bw_8)6lFYh
z8A3b;6J-eH7*f_DBs<Cf+B6R!$as8`58cuFBo}#eG+y3cMwawp=Xrm(dVhD!IpF<^
zmER099aUaJgqQ3v2li;H3?QbX4|so>qbx5g8r0f(1W|@*F@hjhS6(KMO_-|?j@6%W
z41P6+ddzaB`6%y<x08P<qNNU^;Hw#C!CD!syp6o4HMzZ?&3Tghmw8C$n2bzL5y^0@
zPM#a(1DTa$4dHx)2&+NJ+a*~!^77u{<$@KJe~>@3uJSepc{@?Y2k(x-`!*HDiB6XL
zhV78#G$?YNH6r=UZG-icv7ltPx#G?@j(F=h@Ut#*HeB?t8A-MUBMH^rHWHaO7r3m%
z?1{II#PMzIYsauwN)B63#$aU(SOc;IOiDO_Z5T!%k{5Z({w(@l&Wrw%m12&e_;~=?
zh$4y@fIo%|B@twwU__$QT}h{}kMl6Ch3b!W!s9D;sr(f}oysv~x4e#=3)G7d>$l0%
z8T<}+@BBX1%b&7MtH`rrhGNluVKLskUEnxpc$WQ-C$GMEWaTLM;<Ntk)Q%205_!*f
z7|HY|mxCyXVnt_)>`E-9)FOY^i6RO%nBueixt!$l1LPq78|~KNvm&2-^#`7^U;R6e
zqOZS_znmzSb|ANR{ne`%&%b<n!`r^XLAN<x&F+C}*7jlh6c&RT5SxSB+%SljU!Gj{
z^2y0ZeDRN8Jo)D3AD_SY`tjd>-#+?>7tjCn?IZtq9^u_aWQ(XlQIuX5Z^`!UM@OsV
z{KJ!}`jQiM<LDlUrE+kh1nlJOF+^^!DvGU$L3WfyJ#RyKGPITKY>%r%mnAVm<e)6`
z20X|<E6~K=i)q70`D2by%`jTdc}}ivl>^jT#2Xs}3j?+nPIV}b(cTIc?-Gt)^|CvP
zK{*}5G1V{+0@_;!2E)hVtQWJ?Q2oeQOevQ#SL9`?oEkC&r#~xiSpt<X1l|WBHk1(y
zz`}H*E)*NkB@ET&#b6P06CVaABjY^C+-3~5;-oK^GFL>)TF!#cP`_fx(sG6NO{2LY
zhr^_nmTfj8j7Z;?8;5|e4aQ)Plm~|3D$JK6#!tSOu_8wYMi7(J^T^A2BvVoC`2N`j
znvy|}cUf)@@9)!cy36{BIE=(5D;AewC*Uq4ren+(Gg8j={<7?&>@rx!PL0nyzyCc=
z6PbR#dPx4pSNCeJi@{J!xbfX(-B&p{4-tkH)_)QMkscGA7<U)Dq#TX7%%bc9?GiCo
z#hjKUSqC#o_L74{WTt6!7n$h{b>ib-b%!IiaS{_Ja~VL(;#~}k_Ix&*#95nD$j+OD
zNP#o_KbuQ|iDHZK)!8J!>h5Zjh!Xk!S|#>_wo2UlV3o*mEe^c6-0B)RoEqX&nVeb>
z1cydG2B$8{(T2=Ogd1FAaoG@hkWFU`P7w?5U(S$YFhRF$g{31~);j9A5D<<`cCiPb
zV)$q{e$<4bZBnKxtfHg3<5u7cA|?~O9=W1karnv8if!Bc)r&u!+wQTVf)Xqgnmw@=
z(NZ<&U}CB8*`g{`8b_j@WEgsWcB{zaV^OKiqQHwl$F}2HWRd~|O{drCsU~s^!&zOA
zNj&uff-JmBKJW<fR8e-hswohxoF)~9VbQ1J<vij^=abIHq!McsVK<opUsd&Hc-II$
zaJun*f$bE$Q(G!T`t3f)Q9w>3L?Nq9D`!oHT=}OL>(OP7J@Yt~9}$%ctv`nF3>@W<
zDYl7*GK4BFq}ZaR1u?Rhmn)e@t2{?0E?XKv)t^m5ejB5Ncyh%nIInA%Av4eAlzEEE
z0#0oUhQbvc(_mK1r&Yz4_#6>XD3QSent_OqAXXM|PA0CQB(4Ku1&fGePO1##5UTtr
z?LB#(EoyfAw#CIHVHge;Io}v#4iu5d_iQo>TN%mx7Wp1~KX?_2X!)w9wP!F>HkH@N
zU=X`0Q{@=Hay~M>2-%&bD=bl97WTXblaeo#qGgZ+YZZ?<*2Sz3L3WQUi6n+~ZOh1e
z1VZ4eMKzPfZ%GJ(M9Np5jL>=D0=9FI@9l*YZxIsQKg^40*XZ6rMxOC+_$t|+iU?6p
z2M2&|7$jt6qluOcL#$bL8jgh|@(A5Pw3b26dgP`@I0?$iS}Zxnqvc{-DWMqBEfTt)
zVY`-%gE1xtnT(O=n7qD+8=aeSL3EMY#5%i*@TQQsJWPo@vXRY(y(zjv4ga0h6N@gf
zEWhpaq6+uS`Ys504bOv3R%v96IKbpp(In?iM0094L+9o=iO$emg^YuLmUg~6gb@Rd
z6!rY5fMv$TUtI<K5NeQPnGccc^YTPlRH7GTQFC?6)ERim^2EjdNAQx;4Y*Twhu1|(
zZxp9?wOC&n$Gr$OSp){wgS(3%{>QIQ4RL1gZnm&BH#VBiKYjMqSKoWXxr$BUWq%tJ
z9<1T~+b>={eILwbXxXSyE<J1+3PLR3rf$Ae(LbI$1Suoz0VE;AvIS*(i5uw<h;KF_
zGQ_YTEe!(?BM_dB?nyaoih91eE>@wO0;WJ;J2hysSj$rs`zCVd%AazQid7J7&yobj
zCFF|YFJ&>yo<|f3XNjJd$Q6jD6q`a#GZ~zmv7Y&t=@XHFTrTI7S<Wd@O9_#Q=n92l
za-Ev}m|(HN&a6p8CQb}2o`OSMr4;BqdHd>{MIpzUynvnvNSBHjMD~VZ1$kP{8VF4J
zQkJruCWy(2HZ2;fsue+tDn@^9LP0WB3^&X-<_y-myki*>+A!w%rbzAiwro6?4fQR}
zfWX7q*=FOwmXfRLa)iSZaV1SHt%skJ^FRb70%<EYh{FOq$JrJbjIbMm{Eo{PvXn(M
z^d#k=aY?NR9%V4acyfz`;GZ6u2FLN85C=yheDSpyQ;S?6m3siLh10cz{hDF9h!Aa7
z;W!E>dN&A%HWiOdOG6+cgBOs|t2|Sa!A3`|L0GJ22DC-2!C%NoMhc<QDe8W8gsB!~
zfV5N%O@6F&I)7PhR9W+B2++&Ai9GjHGja?JM(m%KbeH>){`RPd;MNc$5AJ#hd5}=h
z-$t^WmUe_FP<qq+5m|mTv6}MYY~W`-+`o7s1NqGa1kH+6z3lnw!<hvHe;B)$-h}IE
z(lS~2Wn4nCp$Z*b)yrbK(t8zS%Ehyr$MQQBS^<V*={q6l{;$TJ$|fL|L-*1z7P563
z#^}Dj%ux&?nbJIt0#Ad_v|hb*U!djFSg0aW<1h`iTuSiP=^q>1l99Klj5YffJwUiO
zA`5QsU>YOIP7^(Zmi7pN)jp{!OHsC>EI9|L1dtc52qr9pg#8@k!y5D$jvg+6*D$`E
zU^snj(kI}c7mX#)GmHL+_%l;QdpZuqb6F#P#h?)bG!Eg5q+7>O6+`&>%`N25|M>V0
zcJSx8;9FK)etBZ~QJWcNuVlQa4`adL_EWoiWe|;uZ?ez4uUC$3Oi2t;)`5KSbp3^R
z2vH;$TdAF$E!`)dJ$w4itAG3NFMayOkAL`+pZ&|lh95kJ>pUt8T()ia+fVK8m2i~!
z&xp@r;veFO?TA2DPn<*(oyx$P49U4J1g*8*7|l1B(X*h8&;R4)|N8jXzx?%w;OYDd
z6^C!`={T7I`R~I`4SezBvqzuHl)Vpb4hr_{B>Jhvx@{}4qG6dd-YO?aZBel!B4GBI
z;$UtZn^_cGi|QjVgD7WCMbBtcVOT*Ein&*5ASbgb&GZPfgbWi4XA{EXUW1m7pTJN{
z^v94aX!UAV16la#8ZPDN1XOBHVrNv%fL3TZ5lE?RusH0*0PFE1lodq8oQKeNKqQ!!
zk<(X)`NFfe7!6lh*bJBkJylV`%I{a_s`#Fjrm{;`D=JdbxXh8!DiMT_Rr9kNLzee|
z{R5M%q)RzH$ofD+m7y;AEhe}zSQewn_gZ%bE25pK48J;*f%>5^CNjf|L;#O&MyV70
z1(w7?Vs6e3pt7`1C@xuo-w_ok@=JNPfp9)E&w{tn8IrY<bQy6;%hF?Zz|%>(n9~zI
zsz{S>^JWq0M_CEq37e2ru<~$qHpKH|I8Ii!PwVg{-X2+S4NBwyA!xQp7L8@HJy!h_
z0SYmXq6uU1sz+eA$T^o<dcZTMFUD}LY7U`_NnR$lurqw1tR*BdU&`@8usTi55f+W(
zSFR$5z$fdZ9BXV1U7eOiVVGM6FlZwtIE^|*>ezZjW$|RAIW-NIB7b1phW5;44vD6O
z(vH+BGIgUP4e6a0$5w_+!!f9o9MznxFeF}3=W!|DN9+-CTRi-Yq*^j?A9<{&2OuL<
zmg2NPt^1CI9Ks-)0!+r8-vQbzA!J7w2Rp`~`o!fX9S!|MH$XUI@Talvm__&^9P!tj
zR)LE)7RT2zc7HeNWd4elr&I>9qAX<WvryV5N5vVF1kmz~&p3DoEOqk9-z7;9m}i#<
zF;yNI((uivg|`WHdQ9qmB6mvr9QB7|jsTCq3UR6B;ezw>OsWUCPg<~J^z^2l3e1ep
z<-$%MQBh39WylyHwu)$L+Y-i(qQ|+&*n!s^N`n7X&XY30Sr<!jUj9?zwIp$D#Z<`2
zX8c*SlqXvRa<7?%4==NTiP{_6@87gX%ddO1*tGaBtNtu|Yk$^WdseDP=!1;FN!nc^
zIUz|{#I><UW8>YMv)-Y%fTBA;A=cjvIc5!Efb?3OR9O<KX;FieWgM!AyeMeLf}~a<
z!={O<Ccc=jH9=<{Egu(QZv=KVltta-B99TTMDzv=D8<kz0kZW-TJy%7)yfIRA&ZJn
zP|}PxER>G8cqw1OvI}Gu506vk>v;mOrhsmZipSTo5s%pFqjZd=-qPw`R~dhprGr8l
zaflGkcS~|w=HuwtnIdNcqnX8sVIn?@hj@J#54!&b@rYQE?eZat2Xd)8BFj8hmyTg^
z{30AV{m^yGY*;&WvDQWbLB4U3&{{yKO$)>7!2{t{ZUmI&{1tm(5KtC-#UnAY2&l-C
zle2jdP%*MM?;xJLS}tqDF0co{Hy=Ex&lY>~ONIfruT^ieB4i~LIZ7)%BidLfvO-GC
zX@0=KubxHXG&Sf9H|#8ujBZ029@>Vu6*JCfWH;IFr)vgPx#OBCXnPY?2BFlvXRTzj
z>HCr)>Wf&GYH*LE$GVLTUhG<7pcGgvMrT<`29qgHG`RvV9p;+X!9TLYzzQr*S=F@M
zI0~^<<T?+{!a=b_Z5&hzykk#I+}|#7wkDIsW<=_Op+#q7HWoo>q^?3WdPR8u?2_<K
z!hjDXT82oId}N?}CiGJK+zzhg<3sy=*`IsgPP@;V0~unpi;Wskg34crNF-EVtlu4$
zFB6VmMC31XsImSwo{m|L*br|T^XjHy%;Qa`V-Bk^qd9@yH?n2b&q9)J7&w%ZY#Eg7
zl}p98Ji8RPqxbMB(+z`P-EtTtHr})uJTi{C4x<k(``QPOrm46ZJzX|eUpxH!9Z3us
z!fo0N9Eq%(#y#FKj(fOgGwgyuz%XjDfGz9HdCcM{biwPOqm~v&hh!!alFr}Z%t53q
zxsze6KHZLE_sePjQFF7~FbEVx+FJVqh8bJFdE<lS)z^==S{lKdlQa`bN=|e%l<(I|
z+U?^P&%S<y-+FoN)_suOy4S<)dbnK=x9j2dJwDvz97`vM8;Wc$bhtU6QkIhp0XUR^
zRG)(EKLo!~3Kd-qRz588dbYjxY;)JM?RvId&$jE?c0Jp6&$b+i2(UieYUF{p*2&4A
z=Wsharos34bPLzh?RvUhPq*voc0Jv0I&Xrb!xWNbGBPl3Xl#fYDYP+_<W2RWXRhbX
z*~@iMN8*+`l7~9FzyI&Q|KGp=zrX*VN7lX%slReGhRs~YXzf98WeRAAO0C8n+N6DZ
z(60~tK9A|_TdtaJ`Hf{uv-$yDc%Cgy?0rlL_+Gt%7@EnrqgS-FBq|C&*$|U2a1tB#
z4DhWL?F8^R!M3{XgMQt=J(z}`qu-Ah&Np8*-TE6d^a*eo>Qw46u{>7(_UN?@O%7~j
zDA*f8zby>z7<Z{d8a+aOd1?Mjp2jgjZx2JtCvv&%n&~yauyk_D2|o&k5P+_B(V*ZJ
z_&$ql2pv+=>x6U9Biy!Ddc$V$_SS$_2e_}+oZ1wp{<VI4XkQO~ig?KWMGd$)#hZR)
z7EL&&GF9{vBrWVkbq#80sul>#(MSjwqjmb|SWrlwnC)H8`G`*CZgfRdCRZ(xT|Pau
zkNe1Wznu0THJtONu)jup%MxcRp?`XqKR$>5x|es9?G!H-n$_s54{A+l^^C38$n1xZ
zb-bRd*K_rHu3pd8>$&=aSauH98ZK7Qb9K`{?4;-QXuTe-*Q51%w0_@?)@u^<VFso1
zdli&6??F&HDr~W6&zw3+Z(;8`j@o{dC16`QJ@T#R@!Xo5W^@vn8Js<e=w%9-AQXfe
zEn$vm9-h5%UNL?Flxznuw1R9>A*)DJJS7nkGo=O>hp#fAW&j$`M^_7EIZ;-CimVqq
z>H#ZB8X5(6!=;v8{~a;TFmq=^=;zZEfP%j|>P>bNkpEm$-InP<<@qtdUMCu1sO`*)
zN|D!yDgN9QD`~aRZKo(O_$1W{kP*K9ZRIdbiMqOdfS$-Kk22+QhrZ5u7m?nyNa(N@
z5hN71B7%hCA|W=f=2=9Lh#w?Gk=0WX0mr?fV{wrYKLYe|7ZN}4agY)|DJ9)OO!qwg
zMKIWAK>i@aTqb;+0_)X=S&2>N2!$F+-WEb9se7(WLK&7_ZA2;n1>`16LD5mUVmy%J
z)!gC1NpRCVoc$RHABEyk<aP`hTRPz%3Wz9Ami3L!Mg_0PvH`1#wB)<=X_6Evs9GTl
zqPzubJGxSlVF#ckdj3TNK5Uf=ssKuvqHWE*PA9x+6+n|>6GEcO@{s8gY}JZap2iHE
z#;TY3G(m4DR)s}7te*;CtDAiaEWjMd!Eom8&06Bvyjf`cx8}_p0XcC6mAJb>Pyqb_
zx?0h3PVC!<ZV=S>gX#r|f7yzau#-SfgPNg_)wB-a$ubBabXU4!wdFoGO%LQ{nVANQ
z>cB$=pwMPMIJb%gWKh?^K{1Mwik@+0FBxII&@V=iBBh!FqL&*T#6p5q4Gbj31TY<V
zCszfhNxmH`B-2WO0jrG<IE>*3Z-I}bo%6U_&S|i-F2FpX0TG!*p!ljL$~f$*Yq}j(
zYqBcE@eCc%O%xYEdKBmzj%XqQ^|A7(%hZMd5u&COX%W*I>Xx2qh=dAtuzS_3cNGtm
z6X9Y;Pj?*w5Y<lf+T7RFPiF$jRog8Xh!KENcE+BV0`Ov+h2#MmQ2QdW&W+1}fe*1C
zb3f~GIHEK#jP`-i1I^U_leMhE1a<<sO=^EtB>>9<jz;4gZa;~2;yAS$Yq9HC3jjin
z<JI9<M<hMq>wz)5m$e0K1b{|+rE3VBQrbfR0}yG}s>dO*0o+tg!wkU1Vh{o3o#YH4
z214Wq09l><p#t^Y_6suMgaM2d(xt3AmBG9Mpc+hAmH;MrTmnk`xU7KH0yu0|02V-=
zmQA;s|3fo>Hw)mfT><hC<JRG`Wd*bq+E+ls3YizccK(~2vyLh)E8uhiz;Z}H_~<JD
zsJ~%Z0Qepl?DHB>-mE+?f&+n)<FX29ivYi+FM|W<F@{yZpDfENU{J~DJ1m3yS*?~l
zqtrgGfzS91xc$_?XyjLAlNHqdc?FLvipiKm<8*SMDYt%c0f5V?i1P{j<Vz@vSn3Gk
zDUt`YC3u-Uu$fnDppf(jz}Q|%NUXXE3Ls?2a8$7toBCIT@uZ~4mK^B-*{Sm`C)-T)
z4Svp<x(T3xNe%=F$`KPmfZ~!L7J_cZXd3z<+>A^Uvf4&>0&o_nb*gh>^^2(obZrK+
zoz~A*fb}cL9k`T0H>#Ly)P@OI)9oEiAcjqxJ$7P`n*t=!JDBHKEe?jYYU(QMt<1Hr
z#kZp#vIt75U1@Sh(lNvaVQ0kd!Uc*_ZnKt!0#34!V5(up0dpv5P`lQVsVX9*2woX#
z0NF*}_BbE#_p~xKwh59SqN9K%rItWa#s>mf24x?RX*B&22sS9iIVUs{zkGCp;1tKu
zAX!0ut&pBZnGGOI9^&|Af^l1Lw{gxKV;sejBo>U}p3@++he-=9+}wEBO6X2h0^ciU
zO(Dw}aY0$Qvvla*J)pPj3}wgx*iTZfJ^YX3|73p7L%QKu$GC@9ZADT0vIADl?VR5R
zsXBe}r=S1q<?nv`!>8Zps3*9hD)go&yyC-;db;<b6gTu_Oe6ounT#S0^H;PN6K}R1
z3p}V3l8`N90t9N1qo`?Nq0696VhcEl{!*F-@54z9mBa@VOt{pjzFJPF9g|>=Jg{LP
zj1g7<wGQW!ugGP^q{zm#a=Vu1!bGBUYP3tSNO8pUaBhq|)W=vYj{1hDX9zKRH2rFX
zL!xUjSsbh_B^ev<ft)0jzSPk20mH|V8CzW}&~^ifJ2dPr5G{!60}7~D0wUml2H%+3
zlA;@1(AU^bc<3~ssPv$LZXLS0qY40E$5|QZ8YN66wUC05wdYwdE?I5Y2^h9J7I(R@
zF@l_j(Z(e`nho6}p)qa!9PN~I3dVDu^V@j8P-p)M=;p3;Iv*tZd}$;&YWotuZVpHX
zus?R=yZW`E42bapnDv!;ozk>2eG(w$I;3+Z)L2N1;e=(9a(C#I0K+b}p0CZWYSC_B
zsP$;Db(3NUhvj+@qM8;_w`->y)^|jHc8KhO^#i1tj_II=5$mUl40yAnaKM@jjB|y-
zGh(pQqReWCk=LhyBDFmr_(sXW&@m9_#S_nB)!5wsE|a)C>X_pOETh-}dSUBh-GLb0
z_Me1_jA^}K@ZI`FR)@_(!#cCeLW3W)EHg5l4D0N$U1%T;w8J_(tQXp0v(gOn6QdJ-
zy3Vl7$|{GwtTLua^1RFr+jYjF_Eol7WIbWfSJ`%vZPyq@Qa6G-S!JMk0{i*0%t&l3
zrr*5I$Uq8?@_D7<61ietX}AJ0_GPJ&PYB`cd9CrWVsFihO+Q!`8~&!7+*cd!CCv1^
z+zxad^Xu2!eTx`8i9Sd72%gP>j6dpM6*4PXs&&!IGH9e-S|TtJb`?!<ajfJBwS^EM
zu*B$HX=~TR5N%lz(EK`NMR+rOVV^ha2!v*#4jpd@$?=*N8zgm_w=EL@=viu7J>(hb
zL?;`MI@Cn~hzjN6E!g0((sLZrFHkwk5Jo0>^6a&9lmzspZ#3~!T{w*|#Ms$9XGSPF
zDyyt%*ZkMyEIh-g@l&gm(D3+`AC66kB18~)={TZBJP~h<OnEqlL?&g3(8MY^<lwtl
zqX9@SURw@?Ii+h}@%G3m>E%UX+O2v=fYh%f8kXnWtyz&_7W!t081pEXx0~t1m3poP
zoPkA}e9uN%V5%BT1op(BhjTI8TO?pBgSoZNE`hw5VVcSSF}RPH_TJ3k@zUw(HKwQp
zsfhnHf>w&Ta<$ZsGzyauqT*UlT+|cd7p*=`uBMe0hU8T<vl=^}sI`{a5;1Z>PB%8%
z?@WJ3kfg0LoT4AV0wi<5@gYEm)&*H%F}4+ua0S?*b&bHU4YFM2eJo#~irs^^2R(3b
z-Qm?`b1YoaCD3ulr29^~g@uOr03&9|)7PqZB&90UHfFMvrJk?1Tqj}6cYOb3TF{0K
zXQS?3Uuub>1Pn3doG4G@ZSg5y$zR{d(L~BqcD)0-v9}N2(G2f_n_2Z(=-!eKJpbxU
z3IPJvf|hUF4U&+NdyCXLqOm40Nzgh0fHBRw3P(_nFPn7xrJj<Bbb9#D6}WR4JV(be
zi`sZW;c_9KD!Q~K<{fmc7#$&ZBE!%aW|iw3<nqwh;L+i!nrYm_wTk5?moVbw_pq&M
z)uAEb56xy9?`i?(8E7!@Z6SI+cziq$q>QoRv?b?^K0t{%5SODuhW-T~k_9C_!>$=Q
zz)C6~>o4cyg~3k&3WUgJnc&Dkz&OFCEEA0B*C}QgSWZF@{+DHn#UyEEKxKC1TGm3;
z`O0&{>Ds3lEJ^bW`=+Ls83wE1IK#+Cs1@dXqXRA^#d58*0+GQAo^Mlca>m4J4G5G6
z4N@a*j54HUf`iy$^8{zF?*zJUO_{=^uHyt-<q;cZIJd!z<J*g9B7JB~uniaVt_Ck2
zT&6&J2LY3sp^;@deTot2amx&oS<)|4thuW)%&}Fn%z29UXIK+reS$45rar;sZe@jZ
zn_<3k8KxKyXUTn^VRF|xH%u|o_94u3yzdKH1%vOC3?d3~$7HJ~zIw>y7@lX@A_gCZ
zS$0ahFwAl;8fjZ*8QfDojkAn22}JbTX}+gZgKQ941G@Q(ZCf!gm{FQy^5``PzIntc
z3^QzD7IB7S3%4btMPb2dPRuj!2+PE;QcgZDb|=yb2-1Nor|7Ccl_hX=8YB&~mn|a%
zuicM(*fSDxD2<JjUPNFFAiBn%hWrLA5N`B6=z7T7HI0-=Rrn;cT=hpBE5~HY^rh6^
z<WNH6j$+{`=F*wQQs$Asbl}+tt~GaHa!cyf=8!eno55%n?&3>`s);dnU&3a(1}&`T
zSa!B-Mu&9eGF1i8Cd-+MI+Mtp^}HMPuv`vRO)$BEa$K~dX<#s(1*`KuEb3{D`_PlS
zyH6A74sspNQusxhH1CHg&Rd2X=Hqm0{{yob2W%%gEa2vF2q#zHs!MQqX4jU|f&Z3<
z(-gZt)|IxcNsIoMeaJK;N!$t-6a9+jo@aPD;k!s#L0K45fEiXu7*bE7lxO$jV*Kvs
zNy%7qm^o}s+~=c3&1v4rZXH-4`8L_DFF*Uw=bwJ@Gh?1zh_JTj_G0_D{{Lp`)V0b&
zyH7%!=<x3jog8+>-o(WFS@`ciee(3npSb`0K6_IL6@w2&PSgkQO1%#myG<A2s!Q;s
zhwz3@#M`f$ZvBm+6A}7^orp@VlSuAuS}g~vCW_T&MAryZ4GacRK=E?5dSf5qrWesL
zjCpuXFXE=x@T3><ppSW7FCy|MXt`6;K3I3`Y16)sxOCj9MWM|khz`Yz)v%4NgxhAs
zZ7bn^JL2tEO}GBW*p8Ux-DcU~gIek=9J*n>S5qA`htRWqt$6NP+qG^b+_od0v=Z(&
zB%ZW2Zd(#JZH+fJBo=tAiGe5WICPpwm?N63hpeG7e<AED#}F)=yV#8T4T*<aI}#5!
zv?Sivk;oEBr)`OvE6Un|YkKZTFJOyeWPx->ZLw_^yop6c)ob5{>NR(R1s#At?}HFJ
z@ptC(T3H}gp$C&TIz<-6bwTR)3PH%cW{QlJtiSK~Unux<H|Wr50UEszis-3a+$a~>
zDy6|`dgX}qwT^-je*xrgpeJiNx#0m9Qo46S6`ckQ()%Ect_1_X3B2>OWCGmzMJ`Ae
znlK6mmC9nK&63$X;oJ(>+y!xT8sJIqfj+txNntj2kw^kvFzc2KQ*CICat(u2lavu6
zfcs1je|`V!wXC@l80m;NdLLlY^%%Rxod<~u%}QXejmBN(9blzF3&+Pxb_cpv!tO$@
znqh(!F#x<(jI&$1`PA-RIlFUk^!A-t)>4HXU#@^UG07SJHlFPBFMs-z_?KV)=vN=T
zpW+c~1;uK6t}bF+Q!#HRpFe;0tN&F$`ltW)ufIKmeB!QrqDjhD4GGL8yW39#OKY~D
zW?mauw-YnNBT*v<foK?kO*YZ&#|h+IX4cs6t*$hcFw5>FQ1Iy=UVZ$Bzx?vcKmPc8
zjcPzdgNI+&dlp*kutSUe(Oc4DvoivPQ>dKHy9)&IW|Ir)$J;e`<HdeZ5fJahYIYOR
zSWZj{4-eHHJwwqu5axRCVYzv2N#OS7?hOVw@{k?~_NCD#Bl~5255Wg!aM06MT6CFR
z1N9sQXkje^blF7^K(~UfMFi+LVT$-@wcqPR1nu6#a`Pa9cKdSo35GvgY(xT%seEKG
zTM{A=;GO~~TCB`!CmcBq-e7AtrS$zF;WEd1$}pLa_C#A9Y`StxUeR8!YVfKCuUv#z
zF2XA;=T!$@b>N4j1B*M+fVxSqgmqWKx~mGjs=zC;*%dMU!qHY+&{_yU7x`yCL)10I
ziwy5qAOFjv_kq%kO_STY3Q-%aBqZD2(u(1x0qR+ATkhJ{Rsak@bSqmQd$Vh0>AiNF
z0u?4|tu;D3ZOa=gqIa$5SHA$Yw0=8!=e60r7xtVEe|6s=fOh9{<5mKZSsM(`X+3>G
ze=&kwT831B8plpPZ9+xXoC0A@?;TX{2g!+1GU+cioEYw6oERqo$l$Hd(V)PeuoE}{
zvNPUZHT-*Nd0utiRp&i$oo7ySE{=(qP0q!YE5F_~<8oDaSA};aKD)Z{*9^;5=UsK)
z_nVO_lZ5#iPyF!WiSI?1CmZkm6hzNyH%n+}-=#K06ee~;V>@cSmKy9oR@s-<5lww*
zP?H4>a4__LBt<1RtoLrvpzdfCp20TkRsdq5zZqC8%xC!E6$&kmKo|jFGa+=KLZ~=^
z&EQQHPu`_t0=N%ey|fRi<p;6!R)0d)00J=h^Q&<Wo(Z;05o$qxE|a1`L|kphZzl+9
zn0tx5o#lzj@JM;4p%)V56_^qryx2zN<B3<GC=pRH53Fe*@aSudfEEBvMq_s%;}~Eh
zmi|a0FreQQFIid|&JoH`4!?FRR`#d@*G{uGz|%)(t(_SiGr9&HfZ@WOjs+I4qeLC7
z8;UB={1>4!S|%*VCXslw6vu$uL7+zpgG0mj3QhzGbc6}uOAI_{1z5F9&#dPw_=fC}
zDt`~S<NEu+-QmA_KGnB}8lbE@?Loeh6us_*@MqAVs1kqk0|GsX^52JhFnsakv-jX!
zaAb98c!-Lh3ix`U)3ywMlC3;wec2duIyZt&%_}*90!_A?+82u<4wA4!8%{A0k-aZ~
z$?p^%XxfJIvk6W8%~sDjPmW6H+$tPA2XmWf8@G&;&E~yuVKZ<b?WEI@^RB~k+ji)3
zzGZ;8#dcVzj#1Lr+PxSeuHisU4IH@=^Euunt)H@D0SrS)fh;&?ZyXUkcJX8!t6R2X
zNc;t>7&lZ?Q~yw28-plbj(MbA9%iF8Fn7G7f+t0CpQ;D2Hk&ai?AU2erbGK`7Fh-6
zFR*i!=xVt_58)~<W^C+xgs)i48Nj6nbiTsVYE(7^Cq_e<QUa3fNY1&`ka^L%>k3Ll
zE>hWoeP<~M-(1FdEU;?Coz5s<*%bsJ2Z%45m1$^{1E{l1M9Z(Ydx8MJix`I>StPfY
z9RH<~{h|YxSH<~Fn2v^t1Z1td7Pmwk?7bkRzZRY`Ypcy@#4?E1ZoX{4TW7wM)gWlH
zSb`SU+;#!pSqoZBzJ2|>JDUs*Q0R)W`bO>|fY{K728@}9Y8CwO+2@ab`^B?YPu~Xu
zV<1HnaL?xkA@3p~HoV&Ppyd-)QX3;6fHx*}AHhbNz@p(gm_4GoK$VOO#7S^O2TL=L
z7^o!50;h@+vjii(s5_bE9OV%tN+gigj2Mav69X8-IPTR<KEwkH&eRKm=Q~x@AgZ?-
zO_kS$tC(gocG-2M!32gt#9qsD9f3m&`0%r9<ditf1JOzv*lh8Glp8c$XdvCdy|Ssv
zIY1*rNzTCga+qwztSF?QWYCyj7^Un3-Euf~qz4Ir;3P<)*a^VggR9$Mx9wKOmi!2T
z)RVZ|k!!cgh?G=H99@wpWvn=XpmZZnprRniI3Z$XD9CUC!*r*xBVI*);6+e!a;W|X
zS(H~|DEYR*QHj3Z$R)u)Y>?s^0-AA#BBH;1R2K#~eJ$V*Z6iyFTTv+5RaC^kI1#{#
z%ZrD8Y(oZNr_yc3lYzbyoWHm0_&<gm72l8i05|si7s8D0^sQ&e+}+%`{>wl7`(K~?
zAN|yPe6isN9~b7W+#w9MpW59k8D*Ntw8#)T|FHY*`v@w?raYAag7Gk>-wOHQ%iq2D
zaruY%`7i(UAmR}2Lohu)&_D!Cj`t)Ov6mV=N%Eb*iS6bFPcn)-xxv~}gC(|zgds(r
zRq{r}0KKLLvtEHPsi#X4&+nP-rv^_md?&-dAvbuMR6NZMD${N5c($N<^344;wzGtw
zFWE0^OCEx^625D^!y$dehC3@Z+|A85)23(Vt(tK*C{UJoa%{=zlsDDdMYQ0}ZE$fZ
z^?jrmP~J9*zwrs@-Zm#<Vuy|0YtWfCeLZ(?*s-S#J8Ln4jUa2=j_anZA0YE08EwK`
zWRRHbfUY6B_UiW6Z>%dE*mq+7;r|H?$6Ksgf4(Z8Yx1$#%(q&`pajk)gW^8#V?ZY*
z3W=#-uxBT~c>244`14Qx^p`JxcNyR-K<e&00G1@S%n)P;(ZDO0Zz)OrAgV+%HSqY^
z={3>zYwPVeVqjBB@ZiJ)*^`<$Xeec|h+*3DHkS3j{^s-a{MWz!;>R!Ez_O0wSQh8y
zKV*YUY)o)DSqiFX@kq7+biGFPKD?;jPk;W=M{hp16>`?=v9;c0oQDey^p<&iW5lwk
zR+Mj#{>869`sfj0%N}oV%1(<+U)*GIp`h*eG#EZvwwZn&5b5DJrfG);v3a1n;4v#_
zFh8<J&!cZ|w(P==vC?e4)zihRo*YXV<ZONX>bWji{o~pE#|9vF=h<a^wynd%SqJgD
zhYy1T#<~j{EBo8HruL+X8W;YzOLdi&&}*RK_}?zy_N#*w;uPCDUC&j+Ni4TKeS6LL
z^e%@C?v(il#<7~owH-3z(qWxiU8Xd;Z(F5ljjQ*g=YM|s;?YOXzWH)M)+@In>mBx>
z^&BFh8RX-jJMz1l+rbdab@B$RBK9q?_0HwNuU7aPnb`Ux!ku_gt%yPy7f|Zmm`Al$
zc|cR6WXVd32Bx371XHUg*{y<-vpxu=0JzhGda@TFHNEo|=*re?A?>s5sN4w$#B(P7
zS{fZx)A(G(DK@!rf+3;mU<)oeb9oBjKMxUaTs8mTnCS&K==nzAE;j<ud1m_HN}KE4
zku_`}*!AZdfxp-YkVyv_XGG~>RR$jhID8~mz}bedMUP;t0*RYeu&69yqDI4#e(=f%
zJyUvGaB4GN<LW?L3ra8)^~C^8=~nD!Iu3b?=NrU^yh}`NWM{+^NR3q)u`d)*xM2*?
zOJFo$^*DKb!Jc(AZb*#;5x;V3mC*PVBlCy=62E-};&$CBC}8u3$%=Z#f?%Z6d__%F
zf;Dz_{Es;)dv9eC0x5t&D<wX}5GDgfu*^VB$I|GG$t-092)53sjOuy}6+BfFXzg5R
z0UK24pmJl_3+ZTC!jDv|Q<fAEBObumJCJ061Z*N(tzPCx(R4t_!Ml9h7}DKlz-`F=
ztRo|o=!}J^yUJz^$CS#z8)F%(2?#~%3aY@|mlb5gkX!=+8fU<TPVrG#3=1A$bI&;l
zKCRBPQ%Y_q6{Mk+q{}J6W9}6x&y|Rj+X82rZ`;^a@O+|reW(KpIxRJHQf#!1a_EM9
z%=a3B8{gmCEv*k;1odf3Vv3a{uMh5%ywur7(4$ceCDTfOqt`0r;D#wkURI1!u0<Vy
zM<H2Is$=JF-Nv`?V&mEXwxvo(&y&DvZd;Bc6abLOVQGvZAv0^Ib7BIU(uXoFqZUOn
zyYWE##!#Tcl<7qQ{K?BB>Q)|#g>(NlmMdoKyXqi*ubWt2z4-D0pyJ%(UKH@rLbrxS
z1%}dKF|q4%nxjpH`Ur|bODhqK#Yq^KlQ7|^A@yWrt+KZo{0AF*&iPWV1&St7ZiLur
z*5(&<jwSL}F3OB7#WuGd9rTaja3>}6kdpBrz{3Gjl3Kq(4Js7g)O;!50);>pBPbfo
zSAtpe-uRVio~qJ(lD1jtrp1&QY!PtrM9b2w-oS%A0jobnjhxdk_qUD!q_AQYLR%Mq
z(-1&PT6vzkTgPD0>_fBA(JQ%>a{(^`b#Sd*8NZ8i6f|}YgCI~X$DpNIUXx;l#cs<e
zu)uIG%DJVWdeGx^@=(uP+{L^La5&OHucS>Ds}P_)3CYBv=hufc(y+@_m5_hKehx~D
z79EdGb&q(E2Frr`3pf|3n47?zthB_iSp)6z=tuW1ay1~o$^q7>Ny#+g9abh+kn_=!
zL{IAhX)~WL=2%2>MZ;;Uovo?xcR{f}I7dkrg80sb`@o|=;27*M03?wyM+rpENr~6l
zqlWF`FW^>0O&N)`lzK^q7l$FzIbM9ClC&?*v-J>k%B)*=VW7qnp%?6lm|F@QjdL2I
z$-RT_>`n!I_QHcKr{4CGVMfNmr@;F=9%QT{q+AYIP@_GLa(6i_QsQ>dX$+<b-^F+V
zk0Ow_27W|ygtc`7uNFqH+9>a`X3Rl+MV~tRp=1Mume@4Ww#IbBOfjQl)ztGl6SjNP
z#p=OSk-!CQyB`!zWPydBw>I+B8Z}rJ4uVG@f(!6)gL2C`XIrJvp2|7(CB7qb=GqQ_
zZHIpco`ieIo&;jWIm(HVXg{GpoqrZK7<*9&<a`X;gqU&qY5THED?h*WL$_w)V_u$E
zSSMVYra_ZK=&j&0fgs4wlX59$Mj@2D6HODccPorAMgI*vUTyEkI|rxa)-?(I5z&aQ
zvFv)Z6r|P$78!xZ;mJ^HKxA%W{3MO0T5kRCY>qObH!~VXV$vXfav3J8PmIEg%13Yc
z5@St>GEXFEEE>hJ+Ug$IBG2Y3wi>WKH2Cg*MBZcP0Os3^#@#9!v5C;*CX0eW)X27i
z10f4qU%ykEFV%9BY*4?)%9xrOxPo{iFyE8bSe^(6W(hnH^bl%3A+{(Jn2=L#U5HN2
z&4R9tZdtH9!xGcsTmteBPe8z*m|#&<Hqd19>M^id71SotbQM!pj$Q3xh2afQ1hoF!
zdN$##Z4Ow@c-3gMDD{}ddSa7rQCWF%c8mTgO*k;Po#}o{6HY>)knPb~+m^uZD~^&j
zMLF3hVg#qwGc8xiAt5h2cIogHxPUaq%P=J*1Vd5l4{7+o{Vv+MqTQGtiRZI%*=~G5
z#=imcp(_}T<+SYK#?to6Xu1`<v2?C?tASmcS4*c-8+ocz<N?7u>wFW37;aEJronI!
zCj!7EgC#BIo`Z<tLh4MRSJ<g1uSyTrW6``}HNB$<pUCD~yyQIr-P6akY&Y_aVHe3a
zXSmILLju9h_APeIP86bntkw;hsW>=xcFCKw=iHYrZgiD}1^p#3<{{D@taK3on%7ZX
z*HPQ$gO<9pnz4}~hTgZId&N5Q##R1l&$f8#MnFCSpv2dX>je;C6uaw2Kn-4E<+IfV
zj^<>#>Z6-zs(LDpXTN2(7|J#E&TeejW0z1(ERN4*Ob%A&s}Ch`us9#7;piBv+%u_w
zAs?lqM_>Zktdx&F-6Ed*dB~WLDuZy1Y#vEytfVmO)=D43a+eb}1uMr4UEUrp8I7Bq
zROL7e;GkAqFPlxY=!AHHhKxib1vL<cgjWVlgZxw$2fghfXkVxKBCk*gh+X-t(s8*%
z7i8wo#QiDpUaRMJ7u>S%9L8E`uV5*#768M3Q3H_HPvz67l*8aCVs|-$$&{?!CfJ{$
ziv$i`DN|nq2ggcUs-GeHCTj+~v4<R5Pdw68kuE%r@!Ge3WoXp8UhI%zOA^)r$V&H-
z&~08muypE#@#nUHv>wBzR()W2c3@rWdbg^UeHiNk81`jgNxNyuqz<Y1hR>8y&WjSL
zCUn|+Jr~`y4~jk!o%BrRbu))0C`neM(^D0g1)#~5H}q|PML5n8jR&{M=U#yXSftoa
zrmcOLChq8LpJrVYsp+7sRVvxKF}zIsgnq7`;T{?!qo-N_^vn$S)}Sjklj1d4H`;`Z
zOoY%o3J^i1CxNrPfl?vFA(9b0h({_QF0kIj42nMQ_8F89(p9=Ia?=%t;X^Ih{_PhJ
z0D<9_AO$)jh{73q#T05UP^6KXkM0PKq_}%>c#6uX-7=X^aZz2eJ%YBlM>MDq4v!9i
z$y&Ijd)J~`2+uRi#*6qfD~O(H7(W<{P0hOlWJ*NO8P#3PYSv(Dp3xyUo5S1Uy`j+*
zlt7bJh2?x42eK}Jj8c8VBohskAv1>ZIr%Wx=98jQOysLAkFh<l_LDo1t|>0@U%8bS
zaX{VktrEndU&p0}*8o|f-K_@g!$hT3?iEcJ2va-+sW_(P0La%Y2h<tKdI&^7!ruuV
z1OC=}M}&h=Ea+v#AzUavaR$jay5$|?<Q~ffMcmjIVnWebaj-SHK&&44m4IBp!O&9>
zxQ|wk=@Kp!n;^;v%Q<t>dO!nMDuA5PL{la<L}F}12|=@g#Uz*UY)AT1j`q;Bl9h+p
zW;#0*p3yWkIXB0_%4v?A^bnnJC`=5f*Rst^C{c_I8N5P<h|g`rJ_`89;=`jVIhIR>
zCSbbJGdfc7dE#BbvdImYvnViK?s%k5Of<~BUA1MSWe&?+>vn-}1He1aS@$hLpL(-o
zWp!R%Cx}s1s8(KR&OpMRf@v395up(;%fqE?!7?}=FrA~nKwJW2C|EUx7G-W8bPw=p
zSEN{TwY8Hc_zJ+DUgUxfJ^A(28uJM%ghiv+D@gHYjS$Xj3hWkg6fJQHz|I5?(zdW;
zWE$GyZtXEo1T+PvSMNL3Vhx1NE)$V3?BPX*KevQ`(7MoAG{5QOhS`S$4q9T*V;t5D
zDv^o1>N`-ZkHj0Ge}Q-fYhF910UP|`e1tKQj!g&UqE(Y}EIS}C!n3pu2bD$JY}i2_
z6n1n#tizo>7~z^raIDk-vM6b^qg7l3SB~1ZIS`2AF?iAuA7`NeAF=k}B~WOvk6hLm
z2FvIX<FhJfwAUg#;a7Do36)jyPp{EMgeOp4YMO0xC<qc`#U$0_fGK8`mG9h!XO2Sz
zZI|{f!vT;jJ(+5QTPlSHUI#Qz%zqFIco7ZZ3~^$)w$39pOla;Jj7DhZj?RoH<}oxJ
z33g9hU)3;T<0(Lsh?jDyfy+gfu@=sHU_fZDCgpVY=mRE>al1^9-!Nv*Gelij`6mLn
zP7e#%5;ETGMgWN;dci_>pAk*Rf$eFliCRGK1i}Zd#R<`eABn9sR<-1!sdwMtumgJl
zP_>}HoIFhlC^L2T*~evR&O~p|9d*D#l!*~$dIrdAFkGdQfiTr@xAA3=A(=Enq#(vX
z{6^g*K0)XD+L8!_b?o36i0H}JdCkoVvjrjV(nH|5UXDTHchwI1CPETr95u`XOQz6)
zF!m1Nh7Zi?x#D@f`nP{IzxvD9pZ@%b`Nb8_>sHi(Upn`(`|>yc@#o)Mk+dE(r1zuG
zUpxRPt=sBbaNYw|GyB*IPo0=GiU5RWLl)zutY(m$j_QQ~o_GX24jR9A4bulT1oBKG
zWinaAay6s5V$V=Cs$iD}7pIR9by@k#%my-t3g<&B)v{|nX)$*c8=No+y0=`a+C>uv
zo{4P*F89d(#BMS%^Gn-CL-R#@G>7s`WH%gBtD1jBzn}@ox~GPE$>u{eY_`8+E=pxJ
zHrJ-!T+6_M3k?O_cyKSYvi^!|YGf;xnt?Q^;Si>BsiGHz>QNTYUcA@J2*)T4WimB{
zy9x=(Ygn$O`F*4bL6{{B&J5ZDusngssj)T7=rUW7J4zey*Q;g~8^|b4Fm-B5t(U5N
zxr~&W<tcWiw|5p(>p?^<t!be*cEyR8j9^MjbH>`c6Joibm^P?(@Z2p+Fy@-!B4SHD
zzbFH?Q6mbPREk-v&XdbSbP@$n@MMx|94sZ^5|`3Sogg(t9MfD(B6eU|!^HVOP+u7H
ztx5piZ`4-mmbeWXKS60s(R96!fNJL=Jm;R<B&DMUha##n+OqbVF?B7?$@CubrcuSj
z3NY0bOQ_O@&XnWS+hM+sX=k<TH53q1Gl)Y@OzhWHw|0QiOMpRlT4~2db@7CK4-N<B
zT)nogYUVRWu0U(j`NK}Chr_YK>5>45G4;}_b7Ex6v#Yv>lD2jdHD@VHXH$S3TtC@F
zsHxHZ9h8FOH%x4mY!#Vi9Aj?P3(hXsifY`3PMKKW0k21Kq>*@KORZs4s)H=Us}OV9
z)_9=+6d<zTs9P;!LcyG(Kk7>7(n!d=w=f$kz!*VW3Su-3U(k)C;XF&%zooaGmWct-
zs;TtI2u5ogSvt)z{8~{?qoHNnapCBQA-2%FEOO%xK%N=579Y+Yg_1e-&^Wdg@*o@q
z4#1>E1sDZe&QnncY{%|?Br^TbsP2O%w-v0~V*UYLuC;rjni!a6c$`}Xt0b(5n9#+J
z{v|9P=X$qQVib6eZWrt^?cvC(31Zdmf}{huL?8-Yp!}X|(F4R|G1YA(mc>f4<Fqoj
zlBNZWTX|@LrwQnK1)XCMF7?_37>p6+Fj?zYD-<^^#t~<sqDR})WORC+Xq*&zXo~Zt
z)dMIl<2h<#->C`5f^7;bo;@OkNHUdVXh(+r>2#Ng3e^sn2F?yxbw)US8hgP?&{N)3
zt(k!kX+N|uNo1vN4~f@aYBru;$t$3JLYqkGNf~X?lG(BvE@KkM_<oEaT8H&SD1U$M
zs8l|3rR3cC-B3rBHRNvD4#%!I+nV>hGRiS+Iz*<d)$$OHn`d+=B9^6I1D*Cx9tNW-
zBW@L|U-kAA>KBlTVQ%hMGZB7IW7M$<=8Fg*1K+yNVM^}^W~UbBgLJFz&uMl=Jp6tm
z9?C@Bf&zF~bhW%jR|EXtqkkEY)#44vYP-mPenz0<zpruRNZioA#lNdUYi4GMTjV&O
z*ARd`3g}@7$i|1Yw~yMEkzkVpRop*C%ifu-Lz^z0vb%x0T_kk0sXDh)XF<Ywl&E!M
zBIjb`SxgQEfCD#Hq3MP!cUJ2uk{5||Vw%hAWq(E4!a4_&7WX-DFisvl-n=eXuuF-2
zRprakf(KKWg+Cz9Bkw>i*Tsu<Ze&byd-p&s-Nb=|ij@I?FMrVT&H8tA`Uin%f$S_0
z$1~b$VNhcFbEXax>!zNFBv(UP&p{@+F#R(NCBf<tnV^)J2DJfit2?_;(ncuGEkY5S
z#*|qog;4UdP=KSq5{lTli%8^fNB1ip;+i?Rh$N7GdMlDduwidfL+Z*!Mk+_HC)fhp
z(=(~W2C3k#lJ6pwct0EfhckFu7|@hCTP1QJ-B4&EF^uAj5^=1znni-Pf}}Em<L0wn
zgklx;eJhgy_#Rmlrkg!EsAID%6UPL{AQ9v*#V~)Hb+S?)eiK^-fEwOlo=&HA@=Yc&
zYM8)kQBB;)1Q1AJkV#^gp{H9*$%{+^YD`XLA}%GC-mrBVaP%S*&&2woPg2&Jt=G%s
zj-d;`StY>H$csp7i>@>hT;EU@v@a4|?W05@yKNSU1Y%0s#-v1V$<F&R#&9YT?-_?2
zBoY}F8#JtEr%<2{!3PH5Yvo3P;M8y*)UomQ#J<H42!CeOK@xgq)WH?u{WF5YJ4pk+
z`)t{Ed+stH?D8bsheV;TSfi{5%C605?@UX%d~sO5xlq+78VSR8uz+wf`G&!ccMM})
z-Lo0%L4gJlL$CC6eLK<6`J$<kB_P<@OV}W!7hJ}CQLrO>GWZI-ksAiTx@8>wc++;K
zj~+UD9y|od#2&ERm6*t{1`kiK*4GdIepU*>dQV2pO41wW{II%d8Taa@?W8*;0G`K<
zLQe>9o^>_~)^X@9$#MT#zs(o{#Y)X517Cf7GVtARr`=~Q#i$0A^W!Gwp`-kP{PHmF
zeYD*ATX*>V3=I_4pU!hA%pu<}-0_}ew5xlzqir=q0bTZ*nSzDItbm658(H!)<Z9_M
zw+mixPP`W?`7SoYtFIq#4`43>KdB&+EfY?TUo7gcmx`*7Up)Kz5q|6C75?)<!hc@v
zmaE-zwOg)s%hhhV+ASZR-2xWG6T1ba@fWgNoKGo>k&-J5Cw=uPxDt>bCDop*!ODl|
z47-{wuQ6NP)oi(%EmyPUYPMX>maEzF{W4o}B*^gEY^jm9%=)-Z{ycWe*<q5u$A(L|
z8ZKAE<!ZQG4VSCoay48&V8dnKln9Ptj*zU2+B_Pf7!LA3Ox@U+O7f<9U#_Oa`RlNA
z5_Me5<RXA&;zJ$X-~adD|L@=b-{1ewBWoXanN6(Z#MONh4I4Ary|8?GXdlnTZ+l-(
z`;Qv-swrg6$*47)cY6QyFn@d@!zqvfx6#dyLj_O<z^rzMs&^fh+lJwK;#t_e(W33r
z$XRMa>+nRuEAf_EqZQ!0wdticJ%{#WG?m!wFJ(U&_9>ax8fPZJbhRp2vO1W?J7pBX
z%hr*!%&}#t-+GwuJ?PELz00jLJPn|M09WMZreMpln$-D`2q#<<u){lJ61kOOcAnj$
zvNAbwZz-T(RjHKsSHnT?++7ZO>kaFn9)aqEg5adRQ^9KYZ)+!N+*XNQv?!_62BZ77
zHQ#1c#X=6N&3-?uK0X=u?zhwKvlc5FNYl&q4#%3?rHVm4=mWIoo!_1U*#&;`sB3%}
zEX-g}gWa&fYiGpm=EHpVGU|5sa`R^7a5?;hy`6eDU{?4f*RU&`vVj4|2?{6^^ac=O
z`weef^Xg%%?0ZIp_Udl{w0W^SmZqwFP$NzYgl)a1vEJ|Mo2xl<HD|8o%+;K^nlo2(
z=DRd!(9Ct3;0hP3C%y)yKGedTt3`9QXs#B`)uOptG*^q}omn*3BASPp`O5EA=F2?j
z%oo@$fZ_|<&#d%5DL2S?C6lRvSo~V`A%_AOKuU)x(Bc|L)C#aQG!7iH^#BA+8K%gJ
z=uwT)sD>R_6u`e|mqa#@>_Nwpz!{^L$x&570nyPqtPHWZ2D1t^5J*p%qP>(oMwqKb
zI+<9FgK&U-(uEUcSY<1l41$$KG{CpFvuH#jsHs^bBV)_%L^5CvbU14l*(Al@SfrB@
znV4tkpavw8-sZgWIWg8U4h5jHR^?CupT!^`2fB+UAV&_G05qNzc&->L5J7CLl*TV>
zN69DyN>Lgqg7T@jH8^8}c``xOM+Fqkn3_DuCtH$xFY?L2F>;iT_4Vx58<2YIvT(qS
z0VI_!81f1&k~t{d%4Y3g^~vVziwCR-%eDe-IBAyq;;}ScPSy^{TFGR#EFQ3My6jhb
z%Yy`G5Dze{y?ML!bDMz&=3i1EcL6!&gBb)={U9I<c))xjAsFSdBfE(3S6W1bWdc~~
zSw@)@U#BvvnJn(3j7lPw?jWNAX5n!OiASL}@M~psKhqEuSZUDB5P|{T%pfG#MT?L`
zPt+3`5#Mwckp<JzA|l(!ZD$ch7M7ff2yjh#y^JD2q{dAKpx7j4&>*6uv?w=;Xvc2+
zAWx*X2k`-z*MQ+uY*{dTas<rf70B}LW@G`}D8Q?LUu?^RHzVsqHX<V-%7Ct}_{jx4
zcHIvvUXJYC_??L_n;NEh1brjPmNg{fcma$Ez~O2YqZ1{pgn<pa7B$Q5+^C}?4Dbl0
zaV7;-s66!a9W2T3^b|ITjKoIzNuqR1=;P#C$S48z);5+t(;wjz$-gJ^q5(&^4y;VD
zJAkkY8m<}}xit}f4X7bVj8F(q$RRqdCXESXlN~j_fFCO}7Uzk(TmjDx@=8UvuJVSW
zi%MwkK?Ztdh*N?_5eP`jEl4QxrI05XQd(v@GJc55<7TpfvFk~_=&T}7=K|2hkT-Mf
z6$@FOVV0m?o9o8QPELpwL%FTvT%)R4!z4;&ILx;_Cg}CpcnwVh0{5N2ZJcf#gq{(?
zu%2?|0Zb$lSk6PRuukCP@{P*?#D*0MsiP$WXA@DD!s#pEt+PFvC}T_-c%|qpj~D>X
zRilq9Smd%O)C%T_hv2J*f(>}XoFN<TWej_OYWpeVhR+XcniCzH*yK#~Ue7#38ovnJ
zNdK<bAI7(d7O~oPIJQ}8^2NN?P7Fv)eqR7HIZm{J&5Xl5md4-7LVJ@nq$QiYKfqMR
zB2(2F1I#&yCUOseiV@s-6~vIkG%MxqL<qt>2mB&A4VP&K<3|N8aAT1JJU@^OF*VB7
zXcf-ejixG`9s^Rs)IO+D3<rSb=XMLc9A_E_51$HSKHIi`@Wb9)P;NwJBH{F731KUh
z^TUNgF7wWIV2jw@*d+ZNcQ#zW{jH5XlFR<y=Gr~k+L)DbXEPY-cDFW2;q0=r8@ccP
z*0w|?-`Ux?OBVimYh$^|UX2KJax0ex{2$tCv%p#>5@=>J!Dez!T1*+&8yG5r2GX-$
zAC+XrnfAa4nk3kbJT5>^jmUd!%qRF8bMGLzaDE(A`JH*D#q){Do*dTdYS`hl#-UmF
zPU}N5b9)g|N5IRU=h=Z5HEfS-Sza-X^DO3j4t0B616;l=r!{$V;HB*z*D(^oe{)<T
zRh8`Kyar4?$N>6r9f*OtoYseejDcTH>jMBg!C^Tc*V<xJhw~b;^HGj?Fu0JKQ8qB>
zu?o<2@pmBE!F*zi<tfJe9S-b!BD;!^^E}Psm@z!9T-U3a2Bm@JhBiv_B;P2|YuwJX
zYy2Nj`i<I#O=0tNgFb<j(2kT?Gw~(PfN{RzXz6o&S<kuClP|(i*H!1ijDUT;nQ(=m
zXM)3TCf#wvrN-;2%$Z1viJJ0YLg9fNu`Xr#8)cFWP)Qc&Rc-mcq}<M6p=ks~P&#^Q
zTiZCQz{(@{_-0O$WVQHq2cXju`LUFm2>5CsU`O!7xjQ(+SIhc=Th{M{MU|^=QkGD#
zM42Nr_7OQv@R0Fy=N9tN822bbWl2uH>@b7^0z2flp$Gl+)$e}u&40Z7$B%#fea=k9
zLINen@Y4H`nQ{*s`q&XeznK*dq+HNN-1KN%X0s+;3()b&v6Ou0djs1d`nqT0BU-JF
z+<JPd$zHalG=80M5>*tl6hTG#85(q=Bx8tO?`D{zLwB{P;i^j6gLi2H*|IV{;z%Xb
zcI`mp2!(>3ibs~bFo<|Shp2pJh{Pg<+F9!uw6sbi2YW1#6RjO_JQpL33eERq{<ywl
z!q;Q;mWGo>Je=bT@Jn&F!4yqBKOrB0b+NfM#xNNba1=Kemc(cvG@_=Z>a7ZYUTFN6
zz#~MQIg+kTpTM6HKN2SuOJ+*ZCUM+BQ`fW2{D2o}hpb#eBhSOgzEoPzk~70}26nqF
ztpJ)%tb?N7ENnP24N}#GmF197vef2GGCepiEA~)uRmIv8gb`eBzPZNo=y_3rky9z~
zdbQGKVTs<4b1jNY_Oh<z{89#nXuEfgOc0z@JxCRWK&hk*Q)bJulEK8H+>PD0*JTyj
zpT>o8VaZlv1)24`OAD+~PFGTD+;Yg<z-sb&_Kyn}pHGb>trqeI<VHzoXbsZeX;LIV
zRcOH!coiNFm1(O6w4CA~VOhDhbE4B5Y-39_WO9J}Ze#PO5j6o*rOlVihMHzw9ZXA9
zim<eH%`sE#a%iE3ik#=Xj4HfsKh*G~(pF5%KHJda8nzia_yvo3t+B;dqPoht`@bmb
z3!`%#=H*1L+t3#P>|CT)V@oQ5U;)gcHMAtIZ*_MX4S<EHHnP!t8)#&6zg1~u<NPc{
zcChGu`!UC2Tx--9kC|54LYD?MkcnkxjYiIb>XhDeYNWGtE*J^1wVSR5@iaMrQ+HI5
zJ!BD(YaEEOK*?o+%xq{+MuxoFE(nm5$wZ*kOG)8yk88Ul_fHB(Y~1Y2RHbTzzjyvT
zvLWMynbpUvsL08ZW=(}z3}sPOz_>`WqB2VSH|r_JQ2n5&7(a<!Q*j;_O$9g4*xOVU
zl*pn_y_<CvIB)Z!s_>F-(Ns`E(J!j%Ft6#<4rN#BqN?C*xItI(Ef-CtthzU9Dp4Xx
zl8Fj0Nn>0v37{eZ_Y;a*3$1)zMB=L{2Z-UT`^No)pq)*f*VU1V(>vQ`XsM=1=Y?#v
zjJC)Rxpo7*Io`lmbVPMH&{a|5MFb2AzdbvS2*O$2^W$tT3#n>?mEqN<D?uMN+f!h0
zB-3~|r{t%|4n8j@XPWQW&8Z=MueFQ}&n+t|z&ZCfSX9{ItqK!_mZ{9k$-`Tn4Jv4a
zIM`D#8NFW&Dkz)UmXlwq1DZi~;5MHvDhD>)VKs>th=c3~dkPD8u&2Ns1PgI6s6h7_
z27{_FDm+_Lq}xoRImM;L;+NT;LU;n~uZuwir$5W#I9pV-(@3B=+f*cWB;VC+RiVfw
z=GPll_bg#m7hI8ITp5=ZOcSV~CX~b=Gmdk}Ac;swdVEZwonWg~Rh6<T^zw9+JE%F8
znwF|!7A=d4Y~E4BN@;&(fwaCs9$_7XK~sVM%xd*`%UF?8HxGI~B#Z?m0=nD%psP?0
z&9&7_=Pj*eSzL{IwT(?z7Z^Wz=9?B|+pe%g_BAYts;8clt%U_8lN(KQC$dNUFoBp#
zjrs`6Xaq9mauCz`=uNMrHDsU0s?*A&%wQRoSW9tuB?83~^Lmq6ZqiTi6q@ab!7+`e
zL{<#f-3=Y*>fK$vyEB!@1Z`D!HZmUUe5oah!DGlO;j+!fTQS>kIA3dI?jF!WA(NP+
zF339a_Q40V!h;THWhA{~S9ms4fBDpSCQ<Qb!5Y|#W?97-RnZ^;iQ)mUBZii$h%kI`
zBGER5iey9p2Vk0`?asIn01+_+)niDjRb*<oB~=|B0<yJDo1!8x70_8LzFo>ybNp(%
zB&W`_V>xqAS3|?Xfhc=Q3aJk{t;F3^&#)wMTpTJ4G|TE(&OeEin!m<>OY~x!c?}+M
zs+VG5NJD9%iHkgbAl<G#Z;4|Z7ggm%m){IxLn67J>;*$gDU{g-3U!%Y<SbYP-KSUl
z=wW&jxi*K{MGA#g4<@#Z7#Lk;5jeLywT8;QxrlX{SRdOdxJ<0|<HQz?KrQnM+VDaL
zB{Wb+`O!L+W<Q@!Dw@MGl4=Z3h~*Js5+UePH2Ler!OpgwV#v5eGJR{L0mc}94oLm<
zLSf#MHL}3SX<MU^u^vvg)n{g`&J1(<l7XCRmp~3&R(#ToYjQwlvBR4aTHG+55rZG5
zlPD|PDy}pu7nMD;mx|I9>sB=oKFnbnF~el>)Ru<g?2OZi#XnCcd<8d7ClpDfQK5wg
z2eq&P3b+@0u`p5tqC3U(bf)-dV8PY8BkcMqr&eS`(#vr+vt|l0S1Gqb2}k=L5tZ0J
zVYF3zI@$iAsji}B#X05+gio@YrO93klz{2lcWQ8@)FV}*ZsvK6Y^j~6ku|@=rbI|2
z)!TL@rN4wkmVN0_>$OZHVjp>!#RHH>M{SG4A`P38@xPn*WPnp;;beu-GXJOvckM;d
z#wYKUks|h5g%HxXDWlac+GSV5il#eR#Esz8!+Ym>lbJKdCt3SLWg0_qXOCX6dn2{z
z1>>Aux#Cp7D(~8rVjt!aF+n#>WMF`FI6HB4g%WQ)Jds%k0dk8-z&q))SuBfxhUxSO
zSuN8Ebl5U#*<|SxFNY`Gs+w;*JLLlL4(79y0UG2b`r(OQI61=S!_$fiMs?JDb|U$0
z@D|J2i2wvkrk2B#Ee~ZpJJCFnPzLncv-5tD16V$-Xvadq5A!Oo7sN=at<JC&crEj4
zH2gVlPy`DyYap}`Q53Xw>{u32<o#(y0e_usGHmF1lgizx1&3M;+>N@HiX)HHiZC!M
z6U1#w+6q-Oyd^m}((bHg#?=uyvaM>&pu;7KN61cD*-~;C<{tfIJ(=anXE~|zFVqxl
zOrZmYM2e^JQ&GdFi%oHCi)q!P#j=qGfVVN+$yL8vt`E_2eK(aSDYMN4IMA|<2+KgH
zI)~klQS`m{xeP+@!q<@(VnOXxsURJYcZyUFA{sF&-l9n5^N)V}i~sz|&wu&z|G12-
z<`SLQ{;mJNX`hN1v{Ywr+y`nKvpaMqJ&J9Ex7&gJ;&=c2B>e85fA!?q_c>VMk%XMY
z-#9+}Zk`8Sc(ae&aJUt?;cx?T!)?F~u+)&w22O+K=+S5wS*UGWd><Dui5r>ZloJm@
zJiXvDemtOb?1-JRkEC-V0KIPya%F|wvz38onE*>lHHQIknM{NoHT9fUz!QVVX={ku
z9pbxRuK8nwqjNKi&K82_1ij~QGknhu1dq7Lgy7M1o^uL-0$-&=@Sw5<2t1mHKuIR+
z&6%V<dr!m(kj@P_I@{H-h3+}rh~0C7z!OSoodZz~x=QDw&{?Z|X$9f24RXLU(iD8W
zK%c-a2+yq;JU2k_9B#wlVF5}W6hW5pj#|KKb$-_Zw18=V+^z=hTQ|SO)LBF7l<8(X
zo-LNoVFTt<MlhcfJRVo9;_<M|2I(bQ_p-t@3}93lvQ@ny_Mqtrk%+rAR=<~e{WVrD
zk3)OW<IvoR!DA%pxDT7h#NXM95IzRo1(b+X!ZL3}NH4^7hL2#}_LBaL3-yEEiG*od
z7@O|F$8;hZlmLLAr|2#zijftv)&Q}Xe~^p!+OXEISUuoE=jWZ+nWllu={`(NCvuVf
zv<Sv&0RgJ|l7^{M@+-mcintQY@PxAmV(-S?G%ZX|_n~px$iy?&H_HU_MnYm4GV&K?
zl!^<Az%yJiJmTCZtl8&vO8d-BX%x!qF1&T2;Iy4}3+vC&>vwYE&Qh_g!N}VyUawp3
zcLbZe@jtN_$(lNfW&Y&#Tu^JV)T3`Bimfd!9JPvC+guCVaR-^ymR;!=tRL|D<M=~7
zSJtPsyHK2k1(=8?@vUN<V@jJ(?cSAhECx}U{RkAoaxUxyVhTJt;A*{180x9{wEpzl
zuYQ#4`zfA7KoQz*oC@_uQ!#HRpY-_;KMUV}`|<Do;SBPLyYh*wj7|(jmbq<i`)MGX
z`}Wh!YXfWdB9$h~itt%sy)`M}quCGgA=uBhguT_3rV?h^okaQ4PhNce%Rm0=pYuO`
zuhAcg{P^&D>-GjFS3UcdGy5D{w@d&S#U|mE824wNX>^ZnO;NWdv}b?x^I!bqqmLkx
zCog0@aBaWTMXx^3dVm3(G2d=u%oRbT3D9@sfjku>DlbeflNal7zGl0Mn^aY@c*b*n
z_wtJ;-#&f0AGiFDBAf1e#ge-T-=O!pH;@g!h(Dfq7_(P4-Z8o#!#!KVRLeTnfeke?
z5!))PtuJeeT*JC(6vLj+`*J4%9CK;|dlakMo9Thgjx~K)-E=zgnA{B`cLWBw_{jab
z4j(UAP93d6Fua>ca>ttn?`pj1ge$hL29B|H^BSq(6;o_I26|l4oWrSHhaZsN^{3>x
zq$0kV6?nYqFh(xS&E&YqdXEE+O*?AGLl{Tw0k@d%xvkgQE3R93P{(yTy{nH;set#s
zopztKV4_D8r;Vn{v6oTd%M}%HuZ=m=qV^xg9N*RTEf0PRqgQ2jg5~v7`7lY3cgSpl
zNa)0BmmjkyrsTn<v(VY3L;@RIEQ=^&iKUcU<Zt>Q#RnUVh(-RqBF#T+g1)OEdNo9^
zhUkMl#jZx^)d;;Bp;sgH{V+n)F`XEp=+w9vLv%`6?9I%ucJS4wAj{C@D@F8sMyPnT
zK(7|))dIa*pjQj@YJpxY(5nS{UkkLj6Z=z5q_x?U{CVupE7|7x4A5{jK(7Yq)d0O3
zpjQL*YJgr1(5nIZ@D0#?t1vi59z(K@ZI(=v8ylh~#%)X`c~d<QXs=e`xr=aZiN_KE
z3>8VR_SU0gt?K!Q_p6Wp<@UjS=k=)jEt$7=WZuw_dAO}3(`YlMHd+F3yKm9<>0$o(
zLe{U<uJQFSfoz*@80C1wFv#(iZP%&wa{Qs~w9e#IP7TSKW*{hgGKOuVZy%MwuG|aS
z!0%%84){(=I#_yloubd$)=O_`IvgOM*4l>S%CPt6j5LyKD;UVM{X_^r9&4;&%cqC-
z@q)>;^X0Vnpt*6HyqFD^wk+NShzV`)=`%qw6de1Fy>@i8E6!~V%b8yG2EBZ`Gw9PV
zr@aTwc7s@g0A4a+d21wtjuf2=&D*{|Kq`uI43<J5uJeMko5Vz(+_sjFpPqD<?|nJ#
zJ!oSN&pHbjba7=1cO|Dw|5AqVyO>_+t`ZcLyK#sn(qNcQ($_8^5k)K=6|Mx|E;+YB
z{4RDfoQY5zN1Ynt2O7EwMWQ5&u%$iMbrfxwI|fKC{hB-2#t-|{y>D1HAHzvt7DSg9
zDhxQOO%2}q9E~GCgUli<^z4kcR}=jG3d~-O(yLK=HA>%sQ401E8l{;mR#&6+YLs4$
z()ZFR&Bsh2d)dnhx_vcDXUk{PFXh-owdt2~<xIt@T94|3hJ{fZ5VNh<TGjWvTk2|&
zUM<qAMf&b6Qjv)!9IqDX)grxGr0=;!+IW<&7AdR|kS(2tNyEj$q}NJ?54C~nYLs4$
z(yLMW4vbP#{J<#n$_RKhO0P!g)hK;GbN3;p#$}=m@83hC^j-Bi<zu|ow0@8^t?psh
zv=ZVNK*l(|Cv0)ThT~t`zk%u%<e^HlIzb)Av5cNL+pq~qfipFDb)FKPL=Y5$9l+m#
zhBcco@@3)`{85P@Q|0f0UPyl*G>`mO&!_tKP(#{f`B~B0mudqOt0i~oL@>Q90z%<`
zU4$fOM`}W{K%(DD$)W})Epjp}j8daXMi;uY#GuN7w3MENu?L`j*R9B`{6_YJ(Bw_Y
zLMsAJjm9)2(4N+IritbTnKZOL54FZ4duI7<7FUG~rqDPo?kqrXY^w;t$h3&ilPuwl
zMJT@y(y1&?OI#%AMKtaWB<R3m<Ul+bi*06s1JACUq~6*~^`$l5QeA=&Or9lZ3H{sz
zn2s?iF{h286Qt(tGL%2b4?FKxv5V|fz=^B(=tGpa*Q7uS<wkp}RG{m1NIFh#ktRmq
z$2w1;SYOm5Fn)4!TnBPqgM^_TljkGd(L?8W@fu7zf18`bjL)*m${Rcj&ry{6hg?$n
z;)5&eP6TJUI=b9o0pV;{t4NlvUlt$vg`I8w4+ve;so3Pz!m#=rnup4w^u(v|@|dRg
zlv$Rf9<H;D)jNpoehx+yYv0aNbL#ALv0*l6u>nnU7MpC3aI)UyY(S)7k(;bpaXM6P
zqRo{lOnIJ*@;sA*FTjc1$V`rjEcebb%Z5<JU1UKX7rVp`zOuWHhXoEGdv;ytuZ!&*
zjeFl?{kG>XeR$T`U7V~xezosp)g&t*))JNV1LYyc77`W9d0&mKIeKxAZuGHMEF*l2
zpFaEQtMA@*@@H@@K;Q7@o|6-oUjF-VJ*F?7eD;tXrj$j)v{=}bV(TPNZjM+a*}?-M
zqu8u2&e069DXrH&^5vHH>8x`Se?dv(4_w_-|L~yPti_8KM5X>^{2r%p3&RkhZ0r6A
zaaOsL0gg9p$A{#A*!mVpgV4Fui*-tEq=Q8jSQ{*T7g5`m$%V^!Di<EH91^}N$EH|0
zt#3TTn_xmfy$?geG7GNQ&aEhhmt$7pGR_5pr5&GON^o0)_OYiqT_T^R5{Gn2j7z#i
z-mNsNZn>p>I;RZeAi>bZjtI;Z$;dsL%SE9pq)O$o4#(2c1;uCm_T2se=X5(-2j=D*
zM@t;d?P$kaHlsx@0814qf*3Uw;KfOVq1H^TtY(abeTq*!0$A;WbDQ#qB&JVYEo@oJ
z&gR{P9c7iCuIt0<j?K!}NV%%2>baUMjWvAS_b>2H#VoZKvb^8Hv@!)C3WCInzGnck
z#k`r&a|DhmOKiRtAAolh^@?+w&F^C8B5CQx+{4z*nh61+cOdy(t}R87s@3fqn%V-H
zc4(Kp-r{}0$LV*$WqcZ(okuI%%hK+S`MAJ#v`@Q$#B7h&ZoY(bKHLMk@;HhI(jh;)
zXbKe$90*N)nS3!T10m7sB0ZaG*JFf1P@U3m+ue~ullnTzE@X^vHCiO#l>#%Sy&=mF
zW9yQ#+tQCRx&2sBzbM*S1P)<DYVZq|Er<x<xbH{;yl(QYKoY9Ef;fnpL5L+Wyt$DC
zQkk-019%blB$1B+bKlz_#Iti`yN{WF7me?TptOeLBC=T9B;{BQ)}OqBj;7>eZZ@Jt
zA%Uo%8w4RL*~z`4fPLe8Z}%cvUQwWtP2H1%J7%OpeL04zB&ro8?Gr_t``JLAYJ)ls
zjZOHVFH<iOxOAx}G5h%8TbF#pzQ<t`{haq~_pEMNk6F$!>)W>1z`ATik+9;u9mA{w
zy!?SFKYy4JOS){8+aZ=?9AJ$$!xa5itvk_gtDDvX6)T#1odd0?v-HhGvCJ57kTA>*
zqF$G(V-NwuIXL>1w~IQ--6HsXEhoD=iV6mSGyR5PO$V*Kk*%Hm{?>LNIQCHl5c>vl
zN-<8;dz@v92o>VA@>w~5kWZ$%2Dmb|Zinvy^#O&G_5~mohEG~Pv|ihhk!40FcZM(S
zgrBD!4x7jJrwjwlvNmv9Fned*esJ!=oyK>eaNdiqfdkjRe{r+#xa6S9DFUihW5R<C
zp#AXK=Z}8-#j{sWA9558PJ{YQh)a8hwtYJ4?h@tc)bqsB*91tA-H^pji)94BldVFn
zAUoTG$=a|W4@E<*vQ2g$?S9m$i4SYrdCnMkj^oA?J0}#rN5y+E=Ue4H_&_-vEepTm
z<QT-TRxYU*GK_s-QJo6NbO03<l8gg|Y@))I<=%i{*|$Vp^ozi(SZ*7EkvtyZ`%I?^
zbxNbutf)e*<-|>Jp;MC{l%#iq^eie8*78HZW04`w6Pd=ETF^&Sf9k>%>n4iQSAiPw
z!+aB}%SZ3dD%bU*3*iV+?uk_lzJjsK)@DubO0Z%DBky>#VC9UJ2Ti>idJwE@u{|Uy
z5{$Z)T)h)((%vrDM31}6mDLF%B1o!-IpPh14dTRHO0b(aqL{^@Em#rkAXf%KtXg^E
zUD%XVsDRCkUS(>yR5l`2<RGv68?$A~B2h@8+Kv`nMIh?jiw3dFGR0i^?LLoMm)^t)
zL*K+aRoNLm2oz_5vI4|4c^<G*YZEBIjbEn$?ir)>n5*1niM;P1%pe|26DI13OjDF3
z|BkaXWdJAAL<MhNq#5k8@ttAKwrLqbZ@V<r#~H;5t+W!S?0SHn4&tmb#ELYaMuXs<
zcX3w6&6_yovChrn6nFo=%k$RwXSEC`A2d2<xQ)9sJ))GUjayWM^(xJjM6$U{Gm2Tf
zm1aT*K$xYO%OXrUdSYx#6S->Br70&+c5##@3#nJq6h*_Lt|rY26Ta$EBzABup-Hle
zB_bC#Nd_X&Hc0}zwTi2HzP;{0qy_3V&C)8m&b2u28N+>tTGO9ZYoho8rE%#T8uQfA
z`Vfu7yHr7Z{>R66@WwvJ1>&1{Ua;{$m}oIA`WaF24zZnlYIm;;a6R!E6L9?Z-~a8@
zp(zkN3kcS2nV)3H9Azr)WSjl1C!alg`pv6<t3UhZ({KL$N5A>vM;9A@@U2t?|C?<a
z{`OP5du5d!$A3nAhK4Sb^1D3|pmc4@bw>thd_uCJ3qdT<FHT&y8=SdWP`~-bAHVwZ
z5C8q+S3iFc)iUlw@cKW{av6C054~h&zX|AYYZuVrhBlzvx`24#X_ZCNkS7|~B0ITk
z>?fkrwxCFRU(|epxyB1F<IV53q#kbTNj>a0rM{*kx2B*SxyiTCD(p)cap~>1U;)*R
zT;H2^9eF}?vKMl>-^t)nqFl8fx6D=^mA9S2y|j_7&ROcra0P6Va=GG~oi@JPy7=~+
z_zt)A<HFd_+K<~U#1I(6NzB*-OWWB7TbNt<4U2#EinF_~yB(XiHEizpYaVXz$Bihd
zK{uwBD8qhZKdvpBJI43gkIMuwawP<Czy;^8u`wExTQBm}r`tuo`{lI%sHG>@8$T#F
z(QRyLY`RUq9#k8YAF9sJs@wd#pKj<j6TJ54=I&;)A6YiIYxzrDp$)p(HxJ6tjJ3CR
zo!`6q=Hgo$PF6yY0S&rZGl;Y>dv8N8zHtqaG-y3HYH!?p$?F}h_wr!=?#pt_op^di
zDxUjr_DuYptq8%=lc@9<&CjPI#1-E4SWwV9nDLVSjLVoi<}Rdp)4;HI4+6c7Xe^60
z7SXhD_dIMl9K%X5C_#049{AQqGd$ojmXNs<sopeD@ZE=C??f_ag1T8UPOOF3NM?M%
zWeg>=PusOaL)Q7a?!@4gZ<7qhHOPh0sZeLZ*cJhv1%t?2a>Mt-?dP_k%-u-ariJ3|
zKKyNKc^Dk6D}f;BxeV8om1^;8^}W9P+y<7p8+G46&UYUczpXrIY%TK8xOzG<w`P%m
z&o2&3Wc`H8m|q|6O1Yn1_MvH#Q;Y3GG(GN8!t@=-hVlPLXbj$BH8ku|prugNEuemD
z*!)n@XPKvnHs-t&I)?Y>a6#%9>;=((_Sf`J=_BKw{^1OQil>5-lRxff2iTy6Y7P0E
zHbTz0hE{si528vWbH|ULon8}dzqZ~gwcuqxC8T#kj(bwe`B=nvv>sg$<!!?5;pw0M
z!F=`dXXQt45O$9ymg2npr$RD`ygDu?OF<O{2Ff<Nbgj1g0IThO`ty%Idh@X*cD8$_
z#q-YCcCNVVI1d*Z=q>XompuEHOZfS>?M&7!$SWa=&py*61D*4#&Uxq=jDP;||9ter
zKYjY?SEyM0_Q?y`ip{IkeWCvQR)!Jv&yz36{?^^)e|ib7dCu=&A{+E_KO^!cDH78Z
zXiMlHeId+))l)FDlx|{OR?_MPRHJ0z$%UnQO!OD3lM5@)GGf%34fl~jqSaBHD(e|o
z$)<(t_6Tg+K>7q?J7gkF9?+_0V~^|WMBSgjH|hVCq({Lmf8G`DYz=niu2{HlxY$gq
zvT?^0(L)7TRoCloP)6t({GNjdNAKMfP=c=|3SyU{Py;nO+eNlsLkeJOtCa&-*JbJ$
zul4BBHV0&@dR=Jm=}GIN;$wOFXDQ{*qpOY;6Z(&LHO7yg{PpRJN97XP?zJjUg(fgk
zhb**}4Z}7l1CNF~2-G-59VgUG5fxRgGPVOC69^aZGTOh-Z3rI#@I4-lHlY;>0wwZL
z)6qNKz#(y~Dcq_NXEHk4K-+CQyP!A(0^CS6sL*ZgedefCZ0JlCSV<P0CoL&jU@uR^
zCMa&+<EU$4v(Z`hGb&QVB2FgJ_`mJX>wZ4hepX~VSqWnI`1fHy=Zo*>iUtIrnAN!j
z&&>bJU4^=Nv9-0<z{s)2O&8~j4mMZzlpS(|307dNP;e{_AxBXhrmEub%iURyO2C^P
zYtAS7q0ZOAbhMMta-y<uU%r;7Px8w_0iUp|tLa^O!}j-6ls9oLe^-2%61sj{o1LbD
zSuWt`tsV%9m|BM`^+8Z2*3y%!&#D%c7O|<tG4V&2VzW1+V<V*{()$qFxi|0=J?iMi
z3rb2>d-I=HpZZNTgDfv!2=s6<&EU?Z7_5yKR}FxPmVL!zJ7$8wwa(1`>0$o3@ABO*
zr~OAQ+cdzKZWj_<yES!=pC8&6Z@-PM9iI2Kgo^{Q!^L(-IM?p*7vCGGtb>i{q4gC5
zIZqLuph6cFwj9nTu<IspY>sH5&3QDnEXS(txI(mZ%iJnstZ!EE0{JWF4*@N`T<Jsi
zZc+K)F63iy)Vgji%kdffF)4lpL4JA2CYN{LQq6e1JFx;@&dL-9<60)xF_VYVN*;Nn
zJ*iLuQIYeb9Qgz}En;1?lT(K2BCu#&n2qZyCnr)M-rMDPjfm#N&>mFTn!fy&Rg?sA
z&0@VOh40Xuw$+QpbU|}Eo=YvbcW`8K)1KK!ZdNjl<YI@j7Pp_(ao)tcqUL^WM4`|e
zRXw{y-3@WXt^moq21<Pw{Xr~A5Vxh2?f)94=9Ix{{$D0HiRCr_?{10?&xMi(WUSpu
z(K$y}JGsI!Kl~Ocx)=YHzy5Ll$zOl^r>jbOpFI5A@<w7oFmYsydrjuZnsw^v<0sF)
zT2e==bkU2OYChp!qBI_rB%dq?p?=dpH*JmjR;lL9sy=17a{Gk1d4eb*KH*UA`UJmu
zLTdGu@xBkptq}2W?<bU`Pq5nu#5+C!Mwh;W?S(DYwOS^l6(HZ<T%?<Kih&^4rDCkl
zlSRw4_)-oA6n(PCub%6E&_ABdf2`|`_I@IczYtnYT6RaI@<Tyc#A|;*Zj4QK#fu3o
zH=@KJH~wvB+y4Ldu4T7v7zq9lYlshV$xrazrvg3pl1sm!|K6S9Qle}(h+Qj1038xQ
zwjjz9XSpxV+?=yQ_%HL=E&uzQ*tmE0nw|aiw_^9lCug%ORQ6Z-ZvVFP<mv+V2AQon
zX1+5>>hlMF^z%bdQOymrYZzjdKE&k6wEOZAvLU%*t5M!#gwkiRq6NK0w<BCX<VQ!q
z(^-FnUxpwa!}<i5b#VWh`RMY2-bSE30TTPh`*@0wZiyOT72B&G0`^&-d|lnR!A}Hb
zpDrj+H%rpB6U6lkXoOZ%qwk-L5pisnhI^(yWidWg{Xnp{!l{QiS<qULBT#42Lvz96
zT=FL(Eo)LSXykGr>R(tAkFw}d7Tw>;@@fCVs3J(zdH_I@mbyi3a#SD?4jpwFsB1U^
zC<{S3H>r)Ni!?|iOok#d>!HyjF)9e!$hZJilPi29HwTu17KOncM4E#lW-f9w7i4ll
zWY{E~8a;*We#kLwN<a%)h(@yL)~S_(GCYcAC^UA->Y$>4RCw3=b<v<EfjGo3WQIm(
z+i5i^eX4Qg+^CJgz-U|&e$j<(86YY7$nX4*Mnmont}c1h-tvApkFSDx-W}wi_^FY_
zK@m%)G-5d4YLpX?(o_Ztab3sTx!H3IqVMu`po&5HP>fL+B$iNZ>~&BQ^eE=TpkmWT
zv;n^v9qwrsBYZ)Yw|_}EJ0^Df1v6<#+T8@o=-3v@dXfl2V_lkAoF$1nnAs$i4doi6
zYZi8i+5jU1ir8x0;icj@cDiW&=`M&-QQw>&=soZR+nfrj87dn!d&mqL=%3L)pI%Zz
z70B2_e-vU)?;jr4;sI-+zFyUEI7ReyhOgii%%7AFrfVIVYwbVa1l;l6-(Stu8ZqVC
zV}or^#hA^N*8LC$|J=9j$JM$S3o>Xr^%a^y>f-7<$;gOa^-QD^j<$xQt>JZT4e7Hg
zH2)A>Z=v~2aJ@yOu)bmf3u7H5no<Gqhx|}Rle}M13X(Q3)TI^68h+QAX5}cLJXk<^
iyIg+#JfFXxFGm68OBGOjeyW7><M$t8y?%ilz5)ONh+I1W

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/links.png b/Telegram/Resources/icons/settings/premium/links.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e7913e159080cd3733410d0c23b474ee6d2688f
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq00009a7bBm000XU
z000XU0RWnu7ytkQ6iGxuR5*>TmA%V(VHn5n=jU|f<rq#Wlw|a}5go!JN~}hck(9C-
z)Z-5@ve{UaL`WEvlF7?}#efVLlts?<40p-T!BY?4>Dzr@*XMk@?)#kcrBEo2$0K@A
z6h*yB_%w{7sDJNMu!v_HLZQ&-^O;O0y<U$H8jr_=!Jty9oKB~wskn=gNMy6w07tvs
zE)t16hHyc}Vv&nzx7*!r7yCk?@H;4%%iSSZmbKYz8jVJ$(>a|^mSq7To6WugF$}}a
zVlWsi7R&j3zFaP9wK^CK;&p~$o`OoH(j6tA&)?EJosLK(!oE~0Jq8g3vE6QODQ2^o
zVVHP4ZZ?~j%OwDKy<UgIfp@ptEkO`h5OGVDN~PEXfKsV68jZ17Y%-a+T(0Bsm`bH;
zwc2X6!ZlK<l%lA^;c$}*A%qa0&p#Xv_-Ua~NTpH%z;rs5$z;i7((QKBG(DfsuX*?T
zJxP*}XVhx7aFJLnzIp(#*=*5h^lp63X7lN=1Azc8vRbVkj|cliBB9soxu@y(`(NFo
za=8ou%jHrom)q@jhGA%$9*stKlzP4X>K<V=8VvwApU>al-|2Lko2B3H^LV`9K?tG6
zV!`dl%49O!`u~pqRuYK>A+%nvd%d1ktHtQya9Ai5X0zGDmit5`Nmi>>0BAHCG)+J5
wc?h`!2?T<0IDGpa{Sovxee&b~^{L;{4;h@yb042iGXMYp07*qoM6N<$g7^&`YybcN

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/links@2x.png b/Telegram/Resources/icons/settings/premium/links@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ef36c850231f3779fcd6f3a0d8d5ecd8363b250
GIT binary patch
literal 1253
zcmV<B1RDE^P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00009a7bBm000XU
z000XU0RWnu7ytkSmq|oHR9J=WnO`V-e;CJ~EsOlwFs%%ct<*%j@F!e}3&nCJ<wha$
z=gQ1VDW!H{wJXYsP%flgkUvRlGGTRO&7WB~T+nPfW3#P<&hO&Xey4MG&d&BFF1#<F
z&+~aduk)Op&*yW_cv7h}5D38UP-<%GPb1JJ6bgSD;eQE*LjF%PQ1u5CO@Bbql<+T;
zMIw<>sg%p*85tP>@cjIIeSK}S*?c}<{HAd{_GM*dTCMi%><q&&oF)vz&d$!XT5VZb
zSv)W?0aaF3uCA`qA(*tfx>{LT`7J;^9#5y!aYrFbr_+5gkVqslnN0D~5HgueB9Z88
zfFu%$!{Ojq7)4Qw#bP#_olYlZ$l-8EB$6)xvRbWNP%sQ@YilD<RH;-~S6Ad5tJV6i
zKt`jH3(d{VO<`dn0Ayrj3=9mY)#}{bTmZ<-%)Gt5C1)Cq#`uA1YHGO9peUM?lLG+l
z?d`9xuSD?u{avkA13+nMDJ8$Ux;jpv!^6X<G#-y9DJcm6y1TpSqeSh!y*+a9@bEAm
zAf-~tr9C)~S5#Dtj*dngnw*>jfZ^d`N?fT_G66Ae9nH<nOhaK^TwFXpK8}ox$mQ~g
z2?+@a01ylY>E<?@EwU+7ht}5CSi0i#`P$pt$@z_qjVOvz(pp+t0AP7}nG#=HTVsTY
z2$YzZ=yJK3Xl`z9^78VC`5KKzr_;$~G62ZT%sf6m4ySEyZUR7Za&jmXqByu*uEfN|
z7=T0~5#1$BlbxLn0IjX9KA-R7<AcZ?92^7ynM_8c?e6aK`FsFaSy`c*ghHW+3pX23
zFc_p8VHid%FyUvayu2I$>~=ej<5N>p>+9<{j&E&k5k3<W6A`Z}7!1Y+l#-I-_xtHa
z_4V}t(9zKmj*O3w6I1kheIO9HySpP=#X^JQ_{+;nN=ix$Kmc%Xa6oZ6IXM9Ug+f7z
zPfScu<_ZLYxw$ze8XU*>_xB?fWqa(cR%=yN6*;o9vO=_nlBv;XR4Uc-^78%tz1Qn4
zE-vor>5)pMOwNQk;}}zinwpv@m(|zT2h6+M`T6<u^fXIX$ZBY4V1!`;;`8}#x0~#;
zu&@9CU0q%D0y{f9#4P$!MAyT^16y}k_OhOy9<q_w>jeNFk9Tx*M2>H7Zxi_jgMmwX
zdV7201OfmALC9X=!^7CvnA7PzJv|*78X_Wky`Bq=-EL<o7ab@+KcDhy5%GXLGc&`5
zCKL)0$0imao=_<C`~56QB_$<hvso+_ha(P$V}5=fMNxr3Ad|^DJ39*s3RoNn;W%Db
zS7$bx*?~A6@)Zij<>e)p9x%!4_14wZMJ*J=Yfx5JmdE3Xj|M@IqM{-$RbqQlTwGj?
z73J~qQKQjt^au8pny##@Ebhq&f-EjBE-fv&-EQu)fcwV=sZ?59TT6}@3<d;2<Z`(}
zp%9D3pP!!?hFx4-+}_?^US1L#Up(S?%QiMP$oHbZzdz1;QDLG2rKP2jkF!TdM>RDy
z-$4T$e?#f%>2Gguv$L~LPfr$$g*cdgqy9b%N6{ZpH2pfDUnkyg`+Mp?&Fj9U1ofkf
P00000NkvXXu0mjfRfays

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/links@3x.png b/Telegram/Resources/icons/settings/premium/links@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9b5c3ea1a1b83bcae023a418b06eadd5b09ff51
GIT binary patch
literal 2121
zcmV-P2)6f$P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00009a7bBm000XU
z000XU0RWnu7ytkV`$<GWRA_<in{7x_UmVBJ9?Ff)>qF|$bm9{|4TBA7<w&w*;0w)%
zQYy8QX<@x6d=-&zdKE%MXlO`ag$TArATb&)E0)Mov#DcjYWY~snO>N!J^f$YKbNuH
zZD)6Pnc?@<@chp2_xs#)?!CWr&Xty$n!2&E0sbu^2m+#_qP98>>J=3gMgM2PwmOGM
zX$Ne(X$Ne(X$Ne(X$Ne(i5ckt2!h1N$FtdNti-X|Y@3^#7K<g)1!_dVQd3h43JUh@
z*^`@_D-Z~>va;gi<LPud0KnyPSu7Tl$)wZi#>dB3S62rI2j}PKsZRny5DLA?WU|iA
zPJ_YVhL*u#=<Mv2$z&9!fglJqU>pvoxw(04Yz&^qS7T#i&CSgm4(D$HD=jUZnVAU(
z$x|~kGo_`aTMQN#7uVL-Mir8$+S=M;V`H}lOehqNj*dox3e)K5s8A^U(_kefB^HY%
za#WZs7E4J<2{|wtf*_&3QVI(T6$(XkbTo;Om?kGDQ4}>83=W4QJ3E`h;rJUI6h%*;
zK0Pon5R!i~BgW_R7Zw&s4}xB=zj^Z}jYjiwE0f7I8VzBW`T2Q1pC4H;8jUtQJWQJE
z_3PIuDJlM(vskQ-jt;_(!^6YA*Mds0_V#wtRL`D0+r4`?=7+=K$Ye5wLebyf-`w1s
zkdT0f=<4bs?B3qq9w{)1MB;Eb$Wit5^x#xQMMbl-v!1OMi{;9dD_Cn%Qj*bV^z~r3
z+w=4DsRyIe=}M)N9F<%yXR%nApUTQgo6SaOcIM0(%%-8CfzUvyRAL1um0(h-)NZ$v
zpfVbbOy>Wkc11;nKPtD|y|}ozckf;RfIuKvSy}Nlu-olYsT2|nc0E>JUXJG%lFVka
z!{Gn`)YR1U_V(fv(pSmJ$@};32LR}Fx{;9)UjrtSSzcZa8yIH9($dn_*49W27bcBH
z)7RGrV|nS)B`o68r%wqD*4Eb2($Zj{pavl`Gm}K+HZd`w(P-#&I)}rd(P$q(emr{g
zXy7g@D=XL!{GRkuY;0^sM#kLST=4KPBi7Q=64DTvOs1Nen#9CJPbUlpqpYm#&6_s?
zIvzZD5C9Mt7pK$d{Mp>Oa|a44C>VpmP^nb#R0@S6IXT(WgXg=I#bUL#wi0%H^ym?G
z2bPqS1n{p?sTd3f1z=n*cX@dklB%bths|bV9r=9z`Sa(yySrb$e0lBKwL^yv;XWTc
zc;MA>XlN)dE)Hvb{``4>5X;NUTrQUau$Y(_6h&dE`uh6td!wMBU}<T|%b=;L33u!H
z79JlTPft(B{$5>O9XJY#qA@Ws6o4TJvcA3^lu9m_<B#(4@^Y+3`St5pV`F1gRTX~E
zG&D4LfejB2<5Ty@ks})$8-W9@udl=83^igwgAEJ};8YhbT)-=@FJHc3f6U6tnx3A<
zjX!<*g#A{l)k#T7m`#3u{`c?SgI>XnjSXr>Ea+5RTU*P?$-#`Ps;WF|3yZ~)nVE?-
z<>cfjl}h}5I6FK0<jE6!>WW07uV23grJ@py#bQlPP6mi{>((vIQYaMqUIM*dj}=Oo
zva_>mYilbjD?KZEu~-aA<#xM2fBqcwcp0`<eEj&azc46@ip638Kw@Iz)YKHAjlp0j
zEG+cryuQBv=g*&zRBpGsv$Hd3!mwbqwYC1j3=R%rHe#_jKsHvZRW6sGJb5xDC56Z1
zAqavX$hmXp)M_<65~k|vY8Wu6l4^W>++Wke!UFaqD=RC22R55sR#sM4R<^XX#AdTu
zEY|Pezsc<*O-)U~m_b$dCX;DsXo#>0FZr!jYfwK1gW=-Ei`TDTx7+RHsMKop^z<~8
zDP({fH*OG446Rm+ZAyzoqQFzg^L_R9?b}diAf~HVufjq>f~BOSeEaszH<H8QIC0_x
z0D#3}DHIBS328JM9*>8)I)40kNKXq~Gcz+@RVW2u0D#-KZxhD5fB!yaaNxiJ!cF`S
zA3op}lSm{Yyg)E&X=#B>HRN5Yk&zMKcrKSqB9UMQ85tQ}U0wLbqtR$=ZEeMC*4*4&
z`1h5UbUIyt)pxjHd3kwGr_(p8$z;MS3;@8sefz4aswyihJy*LDiNv=ohF8!<YFJ<Z
zfU{@M5(b{1pD!*hCR{1)+O_NQ<;##u1VTYRGr|G`05ml<5r%g-9R2<Md3kxcxw&a+
zY3b?dLZPszsObIs_oR{BZuh-=_d?B({Ao*leSP3;78e&`O7);>YilEsURdX26%`dQ
z>$Grm_wHSCxrKY8SyWWya=9XbWVKrB>gq@*M!^|0<c48LQYw`Kfgqf$Lf8rRCwz@e
zi8LBbV`HOKD%I(9VY&+U1D5#s_%J<Sdhz1Lt5>gjdwXp*8zm0I0%Nn;r%s(BY_i#G
zHk*yfWU|?8-!nUx%eA?=>2x}^T5WfC_r%16R;vvs6JLb|CXq<6y<0Eo_4>NHI=x<>
zl$3P%@Zp@C93GFy<#HVk2a2L*vw3Q2N~hDUuC7|GR_w@vdXav3L`O#xp3uE}_s(;Z
zV@nj)Q<3m_`0(Mwzu`lEl3-je*Xx+a>2w;6#^U1QNMuPuuzMa}5{X2|jvbqun?q65
zYPJ6O@uQ=oL#0x|><;`nk(-KiIz1sFA*4?f{-j8b7y!WKa+%F$YO|qM|LixxJ7C*Q
zJ7C*QJ7C*Q3;=-B>D=lxs24LaG4Y@Lcj5m4>c>#-mOudr00000NkvXXu0mjf)1d^K

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 3d1ac3b3c..5cb49b2ab 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2211,8 +2211,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_business_about_away_messages" = "Define messages that are automatically sent when you are off.";
 "lng_business_subtitle_chatbots" = "Chatbots";
 "lng_business_about_chatbots" = "Add any third party chatbots that will process customer interactions.";
-"lng_business_subtitle_chat_intro" = "Intro";
+"lng_business_subtitle_chat_intro" = "Custom Intro";
 "lng_business_about_chat_intro" = "Customize the message people see before they start a chat with you.";
+"lng_business_subtitle_chat_links" = "Links to Chat";
+"lng_business_about_chat_links" = "Create links that start a chat with you, suggesting the first message.";
 
 "lng_location_title" = "Location";
 "lng_location_about" = "Display the location of your business on your account.";
@@ -2325,7 +2327,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chatbot_menu_remove" = "Remove bot from this chat";
 "lng_chatbot_menu_revoke" = "Revoke access to this chat";
 
-"lng_chat_intro_title" = "Intro";
+"lng_chat_intro_title" = "Custom Intro";
 "lng_chat_intro_subtitle" = "Customize your intro";
 "lng_chat_intro_default_title" = "No messages here yet...";
 "lng_chat_intro_default_message" = "Send a message or click on the greeting below";
@@ -2336,6 +2338,30 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chat_intro_about" = "You can customize the message people see before they start a chat with you.";
 "lng_chat_intro_reset" = "Reset to Default";
 
+"lng_chat_links_title" = "Links to Chat";
+"lng_chat_links_about" = "Give your customers short links that start a chat with you – and suggest the first message from them to you.";
+"lng_chat_links_create_link" = "Create a Link to Chat";
+"lng_chat_links_footer" = "You can also use a simple link for a chat with you – {links}";
+"lng_chat_links_footer_both" = "{username} or {link}";
+"lng_chat_links_no_clicks" = "no clicks";
+"lng_chat_links_clicks#one" = "{count} click";
+"lng_chat_links_clicks#other" = "{count} clicks";
+"lng_chat_link_new_title" = "New Link";
+"lng_chat_link_edit_title" = "Edit Link";
+"lng_chat_link_description" = "Add a message that will be entered in the message field for anyone who starts a chat with you using this link.";
+"lng_chat_link_placeholder" = "Add Preset Message";
+"lng_chat_link_saved" = "Chat link saved.";
+"lng_chat_link_copy" = "Copy";
+"lng_chat_link_share" = "Share";
+"lng_chat_link_rename" = "Rename";
+"lng_chat_link_delete" = "Delete";
+"lng_chat_link_name" = "Link Name (optional)";
+"lng_chat_link_name_about" = "Add a name for this link that only you will see.";
+"lng_chat_link_delete_sure" = "Are you sure you want to delete this chat link?";
+"lng_chat_link_qr_title" = "Chat Link QR Code";
+"lng_chat_link_qr_about" = "Everyone on Telegram can scan this code to contact you.";
+"lng_chat_link_copied" = "Chat link copied to clipboard.";
+
 "lng_boost_channel_button" = "Boost Channel";
 "lng_boost_group_button" = "Boost Group";
 "lng_boost_again_button" = "Boost Again";
diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc
index 12666b6fd..b63b6d15f 100644
--- a/Telegram/Resources/qrc/telegram/animations.qrc
+++ b/Telegram/Resources/qrc/telegram/animations.qrc
@@ -21,5 +21,6 @@
 	<file alias="writing.tgs">../../animations/writing.tgs</file>
 	<file alias="hours.tgs">../../animations/hours.tgs</file>
 	<file alias="phone.tgs">../../animations/phone.tgs</file>
+    <file alias="chat_link.tgs">../../animations/chat_link.tgs</file>
   </qresource>
 </RCC>
diff --git a/Telegram/SourceFiles/api/api_chat_links.cpp b/Telegram/SourceFiles/api/api_chat_links.cpp
new file mode 100644
index 000000000..f8a3f1979
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_chat_links.cpp
@@ -0,0 +1,171 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_chat_links.h"
+
+#include "api/api_text_entities.h"
+#include "apiwrap.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+
+namespace Api {
+namespace {
+
+[[nodiscard]] ChatLink FromMTP(
+		not_null<Main::Session*> session,
+		const MTPBusinessChatLink &link) {
+	const auto &data = link.data();
+	return {
+		.link = qs(data.vlink()),
+		.title = qs(data.vtitle().value_or_empty()),
+		.message = {
+			qs(data.vmessage()),
+			EntitiesFromMTP(
+				session,
+				data.ventities().value_or_empty())
+		},
+		.clicks = data.vviews().v,
+	};
+}
+
+[[nodiscard]] MTPInputBusinessChatLink ToMTP(
+		not_null<Main::Session*> session,
+		const QString &title,
+		const TextWithEntities &message) {
+	auto entities = EntitiesToMTP(
+		session,
+		message.entities,
+		ConvertOption::SkipLocal);
+	using Flag = MTPDinputBusinessChatLink::Flag;
+	const auto flags = (title.isEmpty() ? Flag() : Flag::f_title)
+		| (entities.v.isEmpty() ? Flag() : Flag::f_entities);
+	return MTP_inputBusinessChatLink(
+		MTP_flags(flags),
+		MTP_string(message.text),
+		std::move(entities),
+		MTP_string(title));
+}
+
+} // namespace
+
+ChatLinks::ChatLinks(not_null<ApiWrap*> api) : _api(api) {
+}
+
+
+void ChatLinks::create(
+		const QString &title,
+		const TextWithEntities &message,
+		Fn<void(Link)> done) {
+	const auto session = &_api->session();
+	_api->request(MTPaccount_CreateBusinessChatLink(
+		ToMTP(session, title, message)
+	)).done([=](const MTPBusinessChatLink &result) {
+		const auto link = FromMTP(session, result);
+		_list.push_back(link);
+		_updates.fire({ .was = QString(), .now = link });
+		if (done) done(link);
+	}).fail([=](const MTP::Error &error) {
+		const auto type = error.type();
+		if (done) done(Link());
+	}).send();
+}
+
+void ChatLinks::edit(
+		const QString &link,
+		const QString &title,
+		const TextWithEntities &message,
+		Fn<void(Link)> done) {
+	const auto session = &_api->session();
+	_api->request(MTPaccount_EditBusinessChatLink(
+		MTP_string(link),
+		ToMTP(session, title, message)
+	)).done([=](const MTPBusinessChatLink &result) {
+		const auto parsed = FromMTP(session, result);
+		if (parsed.link != link) {
+			LOG(("API Error: EditBusinessChatLink changed the link."));
+			if (done) done(Link());
+			return;
+		}
+		const auto i = ranges::find(_list, link, &Link::link);
+		if (i != end(_list)) {
+			*i = parsed;
+			_updates.fire({ .was = link, .now = parsed });
+			if (done) done(parsed);
+		} else {
+			LOG(("API Error: EditBusinessChatLink link not found."));
+			if (done) done(Link());
+		}
+	}).fail([=](const MTP::Error &error) {
+		const auto type = error.type();
+		if (done) done(Link());
+	}).send();
+}
+
+void ChatLinks::destroy(
+		const QString &link,
+		Fn<void()> done) {
+	_api->request(MTPaccount_DeleteBusinessChatLink(
+		MTP_string(link)
+	)).done([=] {
+		const auto i = ranges::find(_list, link, &Link::link);
+		if (i != end(_list)) {
+			_list.erase(i);
+			_updates.fire({ .was = link });
+			if (done) done();
+		} else {
+			LOG(("API Error: DeleteBusinessChatLink link not found."));
+			if (done) done();
+		}
+	}).fail([=](const MTP::Error &error) {
+		const auto type = error.type();
+		if (done) done();
+	}).send();
+}
+
+void ChatLinks::preload() {
+	if (_loaded || _requestId) {
+		return;
+	}
+	_requestId = _api->request(MTPaccount_GetBusinessChatLinks(
+	)).done([=](const MTPaccount_BusinessChatLinks &result) {
+		const auto &data = result.data();
+		const auto session = &_api->session();
+		const auto owner = &session->data();
+		owner->processUsers(data.vusers());
+		owner->processChats(data.vchats());
+		auto links = std::vector<Link>();
+		links.reserve(data.vlinks().v.size());
+		for (const auto &link : data.vlinks().v) {
+			links.push_back(FromMTP(session, link));
+		}
+		_list = std::move(links);
+		_loaded = true;
+		_loadedUpdates.fire({});
+	}).fail([=] {
+		_requestId = 0;
+		_loaded = true;
+		_loadedUpdates.fire({});
+	}).send();
+}
+
+const std::vector<ChatLink> &ChatLinks::list() const {
+	return _list;
+}
+
+bool ChatLinks::loaded() const {
+	return _loaded;
+}
+
+rpl::producer<> ChatLinks::loadedUpdates() const {
+	return _loadedUpdates.events();
+}
+
+rpl::producer<ChatLinks::Update> ChatLinks::updates() const {
+	return _updates.events();
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_chat_links.h b/Telegram/SourceFiles/api/api_chat_links.h
new file mode 100644
index 000000000..34226eab9
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_chat_links.h
@@ -0,0 +1,64 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class ApiWrap;
+
+namespace Api {
+
+struct ChatLink {
+	QString link;
+	QString title;
+	TextWithEntities message;
+	int clicks = 0;
+};
+
+struct ChatLinkUpdate {
+	QString was;
+	std::optional<ChatLink> now;
+};
+
+class ChatLinks final {
+public:
+	explicit ChatLinks(not_null<ApiWrap*> api);
+
+	using Link = ChatLink;
+	using Update = ChatLinkUpdate;
+
+	void create(
+		const QString &title,
+		const TextWithEntities &message,
+		Fn<void(Link)> done = nullptr);
+	void edit(
+		const QString &link,
+		const QString &title,
+		const TextWithEntities &message,
+		Fn<void(Link)> done = nullptr);
+	void destroy(
+		const QString &link,
+		Fn<void()> done = nullptr);
+
+	void preload();
+	[[nodiscard]] const std::vector<ChatLink> &list() const;
+	[[nodiscard]] bool loaded() const;
+	[[nodiscard]] rpl::producer<> loadedUpdates() const;
+	[[nodiscard]] rpl::producer<Update> updates() const;
+
+private:
+	const not_null<ApiWrap*> _api;
+
+	std::vector<Link> _list;
+	rpl::event_stream<> _loadedUpdates;
+	mtpRequestId _requestId = 0;
+	bool _loaded = false;
+
+	rpl::event_stream<Update> _updates;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index a9960a1dd..ef3b0f01f 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_authorizations.h"
 #include "api/api_attached_stickers.h"
 #include "api/api_blocked_peers.h"
+#include "api/api_chat_links.h"
 #include "api/api_chat_participants.h"
 #include "api/api_cloud_password.h"
 #include "api/api_hash.h"
@@ -163,6 +164,7 @@ ApiWrap::ApiWrap(not_null<Main::Session*> session)
 , _globalPrivacy(std::make_unique<Api::GlobalPrivacy>(this))
 , _userPrivacy(std::make_unique<Api::UserPrivacy>(this))
 , _inviteLinks(std::make_unique<Api::InviteLinks>(this))
+, _chatLinks(std::make_unique<Api::ChatLinks>(this))
 , _views(std::make_unique<Api::ViewsManager>(this))
 , _confirmPhone(std::make_unique<Api::ConfirmPhone>(this))
 , _peerPhoto(std::make_unique<Api::PeerPhoto>(this))
@@ -4424,6 +4426,10 @@ Api::InviteLinks &ApiWrap::inviteLinks() {
 	return *_inviteLinks;
 }
 
+Api::ChatLinks &ApiWrap::chatLinks() {
+	return *_chatLinks;
+}
+
 Api::ViewsManager &ApiWrap::views() {
 	return *_views;
 }
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 58165adec..0d31126d3 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -69,6 +69,7 @@ class SensitiveContent;
 class GlobalPrivacy;
 class UserPrivacy;
 class InviteLinks;
+class ChatLinks;
 class ViewsManager;
 class ConfirmPhone;
 class PeerPhoto;
@@ -384,6 +385,7 @@ public:
 	[[nodiscard]] Api::GlobalPrivacy &globalPrivacy();
 	[[nodiscard]] Api::UserPrivacy &userPrivacy();
 	[[nodiscard]] Api::InviteLinks &inviteLinks();
+	[[nodiscard]] Api::ChatLinks &chatLinks();
 	[[nodiscard]] Api::ViewsManager &views();
 	[[nodiscard]] Api::ConfirmPhone &confirmPhone();
 	[[nodiscard]] Api::PeerPhoto &peerPhoto();
@@ -703,6 +705,7 @@ private:
 	const std::unique_ptr<Api::GlobalPrivacy> _globalPrivacy;
 	const std::unique_ptr<Api::UserPrivacy> _userPrivacy;
 	const std::unique_ptr<Api::InviteLinks> _inviteLinks;
+	const std::unique_ptr<Api::ChatLinks> _chatLinks;
 	const std::unique_ptr<Api::ViewsManager> _views;
 	const std::unique_ptr<Api::ConfirmPhone> _confirmPhone;
 	const std::unique_ptr<Api::PeerPhoto> _peerPhoto;
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 5640c11b5..13f5b146d 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -580,8 +580,10 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 			ShareInviteLinkBox(&_window->session(), link));
 	});
 	const auto getLinkQr = crl::guard(weak, [=] {
-		delegate()->peerListUiShow()->showBox(
-			InviteLinkQrBox(link, tr::lng_filters_link_qr_about()));
+		delegate()->peerListUiShow()->showBox(InviteLinkQrBox(
+			link,
+			tr::lng_group_invite_qr_title(),
+			tr::lng_filters_link_qr_about()));
 	});
 	const auto editLink = crl::guard(weak, [=] {
 		delegate()->peerListUiShow()->showBox(
@@ -886,8 +888,10 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 			ShareInviteLinkBox(&_window->session(), link));
 	};
 	const auto getLinkQr = [=] {
-		delegate()->peerListUiShow()->showBox(
-			InviteLinkQrBox(link, tr::lng_filters_link_qr_about()));
+		delegate()->peerListUiShow()->showBox(InviteLinkQrBox(
+			link,
+			tr::lng_group_invite_qr_title(),
+			tr::lng_filters_link_qr_about()));
 	};
 	const auto editLink = [=] {
 		delegate()->peerListUiShow()->showBox(
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index fcdc646a5..7b80e2652 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -272,9 +272,10 @@ QImage QrForShare(const QString &text) {
 void QrBox(
 		not_null<Ui::GenericBox*> box,
 		const QString &link,
+		rpl::producer<QString> title,
 		rpl::producer<QString> about,
 		Fn<void(QImage, std::shared_ptr<Ui::Show>)> share) {
-	box->setTitle(tr::lng_group_invite_qr_title());
+	box->setTitle(std::move(title));
 
 	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
 
@@ -350,8 +351,10 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 		delegate()->peerListUiShow()->showBox(ShareInviteLinkBox(peer, link));
 	});
 	const auto getLinkQr = crl::guard(weak, [=] {
-		delegate()->peerListUiShow()->showBox(
-			InviteLinkQrBox(link, tr::lng_group_invite_qr_about()));
+		delegate()->peerListUiShow()->showBox(InviteLinkQrBox(
+			link,
+			tr::lng_group_invite_qr_title(),
+			tr::lng_group_invite_qr_about()));
 	});
 	const auto revokeLink = crl::guard(weak, [=] {
 		delegate()->peerListUiShow()->showBox(
@@ -976,6 +979,7 @@ void AddPermanentLinkBlock(
 		if (const auto current = value->current(); !current.link.isEmpty()) {
 			show->showBox(InviteLinkQrBox(
 				current.link,
+				tr::lng_group_invite_qr_title(),
 				tr::lng_group_invite_qr_about()));
 		}
 	});
@@ -1130,13 +1134,15 @@ void CopyInviteLink(std::shared_ptr<Ui::Show> show, const QString &link) {
 
 object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 		not_null<PeerData*> peer,
-		const QString &link) {
-	return ShareInviteLinkBox(&peer->session(), link);
+		const QString &link,
+		const QString &copied) {
+	return ShareInviteLinkBox(&peer->session(), link, copied);
 }
 
 object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 		not_null<Main::Session*> session,
-		const QString &link) {
+		const QString &link,
+		const QString &copied) {
 	const auto sending = std::make_shared<bool>();
 	const auto box = std::make_shared<QPointer<ShareBox>>();
 
@@ -1148,7 +1154,9 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 
 	auto copyCallback = [=] {
 		QGuiApplication::clipboard()->setText(link);
-		showToast(tr::lng_group_invite_copied(tr::now));
+		showToast(copied.isEmpty()
+			? tr::lng_group_invite_copied(tr::now)
+			: copied);
 	};
 	auto submitCallback = [=](
 			std::vector<not_null<Data::Thread*>> &&result,
@@ -1228,8 +1236,9 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 
 object_ptr<Ui::BoxContent> InviteLinkQrBox(
 		const QString &link,
+		rpl::producer<QString> title,
 		rpl::producer<QString> about) {
-	return Box(QrBox, link, std::move(about), [=](
+	return Box(QrBox, link, std::move(title), std::move(about), [=](
 			const QImage &image,
 			std::shared_ptr<Ui::Show> show) {
 		auto mime = std::make_unique<QMimeData>();
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
index b4f54ef70..784bcc809 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
@@ -41,12 +41,15 @@ void AddPermanentLinkBlock(
 void CopyInviteLink(std::shared_ptr<Ui::Show> show, const QString &link);
 [[nodiscard]] object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 	not_null<PeerData*> peer,
-	const QString &link);
+	const QString &link,
+	const QString &copied = {});
 [[nodiscard]] object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 	not_null<Main::Session*> session,
-	const QString &link);
+	const QString &link,
+	const QString &copied = {});
 [[nodiscard]] object_ptr<Ui::BoxContent> InviteLinkQrBox(
 	const QString &link,
+	rpl::producer<QString> title,
 	rpl::producer<QString> about);
 [[nodiscard]] object_ptr<Ui::BoxContent> RevokeLinkBox(
 	not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
index 46905d67b..5952171ae 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
@@ -214,38 +214,11 @@ object_ptr<Ui::BoxContent> DeleteAllRevokedBox(
 	});
 }
 
-not_null<Ui::SettingsButton*> AddCreateLinkButton(
+[[nodiscard]] not_null<Ui::SettingsButton*> AddCreateLinkButton(
 		not_null<Ui::VerticalLayout*> container) {
-	const auto result = container->add(
-		object_ptr<Ui::SettingsButton>(
-			container,
-			tr::lng_group_invite_add(),
-			st::inviteLinkCreate),
+	return container->add(
+		MakeCreateLinkButton(container, tr::lng_group_invite_add()),
 		style::margins(0, st::inviteLinkCreateSkip, 0, 0));
-	const auto icon = Ui::CreateChild<Ui::RpWidget>(result);
-	icon->setAttribute(Qt::WA_TransparentForMouseEvents);
-	const auto size = st::inviteLinkCreateIconSize;
-	icon->resize(size, size);
-	result->heightValue(
-	) | rpl::start_with_next([=](int height) {
-		const auto &st = st::inviteLinkList.item;
-		icon->move(
-			st.photoPosition.x() + (st.photoSize - size) / 2,
-			(height - size) / 2);
-	}, icon->lifetime());
-	icon->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(icon);
-		p.setPen(Qt::NoPen);
-		p.setBrush(st::windowBgActive);
-		const auto rect = icon->rect();
-		{
-			auto hq = PainterHighQualityEnabler(p);
-			p.drawEllipse(rect);
-		}
-		st::inviteLinkCreateIcon.paintInCenter(p, rect);
-	}, icon->lifetime());
-	return result;
 }
 
 Row::Row(
@@ -584,8 +557,10 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 				ShareInviteLinkBox(_peer, link));
 		}, &st::menuIconShare);
 		result->addAction(tr::lng_group_invite_context_qr(tr::now), [=] {
-			delegate()->peerListUiShow()->showBox(
-				InviteLinkQrBox(link, tr::lng_group_invite_qr_about()));
+			delegate()->peerListUiShow()->showBox(InviteLinkQrBox(
+				link,
+				tr::lng_group_invite_qr_title(),
+				tr::lng_group_invite_qr_about()));
 		}, &st::menuIconQrCode);
 		result->addAction(tr::lng_group_invite_context_edit(tr::now), [=] {
 			delegate()->peerListUiShow()->showBox(EditLinkBox(_peer, data));
@@ -1014,3 +989,42 @@ void ManageInviteLinksBox(
 
 	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
 }
+
+object_ptr<Ui::SettingsButton> MakeCreateLinkButton(
+		not_null<QWidget*> parent,
+		rpl::producer<QString> text) {
+	auto result = object_ptr<Ui::SettingsButton>(
+		parent,
+		std::move(text),
+		st::inviteLinkCreate);
+	const auto raw = result.data();
+
+	const auto icon = Ui::CreateChild<Ui::RpWidget>(raw);
+	icon->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto size = st::inviteLinkCreateIconSize;
+	icon->resize(size, size);
+
+	raw->heightValue(
+	) | rpl::start_with_next([=](int height) {
+		const auto &st = st::inviteLinkList.item;
+		icon->move(
+			st.photoPosition.x() + (st.photoSize - size) / 2,
+			(height - size) / 2);
+	}, icon->lifetime());
+
+	icon->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(icon);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowBgActive);
+		const auto rect = icon->rect();
+		{
+			auto hq = PainterHighQualityEnabler(p);
+			p.drawEllipse(rect);
+		}
+		st::inviteLinkCreateIcon.paintInCenter(p, rect);
+	}, icon->lifetime());
+
+	return result;
+}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.h b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.h
index c16db91b4..3515b9655 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.h
@@ -11,9 +11,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class PeerData;
 
+namespace Ui {
+class SettingsButton;
+} // namespace Ui
+
 void ManageInviteLinksBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<PeerData*> peer,
 	not_null<UserData*> admin,
 	int count,
 	int revokedCount);
+
+[[nodiscard]] object_ptr<Ui::SettingsButton> MakeCreateLinkButton(
+	not_null<QWidget*> parent,
+	rpl::producer<QString> text);
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index 81404959c..bb71e2e63 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -146,6 +146,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_business_subtitle_chatbots();
 	case PremiumFeature::ChatIntro:
 		return tr::lng_business_subtitle_chat_intro();
+	case PremiumFeature::ChatLinks:
+		return tr::lng_business_subtitle_chat_links();
 	}
 	Unexpected("PremiumFeature in SectionTitle.");
 }
@@ -205,6 +207,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_business_about_chatbots();
 	case PremiumFeature::ChatIntro:
 		return tr::lng_business_about_chat_intro();
+	case PremiumFeature::ChatLinks:
+		return tr::lng_business_about_chat_links();
 	}
 	Unexpected("PremiumFeature in SectionTitle.");
 }
@@ -533,6 +537,7 @@ struct VideoPreviewDocument {
 		case PremiumFeature::AwayMessage: return "away_message";
 		case PremiumFeature::BusinessBots: return "business_bots";
 		case PremiumFeature::ChatIntro: return "business_intro";
+		case PremiumFeature::ChatLinks: return "business_links";
 		}
 		return "";
 	}();
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.h b/Telegram/SourceFiles/boxes/premium_preview_box.h
index fa520caaf..8e1dc503b 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.h
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.h
@@ -75,6 +75,7 @@ enum class PremiumFeature {
 	AwayMessage,
 	BusinessBots,
 	ChatIntro,
+	ChatLinks,
 
 	kCount,
 };
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
new file mode 100644
index 000000000..262b671f6
--- /dev/null
+++ b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
@@ -0,0 +1,813 @@
+/*
+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 "settings/business/settings_chat_links.h"
+
+#include "api/api_chat_links.h"
+#include "apiwrap.h"
+#include "base/event_filter.h"
+#include "boxes/peers/edit_peer_invite_link.h"
+#include "boxes/peers/edit_peer_invite_links.h"
+#include "boxes/premium_preview_box.h"
+#include "boxes/peer_list_box.h"
+#include "chat_helpers/emoji_suggestions_widget.h"
+#include "chat_helpers/message_field.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "core/application.h"
+#include "core/ui_integration.h"
+#include "core/core_settings.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_document.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_account.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "settings/business/settings_recipients_helper.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+#include <QtGui/QGuiApplication>
+
+namespace Settings {
+namespace {
+
+constexpr auto kChangesDebounceTimeout = crl::time(1000);
+
+using ChatLinkData = Api::ChatLink;
+
+class ChatLinks final : public BusinessSection<ChatLinks> {
+public:
+	ChatLinks(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+	~ChatLinks();
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	const Ui::RoundRect *bottomSkipRounding() const override {
+		return &_bottomSkipRounding;
+	}
+
+private:
+	void setupContent(not_null<Window::SessionController*> controller);
+
+	Ui::RoundRect _bottomSkipRounding;
+
+};
+
+struct ChatLinkAction {
+	enum class Type {
+		Copy,
+		Share,
+		Rename,
+		Delete,
+	};
+	QString link;
+	Type type = Type::Copy;
+};
+
+class Row;
+
+class RowDelegate {
+public:
+	virtual not_null<Main::Session*> rowSession() = 0;
+	virtual void rowUpdateRow(not_null<Row*> row) = 0;
+	virtual void rowPaintIcon(
+		QPainter &p,
+		int x,
+		int y,
+		int size) = 0;
+};
+
+class Row final : public PeerListRow {
+public:
+	Row(not_null<RowDelegate*> delegate, const ChatLinkData &data);
+
+	void update(const ChatLinkData &data);
+
+	[[nodiscard]] ChatLinkData data() const;
+
+	QString generateName() override;
+	QString generateShortName() override;
+	PaintRoundImageCallback generatePaintUserpicCallback(
+		bool forceRound) override;
+
+	QSize rightActionSize() const override;
+	QMargins rightActionMargins() const override;
+	void rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) override;
+	bool rightActionDisabled() const override {
+		return true;
+	}
+
+	void paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) override;
+
+private:
+	void updateStatus(const ChatLinkData &data);
+
+	const not_null<RowDelegate*> _delegate;
+	ChatLinkData _data;
+	Ui::Text::String _status;
+	Ui::Text::String _clicks;
+
+};
+
+[[nodiscard]] uint64 ComputeRowId(const ChatLinkData &data) {
+	return UniqueRowIdFromString(data.link);
+}
+
+[[nodiscard]] QString ComputeClicks(const ChatLinkData &link) {
+	return link.clicks
+		? tr::lng_chat_links_clicks(tr::now, lt_count, link.clicks)
+		: tr::lng_chat_links_no_clicks(tr::now);
+}
+
+Row::Row(not_null<RowDelegate*> delegate, const ChatLinkData &data)
+: PeerListRow(ComputeRowId(data))
+, _delegate(delegate)
+, _data(data) {
+	setCustomStatus(QString());
+	updateStatus(data);
+}
+
+void Row::updateStatus(const ChatLinkData &data) {
+	const auto context = Core::MarkedTextContext{
+		.session = _delegate->rowSession(),
+		.customEmojiRepaint = [=] { _delegate->rowUpdateRow(this); },
+	};
+	_status.setMarkedText(
+		st::messageTextStyle,
+		data.message,
+		kMarkupTextOptions,
+		context);
+	_clicks.setText(st::messageTextStyle, ComputeClicks(data));
+}
+
+void Row::update(const ChatLinkData &data) {
+	_data = data;
+	updateStatus(data);
+	refreshName(st::inviteLinkList.item);
+	_delegate->rowUpdateRow(this);
+}
+
+ChatLinkData Row::data() const {
+	return _data;
+}
+
+QString Row::generateName() {
+	if (!_data.title.isEmpty()) {
+		return _data.title;
+	}
+	auto result = _data.link;
+	return result.replace(
+		u"https://"_q,
+		QString()
+	);
+}
+
+QString Row::generateShortName() {
+	return generateName();
+}
+
+PaintRoundImageCallback Row::generatePaintUserpicCallback(bool forceRound) {
+	return [=](
+			QPainter &p,
+			int x,
+			int y,
+			int outerWidth,
+			int size) {
+		_delegate->rowPaintIcon(p, x, y, size);
+	};
+}
+
+QSize Row::rightActionSize() const {
+	return QSize(
+		_clicks.maxWidth(),
+		st::inviteLinkThreeDotsIcon.height());
+}
+
+QMargins Row::rightActionMargins() const {
+	return QMargins(
+		0,
+		(st::inviteLinkList.item.height - rightActionSize().height()) / 2,
+		st::inviteLinkThreeDotsSkip,
+		0);
+}
+
+void Row::rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) {
+	p.setPen(selected ? st::windowSubTextFgOver : st::windowSubTextFg);
+	_clicks.draw(p, x, y, outerWidth);
+}
+
+void Row::paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) {
+	p.setPen(selected ? st.statusFgOver : st.statusFg);
+	_status.draw(p, {
+		.position = { x, y },
+		.outerWidth = outerWidth,
+		.availableWidth = availableWidth,
+		.palette = &st::defaultTextPalette,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.now = crl::now(),
+		.elisionLines = 1,
+	});
+}
+
+class LinksController final
+	: public PeerListController
+	, public RowDelegate
+	, public base::has_weak_ptr {
+public:
+	explicit LinksController(not_null<Window::SessionController*> window);
+
+	[[nodiscard]] rpl::producer<int> fullCountValue() const {
+		return _count.value();
+	}
+
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowRightActionClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+	Main::Session &session() const override;
+
+	not_null<Main::Session*> rowSession() override;
+	void rowUpdateRow(not_null<Row*> row) override;
+	void rowPaintIcon(
+		QPainter &p,
+		int x,
+		int y,
+		int size) override;
+
+private:
+	void appendRow(const ChatLinkData &data);
+	void prependRow(const ChatLinkData &data);
+	void updateRow(const ChatLinkData &data);
+	bool removeRow(const QString &link);
+
+	void showRowMenu(
+		not_null<PeerListRow*> row,
+		bool highlightRow);
+
+	[[nodiscard]] base::unique_qptr<Ui::PopupMenu> createRowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row);
+
+	const not_null<Window::SessionController*> _window;
+	const not_null<Main::Session*> _session;
+	rpl::variable<int> _count;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	QImage _icon;
+	rpl::lifetime _lifetime;
+
+};
+
+struct LinksList {
+	not_null<Ui::RpWidget*> widget;
+	not_null<LinksController*> controller;
+};
+
+LinksList AddLinksList(
+		not_null<Window::SessionController*> window,
+		not_null<Ui::VerticalLayout*> container) {
+	auto &lifetime = container->lifetime();
+	const auto delegate = lifetime.make_state<PeerListContentDelegateShow>(
+		window->uiShow());
+	const auto controller = lifetime.make_state<LinksController>(window);
+	controller->setStyleOverrides(&st::inviteLinkList);
+	const auto content = container->add(object_ptr<PeerListContent>(
+		container,
+		controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	return { content, controller };
+}
+
+void EditChatLinkBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		ChatLinkData data,
+		Fn<void(ChatLinkData, Fn<void()> close)> submit) {
+	box->setTitle(data.link.isEmpty()
+		? tr::lng_chat_link_new_title()
+		: tr::lng_chat_link_edit_title());
+
+	box->setWidth(st::boxWideWidth);
+
+	Ui::AddDividerText(
+		box->verticalLayout(),
+		tr::lng_chat_link_description());
+
+	const auto peer = controller->session().user();
+	const auto outer = box->getDelegate()->outerContainer();
+	const auto field = box->addRow(
+		object_ptr<Ui::InputField>(
+			box.get(),
+			st::settingsChatLinkField,
+			Ui::InputField::Mode::MultiLine,
+			tr::lng_chat_link_placeholder()));
+	box->setFocusCallback([=] {
+		field->setFocusFast();
+	});
+
+	Ui::AddDivider(box->verticalLayout());
+	Ui::AddSkip(box->verticalLayout());
+
+	const auto title = box->addRow(object_ptr<Ui::InputField>(
+		box.get(),
+		st::defaultInputField,
+		tr::lng_chat_link_name(),
+		data.title));
+
+	const auto emojiToggle = Ui::CreateChild<Ui::EmojiButton>(
+		field->parentWidget(),
+		st::defaultComposeFiles.emoji);
+
+	using Selector = ChatHelpers::TabbedSelector;
+	auto &lifetime = box->lifetime();
+	const auto emojiPanel = lifetime.make_state<ChatHelpers::TabbedPanel>(
+		outer,
+		controller,
+		object_ptr<Selector>(
+			nullptr,
+			controller->uiShow(),
+			Window::GifPauseReason::Layer,
+			Selector::Mode::EmojiOnly));
+	emojiPanel->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	emojiPanel->hide();
+	emojiPanel->selector()->setCurrentPeer(peer);
+	emojiPanel->selector()->emojiChosen(
+	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
+	}, field->lifetime());
+	emojiPanel->selector()->customEmojiChosen(
+	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+		Data::InsertCustomEmoji(field, data.document);
+	}, field->lifetime());
+
+	emojiToggle->installEventFilter(emojiPanel);
+	emojiToggle->addClickHandler([=] {
+		emojiPanel->toggleAnimated();
+	});
+
+	const auto allow = [](not_null<DocumentData*>) { return true; };
+	InitMessageFieldHandlers(
+		controller,
+		field,
+		Window::GifPauseReason::Layer,
+		allow);
+	Ui::Emoji::SuggestionsController::Init(
+		outer,
+		field,
+		&controller->session(),
+		{ .suggestCustomEmoji = true, .allowCustomWithoutPremium = allow });
+
+	field->setSubmitSettings(Core::App().settings().sendSubmitWay());
+	field->setMaxHeight(st::defaultComposeFiles.caption.heightMax);
+
+	const auto save = [=] {
+		auto copy = data;
+		copy.title = title->getLastText().trimmed();
+		auto textWithTags = field->getTextWithAppliedMarkdown();
+		copy.message = TextWithEntities{
+			textWithTags.text,
+			TextUtilities::ConvertTextTagsToEntities(textWithTags.tags)
+		};
+		submit(copy, crl::guard(box, [=] {
+			box->closeBox();
+		}));
+	};
+	const auto updateEmojiPanelGeometry = [=] {
+		const auto parent = emojiPanel->parentWidget();
+		const auto global = emojiToggle->mapToGlobal({ 0, 0 });
+		const auto local = parent->mapFromGlobal(global);
+		emojiPanel->moveBottomRight(
+			local.y(),
+			local.x() + emojiToggle->width() * 3);
+	};
+	const auto filterCallback = [=](not_null<QEvent*> event) {
+		const auto type = event->type();
+		if (type == QEvent::Move || type == QEvent::Resize) {
+			// updateEmojiPanelGeometry uses not only container geometry, but
+			// also container children geometries that will be updated later.
+			crl::on_main(emojiPanel, updateEmojiPanelGeometry);
+		}
+		return base::EventFilterResult::Continue;
+	};
+	base::install_event_filter(emojiPanel, outer, filterCallback);
+
+	field->submits(
+	) | rpl::start_with_next([=] {
+		title->setFocus();
+	}, field->lifetime());
+	field->cancelled(
+	) | rpl::start_with_next([=] {
+		box->closeBox();
+	}, field->lifetime());
+
+	title->submits(
+	) | rpl::start_with_next(save, title->lifetime());
+
+	rpl::combine(
+		box->sizeValue(),
+		field->geometryValue()
+	) | rpl::start_with_next([=](QSize outer, QRect inner) {
+		emojiToggle->moveToLeft(
+			inner.x() + inner.width() - emojiToggle->width(),
+			inner.y() + st::settingsChatLinkEmojiTop);
+		emojiToggle->update();
+		crl::on_main(emojiPanel, updateEmojiPanelGeometry);
+	}, emojiToggle->lifetime());
+
+	const auto initial = TextWithTags{
+		data.message.text,
+		TextUtilities::ConvertEntitiesToTextTags(data.message.entities)
+	};
+	field->setTextWithTags(initial, Ui::InputField::HistoryAction::Clear);
+	auto cursor = field->textCursor();
+	cursor.movePosition(QTextCursor::End);
+	field->setTextCursor(cursor);
+
+	const auto checkChangedTimer = lifetime.make_state<base::Timer>([=] {
+		if (field->getTextWithAppliedMarkdown() == initial) {
+			box->setCloseByOutsideClick(true);
+		}
+	});
+	field->changes(
+	) | rpl::start_with_next([=] {
+		checkChangedTimer->callOnce(kChangesDebounceTimeout);
+		box->setCloseByOutsideClick(false);
+	}, field->lifetime());
+
+	box->addButton(tr::lng_settings_save(), save);
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
+void EditChatLink(
+		not_null<Window::SessionController*> window,
+		not_null<Main::Session*> session,
+		ChatLinkData data) {
+	const auto submitting = std::make_shared<bool>();
+	const auto submit = [=](ChatLinkData data, Fn<void()> close) {
+		if (std::exchange(*submitting, true)) {
+			return;
+		}
+		const auto done = crl::guard(window, [=](const auto&) {
+			window->showToast(tr::lng_chat_link_saved(tr::now));
+			close();
+		});
+		session->api().chatLinks().edit(
+			data.link,
+			data.title,
+			data.message,
+			done);
+	};
+	window->show(Box(
+		EditChatLinkBox,
+		window,
+		data,
+		crl::guard(window, submit)));
+}
+
+LinksController::LinksController(
+	not_null<Window::SessionController*> window)
+: _window(window)
+, _session(&window->session()) {
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		_icon = QImage();
+	}, _lifetime);
+
+	_session->api().chatLinks().updates(
+	) | rpl::start_with_next([=](const Api::ChatLinkUpdate &update) {
+		if (!update.now) {
+			if (removeRow(update.was)) {
+				delegate()->peerListRefreshRows();
+			}
+		} else if (update.was.isEmpty()) {
+			prependRow(*update.now);
+			delegate()->peerListRefreshRows();
+		} else {
+			updateRow(*update.now);
+		}
+	}, _lifetime);
+}
+
+void LinksController::prepare() {
+	auto &&list = _session->api().chatLinks().list()
+		| ranges::views::reverse;
+	for (const auto &link : list) {
+		appendRow(link);
+	}
+	delegate()->peerListRefreshRows();
+}
+
+void LinksController::rowClicked(not_null<PeerListRow*> row) {
+	showRowMenu(row, true);
+}
+
+void LinksController::showRowMenu(
+		not_null<PeerListRow*> row,
+		bool highlightRow) {
+	delegate()->peerListShowRowMenu(row, highlightRow);
+}
+
+void LinksController::rowRightActionClicked(not_null<PeerListRow*> row) {
+	delegate()->peerListShowRowMenu(row, true);
+}
+
+base::unique_qptr<Ui::PopupMenu> LinksController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	auto result = createRowContextMenu(parent, row);
+
+	if (result) {
+		// First clear _menu value, so that we don't check row positions yet.
+		base::take(_menu);
+
+		// Here unique_qptr is used like a shared pointer, where
+		// not the last destroyed pointer destroys the object, but the first.
+		_menu = base::unique_qptr<Ui::PopupMenu>(result.get());
+	}
+
+	return result;
+}
+
+base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	const auto real = static_cast<Row*>(row.get());
+	const auto data = real->data();
+	const auto link = data.link;
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	result->addAction(tr::lng_group_invite_context_copy(tr::now), [=] {
+		QGuiApplication::clipboard()->setText(link);
+		delegate()->peerListUiShow()->showToast(
+			tr::lng_chat_link_copied(tr::now));
+	}, &st::menuIconCopy);
+	result->addAction(tr::lng_group_invite_context_share(tr::now), [=] {
+		delegate()->peerListUiShow()->showBox(ShareInviteLinkBox(
+			_session,
+			link,
+			tr::lng_chat_link_copied(tr::now)));
+	}, &st::menuIconShare);
+	result->addAction(tr::lng_group_invite_context_qr(tr::now), [=] {
+		delegate()->peerListUiShow()->showBox(InviteLinkQrBox(
+			link,
+			tr::lng_chat_link_qr_title(),
+			tr::lng_chat_link_qr_about()));
+	}, &st::menuIconQrCode);
+	result->addAction(tr::lng_group_invite_context_edit(tr::now), [=] {
+		EditChatLink(_window, _session, data);
+	}, &st::menuIconEdit);
+	result->addAction(tr::lng_group_invite_context_delete(tr::now), [=] {
+		const auto sure = [=](Fn<void()> &&close) {
+			_window->session().api().chatLinks().destroy(link, close);
+		};
+		_window->show(Ui::MakeConfirmBox({
+			.text = tr::lng_chat_link_delete_sure(tr::now),
+			.confirmed = sure,
+			.confirmText = tr::lng_box_delete(tr::now),
+		}));
+	}, &st::menuIconDelete);
+	return result;
+}
+
+Main::Session &LinksController::session() const {
+	return *_session;
+}
+
+void LinksController::appendRow(const ChatLinkData &data) {
+	delegate()->peerListAppendRow(std::make_unique<Row>(this, data));
+	_count = _count.current() + 1;
+}
+
+void LinksController::prependRow(const ChatLinkData &data) {
+	delegate()->peerListPrependRow(std::make_unique<Row>(this, data));
+	_count = _count.current() + 1;
+}
+
+void LinksController::updateRow(const ChatLinkData &data) {
+	if (const auto row = delegate()->peerListFindRow(ComputeRowId(data))) {
+		const auto real = static_cast<Row*>(row);
+		real->update(data);
+		delegate()->peerListUpdateRow(row);
+	}
+}
+
+bool LinksController::removeRow(const QString &link) {
+	const auto id = UniqueRowIdFromString(link);
+	if (const auto row = delegate()->peerListFindRow(id)) {
+		delegate()->peerListRemoveRow(row);
+		_count = std::max(_count.current() - 1, 0);
+		return true;
+	}
+	return false;
+}
+
+not_null<Main::Session*> LinksController::rowSession() {
+	return _session;
+}
+
+void LinksController::rowUpdateRow(not_null<Row*> row) {
+	delegate()->peerListUpdateRow(row);
+}
+
+void LinksController::rowPaintIcon(
+		QPainter &p,
+		int x,
+		int y,
+		int size) {
+	const auto skip = st::inviteLinkIconSkip;
+	const auto inner = size - 2 * skip;
+	const auto bg = &st::msgFile1Bg;
+	const auto stroke = st::inviteLinkIconStroke;
+	if (_icon.isNull()) {
+		_icon = QImage(
+			QSize(inner, inner) * style::DevicePixelRatio(),
+			QImage::Format_ARGB32_Premultiplied);
+		_icon.fill(Qt::transparent);
+		_icon.setDevicePixelRatio(style::DevicePixelRatio());
+
+		auto p = QPainter(&_icon);
+		p.setPen(Qt::NoPen);
+		p.setBrush(*bg);
+		{
+			auto hq = PainterHighQualityEnabler(p);
+			auto rect = QRect(0, 0, inner, inner);
+			p.drawEllipse(rect);
+		}
+		st::inviteLinkIcon.paintInCenter(p, { 0, 0, inner, inner });
+	}
+	p.drawImage(x + skip, y + skip, _icon);
+}
+
+ChatLinks::ChatLinks(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: BusinessSection(parent, controller)
+, _bottomSkipRounding(st::boxRadius, st::boxDividerBg) {
+	setupContent(controller);
+}
+
+ChatLinks::~ChatLinks() = default;
+
+rpl::producer<QString> ChatLinks::title() {
+	return tr::lng_chat_links_title();
+}
+
+void ChatLinks::setupContent(
+		not_null<Window::SessionController*> controller) {
+	using namespace rpl::mappers;
+
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	AddDividerTextWithLottie(content, {
+		.lottie = u"chat_link"_q,
+		.lottieSize = st::settingsCloudPasswordIconSize,
+		.lottieMargins = st::peerAppearanceIconPadding,
+		.showFinished = showFinishes() | rpl::take(1),
+		.about = tr::lng_chat_links_about(Ui::Text::WithEntities),
+		.aboutMargins = st::peerAppearanceCoverLabelMargin,
+	});
+
+	Ui::AddSkip(content);
+
+	const auto limit = controller->session().account().appConfig().get<int>(
+		u"business_chat_links_limit"_q,
+		100);
+	const auto add = content->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			content,
+			MakeCreateLinkButton(
+				content,
+				tr::lng_chat_links_create_link()))
+	)->setDuration(0);
+
+	const auto list = AddLinksList(controller, content);
+	add->toggleOn(list.controller->fullCountValue() | rpl::map(_1 < limit));
+	add->finishAnimating();
+
+	add->entity()->setClickedCallback([=] {
+		if (!controller->session().premium()) {
+			ShowPremiumPreviewToBuy(
+				controller,
+				PremiumFeature::ChatLinks);
+			return;
+		}
+		const auto submitting = std::make_shared<bool>();
+		const auto submit = [=](ChatLinkData data, Fn<void()> close) {
+			if (std::exchange(*submitting, true)) {
+				return;
+			}
+			const auto done = [=](const auto&) {
+				controller->showToast(tr::lng_chat_link_saved(tr::now));
+				close();
+			};
+			controller->session().api().chatLinks().create(
+				data.title,
+				data.message,
+				done);
+		};
+		controller->show(Box(
+			EditChatLinkBox,
+			controller,
+			ChatLinkData(),
+			crl::guard(this, submit)));
+	});
+
+	Ui::AddSkip(content);
+
+	const auto self = controller->session().user();
+	const auto username = self->username();
+	const auto make = [&](std::vector<QString> links) {
+		Expects(!links.empty());
+
+		for (auto &link : links) {
+			link = controller->session().createInternalLink(link);
+		}
+		return (links.size() > 1)
+			? tr::lng_chat_links_footer_both(
+				tr::now,
+				lt_username,
+				Ui::Text::Link(links[0], "https://" + links[0]),
+				lt_link,
+				Ui::Text::Link(links[1], "https://" + links[1]),
+				Ui::Text::WithEntities)
+			: Ui::Text::Link(links[0], "https://" + links[0]);
+	};
+	auto links = !username.isEmpty()
+		? make({ username, '+' + self->phone() })
+		: make({ '+' + self->phone() });
+	Ui::AddDividerText(
+		content,
+		tr::lng_chat_links_footer(
+			lt_links,
+			rpl::single(std::move(links)),
+			Ui::Text::WithEntities),
+		st::settingsChatbotsBottomTextMargin,
+		RectPart::Top);
+
+	Ui::ResizeFitChild(this, content);
+}
+
+} // namespace
+
+Type ChatLinksId() {
+	return ChatLinks::Id();
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_links.h b/Telegram/SourceFiles/settings/business/settings_chat_links.h
new file mode 100644
index 000000000..ce4f010f8
--- /dev/null
+++ b/Telegram/SourceFiles/settings/business/settings_chat_links.h
@@ -0,0 +1,16 @@
+/*
+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 "settings/settings_type.h"
+
+namespace Settings {
+
+[[nodiscard]] Type ChatLinksId();
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
index b8c990d03..57e74cf25 100644
--- a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
@@ -111,8 +111,10 @@ void QuickReplies::setupContent(
 					showOther(ShortcutMessagesId(id));
 					close();
 				};
-				controller->show(
-					Box(EditShortcutNameBox, QString(), crl::guard(this, submit)));
+				controller->show(Box(
+					EditShortcutNameBox,
+					QString(),
+					crl::guard(this, submit)));
 			});
 			if (count > 0) {
 				AddSkip(addWrap);
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 9ad3e3954..7c74c1ef2 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -111,6 +111,7 @@ settingsBusinessIconGreeting: icon {{ "settings/premium/status", settingsIconFg
 settingsBusinessIconAway: icon {{ "settings/premium/business/business_away", settingsIconFg }};
 settingsBusinessIconChatbots: icon {{ "settings/premium/business/business_chatbots", settingsIconFg }};
 settingsBusinessIconChatIntro: icon {{ "settings/premium/intro", settingsIconFg }};
+settingsBusinessIconChatLinks: icon {{ "settings/premium/links", settingsIconFg }};
 
 settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(semiboldTextStyle) {
@@ -648,3 +649,23 @@ settingsChatIntroField: InputField(defaultMultiSelectSearchField) {
 	textMargins: margins(2px, 0px, 32px, 0px);
 }
 settingsChatIntroFieldMargins: margins(20px, 15px, 20px, 8px);
+
+settingsChatLinkEmojiTop: 2px;
+settingsChatLinkField: InputField(defaultInputField) {
+	textBg: transparent;
+	textMargins: margins(2px, 8px, 2px, 8px);
+
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	placeholderMargins: margins(0px, 0px, 0px, 0px);
+	placeholderScale: 0.;
+	placeholderFont: normalFont;
+
+	border: 0px;
+	borderActive: 0px;
+
+	heightMin: 32px;
+
+	font: normalFont;
+}
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index e6ae4de18..f0294643c 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "settings/settings_business.h"
 
+#include "api/api_chat_links.h"
 #include "boxes/premium_preview_box.h"
 #include "core/click_handler_types.h"
 #include "data/business/data_business_info.h"
@@ -24,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "settings/business/settings_away_message.h"
 #include "settings/business/settings_chat_intro.h"
+#include "settings/business/settings_chat_links.h"
 #include "settings/business/settings_chatbots.h"
 #include "settings/business/settings_greeting.h"
 #include "settings/business/settings_location.h"
@@ -41,6 +43,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
+#include "ui/new_badges.h"
 #include "ui/vertical_list.h"
 #include "window/window_session_controller.h"
 #include "apiwrap.h"
@@ -58,6 +61,7 @@ struct Entry {
 	rpl::producer<QString> title;
 	rpl::producer<QString> description;
 	PremiumFeature feature = PremiumFeature::BusinessLocation;
+	bool newBadge = false;
 };
 
 using Order = std::vector<QString>;
@@ -70,7 +74,8 @@ using Order = std::vector<QString>;
 		u"business_hours"_q,
 		u"business_location"_q,
 		u"business_bots"_q,
-		u"intro"_q,
+		u"business_intro"_q,
+		u"business_links"_q,
 	};
 }
 
@@ -131,12 +136,23 @@ using Order = std::vector<QString>;
 			},
 		},
 		{
-			u"intro"_q,
+			u"business_intro"_q,
 			Entry{
 				&st::settingsBusinessIconChatIntro,
 				tr::lng_business_subtitle_chat_intro(),
 				tr::lng_business_about_chat_intro(),
 				PremiumFeature::ChatIntro,
+				true
+			},
+		},
+		{
+			u"business_links"_q,
+			Entry{
+				&st::settingsBusinessIconChatLinks,
+				tr::lng_business_subtitle_chat_links(),
+				tr::lng_business_about_chat_links(),
+				PremiumFeature::ChatLinks,
+				true
 			},
 		},
 	};
@@ -177,6 +193,9 @@ void AddBusinessSummary(
 			descriptionPadding);
 		description->setAttribute(Qt::WA_TransparentForMouseEvents);
 
+		if (entry.newBadge) {
+			Ui::NewBadge::AddAfterLabel(content, label);
+		}
 		const auto dummy = Ui::CreateChild<Ui::AbstractButton>(content.get());
 		dummy->setAttribute(Qt::WA_TransparentForMouseEvents);
 
@@ -374,6 +393,7 @@ void Business::setupContent() {
 	owner->chatbots().preload();
 	owner->businessInfo().preload();
 	owner->shortcutMessages().preloadShortcuts();
+	owner->session().api().chatLinks().preload();
 
 	Ui::AddSkip(content, st::settingsFromFileTop);
 
@@ -387,6 +407,7 @@ void Business::setupContent() {
 			case PremiumFeature::QuickReplies: return QuickRepliesId();
 			case PremiumFeature::BusinessBots: return ChatbotsId();
 			case PremiumFeature::ChatIntro: return ChatIntroId();
+			case PremiumFeature::ChatLinks: return ChatLinksId();
 			}
 			Unexpected("Feature in showFeature.");
 		}());
@@ -410,6 +431,8 @@ void Business::setupContent() {
 			return owner->chatbots().loaded();
 		case PremiumFeature::ChatIntro:
 			return owner->session().user()->isFullLoaded();
+		case PremiumFeature::ChatLinks:
+			return owner->session().api().chatLinks().loaded();
 		}
 		Unexpected("Feature in isReady.");
 	};
@@ -429,7 +452,8 @@ void Business::setupContent() {
 		owner->chatbots().changes() | rpl::to_empty,
 		owner->session().changes().peerUpdates(
 			owner->session().user(),
-			Data::PeerUpdate::Flag::FullInfo) | rpl::to_empty
+			Data::PeerUpdate::Flag::FullInfo) | rpl::to_empty,
+		owner->session().api().chatLinks().loadedUpdates()
 	) | rpl::start_with_next(check, content->lifetime());
 
 	AddBusinessSummary(content, _controller, [=](PremiumFeature feature) {
@@ -686,6 +710,8 @@ std::vector<PremiumFeature> BusinessFeaturesOrder(
 			return PremiumFeature::BusinessBots;
 		} else if (s == u"business_intro"_q) {
 			return PremiumFeature::ChatIntro;
+		} else if (s == "business_links"_q) {
+			return PremiumFeature::ChatLinks;
 		}
 		return PremiumFeature::kCount;
 	}) | ranges::views::filter([](PremiumFeature feature) {

From f240cbbda663f903ba519fe7b868abf0e04abffb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Mar 2024 19:13:26 +0400
Subject: [PATCH 125/596] Handle chat link clicks.

---
 .../SourceFiles/core/local_url_handlers.cpp   | 29 +++++++++++++--
 Telegram/SourceFiles/data/data_drafts.cpp     | 26 ++++++++++++++
 Telegram/SourceFiles/data/data_drafts.h       |  4 +++
 .../window/window_session_controller.cpp      | 35 +++++++++++++++++++
 .../window/window_session_controller.h        |  3 ++
 .../window_session_controller_link_info.h     |  1 +
 6 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index c5502085a..5e4afae2a 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -977,6 +977,24 @@ bool ResolveBoost(
 	return true;
 }
 
+bool ResolveChatLink(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto myContext = context.value<ClickHandlerContext>();
+	const auto slug = match->captured(1);
+	controller->window().activate();
+	controller->showPeerByLink(Window::PeerByLinkInfo{
+		.chatLinkSlug = match->captured(1),
+		.clickFromMessageId = myContext.itemId,
+		.clickFromAttachBotWebviewUrl = myContext.attachBotWebviewUrl,
+	});
+	return true;
+}
+
 } // namespace
 
 const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
@@ -1046,11 +1064,11 @@ const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
 			ResolveTestChatTheme,
 		},
 		{
-			u"invoice/?\\?(.+)(#|$)"_q,
+			u"^invoice/?\\?(.+)(#|$)"_q,
 			ResolveInvoice,
 		},
 		{
-			u"premium_offer/?(\\?.+)?(#|$)"_q,
+			u"^premium_offer/?(\\?.+)?(#|$)"_q,
 			ResolvePremiumOffer,
 		},
 		{
@@ -1065,6 +1083,10 @@ const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
 			u"^boost/?\\?(.+)(#|$)"_q,
 			ResolveBoost,
 		},
+		{
+			u"^message/?\\?slug=([a-zA-Z0-9\\.\\_]+)(&|$)"_q,
+			ResolveChatLink
+		},
 		{
 			u"^([^\\?]+)(\\?|#|$)"_q,
 			HandleUnknown
@@ -1176,6 +1198,9 @@ QString TryConvertUrlToLocal(QString url) {
 				? "gradient"
 				: "slug";
 			return u"tg://bg?"_q + type + '=' + bg + (params.isEmpty() ? QString() : '&' + params);
+		} else if (const auto chatlinkMatch = regex_match(u"^m/([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
+			const auto slug = chatlinkMatch->captured(1);
+			return u"tg://message?slug="_q + slug;
 		} else if (const auto privateMatch = regex_match(u"^"
 			"c/(\\-?\\d+)"
 			"("
diff --git a/Telegram/SourceFiles/data/data_drafts.cpp b/Telegram/SourceFiles/data/data_drafts.cpp
index 6f386e582..e0ebb7741 100644
--- a/Telegram/SourceFiles/data/data_drafts.cpp
+++ b/Telegram/SourceFiles/data/data_drafts.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_widget.h"
 #include "history/history_item_components.h"
 #include "main/main_session.h"
+#include "data/data_changes.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
 #include "mainwidget.h"
@@ -128,4 +129,29 @@ void ClearPeerCloudDraft(
 	history->applyCloudDraft(topicRootId);
 }
 
+void SetChatLinkDraft(
+		not_null<PeerData*> peer,
+		const TextWithEntities &draft) {
+	const auto textWithTags = TextWithTags{
+		draft.text,
+		TextUtilities::ConvertEntitiesToTextTags(draft.entities)
+	};
+	const auto cursor = MessageCursor{
+		int(textWithTags.text.size()),
+		int(textWithTags.text.size()),
+		Ui::kQFixedMax
+	};
+	const auto history = peer->owner().history(peer->id);
+	const auto topicRootId = MsgId();
+	history->setLocalDraft(std::make_unique<Data::Draft>(
+		textWithTags,
+		FullReplyTo{ .topicRootId = topicRootId },
+		cursor,
+		Data::WebPageDraft()));
+	history->clearLocalEditDraft(topicRootId);
+	history->session().changes().entryUpdated(
+		history,
+		Data::EntryUpdate::Flag::LocalDraftSet);
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_drafts.h b/Telegram/SourceFiles/data/data_drafts.h
index 4fdd9159c..581acaeea 100644
--- a/Telegram/SourceFiles/data/data_drafts.h
+++ b/Telegram/SourceFiles/data/data_drafts.h
@@ -205,4 +205,8 @@ using HistoryDrafts = base::flat_map<DraftKey, std::unique_ptr<Draft>>;
 		&& (a->webpage == b->webpage);
 }
 
+void SetChatLinkDraft(
+	not_null<PeerData*> peer,
+	const TextWithEntities &draft);
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 031946f0a..44868b6db 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "window/window_session_controller.h"
 
+#include "api/api_text_entities.h"
 #include "boxes/add_contact_box.h"
 #include "boxes/peers/add_bot_to_chat_box.h"
 #include "boxes/peers/edit_peer_info_box.h"
@@ -307,6 +308,13 @@ void SessionNavigation::showPeerByLink(const PeerByLinkInfo &info) {
 		resolvePhone(info.phone, [=](not_null<PeerData*> peer) {
 			showPeerByLinkResolved(peer, info);
 		});
+	} else if (!info.chatLinkSlug.isEmpty()) {
+		resolveChatLink(info.chatLinkSlug, [=](
+				not_null<PeerData*> peer,
+				TextWithEntities draft) {
+			Data::SetChatLinkDraft(peer, draft);
+			showPeerByLinkResolved(peer, info);
+		});
 	} else if (const auto name = std::get_if<QString>(&info.usernameOrId)) {
 		resolveUsername(*name, [=](not_null<PeerData*> peer) {
 			if (info.startAutoSubmit) {
@@ -352,6 +360,33 @@ void SessionNavigation::resolvePhone(
 	}).send();
 }
 
+void SessionNavigation::resolveChatLink(
+		const QString &slug,
+		Fn<void(not_null<PeerData*> peer, TextWithEntities draft)> done) {
+	_api.request(base::take(_resolveRequestId)).cancel();
+	_resolveRequestId = _api.request(MTPaccount_ResolveBusinessChatLink(
+		MTP_string(slug)
+	)).done([=](const MTPaccount_ResolvedBusinessChatLinks &result) {
+		_resolveRequestId = 0;
+		parentController()->hideLayer();
+		const auto &data = result.data();
+		_session->data().processUsers(data.vusers());
+		_session->data().processChats(data.vchats());
+
+		using namespace Api;
+		const auto peerId = peerFromMTP(data.vpeer());
+		done(_session->data().peer(peerId), {
+			qs(data.vmessage()),
+			EntitiesFromMTP(_session, data.ventities().value_or_empty())
+		});
+	}).fail([=](const MTP::Error &error) {
+		_resolveRequestId = 0;
+		if (error.code() == 400) {
+			showToast(tr::lng_confirm_phone_link_invalid(tr::now));
+		}
+	}).send();
+}
+
 void SessionNavigation::resolveUsername(
 		const QString &username,
 		Fn<void(not_null<PeerData*>)> done) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 57e528579..4504f3b3c 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -260,6 +260,9 @@ private:
 	void resolvePhone(
 		const QString &phone,
 		Fn<void(not_null<PeerData*>)> done);
+	void resolveChatLink(
+		const QString &slug,
+		Fn<void(not_null<PeerData*> peer, TextWithEntities draft)> done);
 	void resolveUsername(
 		const QString &username,
 		Fn<void(not_null<PeerData*>)> done);
diff --git a/Telegram/SourceFiles/window/window_session_controller_link_info.h b/Telegram/SourceFiles/window/window_session_controller_link_info.h
index 5cf6dce7e..01224a3f0 100644
--- a/Telegram/SourceFiles/window/window_session_controller_link_info.h
+++ b/Telegram/SourceFiles/window/window_session_controller_link_info.h
@@ -31,6 +31,7 @@ using RepliesByLinkInfo = std::variant<v::null_t, CommentId, ThreadId>;
 struct PeerByLinkInfo {
 	std::variant<QString, ChannelId> usernameOrId;
 	QString phone;
+	QString chatLinkSlug;
 	MsgId messageId = ShowAtUnreadMsgId;
 	StoryId storyId = 0;
 	RepliesByLinkInfo repliesInfo;

From 66a47137a0bc067e8a365bda5db887a43549a453 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Mar 2024 19:11:48 +0400
Subject: [PATCH 126/596] Copy chat link by left click in footer.

---
 .../settings/business/settings_chat_links.cpp       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
index 262b671f6..021a6c207 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
@@ -792,14 +792,23 @@ void ChatLinks::setupContent(
 	auto links = !username.isEmpty()
 		? make({ username, '+' + self->phone() })
 		: make({ '+' + self->phone() });
-	Ui::AddDividerText(
+	auto label = object_ptr<Ui::FlatLabel>(
 		content,
 		tr::lng_chat_links_footer(
 			lt_links,
 			rpl::single(std::move(links)),
 			Ui::Text::WithEntities),
+		st::boxDividerLabel);
+	label->setClickHandlerFilter([=](ClickHandlerPtr handler, auto) {
+		QGuiApplication::clipboard()->setText(handler->url());
+		controller->showToast(tr::lng_chat_link_copied(tr::now));
+		return false;
+	});
+	content->add(object_ptr<Ui::DividerLabel>(
+		content,
+		std::move(label),
 		st::settingsChatbotsBottomTextMargin,
-		RectPart::Top);
+		RectPart::Top));
 
 	Ui::ResizeFitChild(this, content);
 }

From 05a5e623272478ed792cb9cf73f99412339b712a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 27 Mar 2024 18:24:57 +0400
Subject: [PATCH 127/596] Update API scheme on layer 177.

---
 Telegram/SourceFiles/mtproto/scheme/api.tl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 60a32254d..6c0a8f7c7 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -82,7 +82,7 @@ storage.fileMp4#b3cea0e4 = storage.FileType;
 storage.fileWebp#1081464c = storage.FileType;
 
 userEmpty#d3bc4b7a id:long = User;
-user#215c4438 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true close_friend:flags2.2?true stories_hidden:flags2.3?true stories_unavailable:flags2.4?true contact_require_premium:flags2.10?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> stories_max_id:flags2.5?int color:flags2.8?PeerColor profile_color:flags2.9?PeerColor = User;
+user#215c4438 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true close_friend:flags2.2?true stories_hidden:flags2.3?true stories_unavailable:flags2.4?true contact_require_premium:flags2.10?true bot_business:flags2.11?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> stories_max_id:flags2.5?int color:flags2.8?PeerColor profile_color:flags2.9?PeerColor = User;
 
 userProfilePhotoEmpty#4f11bae1 = UserProfilePhoto;
 userProfilePhoto#82d1f706 flags:# has_video:flags.0?true personal:flags.2?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = UserProfilePhoto;
@@ -101,7 +101,7 @@ channel#aadfc8f flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5
 channelForbidden#17d493d5 flags:# broadcast:flags.5?true megagroup:flags.8?true id:long access_hash:long title:string until_date:flags.16?int = Chat;
 
 chatFull#c9d31138 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true translations_disabled:flags.19?true id:long about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:flags.13?ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int call:flags.12?InputGroupCall ttl_period:flags.14?int groupcall_default_join_as:flags.15?Peer theme_emoticon:flags.16?string requests_pending:flags.17?int recent_requesters:flags.17?Vector<long> available_reactions:flags.18?ChatReactions = ChatFull;
-channelFull#680b773c 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 flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true restricted_sponsored:flags2.11?true id:long 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:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long 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?long 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 ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet sponsored_min_cpm:flags2.12?int = ChatFull;
+channelFull#44c054a7 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 flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true restricted_sponsored:flags2.11?true can_view_revenue:flags2.12?true id:long 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:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long 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?long 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 ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet = ChatFull;
 
 chatParticipant#c02d4007 user_id:long inviter_id:long date:int = ChatParticipant;
 chatParticipantCreator#e46bcee4 user_id:long = ChatParticipant;
@@ -2263,7 +2263,7 @@ channels.updateEmojiStatus#f0d3e6a8 channel:InputChannel emoji_status:EmojiStatu
 channels.setBoostsToUnblockRestrictions#ad399cee channel:InputChannel boosts:int = Updates;
 channels.setEmojiStickers#3cd930b7 channel:InputChannel stickerset:InputStickerSet = Bool;
 channels.reportSponsoredMessage#af8ff6b9 channel:InputChannel random_id:bytes option:bytes = channels.SponsoredMessageReportResult;
-channels.restrictSponsoredMessages#39bb9241 flags:# channel:InputChannel restricted:Bool min_cpm:flags.0?int = Updates;
+channels.restrictSponsoredMessages#9ae91519 channel:InputChannel restricted:Bool = Updates;
 
 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;

From 0dd1a4973ad839a0b63455e834e41d71e92c89df Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 28 Mar 2024 13:46:30 +0400
Subject: [PATCH 128/596] Handle the new FLOOD_PREMIUM_WAIT errors.

---
 Telegram/SourceFiles/mtproto/mtp_instance.cpp | 45 +++++++++++++++----
 Telegram/SourceFiles/mtproto/mtp_instance.h   |  3 ++
 .../SourceFiles/mtproto/mtproto_response.h    |  3 +-
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
index 7a9908d99..861d6cd44 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
@@ -99,6 +99,9 @@ public:
 	void restartedByTimeout(ShiftedDcId shiftedDcId);
 	[[nodiscard]] rpl::producer<ShiftedDcId> restartsByTimeout() const;
 
+	[[nodiscard]] auto nonPremiumDelayedRequests() const
+	-> rpl::producer<mtpRequestId>;
+
 	void restart();
 	void restart(ShiftedDcId shiftedDcId);
 	[[nodiscard]] int32 dcstate(ShiftedDcId shiftedDcId = 0);
@@ -283,6 +286,8 @@ private:
 	Fn<void(ShiftedDcId shiftedDcId, int32 state)> _stateChangedHandler;
 	Fn<void(ShiftedDcId shiftedDcId)> _sessionResetHandler;
 
+	rpl::event_stream<mtpRequestId> _nonPremiumDelayedRequests;
+
 	base::Timer _checkDelayedTimer;
 
 	Core::SettingsProxy &_proxySettings;
@@ -553,6 +558,11 @@ rpl::producer<ShiftedDcId> Instance::Private::restartsByTimeout() const {
 	return _restartsByTimeout.events();
 }
 
+auto Instance::Private::nonPremiumDelayedRequests() const
+-> rpl::producer<mtpRequestId> {
+	return _nonPremiumDelayedRequests.events();
+}
+
 void Instance::Private::requestConfigIfOld() {
 	const auto timeout = _config->values().blockedMode
 		? kConfigBecomesOldForBlockedIn
@@ -1356,8 +1366,9 @@ bool Instance::Private::onErrorDefault(
 	auto badGuestDc = (code == 400) && (type == u"FILE_ID_INVALID"_q);
 	static const auto MigrateRegExp = QRegularExpression("^(FILE|PHONE|NETWORK|USER)_MIGRATE_(\\d+)$");
 	static const auto FloodWaitRegExp = QRegularExpression("^FLOOD_WAIT_(\\d+)$");
+	static const auto FloodPremiumWaitRegExp = QRegularExpression("^FLOOD_PREMIUM_WAIT_(\\d+)$");
 	static const auto SlowmodeWaitRegExp = QRegularExpression("^SLOWMODE_WAIT_(\\d+)$");
-	QRegularExpressionMatch m1, m2;
+	QRegularExpressionMatch m1, m2, m3;
 	if ((m1 = MigrateRegExp.match(type)).hasMatch()) {
 		if (!requestId) return false;
 
@@ -1462,13 +1473,17 @@ bool Instance::Private::onErrorDefault(
 	} else if (code < 0
 		|| code >= 500
 		|| (m1 = FloodWaitRegExp.match(type)).hasMatch()
-		|| ((m2 = SlowmodeWaitRegExp.match(type)).hasMatch()
-			&& m2.captured(1).toInt() < 3)) {
-		if (!requestId) return false;
+		|| (m2 = FloodPremiumWaitRegExp.match(type)).hasMatch()
+		|| ((m3 = SlowmodeWaitRegExp.match(type)).hasMatch()
+			&& m3.captured(1).toInt() < 3)) {
+		if (!requestId) {
+			return false;
+		}
 
-		int32 secs = 1;
+		auto secs = 1;
+		auto nonPremiumDelay = false;
 		if (code < 0 || code >= 500) {
-			auto it = _requestsDelays.find(requestId);
+			const auto it = _requestsDelays.find(requestId);
 			if (it != _requestsDelays.cend()) {
 				secs = (it->second > 60) ? it->second : (it->second *= 2);
 			} else {
@@ -1479,17 +1494,27 @@ bool Instance::Private::onErrorDefault(
 //			if (secs >= 60) return false;
 		} else if (m2.hasMatch()) {
 			secs = m2.captured(1).toInt();
+			nonPremiumDelay = true;
+		} else if (m3.hasMatch()) {
+			secs = m3.captured(1).toInt();
 		}
 		auto sendAt = crl::now() + secs * 1000 + 10;
 		auto it = _delayedRequests.begin(), e = _delayedRequests.end();
 		for (; it != e; ++it) {
-			if (it->first == requestId) return true;
-			if (it->second > sendAt) break;
+			if (it->first == requestId) {
+				return true;
+			} else if (it->second > sendAt) {
+				break;
+			}
 		}
 		_delayedRequests.insert(it, std::make_pair(requestId, sendAt));
 
 		checkDelayedRequests();
 
+		if (nonPremiumDelay) {
+			_nonPremiumDelayedRequests.fire_copy(requestId);
+		}
+
 		return true;
 	} else if ((code == 401 && type != u"AUTH_KEY_PERM_EMPTY"_q)
 		|| (badGuestDc && _badGuestDcRequests.find(requestId) == _badGuestDcRequests.cend())) {
@@ -1879,6 +1904,10 @@ rpl::producer<ShiftedDcId> Instance::restartsByTimeout() const {
 	return _private->restartsByTimeout();
 }
 
+rpl::producer<mtpRequestId> Instance::nonPremiumDelayedRequests() const {
+	return _private->nonPremiumDelayedRequests();
+}
+
 void Instance::requestConfigIfOld() {
 	_private->requestConfigIfOld();
 }
diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.h b/Telegram/SourceFiles/mtproto/mtp_instance.h
index 7dc5be49b..55401065f 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.h
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.h
@@ -140,6 +140,9 @@ public:
 	void restartedByTimeout(ShiftedDcId shiftedDcId);
 	[[nodiscard]] rpl::producer<ShiftedDcId> restartsByTimeout() const;
 
+	[[nodiscard]] auto nonPremiumDelayedRequests() const
+		-> rpl::producer<mtpRequestId>;
+
 	void syncHttpUnixtime();
 
 	void sendAnything(ShiftedDcId shiftedDcId = 0, crl::time msCanWait = 0);
diff --git a/Telegram/SourceFiles/mtproto/mtproto_response.h b/Telegram/SourceFiles/mtproto/mtproto_response.h
index 657546fcc..3a810b200 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_response.h
+++ b/Telegram/SourceFiles/mtproto/mtproto_response.h
@@ -39,7 +39,8 @@ private:
 };
 
 inline bool IsFloodError(const QString &type) {
-	return type.startsWith(u"FLOOD_WAIT_"_q);
+	return type.startsWith(u"FLOOD_WAIT_"_q)
+		|| type.startsWith(u"FLOOD_PREMIUM_WAIT_"_q);
 }
 
 inline bool IsFloodError(const Error &error) {

From f65bc7c0bd49067afe4ee66b9379daf9a7a524ec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 28 Mar 2024 13:47:06 +0400
Subject: [PATCH 129/596] Suggest premium on transfer speed limiting.

---
 Telegram/Resources/langs/lang.strings         | 13 +++
 Telegram/SourceFiles/data/data_session.cpp    | 14 +++
 Telegram/SourceFiles/data/data_session.h      |  1 +
 .../main/main_session_settings.cpp            | 15 ++-
 .../SourceFiles/main/main_session_settings.h  | 15 +++
 Telegram/SourceFiles/mainwidget.cpp           | 61 ++++++++++++
 Telegram/SourceFiles/mainwidget.h             |  2 +
 .../storage/download_manager_mtproto.cpp      | 26 +++++
 .../storage/download_manager_mtproto.h        | 12 +++
 Telegram/SourceFiles/storage/file_upload.cpp  | 16 +++-
 Telegram/SourceFiles/storage/file_upload.h    |  6 ++
 .../window/window_session_controller.cpp      | 94 ++++++++++++++++---
 .../window/window_session_controller.h        |  4 +
 13 files changed, 262 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 5cb49b2ab..0c8045d4d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4948,6 +4948,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_iv_join_channel" = "Join";
 "lng_iv_window_title" = "Instant View";
 
+"lng_limit_download_title" = "Download speed limited";
+"lng_limit_download_subscribe" = "Subscribe to {link} and increase download speed {increase}.";
+"lng_limit_download_increase_times#one" = "**{count}** time";
+"lng_limit_download_increase_times#other" = "**{count}** times";
+"lng_limit_download_increase_speed" = "by **{percent}**";
+"lng_limit_download_subscribe_link" = "Telegram Premium";
+"lng_limit_upload_title" = "Upload speed limited";
+"lng_limit_upload_subscribe" = "Subscribe to {link} and increase upload speed {increase}.";
+"lng_limit_upload_increase_times#one" = "**{count}** time";
+"lng_limit_upload_increase_times#other" = "**{count}** times";
+"lng_limit_upload_increase_speed" = "by **{percent}**";
+"lng_limit_upload_subscribe_link" = "Telegram Premium";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 0e1259c6a..c31d22440 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1679,6 +1679,20 @@ bool Session::queryItemVisibility(not_null<HistoryItem*> item) const {
 	return result;
 }
 
+bool Session::queryDocumentVisibility(
+		not_null<DocumentData*> document) const {
+	const auto i = _documentItems.find(document);
+	if (i != end(_documentItems)) {
+		for (const auto &item : i->second) {
+			if (queryItemVisibility(item)) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+
 [[nodiscard]] auto Session::itemVisibilityQueries() const
 -> rpl::producer<Session::ItemVisibilityQuery> {
 	return _itemVisibilityQueries.events();
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index b233aead1..0f7df77f4 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -271,6 +271,7 @@ public:
 		not_null<bool*> isVisible;
 	};
 	[[nodiscard]] bool queryItemVisibility(not_null<HistoryItem*> item) const;
+	[[nodiscard]] bool queryDocumentVisibility(not_null<DocumentData*> document) const;
 	[[nodiscard]] rpl::producer<ItemVisibilityQuery> itemVisibilityQueries() const;
 	void itemVisibilitiesUpdated();
 
diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index cf451a20b..239bc7cf6 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -46,7 +46,8 @@ QByteArray SessionSettings::serialize() const {
 		+ sizeof(qint32) * 2
 		+ _hiddenPinnedMessages.size() * (sizeof(quint64) * 3)
 		+ sizeof(qint32)
-		+ _groupEmojiSectionHidden.size() * sizeof(quint64);
+		+ _groupEmojiSectionHidden.size() * sizeof(quint64)
+		+ sizeof(qint32) * 2;
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -98,6 +99,9 @@ QByteArray SessionSettings::serialize() const {
 		for (const auto &peerId : _groupEmojiSectionHidden) {
 			stream << SerializePeerId(peerId);
 		}
+		stream
+			<< qint32(_lastNonPremiumLimitDownload)
+			<< qint32(_lastNonPremiumLimitUpload);
 	}
 	return result;
 }
@@ -161,6 +165,8 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	qint32 photoEditorHintShowsCount = _photoEditorHintShowsCount;
 	std::vector<TimeId> mutePeriods;
 	qint32 legacySkipPremiumStickersSet = 0;
+	qint32 lastNonPremiumLimitDownload = 0;
+	qint32 lastNonPremiumLimitUpload = 0;
 
 	stream >> versionTag;
 	if (versionTag == kVersionTag) {
@@ -434,6 +440,11 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 			}
 		}
 	}
+	if (!stream.atEnd()) {
+		stream
+			>> lastNonPremiumLimitDownload
+			>> lastNonPremiumLimitUpload;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for SessionSettings::addFromSerialized()"));
@@ -479,6 +490,8 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	_supportAllSilent = (supportAllSilent == 1);
 	_photoEditorHintShowsCount = std::move(photoEditorHintShowsCount);
 	_mutePeriods = std::move(mutePeriods);
+	_lastNonPremiumLimitDownload = lastNonPremiumLimitDownload;
+	_lastNonPremiumLimitUpload = lastNonPremiumLimitUpload;
 
 	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 222a94ead..c44b6f785 100644
--- a/Telegram/SourceFiles/main/main_session_settings.h
+++ b/Telegram/SourceFiles/main/main_session_settings.h
@@ -132,6 +132,19 @@ public:
 	[[nodiscard]] std::vector<TimeId> mutePeriods() const;
 	void addMutePeriod(TimeId period);
 
+	[[nodiscard]] TimeId lastNonPremiumLimitDownload() const {
+		return _lastNonPremiumLimitDownload;
+	}
+	[[nodiscard]] TimeId lastNonPremiumLimitUpload() const {
+		return _lastNonPremiumLimitUpload;
+	}
+	void setLastNonPremiumLimitDownload(TimeId when) {
+		_lastNonPremiumLimitDownload = when;
+	}
+	void setLastNonPremiumLimitUpload(TimeId when) {
+		_lastNonPremiumLimitUpload = when;
+	}
+
 private:
 	static constexpr auto kDefaultSupportChatsLimitSlice = 7 * 24 * 60 * 60;
 	static constexpr auto kPhotoEditorHintMaxShowsCount = 5;
@@ -158,6 +171,8 @@ private:
 	bool _dialogsFiltersEnabled = false;
 	int _photoEditorHintShowsCount = 0;
 	std::vector<TimeId> _mutePeriods;
+	TimeId _lastNonPremiumLimitDownload = 0;
+	TimeId _lastNonPremiumLimitUpload = 0;
 
 	Support::SwitchSettings _supportSwitch;
 	bool _supportFixChatsOrder = true;
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 0f1541ae8..d58315778 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -32,6 +32,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/dropdown_menu.h"
 #include "ui/focus_persister.h"
 #include "ui/resize_area.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "window/window_connecting_widget.h"
 #include "window/window_top_bar_wrap.h"
 #include "window/notifications_manager.h"
@@ -79,7 +81,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "export/view/export_view_panel_controller.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "main/main_app_config.h"
 #include "main/main_account.h"
+#include "settings/settings_premium.h"
 #include "support/support_helper.h"
 #include "storage/storage_user_photos.h"
 #include "styles/style_dialogs.h"
@@ -1872,6 +1876,63 @@ bool MainWidget::preventsCloseSection(
 		&& preventsCloseSection(std::move(callback));
 }
 
+void MainWidget::showNonPremiumLimitToast(bool download) {
+	const auto parent = _mainSection
+		? ((QWidget*)_mainSection.data())
+		: (_dialogs && _history->isHidden())
+		? ((QWidget*)_dialogs.get())
+		: ((QWidget*)_history.get());
+	const auto link = download
+		? tr::lng_limit_download_subscribe_link(tr::now)
+		: tr::lng_limit_upload_subscribe_link(tr::now);
+	const auto better = session().account().appConfig().get<double>(download
+		? u"upload_premium_speedup_download"_q
+		: u"upload_premium_speedup_upload"_q, 10.);
+	const auto percent = int(base::SafeRound(better * 100.));
+	if (percent <= 100) {
+		return;
+	}
+	const auto increase = ((percent % 100) || percent <= 400)
+		? (download
+			? tr::lng_limit_download_increase_speed
+			: tr::lng_limit_upload_increase_speed)(
+				tr::now,
+				lt_percent,
+				TextWithEntities{ QString::number(percent - 100) },
+				Ui::Text::RichLangValue)
+		: (download
+			? tr::lng_limit_download_increase_times
+			: tr::lng_limit_upload_increase_times)(
+				tr::now,
+				lt_count,
+				percent / 100,
+				Ui::Text::RichLangValue);
+	auto text = (download
+		? tr::lng_limit_download_subscribe
+		: tr::lng_limit_upload_subscribe)(
+			tr::now,
+			lt_link,
+			Ui::Text::Link(Ui::Text::Bold(link)),
+			lt_increase,
+			TextWithEntities{ increase },
+			Ui::Text::RichLangValue);
+	auto filter = [=](ClickHandlerPtr handler, Qt::MouseButton button) {
+		Settings::ShowPremium(
+			controller(),
+			download ? u"download_limit"_q : u"upload_limit"_q);
+		return false;
+	};
+	Ui::Toast::Show(parent, {
+		.title = (download
+			? tr::lng_limit_download_title
+			: tr::lng_limit_upload_title)(tr::now),
+		.text = std::move(text),
+		.duration = 5 * crl::time(1000),
+		.slideSide = RectPart::Top,
+		.filter = std::move(filter),
+	});
+}
+
 void MainWidget::showBackFromStack(
 		const SectionShow &params) {
 	if (preventsCloseSection([=] { showBackFromStack(params); }, params)) {
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index a2c396781..10bea63d4 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -233,6 +233,8 @@ public:
 		Fn<void()> callback,
 		const SectionShow &params) const;
 
+	void showNonPremiumLimitToast(bool download);
+
 	void dialogsCancelled();
 
 protected:
diff --git a/Telegram/SourceFiles/storage/download_manager_mtproto.cpp b/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
index 77aae801b..b74eb7721 100644
--- a/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
+++ b/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
@@ -800,6 +800,10 @@ void DownloadMtprotoTask::getCdnFileHashesDone(
 void DownloadMtprotoTask::placeSentRequest(
 		mtpRequestId requestId,
 		const RequestData &requestData) {
+	if (_sentRequests.empty()) {
+		subscribeToNonPremiumLimit();
+	}
+
 	const auto amount = _owner->changeRequestedAmount(
 		dcId(),
 		requestData.sessionIndex,
@@ -815,6 +819,24 @@ void DownloadMtprotoTask::placeSentRequest(
 	Ensures(ok1 && ok2);
 }
 
+void DownloadMtprotoTask::subscribeToNonPremiumLimit() {
+	if (_nonPremiumLimitSubscription) {
+		return;
+	}
+	_owner->api().instance().nonPremiumDelayedRequests(
+	) | rpl::start_with_next([=](mtpRequestId id) {
+		if (_sentRequests.contains(id)) {
+			if (const auto documentId = objectId()) {
+				const auto type = v::get<StorageFileLocation>(
+					_location.data).type();
+				if (type == StorageFileLocation::Type::Document) {
+					_owner->notifyNonPremiumDelay(documentId);
+				}
+			}
+		}
+	}, _nonPremiumLimitSubscription);
+}
+
 auto DownloadMtprotoTask::finishSentRequest(
 	mtpRequestId requestId,
 	FinishRequestReason reason)
@@ -833,6 +855,10 @@ auto DownloadMtprotoTask::finishSentRequest(
 	_sentRequests.erase(it);
 	const auto ok = _requestByOffset.remove(result.offset);
 
+	if (_sentRequests.empty()) {
+		_nonPremiumLimitSubscription.destroy();
+	}
+
 	if (reason == FinishRequestReason::Success) {
 		_owner->requestSucceeded(
 			dcId(),
diff --git a/Telegram/SourceFiles/storage/download_manager_mtproto.h b/Telegram/SourceFiles/storage/download_manager_mtproto.h
index 6cc7421f6..a5916b491 100644
--- a/Telegram/SourceFiles/storage/download_manager_mtproto.h
+++ b/Telegram/SourceFiles/storage/download_manager_mtproto.h
@@ -57,6 +57,13 @@ public:
 	void checkSendNextAfterSuccess(MTP::DcId dcId);
 	[[nodiscard]] int chooseSessionIndex(MTP::DcId dcId) const;
 
+	void notifyNonPremiumDelay(DocumentId id) {
+		_nonPremiumDelays.fire_copy(id);
+	}
+	[[nodiscard]] rpl::producer<DocumentId> nonPremiumDelays() const {
+		return _nonPremiumDelays.events();
+	}
+
 private:
 	class Queue final {
 	public:
@@ -109,6 +116,7 @@ private:
 	const not_null<ApiWrap*> _api;
 
 	rpl::event_stream<> _taskFinished;
+	rpl::event_stream<DocumentId> _nonPremiumDelays;
 
 	base::flat_map<MTP::DcId, DcBalanceData> _balanceData;
 	base::Timer _resetGenerationTimer;
@@ -253,6 +261,8 @@ private:
 		int64 offset,
 		bytes::const_span buffer);
 
+	void subscribeToNonPremiumLimit();
+
 	const not_null<DownloadManagerMtproto*> _owner;
 	const MTP::DcId _dcId = 0;
 
@@ -271,6 +281,8 @@ private:
 	base::flat_map<RequestData, QByteArray> _cdnUncheckedParts;
 	mtpRequestId _cdnHashesRequestId = 0;
 
+	rpl::lifetime _nonPremiumLimitSubscription;
+
 };
 
 } // namespace Storage
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index 72ebdaafe..c40396955 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -206,6 +206,13 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 	) | rpl::start_with_next([=](const FullMsgId &fullId) {
 		processDocumentFailed(fullId);
 	}, _lifetime);
+
+	_api->instance().nonPremiumDelayedRequests(
+	) | rpl::start_with_next([=](mtpRequestId id) {
+		if (dcMap.contains(id)) {
+			_nonPremiumDelayed.emplace(id);
+		}
+	}, _lifetime);
 }
 
 void Uploader::processPhotoProgress(const FullMsgId &newId) {
@@ -359,7 +366,7 @@ void Uploader::upload(
 void Uploader::currentFailed() {
 	auto j = queue.find(uploadingId);
 	if (j != queue.end()) {
-		const auto &[msgId, file] = std::move(*j);
+		const auto [msgId, file] = std::move(*j);
 		queue.erase(j);
 		notifyFailed(msgId, file);
 	}
@@ -640,7 +647,7 @@ void Uploader::cancelAll() {
 		currentFailed();
 	}
 	while (!queue.empty()) {
-		const auto &[msgId, file] = std::move(*queue.begin());
+		const auto [msgId, file] = std::move(*queue.begin());
 		queue.erase(queue.begin());
 		notifyFailed(msgId, file);
 	}
@@ -689,6 +696,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 	if (i == requestsSent.cend()) {
 		j = docRequestsSent.find(requestId);
 	}
+	const auto wasNonPremiumDelayed = _nonPremiumDelayed.remove(requestId);
 	if (i != requestsSent.cend() || j != docRequestsSent.cend()) {
 		if (mtpIsFalse(result)) { // failed to upload current file
 			currentFailed();
@@ -742,6 +750,9 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 					file.fileSentSize,
 					file.file->partssize });
 			}
+			if (wasNonPremiumDelayed) {
+				_nonPremiumDelays.fire_copy(fullId);
+			}
 		}
 	}
 
@@ -750,6 +761,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 
 void Uploader::partFailed(const MTP::Error &error, mtpRequestId requestId) {
 	// failed to upload current file
+	_nonPremiumDelayed.remove(requestId);
 	if ((requestsSent.find(requestId) != requestsSent.cend())
 		|| (docRequestsSent.find(requestId) != docRequestsSent.cend())) {
 		currentFailed();
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index de5a84a19..2e68307b9 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -98,6 +98,10 @@ public:
 		return _secureFailed.events();
 	}
 
+	[[nodiscard]] rpl::producer<FullMsgId> nonPremiumDelays() const {
+		return _nonPremiumDelays.events();
+	}
+
 	void unpause();
 	void sendNext();
 	void stopSessions();
@@ -126,6 +130,7 @@ private:
 	base::flat_map<mtpRequestId, QByteArray> requestsSent;
 	base::flat_map<mtpRequestId, int32> docRequestsSent;
 	base::flat_map<mtpRequestId, int32> dcMap;
+	base::flat_set<mtpRequestId> _nonPremiumDelayed;
 	uint32 sentSize = 0; // FileSize: Right now any file size fits 32 bit.
 	uint32 sentSizes[MTP::kUploadSessionsCount] = { 0 };
 
@@ -143,6 +148,7 @@ private:
 	rpl::event_stream<FullMsgId> _photoFailed;
 	rpl::event_stream<FullMsgId> _documentFailed;
 	rpl::event_stream<FullMsgId> _secureFailed;
+	rpl::event_stream<FullMsgId> _nonPremiumDelays;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 44868b6db..4e03d8765 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/player/media_player_instance.h"
 #include "media/view/media_view_open_common.h"
 #include "data/data_document_resolver.h"
+#include "data/data_download_manager.h"
 #include "data/data_session.h"
 #include "data/data_file_origin.h"
 #include "data/data_folder.h"
@@ -64,6 +65,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "mainwidget.h"
 #include "main/main_account.h"
+#include "main/main_app_config.h"
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
@@ -74,6 +76,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_blocked_peers.h"
 #include "support/support_helper.h"
 #include "storage/file_upload.h"
+#include "storage/download_manager_mtproto.h"
 #include "window/themes/window_theme.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller_link_info.h"
@@ -90,20 +93,6 @@ namespace {
 constexpr auto kCustomThemesInMemory = 5;
 constexpr auto kMaxChatEntryHistorySize = 50;
 
-[[nodiscard]] Ui::ChatThemeBubblesData PrepareBubblesData(
-		const Data::CloudTheme &theme,
-		Data::CloudThemeType type) {
-	const auto i = theme.settings.find(type);
-	return {
-		.colors = (i != end(theme.settings)
-			? i->second.outgoingMessagesColors
-			: std::vector<QColor>()),
-		.accent = (i != end(theme.settings)
-			? i->second.outgoingAccentColor
-			: std::optional<QColor>()),
-	};
-}
-
 class MainWindowShow final : public ChatHelpers::Show {
 public:
 	explicit MainWindowShow(not_null<SessionController*> controller);
@@ -144,6 +133,29 @@ private:
 
 };
 
+[[nodiscard]] Ui::ChatThemeBubblesData PrepareBubblesData(
+		const Data::CloudTheme &theme,
+		Data::CloudThemeType type) {
+	const auto i = theme.settings.find(type);
+	return {
+		.colors = (i != end(theme.settings)
+			? i->second.outgoingMessagesColors
+			: std::vector<QColor>()),
+		.accent = (i != end(theme.settings)
+			? i->second.outgoingAccentColor
+			: std::optional<QColor>()),
+	};
+}
+
+[[nodiscard]] bool DownloadingDocument(not_null<DocumentData*> document) {
+	for (const auto id : Core::App().downloadManager().loadingList()) {
+		if (id->object.document == document.get()) {
+			return true;
+		}
+	}
+	return false;
+}
+
 MainWindowShow::MainWindowShow(not_null<SessionController*> controller)
 : _window(base::make_weak(controller)) {
 }
@@ -1192,6 +1204,16 @@ SessionController::SessionController(
 		}));
 	}, _lifetime);
 
+	session->downloader().nonPremiumDelays(
+	) | rpl::start_with_next([=](DocumentId id) {
+		checkNonPremiumLimitToastDownload(id);
+	}, _lifetime);
+
+	session->uploader().nonPremiumDelays(
+	) | rpl::start_with_next([=](FullMsgId id) {
+		checkNonPremiumLimitToastUpload(id);
+	}, _lifetime);
+
 	session->addWindow(this);
 
 	crl::on_main(this, [=] {
@@ -1200,6 +1222,50 @@ SessionController::SessionController(
 	});
 }
 
+bool SessionController::skipNonPremiumLimitToast(bool download) const {
+	if (session().premium()) {
+		return true;
+	}
+	const auto now = base::unixtime::now();
+	const auto last = download
+		? session().settings().lastNonPremiumLimitDownload()
+		: session().settings().lastNonPremiumLimitUpload();
+	const auto delay = session().account().appConfig().get<int>(
+		u"upload_premium_speedup_notify_period"_q,
+		3600);
+	return (last && now < last + delay && now > last - delay);
+}
+
+void SessionController::checkNonPremiumLimitToastDownload(DocumentId id) {
+	if (skipNonPremiumLimitToast(true)) {
+		return;
+	}
+	const auto document = session().data().document(id);
+	const auto visible = session().data().queryDocumentVisibility(document)
+		|| DownloadingDocument(document);
+	if (!visible) {
+		return;
+	}
+	content()->showNonPremiumLimitToast(true);
+	const auto now = base::unixtime::now();
+	session().settings().setLastNonPremiumLimitDownload(now);
+	session().saveSettingsDelayed();
+}
+
+void SessionController::checkNonPremiumLimitToastUpload(FullMsgId id) {
+	if (skipNonPremiumLimitToast(false)) {
+		return;
+	} else if (const auto item = session().data().message(id)) {
+		if (!session().data().queryItemVisibility(item)) {
+			return;
+		}
+		content()->showNonPremiumLimitToast(false);
+		const auto now = base::unixtime::now();
+		session().settings().setLastNonPremiumLimitUpload(now);
+		session().saveSettingsDelayed();
+	}
+}
+
 void SessionController::suggestArchiveAndMute() {
 	const auto weak = base::make_weak(this);
 	_window->show(Box([=](not_null<Ui::GenericBox*> box) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 4504f3b3c..063a2485a 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -650,6 +650,10 @@ private:
 		CachedTheme &theme,
 		bool generateGradient = true) const;
 
+	[[nodiscard]] bool skipNonPremiumLimitToast(bool download) const;
+	void checkNonPremiumLimitToastDownload(DocumentId id);
+	void checkNonPremiumLimitToastUpload(FullMsgId id);
+
 	const not_null<Controller*> _window;
 	const std::unique_ptr<ChatHelpers::EmojiInteractions> _emojiInteractions;
 	const bool _isPrimary = false;

From 0d740c21a20f19e5a0aefcb08090f031d0861365 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 28 Mar 2024 18:22:03 +0400
Subject: [PATCH 130/596] Check if bot supports Telegram Business.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/data/data_session.cpp    |  1 +
 Telegram/SourceFiles/data/data_user.h         | 16 +++++++------
 .../settings/business/settings_chatbots.cpp   | 24 +++++++++++++++----
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0c8045d4d..e149ccd29 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2316,6 +2316,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chatbots_reply_about" = "The bot will be able to view all new incoming messages, but not the messages that had been sent before you added the bot.";
 "lng_chatbots_remove" = "Remove Bot";
 "lng_chatbots_not_found" = "Chatbot not found.";
+"lng_chatbots_not_supported" = "This bot doesn't support Telegram Business yet.";
 "lng_chatbots_add" = "Add";
 "lng_chatbots_info_url" = "https://telegram.org/privacy";
 "lng_chatbot_status_can_reply" = "bot manages this chat";
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index c31d22440..3881a601c 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -722,6 +722,7 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 					result->botInfo->inlinePlaceholder = QString();
 				}
 				result->botInfo->supportsAttachMenu = data.is_bot_attach_menu();
+				result->botInfo->supportsBusiness = data.is_bot_business();
 				result->botInfo->canEditInformation = data.is_bot_can_edit();
 			} else {
 				result->setBotInfoVersion(-1);
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index fd992a0ef..166988287 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -22,13 +22,6 @@ struct BusinessDetails;
 struct BotInfo {
 	BotInfo();
 
-	bool inited = false;
-	bool readsAllHistory = false;
-	bool cantJoinGroups = false;
-	bool supportsAttachMenu = false;
-	bool canEditInformation = false;
-	int version = 0;
-	int descriptionVersion = 0;
 	QString description;
 	QString inlinePlaceholder;
 	std::vector<Data::BotCommand> commands;
@@ -44,6 +37,15 @@ struct BotInfo {
 
 	ChatAdminRights groupAdminRights;
 	ChatAdminRights channelAdminRights;
+
+	int version = 0;
+	int descriptionVersion = 0;
+	bool inited : 1 = false;
+	bool readsAllHistory : 1 = false;
+	bool cantJoinGroups : 1 = false;
+	bool supportsAttachMenu : 1 = false;
+	bool canEditInformation : 1 = false;
+	bool supportsBusiness : 1 = false;
 };
 
 enum class UserDataFlag : uint32 {
diff --git a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
index cb11074ab..d31239e19 100644
--- a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
@@ -38,6 +38,7 @@ constexpr auto kDebounceTimeout = crl::time(400);
 enum class LookupState {
 	Empty,
 	Loading,
+	Unsupported,
 	Ready,
 };
 
@@ -247,9 +248,14 @@ Main::Session &PreviewController::session() const {
 			return rpl::single(BotState());
 		} else if (const auto peer = owner->peerByUsername(extracted)) {
 			if (const auto user = peer->asUser(); user && user->isBot()) {
+				if (user->botInfo->supportsBusiness) {
+					return rpl::single(BotState{
+						.bot = user,
+						.state = LookupState::Ready,
+					});
+				}
 				return rpl::single(BotState{
-					.bot = user,
-					.state = LookupState::Ready,
+					.state = LookupState::Unsupported,
 				});
 			}
 			return rpl::single(BotState{
@@ -314,7 +320,10 @@ Main::Session &PreviewController::session() const {
 	std::move(state) | rpl::filter([=](BotState state) {
 		return state.state != LookupState::Loading;
 	}) | rpl::start_with_next([=](BotState state) {
-		raw->toggle(state.state == LookupState::Ready, anim::type::normal);
+		raw->toggle(
+			(state.state == LookupState::Ready
+				|| state.state == LookupState::Unsupported),
+			anim::type::normal);
 		if (state.bot) {
 			const auto delegate = parent->lifetime().make_state<
 				PeerListContentDelegateSimple
@@ -330,11 +339,14 @@ Main::Session &PreviewController::session() const {
 			controller->setDelegate(delegate);
 			delete base::take(*child);
 			*child = content;
-		} else if (state.state == LookupState::Ready) {
+		} else if (state.state == LookupState::Ready
+			|| state.state == LookupState::Unsupported) {
 			const auto content = Ui::CreateChild<Ui::RpWidget>(inner);
 			const auto label = Ui::CreateChild<Ui::FlatLabel>(
 				content,
-				tr::lng_chatbots_not_found(),
+				(state.state == LookupState::Unsupported
+					? tr::lng_chatbots_not_supported()
+					: tr::lng_chatbots_not_found()),
 				st::settingsChatbotsNotFound);
 			content->resize(
 				inner->width(),
@@ -483,6 +495,8 @@ void Chatbots::save() {
 	const auto fail = [=](QString error) {
 		if (error == u"BUSINESS_RECIPIENTS_EMPTY"_q) {
 			show->showToast(tr::lng_greeting_recipients_empty(tr::now));
+		} else if (error == u"BOT_BUSINESS_MISSING"_q) {
+			show->showToast(tr::lng_chatbots_not_supported(tr::now));
 		}
 	};
 	controller()->session().data().chatbots().save({

From ab74ed0fa75639191fc2fe5a41c1e6f0d2381db1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 09:49:13 +0400
Subject: [PATCH 131/596] Handle flood errors in birthday changes.

---
 Telegram/SourceFiles/core/local_url_handlers.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 5e4afae2a..44474df65 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -697,8 +697,11 @@ bool ShowEditBirthday(
 		)).done(crl::guard(controller, [=] {
 			controller->showToast(tr::lng_settings_birthday_saved(tr::now));
 		})).fail(crl::guard(controller, [=](const MTP::Error &error) {
-			controller->showToast(u"Error: "_q + error.type());
-		})).send();
+			const auto type = error.type();
+			controller->showToast(type.startsWith(u"FLOOD_WAIT_"_q)
+				? tr::lng_flood_error(tr::now)
+				: (u"Error: "_q + error.type()));
+		})).handleFloodErrors().send();
 	};
 	controller->show(Box(
 		Ui::EditBirthdayBox,

From 280d69d3465518a8383600edc9a4bcce60841c84 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 11:21:57 +0400
Subject: [PATCH 132/596] Implement personal channel selector.

---
 Telegram/Resources/langs/lang.strings         |   9 +-
 .../SourceFiles/core/local_url_handlers.cpp   | 139 ++++++++++++++++++
 Telegram/SourceFiles/data/data_changes.h      |  31 ++--
 Telegram/SourceFiles/data/data_user.cpp       |  20 +++
 Telegram/SourceFiles/data/data_user.h         |   7 +
 .../info/profile/info_profile_values.cpp      |  10 ++
 .../info/profile/info_profile_values.h        |   2 +
 .../settings/settings_information.cpp         |  46 ++++--
 8 files changed, 238 insertions(+), 26 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e149ccd29..0f8f971f1 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -672,7 +672,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_birthday_contacts" = "Only your contacts can see your birthday. {link}";
 "lng_settings_birthday_contacts_link" = "Change >";
 "lng_settings_birthday_saved" = "Your date of birth was updated.";
-"lng_settings_birthday_reset" = "Reset";
+"lng_settings_birthday_reset" = "Remove";
+"lng_settings_channel_label" = "Personal channel";
+"lng_settings_channel_add" = "Add";
+"lng_settings_channel_remove" = "Remove";
+"lng_settings_channel_no_yet" = "You don't have any channels yet.";
+"lng_settings_channel_start" = "Start a Channel";
+"lng_settings_channel_saved" = "Your personal channel was updated.";
+"lng_settings_channel_removed" = "Your personal channel was removed.";
 "lng_settings_add_account_about" = "You can add up to four accounts with different phone numbers.";
 "lng_settings_peer_to_peer_about" = "Disabling peer-to-peer will relay all calls through Telegram servers to avoid revealing your IP address, but may slightly decrease audio quality.";
 "lng_settings_advanced" = "Advanced";
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 44474df65..1cd4c18fc 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -69,6 +69,102 @@ namespace {
 
 using Match = qthelp::RegularExpressionMatch;
 
+class PersonalChannelController final : public PeerListController {
+public:
+	explicit PersonalChannelController(not_null<Main::Session*> session);
+	~PersonalChannelController();
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	[[nodiscard]] rpl::producer<not_null<ChannelData*>> chosen() const;
+
+private:
+	const not_null<Main::Session*> _session;
+	rpl::event_stream<not_null<ChannelData*>> _chosen;
+	mtpRequestId _requestId = 0;
+
+};
+
+PersonalChannelController::PersonalChannelController(
+	not_null<Main::Session*> session)
+: _session(session) {
+}
+
+PersonalChannelController::~PersonalChannelController() {
+	if (_requestId) {
+		_session->api().request(_requestId).cancel();
+	}
+}
+
+Main::Session &PersonalChannelController::session() const {
+	return *_session;
+}
+
+void PersonalChannelController::prepare() {
+	using Flag = MTPchannels_GetAdminedPublicChannels::Flag;
+	_requestId = _session->api().request(
+		MTPchannels_GetAdminedPublicChannels(
+			MTP_flags(Flag::f_for_personal))
+	).done([=](const MTPmessages_Chats &result) {
+		_requestId = 0;
+
+		const auto &chats = result.match([](const auto &data) {
+			return data.vchats().v;
+		});
+		for (const auto &chat : chats) {
+			if (const auto peer = _session->data().processChat(chat)) {
+				if (!delegate()->peerListFindRow(peer->id.value)) {
+					delegate()->peerListAppendRow(
+						std::make_unique<PeerListRow>(peer));
+				}
+			}
+		}
+		delegate()->peerListRefreshRows();
+	}).send();
+}
+
+void PersonalChannelController::rowClicked(not_null<PeerListRow*> row) {
+	if (const auto channel = row->peer()->asChannel()) {
+		_chosen.fire_copy(channel);
+	}
+}
+
+auto PersonalChannelController::chosen() const
+-> rpl::producer<not_null<ChannelData*>> {
+	return _chosen.events();
+}
+
+void SavePersonalChannel(
+		not_null<Window::SessionController*> window,
+		ChannelData *channel) {
+	const auto self = window->session().user();
+	const auto history = channel
+		? channel->owner().history(channel->id).get()
+		: nullptr;
+	const auto item = history
+		? history->lastServerMessage()
+		: nullptr;
+	const auto channelId = channel
+		? peerToChannel(channel->id)
+		: ChannelId();
+	const auto messageId = item ? item->id : MsgId();
+	if (self->personalChannelId() != channelId
+		|| (messageId
+			&& self->personalChannelMessageId() != messageId)) {
+		self->setPersonalChannel(channelId, messageId);
+		self->session().api().request(MTPaccount_UpdatePersonalChannel(
+			channel ? channel->inputChannel : MTP_inputChannelEmpty()
+		)).done(crl::guard(window, [=] {
+			window->showToast((channel
+				? tr::lng_settings_channel_saved
+				: tr::lng_settings_channel_removed)(tr::now));
+		})).fail(crl::guard(window, [=](const MTP::Error &error) {
+			window->showToast(u"Error: "_q + error.type());
+		})).send();
+	}
+}
+
 bool JoinGroupByHash(
 		Window::SessionController *controller,
 		const Match &match,
@@ -730,6 +826,45 @@ bool ShowEditBirthdayPrivacy(
 	return true;
 }
 
+bool ShowEditPersonalChannel(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+
+	auto listController = std::make_unique<PersonalChannelController>(
+		&controller->session());
+	const auto rawController = listController.get();
+	auto initBox = [=](not_null<PeerListBox*> box) {
+		box->setTitle(tr::lng_settings_channel_label());
+		box->addButton(tr::lng_box_done(), [=] {
+			box->closeBox();
+		});
+
+		const auto save = [=](ChannelData *channel) {
+			SavePersonalChannel(controller, channel);
+			box->closeBox();
+		};
+
+		rawController->chosen(
+		) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+			save(channel);
+		}, box->lifetime());
+
+		if (controller->session().user()->personalChannelId()) {
+			box->addLeftButton(tr::lng_settings_channel_remove(), [=] {
+				save(nullptr);
+			});
+		}
+	};
+	controller->show(Box<PeerListBox>(
+		std::move(listController),
+		std::move(initBox)));
+	return true;
+}
+
 void ExportTestChatTheme(
 		not_null<Window::SessionController*> controller,
 		not_null<const Data::CloudTheme*> theme) {
@@ -1128,6 +1263,10 @@ const std::vector<LocalUrlHandler> &InternalUrlHandlers() {
 			u"^edit_privacy_birthday$"_q,
 			ShowEditBirthdayPrivacy,
 		},
+		{
+			u"^edit_personal_channel$"_q,
+			ShowEditPersonalChannel,
+		},
 	};
 	return Result;
 }
diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index eeb80ccb7..d33a41617 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -90,27 +90,28 @@ struct PeerUpdate {
 		EmojiStatus         = (1ULL << 28),
 		BusinessDetails     = (1ULL << 29),
 		Birthday            = (1ULL << 30),
+		PersonalChannel     = (1ULL << 31),
 
 		// For chats and channels
-		InviteLinks         = (1ULL << 31),
-		Members             = (1ULL << 32),
-		Admins              = (1ULL << 33),
-		BannedUsers         = (1ULL << 34),
-		Rights              = (1ULL << 35),
-		PendingRequests     = (1ULL << 36),
-		Reactions           = (1ULL << 37),
+		InviteLinks         = (1ULL << 32),
+		Members             = (1ULL << 33),
+		Admins              = (1ULL << 34),
+		BannedUsers         = (1ULL << 35),
+		Rights              = (1ULL << 36),
+		PendingRequests     = (1ULL << 37),
+		Reactions           = (1ULL << 38),
 
 		// For channels
-		ChannelAmIn         = (1ULL << 38),
-		StickersSet         = (1ULL << 39),
-		EmojiSet            = (1ULL << 40),
-		ChannelLinkedChat   = (1ULL << 41),
-		ChannelLocation     = (1ULL << 42),
-		Slowmode            = (1ULL << 43),
-		GroupCall           = (1ULL << 44),
+		ChannelAmIn         = (1ULL << 39),
+		StickersSet         = (1ULL << 40),
+		EmojiSet            = (1ULL << 41),
+		ChannelLinkedChat   = (1ULL << 42),
+		ChannelLocation     = (1ULL << 43),
+		Slowmode            = (1ULL << 44),
+		GroupCall           = (1ULL << 45),
 
 		// For iteration
-		LastUsedBit         = (1ULL << 44),
+		LastUsedBit         = (1ULL << 45),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index ea5d0dad1..cffe8ad67 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -195,6 +195,23 @@ void UserData::setBusinessDetails(Data::BusinessDetails details) {
 	session().changes().peerUpdated(this, UpdateFlag::BusinessDetails);
 }
 
+ChannelId UserData::personalChannelId() const {
+	return _personalChannelId;
+}
+
+MsgId UserData::personalChannelMessageId() const {
+	return _personalChannelMessageId;
+}
+
+void UserData::setPersonalChannel(ChannelId channelId, MsgId messageId) {
+	if (_personalChannelId != channelId
+		|| _personalChannelMessageId != messageId) {
+		_personalChannelId = channelId;
+		_personalChannelMessageId = messageId;
+		session().changes().peerUpdated(this, UpdateFlag::PersonalChannel);
+	}
+}
+
 void UserData::setName(const QString &newFirstName, const QString &newLastName, const QString &newPhoneName, const QString &newUsername) {
 	bool changeName = !newFirstName.isEmpty() || !newLastName.isEmpty();
 
@@ -623,6 +640,9 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 		update.vbusiness_location(),
 		update.vbusiness_intro()));
 	user->setBirthday(update.vbirthday());
+	user->setPersonalChannel(
+		update.vpersonal_channel_id().value_or_empty(),
+		update.vpersonal_channel_message().value_or_empty());
 	if (user->isSelf()) {
 		user->owner().businessInfo().applyAwaySettings(
 			FromMTP(&user->owner(), update.vbusiness_away_message()));
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index 166988287..7a8a22582 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -205,6 +205,10 @@ public:
 	[[nodiscard]] const Data::BusinessDetails &businessDetails() const;
 	void setBusinessDetails(Data::BusinessDetails details);
 
+	[[nodiscard]] ChannelId personalChannelId() const;
+	[[nodiscard]] MsgId personalChannelMessageId() const;
+	void setPersonalChannel(ChannelId channelId, MsgId messageId);
+
 private:
 	auto unavailableReasons() const
 		-> const std::vector<Data::UnavailableReason> & override;
@@ -223,6 +227,9 @@ private:
 	QString _phone;
 	QString _privateForwardName;
 
+	ChannelId _personalChannelId = 0;
+	MsgId _personalChannelMessageId = 0;
+
 	uint64 _accessHash = 0;
 	static constexpr auto kInaccessibleAccessHashOld
 		= 0xFFFFFFFFFFFFFFFFULL;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index 56b7eac84..aa10dff08 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -352,6 +352,16 @@ rpl::producer<Data::Birthday> BirthdayValue(not_null<UserData*> user) {
 	});
 }
 
+rpl::producer<ChannelData*> PersonalChannelValue(not_null<UserData*> user) {
+	return user->session().changes().peerFlagsValue(
+		user,
+		UpdateFlag::PersonalChannel
+	) | rpl::map([=] {
+		const auto channelId = user->personalChannelId();
+		return channelId ? user->owner().channel(channelId).get() : nullptr;
+	});
+}
+
 rpl::producer<bool> AmInChannelValue(not_null<ChannelData*> channel) {
 	return channel->session().changes().peerFlagsValue(
 		channel,
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h
index 5dac2207d..6b7ccf475 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.h
@@ -86,6 +86,8 @@ rpl::producer<not_null<PeerData*>> MigratedOrMeValue(
 	not_null<UserData*> user);
 [[nodiscard]] rpl::producer<Data::Birthday> BirthdayValue(
 	not_null<UserData*> user);
+[[nodiscard]] rpl::producer<ChannelData*> PersonalChannelValue(
+	not_null<UserData*> user);
 [[nodiscard]] rpl::producer<bool> AmInChannelValue(
 	not_null<ChannelData*> channel);
 [[nodiscard]] rpl::producer<int> MembersCountValue(not_null<PeerData*> peer);
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index c577b0a71..bf6989647 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_peer_values.h"
 #include "data/data_changes.h"
+#include "data/data_channel.h"
 #include "data/data_premium_limits.h"
 #include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_badge.h"
@@ -368,16 +369,7 @@ void SetupBirthday(
 		tr::lng_settings_birthday_add()
 	) | rpl::map([](Data::Birthday birthday, const QString &add) {
 		const auto text = Data::BirthdayText(birthday);
-		if (!text.isEmpty()) {
-			return TextWithEntities{ text };
-		}
-		auto result = TextWithEntities{ add };
-		result.entities.push_back({
-			EntityType::CustomUrl,
-			0,
-			int(add.size()),
-			"internal:edit_username" });
-		return result;
+		return TextWithEntities{ !text.isEmpty() ? text : add };
 	});
 	const auto edit = [=] {
 		Core::App().openInternalUrl(
@@ -419,6 +411,39 @@ void SetupBirthday(
 			Ui::Text::WithEntities)));
 }
 
+void SetupPersonalChannel(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> controller,
+		not_null<UserData*> self) {
+	const auto session = &self->session();
+
+	Ui::AddSkip(container);
+
+	auto value = rpl::combine(
+		Info::Profile::PersonalChannelValue(self),
+		tr::lng_settings_channel_add()
+	) | rpl::map([](ChannelData *channel, const QString &add) {
+		return TextWithEntities{ channel ? channel->name() : add };
+	});
+	const auto edit = [=] {
+		Core::App().openInternalUrl(
+			u"internal:edit_personal_channel"_q,
+			QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = base::make_weak(controller),
+			}));
+	};
+	AddRow(
+		container,
+		tr::lng_settings_channel_label(),
+		std::move(value),
+		tr::lng_mediaview_copy(tr::now),
+		edit,
+		{ &st::menuIconChannel });
+
+	Ui::AddSkip(container);
+	Ui::AddDivider(container);
+}
+
 void SetupRows(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
@@ -1020,6 +1045,7 @@ void Information::setupContent(
 	SetupPhoto(content, controller, self);
 	SetupBio(content, self);
 	SetupRows(content, controller, self);
+	SetupPersonalChannel(content, controller, self);
 	SetupBirthday(content, controller, self);
 	SetupAccountsWrap(content, controller);
 

From f439443fe58104a1cbd45127731cb46c51aa2c48 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 12:01:34 +0400
Subject: [PATCH 133/596] Show personal channel in users profile.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/info/info.style          |  2 +
 .../info/profile/info_profile_actions.cpp     | 71 +++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0f8f971f1..83b354610 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1330,6 +1330,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_via_link_shared_many#one" = "Link shared with **{count} user**.";
 "lng_via_link_shared_many#other" = "Link shared with **{count} users**.";
 
+"lng_info_personal_channel_label" = "Channel";
 "lng_info_mobile_label" = "Mobile";
 "lng_info_mobile_context_menu_fragment_about" = "This number is not tied to a SIM card and was acquired on {link}.";
 "lng_info_mobile_context_menu_fragment_about_link" = "Fragment";
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 19162c400..d59de8526 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -446,6 +446,8 @@ infoSharedMediaButtonIconPosition: point(20px, 3px);
 infoGroupMembersIconPosition: point(20px, 10px);
 infoChannelMembersIconPosition: point(20px, 19px);
 
+infoPersonalChannelIconPosition: point(25px, 20px);
+
 infoBlockHeaderLabel: FlatLabel(infoProfileStatus) {
 	textFg: windowBoldFg;
 	style: TextStyle(defaultTextStyle) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 25fc17c34..1f5e23a1a 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -661,6 +661,7 @@ public:
 	object_ptr<Ui::RpWidget> fill();
 
 private:
+	object_ptr<Ui::RpWidget> setupPersonalChannel(not_null<UserData*> user);
 	object_ptr<Ui::RpWidget> setupInfo();
 	object_ptr<Ui::RpWidget> setupMuteToggle();
 	void setupMainButtons();
@@ -1115,6 +1116,73 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 	return result;
 }
 
+object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
+		not_null<UserData*> user) {
+	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		_wrap,
+		object_ptr<Ui::VerticalLayout>(_wrap));
+	const auto container = result->entity();
+
+	result->toggleOn(PersonalChannelValue(
+		user
+	) | rpl::map(rpl::mappers::_1 != nullptr));
+	result->finishAnimating();
+
+	Ui::AddDivider(container);
+
+	auto channel = PersonalChannelValue(
+		user
+	) | rpl::start_spawning(result->lifetime());
+	auto text = rpl::duplicate(
+		channel
+	) | rpl::map([=](ChannelData *channel) {
+		return channel ? NameValue(channel) : rpl::single(QString());
+	}) | rpl::flatten_latest() | rpl::map([](const QString &name) {
+		return name.isEmpty() ? TextWithEntities() : Ui::Text::Link(name);
+	});
+	auto label = rpl::combine(
+		tr::lng_info_personal_channel_label(Ui::Text::WithEntities),
+		rpl::duplicate(channel)
+	) | rpl::map([](TextWithEntities &&text, ChannelData *channel) {
+		const auto count = channel ? channel->membersCount() : 0;
+		if (count > 1) {
+			text.append(
+				QString::fromUtf8(" \xE2\x80\xA2 ")
+			).append(tr::lng_chat_status_subscribers(
+				tr::now,
+				lt_count_decimal,
+				count));
+		}
+		return text;
+	});
+	auto line = CreateTextWithLabel(
+		result,
+		std::move(label),
+		std::move(text),
+		st::infoLabel,
+		st::infoLabeled,
+		st::infoProfileLabeledPadding);
+	container->add(std::move(line.wrap));
+
+	line.text->setClickHandlerFilter([
+		=,
+		window = _controller->parentController()](
+			const ClickHandlerPtr &handler,
+			Qt::MouseButton button) {
+		if (const auto channelId = user->personalChannelId()) {
+			window->showPeerInfo(peerFromChannel(channelId));
+		}
+		return false;
+	});
+
+	object_ptr<FloatingIcon>(
+		result,
+		st::infoIconMediaChannel,
+		st::infoPersonalChannelIconPosition);
+
+	return result;
+}
+
 object_ptr<Ui::RpWidget> DetailsFiller::setupMuteToggle() {
 	const auto peer = _peer;
 	const auto topicRootId = _topic ? _topic->rootId() : MsgId();
@@ -1349,6 +1417,9 @@ Ui::MultiSlideTracker DetailsFiller::fillChannelButtons(
 object_ptr<Ui::RpWidget> DetailsFiller::fill() {
 	Expects(!_topic || !_topic->creating());
 
+	if (const auto user = _peer->asUser()) {
+		add(setupPersonalChannel(user));
+	}
 	add(object_ptr<Ui::BoxContentDivider>(_wrap));
 	add(CreateSkipWidget(_wrap));
 	add(setupInfo());

From 3b5814edae8b826cc1920da2915f9ac92ced88f5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 12:25:59 +0400
Subject: [PATCH 134/596] Handle empty channels list.

---
 Telegram/Resources/langs/lang.strings         |  2 +-
 .../SourceFiles/core/local_url_handlers.cpp   | 56 +++++++++++++++----
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 83b354610..e094467cf 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -676,7 +676,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_channel_label" = "Personal channel";
 "lng_settings_channel_add" = "Add";
 "lng_settings_channel_remove" = "Remove";
-"lng_settings_channel_no_yet" = "You don't have any channels yet.";
+"lng_settings_channel_no_yet" = "You don't have any public channels yet.";
 "lng_settings_channel_start" = "Start a Channel";
 "lng_settings_channel_saved" = "Your personal channel was updated.";
 "lng_settings_channel_removed" = "Your personal channel was removed.";
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 1cd4c18fc..7ddee02d2 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/sessions_box.h"
 #include "boxes/language_box.h"
 #include "passport/passport_form_controller.h"
+#include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "data/data_birthday.h"
 #include "data/data_channel.h"
@@ -71,7 +72,8 @@ using Match = qthelp::RegularExpressionMatch;
 
 class PersonalChannelController final : public PeerListController {
 public:
-	explicit PersonalChannelController(not_null<Main::Session*> session);
+	explicit PersonalChannelController(
+		not_null<Window::SessionController*> window);
 	~PersonalChannelController();
 
 	Main::Session &session() const override;
@@ -80,46 +82,76 @@ public:
 	[[nodiscard]] rpl::producer<not_null<ChannelData*>> chosen() const;
 
 private:
-	const not_null<Main::Session*> _session;
+	const not_null<Window::SessionController*> _window;
 	rpl::event_stream<not_null<ChannelData*>> _chosen;
 	mtpRequestId _requestId = 0;
 
 };
 
 PersonalChannelController::PersonalChannelController(
-	not_null<Main::Session*> session)
-: _session(session) {
+	not_null<Window::SessionController*> window)
+: _window(window) {
 }
 
 PersonalChannelController::~PersonalChannelController() {
 	if (_requestId) {
-		_session->api().request(_requestId).cancel();
+		_window->session().api().request(_requestId).cancel();
 	}
 }
 
 Main::Session &PersonalChannelController::session() const {
-	return *_session;
+	return _window->session();
 }
 
 void PersonalChannelController::prepare() {
+	setDescription(object_ptr<Ui::FlatLabel>(
+		nullptr,
+		tr::lng_contacts_loading(),
+		computeListSt().about));
+
 	using Flag = MTPchannels_GetAdminedPublicChannels::Flag;
-	_requestId = _session->api().request(
+	_requestId = _window->session().api().request(
 		MTPchannels_GetAdminedPublicChannels(
 			MTP_flags(Flag::f_for_personal))
 	).done([=](const MTPmessages_Chats &result) {
 		_requestId = 0;
 
+		setDescription(nullptr);
 		const auto &chats = result.match([](const auto &data) {
 			return data.vchats().v;
 		});
+		const auto owner = &_window->session().data();
 		for (const auto &chat : chats) {
-			if (const auto peer = _session->data().processChat(chat)) {
-				if (!delegate()->peerListFindRow(peer->id.value)) {
-					delegate()->peerListAppendRow(
-						std::make_unique<PeerListRow>(peer));
+			if (const auto peer = owner->processChat(chat)) {
+				const auto rowId = peer->id.value;
+				const auto channel = peer->asChannel();
+				if (channel && !delegate()->peerListFindRow(rowId)) {
+					auto row = std::make_unique<PeerListRow>(peer);
+					row->setCustomStatus(tr::lng_chat_status_subscribers(
+						tr::now,
+						lt_count,
+						channel->membersCount()));
+					delegate()->peerListAppendRow(std::move(row));
 				}
 			}
 		}
+		if (!delegate()->peerListFullRowsCount()) {
+			auto none = rpl::combine(
+				tr::lng_settings_channel_no_yet(Ui::Text::WithEntities),
+				tr::lng_settings_channel_start()
+			) | rpl::map([](TextWithEntities &&text, const QString &link) {
+				return text.append('\n').append(Ui::Text::Link(link));
+			});
+			auto label = object_ptr<Ui::FlatLabel>(
+				nullptr,
+				std::move(none),
+				computeListSt().about);
+			label->setClickHandlerFilter([=](const auto &...) {
+				_window->showNewChannel();
+				return false;
+			});
+			setDescription(std::move(label));
+		}
 		delegate()->peerListRefreshRows();
 	}).send();
 }
@@ -835,7 +867,7 @@ bool ShowEditPersonalChannel(
 	}
 
 	auto listController = std::make_unique<PersonalChannelController>(
-		&controller->session());
+		controller);
 	const auto rawController = listController.get();
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->setTitle(tr::lng_settings_channel_label());

From da7a796edb746ec4b4e0d638b91fd7a17e1c81c1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 15:30:50 +0400
Subject: [PATCH 135/596] Add session->appConfig() shortcut.

---
 .../SourceFiles/api/api_global_privacy.cpp    |  9 +++----
 Telegram/SourceFiles/api/api_premium.cpp      | 11 ++++----
 Telegram/SourceFiles/api/api_ringtones.cpp    | 13 +++++----
 Telegram/SourceFiles/api/api_sending.cpp      |  4 +--
 .../SourceFiles/api/api_sensitive_content.cpp |  3 +--
 Telegram/SourceFiles/api/api_transcribes.cpp  | 11 ++++----
 Telegram/SourceFiles/api/api_who_reacted.cpp  |  5 ++--
 .../boxes/peers/edit_members_visible.cpp      |  3 +--
 .../boxes/peers/edit_peer_info_box.cpp        |  3 +--
 .../boxes/peers/replace_boost_box.cpp         |  4 +--
 .../chat_helpers/stickers_list_footer.cpp     |  3 +--
 .../SourceFiles/data/data_chat_filters.cpp    |  5 ++--
 .../data/data_message_reactions.cpp           |  3 +--
 Telegram/SourceFiles/data/data_peer.cpp       |  3 +--
 .../SourceFiles/data/data_peer_values.cpp     |  5 ++--
 .../SourceFiles/data/data_premium_limits.cpp  | 27 +++++++++----------
 Telegram/SourceFiles/data/data_session.cpp    | 11 ++++----
 .../data/stickers/data_custom_emoji.cpp       |  3 +--
 .../data/stickers/data_stickers.cpp           |  3 +--
 .../info/profile/info_profile_phone_menu.cpp  |  3 +--
 .../info_userpic_emoji_builder_preview.cpp    |  3 +--
 Telegram/SourceFiles/main/main_app_config.cpp |  6 +++++
 Telegram/SourceFiles/main/main_app_config.h   |  2 ++
 .../main/main_app_config_values.cpp           |  3 +--
 Telegram/SourceFiles/main/main_session.cpp    | 10 ++++---
 Telegram/SourceFiles/main/main_session.h      |  3 +++
 Telegram/SourceFiles/mainwidget.cpp           |  3 +--
 .../menu/menu_antispam_validator.cpp          |  5 ++--
 .../settings/business/settings_chat_intro.cpp |  3 +--
 .../settings/business/settings_chat_links.cpp |  3 +--
 .../business/settings_recipients_helper.cpp   |  9 +++----
 .../settings/settings_business.cpp            |  9 +++----
 .../SourceFiles/settings/settings_main.cpp    |  2 +-
 .../SourceFiles/settings/settings_premium.cpp | 17 ++++++------
 .../window/window_session_controller.cpp      |  3 +--
 35 files changed, 98 insertions(+), 115 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_global_privacy.cpp b/Telegram/SourceFiles/api/api_global_privacy.cpp
index f958bdfe8..6a891f63e 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_global_privacy.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "apiwrap.h"
 #include "main/main_session.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 
 namespace Api {
@@ -40,9 +39,9 @@ void GlobalPrivacy::reload(Fn<void()> callback) {
 		}
 	}).send();
 
-	_session->account().appConfig().value(
+	_session->appConfig().value(
 	) | rpl::start_with_next([=] {
-		_showArchiveAndMute = _session->account().appConfig().get<bool>(
+		_showArchiveAndMute = _session->appConfig().get<bool>(
 			u"autoarchive_setting_available"_q,
 			false);
 	}, _session->lifetime());
@@ -75,12 +74,12 @@ rpl::producer<bool> GlobalPrivacy::showArchiveAndMute() const {
 }
 
 rpl::producer<> GlobalPrivacy::suggestArchiveAndMute() const {
-	return _session->account().appConfig().suggestionRequested(
+	return _session->appConfig().suggestionRequested(
 		u"AUTOARCHIVE_POPULAR"_q);
 }
 
 void GlobalPrivacy::dismissArchiveAndMuteSuggestion() {
-	_session->account().appConfig().dismissSuggestion(
+	_session->appConfig().dismissSuggestion(
 		u"AUTOARCHIVE_POPULAR"_q);
 }
 
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 3f94c8e5c..5257feb2d 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -19,7 +19,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "payments/payments_form.h"
@@ -571,34 +570,34 @@ Data::SubscriptionOptions PremiumGiftCodeOptions::options(int amount) {
 
 int PremiumGiftCodeOptions::giveawayBoostsPerPremium() const {
 	constexpr auto kFallbackCount = 4;
-	return _peer->session().account().appConfig().get<int>(
+	return _peer->session().appConfig().get<int>(
 		u"giveaway_boosts_per_premium"_q,
 		kFallbackCount);
 }
 
 int PremiumGiftCodeOptions::giveawayCountriesMax() const {
 	constexpr auto kFallbackCount = 10;
-	return _peer->session().account().appConfig().get<int>(
+	return _peer->session().appConfig().get<int>(
 		u"giveaway_countries_max"_q,
 		kFallbackCount);
 }
 
 int PremiumGiftCodeOptions::giveawayAddPeersMax() const {
 	constexpr auto kFallbackCount = 10;
-	return _peer->session().account().appConfig().get<int>(
+	return _peer->session().appConfig().get<int>(
 		u"giveaway_add_peers_max"_q,
 		kFallbackCount);
 }
 
 int PremiumGiftCodeOptions::giveawayPeriodMax() const {
 	constexpr auto kFallbackCount = 3600 * 24 * 7;
-	return _peer->session().account().appConfig().get<int>(
+	return _peer->session().appConfig().get<int>(
 		u"giveaway_period_max"_q,
 		kFallbackCount);
 }
 
 bool PremiumGiftCodeOptions::giveawayGiftsPurchaseAvailable() const {
-	return _peer->session().account().appConfig().get<bool>(
+	return _peer->session().appConfig().get<bool>(
 		u"giveaway_gifts_purchase_available"_q,
 		false);
 }
diff --git a/Telegram/SourceFiles/api/api_ringtones.cpp b/Telegram/SourceFiles/api/api_ringtones.cpp
index 5b471851e..87522bf58 100644
--- a/Telegram/SourceFiles/api/api_ringtones.cpp
+++ b/Telegram/SourceFiles/api/api_ringtones.cpp
@@ -16,7 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_file_origin.h"
 #include "data/data_session.h"
 #include "data/notify/data_notify_settings.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "storage/file_upload.h"
@@ -191,20 +190,20 @@ void Ringtones::remove(DocumentId id) {
 }
 
 int64 Ringtones::maxSize() const {
-	return _session->account().appConfig().get<int>(
-		"ringtone_size_max",
+	return _session->appConfig().get<int>(
+		u"ringtone_size_max"_q,
 		100 * 1024);
 }
 
 int Ringtones::maxSavedCount() const {
-	return _session->account().appConfig().get<int>(
-		"ringtone_saved_count_max",
+	return _session->appConfig().get<int>(
+		u"ringtone_saved_count_max"_q,
 		100);
 }
 
 crl::time Ringtones::maxDuration() const {
-	return crl::time(1000) * _session->account().appConfig().get<int>(
-		"ringtone_duration_max",
+	return crl::time(1000) * _session->appConfig().get<int>(
+		u"ringtone_duration_max"_q,
 		5);
 }
 
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index 495b9467e..72bd06b3d 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -28,7 +28,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_entity.h" // TextWithEntities.
 #include "ui/item_text_options.h" // Ui::ItemTextOptions.
 #include "main/main_session.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "storage/localimageloader.h"
 #include "storage/file_upload.h"
@@ -239,8 +238,7 @@ bool SendDice(MessageToSend &message) {
 		|| !message.textWithTags.tags.isEmpty()) {
 		return false;
 	}
-	auto &account = message.action.history->session().account();
-	auto &config = account.appConfig();
+	auto &config = message.action.history->session().appConfig();
 	static const auto hardcoded = std::vector<QString>{
 		Stickers::DicePacks::kDiceString,
 		Stickers::DicePacks::kDartString,
diff --git a/Telegram/SourceFiles/api/api_sensitive_content.cpp b/Telegram/SourceFiles/api/api_sensitive_content.cpp
index e2d3e49ed..97388d638 100644
--- a/Telegram/SourceFiles/api/api_sensitive_content.cpp
+++ b/Telegram/SourceFiles/api/api_sensitive_content.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "apiwrap.h"
 #include "main/main_session.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 
 namespace Api {
@@ -22,7 +21,7 @@ constexpr auto kRefreshAppConfigTimeout = 3 * crl::time(1000);
 SensitiveContent::SensitiveContent(not_null<ApiWrap*> api)
 : _session(&api->session())
 , _api(&api->instance())
-, _appConfigReloadTimer([=] { _session->account().appConfig().refresh(); }) {
+, _appConfigReloadTimer([=] { _session->appConfig().refresh(); }) {
 }
 
 void SensitiveContent::reload() {
diff --git a/Telegram/SourceFiles/api/api_transcribes.cpp b/Telegram/SourceFiles/api/api_transcribes.cpp
index d7064abcd..dd983dc37 100644
--- a/Telegram/SourceFiles/api/api_transcribes.cpp
+++ b/Telegram/SourceFiles/api/api_transcribes.cpp
@@ -15,7 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 
@@ -36,10 +35,10 @@ bool Transcribes::freeFor(not_null<HistoryItem*> item) const {
 
 bool Transcribes::trialsSupport() {
 	if (!_trialsSupport) {
-		const auto count = _session->account().appConfig().get<int>(
+		const auto count = _session->appConfig().get<int>(
 			u"transcribe_audio_trial_weekly_number"_q,
 			0);
-		const auto until = _session->account().appConfig().get<int>(
+		const auto until = _session->appConfig().get<int>(
 			u"transcribe_audio_trial_cooldown_until"_q,
 			0);
 		_trialsSupport = (count > 0) || (until > 0);
@@ -49,7 +48,7 @@ bool Transcribes::trialsSupport() {
 
 TimeId Transcribes::trialsRefreshAt() {
 	if (_trialsRefreshAt < 0) {
-		_trialsRefreshAt = _session->account().appConfig().get<int>(
+		_trialsRefreshAt = _session->appConfig().get<int>(
 			u"transcribe_audio_trial_cooldown_until"_q,
 			0);
 	}
@@ -58,7 +57,7 @@ TimeId Transcribes::trialsRefreshAt() {
 
 int Transcribes::trialsCount() {
 	if (_trialsCount < 0) {
-		_trialsCount = _session->account().appConfig().get<int>(
+		_trialsCount = _session->appConfig().get<int>(
 			u"transcribe_audio_trial_weekly_number"_q,
 			-1);
 		return std::max(_trialsCount, 0);
@@ -67,7 +66,7 @@ int Transcribes::trialsCount() {
 }
 
 crl::time Transcribes::trialsMaxLengthMs() const {
-	return 1000 * _session->account().appConfig().get<int>(
+	return 1000 * _session->appConfig().get<int>(
 		u"transcribe_audio_trial_duration_max"_q,
 		300);
 }
diff --git a/Telegram/SourceFiles/api/api_who_reacted.cpp b/Telegram/SourceFiles/api/api_who_reacted.cpp
index 27134dea9..f610f833d 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.cpp
+++ b/Telegram/SourceFiles/api/api_who_reacted.cpp
@@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
-#include "main/main_account.h"
 #include "base/unixtime.h"
 #include "base/weak_ptr.h"
 #include "ui/controls/who_reacted_context_action.h"
@@ -697,7 +696,7 @@ bool WhoReadExists(not_null<HistoryItem*> item) {
 			|| user->readDatesPrivate()) {
 			return false;
 		}
-		const auto &appConfig = peer->session().account().appConfig();
+		const auto &appConfig = peer->session().appConfig();
 		const auto expirePeriod = appConfig.get<int>(
 			"pm_read_date_expire_period",
 			7 * 86400);
@@ -713,7 +712,7 @@ bool WhoReadExists(not_null<HistoryItem*> item) {
 			&& (megagroup->flags() & ChannelDataFlag::ParticipantsHidden))) {
 		return false;
 	}
-	const auto &appConfig = peer->session().account().appConfig();
+	const auto &appConfig = peer->session().appConfig();
 	const auto expirePeriod = appConfig.get<int>(
 		"chat_read_mark_expire_period",
 		7 * 86400);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
index 8cf55a1e3..216a0431d 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
@@ -15,7 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/vertical_list.h"
 #include "settings/settings_common.h" // IconDescriptor.
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
@@ -26,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace {
 
 [[nodiscard]] int EnableHideMembersMin(not_null<ChannelData*> channel) {
-	return channel->session().account().appConfig().get<int>(
+	return channel->session().appConfig().get<int>(
 		u"hidden_members_group_size_min"_q,
 		100);
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 01bbb02f2..674d5b074 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -44,7 +44,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
 #include "mtproto/sender.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "settings/settings_common.h"
 #include "ui/boxes/boost_box.h"
@@ -78,7 +77,7 @@ constexpr auto kBotManagerUsername = "BotFather"_cs;
 }
 
 [[nodiscard]] int EnableForumMinMembers(not_null<PeerData*> peer) {
-	return peer->session().account().appConfig().get<int>(
+	return peer->session().appConfig().get<int>(
 		u"forum_upgrade_participants_min"_q,
 		200);
 }
diff --git a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
index f57573d99..f9a4c5d8f 100644
--- a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
@@ -17,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_cloud_themes.h"
 #include "data/data_session.h"
 #include "lang/lang_keys.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "main/session/session_show.h"
@@ -464,8 +463,7 @@ Ui::BoostFeatures LookupBoostFeatures(not_null<ChannelData*> channel) {
 }
 
 int BoostsForGift(not_null<Main::Session*> session) {
-	const auto key = u"boosts_per_sent_gift"_q;
-	return session->account().appConfig().get<int>(key, 0);
+	return session->appConfig().get<int>(u"boosts_per_sent_gift"_q, 0);
 }
 
 struct Sources {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index a33462f4a..8d666249f 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -19,7 +19,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
@@ -113,7 +112,7 @@ std::optional<EmojiSection> SetIdEmojiSection(uint64 id) {
 
 rpl::producer<std::vector<GifSection>> GifSectionsValue(
 		not_null<Main::Session*> session) {
-	const auto config = &session->account().appConfig();
+	const auto config = &session->appConfig();
 	return config->value(
 	) | rpl::map([=] {
 		return config->get<std::vector<QString>>(
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 47cd8f4d0..efac543af 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -21,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/ui_utility.h"
 #include "ui/chat/more_chats_bar.h"
 #include "main/main_session.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "apiwrap.h"
 
@@ -33,7 +32,7 @@ constexpr auto kLoadExceptionsAfter = 100;
 constexpr auto kLoadExceptionsPerRequest = 100;
 
 [[nodiscard]] crl::time RequestUpdatesEach(not_null<Session*> owner) {
-	const auto appConfig = &owner->session().account().appConfig();
+	const auto appConfig = &owner->session().appConfig();
 	return appConfig->get<int>(u"chatlist_update_period"_q, 3600)
 		* crl::time(1000);
 }
@@ -320,7 +319,7 @@ not_null<Dialogs::MainList*> ChatFilters::chatsList(FilterId filterId) {
 	auto &pointer = _chatsLists[filterId];
 	if (!pointer) {
 		auto limit = rpl::single(rpl::empty_value()) | rpl::then(
-			_owner->session().account().appConfig().refreshed()
+			_owner->session().appConfig().refreshed()
 		) | rpl::map([=] {
 			return _owner->pinnedChatsLimit(filterId);
 		});
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index 5b7874630..617e07e7e 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "main/main_session.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/session/send_as_peers.h"
 #include "data/data_user.h"
@@ -100,7 +99,7 @@ constexpr auto kTopReactionsLimit = 14;
 
 [[nodiscard]] int SentReactionsLimit(not_null<HistoryItem*> item) {
 	const auto session = &item->history()->session();
-	const auto config = &session->account().appConfig();
+	const auto config = &session->appConfig();
 	return session->premium()
 		? config->get<int>("reactions_user_max_premium", 3)
 		: config->get<int>("reactions_user_max_default", 1);
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 9bf563f6c..76389df4e 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -31,7 +31,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
-#include "main/main_account.h"
 #include "main/main_domain.h"
 #include "main/main_app_config.h"
 #include "mtproto/mtproto_config.h"
@@ -501,7 +500,7 @@ auto PeerData::unavailableReasons() const
 
 QString PeerData::computeUnavailableReason() const {
 	const auto &list = unavailableReasons();
-	const auto &config = session().account().appConfig();
+	const auto &config = session().appConfig();
 	const auto skip = config.get<std::vector<QString>>(
 		"ignore_restriction_reasons",
 		std::vector<QString>());
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 0d5393ac8..1d321f80d 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -16,7 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_message_reactions.h"
 #include "main/main_session.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "ui/image/image_prepare.h"
 #include "base/unixtime.h"
@@ -568,12 +567,12 @@ int UniqueReactionsLimit(not_null<Main::AppConfig*> config) {
 }
 
 int UniqueReactionsLimit(not_null<PeerData*> peer) {
-	return UniqueReactionsLimit(&peer->session().account().appConfig());
+	return UniqueReactionsLimit(&peer->session().appConfig());
 }
 
 rpl::producer<int> UniqueReactionsLimitValue(
 		not_null<PeerData*> peer) {
-	const auto config = &peer->session().account().appConfig();
+	const auto config = &peer->session().appConfig();
 	return config->value(
 	) | rpl::map([=] {
 		return UniqueReactionsLimit(config);
diff --git a/Telegram/SourceFiles/data/data_premium_limits.cpp b/Telegram/SourceFiles/data/data_premium_limits.cpp
index ecca86149..f9d870212 100644
--- a/Telegram/SourceFiles/data/data_premium_limits.cpp
+++ b/Telegram/SourceFiles/data/data_premium_limits.cpp
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_premium_limits.h"
 
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 
@@ -210,7 +209,7 @@ int PremiumLimits::maxBoostLevel() const {
 int PremiumLimits::appConfigLimit(
 		const QString &key,
 		int fallback) const {
-	return _session->account().appConfig().get<int>(key, fallback);
+	return _session->appConfig().get<int>(key, fallback);
 }
 
 bool PremiumLimits::isPremium() const {
@@ -222,73 +221,73 @@ LevelLimits::LevelLimits(not_null<Main::Session*> session)
 }
 
 int LevelLimits::channelColorLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"channel_color_level_min"_q,
 		5);
 }
 
 int LevelLimits::channelBgIconLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"channel_bg_icon_level_min"_q,
 		4);
 }
 
 int LevelLimits::channelProfileBgIconLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"channel_profile_bg_icon_level_min"_q,
 		7);
 }
 
 int LevelLimits::channelEmojiStatusLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"channel_emoji_status_level_min"_q,
 		8);
 }
 
 int LevelLimits::channelWallpaperLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"channel_wallpaper_level_min"_q,
 		9);
 }
 
 int LevelLimits::channelCustomWallpaperLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"channel_custom_wallpaper_level_min"_q,
 		10);
 }
 
 int LevelLimits::groupTranscribeLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"group_transcribe_level_min"_q,
 		6);
 }
 
 int LevelLimits::groupEmojiStickersLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"group_emoji_stickers_level_min"_q,
 		4);
 }
 
 int LevelLimits::groupProfileBgIconLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"group_profile_bg_icon_level_min"_q,
 		5);
 }
 
 int LevelLimits::groupEmojiStatusLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"group_emoji_status_level_min"_q,
 		8);
 }
 
 int LevelLimits::groupWallpaperLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"group_wallpaper_level_min"_q,
 		9);
 }
 
 int LevelLimits::groupCustomWallpaperLevelMin() const {
-	return _session->account().appConfig().get<int>(
+	return _session->appConfig().get<int>(
 		u"group_custom_wallpaper_level_min"_q,
 		10);
 }
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 3881a601c..6bfd2b74e 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "apiwrap.h"
 #include "mainwidget.h"
@@ -242,7 +241,7 @@ Session::Session(not_null<Main::Session*> session)
 , _bigFileCache(Core::App().databases().get(
 	_session->local().cacheBigFilePath(),
 	_session->local().cacheBigFileSettings()))
-, _groupFreeTranscribeLevel(session->account().appConfig().value(
+, _groupFreeTranscribeLevel(session->appConfig().value(
 ) | rpl::map([limits = Data::LevelLimits(session)] {
 	return limits.groupTranscribeLevelMin();
 }))
@@ -2205,7 +2204,7 @@ rpl::producer<int> Session::maxPinnedChatsLimitValue(
 	// We always use premium limit in the MainList limit producer,
 	// because it slices the list to that limit. We don't want to slice
 	// premium-ly added chats from the pinned list because of sync issues.
-	return _session->account().appConfig().value(
+	return _session->appConfig().value(
 	) | rpl::map([folder, limits = Data::PremiumLimits(_session)] {
 		return folder
 			? limits.dialogsFolderPinnedPremium()
@@ -2219,7 +2218,7 @@ rpl::producer<int> Session::maxPinnedChatsLimitValue(
 	// We always use premium limit in the MainList limit producer,
 	// because it slices the list to that limit. We don't want to slice
 	// premium-ly added chats from the pinned list because of sync issues.
-	return _session->account().appConfig().value(
+	return _session->appConfig().value(
 	) | rpl::map([limits = Data::PremiumLimits(_session)] {
 		return limits.dialogFiltersChatsPremium();
 	});
@@ -2227,7 +2226,7 @@ rpl::producer<int> Session::maxPinnedChatsLimitValue(
 
 rpl::producer<int> Session::maxPinnedChatsLimitValue(
 		not_null<Data::Forum*> forum) const {
-	return _session->account().appConfig().value(
+	return _session->appConfig().value(
 	) | rpl::map([limits = Data::PremiumLimits(_session)] {
 		return limits.topicsPinnedCurrent();
 	});
@@ -2239,7 +2238,7 @@ rpl::producer<int> Session::maxPinnedChatsLimitValue(
 	// We always use premium limit in the MainList limit producer,
 	// because it slices the list to that limit. We don't want to slice
 	// premium-ly added chats from the pinned list because of sync issues.
-	return _session->account().appConfig().value(
+	return _session->appConfig().value(
 	) | rpl::map([limits = Data::PremiumLimits(_session)] {
 		return limits.savedSublistsPinnedPremium();
 	});
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index 0ce9ccf78..22b877fb9 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/stickers/data_custom_emoji.h"
 
 #include "chat_helpers/stickers_emoji_pack.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "data/data_channel.h"
@@ -441,7 +440,7 @@ Ui::CustomEmoji::Preview CustomEmojiLoader::preview() {
 CustomEmojiManager::CustomEmojiManager(not_null<Session*> owner)
 : _owner(owner)
 , _repaintTimer([=] { invokeRepaints(); }) {
-	const auto appConfig = &owner->session().account().appConfig();
+	const auto appConfig = &owner->session().appConfig();
 	appConfig->value(
 	) | rpl::take_while([=] {
 		return !_coloredSetId;
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index 5981e5258..f6da8553d 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -26,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "main/main_session.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "mtproto/mtproto_config.h"
 #include "ui/toast/toast.h"
@@ -1321,7 +1320,7 @@ std::vector<not_null<DocumentData*>> Stickers::getListByEmoji(
 
 	ranges::sort(result, std::greater<>(), &StickerWithDate::date);
 
-	const auto appConfig = &session().account().appConfig();
+	const auto appConfig = &session().appConfig();
 	auto mixed = std::vector<not_null<DocumentData*>>();
 	mixed.reserve(result.size());
 	auto premiumIndex = 0, nonPremiumIndex = 0;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
index 1939dde64..58c51ed31 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_app_config_values.h"
 #include "main/main_session.h"
@@ -118,7 +117,7 @@ void AddPhoneMenu(not_null<Ui::PopupMenu*> menu, not_null<UserData*> user) {
 		return;
 	}
 	using Strings = std::vector<QString>;
-	const auto prefixes = user->session().account().appConfig().get<Strings>(
+	const auto prefixes = user->session().appConfig().get<Strings>(
 		u"fragment_prefixes"_q,
 		std::vector<QString>());
 	{
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
index 59e78131c..6918d51b9 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "history/view/media/history_view_sticker_player.h"
 #include "info/userpic/info_userpic_emoji_builder_common.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "ui/painter.h"
@@ -171,7 +170,7 @@ EmojiUserpic::EmojiUserpic(
 
 void EmojiUserpic::setDocument(not_null<DocumentData*> document) {
 	if (!_playOnce.has_value()) {
-		const auto &c = document->owner().session().account().appConfig();
+		const auto &c = document->owner().session().appConfig();
 		_playOnce = !c.get<bool>(u"upload_markup_video"_q, false);
 	}
 	_painter.setDocument(document, [=] { update(); });
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index a973979b7..2507dc8f1 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -223,4 +223,10 @@ void AppConfig::dismissSuggestion(const QString &key) {
 	)).send();
 }
 
+bool AppConfig::newRequirePremiumFree() const {
+	return get<bool>(
+		u"new_noncontact_peers_require_premium_without_ownpremium"_q,
+		false);
+}
+
 } // namespace Main
diff --git a/Telegram/SourceFiles/main/main_app_config.h b/Telegram/SourceFiles/main/main_app_config.h
index 541b9f24c..67b985348 100644
--- a/Telegram/SourceFiles/main/main_app_config.h
+++ b/Telegram/SourceFiles/main/main_app_config.h
@@ -54,6 +54,8 @@ public:
 		const QString &key) const;
 	void dismissSuggestion(const QString &key);
 
+	[[nodiscard]] bool newRequirePremiumFree() const;
+
 	void refresh();
 
 private:
diff --git a/Telegram/SourceFiles/main/main_app_config_values.cpp b/Telegram/SourceFiles/main/main_app_config_values.cpp
index 92faf0b1e..bd2b1f070 100644
--- a/Telegram/SourceFiles/main/main_app_config_values.cpp
+++ b/Telegram/SourceFiles/main/main_app_config_values.cpp
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "main/main_app_config_values.h"
 
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 
@@ -15,7 +14,7 @@ namespace AppConfig {
 
 std::optional<QString> FragmentLink(not_null<Main::Session*> session) {
 	using Strings = std::vector<QString>;
-	const auto domains = session->account().appConfig().get<Strings>(
+	const auto domains = session->appConfig().get<Strings>(
 		u"whitelisted_domains"_q,
 		std::vector<QString>());
 	const auto proj = [&, domain = u"fragment"_q](const QString &p) {
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index 2ba11542e..8ec284294 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -138,10 +138,10 @@ Session::Session(
 		}, _lifetime);
 
 #ifndef OS_MAC_STORE
-		_account->appConfig().value(
+		appConfig().value(
 		) | rpl::start_with_next([=] {
-			_premiumPossible = !_account->appConfig().get<bool>(
-				"premium_purchase_blocked",
+			_premiumPossible = !appConfig().get<bool>(
+				u"premium_purchase_blocked"_q,
 				true);
 		}, _lifetime);
 #endif // OS_MAC_STORE
@@ -227,6 +227,10 @@ Storage::Domain &Session::domainLocal() const {
 	return _account->domainLocal();
 }
 
+AppConfig &Session::appConfig() const {
+	return _account->appConfig();
+}
+
 void Session::notifyDownloaderTaskFinished() {
 	downloader().notifyTaskFinished();
 }
diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h
index 635f453d5..d8c74e087 100644
--- a/Telegram/SourceFiles/main/main_session.h
+++ b/Telegram/SourceFiles/main/main_session.h
@@ -63,6 +63,7 @@ struct ColorIndicesCompressed;
 namespace Main {
 
 class Account;
+class AppConfig;
 class Domain;
 class SessionSettings;
 class SendAsPeers;
@@ -83,6 +84,8 @@ public:
 	[[nodiscard]] Domain &domain() const;
 	[[nodiscard]] Storage::Domain &domainLocal() const;
 
+	[[nodiscard]] AppConfig &appConfig() const;
+
 	[[nodiscard]] bool premium() const;
 	[[nodiscard]] bool premiumPossible() const;
 	[[nodiscard]] rpl::producer<bool> premiumPossibleValue() const;
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index d58315778..5b8d4fc25 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -82,7 +82,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "main/main_app_config.h"
-#include "main/main_account.h"
 #include "settings/settings_premium.h"
 #include "support/support_helper.h"
 #include "storage/storage_user_photos.h"
@@ -1885,7 +1884,7 @@ void MainWidget::showNonPremiumLimitToast(bool download) {
 	const auto link = download
 		? tr::lng_limit_download_subscribe_link(tr::now)
 		: tr::lng_limit_upload_subscribe_link(tr::now);
-	const auto better = session().account().appConfig().get<double>(download
+	const auto better = session().appConfig().get<double>(download
 		? u"upload_premium_speedup_download"_q
 		: u"upload_premium_speedup_upload"_q, 10.);
 	const auto percent = int(base::SafeRound(better * 100.));
diff --git a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
index 5baf781db..1ca71597e 100644
--- a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
+++ b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
@@ -15,7 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h" // IconDescriptor.
@@ -35,13 +34,13 @@ namespace AntiSpamMenu {
 namespace {
 
 [[nodiscard]] int EnableAntiSpamMinMembers(not_null<ChannelData*> channel) {
-	return channel->session().account().appConfig().get<int>(
+	return channel->session().appConfig().get<int>(
 		u"telegram_antispam_group_size_min"_q,
 		100);
 }
 
 [[nodiscard]] UserId AntiSpamUserId(not_null<ChannelData*> channel) {
-	const auto id = channel->session().account().appConfig().get<QString>(
+	const auto id = channel->session().appConfig().get<QString>(
 		u"telegram_antispam_user_id"_q,
 		QString());
 	return UserId(id.toULongLong());
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 2d71d2a60..0be98f8fa 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -25,7 +25,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "settings/business/settings_recipients_helper.h"
@@ -152,7 +151,7 @@ private:
 		not_null<Main::Session*> session,
 		const QString &key,
 		int defaultValue) {
-	return session->account().appConfig().get<int>(key, defaultValue);
+	return session->appConfig().get<int>(key, defaultValue);
 }
 
 [[nodiscard]] not_null<Ui::InputField*> AddPartInput(
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
index 021a6c207..15349246c 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
@@ -25,7 +25,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "settings/business/settings_recipients_helper.h"
@@ -726,7 +725,7 @@ void ChatLinks::setupContent(
 
 	Ui::AddSkip(content);
 
-	const auto limit = controller->session().account().appConfig().get<int>(
+	const auto limit = controller->session().appConfig().get<int>(
 		u"business_chat_links_limit"_q,
 		100);
 	const auto add = content->add(
diff --git a/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp b/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
index 76d7631e7..e80a0cff2 100644
--- a/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
@@ -395,25 +394,25 @@ rpl::producer<bool> ShortcutExistsValue(
 }
 
 int ShortcutsLimit(not_null<Main::Session*> session) {
-	const auto appConfig = &session->account().appConfig();
+	const auto appConfig = &session->appConfig();
 	return appConfig->get<int>("quick_replies_limit", 100);
 }
 
 rpl::producer<int> ShortcutsLimitValue(not_null<Main::Session*> session) {
-	const auto appConfig = &session->account().appConfig();
+	const auto appConfig = &session->appConfig();
 	return appConfig->value() | rpl::map([=] {
 		return ShortcutsLimit(session);
 	});
 }
 
 int ShortcutMessagesLimit(not_null<Main::Session*> session) {
-	const auto appConfig = &session->account().appConfig();
+	const auto appConfig = &session->appConfig();
 	return appConfig->get<int>("quick_reply_messages_limit", 20);
 }
 
 rpl::producer<int> ShortcutMessagesLimitValue(
 		not_null<Main::Session*> session) {
-	const auto appConfig = &session->account().appConfig();
+	const auto appConfig = &session->appConfig();
 	return appConfig->value() | rpl::map([=] {
 		return ShortcutMessagesLimit(session);
 	});
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index f0294643c..c23e82c34 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_wrap_widget.h" // Info::Wrap.
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
 #include "lang/lang_keys.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "settings/business/settings_away_message.h"
@@ -256,10 +255,10 @@ void AddBusinessSummary(
 	auto icons = std::vector<const style::icon *>();
 	icons.reserve(int(entryMap.size()));
 	{
-		const auto &account = controller->session().account();
-		const auto mtpOrder = /*account.appConfig().get<Order>(
+		const auto session = &controller->session();
+		const auto mtpOrder = session->appConfig().get<Order>(
 			"business_promo_order",
-			FallbackOrder())*/FallbackOrder(); AssertIsDebug();
+			FallbackOrder());
 		const auto processEntry = [&](Entry &entry) {
 			icons.push_back(entry.icon);
 			addRow(entry);
@@ -690,7 +689,7 @@ void ShowBusiness(not_null<Window::SessionController*> controller) {
 
 std::vector<PremiumFeature> BusinessFeaturesOrder(
 		not_null<::Main::Session*> session) {
-	const auto mtpOrder = session->account().appConfig().get<Order>(
+	const auto mtpOrder = session->appConfig().get<Order>(
 		"business_promo_order",
 		FallbackOrder());
 	return ranges::views::all(
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 33b175520..d7005fd9d 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -375,7 +375,7 @@ void SetupSections(
 	} else {
 		const auto enabled = [=] {
 			const auto result = account->appConfig().get<bool>(
-				"dialog_filters_enabled",
+				u"dialog_filters_enabled"_q,
 				false);
 			if (result) {
 				preload();
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 4e81d19c6..2addb7fe4 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -26,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h"
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
 #include "lang/lang_keys.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "settings/settings_common_session.h"
@@ -1331,12 +1330,12 @@ void ShowEmojiStatusPremium(
 void StartPremiumPayment(
 		not_null<Window::SessionController*> controller,
 		const QString &ref) {
-	const auto account = &controller->session().account();
-	const auto username = account->appConfig().get<QString>(
-		"premium_bot_username",
+	const auto session = &controller->session();
+	const auto username = session->appConfig().get<QString>(
+		u"premium_bot_username"_q,
 		QString());
-	const auto slug = account->appConfig().get<QString>(
-		"premium_invoice_slug",
+	const auto slug = session->appConfig().get<QString>(
+		u"premium_invoice_slug"_q,
 		QString());
 	if (!username.isEmpty()) {
 		controller->showPeerByLink(Window::PeerByLinkInfo{
@@ -1539,7 +1538,7 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 
 std::vector<PremiumFeature> PremiumFeaturesOrder(
 		not_null<Main::Session*> session) {
-	const auto mtpOrder = session->account().appConfig().get<Order>(
+	const auto mtpOrder = session->appConfig().get<Order>(
 		"premium_promo_order",
 		FallbackOrder());
 	return ranges::views::all(
@@ -1683,8 +1682,8 @@ void AddSummaryPremium(
 	auto icons = std::vector<const style::icon *>();
 	icons.reserve(int(entryMap.size()));
 	{
-		const auto &account = controller->session().account();
-		const auto mtpOrder = account.appConfig().get<Order>(
+		const auto session = &controller->session();
+		const auto mtpOrder = session->appConfig().get<Order>(
 			"premium_promo_order",
 			FallbackOrder());
 		const auto processEntry = [&](Entry &entry) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 4e03d8765..183c0c110 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -64,7 +64,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/calendar_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "mainwidget.h"
-#include "main/main_account.h"
 #include "main/main_app_config.h"
 #include "main/main_domain.h"
 #include "main/main_session.h"
@@ -1230,7 +1229,7 @@ bool SessionController::skipNonPremiumLimitToast(bool download) const {
 	const auto last = download
 		? session().settings().lastNonPremiumLimitDownload()
 		: session().settings().lastNonPremiumLimitUpload();
-	const auto delay = session().account().appConfig().get<int>(
+	const auto delay = session().appConfig().get<int>(
 		u"upload_premium_speedup_notify_period"_q,
 		3600);
 	return (last && now < last + delay && now > last - delay);

From 68ded1a6e0d718f753bfd49c5f1e47f9c4d0d90c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 15:50:57 +0400
Subject: [PATCH 136/596] Allow newRequirePremium for free if server allows.

---
 Telegram/SourceFiles/api/api_global_privacy.cpp      |  4 +++-
 Telegram/SourceFiles/boxes/edit_privacy_box.cpp      | 12 ++++++++----
 .../settings/settings_privacy_security.cpp           |  6 ++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_global_privacy.cpp b/Telegram/SourceFiles/api/api_global_privacy.cpp
index 6a891f63e..d1beddfb6 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_global_privacy.cpp
@@ -141,6 +141,8 @@ void GlobalPrivacy::update(
 	using Flag = MTPDglobalPrivacySettings::Flag;
 
 	_api.request(_requestId).cancel();
+	const auto newRequirePremiumAllowed = _session->premium()
+		|| _session->appConfig().newRequirePremiumFree();
 	const auto flags = Flag()
 		| (archiveAndMute
 			? Flag::f_archive_and_mute_new_noncontact_peers
@@ -152,7 +154,7 @@ void GlobalPrivacy::update(
 			? Flag::f_keep_archived_folders
 			: Flag())
 		| (hideReadTime ? Flag::f_hide_read_marks : Flag())
-		| ((newRequirePremium && _session->premium())
+		| ((newRequirePremium && newRequirePremiumAllowed)
 			? Flag::f_new_noncontact_peers_require_premium
 			: Flag());
 	_requestId = _api.request(MTPaccount_SetGlobalPrivacySettings(
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index cd472746e..9dfcf5ade 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_instance.h"
 #include "lang/lang_keys.h"
 #include "apiwrap.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "data/data_user.h"
 #include "data/data_chat.h"
@@ -488,7 +489,10 @@ void EditMessagesPrivacyBox(
 	constexpr auto kOptionAll = 0;
 	constexpr auto kOptionPremium = 1;
 
-	const auto premium = controller->session().premium();
+	const auto allowed = [=] {
+		return controller->session().premium()
+			|| controller->session().appConfig().newRequirePremiumFree();
+	};
 	const auto privacy = &controller->session().api().globalPrivacy();
 	const auto inner = box->verticalLayout();
 	inner->add(object_ptr<Ui::PlainShadow>(box));
@@ -550,7 +554,7 @@ void EditMessagesPrivacyBox(
 			}),
 		});
 	};
-	if (!premium) {
+	if (!allowed()) {
 		CreateRadiobuttonLock(restricted, st::messagePrivacyCheck);
 
 		group->setChangedCallback([=](int value) {
@@ -562,7 +566,7 @@ void EditMessagesPrivacyBox(
 	}
 
 	Ui::AddDividerText(inner, tr::lng_messages_privacy_about());
-	if (!premium) {
+	if (!allowed()) {
 		Ui::AddSkip(inner);
 		Settings::AddButtonWithIcon(
 			inner,
@@ -581,7 +585,7 @@ void EditMessagesPrivacyBox(
 		});
 	} else {
 		box->addButton(tr::lng_settings_save(), [=] {
-			if (controller->session().premium()) {
+			if (allowed()) {
 				privacy->updateNewRequirePremium(
 					group->current() == kOptionPremium);
 				box->closeBox();
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 1b70efbb4..eb5d0e78a 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -47,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_peer_values.h"
+#include "main/main_app_config.h"
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "storage/storage_domain.h"
@@ -307,8 +308,9 @@ void AddMessagesPrivacyButton(
 	button->addClickHandler([=] {
 		controller->show(Box(EditMessagesPrivacyBox, controller));
 	});
-
-	AddPremiumStar(button, session, rpl::duplicate(label), st.padding);
+	if (!session->appConfig().newRequirePremiumFree()) {
+		AddPremiumStar(button, session, rpl::duplicate(label), st.padding);
+	}
 }
 
 rpl::producer<int> BlockedPeersCount(not_null<::Main::Session*> session) {

From 7c7b962c6d040ada88f8e84da656124aab84a0b2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 18:09:22 +0400
Subject: [PATCH 137/596] Improve couple of Telegram Business icons.

---
 .../settings/premium/business/business_intro.png | Bin 0 -> 681 bytes
 .../premium/business/business_intro@2x.png       | Bin 0 -> 1294 bytes
 .../premium/business/business_intro@3x.png       | Bin 0 -> 1952 bytes
 .../settings/premium/business/business_links.png | Bin 0 -> 733 bytes
 .../premium/business/business_links@2x.png       | Bin 0 -> 1350 bytes
 .../premium/business/business_links@3x.png       | Bin 0 -> 2012 bytes
 .../Resources/icons/settings/premium/intro.png   | Bin 523 -> 0 bytes
 .../icons/settings/premium/intro@2x.png          | Bin 973 -> 0 bytes
 .../icons/settings/premium/intro@3x.png          | Bin 1520 -> 0 bytes
 .../Resources/icons/settings/premium/links.png   | Bin 610 -> 0 bytes
 .../icons/settings/premium/links@2x.png          | Bin 1253 -> 0 bytes
 .../icons/settings/premium/links@3x.png          | Bin 2121 -> 0 bytes
 Telegram/Resources/langs/lang.strings            |   2 ++
 Telegram/SourceFiles/settings/settings.style     |   4 ++--
 14 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 Telegram/Resources/icons/settings/premium/business/business_intro.png
 create mode 100644 Telegram/Resources/icons/settings/premium/business/business_intro@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/business/business_intro@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/business/business_links.png
 create mode 100644 Telegram/Resources/icons/settings/premium/business/business_links@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/business/business_links@3x.png
 delete mode 100644 Telegram/Resources/icons/settings/premium/intro.png
 delete mode 100644 Telegram/Resources/icons/settings/premium/intro@2x.png
 delete mode 100644 Telegram/Resources/icons/settings/premium/intro@3x.png
 delete mode 100644 Telegram/Resources/icons/settings/premium/links.png
 delete mode 100644 Telegram/Resources/icons/settings/premium/links@2x.png
 delete mode 100644 Telegram/Resources/icons/settings/premium/links@3x.png

diff --git a/Telegram/Resources/icons/settings/premium/business/business_intro.png b/Telegram/Resources/icons/settings/premium/business/business_intro.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d357a4191ed2f05e17f426054e03d5040b83a8f
GIT binary patch
literal 681
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfl1iY#WBP}
z@NJ0i>Xm^a-wKuHr#6TPEuGRirIY6m(;|tP8o@^ci~`*b9r?rahauHrQb3xTi-*@f
zuG9rJs_$yw)%yRodS5yB-H)>G3E$Ujo%eOm`?&14XOsSJ?*9AtWQf*OzvaT+M|a=N
zvyq#B{`vc#UsgCMbhs$}t^0rca+BA}kRl72l5g6#v$pyzzpTz`Ra0Lt&egj9lKmgE
z*>5Xsf>z#sE2bdB$Ir$*D`Icl^N$t!TbBgAtlGP*2x#t^yzQ^QR@ut&`*NhIO|I0O
z;-lty=xdd)ijdmml|d^v+<X(azFpwdl?)S&b8pKozy5kAYV*w=C0Rc9l2uV_ois$a
zB6Y;(pKlK^k#d#S<ogz(b4+1LfCdLM!+zz79-D6Jv>$F1_!hRhHSgEoIwx(hZXTz!
z%`*)G9+X(g^01{E&5T;R>_&{9xWfGN!cn{LsyXGey!~F?bT@DN>8DQYg$Ir%IsSbA
z-MZmohKh-g=E3;~YV6eGUzb=F?fet`V|ydBke`j*f3F`;9UCSv6sQ;2XIwd%;#7FS
zwE3VzcioH`8y^<@ShF>1ZGiQmZMWa5%sTzFV?HAb6Qk2o1~<m7;aXF7q@I2{smN@$
zuigCf6Z~UVhIFZYxvC?=r8Kc)i2*~8P?dXXp4se+8DG{E?Tk6~bkpURDJN1k{@Ws-
zxHha?vf4&&YZR|OTi$xN#ft9*PqFhaK2`rbKJ<b5nYEAhO9}k903{PoS3j3^P6<r_
D#QPQ;

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/business/business_intro@2x.png b/Telegram/Resources/icons/settings/premium/business/business_intro@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e120fa5d7c56a384e26fafa6d91d7718b5e4619
GIT binary patch
literal 1294
zcmV+p1@ZccP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGcu7P-R9Fe^SW75wQ53%3j}RfG
zNRmfhg$OB8GGIUvBc+5yBqbAyB4vU+CzOPdfha~E6K^5%h&(Ul6;i^zAG=Pcv-aNq
ze;D2Fe+GYRe|xQOt+V%9Ywz>_`ek}dD_~lI|7-=!e)7Jao}RI>vG~Q~=H~YB@bLTV
z+1S|F-{1cUvp(B^fPki^rq$KekB^T(g6H7ipuN34K0aO_wO(z6GB`N+_Vy+Sg9A@b
zPbVfO>UCsT-^|RcuC7j3DC+121_tcy?G3vzQUm!hIXS6z@C|u;dpkHd*hr5uHD_n%
zt*tFd1c!%*EiEmNkB<@^Hg$V@8xj&Cb7pYP*4B1*c9wdYo1441xL|lzRu*^)3k#_l
zMNUpmyuG~*`V}hl_xDrM)6-LPb8}x`-@Cgz%vM%b!rsct>gec*DpO>6dD+6kLg-R5
z5f>N7E$o+<7Y`2)80O^Uz#m!;;={10sEE4fBBiCJ62JT@_`s`h=>U$7jxsa0gc%tb
z7+PCfV@E_LYW(Kr#?{r8?^uK;Cnu{Z6d7Evudf(pW@f?`#k{k#Gcz;8cuGo26io=o
z_u}H>o}L~x$mHtkYLRO`-qqDbS#U7e*w_RG1wlAFJ9Bb!f^kGd1U4}=G!!ysfiuJR
z_xI@NXn@#XO0~GS$al;|k#yJB*OcY>_!u1$CShS=SgP*sZf0IyUf$c=%jB}MGG>T{
zVF)&qQUUSv^J5Bze^EhP3V>)i%swV2=KlUZDJh8!kyYqekkKj75l{_*fq`tQt*wpA
zmYto=6b%0+BqVSt7+6tJ!6*>T+S(c-z|hXlPAO(6OifKGZg329*%Tf{Qz+!-=2D8?
z-Q9wM0^~2=9tF>g)6&was;V?Zh|I;sg@MR3Bok!=(%RapF%%B-^YbZ1Lqh`$kV7>!
zH8?0xhC+MQM0$EUrDBMVfVee}%uvz-34|_%`ck>(i-=wn5O>QyJ1l)JFE1(R<>fU$
zKhG+8X=w>T<Dy8_G>Ecy8XQA32nzBMwCSs>EAE?Nvr<!2`DQ${xw)Ck1JK{!pIY!&
z2x*H85Y-0a;NUPZF`*<iS4R!9V@{1Q8Ks9lPH}!f&>I^YquLC?nKe8-Y~%sy?(WXz
z85tSj;xbTjxUyZSudkQcf6Z~55biCaKxKrIidE90v$IpQDWJyvP|;KiIBH~$C3Ag!
zeQF}EjK#+$a!JO=$EnHs`nsj1C0E}thywv%eUwy#EG#Ve`1ok(YHMpXY8alMpW~p^
zXzCkc0Vpp;&<+|K8?i@t2V6z)-9vS77>9?4>vONs#z7%!NYtMk+1uOuX*38fGBQ%`
z#>iPLv!kP<=54<-#4W-|mm)QMFr}oVe8)Gn$;->5ZqUSshK6uZ<4cszDhNK6P@zWN
z2-L1W@1vpzjWH@JN|}9ren$K5=;&BkSz#dR1%Joj(8aBp{T+jZ!*v^lxw*Ni80r#a
z0pSx9IfRz_^z?+=H2MerY|zDSQZ}uCX$4Fx@DHxQU#7bBfyI^cN&o-=07*qoM6N<$
Eg50A=wEzGB

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/business/business_intro@3x.png b/Telegram/Resources/icons/settings/premium/business/business_intro@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..878abd23678ce90a64af344f60102b1dc3cb4c31
GIT binary patch
literal 1952
zcmV;R2VeM!P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?3Q0skRA>e5T3JX|PZUp0(>6;*
z+o*@s#4vLyDy@X}M6m@DEis?81fdkAXjOzLt-wfZp(yexk<dy-v`_@Ca4pvi>7|nP
z)y)1sm_LW{-tW%6_xrBe!~LGloHKK_nK|dox!<Ho=Fjwi=>gLNrUy(9m>w`aV0yqt
z57^nbUa;KV-F?%hO@V=dix)3mxNzZ&88fC&pFT1&^7ZT2PoF;Z_xJbq_BJ&&)z;R2
z|NdRT=bs?i+1agFvEumg;|&cBfByXWtKs+K$B%~(AEu?H`TF|)6E;YcfJr-d?rdpk
z(O`?>6j-==^=b*{2^+$sUAuPKXcBL0MMcG$HESl!9wvCff(3PTb-Y?e!MASRnl^3P
z#F)2r>(+Pg-Wg?yoX_*;&;9-V$JI6m2Zx-T9E3QzHpXJUefzd=-@fs)?b@|#x(vV#
zwB^JeIB;M*Y|GBh)@9Y>$B!Ky9idr%e!i}SG#Qx#A$M$TOG!x~c@_c0wDafBBj*w|
zE-sGggkbRY?OVd@0)GDdxo+LMv9b-7ggEV@o^Wz<g7__4w$KgC%gZB$GBY!E*~3r%
z@ZrOvMT>})VE{Dl?(XI#$>HYaW|DXA+&MPk{rmS*r%q*fR8@n6gYtzMF?a9YCH{s1
zSy@@C;<2Bhp`lD99P#AI6SgEdIhpi0a^#3AAHf8i8e(MtFn|7h6t4n#L_z?ZJb5w`
z>Eq+`<;xe4kdaWJFeIvB>><t93%q#of`uXjtOASc*RN~W0DD4G6A}{GLfkq+9y@kS
zJ2&~vg9i^1E1Q7XvuC3QmkZ!A*w2oR4u(MlTe4&ciM)OLHt_fF-zSW#t1BV_znsCP
zrKNb|czSw@GfI1VJF&6}fQRHt@R)&tfmyR=LB`&_dxwXIK|=20&t6|&AA%%r?a7lT
zc@BU(J3C!mT$rLWXU>#RCBs##R@r0{Tm0a`0|{Tr5C@gS?BBni1$tyWLato7a%gDi
z(xpp;fg|wT<oTfTB<jYE8+no(MnOlDtpuE%o%w7lmjO&$TN|oJ5|Emj3MBMK?N3N#
zFdSF5u?)$dH@u^1CIIMdQ4k^V^ycSV0|y5O6FUJ=P*A{gXSw0ty?cbj$*iiXI(+yr
zVcgu@K7anqcy8Oajqm{K>+1!wK*Ijp8XHkui)9d%4~9^Vd412GJ*4s6xpQ%~Xb2!T
zHy6v1_vu0ciEIwNiLDY~>x)KLXvPKO^}cxV;+r>buroZ8htcpsqRYt0;E}2qjF~Fg
zWS)a2`0UxUN<L%w>gsCj)vH&pF#P@d_xA1Ei7)oy>eZ_^Z{8$~9Psn=W9220PM<z4
zmdL35S)jE#09+n{7?c!@7XtL1J9jV>5dtxg1lZf#>&>S%H8lc>L`q6ZA}Q7Yr%s(B
zUUJ~kqenc`#Kc4#E%Xbl?xkV(RD&>6BQ`dc7p)sseSo1w#WO{Hh}!q%%a?QJ%;E7G
z;edbux%(_)_%pAO`KW0zF)<eT5)!3`<WwLK<7Pg6`jo2SQ5=PXh=>T{EC!Y?T`J_H
zMnq><EPzpwe<hp{75E@7p(+idqocKmLzJ>LkHPC7KYr9A3@>FXERk3k6&0mL*0X2N
zBnu@&d&yWn#7RRNLynhY4jnpl<Hijujvvno;`pHwtg4c_VPIWeUallSg2(F%PY){6
zB~&d#Y9fdymz9-?CupL2czFE!^-IeMVRO(z#1l>vYuO~#APf<B;K<fV5t?=k?UyT8
zu1J?EkHf;k@E)5tZ=UiLMT(XrQCL{0xLz*-JrC7Kv}8-sinAh3<MK%ONQON<JyWJk
z(W}2`{)Gz{Br;ToXpe@3gov1qrg?dJp{*ch8yOindXdc|+_cxPUyG&6sd#a1*swvP
za3l;l2OeWg%#drdcI{eZMqZK@7=dT^?%i^35)8g&vVMsYPgJ4a-rkZ`h7GOjQKON1
z;=~D5`bv5r(xALlG6{G*JvVROthC$!JZcNE1_I^K*sxgOq2-1ME?9`}P<(v60on^#
z!0Q^H6&4l6))f~Q@7S>e%|o<=moHzA4uUGf^z?LrO2&}TX|SmA7$FfP`M$p~Hdy3h
z<0l1O_M^>;9+^co3`XLDp}nk2Ijbj^l$4+oZm<DL>=3oBR#f{!G!+g0R-|MP!=q;J
z>gv+2pA|DvJ)`#~R>OE|QBjdtSEK>-Ki02bf9A}Y*49?>WTGM|!=9r@j|K$=8L0IC
zALCRxqCwEu*r+rOACN9zzKj+kiVT{A#y!3>EL*k=<pTcwhL5!PAtRwbhqgZYknG=Y
zm6ervq0_4I29S2p7)4u`JPqZLaFK<=!^6j0o3W6Gk1u#c^50g*LW;@L^nmFB(*vdl
mOb?hIFg;*;!1Tb_dEh?=<H_D6io?AC0000<MNUMnLSTZIAD>JB

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/business/business_links.png b/Telegram/Resources/icons/settings/premium/business/business_links.png
new file mode 100644
index 0000000000000000000000000000000000000000..470bc4f8053af03729692917cf934fa228e448fc
GIT binary patch
literal 733
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfyv#|#WBP}
z@a+`ej?6@f;}>0KOn8#4*7L??bHJ%1CrqTbZI)OXIg`~}+H>=iH7SctR(pocTBMU>
zvha;dCKvbQqf1nlO<7-a=lA;WWmb!mU*+Y0*ZH#N{O9_*_my^hVz1}d-mni}7PL}N
zPtVWa|M=s=_1B~IrrW>fUtD8nFTt~K|Nj4rY!`@hyY9YQx5BQ>Z1&l|b@SaUOyc9>
zSeOoO{9<3%ebi|F`IjpvpHvayx_j?l)!utf3mu&D^Ydf$zH4}^2=TT%TP?ksr76PI
z=~7f*Ute5&IBhd?BZHudQ0L+W875xK4}7bzQJdVk==tZ$4RP`Dg12(atmgL3G?n1d
z2-tpmZHQL)(WJd`hi~SXmG742*?zmWyxcuyqDKp3i;%{t<Hy@Wv`Tlz91-SgpBS+E
zYQdMEHDRl#{<vtwHsNB%5{DgOtFI=NKTw=<{P^*|b^pJ9T^geGx6VHB+Urub3pZ~{
za^`Q3_EDMY^>BvYaz#~<DQTN;9!dK6{JDDIrTZPuiWdVl3RpO-a*W@cK7G2v=HH(`
zJ#vTjC!gFf`T6tbDyuJM1iZZ8vwXRF(bU5ackJ7zcDFU%Y<6PJ)1sL!C-s*tyZ(Cr
z(_r?HD=$kHWN*K1BX|B~$+M!JK5EGZ5-m=O@0K@DI;k@CM1qZtjeu#G;N^z}78<W!
zz2eHSS{k+Xky=~LDbenuFE}+`J?M5cnSJ&V>q-$eXT9nE%Y&Judfje#T9s^#n(C!`
z<@AJ;NpmmkmFi^^KDuwg`WbxpT-SyL|98)jw<-Bs|NFhw2WgKkmY3lN%`!kq%hT1*
JWt~$(695yVIa&Y!

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/business/business_links@2x.png b/Telegram/Resources/icons/settings/premium/business/business_links@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..42a770604eec25eb7369bce9a2400e4d73153494
GIT binary patch
literal 1350
zcmV-M1-bf(P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGut`KgR9Fe^SV<_iT@-)KLy<BM
zg`^B+&Xg1)QZ_6M3nd$pDMPZcVWUtKVS^O0HH0MeEzA-!mDz`ckYxD2-}~OWo$fQe
z&ujJd{h!6ZbI&=ybIv{Y+<Wf*|M+3}3>h$F;D43@qwmbu#l<BmDhj{&92^`TA0Pkz
z^=)o$9vmEe$Fe@Gudi=oW8>P|+Sk|DKMLRB;bD7wdu(j1KGS-&5lVl5|HsFNLKrga
z>FMdXxH!FzwDpaQjOy#_b%jEs>+9>Ywzk%G^P3u|kBNy1>fjIP?d@%Ue}7Gn+C^<=
zXScYx7#J9+ZtLacWp;LUWn~4W?d0SX78aJ6m}qWpPEq&w_gKE2ogK>5M_XE2&d<-Q
z=L4nP+S+PwZ!efeUfbH*gjGI0J#}|?7c_MYdwYA;qj`IK%gV}9v6!5k{P6HVjUbCA
zCMGHnMNxEgw93YY4@8rmp3d<J2?;$tJ;><b;9y~4p{c1U6JhP%-`{CW#l^)O^}B?z
zu`#AXtw?F?9cB)`ySlmrg{7q>A0Hp4(A3mKrFVCC(k0f24AZ41Wa+uNImB&dW;QxH
zDyy)*z78oo+1lDZJv~vKs;VlD2n2CwXD7ug(P$BumzPRX@GB}RnB}3NA*zP_2_Dsk
zD7u@Q8;a*N>ZYiuC?X<ad3l*LIWasu+|ttW{QS&0<KyGZQ)Oi(XEMUu+gmLND)aL4
z62NRos~BY~=#-b2Gb0TR4P3Ohx5t>dxw)Llh|J7P>XgyOQWiKK9v-s%l9H0Ku`!5H
z#W^`SR0m6gQ-^VAm*8#R#>R%~gI4k)sQnyfXJ-qu!EkD7im75jg(~K`fdUQ!B$C4m
z3JMrXT9nPr%}k{ID@`vPq@<)UWNmFN_Xk2HnwgmybY-Bh*Urw)C<?TWfN+!v;Mdnz
z3kwUFc64+E&85}V)qH+JZcz2;gG`FG<`7Plm6dU<2I1%D$6<^(Iyzz)<cW)}udjI%
z5TZfQ=w%FoElKCV;j%?79~q82VcYY~l9!jqEq;D}B6OI@$jG2|1BI)rE7m%Kf`V>u
zZ#je#{2Z4LLg1n;P%x&5D4`=H4{>a5ZBb25;|hh2fiA&0lvrI|6+CJTu>=$kIzB!g
z7!;{WkK5hdt*fg;#}Kg6VNFeqMg&r^;CNtQfawGT1jyC|uVSo)Gy=-OO%0nv>QRG}
zmX=1Xpkg8;BN-+*I2dmoD#gVE9h6B^Q&Xu(N|%<FYWP+X!wofuv&7BKjVYsMV`5@p
zIzK<3UT{^an3>wx*kJXp<W!AsWo0E~;^gEcG&EERg9A*didi%l7Z;wMo=WiF;-i7n
zB!R{?8P_qa8pY#9(cRrG+@J*@?y|@qMd_xor-TEE`oO#SuV3H!`8nmw();`S-;D<0
zhlGU4TGz`&nx)-dcX|MroSf9_ThL!vSV&4r`V-$$3~oGvbqw(i!J`6=8ZS|)lyk5j
zu|sh&mzq`Q{Ja||eK;7y!^620Z_|;Hk&ccIe(Gbt;O`h$S663eXZCjt+ARtT8x#G6
z19cH<0pW>>8p4r^JM!`IG0qQcB3;%E%7zRWGGNHSe=r080`1YCkdpLZZvX%Q07*qo
IM6N<$f>&&6_y7O^

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/business/business_links@3x.png b/Telegram/Resources/icons/settings/premium/business/business_links@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..67b1f55ad8ccbd9d23e2f235b96e2f0575738022
GIT binary patch
literal 2012
zcmV<22P622P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?MoC0LRA>e5npbESO%T9MVlSxJ
z5JexXD6vEoyI{kDSV2LPkU+$OC}I~CQS3hWU_mSo>Vrxm1i=EL4@yKqvG-oU-h2Cg
za4_t*ySKT!|5+X`PqTB=|GP7@vnf+1`AZ^@L?DSk5`iQFNd%GzBoRn40%<AoJJ@U0
zs@1PwzqW1LHfhqNQKLrHs#U96wd&8GKi|K9|K`n`J9qBfym|BV>C?xK9sBt4qeIR=
z@hL4Wtz*ZI3l}adDJl8!<HxT6f1f^mI(YEl)TvXOH*fw=_@EhqOCv^%ICt(`0AGAb
z@UTmlE}G=Ow#228BS)s_lIrWBLx;L{?fTdJ@f0^~*zoxA<EmM4!8>;Bs8XfM-*Ioi
zfC0~*J&Vf|Q_khfms_=J^+$cn$jDf_bSWv$v?gB6hYugJv$G@kmJxvmmMvShkjFS(
z5!kWy)TvWv&z?PV=FE#1FVfS~t5>h?C#PJwa>IuYXJ1el{AgmsFIloA!q39byJydy
zUcGviFJE3WrA3Pt^XAQa`0$~hSSknkN#lxnIdS4dKlKj$g$ozjv}xlurE=xU^XJc}
ztXbuJ{`|RT&z^1x(ZAA31T4F%aYaQ%^c(@TQr{mvdZe-o{OZ-K#*G^XloNuCEp+|*
zbx{)#*tv5jnMPB?xoX<9X@?FSs21iy1^M8?1FQVP!a_|{49hul=2(?Ekh^y6(!9dx
z4I4I)GlYwywR-jH+O=z|CT3-2kz<5L1=uwzWvXz41`TLlRRyKOSX`k(1yynX{{3IR
zd}(E5n++T|P$ix+Wr~&Z%9SgmN|iDtc-yvZRy7Xfi4!MOl|zRP{rdH*gZ}&X??Z+R
z5f-fX+xe3xPZqM2fSNUH`Xwuep}5hmT{};4sa|<<-oAayUKLvl3JR?9FJ8PTG${c@
z$f}@JB)fO()~$Q@?hT$xDg9zA2ali8s-<)1&O#O);5K2EZX&N;yG9j$`t+&!DIn(E
zyLS~URuo&g*I5~9=!7OBfSQ2&kj(BKYa-1B*=i6-S`f_QTFHsJd-twMrv4iA_$C3E
z7&<I6uT`{$)auouMT;~7Z;4kECQOhRck9;8B;&#=1k08!GYP<OfZe$<T}1c+ty{PD
z`y}|{;^N%gTn>_8C=UV)fI*WcP1>|+lVIqELCVqt)DehQFoY7Xnl)=C%P7Et1q-Y(
z6C}4L1~sZ^a-ezWwcpC4hf?GSP``eCk+yyNcEM|aR`-M@C_r1FNz|6=kwB<5vs=CD
z)Tz_!*RM5cTJ>{G97c~G9n=Ra-TL+GHQnm+z<~oQSD!w8%qkq*D=2&S?kxiA)vE_a
zRj0!F`T0T_1z5azu_{i3xdn>QI(6zifBsw}2<{b(Y<rOgz$HzSrY^^f8KV-1h8-6$
z4pNO8HALddl`B=nz@fZ?T|@zJZq;5{lgx6^pg}5qXn5GLVWv<ILpfH(-MV#4qg=ao
ztx5oFJy&pXk~K<h2AVW&86;h6GXJ;a=BG)N<;jyLg_HmbUI6XR>*v*_OP9Ezi70@X
zGiQnrEAZ{xH+LOVrP<-KWy_km%TvbKU3kdRrUlcdPZt6|ui&C(6EXlQxFctHS{MYW
zED_<|yLX#LgW**{B;vnWyJ-CK^743*7&~^XUv!YeJcG9jPZSlrRIgxJzI?f;jt=DH
z<X9ck`kGWm!gL#i@95E^Rz)U~UM#vl!bu+g^5u&u9Sp-@Asat_yp_g^q;2Ph^7!#%
z>sL4O>eZ{FG*!T_Osm%?b|Y!PZIkzP)v8sVLA;^ezkfdni%K(X+O$;t5q_Fl>*WO`
zM@YyReKNgJjWA)YUaeWP#-wpzZrr%x*BOf$;ed7P)>-v&Wl{z4j6hPcQqum<ojX@0
z2Hv-CpOx4TIe743O+u<mu8)3G=yBu5snRP|sx)iXEOit^nxU&SAN9!Wehygi`}glx
z6~zYk=+T49XsTpGTA%9J!1Vr%bgYx$AoWVsMe$(F8k;kkpxLu$tI7l>Ux&I!uqT7m
zE0ND{&R9}2Ce9@j>D#w&i#`ot%1do<>tjp%ReVjFEC~T6-YquOuQYZ1IHJ-7m<_I2
zv4Tm7si|elmUIm4D3i;LnK5IADb0-u{c=arqgc6xdS5BNq~?3~?or<uxn^c&s>9GA
z5}=_mplYdOl7Nh%$=sJeci_W*<sM}H<wF}?Dgy_M@p4%EqS5oJ=6J#_)zokVqehL2
zW@RWY<~cFH6}i2n>~dueWnx%j?gxGQ_H~;P|JTi%H@gj`4DbZb^Eut%`Sa)9#PXF}
z9RBe7+`fJL7>y2^6&VmPwe?d>p4_-`Bb`1;OlZh~Txxhzr(K{?rupEHisb$G8&iAl
zzuyiYKFl3dxc)Ryw{G1dM~*ys@<bxdzveL-;CZ2Y_wIk%n%|+1#}|r{_Okpt6eTi~
u2qY0mB9KHNi9iy8BmzkUk_h~!2>b`or|jf`^x|^>0000<MNUMnLSTZc`pFOg

literal 0
HcmV?d00001

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

literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq00009a7bBm000XU
z000XU0RWnu7ytkPy-7qtR5*>TmA$IMFcimAbCE77on3Tv5fqpD09n+{M-Znzg6|+W
z*heS`MMV5~0d=b4Bsdh8*g;T1v6V>e9fVq%^xn(W|CaOd%gM=UBcxKP%jE*z6GG@s
z!lz*fp~U-?r@rDGq9|6Y)nc)j&*uREtJP|;SPX~5+wB%x6>C&gl@Q`HB7~@_%7?HZ
zUDtz5N-4$|V@xRxjJmG>4$?F&T!QPmPrK{7VY{YjKY<iQVUH6hMNwiwhG9ga+wFFv
z(dhU4EXXhnJ_tf++jb<n)9GX~832IeI1!g^+YmwyNS0;K^Vpr&>$N0Fhr=Oa_dHLQ
z<pA^=NXKzbrxSa%yWI{#m`FrN_jo*Buh(Gta#Ko|%Owj+r_&I^VDmtxY2NSm*E-zn
zN~IF1-?FS)tp)&SHk;@3IqWKz%lu|P)$8@b(ewE{m&;*{3x&ddzYpxA(I}k7pX~8?
z%(gtN>2xXx!tWpez-F`IA|8)NtJPxT5kma0Uy>vM03l>Hn`N_E-}krMt!bLwZr8Fb
zZc4PGWHLDz41C|8OeXA2#fft?Q55U-dZ|?UBO(^`KYjA&FMR4b`UX!G(Q!K!i-Z6G
N002ovPDHLkV1num?{feE

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

literal 973
zcmV;;12X)HP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00009a7bBm000XU
z000XU0RWnu7ytkRe@R3^R9J=WnL$f3K^Vtp%?>LzVQd|?Ac!E^Q1VbgP<RXa2414P
zbP^BVJbLVsr%vrB$o3Q-Di29P5Q~$QK}2kk2n%JJ)VksN9(*x*cXyn%q+alU-1*P*
z{MKijXJ?mUS+-m*gWn;i)A`c~dO-+(8sSqALfcO>{HrcdD|LZd$^MneG);Rvp7HT<
zm&*kJC=?2}x3`&0=KcM>{h)39?cHv7I2;y5QI_SJPO>bEq8JW`-EMa~FqVM4UT-`e
zuU4yi4!x??YCInIdcB<jibkU(9C}5g(QgK#X*!WenB^-Li=j{`6bcoKMKez#k)Ub%
zdw^Un7edG^ld7sdpRexp`FyIXnmG|d^|k+1pj0Y_DTge}&1S=8-cTx)`YKQ?7Q-Z{
z)oPli1p<M(IS>eFnuhnsVzKstW@l&d(Hr7<p67W&^UTaln?U$twJl8Ha6lZ#kwnks
zatNV|i;JtPD{>}|<17P3B9WGH1wo)Fs_yUY?Ok7ACj^Q_B4$9Q&2@Tu+HA;BA0Hok
zdwaE7jl_%#Zukq??RH6$NbWV4%Vo3K&CN{!z{JD^VONnP$!<63>kvZYZtrk77=|Ia
zSC(a2maXqbnx>IV0RS)z<8U}irILQgxMUPXH5LbnUS3}6vk3h*o6XE@3{<I9-rnBG
zfvl=rE>|iQ3qXpZWHOn~0U?AGMX>+`01!p7V>}?8PMZyx0wt5l&cFZw!2bTe=@_PU
z+~405Zgi)orvQMdsVNfk-Q67y1_QLRveGj8!NGyw?_XS81OW8)_4)n&U@%xH6fjd(
zS6ABv0stHzALD_RmzVXklF6i*|Lp7xlMX^iK?n^usJe!Shtuiw;NYN{;pXN>5QOF{
z48yFgt@ZTu=*_RMuO5#_k|YdJ>nFy^$;o^^-?DZsrK;-u{5(Dv=|le5*x2Re<yUBA
zSzcIJXqm{uF{r=4|MBs$J(`n~lhM&pk}THFW!u}^R#6@v9)iIjVSIq;_J$(t{{R40
zRnO1Qd7j_d*?E3`CQkv#Up5R44J|D#HDB4-*gy!4jEry`H!v`uY1-4%Q#PB;=ko}m
z>+5Sv9G@aAnIH(wwP+lDzE?zR$mw+M?(Q~Fj*gDz=H@y<0|?g;giukGt*xz6sdRXF
v*wLo@H(zHHSW)-2FoC*2|DCAc_Ic_Lam=yDgH&x?00000NkvXXu0mjfOW4Z!

diff --git a/Telegram/Resources/icons/settings/premium/intro@3x.png b/Telegram/Resources/icons/settings/premium/intro@3x.png
deleted file mode 100644
index 35e11ed24ab7f566cbc183ea5d9a27f6359fafc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00009a7bBm000XU
z000XU0RWnu7ytkTqDe$SRA_<in_oy;Zy3jq9WhNiko}_(BZxMN+|7hS%9cpbMM5`r
z5z$~*5e#;@t1haG1*1WCUQ`4{QFM_IF&vI*e->L|R?^Z%1e4sd(DLZfb$%B@KbdRi
zIq!K-W%#{QpZ7W6k3Q!;=Y8Izq`bU56bcddOB6*Bxw*NwZ3Dk@b8~a<E!b^)5KCFG
zOj8yt)073vG-bguO;WKBpin5(YPCY4kjZ2OK`;zM({wNxq-k2z<B9^NR;!IhV?jYd
zb#=8yqp7T{RIAnb`S}Dvgu~%rFzEC7+-|qW<2gM&wb^XJU=Y6vilQ)P>*(mPSS&7=
ziv`Q&a#<{vj*bqDHYke11Ex?YdU|>`Ha6fq>Dt)X=;`TEC=_=Etfi&J?RE=6N|oE~
zZfR+`WiX{uIXpa!3n^8@!^3%bdA9>rQ&aQ#^Jk#ZKp-$MFfcGM5C{Z-L)O;TYHDh3
z8q8=k`u%>OMZ4WzQBjc`SW!`7x7&dO{eHjEXuLVF`uckK7f;i4b8~a*@aE=bnx=un
z1A#z&ef>><6%`eI|Nb3li)GoJot^X~J3Bk@3_hQ)sHjMEFo(kd_r$X7+1Z&!qe;!6
z(P+-j&UhtpI2_`F4Gj(PGL+QJ%uMoriXaG?Og1w!gOKFSn>S*CX|-DTx$%dVmzT|E
zv)OE3US3Aa5Q#*dK7A?*nAK`U^Mp%Qs}(<(!C*lCxp0Z5X@kK41cR=}OeT|DE(ZpS
zB)ME}GMRwE5{jZYd-o3>JoxhEOIcYNUn?I!ew>?|qiLEXNtR`!(dgsHk9&K23knMO
zrb^21_iMG<A3uKlI}BQiI-L%oa=v~0_SakW=g*%f5((sj)ai7bhM}ccS62rK18R47
zSIF`iXoh<QEs;p{dOd=Js;a8R#l>VP%H{G;pFVAGZxaM@bxlK)Uax=m?j6gr9C4hb
zn3tF5^?H#j=So*s*oKCNa5#*d$LsZSu4q7|D3wYJ3kx~JAbEr*Aqb+dun>}p8%!dR
zkR&PG(C^>Bg(o2hf+R_aM8X*cnmo7*`tFGv?DFzb>>eO5(KLN|dC3{Z4Hk>V4i67;
zSi+<I{rzY(${EHD#xTsv$_frkc(lI09*@U4!$9Yl)9DoK2b=76J0uJQw!gnG%nVK)
z92`KxKww_4*JiT`^MglLtJUZ8K_Wq5kw|22Zcdn`|1Z!vIp`0U%+JpQr)cPUY<70m
z>-D0!357zTQ0V;pJoz#nkN^DnGZYFz=73b~?d>frEI^~-t$~*>U-G@LOC%Eg{rwb0
zQ51ExP9;e)`Ho(%hxaF0mVNc=6%Qz0T`H&3$qVe{<mBH82L}g%sn*xm;XZkTJ$drv
z;^G1h7K_C?J3Ft-R#sN#@pyo#;4P{o7^pRns<yT^9)(U2EX#iV`t`3Lm6Vh`eE1NO
zq`SL&VqyY*P{iK-ix)58Kbmm$_4V;}h`!s>)zx(~R6|2U2=)Z+kF~b89v>fzO7;5n
zYcy{{cQhLt8>7*v7)ar8xV^m{*%*dB=<)G!>{M2(wW_L0h%1Vsg!UnljVE0C@ZrPg
z=;+kcl<-tS!H|2pe`suM?EU-q)6>&fvJnEoWHQ-xk1j+a5r$!;QmI@nPj4#4<MC)T
z$}o(>;h3D9JUBSG?plW|L0~$aPOH_XzrVS;+1=fJczCE%scLI$A3b_hT3V`7sS=4q
zI2``<>(}n?uE*n{Y5M&99MZr*5%T0AlgYNWw$e}irKKglTgKQWXjYt<m`JC3`}Qqf
zi)cawQ!14fizSsO9*=KsZa#bVOazlCLY(e38ckDElh5b7xVT^#=IH2XWMpJ@brsST
zyE!43;$8ml2#>AWbj4yZj8?Gg-aZqY1<N#L!7@!*uuKz4;M*O(Q<4@J7vIaj3;zc}
WB3e5+KQA-@0000<MNUMnLSTXwZQWu3

diff --git a/Telegram/Resources/icons/settings/premium/links.png b/Telegram/Resources/icons/settings/premium/links.png
deleted file mode 100644
index 3e7913e159080cd3733410d0c23b474ee6d2688f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq00009a7bBm000XU
z000XU0RWnu7ytkQ6iGxuR5*>TmA%V(VHn5n=jU|f<rq#Wlw|a}5go!JN~}hck(9C-
z)Z-5@ve{UaL`WEvlF7?}#efVLlts?<40p-T!BY?4>Dzr@*XMk@?)#kcrBEo2$0K@A
z6h*yB_%w{7sDJNMu!v_HLZQ&-^O;O0y<U$H8jr_=!Jty9oKB~wskn=gNMy6w07tvs
zE)t16hHyc}Vv&nzx7*!r7yCk?@H;4%%iSSZmbKYz8jVJ$(>a|^mSq7To6WugF$}}a
zVlWsi7R&j3zFaP9wK^CK;&p~$o`OoH(j6tA&)?EJosLK(!oE~0Jq8g3vE6QODQ2^o
zVVHP4ZZ?~j%OwDKy<UgIfp@ptEkO`h5OGVDN~PEXfKsV68jZ17Y%-a+T(0Bsm`bH;
zwc2X6!ZlK<l%lA^;c$}*A%qa0&p#Xv_-Ua~NTpH%z;rs5$z;i7((QKBG(DfsuX*?T
zJxP*}XVhx7aFJLnzIp(#*=*5h^lp63X7lN=1Azc8vRbVkj|cliBB9soxu@y(`(NFo
za=8ou%jHrom)q@jhGA%$9*stKlzP4X>K<V=8VvwApU>al-|2Lko2B3H^LV`9K?tG6
zV!`dl%49O!`u~pqRuYK>A+%nvd%d1ktHtQya9Ai5X0zGDmit5`Nmi>>0BAHCG)+J5
wc?h`!2?T<0IDGpa{Sovxee&b~^{L;{4;h@yb042iGXMYp07*qoM6N<$g7^&`YybcN

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

literal 1253
zcmV<B1RDE^P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00009a7bBm000XU
z000XU0RWnu7ytkSmq|oHR9J=WnO`V-e;CJ~EsOlwFs%%ct<*%j@F!e}3&nCJ<wha$
z=gQ1VDW!H{wJXYsP%flgkUvRlGGTRO&7WB~T+nPfW3#P<&hO&Xey4MG&d&BFF1#<F
z&+~aduk)Op&*yW_cv7h}5D38UP-<%GPb1JJ6bgSD;eQE*LjF%PQ1u5CO@Bbql<+T;
zMIw<>sg%p*85tP>@cjIIeSK}S*?c}<{HAd{_GM*dTCMi%><q&&oF)vz&d$!XT5VZb
zSv)W?0aaF3uCA`qA(*tfx>{LT`7J;^9#5y!aYrFbr_+5gkVqslnN0D~5HgueB9Z88
zfFu%$!{Ojq7)4Qw#bP#_olYlZ$l-8EB$6)xvRbWNP%sQ@YilD<RH;-~S6Ad5tJV6i
zKt`jH3(d{VO<`dn0Ayrj3=9mY)#}{bTmZ<-%)Gt5C1)Cq#`uA1YHGO9peUM?lLG+l
z?d`9xuSD?u{avkA13+nMDJ8$Ux;jpv!^6X<G#-y9DJcm6y1TpSqeSh!y*+a9@bEAm
zAf-~tr9C)~S5#Dtj*dngnw*>jfZ^d`N?fT_G66Ae9nH<nOhaK^TwFXpK8}ox$mQ~g
z2?+@a01ylY>E<?@EwU+7ht}5CSi0i#`P$pt$@z_qjVOvz(pp+t0AP7}nG#=HTVsTY
z2$YzZ=yJK3Xl`z9^78VC`5KKzr_;$~G62ZT%sf6m4ySEyZUR7Za&jmXqByu*uEfN|
z7=T0~5#1$BlbxLn0IjX9KA-R7<AcZ?92^7ynM_8c?e6aK`FsFaSy`c*ghHW+3pX23
zFc_p8VHid%FyUvayu2I$>~=ej<5N>p>+9<{j&E&k5k3<W6A`Z}7!1Y+l#-I-_xtHa
z_4V}t(9zKmj*O3w6I1kheIO9HySpP=#X^JQ_{+;nN=ix$Kmc%Xa6oZ6IXM9Ug+f7z
zPfScu<_ZLYxw$ze8XU*>_xB?fWqa(cR%=yN6*;o9vO=_nlBv;XR4Uc-^78%tz1Qn4
zE-vor>5)pMOwNQk;}}zinwpv@m(|zT2h6+M`T6<u^fXIX$ZBY4V1!`;;`8}#x0~#;
zu&@9CU0q%D0y{f9#4P$!MAyT^16y}k_OhOy9<q_w>jeNFk9Tx*M2>H7Zxi_jgMmwX
zdV7201OfmALC9X=!^7CvnA7PzJv|*78X_Wky`Bq=-EL<o7ab@+KcDhy5%GXLGc&`5
zCKL)0$0imao=_<C`~56QB_$<hvso+_ha(P$V}5=fMNxr3Ad|^DJ39*s3RoNn;W%Db
zS7$bx*?~A6@)Zij<>e)p9x%!4_14wZMJ*J=Yfx5JmdE3Xj|M@IqM{-$RbqQlTwGj?
z73J~qQKQjt^au8pny##@Ebhq&f-EjBE-fv&-EQu)fcwV=sZ?59TT6}@3<d;2<Z`(}
zp%9D3pP!!?hFx4-+}_?^US1L#Up(S?%QiMP$oHbZzdz1;QDLG2rKP2jkF!TdM>RDy
z-$4T$e?#f%>2Gguv$L~LPfr$$g*cdgqy9b%N6{ZpH2pfDUnkyg`+Mp?&Fj9U1ofkf
P00000NkvXXu0mjfRfays

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

literal 2121
zcmV-P2)6f$P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00009a7bBm000XU
z000XU0RWnu7ytkV`$<GWRA_<in{7x_UmVBJ9?Ff)>qF|$bm9{|4TBA7<w&w*;0w)%
zQYy8QX<@x6d=-&zdKE%MXlO`ag$TArATb&)E0)Mov#DcjYWY~snO>N!J^f$YKbNuH
zZD)6Pnc?@<@chp2_xs#)?!CWr&Xty$n!2&E0sbu^2m+#_qP98>>J=3gMgM2PwmOGM
zX$Ne(X$Ne(X$Ne(X$Ne(i5ckt2!h1N$FtdNti-X|Y@3^#7K<g)1!_dVQd3h43JUh@
z*^`@_D-Z~>va;gi<LPud0KnyPSu7Tl$)wZi#>dB3S62rI2j}PKsZRny5DLA?WU|iA
zPJ_YVhL*u#=<Mv2$z&9!fglJqU>pvoxw(04Yz&^qS7T#i&CSgm4(D$HD=jUZnVAU(
z$x|~kGo_`aTMQN#7uVL-Mir8$+S=M;V`H}lOehqNj*dox3e)K5s8A^U(_kefB^HY%
za#WZs7E4J<2{|wtf*_&3QVI(T6$(XkbTo;Om?kGDQ4}>83=W4QJ3E`h;rJUI6h%*;
zK0Pon5R!i~BgW_R7Zw&s4}xB=zj^Z}jYjiwE0f7I8VzBW`T2Q1pC4H;8jUtQJWQJE
z_3PIuDJlM(vskQ-jt;_(!^6YA*Mds0_V#wtRL`D0+r4`?=7+=K$Ye5wLebyf-`w1s
zkdT0f=<4bs?B3qq9w{)1MB;Eb$Wit5^x#xQMMbl-v!1OMi{;9dD_Cn%Qj*bV^z~r3
z+w=4DsRyIe=}M)N9F<%yXR%nApUTQgo6SaOcIM0(%%-8CfzUvyRAL1um0(h-)NZ$v
zpfVbbOy>Wkc11;nKPtD|y|}ozckf;RfIuKvSy}Nlu-olYsT2|nc0E>JUXJG%lFVka
z!{Gn`)YR1U_V(fv(pSmJ$@};32LR}Fx{;9)UjrtSSzcZa8yIH9($dn_*49W27bcBH
z)7RGrV|nS)B`o68r%wqD*4Eb2($Zj{pavl`Gm}K+HZd`w(P-#&I)}rd(P$q(emr{g
zXy7g@D=XL!{GRkuY;0^sM#kLST=4KPBi7Q=64DTvOs1Nen#9CJPbUlpqpYm#&6_s?
zIvzZD5C9Mt7pK$d{Mp>Oa|a44C>VpmP^nb#R0@S6IXT(WgXg=I#bUL#wi0%H^ym?G
z2bPqS1n{p?sTd3f1z=n*cX@dklB%bths|bV9r=9z`Sa(yySrb$e0lBKwL^yv;XWTc
zc;MA>XlN)dE)Hvb{``4>5X;NUTrQUau$Y(_6h&dE`uh6td!wMBU}<T|%b=;L33u!H
z79JlTPft(B{$5>O9XJY#qA@Ws6o4TJvcA3^lu9m_<B#(4@^Y+3`St5pV`F1gRTX~E
zG&D4LfejB2<5Ty@ks})$8-W9@udl=83^igwgAEJ};8YhbT)-=@FJHc3f6U6tnx3A<
zjX!<*g#A{l)k#T7m`#3u{`c?SgI>XnjSXr>Ea+5RTU*P?$-#`Ps;WF|3yZ~)nVE?-
z<>cfjl}h}5I6FK0<jE6!>WW07uV23grJ@py#bQlPP6mi{>((vIQYaMqUIM*dj}=Oo
zva_>mYilbjD?KZEu~-aA<#xM2fBqcwcp0`<eEj&azc46@ip638Kw@Iz)YKHAjlp0j
zEG+cryuQBv=g*&zRBpGsv$Hd3!mwbqwYC1j3=R%rHe#_jKsHvZRW6sGJb5xDC56Z1
zAqavX$hmXp)M_<65~k|vY8Wu6l4^W>++Wke!UFaqD=RC22R55sR#sM4R<^XX#AdTu
zEY|Pezsc<*O-)U~m_b$dCX;DsXo#>0FZr!jYfwK1gW=-Ei`TDTx7+RHsMKop^z<~8
zDP({fH*OG446Rm+ZAyzoqQFzg^L_R9?b}diAf~HVufjq>f~BOSeEaszH<H8QIC0_x
z0D#3}DHIBS328JM9*>8)I)40kNKXq~Gcz+@RVW2u0D#-KZxhD5fB!yaaNxiJ!cF`S
zA3op}lSm{Yyg)E&X=#B>HRN5Yk&zMKcrKSqB9UMQ85tQ}U0wLbqtR$=ZEeMC*4*4&
z`1h5UbUIyt)pxjHd3kwGr_(p8$z;MS3;@8sefz4aswyihJy*LDiNv=ohF8!<YFJ<Z
zfU{@M5(b{1pD!*hCR{1)+O_NQ<;##u1VTYRGr|G`05ml<5r%g-9R2<Md3kxcxw&a+
zY3b?dLZPszsObIs_oR{BZuh-=_d?B({Ao*leSP3;78e&`O7);>YilEsURdX26%`dQ
z>$Grm_wHSCxrKY8SyWWya=9XbWVKrB>gq@*M!^|0<c48LQYw`Kfgqf$Lf8rRCwz@e
zi8LBbV`HOKD%I(9VY&+U1D5#s_%J<Sdhz1Lt5>gjdwXp*8zm0I0%Nn;r%s(BY_i#G
zHk*yfWU|?8-!nUx%eA?=>2x}^T5WfC_r%16R;vvs6JLb|CXq<6y<0Eo_4>NHI=x<>
zl$3P%@Zp@C93GFy<#HVk2a2L*vw3Q2N~hDUuC7|GR_w@vdXav3L`O#xp3uE}_s(;Z
zV@nj)Q<3m_`0(Mwzu`lEl3-je*Xx+a>2w;6#^U1QNMuPuuzMa}5{X2|jvbqun?q65
zYPJ6O@uQ=oL#0x|><;`nk(-KiIz1sFA*4?f{-j8b7y!WKa+%F$YO|qM|LixxJ7C*Q
zJ7C*QJ7C*Q3;=-B>D=lxs24LaG4Y@Lcj5m4>c>#-mOudr00000NkvXXu0mjf)1d^K

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e094467cf..16aec31bc 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1340,6 +1340,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_info_birthday_label" = "Date of birth";
 "lng_info_birthday_years#one" = "{date} ({count} year old)";
 "lng_info_birthday_years#other" = "{date} ({count} years old)";
+"lng_info_birthday_today_years#one" = "{date}\n({count} year old)";
+"lng_info_birthday_today_years#other" = "{date}\n({count} years old)";
 "lng_info_birthday_today_label" = "Birthday today";
 "lng_info_birthday_today" = "{emoji} {date}";
 "lng_info_bio_label" = "Bio";
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 7c74c1ef2..e06c9956f 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -110,8 +110,8 @@ settingsBusinessIconReplies: icon {{ "settings/premium/business/business_quick",
 settingsBusinessIconGreeting: icon {{ "settings/premium/status", settingsIconFg }};
 settingsBusinessIconAway: icon {{ "settings/premium/business/business_away", settingsIconFg }};
 settingsBusinessIconChatbots: icon {{ "settings/premium/business/business_chatbots", settingsIconFg }};
-settingsBusinessIconChatIntro: icon {{ "settings/premium/intro", settingsIconFg }};
-settingsBusinessIconChatLinks: icon {{ "settings/premium/links", settingsIconFg }};
+settingsBusinessIconChatIntro: icon {{ "settings/premium/business/business_intro", settingsIconFg }};
+settingsBusinessIconChatLinks: icon {{ "settings/premium/business/business_links", settingsIconFg }};
 
 settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(semiboldTextStyle) {

From 20123fca7f8e364196deda4f8fd4291e8f9a77da Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 18:09:53 +0400
Subject: [PATCH 138/596] Mark the Chatbots section as NEW.

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

diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index c23e82c34..feee8e87c 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -132,6 +132,7 @@ using Order = std::vector<QString>;
 				tr::lng_business_subtitle_chatbots(),
 				tr::lng_business_about_chatbots(),
 				PremiumFeature::BusinessBots,
+				true
 			},
 		},
 		{

From d788f5afac5e106c9290d1e65d391ab6f811b6db Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 18:59:24 +0400
Subject: [PATCH 139/596] Handle today-birthday click in profile.

---
 Telegram/SourceFiles/boxes/boxes.style        |   8 ++
 .../SourceFiles/boxes/gift_premium_box.cpp    |  24 ++++
 Telegram/SourceFiles/boxes/gift_premium_box.h |   1 +
 .../info/profile/info_profile_actions.cpp     | 108 ++++++++++++++++--
 .../info/profile/info_profile_values.cpp      |  14 ++-
 .../window/window_session_controller.cpp      |   6 +
 .../window/window_session_controller.h        |   3 +
 7 files changed, 150 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 14a859e76..c7a23f366 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -1020,3 +1020,11 @@ shortInfoBox: ShortInfoBox {
 	labeled: infoLabeled;
 	labeledOneLine: infoLabeledOneLine;
 }
+
+birthdayLabeled: FlatLabel(infoLabeled) {
+	margin: margins(0px, 0px, 0px, 0px);
+}
+birthdayLabel: FlatLabel(infoLabel) {
+	margin: margins(0px, 0px, 0px, 0px);
+}
+birthdayTodayIcon: icon {{ "menu/gift_premium", windowActiveTextFg }};
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 41f9cc097..19907b080 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -1014,6 +1014,30 @@ void GiftPremiumValidator::showChoosePeerBox(const QString &ref) {
 	}, _manyGiftsLifetime);
 }
 
+void GiftPremiumValidator::showChosenPeerBox(
+		not_null<UserData*> user,
+		const QString &ref) {
+	if (_manyGiftsLifetime) {
+		return;
+	}
+	using namespace Api;
+	const auto api = _manyGiftsLifetime.make_state<PremiumGiftCodeOptions>(
+		_controller->session().user());
+	const auto show = _controller->uiShow();
+	api->request(
+	) | rpl::start_with_error_done([=](const QString &error) {
+		show->showToast(error);
+	}, [=] {
+		const auto users = std::vector<not_null<UserData*>>{ user };
+		const auto giftBox = show->show(
+			Box(GiftsBox, _controller, users, api, ref));
+		giftBox->boxClosing(
+		) | rpl::start_with_next([=] {
+			_manyGiftsLifetime.destroy();
+		}, giftBox->lifetime());
+	}, _manyGiftsLifetime);
+}
+
 void GiftPremiumValidator::showBox(not_null<UserData*> user) {
 	if (_requestId) {
 		return;
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.h b/Telegram/SourceFiles/boxes/gift_premium_box.h
index ed001200e..b054bc3a2 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.h
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.h
@@ -35,6 +35,7 @@ public:
 
 	void showBox(not_null<UserData*> user);
 	void showChoosePeerBox(const QString &ref);
+	void showChosenPeerBox(not_null<UserData*> user, const QString &ref);
 	void cancel();
 
 private:
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 1f5e23a1a..37863f5a5 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -598,6 +598,104 @@ base::options::toggle ShowPeerIdBelowAbout({
 	return result;
 }
 
+[[nodiscard]] object_ptr<Ui::SlideWrap<>> CreateBirthday(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		not_null<UserData*> user) {
+	using namespace Data;
+
+	auto result = object_ptr<Ui::SlideWrap<Ui::RoundButton>>(
+		parent,
+		object_ptr<Ui::RoundButton>(
+			parent,
+			rpl::single(QString()),
+			st::infoHoursOuter),
+		st::infoProfileLabeledPadding - st::infoHoursOuterMargin);
+	result->setDuration(st::infoSlideDuration);
+	const auto button = result->entity();
+
+	auto outer = Ui::CreateChild<Ui::SlideWrap<Ui::VerticalLayout>>(
+		button,
+		object_ptr<Ui::VerticalLayout>(button),
+		st::infoHoursOuterMargin);
+	const auto layout = outer->entity();
+	layout->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	auto birthday = BirthdayValue(
+		user
+	) | rpl::start_spawning(result->lifetime());
+
+	auto label = BirthdayLabelText(rpl::duplicate(birthday));
+	auto text = BirthdayValueText(
+		rpl::duplicate(birthday)
+	) | Ui::Text::ToWithEntities();
+
+	const auto giftIcon = Ui::CreateChild<Ui::RpWidget>(layout);
+	giftIcon->resize(st::birthdayTodayIcon.size());
+	layout->sizeValue() | rpl::start_with_next([=](QSize size) {
+		giftIcon->moveToRight(
+			0,
+			(size.height() - giftIcon->height()) / 2,
+			size.width());
+	}, giftIcon->lifetime());
+	giftIcon->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(giftIcon);
+		st::birthdayTodayIcon.paint(p, 0, 0, giftIcon->width());
+	}, giftIcon->lifetime());
+
+	rpl::duplicate(
+		birthday
+	) | rpl::map([](Data::Birthday value) {
+		return Data::IsBirthdayTodayValue(value);
+	}) | rpl::flatten_latest(
+	) | rpl::distinct_until_changed(
+	) | rpl::start_with_next([=](bool today) {
+		const auto disable = !today && user->session().premiumCanBuy();
+		button->setDisabled(disable);
+		button->setAttribute(Qt::WA_TransparentForMouseEvents, disable);
+		button->clearState();
+		giftIcon->setVisible(!disable);
+	}, result->lifetime());
+
+	auto nonEmptyText = std::move(
+		text
+	) | rpl::before_next([slide = result.data()](
+			const TextWithEntities &value) {
+		if (value.text.isEmpty()) {
+			slide->hide(anim::type::normal);
+		}
+	}) | rpl::filter([](const TextWithEntities &value) {
+		return !value.text.isEmpty();
+	}) | rpl::after_next([slide = result.data()](
+			const TextWithEntities &value) {
+		slide->show(anim::type::normal);
+	});
+	auto labeled = layout->add(object_ptr<Ui::FlatLabel>(
+		layout,
+		std::move(nonEmptyText),
+		st::birthdayLabeled));
+	layout->add(Ui::CreateSkipWidget(layout, st::infoLabelSkip));
+	const auto subtext = layout->add(object_ptr<Ui::FlatLabel>(
+		layout,
+		std::move(
+			label
+		) | rpl::after_next([=] {
+			layout->resizeToWidth(layout->widthNoMargins());
+		}),
+		st::birthdayLabel));
+	result->finishAnimating();
+
+	Ui::ResizeFitChild(button, outer);
+
+	button->setClickedCallback([=] {
+		if (!button->isDisabled()) {
+			controller->showGiftPremiumsBox(user, u"birthday"_q);
+		}
+	});
+
+	return result;
+}
+
 template <typename Text, typename ToggleOn, typename Callback>
 auto AddActionButton(
 		not_null<Ui::VerticalLayout*> parent,
@@ -1004,14 +1102,8 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 				return false;
 			});
 		} else {
-			addInfoOneLine(
-				BirthdayLabelText(BirthdayValue(user)),
-				BirthdayValueText(
-					BirthdayValue(user)
-				) | Ui::Text::ToWithEntities(),
-				tr::lng_mediaview_copy(tr::now),
-				st::infoProfileLabeledUsernamePadding);
-
+			tracker.track(result->add(
+				CreateBirthday(result, controller, user)));
 			tracker.track(result->add(CreateWorkingHours(result, user)));
 
 			auto locationText = user->session().changes().peerFlagsValue(
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index aa10dff08..9fe23da1f 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -668,12 +668,14 @@ rpl::producer<QString> BirthdayValueText(
 		) | rpl::map([=](bool today) {
 			auto text = Data::BirthdayText(value);
 			if (const auto age = Data::BirthdayAge(value)) {
-				text = tr::lng_info_birthday_years(
-					tr::now,
-					lt_count,
-					age,
-					lt_date,
-					text);
+				text = (today
+					? tr::lng_info_birthday_today_years
+					: tr::lng_info_birthday_years)(
+						tr::now,
+						lt_count,
+						age,
+						lt_date,
+						text);
 			}
 			if (today) {
 				text = tr::lng_info_birthday_today(
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 183c0c110..18c536cf3 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1346,6 +1346,12 @@ void SessionController::showGiftPremiumsBox(const QString &ref) {
 	_giftPremiumValidator.showChoosePeerBox(ref);
 }
 
+void SessionController::showGiftPremiumsBox(
+		not_null<UserData*> user,
+		const QString &ref) {
+	_giftPremiumValidator.showChosenPeerBox(user, ref);
+}
+
 void SessionController::init() {
 	if (session().supportMode()) {
 		session().supportHelper().registerWindow(this);
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 063a2485a..811fb87a3 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -395,6 +395,9 @@ public:
 	void showGiftPremiumBox(UserData *user);
 	void showGiftPremiumsBox(const QString &ref);
 
+	// Single user gift as if was selected in multiple recipients chooser.
+	void showGiftPremiumsBox(not_null<UserData*> user, const QString &ref);
+
 	void enableGifPauseReason(GifPauseReason reason);
 	void disableGifPauseReason(GifPauseReason reason);
 	rpl::producer<> gifPauseLevelChanged() const {

From 8fb3e39881081c20dee6f929881eeb6875404f59 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Mar 2024 18:53:14 +0400
Subject: [PATCH 140/596] Simple promo box for Telegram Business.

---
 .../settings/premium/promo/business_away.png  | Bin 0 -> 741 bytes
 .../premium/promo/business_away@2x.png        | Bin 0 -> 1494 bytes
 .../premium/promo/business_away@3x.png        | Bin 0 -> 2203 bytes
 .../premium/promo/business_chatbot.png        | Bin 0 -> 748 bytes
 .../premium/promo/business_chatbot@2x.png     | Bin 0 -> 1410 bytes
 .../premium/promo/business_chatbot@3x.png     | Bin 0 -> 2020 bytes
 .../premium/promo/business_chatlink.png       | Bin 0 -> 873 bytes
 .../premium/promo/business_chatlink@2x.png    | Bin 0 -> 1727 bytes
 .../premium/promo/business_chatlink@3x.png    | Bin 0 -> 2450 bytes
 .../premium/promo/business_greeting.png       | Bin 0 -> 784 bytes
 .../premium/promo/business_greeting@2x.png    | Bin 0 -> 1563 bytes
 .../premium/promo/business_greeting@3x.png    | Bin 0 -> 2345 bytes
 .../settings/premium/promo/business_hours.png | Bin 0 -> 564 bytes
 .../premium/promo/business_hours@2x.png       | Bin 0 -> 1152 bytes
 .../premium/promo/business_hours@3x.png       | Bin 0 -> 1743 bytes
 .../settings/premium/promo/business_intro.png | Bin 0 -> 562 bytes
 .../premium/promo/business_intro@2x.png       | Bin 0 -> 940 bytes
 .../premium/promo/business_intro@3x.png       | Bin 0 -> 1381 bytes
 .../premium/promo/business_location.png       | Bin 0 -> 760 bytes
 .../premium/promo/business_location@2x.png    | Bin 0 -> 1443 bytes
 .../premium/promo/business_location@3x.png    | Bin 0 -> 2106 bytes
 .../premium/promo/business_quickreply.png     | Bin 0 -> 751 bytes
 .../premium/promo/business_quickreply@2x.png  | Bin 0 -> 1423 bytes
 .../premium/promo/business_quickreply@3x.png  | Bin 0 -> 2094 bytes
 Telegram/SourceFiles/api/api_chat_links.cpp   |   1 -
 .../SourceFiles/boxes/premium_preview_box.cpp |  90 ++++++++++++++++--
 .../SourceFiles/boxes/premium_preview_box.h   |   4 +
 Telegram/SourceFiles/settings/settings.style  |   9 ++
 28 files changed, 93 insertions(+), 11 deletions(-)
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_away.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_away@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_away@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_chatbot.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_chatbot@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_chatbot@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_chatlink.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_chatlink@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_chatlink@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_greeting.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_greeting@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_greeting@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_hours.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_hours@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_hours@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_intro.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_intro@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_intro@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_location.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_location@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_location@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_quickreply.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_quickreply@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/promo/business_quickreply@3x.png

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_away.png b/Telegram/Resources/icons/settings/premium/promo/business_away.png
new file mode 100644
index 0000000000000000000000000000000000000000..b18690565e4601b518e5fc96a4ae658119fd049e
GIT binary patch
literal 741
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfyv*~#WBP}
z@M(y*$D%+9-*gsM*TRL9Zk#L2Ws2uMsN#5%!!hIHx*!4ZccrR&E*}~fyf~Jt@WUZ!
zf|wQ;m(!L$Go`636{dChm+-Ni`=OO?{dxVnzx&?L`G4>8-1qO^{PCBceDX`x-j^l2
zqSoHKf1kbiU~_Zxez5}?CfjbmeOYqr_1C<-JRh}S8##Ht_OR7cJyi0%%L@w)C3teo
zq$jX7KYaUEclOy!8751EBG+G!)w>?%Qew6D{`>gY*hY=XCm9YuERd52+M&|uAi&jn
zA}%hj?tE!oU7s>Tu!hK)w9o1e3IaXHljr)SZ;Z&=dh77v!)lA>e{KoUI_j9VS+bAK
zO|GAPW~5Ho=9^!B{}s6R_~VhJjg@~dJu(**n!whzEo$xM%a<J#F1#(9KX0DG=ik47
zFMs0w;A`~u+kZcOVp4QlEVzqp;|0fzE&G0Tzqoi&aNV-2S)yF5OI%gwpFi&V{oA*F
z4!N^eg=k&Be*Jbx{o{?hcU#L8NH3C~-E~1frl7uFe%p%@s~of0K5EW&I}(LcEcK?J
zUVKr5L0(>7KziP>Bc@WkFIu<VyLZp&Z0ea;_Z}Abs0mwm=!og3YKnCEsByPC{a|m)
z)ZD${YKBS1|C1+AI+dhu-o2aq($o*~j1uNDe98^!F6*xwOYrdMsyVL>E8cmhXy>0l
ze|i}0?Ck1lYmcr~6*?)i_d!m^#PiQ5o_<<X;ryn|dd}O=Kb0nO#I+`EoZ+=psFUT*
zs}ie)2Od65Tp2Q}cy0WG`1JJj5G~QnKaop=CVHr>aa9tW64n3Heer&V>ob&ZPg#5-
Q7L>$1UHx3vIVCg!0HV4%t^fc4

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_away@2x.png b/Telegram/Resources/icons/settings/premium/promo/business_away@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..24813a145b5da93c963c04256469d0431d5ebd43
GIT binary patch
literal 1494
zcmV;{1u6Q8P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHKuJVFR9Fe^SXn5oUlhNl%tOko
z$V{eCLLwQ9JcxuMLn$SS%rCr9%9JQ`h{#YP;z7m-^AI6Z<{|S?rvLwUTixB)J%)pG
z?|nJv;X7-uz4lt`TYIgwfBXCKL--R$Kp25P8vzmi)r*RX+S%E;ySqC$IH;?uD=RCX
zot^FN?F|nPcXoEJudnm3>bsKi^707@2|GJG|GoX|?(Vj<wEV6me%AZ?`XUTmPfkxy
z2L=X8OG}%Zo2RCxUS3{k_WAiaCnpDi<VWonWpZ<Kxvp^OrluxD4tlk<wX?IcZ*OmD
zwy&>`_+K>n&NAi=B2-aPLH25DYR=EkiC$e@wX(7z4O&`SNG9SB4h~97OTVM}D^p%x
zUZj0~eqKdIWo&E=!^z1>=#rC@tE;P{Sp)`|P6i|-B&w^ciI0>L<laH`_VzYZA08gU
z8+d^Hz%VT>jlEn%M8y65J(&CZ``9(&!wGC9`IMEF#e~001O)|=QV`JP=H^C2XJ==w
zYRpnb&&<q7N=nicUS@oJ9P&?3Pru1?*M5%f?d^re&CN{_k)Mq!Jv|-6$HzzB%*e>d
zAYW5bQpkprlT%Sq5iz^Ex;|(4RcSbJd3gzqNNN&jY;44EVPWA_dCKLht1Ewh|GBw2
za)q7^4Gpg@d50;^J7;KUsGy(#KBX`S^kqD6Zf=;cn3$NKpC2mA!omVY2R=%@qoac&
ziiBHUULF}45lkAnxVX^!vCfM&2+q*Z5DZI6NyW#<QwT|n`@Flm!zRke$S~JGOS}>x
zrVd3!>d=}&XlQ8I+uOIbwIMLf42lsa8Uh1H5z)-dOmNt&U<m95y|li*J~Yb8%BH5K
z5{I?p#l=P9`1tq;#_Bs-9336WSY>4;bt86Kfse2S1_q+GudlB$EGQ^=N0nfvkf-Dj
z?-Sm*y1J4Xlr#hoD#2KNM+@Hm=;(;NSz20(iHV7gjYVrg@$2g9vV}-(lF`)EWXwNB
z*x1<Mv;qcV{g>C0iHQk06doSVJNs`q1lbU|e`B84YE@Mgf`t90e#k5Ew>iPV!L)1E
z*4Bcu{Vljj9UQKBcz6iPq3`MerbdwZ`}@DE=-2vBT!UzdqN1XwrziFZ?aIi=2+$0z
z98+jfIN<O*I5+^v#IX;MG&?&BcYoOu=s%z!;23by!@~pR4L{G_-CZ;=ASC{M;VVKo
zu=4Zs&CJZ0UO)~24E#<`PIPp1aK>$IZ6SF0>FMbKCa9{aGGP#a<Uj!c|6Jx*XyBf_
zygYW60Yd`fplyCw=W1$dsKM6OR-h;r%aW3kuQ<V7Q&v_+>d<ULLqp*oca|R-U?w>^
z82|=)*4EbeS@Nb#WMm|HGdenoyT_Yyd`tjOhJ=I|8yoW>`-X_PxH!@R4y~-LC@Cqu
zA@vv8-rn96o`8S=GK-_WxVRWK&%D5w5acNm968H<`>?Puphw)-T3T8dyaZHlZ*Rxe
zPft&mmzT4v9Mkpzk(ihWhj6!I2Yz8;Avj3z=;&xH1~3AGCa3X)c>@Cj@EI(jDL_29
zf@{KWA5Rc|x=MWD2b)exN`l6Ti3!FrH#a{%J_Zv$Auxm(FD@?NDBWx6TM_wz&qXK*
zDo?E1*w`RGzM0Ua3PV6sru<_9*XOvnIDj6msHv$bDxXy2iIT<@1p+`$j0pnOgl+_W
zR8$mV%%<2y4?Pw;z}3uXz8WKw27z+Jrr6rrqLR^tahB06YyhdDFW|(jt*xbt3Z`%k
wM}6UV>FMdIudnB-64Js52qPejz|RQ$57Nyc=E2P;umAu607*qoM6N<$f)kFZ@&Et;

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_away@3x.png b/Telegram/Resources/icons/settings/premium/promo/business_away@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d473fdbd4ce87ff07ef54d874cc552f6181b4c60
GIT binary patch
literal 2203
zcmYLLcRbtA8&B+2Gqp<17%4TswrY*oT6@o5g+^>rB`u*rYHO(xyH-oAqNqmg+MC+6
zM%8XnrTjj9y?*15XWZR$ckkD8@4M&l_e^xJ&~ej&K%gu7dfH}y)%z<nWPqMc5@rSr
zIM7U26GR;1`35w!-EH&{#>OBR;M0J>F%Li#e?tJ_1_T5m&j*9Z0So@ymrwS;QN4Wf
z|NDOflV#w0z!H@D+IK8GDR;7h%O>?9Jx8CLs3g!>91dG3Ms*yCEi8<66r&QOVyA+^
z0L2+w$tlL}c4HmZJmWYcIkg+3*y7yXv=+AaaPLTxbk?&rFp$Y6=P{%lxc*Wk;qr%d
zn=?3^^8D&P;9#A7D91vfrsZbE+zKcgqC?XXTR0GiIsE!5ikfM6i4?xvhV6)93O_p@
zyx~-nZ(eCvUu^htu{G>uubQ+moL6O2Q;3{=U6U*hRbypkoo(<A``VjQz4a~%nCsl=
z<M=5RYTmB$EHFhP-XMbq9`dC-;bd>AB@5a>!ko%te(k?~psq@}Sf&!Pzs$sUiz00%
z=)>bPGyuT1_CD4bfW$5DDeb$cW|Af6-k&Z>(DJ=+pqyq~hfqGmA)Q)7>rHZ0Rx@ro
zHUpqELVxyllLFQZR@!kmHbs{qf^vh+$?n2jgLii5P@cvxiy7PU_vtEfDu(K=!F0)M
zEgoO;!#`k7Q3RWgKW8V6ly<G5{~$_uLk?DTq8YdhUfxs>zrYM-BmhY<(w!nYwmdoi
zWvav><uveIG%1R$2vOtK1#B#8$_{jmR@pZaL(?VgMNDH6Nqibp%x%@K9rDPCtbe=$
zAh^KuU;a~FAMrYYdyB2CZacH}-31AJ8csRJS@Jb&ZOzAfOI4=F)s}Cp6v(7a*2YWk
zwr9%xD>{n#NJPM9`!ikU;O;_;vBs{d*HlF!4@Gm@4Qr$zkz|ktV`QA|^HI(l%vOBJ
zTsY@YdmsPx`%F!dYj;U2=5*|5o_d%<83mUdLM>=Bc|Fz1UxIglmQ93a<=c4a>5mOy
z&g4LfP>cx&QSkBapV8)@Yu%yDj6#sJ_m6%!k)AkaXwy^IY2#VZvDf4f@lni`h$47`
z@YF=Pc^B1i$;D8P>KhH_HcME3_{Djq0~cYnE3S@bI9HvGg?t%BF0Nhd0dQi~@r{+_
z0jDau;`a@!in5FRh#dradq&2+528sZnY#@fQ<Rw=e1lYS6)BS2!SL~-9Y?QOSF{Dt
zZ&C`hamN7P<%Z&vJ|?J#q2ZT$=d{Kkn(dXtwf;#q$K|nNLxhe#3(90B-pY=eiNdT@
z!F$$^sJVkjfc;+DR=eCux~>khCh~k&LT?Q53ejB*TA=`zu*y8#oo84P4LjO`ViKq*
z{dNg9vJ%-PjeZp777>COv+)N<NOqV7&B9cLt$Ax`aBwuZ_wgrzlbtyZD$zA97Kj`*
zxk93waLDRHrF|nnLovTMe9N=-UO*;S&a3mzXVfFFPJ6G`Ca_cgI{H4{osQm_b)OO9
zbDc2JeWA_?@aS#;{}rR!Y=B})y}T*K+Fz~4YTXTyvUCR6UGN!dw2)HXe-kcqfq%-<
z)CmSZe;&I6?gOX6EM*0!s+^sB0iq;D&9m6T#?$iefZxiB;{-Cq%|))N&1}UwtVT%t
z%q!`#?V8N<dJN|pgW8U(jeNu?>Dhyx&NT&=X2yDyj%>zvlk}tg&yKx?1QQQ7%yR{_
zqCIs~g0~>y#$-@_xG4vxjN4Oh6xP#(3F;~iFQ4EtUNFAt0#}Tf@k(V@PlrGl4#+6!
zUPw9L3XP96OT@WJU+5IsjzIA<csYw=Q@mlPZ8<rXACbuAn!u_jflDkDFYL}$4~v(b
zXGKmE|6H0HU67}_VFm;p>{DC2d8D_<I&Z&DTt^%Ii7`-`rhHQ6)Vi7%r*K5LUq_=c
zTBi#;)Ot3DGQ`nc_1o3Rgqup8{va)VjG`{z$8jj4iy&&i5%j1QJH}ZLr3goa@lF?F
z$*HLjxi#a|CS}@Nz5VW~uP(XnM^bPrcuh$_e+!R8YE%{-%EG7)*Y_QOC!wm7k5*n)
zU!16yA~;{6j3PlVLi#(cWbBZs?tL$4Eelmbe{PnU77<j;_;r0llT%yb%^6+zfXkrh
zzpA|$b6by9boH9z#GNRrg4_JIV!jK_lWON8c+^<3jD|r|gR($hiE%b^qAW#TQ=qyD
zdbBfl^7Grc0=<hGGM4Llu$0}~Uc{sI0WPBG_0bC~gOm~4GBTi_sbf)rFl`6REf|Ux
z#mIa+-kGa%Cgtuy)C4#QG(9<GuXnQKADH>Qx0qH9+PwEbXTl)(Fb48#s?r`VV<vq4
z9!l+*cNy>I?*n-Zw!>85x#0XD0J+-EXsFAYJ>HCijBR7rfowkp!>DD+^E6x0ceObr
zvB=YlJ{iNQI)V0{e>W=9X$@N+)8Wm2$bO|Djm|R5Fu;?f;a|rXzb9%!;Gf`9nWyzc
zHiH7ZeCY<>$Hi@Kjut`HBODXl<N!=AaIME3T1P|Mv@NA`S+Un5nCgv|XRBSK<X(vk
zt2c0dditn>tqZ_AXJHdOxzQ$20TdnNkM+TJY9;h`2Hh8Vee~(Ao+o~85ZunD(Yr>C
zvjW19Zc@;*Z2&DwCY3gjHJ)daUzJ7DY2<E>3N)S3<y;h>C)t?L(GdjHpMvN>Cfs<H
zvqndvme;z^(g#PfS2W8RlW(k(F7qu$2o@vk(`~36S&2DM+^6>E=w}GvEwdD1VXVs4
z1TFV-eCUe}O@*fWWhr=bGmg-74$^V-^j9*2nDy9u>DjvB*HJ<sMekV)W$NjBboIHX
zw`0sxv$mP4Jg`0sBJHIZojCR@dG-6{^cUtW-gi%2|67g!Q<j%s+GE2(mt+t!;^da&
P-;aU5j)^u=(<SoX|HKF%

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_chatbot.png b/Telegram/Resources/icons/settings/premium/promo/business_chatbot.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e71b3b938331c4398cd2d8e442496458780cfea
GIT binary patch
literal 748
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfho+>#WBP}
z@NCHW?#x7qZ`Nw|QkO+MBNdK$bsfF3rY%Cl`V+fH(5B6SUYj><+_WLVeUsA_jnC|7
zye2A@D^BL%^vqQIzVqDMImP_Orlqg%<$wIT@BHsQ=YQAT|9S6l(%<W=BXs_?{*&Q5
z{;}f7xeL4Y?VENog(pC7x^%A_+mF+(`T>e!7sWpr&pcCOr+(mN$t=I+OM^5|cr7)W
zf8KnyZ}Y(d$L@O*@8-?-QCq)$eWSyHq>T}4uLWpa$=mL}_~PNihp%1@wUKMTcJ}O9
zR>ej7Z=`zDcHdQ-?5Q{1`}xP8e?qjjMy(Ce65S%g#cEr1FmG$r)vT{h4_IvN?aifn
z&o2_GD=%;NzWDlUgV)kYr=Kb%89X>-Hq%GpMTwQx^OQmfyF8Y&{A|n*ChXq3SCzwn
z<7?dd?Q!dK&7_ql7M)Go9Jac)s_NDE-z=xnHm@}3cHO1HEOo*|k<;c<*U_ZMA7>nX
zxFC1_`S8_O@7=$DQX}z0h0XTcyqpUIBzV}aW^KLx`me0gN(~OtjEB<Ci!3L4xU{`E
zR=1!1;oG;oS}FYs0kRWw_SnW)o?2wbDa2MK!`H5_ug@c+H`&V|VB6)Fb2jgH&{$Zs
zb5D%kT)*czX1|pf6>YBc_xD%r?d#lq=19S#m>ow?KNQvy>o%XwoA!d6PkZ*+qy+|C
z^Cudto9ean_FFC%rjVn4Mk^OHI<1y?aWu)X?Iqj3i7rY9RjO^~9ey~$LuEmPh6u+w
zd8fMl|Ns4)7uT-Wa`H!E6vN?%1u8-}-<DN8-JxUk_I8<xRBcVopR!w(Opn!z{eE0O
Z;osu(Zhp$nT~9zM&C}J-Wt~$(699bPJ*@x$

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_chatbot@2x.png b/Telegram/Resources/icons/settings/premium/promo/business_chatbot@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba588c6ec16f3c2348b9846ad0dfcba0e3c8106c
GIT binary patch
literal 1410
zcmV-|1%3L7P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG>`6pHR9Fe^SV<_gQ5gQsMCMr{
z!$O8A3L8=qnM$lgq7d1zBh!Kn61FH33oI-|DP-Ch6BaUO$Sm{xKi%^?9pC-V{l4%1
z|Ify^xc5EJ`@F+F!+YNE{`&Rv{LH}L&43=yys)q^C@5%dZjMLzYJ5-ie05Y_Ja2FB
zch%$N<;CM@jqB^{E3-us0|NsjAqbjt($Ueev$G2b2=MjwwYIjFjFg<5+}YVFN&7>{
z%ge(;kyO}EfJH?`tQSj5%iP@D!NI}%`+JsoeSO{E-=C3@VQOm1@~Pb2-F<R$Vr6AT
z5lsT3@)AO>#L~#fsHCLi{QR8FLtQ>RJVeIq>g4C=udJ*P=JD}yS67#Tfq|xMs7}L@
zxw^W}&(G8F2vA#Fo1UH?6%`d79i5q(+0f9iv9Uo3<KyGDwzkAGmbJ37^7i%?TFg^o
zVj_(wEr@Pve}Dg@qazY*a&j^}Je=n!CMITaagi{$wzfPyJt-48;b+jH0zq}^_oxAO
z?)LUJV!XY*m6erIoG0k%>DAZQlblvpSIy1M2@`w2prC+fr3uFlKy9Rqk&zMNJu54V
zf|5dUaWS##>+6#wD<C8!BoM!Kb#)5NRMghiR$?0&8L8Bk%U@nzhEpt}v9U3i#8F_e
zaL!>qGc&`XD1`m|{K!wlB2v?^u(00V-q_e!ickR{R3K1<E*!hNsaCO2T3U*PUS3{o
zY;348&ND!qaEef2b8{0a5Gdm8?2MxT5SdYsC+PAN6b}v#hCDkvdv<n4K~!qU<dcF#
zu&}TYs16PePz3;nhK35r>O<*-oSd9swzIRt8n?H%KRrER!?GZe0YU`=tHQKlh^b;h
zEoD?T%yv^#lfWK#hybBObyZ7C3!I29F}30fxEF_phMJq33FGGG2EI_5xdt*6FozSk
zB3w8}2;K!O^p}*B1Y<n*_V&=--Q7XPt?uULCZx(6!;mxua0LsvRk?phAaw^Ky^^7!
zA>k1L9fgUB2`bRU!~{;<*x1<B)s?y<Q3M+t^{}R<h7>Tk0!`pwU?`H1fPo!K5M1>g
z9UTI#q9Jvq!Akm+5o26N>+9<p9BEL&Q2t#eJwqhY?(S}CYO05aM_^!}X!#LM=<@Os
z6$ob@H@_%B9h938EU^=DZnZqR>XA8!+$H0f|9e<&LYSU^A6(3%NJ41vz&t%YMJtZR
zk5nTx?PBKIVCY8R9F`=Iz=g;jLeGnq1Md|$rRbwc*;rd!6Id!5k{0&y@ex+|M8l7l
zIBlA16do+r!^4AvgM*?B1Z4b206%O`A|S{bMnpuszP`dyV`HN%0}ct50__z1R8>`R
zC^BHYPwnsT!^_3R#otU1ZjYs<CHTQgxx2f|h|Hnj0)iJjDJdx&iUf>Zf?7&ng)1s5
zs6l*uyo-wq9kPNBJ7DFuwl=)+p!Gz*$Ko<&yhJ-XI#M$Fwe0L{{5*o-eD(D7R99D1
zg0z5Jnk>9(nza8wy~xSQVdI5_guvax!h)HZ8H*E{J3~;Tn?}nbw~hMj8&ivVgQ%mU
zqtDOJL>U(shc`PPA0INru9}{nPD@K8W$CknFBxG|mzS3#OUw|?FW#0gdAhnH#raFp
z`3QoQLSaKTAHb*YZ^#av_0-hV@bK`bM80=`f6&<fvc5N&pXfg`@SkVkH`9|f-HJ>D
QdjJ3c07*qoM6N<$g8I>oTmS$7

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_chatbot@3x.png b/Telegram/Resources/icons/settings/premium/promo/business_chatbot@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..615d94b27b0621da1cfd9f183acdcd67cebb51c4
GIT binary patch
literal 2020
zcmV<A2OIc_P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?PDw;TRA>e5np=pEPZ-D7vb#d8
zC1-MorJO>^4LPiqR^)J@C^oqvB2mbNr6iGyWeFGJVwKI6!y=*_lE`r-k(|%PIxY79
z=|6dPcHaHH@67vqcfA*{i}lRR_c_fx^UO2z{xUL>f5{9aGmy+cG6Rk?(6?{jUAuPW
z=jS`}#U6g>(4pGe+QWwr$KFy$1D`*Cj${0F<cl|az<>dGrT#(3+t@nmGV90`)a==_
zWkjc?vuTKd0|zc$x-=SH{rmS{yLN4Lb@kr`tA(bAetQMYn>X*;wd=@{Ba4cP3JVK|
z4jtODW5;IAn%PTG$nD#=|Ni|uH#gUnu?|0I&>-@J+E?O|K`=^2>DRAc9b0`02R3Zj
zaQ*uAU%!4CyflCO_;LRH`4uZxkZ<errEJ}}aRbKb)2F9I1P<)kv&U;ngFPS(X)MLO
zdGj7VeApnq!Om;fuCbDa9BCquIoiB=v*NvT=MKJwTsPLiX2rm;wqgOq<jIrOyf)~7
zf9Kh=XGe`1rAvcu-MaOYCr`YL#N?_~s|>J1(|(V!k#_9Z;kDrV_wOf8oY=W@=bANZ
z=FgvBTwJ_<{rb|<(hC<ZctaF(SFc{J+sAS(Uc9)XqT<u1Pa>STW53zQur9D3O|}rB
z(DlatZx9%#PMs2rB90$FP6}<)ri~Y`dPpG)7cRVf`Le-y@ZiCmoE(D-u=0(VG={=A
z{m(JHx_kGoZrs(YSI3PTXRmM8tXU5pJkTYuo?hQrH!$osd&$8_l_B|SK#4$Ot(ege
zsXRM7`@n$%x^JwTp^N2x_Uu^*;f9=gP4Wa<$?x@gGcxpj_3hiYxpU_l0H@~4l`Gk1
z;-0bJ5akotPKxTl)b&*N#(pISiV+ZLdZm<cvWZNb^ybMrn;MBCB=pQ4;hxrGk~5%@
z>`y6{Q&^^!Y!PATv)}Yw;&XPVG%lS1y|!@5fi_CXlQL`6B{nS4V92?mnDfdI+M-2^
z<;$1v+qZARgbBuw(F6btFxk}@x^m@;s4(`nfsC?Abt_uE7a2LwYieqYnoBo=AplB_
z_uOBwV1cM0qv(u{NK>;btyE0j6ny&hX|aidD3u)y2@DnkMyVk+7xw^T)TSAH(KMtG
zHp7MuQ=R9|o%{0Tivh^W%90+!QfPzFhjbPNd-v|$rAwC-J!Z_95Xs5eu}+;j$(A5}
z8RpV_{ra_ZzIpRTXoJv)bQXc#zI|KK<jD>lI!J$G5!{6(gs9oQYK9LV{_52$Fq}fz
z<OQf6h5!Hq42u`GZrwUj6rw~-87f{)s)u{N483^qLTDjw-n`kXS1%Tp(oQ<P#Lu5U
zCr+H$qel;x4%!QN`SPW7cI(#d)~#F8v>^gQF*7rB{P^)aq=>AxZQBY>)g!b{V5q-W
z0tVKgR{+RN0?W(G6Pk32Nf;(QVF;>h;sFQbv0>xJjS?Z{<>g_7+VLP<6rofxVTLM{
zz2(21)W0ZRU6gbw?e#Rxe79=V>Mu6R{}GFDaZHX4^(IX}hWYCYSWwyhLVW!AQ6zTn
z-klqb_b3xUI0Au)MYynwQZYja!5D;d@-X;k%$QMCRkd~NR!ZT=j~^SOuFXDu`iveu
znwyyJm8%eiPuDS|U<A)K;nX)CS3oHGD^8Ua{kbeh(-fYTW4xt#%REcF{b7hjxIe~!
zG_6p4^ytx+En7H_3knK)_wL=keS3dpfuke|UP$rk>C>lk=FADi`vB5%Ov%NF{rmU(
z==di?X@%lHvDi{+;+W+`#RlfQV)~tr(k3>Jn1%#6_Tj?^#qs|AdqwCq!RODPO?i#n
z7Bj@KR0;zeTefT&vbYOv+qO-K(BEhDTW~4`(e`5o#$XbLMJqXj8@npHzkdB1Sc#^i
zd(omrQr&Y-x{3-|F+<$UnKK6u9;`YqUc8v<j%aX&YwDly_1knfX?|S1CF!5Syf2D=
z%<g0N?%h)>#zR=kmMz@{SaWbUk=Q`1{(fdH!xl(rh_0hYkJ_?@z)hJl<<Fl#N*To1
zv13CBv1H+ehu9OxP;JTR4C6}6)1PQ!>6}GaGmv%lFCM(fTC=(X`AjNa@j2Z4aO*Cz
z0gfR<hVXL$9;ZYXY2EmZ43ASsjvTRx7pv;NbLY-t2$vLI4y73h!FKJ^rHlTshggmi
z@)I{BT?Mb}TxWQS<^#OmACjIlX_Cxh(-2&RMvNHYHCKJhef##UUfFqJ4n4<?9cvnw
z_#N7&O`D9>Q-=2J+4KJW`^pR|5C1n)+h3s(Ey$WWb*lcv?JzOEP(GBAoLHsG%F2@`
zPZ}jChgeBT3E%SBg!)2p-6kN*%F1Bz6(83@K3T}Stv707czJi2$ad}8O`A4t_wL>D
z5tLGR$&w}1clsJSNQ@hF@7}#E8Xr5!qH(h=Eqi!)#xa|p61Y|OX&Ds-GueXQHk~<h
zCJJFOlfmzw_<?53j7rQ&W+0h?WCoHMNM<0~8Tbzoy_}4SwLww<0000<MNUMnLSTY7
C3gMXm

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_chatlink.png b/Telegram/Resources/icons/settings/premium/promo/business_chatlink.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b812d8ec60121594c09c80a1a003a4a537c7018
GIT binary patch
literal 873
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jf$6fRi(`m|
z;L{Lq@2o%(yQnV>K?^z7DkvJMR85SS;HhA%z@x?DIm^Rkaz{x(Glxonl85gig&c*B
z0HMs8i~3mE`)0XVc6x|x(P7rU`1|U#b04q#W&S?zVB*^R+UmDo?}&UoUpHres+oz2
ziMhGCk<q0)cVa?Ar+TO?y7=Pf&!0DMM%vB)U-?ShT~=21_wV0cON~UhSep;--o5+#
z_wt1SD*`l@En60}^2)7SvyMOh`EoVS%sF#v>gw!lZFBSU^^I#ZZRF0U7#)27?b|nh
z?cNhlKV83m{p?v^sb7;=m>Rv7zIyjg?Z=B38X0WOjjq}&r%s(39v;rl&aU(M&z~B#
z$tTk`w>lks{~f5Q*}&TR_qT6tN*hkhUlq36_1}&;nX_li`0?XML|ojn0*ke4*Y3zH
zFP|>3C+_{li-MD5CdKNBYtQNG>Y6r9EM)HKr`N7tZQQ<LLqT=5H=n|a<;&HdIELh%
z<aI4AEp0vgFu%00&`_@5-p0m7Nie3aqJkqhIQa7E)7%dm&OHBIc=`LpNfUh3mM>r4
zX=Gr~aBYE=si~>meEvX%_51eiJAT}KiKoTYt5=UEZQQ?q{#%Zp`ntM;CHeX9pFCmt
z^y-z?N2Z^jJ_+qy9MPgI*8Py<u~*2i{LMG#_^DrfTV`G3=*F3qoo#JxEvW3}wpr6_
z{q_6z@7Moc>YJRLyfbFq+O@m_RvjB<WMo=;Ryvw*-?lA7%XQ(O8xq||53yuQS_^Wp
zcqp$4(`I9Tw;?iZ^UTuE$BwyK&CScnS;B9ux`pBN&VBp*99+!p?D~w1EhmJBg<as<
z8g=&2>5wflXSJFoyz=wc-+p_HCBsCD?T_ZPW1R~$+?}17H#sX=%{`Z4lGK-%m$yMl
zX<|l2MTFMWN0JjyrU2tZ$36A@iH{!({r&mpb<CV8c}8v<BkwV%#1AK`O9~4GyN^cb
wbwr5?9^;=n%|iv~H@<e}v%kKc`Oo%`@yR09Cmi3O-3KLePgg&ebxsLQ0J@%c)&Kwi

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_chatlink@2x.png b/Telegram/Resources/icons/settings/premium/promo/business_chatlink@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6490fb474efed6a2fbdb1a50f8a5df4952d1a846
GIT binary patch
literal 1727
zcmV;w20;0VP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NIDM>^@R9Fe^m{~}cO%%u9(!w@N
zEn96dQA4OK1QU@gQY@o_!04hoMJyG}$jXW!3X_T~ZMlfj3%w8`m()ZHTcEHa)QTXo
zOv{q2pwbroeqX1C@$q@y#rQ5h@V$6EbI$*qnK^To8Ev-V->?UUJ@DUpV8qbOyScfA
zhlj6PwQAnHdDEs%n>uys`0?Z4zJ2@V&7027&c?>Z>gwwD_V%F}cTH>AvSlSDCGX$A
z?|1Zj`0!zNcJ`!6lU$m>1rJ3;MC{+cKPDzdP0-uh`}px=T!LdhfBx+2>x--A%$YNL
z_H2du`0?Y36DN)zKmOsv2gUqbV$`Tn7*!s@bbfw*e0==4apO!)2LuFc+qSK~zFw(x
zbaX^TMVW$KX0qcuckYO3PHNx2eG?~6bkYiOcIC<y(f#q`$F5zwMvQRbOiX6M`NXDJ
zBu=MHnPLKR#9F_8eRp@a7|F}aa|E}R`}p_}A{grH>)W$u&);lr?%cWe?%k6$Wo2bq
z&uJ|gIdbHU8#lznjvYI!fxji-qobp@Z{L3Q?AgrBOlUZ|mbbTeOG}Fw+_-V0E^>-a
zOiUEzW5<p;R0s?Vym|Ac;MMomty@7sLAvg&S+m;O+5iya6DCa1MGj~$FRyp+-l5st
z-0be|ZXdmN?b<J2zQ{UydU~EbdBRtQU%!403k%cLSFc_zq9aF+=zItC!Gi}yZTa%$
z_MuEbH3Cc>N>5LxK!E3)nwkm+K3f_+dbDoj^5x6$zkT~g(bD<$=x5KKp;J{=We@aA
zMmYxg>C-35rUATp^JYZ+Qc_ZM(SijFguiv`R-JE2FI~D+6t-;HVhQ>qz!MD(4fK;g
zi~)a}nwl_GSXelKYqLFg@BluF2EO_5z<~pxi33khPjiILMvbPw8l+>#j$OQXvCh1B
z@gk;}US~p+`S5@K{7JAHL<2HYWHfLHDi8-@K+BLQe*OA2)996nO7rN^Bbc0&(waVf
zIy9Y5afG1sLr@oJ0|t@Ff=Et4uU@?}KxMdQ&6?8EQj(Uct(?Sau3x_{*1Nj81WA>b
zz`B3`zQL3-?&s%c5Sa|0K7EQmPoF+LST<wE3~2&-6tkMv)>c&bQ5Z#w%(`~%8XR&k
zBqYROYRs51|DyZ*larGTB9oyc&V>sX2FuFJ%dztP`}fGmNRe8trlO+a*Npx2oWXWz
zN+NY8Z*0<^Yinx_h9*y*ELNyeN+fv%U-<^n?%lfuSyonNT33mE0jyZDLYWf6B!;N#
z$RxCNbZBU(42z44g&>CLP|!55qeqV_Fn3w{F`-7!;?|+~icqnvf=P)?2-U@cgM)Q3
z?v-ufaK(o<G%OL>DH#CHojZpqE_zbgl{IsMn<y0m1@2QiLiw4yz0Mb!C@v@{xO(;K
z;L>6MbBJUj_D#do0RBCshN3|3czAdy1iK-*;8R6Z!i$vEs3=~!a-~u+B@z-6Fv5>M
zXbLc4ZrHFvbaw9Csf+1K!mp{RA-_blaN)wcckc?HC^oEBSBIvWzj*Ni@bl--ojNb2
zFHYjkFn|7h#iTT|6q%dv%a<=H*=l&{(j`M<SBi=_eE6{7xz{SDQv~-I5(H&>i2k-B
z0`~6RD_0J+6poS-r*{(5Ip`{6A6i_`O#u#=X=!OPB@Y@sm{8-qNIG6yIXO9-Hf`eZ
z>cE!G78@JO9SDPz6_xf5wTytGq9R!nsb`eAGS0}zkkydtixw?%MRg$d{Q2`Nh&Dcu
z?ZSu_OQg%Lh)9Q5P<y7i9`H=Y*2$A6?cpqB)Ore_I0hr!OnA{+V4Y*f#l^|a)~#Eo
zYjE*6bLI?XEh#Ap|5FJioVk-QC3Wb~p+j6bB!00#Gd^|dlpzXrgU-^Gm6e#oNh+C1
zF(O?(LuI*qsq8#3)KC#Dg+urE_jh(mJ2<RJ1EIIGjwMT$&_4C5Ltj)A8weIhV)F<Y
zLN-}G{d043>EW!HrycJV<s>*fit*F!+qcPf7D@ur^EnauhZPrAUZ||e&TfYys;jFr
z?3-f9je`He7~aT3v2Lwn`6|UjGiT1^NlK+=$GrD=Ec5ReYg5CLVGj&@;Q!%)e*gz0
VShT(d^6~%x002ovPDHLkV1jRfI=BD;

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_chatlink@3x.png b/Telegram/Resources/icons/settings/premium/promo/business_chatlink@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..af17dbc53a9b214f1feda7194a070aa0acfac37c
GIT binary patch
literal 2450
zcmYLLc|6oz7at6X2ZJ%T$vT#dCHvTohGt|bTO(wbbsh}avQ)@kB-t9vW63r#7+DgU
z!Bg2XQE5ST${rEDKcCP0dEY<IJ?Ac;@45GE_oQC3y1>OD!T|z-xNumE4ZyJ{#Lf(i
zAMYU`0AnKBTrdHVhvCb>1mlgz`B++l6abkW#B|pW1U@+ekO)8^5KAc&hy~zGCu^n5
z|J%iuvix5@Ie1^yY#o63jl-brd|AI2hNnEd2<?gZ&eloi{%eia--o#brDIHKFuL*4
z0Ikmq&mzhjsM;g|<=1QK?EG>#(-xzD_-^><hf6HakK?k%A{_(u#bO<zr$>4GWgd(H
zWY?I%aw2S$Y#Rrv`9VcRo!Ud^Ywhb`D%ZMv$I2a>eTH(++IEC38^-<KKR!BK94YzQ
z6}8=;DLRmKrZaliUu_wJqkf=xuQF=J(*%$t{iv;bAHFs?wZRneqX1Bbu)3MeL+obl
zwdV)apeX>w-6xB40>F8s;yTQ6!Mrl~7vsrgPXJE2u(qtkDBdvU=i0&Us)}p3-Am=^
zz4fn-8+<b6iFFRB9ac`*j@t6@W4&}i6~fo<*h=$<TMI))3ib-Txw4ib>~;2a6RiQ0
z_H_;hu?Gx4@dYK94vmX>iYB{@2{5Ir5SBn)UY=wwQHPE&KcWG<IxRnyUrtxaD+%dP
z?>nsE{04Zd6-mF~b7h0nv+&i4%$lB0>RyBAZtiak+!GI=mKesaOtt;(Mv{c^werAG
zrQXEI_jWV+74&NBk~mrl@B4pD6`iPxrfE<SrM}=5Moq-}mj+WY!<)~HZ!z=2`1xOQ
zcis422*a4CJj;zthO-TKuzMn{3e-$5Bn@&57wc?)Yz;7l_q=cNltxOCrU2`;<ck?Z
zBhvF}7Jv?N($AH5$jzJYT_5X3OfZ{e!G$xte{IdnSr&%P(o*m8h<8VACm&JWUnc+f
z+(~S47N%GZev~=@E^X&e&PTJI7UB`phx`EC%F!cZP10YTXlSO}%$$zDU5j+Op{JSY
z255r@xTu~NE7l4s-1yuYa0S$DUu)MM|EK%hCNp5gIT4qC!E+jATcK#*<cErmTdyCf
zz-$vhbgPD|t?$FjVIZ0L`PYvCJ^R324Y>7Veg<ASdU6W9J@(H9UU_q^ppOW+ju_b{
zmaS>!`&3&W(`1IIcGhzxL~+3bIcpAP<0)#8w*!m2f4L(as$hrZ_}Lk;PLbiWl-ot8
z#T*^9%5$B%efL4i_qN~}6Le?Ta?Wb9qVuyx1Yt$R-%1WS&TEd!*7kWLWJ>|-pSjqS
zCVIUu<LFO|-?+!UL4U@R>@(jc_g3E3u~whI%S}d^-MKzO5-_8u38<G}#sbD{=9mZU
zb%^)A96SkioU@=WXut0W59mEfhV|6@5@gZ7Bu@xmgT&&Sf@Z(*s$5>RS=Qh~Scp>_
zA>7pS5Z6^^#)UVgOh~2nG3;}Q_ao`(Endeeivl2lI+aT`pjqNZKjs26gRS`+UgasR
zCM{@_d4#m%jTnhK9uirYb7wW(703Qyg06xjruX4Gp-Va@mEc;y<tt~o_SQbw{>2&j
zX5y*q-%X{?qfA%R#~PJf=SNChN0`&?VN=n&D}ISU0;TsGw(2XxS~kB81aMbvbjKbl
zo@6yPhb>B%)3rU64x<D)JT{6aVdVpBe7Mi(B1HHRUa#0L6`ub1sht?qY*vz^o$7ZC
zo<r6$WiMu|Y1JuT>&n-QAPf<gM$1gBK4VYWjQHm}E95f<qF+Jt@Yclf5}y&0fs|r`
zy>rieSnt3KL1Rlr3O3+4t$jpHCzR%a?v5DP*EClXz=<2)ETu9AapZ?XwV9&Y2ZA4T
zk)!P66pI-kCer&Gx21qmR9VU;qJjM<WTRflR}vK=VTpR~fcb?u>_u78LcWjATDWIb
zHOgNh7Yi1&4556qu8))$xuQ@Fw`cB4o(D74S@{11!i^pGBJQZGWh>wa@*(jJQXq%z
ziIQT=c(t{(4HonadbNacYYo5kl*C%)Cb!N6;VaS%=r`y|p8j3Ig1plxfC4Aj^L-t?
z5>i=FjYQSo<F5|+)*pMYvx&Q7=OmzDw^3sks6X;p?>er+DUi~qwY6`(d~4?7;~U_j
zYe_=Xi1lm2drb0Gcmt=r?cPb-oqSVxlcjYM+iI2Z>pUfw)YSF7b7FAk%t<?1&r{bI
zw_ikU`xp?|R~1z13C=@>n)LHwdd~FmCy?SA+v<*4{2g72ZPi%ZF8YR5c5lTtT5+Cl
zji!1=^3~?BM6~wbUq0df^~?LhfA~e<l!8=#)|#O=*)~yAEpo$cEYWT*$w&7~ljjBZ
zh?zdt$!7Oe2yp~(SttASrR7|9?U#efaFBd&#p?v|sNC^pCifl46dN~uY0f0<tzZmi
z0SEEV@ey_Mft!P5_N4LHEo6c1T?uKR=EADrM{HaosP@KhG7wG*|1`-bw1~R7=;DNL
zA^?91MH2jn;Q}S7l0Tc)mPKtZIHIk0AfP0(Oc8I=Q_Q5SWg*s+pHQq(kOneNHXtr!
z_~PQmtFfG=IIZX%-@>vACW^Qb$FxpFPXd$SyDHhXUi};0F?&{XISSH$x?fhNKLTf?
zg$cG&vn8Ku8qDs<<mM>#XlcDo(@PP8ZM<?r$R%r>KbDC~K{=2*n}x%d@Lu?A22fc>
zg@rCdMCI8q5Rf4Iq-_vw7@R6rIk;WBXSp9a6HJH_8-31C8!MBysYnsTf%|I`5T>#p
zSWnxF{dyE?F>w0zolio2D`Q1VV`LXSN3sraAu{_?`v9H3dEcql?(Ed_aWj*pYFH(C
z{+8_(r#z^Xg6X|X+Hdv5YV^n9mPw_F@D;|)-2g4s$k>H91uh+7*&!X}frt((=&_fP
zu9OB2E&bPq%0R#7sZkF}wao*IcT)8^oTZ0nRnxTfii8N>UG!;B$G2{vyl*0b)J^Mt
z>$o)Ojuk`027#>3VXfOf+>Mw-^no~U{lg5ZRO{R4F?;)}G9=H>&qB5gF{f&Qzhbz=
zvWdViYvHyY66YJe4W5ZU1P>iZ%I*oqt-R#Xco5>)h2KVb%*F*?qj;sNXU+<md&LFX
zwh>&+5jQ1|#8pz`eTz#x_C=FlsQ%j?9gj8AR(%m~wxlI$RCO3ElG)O)T%JVrehp(T
zB^|6bjtNUIWgDE{L|pQ}@k%Re00`@Pu?g2U$=d(6BmeD7e!J>#sK{P~uRvV*=T7<|
MoT(LtY~ptNKV%GfaR2}S

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_greeting.png b/Telegram/Resources/icons/settings/premium/promo/business_greeting.png
new file mode 100644
index 0000000000000000000000000000000000000000..22d1526c267fd6e95b7d1e2ace87ec530c3bbff5
GIT binary patch
literal 784
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfvL*V#WBP}
z@NTfTM^d81*T$<#CLE{4IUa3V!tv3uNh#08g{NnMfXl5N98s<cE!`}wEJu4A6@nHu
zad1skkkE_SF{MlCkcWs@fcQ6;*_ZDqp4n+=xqIgBUvkf_=X}2ZesRFRjr|7`eEj_W
zEzOYXRhxc#XUw}tkCGN&tf;Q$ZgmRLDz&iMFlWx3J^S|A+1cH@caN>vai-6;yzSGc
zPj6SAHGls5uT?o_)!EtHQDtRi2JZ_j^z`&zl>8EiQ8={6Z~0*#yZQB%m5D|(A3uIv
zUS1xyTGX{-ON5Tzbno@o>rZAINX(l*fA`(Itx<Dl%wTX`eYNZOV~HDg?(EsQQ&Lv;
z?*04guV!tG;JN3kCTtnLFyKRl&4<$Z`uegmwh3;F4>HU@FE1_4T&*;*;n>Zaky}1Y
z+2HRt#YZi8rO1(H?x;f#4GJcDJbCeg<KVAfRx!V8?2afaE6??FUmG@A;OyD6p<1F2
zmtUIPa$30IX3nh~vm;6qJ0y;od8h~-(VF_|;X_70LH@eq$B$R=ExyRXl9J5N!qj;G
z{qv6%EG3zlFCRQ;=$Px5ZZ=zXi9(UULDm{yfB*UO=TATVl=04?Lrnh|0?#}xx_$dL
zb3^>f2%WZ1hYveD6(|VIm^DkOJxF8u^5v^nuZ}OhfB(^^PeT9S^?zqwv~}y&I;E)k
zqSDe<?dIJ{8$E0a>bKjcZH(~u_x~$8N#fd~iyC2`3j-!>(G=lpZ(cfg=1j%6by`kW
z-o4WcyO?8EpY_M*PM-NS(HZxnpNQ%ReyhmO=imORF(NYZU}*N%Tm7fDGc66OtgVe*
ze|>M<`(wx4)FwA-?!NnP?L$U^bv(xzyMk7>v`+C_%G~hZ?k{6w1>aupmh~l|)adEz
K=d#Wzp$PzJbxu40

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_greeting@2x.png b/Telegram/Resources/icons/settings/premium/promo/business_greeting@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..21c575d7327564aea4cbfcfb8c668c4db17ac4e6
GIT binary patch
literal 1563
zcmV+$2ITpPP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHg-Jv~R9Fe^SZgTWZ5W?pY$4~v
zHX?*b4)H;>wWSn8DCa}r1BJ+Zpk#c|!X}3pvdOkuawu{x<-^cO!VD#6ZH;Zln8V&*
z@3md;e-9pi55Bzle|TK?@4im=bzk>&U$<-5uD+`X{LdnwaL)DU>gw9s+V1b~Z*6Uz
zQ`LFJwY9a|+S(2d4u1Xmb$EFA>eVY99i8(k6)%6|#*MhRxJQp3g@=c$si`R`DNRmJ
z!WH4y*Vm`0s3=~i?3~Wd&YwPgV%u|bb5EW;p<#A*ww;|_K|uix6B83<HzQK=`t|Ee
zOG{*LeSMwX0x>W!z)Jf2`+=;ku7aPzOCbUS1IY<&77Rp1MImDddHeP)oAmJTAn@VC
zhYVf{k(!zcOS`+foF934d1M>E_V)H{wWFg0$mh?WH8eCBym%rgD2UA8yLXSYD<~-R
z_VyAe43d+R6M@M6qkdp3t*xzZ-MV#j>I?|hianyUJu@@I`Jtz$x3;!M=23@OV?#p&
zz|GA~)F%c}4qm^0y|=eV{5YPWp`ko`2I9`0JDkp>tF*L~<=x!e$kEZ!Q3eqM0*i`@
z2vk>BpPHH?ap5nD2uq0~5Sx!5KavVmVb<mC?alHT85xATySp>^;>8PqKYsk6-Ff-)
zCGk{LRCs!NMnps)(m=3O77<0Hq@+L$cY=?P57Id-EDSV|?d@$%O-)vT90G{S#E7Y>
z>Cc}(0ajL4-oJkz1irGeGG>U4jRk@oWJDD4?AbGj4Gj%3H$0>5c>n%AgV+&@UvzXd
zgD_7fXJ=<YEG#T=@`0zMqy*sd@-p*_B64$cA%+5ti-HAk;;0DK)YLHO=jR8`FJHbe
zr=g)C0tt{lDqzfy^#HH0uV+LQ;o{;#wp&|UadWW@B0)G#AA{}f?XZ!VnaRlG$B)UI
z>FH^d3C3^Uyh*q)qC9&dp{%T&pP$dGY;0_lmzQVm<m6;1MM}B4x)O+u!@7kBM@vg<
zXJ-d&Sy@>u2m;F>ht5`zy1KeZjDK5NTIA&9ST$|v*RNlZ!VC%tbO$(Sh$SkP5U;DN
zgU$~hJ_x~6Xn%iy@}s-EJ0>P(etw>Y@KPvQRaFIiY-~&jGM$i+fLR<gMu=EkTm)WT
zUM_)48x|KALk8*0+f-d$4Fuo2ckhJx1RT40R2KwszHqQjOiYBc=H}+4Cm<j|h@V2!
zp+zI1qN2jAUS3|5QV5ulkrCs^5;itAFpM5jVirjT9Q%lFQ({Wm(AU?O)=^tq%Qrj(
zP!Fj~{Pyjeurwd53k3psEipy0hY|_=lp&J0si}#4>g?>q31R_E;X1?A#>NJN;t9G&
zpi{iaZ%!1}=H_Pd32A%#_HCgG^kTum!9qkNP3uI_63PD;8xr&B)2HOq%F2qPqvK!G
zG7YFX!Qquj`d^`>q$Ik(zJLENyys=p_~y+UtPsteY~sJA9z1veZ=eXJ`J9i6o}M1)
z!E5eZ4nY{bDXIW%A386tPiNITK0Xd5&!0a(tKc#G#>U2^4jNGmRaI4wVUh}=f}pj9
z_=P=7&_g00DNcifgZldVQXP<-ynFX9$)fj_oRfKsdjp*i=|z`_4qCh_v@sAwUnabK
z#EVPgMBhU#5y~UhEsgch9KSZx($fB57y36OB!t=>w9oPJ@zQmhnVHcW99;+666wsc
z&*D16BbBxf-I9TU!Lhn5EiI|#zycf`9FFC=FwnxnVq|25d_t>VSXc=2tR0tNdU`sY
zEL7LX$Vi^LL;@L_las@*QaFb<2Hr-)!@~^X{{qONOLXF>YII(B2cl=CXbFFDm0DR@
z9ThnV`L9hri9<Y&h6#-T$_xnjG%+!Ox^?F6N4&i&&Z`JqML?zq`~$eQGb`(xq#*zR
N002ovPDHLkV1hY6%<KRF

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_greeting@3x.png b/Telegram/Resources/icons/settings/premium/promo/business_greeting@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bf932cd62d86ce502e2452e23710e85097990d8
GIT binary patch
literal 2345
zcmV+^3D)+BP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS@lSxEDRA>e5nsulaOBBGb-CY>i
zie1=ZpqPk>jfDtypdy0Z*ouLO2sSoif}LQXVh1)Vc6Yp=Z}c#CX7}pux1ZPd*!#~t
zJLk-aiBt2%#Dst03WO^Vu0Xf~;R^hBS0GVTRZpHgd5s!1DpjhKAwz~wpFX{Q{W_}R
z{t)y2{rf+C`t;k+zt5jPFJ8PjXU?2|NPINJBu$!h$&w{MEsFL3(W6Is^X83)&>(qc
z&z^nClquV{Z$EP62$nQ#*f3F|?`M1H(4n!ciT!c<^y!o-QwFI=u)Ky18}{zqyVyE^
z+qP{R8}j`5b2a|;>(?1GX4I-xt8?eh*RNj};!&eU1*=S8+&XpYBw8B4ix)3sWccvm
zBC<e%0yqzaf+ka@OoIAbfNa^ay?_5+w7+}zE~kslkr4r))Ri7Te!QTjPMxZw{tCEf
z&z_>+ym|8yCr*r7)vH&R4G}DtP}ewp`t;%_-@bjDBS#J$8~^aSb?cPsSdt<|3Q?$i
z`}Sgz0($l8C0GS;GlgdU{P_kpo<CQwUagel5E`nmfuc9Sg9i_kpA@oGsZuehXg+@Y
zm_L7hLB&77N{jXtD^}DMB7z+|c1*AUxEY-QxNqOSLa=n{QUe>GpH-?<5zS7WI+Y|z
z5?z}-dGb7Y@<a&k-@mV8fieE(&6|qg%a<?3iWM^m)Mvtk37a-;x?sVAUH|?qU%s59
z9<2bFAVGrGty|BYJ)2V`s^jYn%^Edoq&rE1m_g9BYgd`RVZ#Ok%V)`wC9ht+Dl`JT
zeEG6%+qO1+L?Z;E{rmTe3;{?2jRT38apT4b!Q;n|4Z&QzOP4MQLHY9Kb%F{NDqw(M
zZD7!#K{|azaMr9@(a)BlM$l4sk4WMm?cTjx=m!oQXozR$1-o<SPQelqZrr#bD1e6#
zA99{44rCCxP@zIHB_d$aqD8`&i*fDRwKs3x$Or%ghJY+tvY?ZqF#-dWoNDf;aHv_c
zrkcKD#R?fbbLLEuB1P0Vg^!LRY#8GFeCE!b8)KBbTeof%FJ2rjY0{)wwQ7|p0nng9
z1A}|DYSrYj&73*Yz;YF3`r*Te!ID+V$g^k9@I(3(vM|9069XGJZY&%-bm$<$IB(0A
zEfW;UM7nh81gn6NBS$I%&QHF4`3&r#Lx*H~lO|2hojWI=?b@|7h>I32D%jDZM;ll_
zp92OA5RP&-6eDcY_wB-k3$_4Gl$yR}%N7I62^7w{!`QQDk3q?2pFVwrn6<VEJdd<!
z(Ly-3Y}wM7&uv-1e!UP-CL07Cp${KED1!R+>l;`+hs;#~#~ycYkny=`(<Vj0=BG}b
z+9vQkk}Fp(k$vUL6&#nr0^6v>gvJhB-Me>J*vpqM8vz|(FB288X3ZLdKc7ShDf12<
zJZKa693hN~c<N<)!LV)LzI}>@$VPTzNIG%igu=4_21?&>oQ>mlRjyoF6bP(NC1P&e
zxKa255Toco8Tw({$&)7)8KoovT_?cB5h2jKYSpUxI51h2cwO9yfmNR)MvM>zaJG&#
z-UhpL>7pl4!hP%3t;V5(FTRAcs%XfGGG@%E3(K52vs-2;L3zlKA^H@74;(n4*uHx8
zN>zY@@&hz)-drrPfz6vYV~N3+oxFGNo+2g%Bjq&+>`y9APA^kfL8Hu3#N@u>er(rj
zGyKH}GA>@cDE4s7sOO2KG6F!0iW6usVxtJJifrM+g$CCC96NTbA|~kBSVrpBtt&$9
z?96dWT!VG$)Dd=gD%qSiZQ98CLEv~RxM0L<u#_-y$%u(zH&hl%97~%vtt0Woi4#SW
zQl&~c(s&r;b_u(3<;v+Z$pdlRf@NdLuyg|8GG)qe4{g_PkoE4}Tk)ATZJL3S&!b0=
zDjJec`+x}9?*je$^%K>N%0jW2J9n<6f`~MdlHU}wckf=L5Oax^j#CINV3j6o*RFM>
z@ixdViD5*2If^<LPQRr2^iS;=r4u{C)2B~I%H+wD9kC47t5;9du)9NUv*H?O({JCt
zEldezj+Hsb^8ESpLWYWtOW-C6DMnN<DD@sm*|KE~tj|v#f#evVI*l5m2denuKWR>g
zZ5=yy^eNA2n)pokvxrV4zQ)*nxk#|4591bOTeWJXy7_jZ>`U^GNgM%LGCNI;gmVmK
zy#D?`jH+F`wj)RCTvdiTV*L$Hnlwoa3%=t|g2&UA2p~oHr62cahCNH~3pri{dy2P_
zf&~jo9;hrFGiHo87QUz{mSsVs^&rYgpcWD_0Q50`CmZx-(T_>eTtHm33`111WXV>p
zT&dee8OGI$MD@7m>dqrbuV_mp@=Ta8LAQ;*V)ULDB#=<EIp+Shh7pZ)>()&Vaimlf
zxe;-6nY?4i4z-AQFBg)ahsme(hgs73U?Z5)mrkZKj58m!1@8PxlqeyB5l<)|Jb17>
zxo1q_!iD9`bN)Tgk7NSxvC^nfN^mQJx(xa+EBLuZBzpRp%R41)0$ExBx^Z?V%PVWW
z%Ruifa)w?N_)bqoKWEMy-8SAFA`CnFc9B^5Q7fo9G{dElhLJo{mo8n}A9JcfX+V&v
zMkSf@q*=3O&7}0iHaZ!+s(9i6F=tzEJ^X36;ifJPR{3cFw&5yg&6;I5Sly;$70=Fc
zs%dxx&`5L>=5?IDuU=N8B@Z$7i>}R<MwOn9;xqobU&~Px>Ms>)2XLP3r)`fKq42wN
z=Z@?ZnGHW2a3hZA@g6;T*gr+0#lW?pZ%I|ka~{PWt@-1}kBdnFIE-K(!J@YS<j2x^
z*Hw=LCR3x`5<Qgy<4i$-x0JqT946susPWu-jDaZ>I3xCfpJMUz2HQ6L1P^6Fl?dj0
zLg1FTF{IJJ;~-fQ7P3oc&z|Mt5!~JA!|`wh!W9TtAY6fP1;Q2hAFRMX*3ehN&S6{U
P00000NkvXXu0mjfKaNYy

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_hours.png b/Telegram/Resources/icons/settings/premium/promo/business_hours.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea917bb246afca5525f1a4b516abe570d8fb2f9e
GIT binary patch
literal 564
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY@Vl!V~B;|
z-6;##9dZzG{VnJEiMh3frBhjxvyY|O(d?n}1Pd0&kBllil4f5CO>l5<m@s95pan|}
zBi|A0#K|`=iB&KiU1e=t{_fnnGwTv--u|jAGrGO)_S>?(aocsc&%G>(T7P}t`}bwL
zuS^kHSYu}|*B`z1TGGZDXVZ>9o_Ho{<Bc3M>E2@{R&PtJUMxG6nZ7j0a{hUbDW_AP
zmdd1?NNM&=7GTM+Qtw>BI_dSUnLcidrkKg_9aS-z>9fF5EM11h@jzSPREx)XvzKx5
z7G+&|P?o=a_8bonnO@apOcxX;EB%Xi{L)eT?f2dakp~%TW(Z5A1RYu5`ohF^(t&7(
znIa2kHq8*X@@>|e?!ErHaJ|r%-+!GJ8q7a`wL`OMoySd|yJ?#{)#Ulu`^5GxGvJwi
zI(5qDhV8d=x8JTUxZ9g!W-Y<9?)vKIl{;hnI3@&&1cz^lT00|_lf!{&Vbt0%t*NW7
zuKJ-Eyl;k-P4@mYmw-)wCoV|*Q>-vE;@yjv4oW{asyAJ`?e49+vj1E1eUGjQySCjp
m?k2kB>(S%i3U1y{{loaD@$L#Pi;!kejCs2HxvX<aXaWFmI^gX9

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_hours@2x.png b/Telegram/Resources/icons/settings/premium/promo/business_hours@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..62411855b682722e07e3e9e78a66e270638dee70
GIT binary patch
literal 1152
zcmV-`1b_R9P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF>PbXFR9Fe^m`x~cQ546ICnY7y
zM|nlb0GTPhlrWNk5~a*!ZiJaBLnbDafhftyz>Q=g9~sCLBZZz46GcA4`?<?K_q6vq
z$2s@jCxg2O?mlb(*MBc-@4eRA+i|ij>w&BX{;vmeQlrn!&24FE>FDUFtgQSUZ}9w$
zw~LF5&CSi--QCyM*VM?PX*D)B&d<-^+}ykeHUPi?M`L%K2p+1guAZ2f=<n~($@$cJ
zcz8HHJ-xcR!Zl2crz$EcYHMo?3JSyyY+hbo9vd4wJ3EVN*%$bsp`oXzCvnQ%-QC>W
zTvu0Dety2KhL9luzyyyX>NYY(NnT#w?Ch*iKR-WDPfwSZmm6HYy}gr@leo|;2L>1w
z(Vdx@fyxU=r4I!=R2WZAPU`CFY?hju8ul-k?d@%Qw7$L`MPYy{U7K9rY;0^46&2a@
zA>p8j8`js?RRD^pyM9tJp@b~Fut3K-56~e5jE;_$m6iEnP<L%gaX+ykWEbObKi~LG
zugW2jwS(5!Z7SXrE-fwL9@awLHzqpVH&n8?kcZPqpa^JhZ*LgHF-gdRe*eT<5F#-K
zA+(T3i<tyj)CeT@2~RL5f2*phIAt_CNvTf{LWxgI;RCV6Y(U8j1UG9?5wy3rV?B+I
zGHi*U1<VxcLHT9j9ga*%NeS}R)m3{meTmRA1ryn9ib3RXaOA12tu0$2eF?OX!y^+J
zgo;73708;8kB<gABcISh4wbs+6obgvpe2D5Fh~f5;DDeP#>&FNLRM;jf4`xj!6lc8
z40XjIst7<775pWtwzjr*c6JU73>cb`KKuImy1ToZo0|#fF1bu(@F)g(5qo=k#Eh4h
zmxF@?uiV>rS9W-K*w2xNhlc{&+1c^xhU&BFIF_+kOwc5A(r17s1<>*F@yEG;f4{!I
z?&;}K!BV@)5afWv9-76)MbJk_M=Gx><P5K@tbAA$Z!i=W7pq7SLJn|YVIcsM9HLGI
zeSd$i7KBNh)uXz-y}cEiE-x>enwl)ghX7j0fsK!ks{m8j*48GZRHEkCSKqA5+S;0^
zQ*WqnXa&GTD!>#*O&zAb;|vZC5-g}|?I9$=sY6w9A|+Ry!bh4)a)l~t`QbCWB2KaV
zfazxyXc+Y4N?2@)ROFA0jFgs^DvJ~sWuV9x>Wp85AoMdjlsx1`Q3`O5x=l)9pUI0N
z6JV3;C+-X!6FY+va;B!HjLVI2m4+nUYpeI)Wj}q-W5egeig#|mJ`PZyV<_dMcp`65
z;(XI{jB6z^lQ{k(9;{rO=x~hXNsqc%9D`6?b$)*StxtMhv$FlH2eKXr;emhc6gOTN
SX-gsi0000<MNUMnLSTZw@%+mG

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_hours@3x.png b/Telegram/Resources/icons/settings/premium/promo/business_hours@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..923950f8495eb6ef61a2af8603e71ec902e72dff
GIT binary patch
literal 1743
zcmV;=1~B=FP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>IY~r8RA>e5noCHPTNKAN#2(z6
z2BA<61RqgKAq855prF!72TBjnW=<V7bs$&+g&a7mK|?`A69*XyDh?D>NR*N*85$*t
zkGi3W+Py#Awb=KZ@9b}X=X^)a`+WmlXYcj+ul-zm?VXSid_fBYEfBOo&;mgV1TApr
zS|Bk_h)$k7SyWV%pPzr>!iCJt%s=-&Z2i6Wy?_6Hc6N4pdU|wpbaQhvP8j@Do0gW=
z(9keAIQaeh_kS!t*kDEkK|gW$sO!?DOI=-E+uPd~?l`a@h&W1ogcPf)bLY-IdGcgu
zXU75WUJ>20w6yfs-UngmOq8Gsg|T9aQU27aQx6|L+}PL%cj?``caI-GzIE#s6YSWr
zW4a-JQb-jH^YioJvM6kBZf2J1Qu{||WMoWCOoYH%SXgLmY`lE=vONx%5kW9S70NMT
zug4!wR=iK2KIu?aS63fAcyQvxiAV-6Uc6XaTbrGo?Z|*2;waH|Vgf^s{BbD+pFU5R
z_bn|gXU?247^|+XR+DgRYpcAxJQ62LP^GUx7{Xj6em~1Gqc`fx%1UWzsjGppu`!YA
z@9#JBqY$;i4-t3Y7#MnA&CJYXWo4OBs#-QH0ov2k<0^t$l#2*P<2WXn%KE%|_3G8>
z)2Ce_Du$akZ?3Pe19W+LxuBrHMhfMa5Z^Ezm$ih&S6>5ZPJ6GE8>y+Ov^t@cjaP~X
z6MDY^!2dmf{Yn~-31B$_?R|*Ei6MQy0V5J;H06W>vJ10h*{l}Pn28{RIaw!x;b&a(
z^yyRSE|%j60ODATQ2{{A<&Px-Q;7rFK+XG=!Q>x%pMk+pg;CkN0pm}sOwcW@MQ~s+
zZ>YL+=MGylAB2I;P=#rM0VD&bRTal18Q+9+hKR|mZfa^u!Fv7rwV5+gEv6-&1d{9d
z?LTpMxYE0K?<OTBsd8o-8)Z0;O^NIcDJdy7{NX&927oFD62QWFJe24WgQu81#0I$l
z)ngDLRrWstAfpjr_JX0D?1mCRalQ(z_VU{o$1n&C<r~1vo3&{u5-1!$eq7;y{`|QY
zN8-gRFaTzb9!-vsV-kQbU%nLj00|w24lf*%$uTl#BJk$T8=()7&|&EC!XcR)BQv1{
z*ne1R70oe`0~JRP%OE}6q<sm;?T(I)fq{YBw{I&cU;swZ0?%IIPtM`tVKq}pEvX_b
zp;r}h0I?6%qgXu1`OMADDO*2&{J3%BhQa_CRR}zTOQs$p22zq_ZxwO<`t{`GWJRAn
zdp0jG&!9TSs`Ka1%NZguF|oL~SSb`R0?*Nq$+2*O@$vE9-Cb4w<;$11Z{LRVIF``l
zsysbC-EwdJ`0?Z7;-Y9H87_3J#L&=C$WTNhX&Dk2?2jCZ?G5zy_9|8CZ)ayG9qua5
zj{M@q3(lAI_4UFmLlJmV=#A*>>r*(`4MUQi-V`MyT)ldgA*A~TzRJo<uX=zXF$3_t
zivQ$qZ*LbU(Jw*2jI-@bPELwKMLc`<%v1CT4AB6*U%DOso8}ldJt9H6Q|RajE{zHc
z3!9pnI8cd(`}gltURG8nC1yg0p~Evvh1Qmolt}ZCXAiB8_V=}G*Yp&PGV$oqBO85f
zZEXSxcs3#qJbDn!?STVFv_%}QT3cILU<D;aZf>rtKDoqj4T4=%`E_h@G{d?oTQE+#
zrVTwETTF8dG~M0Zf~l&iN@!n*k&%%rSFSJ!37YQRyZ7P42eVoofDX(o<y`AmYQR~$
zmr}2(0e9WLBy-%&xN-QL%)y*r={Gmzruw*~-!OPI6Q($JWK-Puc1SKIxO6uS*(mDR
ztYf@JA|@oHvOk*wazCz-Fcag&-`d(5;l=0ApDl9=c(orFf2xzoc*&^&l!Sb8$Tg1w
zJ%TxOSG5ZI(Y#z2-}HXtioo?bL`_YNJcp>LsEE|P2l*UAVPZ_`7wrs7*9R<Y^mTQ0
zIXO9wUJ)@J`~wz+jI~5xC-IGsyx;Hr<Vg9(9uTKTVyHFWIXHH^&xIrakJ__7y@i-U
zoCD<gQ;kgfzX&4k&*icX%P*Sq+aY;6yHAgu2_sZS`rEf}U%!4OmH(SPcJ{0113f_t
l1T7G>K+pm~3;e%Z;9vc<i}a9q6y*Q_002ovPDHLkV1n`B7eoL6

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_intro.png b/Telegram/Resources/icons/settings/premium/promo/business_intro.png
new file mode 100644
index 0000000000000000000000000000000000000000..57d1c8c82068861a01afdc96ec908d01d06e00f8
GIT binary patch
literal 562
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY>uakV~B;|
z*%0fzLk<F4f4Xea5D;Qg-0txu&tcOP;Rnh~o(Y(k#4wzE#8M#W(z%nhRl9ywgF)p-
z7i;PB$9N}B(p)psJpcZgb>-JK{hNJrlj7}d?9GmgFHX=@a1A_C_@~0A=cfLKyLs!c
zzgF=)u-Z_-fjRPe*2{xgTdTBnyOct%1)p+XKJR&JB1g*37_B+7Z#b4d`)ujF^m|Yg
zD^C+ciq6Uh^B)#i94U*r9=bDc`|kVi?|U~l2P}19mh=`mr0%tR_4|z7cm32RU%&J~
zA>?#N+CRm`7dc!%sG6Czge|+Q*;*jLv}A)5+X-30$Kv}oah!WvVzp3QV$R*X<)=J0
zc|{t97vGo^qwZq)`2BRJ`+6#?qpnrh<eAO3VzNK~`SjBuMokm$pZn@9WS-O>R(<pR
z_xIniSu<Pvjwdg_Jn{OIs=ZR73$n$W4i(NhnshPCP|^4D*)-*9#g@vcr*FOfnznhS
z-jq~Hz3*?!4trU$#Wb{uT|RN){5+YccO0J^k2A78ud#dWyqtTHc$Hhn%H=oepCuaG
jXxw<b*<bhjxAuGNj$4ItC-fL!0mYZ6tDnm{r-UW|Bc$Mh

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_intro@2x.png b/Telegram/Resources/icons/settings/premium/promo/business_intro@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4132668cc03c3a61630a2af1c12a2f54397596a5
GIT binary patch
literal 940
zcmV;d15^BoP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF7D+@wR9Fe^SUqcEK@`oZU<?RB
z@vE}iN=#uRD5kLy&He<zPW=P^0xj&cwNR|YI(C9s87yrQ0}`wRgM}=9WE0puIPiS(
zeDn2|jai&R?%aFsnKLtYo^Rg8#krkV;6Gb|Z=CaSyWKvY&tkD~;?=N^kB`}GHlNSc
zPI)_%$vizh{Wjb{0xEeO$aJ|}_xJaPl^hU&5VRCov@Jt&GMPm3!^1<f*&K~V+wGRZ
zr5C!qybK0|>2x|A4g=HabW*959$43p<t0-qm&+!TNf*Z*012oFr_A1s$73W927|w%
zhR6mL2tkW_;-1J3=<#^SRC2i-Gt+9de&011OfU!uGmb42ya(Le+>o?LB(nEvET_|1
zuh&<r6#>IQ7fuau?*JhIV~D+%X@x=|k_JN$e0zI~rwf6pf8j((FN?`6S*=)xR;%Up
zdhyV!R;xdD4F<Y!B1B&&J-NDm<~*=9Se5tp_gE~ZW<eKDgaA<c6`RSdAP)?B8j6?H
zO{G#fNZWPbgdhNp);OIR1TtIZ_xrD|u8`dAcC~_t69B-pQKm;m5R=phKt|AXI$f{V
z7&RV`YsV%|007fQnI0KIZ*Onyb{o|Bd|q4Ba3TZ%V9eop0nF0FsU{C0oGDcC-LAnP
zM+_moW6xwhE|Dkgv>uF@N59_>1OkmlgVYl|Fwlh)q2m+f@XEZBDzuBm0xuHTY?hpG
zRI%~8F(im6gNWznXGNt!L*|qj9Fm?cwnApJ8MSP;+v%iAbT}O1#3@}KLrhSySS%C@
zJiG+6TrP2W+H5xbDPmhTnN0A4!O#Bk@*-O1Vk=au)$p!kv)MQ`y}rKUpPv&<U}A!h
z^K;jP#t;IFZJ7|Y99TwBB9XvF{TH?MdOaLT2~EOVhB0t+pkIf9iAJLihXXYvs_D2O
z<tX76tYs{fN{^3^*VotDkmA7;=%^ZnP#Ho=p&7Wv;dG$!Toh?UnwaE85j^A*%&A<Z
zA?UL{Hhi7WF<7Ke`Cz4~I*kK+_b)%`(Y8#j?Swvhs%4$+^9p={75D=|+)dV+PB9Mv
O0000<MNUMnLSTX|^o?r(

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_intro@3x.png b/Telegram/Resources/icons/settings/premium/promo/business_intro@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..587b4e36e5ff1fc61edb4b4826aba88f5a7879eb
GIT binary patch
literal 1381
zcmV-r1)BPaP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS<&q+i<RA>e5TFWbLQ51JSw<LLF
z;!Tpwy+-N|Ob`P~$<(7{raV#xro<3=`~}J*Q6>f$DE<JEM4m;rlxK18ue)otJCE<|
zv-djR^?jW)T4$}_dY-i(=bW9C6kcHk!U}{H2rCd)Abu<GLp$`;)YQ__(!9Jp5ZXrE
z6klIoZ*OnU&(A@)Vfgt?O-<|T>n|@ae*(VX0*>I0KL?A&!otFxot=QwaWD_3aBT^O
z?Y63_3hm+GHYO~%MgZ!`sE#od?C9tyCntwY@9*z#Y-|KH48#C#X=$met0RwhcXu^4
zHCI<x#9<)h4t#ic=;-KRFsfhzj^K`Z0%0g9DMK)P$u!&q*zQgt6%`ddK0Z<aoO21L
zCbAo|XC>zdrxXB!kwyA6+MQ<hy}dnsLuQ(AEpkIJDl2Ei(;Ze}GKAT}6K@AZB9Zd)
z@?ZZh5V*BtJUQfA%qyOFZ$N#0J+(o5d%L%SgeWN~nVFfvY(^G9;1*1XB%n75*JK1C
zc`JA#nwy)+B4|%M0R{&L-`?Ix*Fr!90D(OTzhUTfg=Y`|%+JqHOiZMtq_}}00st^K
zfFb{<p}wO!9z{=24~ed?ueY|gu)c#+U0sd&x}cyyNC7)NJ)NAKByj8qzdeA#BX{89
z;$lWdh8!+#!KBUvSY^EV4THZGM@B}d1DBSTy1Todo}T2ya0@0xf(h{O@URSEp_voI
zRNmU!Dk4J%4h#&qMF|lALfY2Wrnd&T83&&^v9hu<+9+dOS)P>~2Sfk}4pg8hOU-HK
z#Paj=DJC&n(5;=20kWbUslj1ROe2DTRG1UHxw)Z0F|!lxNXP(L(Gl#I$(-2P+1dU5
zy$Ay9m1UxrgM)}(K%fFeS!zx*C-(LAwYs`0!on&%Jw5FfB1E)IudJ*<(G3|C-|x!!
zO%`bWE!D-v#n{*w_JN|(U0q!b4GnHvDqsMHN>Gm_ie0}?Oqjy%mNrdM2=z^{-!PcR
z7!|0uw|8i0=>7ejI2HmT006V_xo(3>4Dn&lUQtmoH#bM~qzD?fv$L}h1-hx{A7gUK
zF?jm=`uh9(v11Z@3#?a|*<&yV2Ah~j5^3P23zwX8&~$*U7<A~-?T3j)ug~|B@{F;p
ztSo%2&CJX+Nf7_|*4EZ8FE34ukS<SR+uPf<wY6kan;0D(#r*mF{H$$(6dA@?a&mHI
zWhGfOA@C|)TwH8ofpi%X`~3WznwlbuCIo&s93LN>SRh@VR>YSnY$MFa7=Bw)WQGJ!
zVh94iuy7eh!>G>Cij2`Pno8Kj*jiB(J1s4(v$HchJ6pZ>A0Ho^o0}&mC+aFHNan<r
zmzNtG8&w?3nDOy({1CLf-N*n9nz<EmTtOp<^z?MRo@ppXQDIIDlRiEKMDgb++TGnf
zI5=<=X*0cBQ9h<cKcn6J;Tz7v!UDFAZU8$UV~qYz*rmjgUCSX6z(RN@CNG-!(QeVV
z-~Rr0+4+VX*|i*!zFCwi9*;vPC7hTCSdcnCveUQ0ggSDB+~V$#n2%$9hlhu`xw+K4
z3399t`NY>jOnLxHL}DJDrPMK(V4kEkfaVo;0xsZ){tr?BDun77v)dA<&=Tr+x;@E|
n6ILLsKv;pW0$~OIPX+!0lziLF+Z;J900000NkvXXu0mjfh8SHT

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_location.png b/Telegram/Resources/icons/settings/premium/promo/business_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..074f4418497c3c2e5280ea90073525db736e812b
GIT binary patch
literal 760
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfhoz;#WBP}
z@M*BE$Erk$wcd*s@@4S}b<A4%ptofMlR9fV+d)q$ohFAv`_C$9#0V9hSi00R`;4RD
zm5W@C?ye%zYh<KER6|NWvcKQ?eerkg3=jP~Pxm$7uRQ;I?&I$^?<=1@`?vq==kv4n
z=JB;BZ@;ZQ^;Cw5RR3{*fB)ytpJ#2IWw9wjXZG1|A3i+z{u?O5>Ce0&ZvFPlFZb-*
zH*em&xVX4wL7LM~Pd%HaKG}0)gpH*oWBmH-(!FixpI28`8_zzwWuC&~i#OhX*A+W`
z=n&Hh2L*xdqbq_tU6`gHKki=h;NnF=JFc3YF?KdKDxdC4Wpy5X6tz~Y)8!uLFHX7E
z4L5Uo-HJ;~UFB;W?Cl=xZwi)J7_8CzCwlc&C5Z;Tx5~d&_wCpr!NbPZ?5H+*p`*36
zb<xf_dn{WghOOppb+VD;*Nu*ib#?jn?OVsia_``kAs;LL{Q4#3*0Cx;Luabj3HEJM
zu9x=;Y)mn#EGsjU;hVT4Z+mq?L4$_n+;cB`wr$(CBI514ciV2i?d|1tv7hLXlb7e0
z-clGD71hMH(XHHo;Q&)3!=Dnj@87>y?UkFgd-v|QZ{KEZ?P5CEu)OC*{1e&fUT;gS
zViyJ+@L3=zkvt(gJNpHnmJ-wIt6g#v(}e5t>g(kzqa!1C?%nJ9cgM>FgAS*vz4MMg
zK3HvTZoV_7?_dJMVvRH3K7KS@tDaF=`Sa&b$&bFvFTZ~MTBM)RY^Kk}j4N-;x?Pld
z>MUg9Vq(su82zl7cQQrjr}}}XMWS3s)nC;%`)N=0x+A-8&CQ&Bd-f!pxX+(n<+U`Z
j{qVu(pVNc>dtcQ5rq6mfAoIczP^$BE^>bP0l+XkK<X=fO

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_location@2x.png b/Telegram/Resources/icons/settings/premium/promo/business_location@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..abc79b9b9d32ec9e9473b977063a25f550a22803
GIT binary patch
literal 1443
zcmV;U1zh@xP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NH4M{{nR9Fe^SXn4;Uliv<nKI7`
z5sA#RBISuPJqRy`P)ejkBqb>!nUdr|C}V^WnKC83@Sv1=Naiu~bbsCbZ{OWH=i|D*
z>*0UD^Ke@Gw|{%Bb=KZ%?Y)nTjP#L4KpKI6ECO<$`d&FXx!~a7q@*NYUtbK|-rjzD
zd;63IiIH`5bh5LvcXoE*0e$xO_sh%6-QC@P$BeeNc5-rZZEbCOdb+Br>hBB@<~Tb$
z*VotI-Q7_?_`=%ST0ud9jg5_<3Ntgaii(Pxn;SZCeSKY1Q&W&E78Hp@k&%%zGc!~R
zgo%lXxVSiiR8>`Vc6M?cU0Pbo%E~e|H6?l-9UYsSo1dPZs1h>EXciV0inYz}P*PGF
zA0MY$Zf|ev>gw$6?ZHIk2_79Cji#EKT5N3W(9qEH^E2hYzP`@R&Q48DQ3SnhZEY?t
zE*LUAJPdqvbd+ybERvIxLv(F!Zf0a;XlZFtD#sy;>*?uXi6ElzhWY^kA5&djZEkK(
zneFZEz~M1PJ{CqsMlfb>ZVqY1VT*H!(lB52dwP0$kPWnp2pt_A?>Hplut`%zMFj%p
z`{m_Dknj$OQKhA&gfKWbcye;WA;TLE!Zw8+Vj15oOC9<s;Qvg7knKp-`T2Q%M5d>w
zA0Hq2I6>sab$kU!X~xbV&T3_4Wp{UXR8*9piNE3yiUp|`PEJnY;o;ui-bO}7_xJax
z2&m~O+1R9uii!js5(ZI5Q7uqX`Q0BDMl!_M*tn~!3rhIU_4RdbZZ5y%l7W9ELfEtV
z`uYqE3}EBo;bC%e65G3?q9Ow3;NXC>M}B_3kB?7SSQw4~{BIUOz7io56O)630}`0l
z)>d6zUDg1mZ)IhL^kOB+%F436V&$(m)ZgDv?8V2&3mQPE;0od3q#(%Qf`9Cgr>7^e
z)X>ntRm!w+eAwID0~5=f6C?>2#)yar*hLXaO-*GSkil-vuHv(^v&_s)5HP=9US2Fy
z!VbB)xj{P)cbAu!)C_X!>gww7@Q}5QlL;aOj;pIHWkQg!L;CvqP>M1`Z6G#zd3iVx
zqh8>gL~-QT>FFt&BpE3#VTXtf_JoOgcz%9P?BSO3%dkkKuC9(I8S)FKl0<}!jSc8w
zuOBGcK|w)CJ)FvM{-;)~tgI9i6wpM8qM%sekFyMEOtQ?v!a}U}pB-=xOzd|W8X7E9
z!c*4U+lvbZ4B)oJn&HS;QZX?x0LRA0E-o(E-cLJ(l268Ce;_eu)ghnB4w#aX!ufQT
zh8@@1+8RhrO%02Sl?A5^+Yl~OWJbvQ`1lxCQtVKyB0D=fauX^mD`Rmg<I=afx(W@;
z%gdaqNI6`A;}DV=OA^bI_<=AS9UZZrEiNvmrKQo*hubQ8!T0d+;Hs99DK0K1V?#qj
z`MtsjmIB5sEG*#qht-F&MpU49pr|M-E5mkRU?64(Sxvg|#;#7j*wD}rg%JoM!I?OJ
ze}8hvMcxV97DQ3_sTm?*78)BHamwNFQF3r$h3kZdKO2OQkdQzS7?zj+?~sGk!!->!
zDigi`a})|Uv04WP28c$yaSA4Tf-w6hYHMp-Qc|+JyBiP?Kxj=(O+-UWOACC$Kaj1h
zErNuEguJ6lY?q&(Ut(h7hpw>WVHgfsT3Q0c%+mi2xbxFxhyP6MkZ+aoZ-n}U*kInV
x(SEB3d}D|i@&Hqbbw+2CPm?0j2>gE|@B`-ozBtF&7qS2V002ovPDHLkV1iV`jywPW

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_location@3x.png b/Telegram/Resources/icons/settings/premium/promo/business_location@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d58a00bc882c2d8a68f641c5bfe3a6c11ba2b94
GIT binary patch
literal 2106
zcmV-A2*vk_P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?q)9|URA>e5npLP3T@=UdPO!TW
z3lt2*0u{Rh#lS$ZK?KDB!FW&*6;U5l#7^vPMSL)^<H7F2?)ttT-}e65cV^C<bLU>~
z2;ZESvu5wrv-X;`*WMX2M8C)bkq06VL>`Dd5P2Z-K;(hH!UH*S<QO<`;I?hs9zJ|{
z>C&Z@D_3^t&>>s4Y=4Dv!IUUdrp$~PGhV)Y`H$=O>eZ_yOO`Zk+B8$9Ou?8NszQYd
zb?)4G`0(MdN)KltX3Lf>KYsjhS>zme{P^+QxpV8*t(#KwYS*s4VZ#Pn#Ely_nlx#W
zQa%ac=gO69=+L2;FJE@5pTP6Yn>VLVpI)t6wYZX6wQ6<v@L^AuA3l7jT)A>w4k<vW
zP@%%?*|T52e(jd`@#DwEix=|(HMMBbqG!*Z>CpjPxNu?o`0-`SmUW2Fk|j%@K7E*V
z;5#1o@89nr4ER{IXwlWHSO5I^(;<Mz+qZ9z9XqyQ!Gf?}x^$@!^5)H(Idf(lzkK=f
zw{PES+y;LA`gP*OiIF2m7AaB${L!OF-@A9uMldi5Y23JRojP^WEPliV0gVwEQVAiq
zyn_c1cI?>EP7Dsi#DSdIwQJW+n>Ky^{MpUNXXMJ2D+2}$$eJ~)VMQ1VISr!GRu{hS
z-@jk5U_q5CRiw878<RJnaRK@A<?Gk4-@bkOzJLEN6+MCD$B(yf-#%l;jG_gYGG&U8
z6IrM>trO;rfBEvoup<D*j2VM+PNbygxP~PmW++^^@Q4v3h(n@Lx&jdGEY$k->kHEc
z($cVs6)Q?GDccs~h7&hTw0s7S9z7}%{;51ghQ;}GX3w5oN{|BtrxkGj{{3_3&WYQd
zJ9h-95{P41D!GS99vK#*^8<;F-dG^Fg-8^=u@IdfNc3Ov#;By{&6`J=%g)Wm3W}1w
zd-qbT_~0ZuMM<WzfDgYvS%As|h9ydr@Mr6oEnmL;+O=!r){3bv{vBdd{^)*7IdkTu
z)WYCAdGb7Y@&p7Mhw7wv@7}p{=k^yBzG2c2d;0e6OM9bv^X7Ib2LiFWef#!Rt5%&q
zf8O9zk&7@0kPe}UT5ReD4<5{hQep22u)5Z-Ur$}0h$Z1CkNo-b@7%eQepbnnCH*yK
zd)BjOPZ|eZx^(f!WH#hbEMC0$v17*^+hOW`w&yegh&K>w)~wmKZQB9`3K(Npc$+tG
zrddD(Ca!rg5&mc>((pQS=8PS6XzaN+r#mog*f0`_kO|8kJ$l5{JMP3EHEh|kWm1%O
z2${oQA3CQ;jvTQ`JiXx0<oE2KGmQSJ`U12-TDEMNh(f%&Lx&E@wq3h+#i9x=dCZ(S
zQ@xrA6DAxua3Ge7_Bbx+-n~2d(+sw2*RFBn#x{cBa17()ONZPjLD!mkN(#jV-n@B(
zBZNkSRj>_&V;K2buWSDN`E=)PoeWGjGFG*<ZrwWC%mxisc5hRB!ZEB)ojTHB>(;G;
z1x%YZ?cKX~j~+eZkf3VSsv0){i<3gc!1QxVmoDu<;4vJ-^ev|IMG|+Y)va5%$&)9W
z25^lUH8yVC=s@7{`t|D?6gQ0kgku<q+bF@onyrn2>G<1&*yfH&n^4?rs&EX`3Mp2s
zn5~V0HESNpgq$Hd(5Of>;=niK;TZPd!2=_n-G|%X3l}bY{`|T0=EFdnU5^H^kD$cO
z#tElZynFYql%P}Z_|86k`jq;R<0X!-I0~cA60!jG_rHGq3ckh@1^!UwLD`||fx;?L
zZIbZHl`ALm-Me=u4JZ2#Clt?~JxeM#iqPuN30N}KVn0xPXp*Z6f^8ri!|=C0M4X0l
zx@YU;590-*)Zp+z+p%MZCw^KQ#+FesR9I-l0dQumk%<#0CVuqF(IKH|Xz`9`N)+dq
zK!R(G!jI@u+yihvMD^gmjmOy{88m26OeL%d?s?q0bxTy-m#`*N0>(A0Ql&~nxg@y(
z4qdsl!?xEgwqCt@!hiANg*)%NN$j(~J$v@J5fUBoF^s)Bn{%?Ql=A_&oUvlX3SO)u
zM2RI)ty#0iU#;rZt4kb*x^}_oPv|l0X&CE)<?Fs?M4P2ouU_=esJ>%e5a0rWT{KX?
zQtZk$t|53R@!t?R<J75B!i;-v9E;EIal%8q;9IIxDGu|mUcIV81MrEYe`aqVc%O7B
zPM$pJz~u4b#fx@+=agMI+>Rl(J#}JtBQ$!ZaT}(dOp*<9*+LxM0L2cM#5^xQ7%pr&
zsEPP$*|bxqPL&LTlXa+BF3-6aWdHvCg+PjL(V~UOg9B{8J@4coi5pzXy#4~XrPHQO
z8}QBL3hLTs&6<gX;@$2*af^ywre=weZ{NPjFp{mNQVR?jGUU^zPht&l`t<3B4I2jF
z%jcL2dXTddt5vI(I5cY1$kv{WM{|zZ)~#FH%asDk4tS9V2iRXsnly>Jd)BO34H`6X
zB)0&3NlWY|?aeQ%)b<^1dXl?+r;pvV+NJ>{rYi{{YDe9uQKM|zY?zEi7a(1gOIu+i
zNmih35-?3~wlHZcC<Ja)B&wUpfpg}}32<XJ+4ZszjEEtU^D+8rWJ|8fUAuNI239m2
kc_8vY<blWo|9cPo3r3E7^mO7>ZvX%Q07*qoM6N<$f<OcWp8x;=

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_quickreply.png b/Telegram/Resources/icons/settings/premium/promo/business_quickreply.png
new file mode 100644
index 0000000000000000000000000000000000000000..91282589dbbe6ce22660b5539bd9b2898557c1c3
GIT binary patch
literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfhp3{#WBP}
z@M*~2{EdMk-_N=T_x_M@X}PjUF>d0o4p${X-&L8Ht|*l;v$1tc=<W)2%2g6P^1SJ0
zno)>UcgHfX$I3!3k8E{o3vB<g-}|n2-gf_e%l*&iRG;6;a>#yn$Ntb|7c=tm^S@Tv
z&Og8WV#fRT@6V=f4$*r0`RCWFTB%lLm5Cnn=FQ__bKV=b{%Y3Uyz;G4g*#*B`lWA-
za9cd__FFx%?&VSL9XE64`7PfW<EJAgFL<AA@<|@H<^|GRt$sIc7lo~U{<%^?;D&RB
z_2P>hd2;>i{VD<)B3`SncDXHHZnDHvZ8Cr1?6ccq^d1WE9lZPR-#@um_SV+U7Fttp
zz5hP>q{^bul_5f%ERX)ArWr}zDQVcXV@E}GweuE*l^-j3N*6@w>+AEiGdsH~U7X)s
zT3&80!?*dS&NT7<<F|9noE8dj-^^ueKKS*kY1_Vi`<m{*+_h`htzQ>jmL!OB9lfTK
zI8lM+Y}3r3l_HmpO$%DtBHVNQaj#qQYi7xVY*L~?z4PYJ4_+zKRd;*(^yvZNI%3K~
z-+AAZSXJ-6r?{!xbf!=D(MMa-c5LnM=XYs!Q95{}<#6I1dEo@LRadp9G+!_%JTd=o
z-T&v$pa1-6`DmvxD-+|DH=logcqxD7Y0<$c5o@o>GrZ^i`{~1nhT}Df1re=IiDt7M
z%@yq2Lk|dSyqU9tk89)Yw{h#mtE7G<7|lE&o4GY=rVrcs4zHzI+i!PV_$SujvHWt;
zPMLWfvu8{5wSWHcgJUie^U<V@+ujH6jCogL)p6vS&8d!q2?so#*@4MLf+Iub&W!)O
Zf4Em1W6E#}cParTHcwYSmvv4FO#ovjJn#Sj

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_quickreply@2x.png b/Telegram/Resources/icons/settings/premium/promo/business_quickreply@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..90662ccf99b371b398f4c69a48264dafe17303af
GIT binary patch
literal 1423
zcmV;A1#tR_P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG`AI}UR9Fe^SXn52T@*L}&0~f#
z4~Zutg$Efzq)<wE@J5O#Lx>C|ijXNol6djp1sNjBkW$7nln9xJ49PtFzhBnZ={omJ
z_ujsTukLv`?Y)NIUVELj*Iw&rXs92x2h<+;Z#|%?9K5!+c3@y&WMrhPtE-)zovp2{
zv9a;h)z!tt#pUJY^78V;#Kh_8sdC_oX$1uZ4Gaw2-roKddp0&UN=r-4&CL~BKmiX0
z2M3pzmq$fKF$=uCz3uGmz$I|Z)6<iUjSXDo?Ck91<iyB4JUlctH8nOi-rwIdL{$g6
zy1D>mJOb#pwzjyqI3pt?PG}DgkF2b$nVA_z<?QS%BqW4WSYaY|ytK4L(D+hiWo2e&
zW)e{lXJcbyr2F~#SzKJKsj0v>;aCOEM{E)z;?&yOnnOs8l#q~ccXvl1&CShX;{1Fo
zD=UNufWE)KOG-*q*_?}u%gV|M*;G_i#J?s#M@vg<etw=H3JMDN1*LK<EiJdUwg@mO
zDM_jtBbSzzM#>Eh4GdAmfrEp?@$oTW5#uH%CJLZgSXf+NUqf?qb5lo0M~Y@`ZEZ(K
zhpDNluyAZ_EbSBW!jiwZRaI4_78)A*i@`HNu#^1a;-aWcLqkIlet&;Q(&E9BBk%9;
zLuY(^T#my_=<Mv2Xp^_MH%Vq@X7a+xGW`AhNg*{gRhBM1#v$nG>5*vD+S(c<=jP^w
zG5_UOR#rm#_4QTM`7Ai;HsR!BiLb9O1S<=KW7^l(2Wf1AgC|CkXj52N7?!}}>+8#c
z<Tyb%oDe!WIbn&?6uCPlCI;mPCl^E{Krb&Z6a{!DCnr&&JU%|Mgc)#0N5}Q`brzRB
z-QC@V?d|RDY{t)=a`(^nB)xEd$>SIp7?5&CMh1(k#hPRK^74W=bmUo}%+AgNi<8Ak
zBs3Pw(9n=5&(F^+7RQwC=c%bF4&Dz*Pfza;|AQ1fGBQFA02Bn}aS%Er5FQ>b&t+4(
zySpL1x3|Y;NSMP`%6mZIvj#Bn@$qDkr>CblDszh=HpQi7BqUk`jjpaP7=%I(rJoD{
z&k&U;G6WPj<B>;6L%KD%9B*!JfZyBO%ZJ9MBZora@bFMyU!Tq6nGX&QLIsb&mm<~V
z<Ybb>Mau&wM@~#kB%Q*-LOCV}fw^2ot-<*^IywUQ!NGx~@5QV}PD0P%?(WVI1qOL}
zc@-5EoM%c_tEQ%gwu-t|mM%UH2naw~4rOFQMSCkg^punoRKvhTdCn&zM9<F7rrn^S
zkseHZh|$r}sDS{8auJ;jpO^@}zrUYs!qF2E6=dh;=8`oy>OMX`g0g~4Dsi^Aw*{qy
zn7E9Ghlgobh)9VgC^sT%3AD+;YH4ZVmJp=kKLipWIR+r8XVB3KYKSpWX3)-%>1Abc
z$WhNDt)-`@!~ZC<sAa<~h9x5+BC4yaS65dleu41u@zL7as(KV^jE;^14o*TACWDY<
z5$Q}DO6KB?%#K@~nKA>If{*Uz<|exzCC5Oa3j`eq?C|sRtFNy=KR;&{Ly^UdSpyh{
zgPoI;qr_?AZT;)&>hkmRu^Y5@=vNpgfr6S4enQ8CUsW&^2M}E;z6kxW!mk;0sGMbx
zlD;9e>FH_KzVSB*7Z(1)AlOxc7F6b_sYxClvbVQKMTbm{9ixR^SXjXC7(p~OQ|$q@
d2mS{h_y@$0xm^s3{&4^R002ovPDHLkV1jIcenS8N

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/promo/business_quickreply@3x.png b/Telegram/Resources/icons/settings/premium/promo/business_quickreply@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebe964f298339c32bbe84e1708cd6b93b8df77b8
GIT binary patch
literal 2094
zcmV+}2+{Y6P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?m`OxIRA>e5nptd4TNHp>Ma@x4
z%}UMnfS89ELPAO+5=DrJCQUpD)kdU}@?s3)fkY&x#1IjQn286WstG9~X;DQqTJt<l
z_kP!5-QDw_bN+pXpL>(j2lm-}&3o;&)?WLMiwplk3xpO3Ef88Dv_NQq|C|NlV<b_0
ze0;xt{rdOs-=#~J&Ye3aB_%a#)Tmy)dhg%AfBW|B)2B}>Dk^T@zFkyQbo1uT7|9SM
z*=Eg}O`kq}*REZU9zFU?@9)l?JDWFeo;Y!0!-frm6eTEH0|yQ~di3bGZ{PIPv4Hyc
z@#D^&JK5o&MDj~#(4axbj~};?RGIqz{ri(APs+>7pFe-DOj``Ue*MaZckSBMuULNY
z+qZ9Tr_#N9_qJ@=GG)q?zJ2?)Zr!?e?b^bqZr!>d4j3?C)~s2(ckh1u_;I9usJDIl
z_9ji52-fc#Oqei%7+{i#c(7>Eq8>eZ=*vNvA;v6UzC2PxcDPTUKKi8mLM9|6tX#Pg
z?^3lQxXqqDn<dZG8#HK;o16Ra;X{?|hYugJv$H+Zbb(0JK7018%A3Q3Q~6OzWnaI3
z{k*(9^if&t*s-Hlty(Hrz~ee~>YP4(T4j0u{P}k6+6BxeE)Ea8b?cVOh?EdGm!AYV
z44idghAXaGwMvZ&!7^^#xbePy`-B~XrAwCv%i<@sb?ertZ05|F6B9NyiLPC{R%JSO
z?%bN|zQ1P7n4vOQym+y1l3E0C6SB6j{_^Dum6{f&4iEw3!Gi}veZz(gI#@x$;O*2j
z!u`U93uqe*@ilAK2;EbsPI;zFWJ^m+BLcY<i%dXH6B)=WZYfy6ck9;e)2B}cQ3jri
z9rVH2&?ze`>)5fQ1t-TT>H$%#y1F`mqU6w_Lqc)IiWQFBofd}<9V&G0-o5KVx1c2X
zN6HQzI!M8O|Nebk!bx_=wdT#6zj*P&k8Y`{sgk&<zo<DK89FXf!igyP`T35p(HDmg
zAO7ae8zJan-}da;Bj{77PL0me4&v(7t3rr#ZwID7?^Cx)lO~Bgd-v|u=UW4k>xNLd
zbm>x!H6I^-bi@6`pQ%wj7Le?<C`MuGLl-luAKkd8iB#$7>1NWuzMV>D746))bH7jm
z_`k5Qknl}c$Dl=2;KraCCn>u{f?mCP$=JnU|Ni}kZK!uCK3rhxfqL6Fnk%wn1qB6m
ztp2^RM?xegCmWNvwOBV2%$RA@rcF*xj-c3qndUM7*s)`cTEy75kt0WvS4?2)r@HEv
z-A_6M48u0WWtFt$m=2*B($C<`nKPF3Ws+Pf^r??!-ZXGJV^Y-NiYBzkPr9O!lOAU9
zG-s^OpFazLNGLNha8gX%4>uD8yTOtrOWwVEXSb?9fAZu>XJEBTB;7j$Tdy8Fc1$*%
z7OypsGD}vWo9pV2I-O3NaKZVTHf^eqv=~y93q02j3y2?6PQiorx}dRX^g89!a)8IW
z+O%oYrjeAS3v~JN<#FT2y?pu7lDJH&y*=9FGH)6<x#Eo*Hw0SEX)@_&fL0WKZnc6V
z9a!O8T3RY&7lYotd&{QNS8;(E4HT{1dZ3WJcI}!W6%^F-CIDIk>4Cj|{W>u*Q41#;
zkRPq^L$NjGOEgyY>uOUVBO}8eP<O?TR`5`-QNFryg9i^53(@V+72gIfGc(h(2SSpr
zj&we_{&ESn;iEB4--dSv(QW+r@ft|hAZ^>W<poSg=|pxDp#=*T2s)|AwCeg3GYh%v
z*RM+)b4!S4G@;``tCW-!GJ!#XyaF}10$9Lbym(P$nm>QO1%$>Fn@@)vSHz{GX5mPB
zyatL4WWPuNFEeU`iBfIUs8L?1{J`<H;k;{$R_t5LmMuLCU`ABCD9@ff^W0rD)7AK<
z9FfK*>T%LEkhDR#XkNK;Ma)Kiqn)OW?H!QEPPMVcr6&0I9p1sJs;We{g9i_Kmsbyy
zOD7#0;aE~q!rPJ_s!J%f&&=DoOKcb5L>lt1n)Il5TeWKCf`ltjo@B*-Sy@@GaP@(S
z4Ma|1#DKnUY)>^kO5qoHy^rRcTb>7Ay?P~F7?AWjb?T&V7uS&7!zD%PbU|D(Apfpj
zy;_YEhHjfSZSvKl*AZg!<jG>ljT<-Gp^O<bX4|%HJmhxo-re~njT<+$D0OXdaj`so
z2n+5L6g_raqRzW`8a#632tVaAC=MGojJA}CI#yr5e*MguGi9E>9gf6nD7SC2ANOk-
zW`Gd}_?Kg2*>T`Wg~-I~Gr#!|Qn4CP!b*(d<<7*0A7}6ugN?=B-UeunY0%k3KZc+D
z6h~xL`}nk0IPPk;5itD$TSORKxNu>BwUU-A(s-(@tmMa(SdM+;#z}972H@z?qt(`m
zVORET*|KH$9_MGskRd&L_O!fu17`dX^Tdf0H17F<W(>E*j`X~F^K{IQ&Re%`jZCB1
zg-annwiz*E1SJx-XwjmD9k1Uyf8f9YXT`8LDn;(zZ<VqpGpD|yK&pK>nPfm(!;5(H
zK79Bv0Z?7~<72HeM$jXB65>gqJa$mFaXjd68a=E(u0tq5Xo1iIp#?$<gcb-b@PDzu
Y-wpxLIE_0U1ONa407*qoM6N<$f+%+L=Kufz

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/api/api_chat_links.cpp b/Telegram/SourceFiles/api/api_chat_links.cpp
index f8a3f1979..aa5be9f55 100644
--- a/Telegram/SourceFiles/api/api_chat_links.cpp
+++ b/Telegram/SourceFiles/api/api_chat_links.cpp
@@ -55,7 +55,6 @@ namespace {
 ChatLinks::ChatLinks(not_null<ApiWrap*> api) : _api(api) {
 }
 
-
 void ChatLinks::create(
 		const QString &title,
 		const TextWithEntities &message,
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index bb71e2e63..67e402da5 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -1210,11 +1210,13 @@ void DecorateListPromoBox(
 		box->closeBox();
 	});
 
-	Data::AmPremiumValue(
-		session
-	) | rpl::skip(1) | rpl::start_with_next([=] {
-		box->closeBox();
-	}, box->lifetime());
+	if (!descriptor.hideSubscriptionButton) {
+		Data::AmPremiumValue(
+			session
+		) | rpl::skip(1) | rpl::start_with_next([=] {
+			box->closeBox();
+		}, box->lifetime());
+	}
 
 	if (const auto &hidden = descriptor.hiddenCallback) {
 		box->boxClosing() | rpl::start_with_next(hidden, box->lifetime());
@@ -1274,11 +1276,10 @@ void Show(
 		}));
 		return;
 	} else if (descriptor.section == PremiumFeature::Business) {
-		const auto window = show->resolveWindow(
-			ChatHelpers::WindowUsage::PremiumPromo);
-		if (window) {
-			Settings::ShowBusiness(window);
-		}
+		show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+			TelegramBusinessPreviewBox(box, &show->session());
+			DecorateListPromoBox(box, show, descriptor);
+		}));
 		return;
 	}
 	auto &list = Preloads();
@@ -1576,6 +1577,75 @@ void UpgradedStoriesPreviewBox(
 		tr::lng_premium_stories_about_mobile());
 }
 
+void TelegramBusinessPreviewBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session) {
+	using namespace Ui::Text;
+
+	box->setTitle(tr::lng_business_title());
+
+	auto entries = std::vector<Ui::Premium::ListEntry>();
+	const auto push = [&](
+			tr::phrase<> title,
+			tr::phrase<> description,
+			const style::icon &icon) {
+		entries.push_back({
+			.title = title(),
+			.about = description(WithEntities),
+			.icon = &icon,
+		});
+	};
+	for (const auto feature : Settings::BusinessFeaturesOrder(session)) {
+		switch (feature) {
+		case PremiumFeature::GreetingMessage: push(
+			tr::lng_business_subtitle_greeting_messages,
+			tr::lng_business_about_greeting_messages,
+			st::settingsBusinessPromoGreeting);
+			break;
+		case PremiumFeature::AwayMessage: push(
+			tr::lng_business_subtitle_away_messages,
+			tr::lng_business_about_away_messages,
+			st::settingsBusinessPromoAway);
+			break;
+		case PremiumFeature::QuickReplies: push(
+			tr::lng_business_subtitle_quick_replies,
+			tr::lng_business_about_quick_replies,
+			st::settingsBusinessPromoReplies);
+			break;
+		case PremiumFeature::BusinessHours: push(
+			tr::lng_business_subtitle_opening_hours,
+			tr::lng_business_about_opening_hours,
+			st::settingsBusinessPromoHours);
+			break;
+		case PremiumFeature::BusinessLocation: push(
+			tr::lng_business_subtitle_location,
+			tr::lng_business_about_location,
+			st::settingsBusinessPromoLocation);
+			break;
+		case PremiumFeature::BusinessBots: push(
+			tr::lng_business_subtitle_chatbots,
+			tr::lng_business_about_chatbots,
+			st::settingsBusinessPromoChatbots);
+			break;
+		case PremiumFeature::ChatIntro: push(
+			tr::lng_business_subtitle_chat_intro,
+			tr::lng_business_about_chat_intro,
+			st::settingsBusinessPromoChatIntro);
+			break;
+		case PremiumFeature::ChatLinks: push(
+			tr::lng_business_subtitle_chat_links,
+			tr::lng_business_about_chat_links,
+			st::settingsBusinessPromoChatLinks);
+			break;
+		}
+	}
+
+	Ui::Premium::ShowListBox(
+		box,
+		st::defaultPremiumLimits,
+		std::move(entries));
+}
+
 object_ptr<Ui::GradientButton> CreateUnlockButton(
 		QWidget *parent,
 		rpl::producer<QString> text) {
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.h b/Telegram/SourceFiles/boxes/premium_preview_box.h
index 8e1dc503b..63b1bd1be 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.h
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.h
@@ -45,6 +45,10 @@ void UpgradedStoriesPreviewBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session);
 
+void TelegramBusinessPreviewBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Main::Session*> session);
+
 enum class PremiumFeature {
 	// Premium features.
 	Stories,
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index e06c9956f..9c1c98d22 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -113,6 +113,15 @@ settingsBusinessIconChatbots: icon {{ "settings/premium/business/business_chatbo
 settingsBusinessIconChatIntro: icon {{ "settings/premium/business/business_intro", settingsIconFg }};
 settingsBusinessIconChatLinks: icon {{ "settings/premium/business/business_links", settingsIconFg }};
 
+settingsBusinessPromoLocation: icon {{ "settings/premium/promo/business_location", premiumButtonBg1 }};
+settingsBusinessPromoHours: icon {{ "settings/premium/promo/business_hours", premiumButtonBg1 }};
+settingsBusinessPromoReplies: icon {{ "settings/premium/promo/business_quickreply", premiumButtonBg1 }};
+settingsBusinessPromoGreeting: icon {{ "settings/premium/promo/business_greeting", premiumButtonBg1 }};
+settingsBusinessPromoAway: icon {{ "settings/premium/promo/business_away", premiumButtonBg1 }};
+settingsBusinessPromoChatbots: icon {{ "settings/premium/promo/business_chatbot", premiumButtonBg1 }};
+settingsBusinessPromoChatIntro: icon {{ "settings/premium/promo/business_intro", premiumButtonBg1 }};
+settingsBusinessPromoChatLinks: icon {{ "settings/premium/promo/business_chatlink", premiumButtonBg1 }};
+
 settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(semiboldTextStyle) {
 		font: font(10px semibold);

From b0565f218821d272b54b2213d5382454c25d4e22 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Mar 2024 21:21:51 +0300
Subject: [PATCH 141/596] Moved files for boosts to nested folder.

---
 Telegram/CMakeLists.txt                          | 16 ++++++++--------
 Telegram/SourceFiles/boxes/gift_premium_box.cpp  |  2 +-
 .../boxes/peers/edit_peer_color_box.cpp          |  2 +-
 .../boxes/peers/edit_peer_info_box.cpp           |  2 +-
 .../boosts/create_giveaway_box.cpp               | 12 ++++++------
 .../boosts/create_giveaway_box.h                 |  0
 .../boosts/giveaway/boost_badge.cpp              |  2 +-
 .../boosts/giveaway/boost_badge.h                |  0
 .../boosts/giveaway/giveaway.style               |  0
 .../giveaway/giveaway_list_controllers.cpp       |  2 +-
 .../boosts/giveaway/giveaway_list_controllers.h  |  0
 .../boosts/giveaway/giveaway_type_row.cpp        |  2 +-
 .../boosts/giveaway/giveaway_type_row.h          |  0
 .../boosts/giveaway/select_countries_box.cpp     |  2 +-
 .../boosts/giveaway/select_countries_box.h       |  0
 .../boosts/info_boosts_inner_widget.cpp          | 10 +++++-----
 .../boosts/info_boosts_inner_widget.h            |  0
 .../boosts/info_boosts_widget.cpp                |  4 ++--
 .../boosts/info_boosts_widget.h                  |  1 -
 .../info_statistics_list_controllers.cpp         |  2 +-
 Telegram/SourceFiles/window/window_peer_menu.cpp |  2 +-
 Telegram/cmake/td_ui.cmake                       | 14 +++++++-------
 22 files changed, 37 insertions(+), 38 deletions(-)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/create_giveaway_box.cpp (98%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/create_giveaway_box.h (100%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/giveaway/boost_badge.cpp (98%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/giveaway/boost_badge.h (100%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/giveaway/giveaway.style (100%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/giveaway/giveaway_list_controllers.cpp (99%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/giveaway/giveaway_list_controllers.h (100%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/giveaway/giveaway_type_row.cpp (98%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/giveaway/giveaway_type_row.h (100%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/giveaway/select_countries_box.cpp (98%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/giveaway/select_countries_box.h (100%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/info_boosts_inner_widget.cpp (97%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/info_boosts_inner_widget.h (100%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/info_boosts_widget.cpp (95%)
 rename Telegram/SourceFiles/info/{ => channel_statistics}/boosts/info_boosts_widget.h (97%)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 9f0a2493b..b968e4cab 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -861,14 +861,14 @@ PRIVATE
     history/history_view_highlight_manager.h
     history/history_widget.cpp
     history/history_widget.h
-    info/boosts/giveaway/giveaway_list_controllers.cpp
-    info/boosts/giveaway/giveaway_list_controllers.h
-    info/boosts/create_giveaway_box.cpp
-    info/boosts/create_giveaway_box.h
-    info/boosts/info_boosts_inner_widget.cpp
-    info/boosts/info_boosts_inner_widget.h
-    info/boosts/info_boosts_widget.cpp
-    info/boosts/info_boosts_widget.h
+    info/channel_statistics/boosts/create_giveaway_box.cpp
+    info/channel_statistics/boosts/create_giveaway_box.h
+    info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
+    info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h
+    info/channel_statistics/boosts/info_boosts_inner_widget.cpp
+    info/channel_statistics/boosts/info_boosts_inner_widget.h
+    info/channel_statistics/boosts/info_boosts_widget.cpp
+    info/channel_statistics/boosts/info_boosts_widget.h
     info/common_groups/info_common_groups_inner_widget.cpp
     info/common_groups/info_common_groups_inner_widget.h
     info/common_groups/info_common_groups_widget.cpp
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 19907b080..1cac5db25 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -26,7 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_subscription_option.h"
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
-#include "info/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "mainwidget.h"
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index c0d26766a..50470657a 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -30,7 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "info/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/boosts/info_boosts_widget.h"
 #include "info/profile/info_profile_emoji_status_panel.h"
 #include "info/info_memento.h"
 #include "iv/iv_data.h"
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 674d5b074..d6b982c45 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -39,7 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_premium_limits.h"
 #include "data/data_user.h"
 #include "history/admin_log/history_admin_log_section.h"
-#include "info/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/boosts/info_boosts_widget.h"
 #include "info/profile/info_profile_values.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
diff --git a/Telegram/SourceFiles/info/boosts/create_giveaway_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
similarity index 98%
rename from Telegram/SourceFiles/info/boosts/create_giveaway_box.cpp
rename to Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
index 01462aa3b..4734718b9 100644
--- a/Telegram/SourceFiles/info/boosts/create_giveaway_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
@@ -5,18 +5,18 @@ 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 "info/boosts/create_giveaway_box.h"
+#include "info/channel_statistics/boosts/create_giveaway_box.h"
 
 #include "api/api_premium.h"
 #include "base/call_delayed.h"
 #include "base/unixtime.h"
 #include "countries/countries_instance.h"
 #include "data/data_peer.h"
-#include "info/boosts/giveaway/boost_badge.h"
-#include "info/boosts/giveaway/giveaway_list_controllers.h"
-#include "info/boosts/giveaway/giveaway_type_row.h"
-#include "info/boosts/giveaway/select_countries_box.h"
-#include "info/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h"
+#include "info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h"
+#include "info/channel_statistics/boosts/giveaway/giveaway_type_row.h"
+#include "info/channel_statistics/boosts/giveaway/select_countries_box.h"
+#include "info/channel_statistics/boosts/info_boosts_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
diff --git a/Telegram/SourceFiles/info/boosts/create_giveaway_box.h b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.h
similarity index 100%
rename from Telegram/SourceFiles/info/boosts/create_giveaway_box.h
rename to Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.h
diff --git a/Telegram/SourceFiles/info/boosts/giveaway/boost_badge.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp
similarity index 98%
rename from Telegram/SourceFiles/info/boosts/giveaway/boost_badge.cpp
rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp
index f6cc1f548..feb6d395e 100644
--- a/Telegram/SourceFiles/info/boosts/giveaway/boost_badge.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.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 "info/boosts/giveaway/boost_badge.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h"
 
 #include "ui/effects/radial_animation.h"
 #include "ui/painter.h"
diff --git a/Telegram/SourceFiles/info/boosts/giveaway/boost_badge.h b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.h
similarity index 100%
rename from Telegram/SourceFiles/info/boosts/giveaway/boost_badge.h
rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.h
diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway.style b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
similarity index 100%
rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway.style
rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
similarity index 99%
rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.cpp
rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
index 4b5c7ac60..22c3680bd 100644
--- a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.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 "info/boosts/giveaway/giveaway_list_controllers.h"
+#include "info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h"
 
 #include "apiwrap.h"
 #include "data/data_channel.h"
diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.h b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h
similarity index 100%
rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway_list_controllers.h
rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h
diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp
similarity index 98%
rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.cpp
rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp
index c66a636ab..2cfed79a6 100644
--- a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.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 "info/boosts/giveaway/giveaway_type_row.h"
+#include "info/channel_statistics/boosts/giveaway/giveaway_type_row.h"
 
 #include "lang/lang_keys.h"
 #include "ui/painter.h"
diff --git a/Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.h b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.h
similarity index 100%
rename from Telegram/SourceFiles/info/boosts/giveaway/giveaway_type_row.h
rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.h
diff --git a/Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
similarity index 98%
rename from Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.cpp
rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
index 2a296930a..1faa9289d 100644
--- a/Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.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 "info/boosts/giveaway/select_countries_box.h"
+#include "info/channel_statistics/boosts/giveaway/select_countries_box.h"
 
 #include "countries/countries_instance.h"
 #include "lang/lang_keys.h"
diff --git a/Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.h b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.h
similarity index 100%
rename from Telegram/SourceFiles/info/boosts/giveaway/select_countries_box.h
rename to Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.h
diff --git a/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
similarity index 97%
rename from Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp
rename to Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
index eb0805c49..15c72c5f2 100644
--- a/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.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 "info/boosts/info_boosts_inner_widget.h"
+#include "info/channel_statistics/boosts/info_boosts_inner_widget.h"
 
 #include "api/api_premium.h"
 #include "api/api_statistics.h"
@@ -14,10 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
-#include "info/boosts/create_giveaway_box.h"
-#include "info/boosts/giveaway/boost_badge.h"
-#include "info/boosts/giveaway/giveaway_type_row.h"
-#include "info/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/boosts/create_giveaway_box.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h"
+#include "info/channel_statistics/boosts/giveaway/giveaway_type_row.h"
+#include "info/channel_statistics/boosts/info_boosts_widget.h"
 #include "info/info_controller.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/statistics/info_statistics_inner_widget.h" // FillLoading.
diff --git a/Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.h b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.h
similarity index 100%
rename from Telegram/SourceFiles/info/boosts/info_boosts_inner_widget.h
rename to Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.h
diff --git a/Telegram/SourceFiles/info/boosts/info_boosts_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
similarity index 95%
rename from Telegram/SourceFiles/info/boosts/info_boosts_widget.cpp
rename to Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
index b1db67544..e8a94e1a9 100644
--- a/Telegram/SourceFiles/info/boosts/info_boosts_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
@@ -5,9 +5,9 @@ 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 "info/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/boosts/info_boosts_widget.h"
 
-#include "info/boosts/info_boosts_inner_widget.h"
+#include "info/channel_statistics/boosts/info_boosts_inner_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
diff --git a/Telegram/SourceFiles/info/boosts/info_boosts_widget.h b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.h
similarity index 97%
rename from Telegram/SourceFiles/info/boosts/info_boosts_widget.h
rename to Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.h
index d67648267..6da483431 100644
--- a/Telegram/SourceFiles/info/boosts/info_boosts_widget.h
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.h
@@ -47,7 +47,6 @@ public:
 	void showFinished() override;
 
 	[[nodiscard]] not_null<PeerData*> peer() const;
-	[[nodiscard]] FullMsgId contextId() const;
 
 	void setInternalState(
 		const QRect &geometry,
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 1a975b788..1ed6d7884 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_stories.h"
 #include "data/data_user.h"
 #include "history/history_item.h"
-#include "info/boosts/giveaway/boost_badge.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/effects/outline_segments.h" // Ui::UnreadStoryOutlineGradient.
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index bd32747ce..d3920c5a5 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -63,7 +63,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "support/support_helper.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
-#include "info/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/boosts/info_boosts_widget.h"
 #include "info/profile/info_profile_values.h"
 #include "info/statistics/info_statistics_widget.h"
 #include "info/stories/info_stories_widget.h"
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index c2bb319bf..b77a7f1b7 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -23,7 +23,7 @@ set(style_files
     calls/calls.style
     export/view/export.style
     info/info.style
-    info/boosts/giveaway/giveaway.style
+    info/channel_statistics/boosts/giveaway/giveaway.style
     info/userpic/info_userpic_builder.style
     intro/intro.style
     iv/iv.style
@@ -122,12 +122,12 @@ PRIVATE
     info/userpic/info_userpic_emoji_builder_layer.cpp
     info/userpic/info_userpic_emoji_builder_layer.h
 
-    info/boosts/giveaway/boost_badge.cpp
-    info/boosts/giveaway/boost_badge.h
-    info/boosts/giveaway/giveaway_type_row.cpp
-    info/boosts/giveaway/giveaway_type_row.h
-    info/boosts/giveaway/select_countries_box.cpp
-    info/boosts/giveaway/select_countries_box.h
+    info/channel_statistics/boosts/giveaway/boost_badge.cpp
+    info/channel_statistics/boosts/giveaway/boost_badge.h
+    info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp
+    info/channel_statistics/boosts/giveaway/giveaway_type_row.h
+    info/channel_statistics/boosts/giveaway/select_countries_box.cpp
+    info/channel_statistics/boosts/giveaway/select_countries_box.h
 
     intro/intro_code_input.cpp
     intro/intro_code_input.h

From 9941a46769a2e8af7441bc548dcd9565481707c8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Mar 2024 23:51:11 +0300
Subject: [PATCH 142/596] Added some phrases for channel earn info section.

---
 Telegram/Resources/langs/lang.strings | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 16aec31bc..0f5cf869f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4951,6 +4951,37 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_boosts_prepaid_giveaway_status#one" = "{count} subscription {duration}";
 "lng_boosts_prepaid_giveaway_status#other" = "{count} subscriptions {duration}";
 
+"lng_channel_earn_title" = "Monetization";
+"lng_channel_earn_about" = "Telegram shares 50% of the revenue from ads displayed in your channel. {link}";
+"lng_channel_earn_about_link" = "Learn more {emoji}";
+"lng_channel_earn_overview_title" = "Proceeds overview";
+"lng_channel_earn_available" = "Balance available to withdraw";
+"lng_channel_earn_reward" = "Proceeds since last withdrawal";
+"lng_channel_earn_total" = "Total lifetime proceeds";
+"lng_channel_earn_balance_title" = "Available balance";
+"lng_channel_earn_balance_placeholder" = "Enter your TON address";
+"lng_channel_earn_balance_button" = "Withdraw";
+"lng_channel_earn_balance_about" = "By the end of May, you will be able to collect your reward using Fragment, a third-party platform used by the advertiser to pay for the ad. {link}";
+"lng_channel_earn_history_title" = "Transaction history";
+"lng_channel_earn_history_in" = "Proceeds from ads";
+"lng_channel_earn_history_in_about" = "Proceeds from ads displayed in";
+"lng_channel_earn_history_out" = "Balance withdrawal to";
+"lng_channel_earn_off" = "Switch Off Ads";
+"lng_channel_earn_off_about" = "You will not be eligible for any rewards if you switch off ads.";
+"lng_channel_earn_cpm_min" = "No Ads";
+"lng_channel_earn_cpm#one" = "{count} CPM";
+"lng_channel_earn_cpm#other" = "{count} CPM";
+"lng_channel_earn_learn_title" = "Earn From Your Channel";
+"lng_channel_earn_learn_in_subtitle" = "Telegram Ads";
+"lng_channel_earn_learn_in_about" = "Telegram can display ads in your channel.";
+"lng_channel_earn_learn_split_subtitle" = "50:50 revenue split";
+"lng_channel_earn_learn_split_about" = "You can receive 50% of the ad revenue in TON.";
+"lng_channel_earn_learn_out_subtitle" = "Flexible withdrawals";
+"lng_channel_earn_learn_out_about" = "You can withdraw your TON any time.";
+"lng_channel_earn_learn_coin_title" = "What is {emoji} TON?";
+"lng_channel_earn_learn_coin_about" = "TON is a blockchain platform and cryptocurrency that Telegram uses for its record scalability and ultra low commissions on transactions. {link}";
+"lng_channel_earn_learn_close" = "Got it";
+
 "lng_contact_add" = "Add";
 "lng_contact_send_message" = "message";
 

From a7df074b8f2deb0a0841c8ff95ff883c999d8563 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 20 Mar 2024 00:19:24 +0300
Subject: [PATCH 143/596] Added dummy files for channel earn info section.

---
 Telegram/CMakeLists.txt                       |   4 +
 .../earn/info_earn_inner_widget.cpp           |  63 +++++++++
 .../earn/info_earn_inner_widget.h             |  62 +++++++++
 .../earn/info_earn_widget.cpp                 | 121 ++++++++++++++++++
 .../earn/info_earn_widget.h                   |  69 ++++++++++
 Telegram/SourceFiles/info/info_controller.h   |   1 +
 6 files changed, 320 insertions(+)
 create mode 100644 Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
 create mode 100644 Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
 create mode 100644 Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.cpp
 create mode 100644 Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index b968e4cab..2c5feb862 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -869,6 +869,10 @@ PRIVATE
     info/channel_statistics/boosts/info_boosts_inner_widget.h
     info/channel_statistics/boosts/info_boosts_widget.cpp
     info/channel_statistics/boosts/info_boosts_widget.h
+    info/channel_statistics/earn/info_earn_inner_widget.cpp
+    info/channel_statistics/earn/info_earn_inner_widget.h
+    info/channel_statistics/earn/info_earn_widget.cpp
+    info/channel_statistics/earn/info_earn_widget.h
     info/common_groups/info_common_groups_inner_widget.cpp
     info/common_groups/info_common_groups_inner_widget.h
     info/common_groups/info_common_groups_widget.cpp
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
new file mode 100644
index 000000000..a52a51627
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -0,0 +1,63 @@
+/*
+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 "info/channel_statistics/earn/info_earn_inner_widget.h"
+
+#include "info/info_controller.h"
+
+namespace Info::ChannelEarn {
+namespace {
+} // namespace
+
+InnerWidget::InnerWidget(
+	QWidget *parent,
+	not_null<Controller*> controller,
+	not_null<PeerData*> peer)
+: VerticalLayout(parent)
+, _controller(controller)
+, _peer(peer)
+, _show(controller->uiShow()) {
+}
+
+void InnerWidget::load() {
+}
+
+void InnerWidget::fill() {
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+	// memento->setState(base::take(_state));
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+	// _state = memento->state();
+	// if (!_state.link.isEmpty()) {
+	// 	fill();
+	// } else {
+	// 	load();
+	// }
+	Ui::RpWidget::resizeToWidth(width());
+}
+
+rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
+	return _scrollToRequests.events();
+}
+
+auto InnerWidget::showRequests() const -> rpl::producer<ShowRequest> {
+	return _showRequests.events();
+}
+
+void InnerWidget::showFinished() {
+	_showFinished.fire({});
+}
+
+not_null<PeerData*> InnerWidget::peer() const {
+	return _peer;
+}
+
+} // namespace Info::ChannelEarn
+
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
new file mode 100644
index 000000000..00cf03149
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
@@ -0,0 +1,62 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/scroll_area.h"
+#include "ui/wrap/vertical_layout.h"
+
+namespace Ui {
+class Show;
+} // namespace Ui
+
+namespace Info {
+class Controller;
+} // namespace Info
+
+namespace Info::ChannelEarn {
+
+class Memento;
+
+class InnerWidget final : public Ui::VerticalLayout {
+public:
+	struct ShowRequest final {
+	};
+
+	InnerWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		not_null<PeerData*> peer);
+
+	[[nodiscard]] not_null<PeerData*> peer() const;
+
+	[[nodiscard]] rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
+	[[nodiscard]] rpl::producer<ShowRequest> showRequests() const;
+
+	void showFinished();
+
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+private:
+	void load();
+	void fill();
+
+	not_null<Controller*> _controller;
+	not_null<PeerData*> _peer;
+	std::shared_ptr<Ui::Show> _show;
+
+	// Data::ChannelEarnStatus _state;
+
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+	rpl::event_stream<ShowRequest> _showRequests;
+	rpl::event_stream<> _showFinished;
+	rpl::event_stream<bool> _loaded;
+
+};
+
+} // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.cpp
new file mode 100644
index 000000000..fb50472db
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.cpp
@@ -0,0 +1,121 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/channel_statistics/earn/info_earn_widget.h"
+
+#include "info/channel_statistics/earn/info_earn_inner_widget.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "lang/lang_keys.h"
+
+namespace Info::ChannelEarn {
+
+Memento::Memento(not_null<Controller*> controller)
+: ContentMemento(Info::Statistics::Tag{
+	controller->statisticsPeer(),
+	{},
+	{},
+}) {
+}
+
+Memento::Memento(not_null<PeerData*> peer)
+: ContentMemento(Info::Statistics::Tag{ peer, {}, {} }) {
+}
+
+Memento::~Memento() = default;
+
+Section Memento::section() const {
+	return Section(Section::Type::ChannelEarn);
+}
+
+void Memento::setState(SavedState state) {
+	_state = std::move(state);
+}
+
+Memento::SavedState Memento::state() {
+	return base::take(_state);
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(parent, controller);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+Widget::Widget(
+	QWidget *parent,
+	not_null<Controller*> controller)
+: ContentWidget(parent, controller)
+, _inner(setInnerWidget(
+	object_ptr<InnerWidget>(
+		this,
+		controller,
+		controller->statisticsPeer()))) {
+	_inner->showRequests(
+	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
+	}, _inner->lifetime());
+	_inner->scrollToRequests(
+	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+		scrollTo(request);
+	}, _inner->lifetime());
+}
+
+not_null<PeerData*> Widget::peer() const {
+	return _inner->peer();
+}
+
+bool Widget::showInternal(not_null<ContentMemento*> memento) {
+	return (memento->statisticsPeer() == peer());
+}
+
+rpl::producer<QString> Widget::title() {
+	return tr::lng_channel_earn_title();
+}
+
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+rpl::producer<bool> Widget::desiredShadowVisibility() const {
+	return rpl::single<bool>(true);
+}
+
+void Widget::showFinished() {
+	_inner->showFinished();
+}
+
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(controller());
+	saveState(result.get());
+	return result;
+}
+
+void Widget::saveState(not_null<Memento*> memento) {
+	memento->setScrollTop(scrollTopSave());
+	_inner->saveState(memento);
+}
+
+void Widget::restoreState(not_null<Memento*> memento) {
+	_inner->restoreState(memento);
+	scrollTopRestore(memento->scrollTop());
+}
+
+std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer) {
+	return std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<Memento>(peer)));
+}
+
+} // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
new file mode 100644
index 000000000..a79dd897a
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.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 "info/info_content_widget.h"
+
+namespace Info::ChannelEarn {
+
+class InnerWidget;
+
+class Memento final : public ContentMemento {
+public:
+	Memento(not_null<Controller*> controller);
+	Memento(not_null<PeerData*> peer);
+	~Memento();
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+	struct ChannelEarnStatus{
+	};
+
+	using SavedState = ChannelEarnStatus;
+
+	void setState(SavedState states);
+	[[nodiscard]] SavedState state();
+
+private:
+	SavedState _state;
+
+};
+
+class Widget final : public ContentWidget {
+public:
+	Widget(QWidget *parent, not_null<Controller*> controller);
+
+	bool showInternal(not_null<ContentMemento*> memento) override;
+	rpl::producer<QString> title() override;
+	rpl::producer<bool> desiredShadowVisibility() const override;
+	void showFinished() override;
+
+	[[nodiscard]] not_null<PeerData*> peer() const;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento);
+
+private:
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	const not_null<InnerWidget*> _inner;
+
+};
+
+[[nodiscard]] std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer);
+
+} // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index bb5eca6bf..628d50bca 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -134,6 +134,7 @@ public:
 		PollResults,
 		Statistics,
 		Boosts,
+		ChannelEarn,
 	};
 	using SettingsType = ::Settings::Type;
 	using MediaType = Storage::SharedMediaType;

From a45a9e65158c22aa762a4ce899c7073881b11ca8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 20 Mar 2024 01:02:36 +0300
Subject: [PATCH 144/596] Added initial learn about as divider text to channel
 earn info section.

---
 .../earn/channel_earn.style                   | 11 ++++
 .../earn/info_earn_inner_widget.cpp           | 51 ++++++++++++++++++-
 Telegram/cmake/td_ui.cmake                    |  1 +
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
new file mode 100644
index 000000000..38c562408
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -0,0 +1,11 @@
+/*
+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
+*/
+using "ui/basic.style";
+using "boxes/boxes.style";
+
+channelEarnLearnArrowMargins: margins(-2px, 5px, 0px, 0px);
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index a52a51627..f58ec6b6e 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -7,7 +7,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/channel_statistics/earn/info_earn_inner_widget.h"
 
+#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "info/info_controller.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_channel_earn.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
 
 namespace Info::ChannelEarn {
 namespace {
@@ -27,6 +40,42 @@ void InnerWidget::load() {
 }
 
 void InnerWidget::fill() {
+	const auto container = this;
+
+	const auto session = &_peer->session();
+	{
+		const auto emoji = Ui::Text::SingleCustomEmoji(
+			session->data().customEmojiManager().registerInternalEmoji(
+				st::topicButtonArrow,
+				st::channelEarnLearnArrowMargins,
+				false));
+		auto label = object_ptr<Ui::FlatLabel>(
+			container,
+			st::boxDividerLabel);
+		const auto raw = label.data();
+		tr::lng_channel_earn_about(
+			lt_link,
+			tr::lng_channel_earn_about_link(
+				lt_emoji,
+				rpl::single(emoji),
+				Ui::Text::RichLangValue
+			) | rpl::map([](TextWithEntities text) {
+				return Ui::Text::Link(std::move(text), 1);
+			}),
+			Ui::Text::RichLangValue
+		) | rpl::start_with_next([=](const TextWithEntities &text) {
+			raw->setMarkedText(
+				text,
+				Core::MarkedTextContext{ .session = session });
+		}, label->lifetime());
+		label->setLink(1, std::make_shared<LambdaClickHandler>([=] {
+		}));
+		container->add(object_ptr<Ui::DividerLabel>(
+			container,
+			std::move(label),
+			st::defaultBoxDividerLabelPadding,
+			RectPart::Top | RectPart::Bottom));
+	}
 }
 
 void InnerWidget::saveState(not_null<Memento*> memento) {
@@ -36,7 +85,7 @@ void InnerWidget::saveState(not_null<Memento*> memento) {
 void InnerWidget::restoreState(not_null<Memento*> memento) {
 	// _state = memento->state();
 	// if (!_state.link.isEmpty()) {
-	// 	fill();
+		fill();
 	// } else {
 	// 	load();
 	// }
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index b77a7f1b7..aaad4c10c 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -24,6 +24,7 @@ set(style_files
     export/view/export.style
     info/info.style
     info/channel_statistics/boosts/giveaway/giveaway.style
+    info/channel_statistics/earn/channel_earn.style
     info/userpic/info_userpic_builder.style
     intro/intro.style
     iv/iv.style

From 588624e7a9cdd4674bc62322dc0295cd37b35f8e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 20 Mar 2024 04:16:50 +0300
Subject: [PATCH 145/596] Added initial overview subsection to channel earn
 info section.

---
 .../earn/channel_earn.style                   |  21 ++++
 .../earn/info_earn_inner_widget.cpp           | 108 ++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 38c562408..62c0600fb 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -9,3 +9,24 @@ using "ui/basic.style";
 using "boxes/boxes.style";
 
 channelEarnLearnArrowMargins: margins(-2px, 5px, 0px, 0px);
+
+channelEarnOverviewMajorLabel: FlatLabel(defaultFlatLabel) {
+	maxHeight: 30px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(15px semibold);
+	}
+}
+channelEarnOverviewMinorLabel: FlatLabel(channelEarnOverviewMajorLabel) {
+	maxHeight: 30px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px semibold);
+	}
+}
+channelEarnOverviewMinorLabelSkip: 3px;
+channelEarnOverviewSubMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(13px);
+	}
+}
+channelEarnOverviewSubMinorLabelSkip: 4px;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index f58ec6b6e..e15f35ae5 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/channel_statistics/earn/info_earn_inner_widget.h"
 
+#include "base/random.h"
+#include "chat_helpers/stickers_emoji_pack.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_peer.h"
 #include "data/data_session.h"
@@ -15,15 +17,52 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_controller.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "statistics/widgets/chart_header_widget.h"
+#include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/labels.h"
+#include "ui/wrap/slide_wrap.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
+#include "styles/style_statistics.h"
 
 namespace Info::ChannelEarn {
 namespace {
+
+void AddHeader(
+		not_null<Ui::VerticalLayout*> content,
+		tr::phrase<> text) {
+	const auto header = content->add(
+		object_ptr<Statistic::Header>(content),
+		st::statisticsLayerMargins + st::boostsChartHeaderPadding);
+	header->resizeToWidth(header->width());
+	header->setTitle(text(tr::now));
+	header->setSubTitle({});
+}
+
+void AddEmojiToMajor(
+		not_null<Ui::FlatLabel*> label,
+		not_null<Main::Session*> session,
+		float64 value) {
+	auto emoji = TextWithEntities{
+		.text = (QString(QChar(0xD83D)) + QChar(0xDC8E)),
+	};
+	if (const auto e = Ui::Emoji::Find(emoji.text)) {
+		const auto sticker = session->emojiStickersPack().stickerForEmoji(e);
+		if (sticker.document) {
+			emoji = Data::SingleCustomEmoji(sticker.document);
+		}
+	}
+	label->setMarkedText(
+		emoji.append(' ').append(QString::number(int64(value))),
+		Core::MarkedTextContext{
+			.session = session,
+			.customEmojiRepaint = [label] { label->update(); },
+		});
+}
+
 } // namespace
 
 InnerWidget::InnerWidget(
@@ -76,6 +115,75 @@ void InnerWidget::fill() {
 			st::defaultBoxDividerLabelPadding,
 			RectPart::Top | RectPart::Bottom));
 	}
+	Ui::AddSkip(container);
+	Ui::AddDivider(container);
+	Ui::AddSkip(container);
+	{
+		Ui::AddSkip(container);
+		AddHeader(container, tr::lng_channel_earn_overview_title);
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+
+		const auto multiplier = 3.8; // Debug.
+		const auto addOverviewEntry = [&](
+				float64 value,
+				const tr::phrase<> &text) {
+			value = base::RandomIndex(1000000) / 1000.; // Debug.
+			const auto line = container->add(
+				Ui::CreateSkipWidget(container, 0),
+				st::boxRowPadding);
+			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				st::channelEarnOverviewMajorLabel);
+			AddEmojiToMajor(majorLabel, session, value);
+			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				QString::number(value - int64(value)).mid(1),
+				st::channelEarnOverviewMinorLabel);
+			const auto secondMinorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				QString(QChar(0x2248))
+					+ QChar('$')
+					+ QString::number(value * multiplier),
+				st::channelEarnOverviewSubMinorLabel);
+			rpl::combine(
+				line->widthValue(),
+				majorLabel->sizeValue()
+			) | rpl::start_with_next([=](int available, const QSize &size) {
+				line->resize(line->width(), size.height());
+				minorLabel->moveToLeft(
+					size.width(),
+					st::channelEarnOverviewMinorLabelSkip);
+				secondMinorLabel->resizeToWidth(available
+					- size.width()
+					- minorLabel->width());
+				secondMinorLabel->moveToLeft(
+					rect::right(minorLabel)
+						+ st::channelEarnOverviewSubMinorLabelSkip,
+					st::channelEarnOverviewSubMinorLabelSkip);
+			}, minorLabel->lifetime());
+
+			Ui::AddSkip(container);
+			const auto sub = container->add(
+				object_ptr<Ui::FlatLabel>(
+					container,
+					text(),
+					st::channelEarnOverviewSubMinorLabel),
+				st::boxRowPadding);
+			sub->setTextColorOverride(st::windowSubTextFg->c);
+		};
+		addOverviewEntry(0, tr::lng_channel_earn_available);
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		addOverviewEntry(0, tr::lng_channel_earn_reward);
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		addOverviewEntry(0, tr::lng_channel_earn_total);
+		Ui::AddSkip(container);
+	}
+	Ui::AddSkip(container);
+	Ui::AddDivider(container);
+	Ui::AddSkip(container);
 }
 
 void InnerWidget::saveState(not_null<Memento*> memento) {

From 796e09bf13934781555740bbb02174df312c1eed Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 20 Mar 2024 15:37:01 +0300
Subject: [PATCH 146/596] Added initial subsection for history to channel earn
 info section.

---
 .../earn/channel_earn.style                   |  33 +++-
 .../earn/info_earn_inner_widget.cpp           | 159 +++++++++++++++++-
 2 files changed, 188 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 62c0600fb..c7f35ba6c 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -17,7 +17,6 @@ channelEarnOverviewMajorLabel: FlatLabel(defaultFlatLabel) {
 	}
 }
 channelEarnOverviewMinorLabel: FlatLabel(channelEarnOverviewMajorLabel) {
-	maxHeight: 30px;
 	style: TextStyle(defaultTextStyle) {
 		font: font(12px semibold);
 	}
@@ -29,4 +28,34 @@ channelEarnOverviewSubMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
 		font: font(13px);
 	}
 }
-channelEarnOverviewSubMinorLabelSkip: 4px;
+channelEarnOverviewSubMinorLabelPos: point(4px, 2px);
+channelEarnHistoryLabel: FlatLabel(channelEarnOverviewMajorLabel) {
+	style: TextStyle(semiboldTextStyle) {
+	}
+}
+channelEarnHistorySubLabel: FlatLabel(channelEarnOverviewSubMinorLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+}
+channelEarnHistoryRecipientLabel: FlatLabel(channelEarnOverviewSubMinorLabel) {
+	maxHeight: 0px;
+	minWidth: 100px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+}
+channelEarnHistoryMajorLabel: FlatLabel(channelEarnOverviewMajorLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(13px semibold);
+	}
+}
+channelEarnHistoryMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px semibold);
+	}
+}
+channelEarnHistoryMinorLabelSkip: 1px;
+channelEarnHistoryOuter: margins(0px, 6px, 0px, 6px);
+channelEarnHistoryTwoSkip: 5px;
+channelEarnHistoryThreeSkip: 3px;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index e15f35ae5..676ad83bb 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/channel_statistics/earn/info_earn_inner_widget.h"
 
 #include "base/random.h"
+#include "base/unixtime.h"
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_peer.h"
@@ -21,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_channel_earn.h"
@@ -28,6 +30,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_statistics.h"
 
+#include <QUuid>
+
 namespace Info::ChannelEarn {
 namespace {
 
@@ -63,6 +67,16 @@ void AddEmojiToMajor(
 		});
 }
 
+[[nodiscard]] QString FormatDate(TimeId date) {
+	const auto parsedDate = base::unixtime::parse(date);
+	return tr::lng_group_call_starts_short_date(
+		tr::now,
+		lt_date,
+		langDayOfMonth(parsedDate.date()),
+		lt_time,
+		QLocale().toString(parsedDate.time(), QLocale::ShortFormat));
+}
+
 } // namespace
 
 InnerWidget::InnerWidget(
@@ -81,6 +95,9 @@ void InnerWidget::load() {
 void InnerWidget::fill() {
 	const auto container = this;
 
+	constexpr auto kMinus = QChar(0x2212);
+	const auto currency = u"TON"_q;
+
 	const auto session = &_peer->session();
 	{
 		const auto emoji = Ui::Text::SingleCustomEmoji(
@@ -159,8 +176,8 @@ void InnerWidget::fill() {
 					- minorLabel->width());
 				secondMinorLabel->moveToLeft(
 					rect::right(minorLabel)
-						+ st::channelEarnOverviewSubMinorLabelSkip,
-					st::channelEarnOverviewSubMinorLabelSkip);
+						+ st::channelEarnOverviewSubMinorLabelPos.x(),
+					st::channelEarnOverviewSubMinorLabelPos.y());
 			}, minorLabel->lifetime());
 
 			Ui::AddSkip(container);
@@ -184,6 +201,144 @@ void InnerWidget::fill() {
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
+	{
+		Ui::AddSkip(container);
+		AddHeader(container, tr::lng_channel_earn_history_title);
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+
+		struct HistoryEntry final {
+			TimeId from = 0;
+			TimeId to = 0;
+			float64 value = 0;
+			QString recipient;
+			bool in = false;
+		};
+
+		const auto addHistoryEntry = [&](
+				const HistoryEntry &entry,
+				const tr::phrase<> &text) {
+			const auto wrap = container->add(
+				object_ptr<Ui::PaddingWrap<Ui::VerticalLayout>>(
+					container,
+					object_ptr<Ui::VerticalLayout>(container),
+					QMargins()));
+			const auto inner = wrap->entity();
+			inner->setAttribute(Qt::WA_TransparentForMouseEvents);
+			inner->add(object_ptr<Ui::FlatLabel>(
+				inner,
+				text(),
+				st::channelEarnHistoryLabel));
+
+			if (!entry.recipient.isEmpty()) {
+				Ui::AddSkip(inner, st::channelEarnHistoryThreeSkip);
+				const auto label = inner->add(object_ptr<Ui::FlatLabel>(
+					inner,
+					rpl::single(
+						Ui::Text::Wrapped(
+							{ entry.recipient },
+							EntityType::Code)),
+					st::channelEarnHistoryRecipientLabel));
+				label->setBreakEverywhere(true);
+				label->setTryMakeSimilarLines(true);
+				Ui::AddSkip(inner, st::channelEarnHistoryThreeSkip);
+			} else {
+				Ui::AddSkip(inner, st::channelEarnHistoryTwoSkip);
+			}
+
+			inner->add(object_ptr<Ui::FlatLabel>(
+				inner,
+				entry.to
+					? (FormatDate(entry.from)
+						+ ' '
+						+ QChar(8212)
+						+ ' '
+						+ FormatDate(entry.to))
+					: FormatDate(entry.from),
+				st::channelEarnHistorySubLabel));
+
+			const auto color = (entry.in
+				? st::boxTextFgGood
+				: st::menuIconAttentionColor)->c;
+			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				wrap,
+				(entry.in ? '+' : kMinus)
+					+ QString::number(int64(entry.value)),
+				st::channelEarnHistoryMajorLabel);
+			majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+			majorLabel->setTextColorOverride(color);
+			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				wrap,
+				QString::number(entry.value - int64(entry.value)).mid(1)
+					+ ' '
+					+ currency,
+				st::channelEarnHistoryMinorLabel);
+			minorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+			minorLabel->setTextColorOverride(color);
+			const auto button = Ui::CreateChild<Ui::SettingsButton>(
+				wrap,
+				rpl::single(QString()));
+			button->setClickedCallback([=] {
+			});
+			wrap->geometryValue(
+			) | rpl::start_with_next([=](const QRect &g) {
+				const auto &padding = st::boxRowPadding;
+				const auto majorTop = (g.height() - majorLabel->height()) / 2;
+				minorLabel->moveToRight(
+					padding.right(),
+					majorTop + st::channelEarnHistoryMinorLabelSkip);
+				majorLabel->moveToRight(
+					padding.right() + minorLabel->width(),
+					majorTop);
+				const auto rightWrapPadding = rect::m::sum::h(padding)
+					+ minorLabel->width()
+					+ majorLabel->width();
+				wrap->setPadding(
+					st::channelEarnHistoryOuter
+						+ QMargins(padding.left(), 0, rightWrapPadding, 0));
+				button->resize(g.size());
+				button->lower();
+			}, wrap->lifetime());
+		};
+		const auto randomRecipient = [&] { // Debug.
+			const auto format = QUuid::StringFormat::Id128;
+			return (QUuid::createUuid().toString(format)
+				+ QUuid::createUuid().toString(format)).mid(0, 48);
+		};
+		addHistoryEntry(
+			{
+				.from = base::unixtime::now(),
+				.to = base::unixtime::now() - base::RandomIndex(200000),
+				.value = base::RandomIndex(1000000) / 1000.,
+				.in = true,
+			},
+			tr::lng_channel_earn_history_in);
+		addHistoryEntry(
+			{
+				.from = base::unixtime::now(),
+				.recipient = randomRecipient(),
+				.value = base::RandomIndex(1000000) / 1000.,
+			},
+			tr::lng_channel_earn_history_out);
+		addHistoryEntry(
+			{
+				.from = base::unixtime::now(),
+				.to = base::unixtime::now() - base::RandomIndex(200000),
+				.value = base::RandomIndex(1000000) / 1000.,
+				.in = true,
+			},
+			tr::lng_channel_earn_history_in);
+		addHistoryEntry(
+			{
+				.from = base::unixtime::now(),
+				.recipient = randomRecipient(),
+				.value = base::RandomIndex(1000000) / 1000.,
+			},
+			tr::lng_channel_earn_history_out);
+	}
+	Ui::AddSkip(container);
+	Ui::AddDivider(container);
+	Ui::AddSkip(container);
 }
 
 void InnerWidget::saveState(not_null<Memento*> memento) {

From 490d9bc3eceadb7db7ce6cfedb26e5a23fcb0f26 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 20 Mar 2024 18:21:32 +0300
Subject: [PATCH 147/596] Added initial box for every history entry to channel
 earn info section.

---
 .../earn/channel_earn.style                   |  29 +++
 .../earn/info_earn_inner_widget.cpp           | 194 ++++++++++++++++--
 2 files changed, 207 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index c7f35ba6c..c9c03172d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -59,3 +59,32 @@ channelEarnHistoryMinorLabelSkip: 1px;
 channelEarnHistoryOuter: margins(0px, 6px, 0px, 6px);
 channelEarnHistoryTwoSkip: 5px;
 channelEarnHistoryThreeSkip: 3px;
+
+channelEarnHistoryRecipientButton: RoundButton {
+	textFg: transparent;
+	textFgOver: transparent;
+	numbersTextFg: transparent;
+	numbersTextFgOver: transparent;
+	textBg: windowBgOver;
+	textBgOver: windowBgOver;
+
+	numbersSkip: 7px;
+
+	width: 190px;
+	height: 34px;
+	padding: margins(0px, 0px, 0px, 0px);
+
+	textTop: 8px;
+	radius: 8px;
+
+	iconPosition: point(0px, 0px);
+
+	font: semiboldFont;
+
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgRipple;
+	}
+}
+channelEarnHistoryRecipientButtonLabel: FlatLabel(channelEarnHistoryRecipientLabel) {
+	align: align(center);
+}
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 676ad83bb..cb1c7867b 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -16,21 +16,27 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "info/info_controller.h"
+#include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "statistics/widgets/chart_header_widget.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/slide_wrap.h"
+#include "styles/style_boxes.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_statistics.h"
 
 #include <QUuid>
+#include <QtWidgets/QApplication>
 
 namespace Info::ChannelEarn {
 namespace {
@@ -230,14 +236,14 @@ void InnerWidget::fill() {
 				text(),
 				st::channelEarnHistoryLabel));
 
+			const auto recipient = Ui::Text::Wrapped(
+				{ entry.recipient },
+				EntityType::Code);
 			if (!entry.recipient.isEmpty()) {
 				Ui::AddSkip(inner, st::channelEarnHistoryThreeSkip);
 				const auto label = inner->add(object_ptr<Ui::FlatLabel>(
 					inner,
-					rpl::single(
-						Ui::Text::Wrapped(
-							{ entry.recipient },
-							EntityType::Code)),
+					rpl::single(recipient),
 					st::channelEarnHistoryRecipientLabel));
 				label->setBreakEverywhere(true);
 				label->setTryMakeSimilarLines(true);
@@ -246,39 +252,195 @@ void InnerWidget::fill() {
 				Ui::AddSkip(inner, st::channelEarnHistoryTwoSkip);
 			}
 
+			const auto dateText = entry.to
+				? (FormatDate(entry.from)
+					+ ' '
+					+ QChar(8212)
+					+ ' '
+					+ FormatDate(entry.to))
+				: FormatDate(entry.from);
 			inner->add(object_ptr<Ui::FlatLabel>(
 				inner,
-				entry.to
-					? (FormatDate(entry.from)
-						+ ' '
-						+ QChar(8212)
-						+ ' '
-						+ FormatDate(entry.to))
-					: FormatDate(entry.from),
+				dateText,
 				st::channelEarnHistorySubLabel));
 
 			const auto color = (entry.in
 				? st::boxTextFgGood
 				: st::menuIconAttentionColor)->c;
+			const auto majorText = (entry.in ? '+' : kMinus)
+				+ QString::number(int64(entry.value));
 			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				wrap,
-				(entry.in ? '+' : kMinus)
-					+ QString::number(int64(entry.value)),
+				majorText,
 				st::channelEarnHistoryMajorLabel);
 			majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 			majorLabel->setTextColorOverride(color);
-			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
-				wrap,
+			const auto minorText =
 				QString::number(entry.value - int64(entry.value)).mid(1)
 					+ ' '
-					+ currency,
+					+ currency;
+			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				wrap,
+				minorText,
 				st::channelEarnHistoryMinorLabel);
 			minorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 			minorLabel->setTextColorOverride(color);
 			const auto button = Ui::CreateChild<Ui::SettingsButton>(
 				wrap,
 				rpl::single(QString()));
+
+			const auto detailsBox = [=, peer = _peer](
+					not_null<Ui::GenericBox*> box) {
+				Ui::AddSkip(box->verticalLayout());
+				Ui::AddSkip(box->verticalLayout());
+				const auto labels = box->addRow(
+					object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
+						box,
+						object_ptr<Ui::RpWidget>(box)))->entity();
+
+				const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
+					labels,
+					majorText,
+					st::channelEarnOverviewMajorLabel);
+				majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+				majorLabel->setTextColorOverride(color);
+				const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
+					labels,
+					minorText,
+					st::channelEarnOverviewMinorLabel);
+				minorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+				minorLabel->setTextColorOverride(color);
+				rpl::combine(
+					majorLabel->sizeValue(),
+					minorLabel->sizeValue()
+				) | rpl::start_with_next([=](
+						const QSize &majorSize,
+						const QSize &minorSize) {
+					labels->resize(
+						majorSize.width() + minorSize.width(),
+						majorSize.height());
+					majorLabel->moveToLeft(0, 0);
+					minorLabel->moveToRight(
+						0,
+						st::channelEarnOverviewMinorLabelSkip);
+				}, box->lifetime());
+
+				Ui::AddSkip(box->verticalLayout());
+				box->addRow(object_ptr<Ui::CenterWrap<>>(
+					box,
+					object_ptr<Ui::FlatLabel>(
+						box,
+						dateText,
+						st::channelEarnHistorySubLabel)));
+				Ui::AddSkip(box->verticalLayout());
+				Ui::AddSkip(box->verticalLayout());
+				Ui::AddSkip(box->verticalLayout());
+				box->addRow(object_ptr<Ui::CenterWrap<>>(
+					box,
+					object_ptr<Ui::FlatLabel>(
+						box,
+						entry.in
+							? tr::lng_channel_earn_history_in_about()
+							: tr::lng_channel_earn_history_out(),
+						st::channelEarnHistoryMajorLabel)));
+				Ui::AddSkip(box->verticalLayout());
+				if (entry.in) {
+					Ui::AddSkip(box->verticalLayout());
+				}
+
+				if (!entry.recipient.isEmpty()) {
+					const auto wrap = box->addRow(
+						object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+							box,
+							object_ptr<Ui::RoundButton>(
+								box,
+								rpl::single(QString()),
+								st::channelEarnHistoryRecipientButton)));
+					const auto container = wrap->entity();
+					const auto label = Ui::CreateChild<Ui::FlatLabel>(
+						container,
+						rpl::single(recipient),
+						st::channelEarnHistoryRecipientButtonLabel);
+					label->setAttribute(Qt::WA_TransparentForMouseEvents);
+					label->setBreakEverywhere(true);
+					label->setTryMakeSimilarLines(true);
+					label->resizeToWidth(container->width());
+					label->sizeValue(
+					) | rpl::start_with_next([=](const QSize &s) {
+						const auto padding = QMargins(
+							st::chatGiveawayPeerPadding.right(),
+							st::chatGiveawayPeerPadding.top(),
+							st::chatGiveawayPeerPadding.right(),
+							st::chatGiveawayPeerPadding.top());
+						container->resize(
+							container->width(),
+							(Rect(s) + padding).height());
+						label->moveToLeft(0, padding.top());
+					}, container->lifetime());
+					container->setClickedCallback([=] {
+						QGuiApplication::clipboard()->setText(recipient.text);
+						box->showToast(tr::lng_text_copied(tr::now));
+					});
+				}
+				if (entry.in) {
+					const auto peerBubble = box->addRow(
+						object_ptr<Ui::CenterWrap<>>(
+							box,
+							object_ptr<Ui::RpWidget>(box)))->entity();
+					peerBubble->setAttribute(
+						Qt::WA_TransparentForMouseEvents);
+					const auto left = Ui::CreateChild<Ui::UserpicButton>(
+						peerBubble,
+						peer,
+						st::uploadUserpicButton);
+					const auto right = Ui::CreateChild<Ui::FlatLabel>(
+						peerBubble,
+						Info::Profile::NameValue(peer),
+						st::channelEarnHistoryLabel);
+					rpl::combine(
+						left->sizeValue(),
+						right->sizeValue()
+					) | rpl::start_with_next([=](
+							const QSize &leftSize,
+							const QSize &rightSize) {
+						const auto padding = QMargins(
+							st::chatGiveawayPeerPadding.left() * 2,
+							st::chatGiveawayPeerPadding.top(),
+							st::chatGiveawayPeerPadding.right(),
+							st::chatGiveawayPeerPadding.bottom());
+						peerBubble->resize(
+							leftSize.width()
+								+ rightSize.width()
+								+ rect::m::sum::h(padding),
+							leftSize.height());
+						left->moveToLeft(0, 0);
+						right->moveToRight(padding.right(), padding.top());
+						const auto maxRightSize = box->width()
+							- rect::m::sum::h(st::boxRowPadding)
+							- rect::m::sum::h(padding)
+							- leftSize.width();
+						if (rightSize.width() > maxRightSize) {
+							right->resizeToWidth(maxRightSize);
+						}
+					}, peerBubble->lifetime());
+					peerBubble->paintRequest(
+					) | rpl::start_with_next([=] {
+						auto p = QPainter(peerBubble);
+						auto hq = PainterHighQualityEnabler(p);
+						p.setPen(Qt::NoPen);
+						p.setBrush(st::windowBgOver);
+						const auto rect = peerBubble->rect();
+						const auto radius = rect.height() / 2;
+						p.drawRoundedRect(rect, radius, radius);
+					}, peerBubble->lifetime());
+				}
+				Ui::AddSkip(box->verticalLayout());
+				Ui::AddSkip(box->verticalLayout());
+				box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
+			};
+
 			button->setClickedCallback([=] {
+				_show->showBox(Box(detailsBox));
 			});
 			wrap->geometryValue(
 			) | rpl::start_with_next([=](const QRect &g) {

From 99dd5507bf05932c36dd806cb2c0e509e912bebe Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 21 Mar 2024 03:38:24 +0300
Subject: [PATCH 148/596] Added initial transfer subsection to channel earn
 info section.

---
 Telegram/Resources/langs/lang.strings         |   2 +
 .../earn/channel_earn.style                   |  14 +-
 .../earn/info_earn_inner_widget.cpp           | 228 +++++++++++++++---
 3 files changed, 204 insertions(+), 40 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0f5cf869f..3d734f568 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4962,6 +4962,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_balance_placeholder" = "Enter your TON address";
 "lng_channel_earn_balance_button" = "Withdraw";
 "lng_channel_earn_balance_about" = "By the end of May, you will be able to collect your reward using Fragment, a third-party platform used by the advertiser to pay for the ad. {link}";
+"lng_channel_earn_transfer_sure_about1" = "Check the address of the recipient:";
+"lng_channel_earn_transfer_sure_about2" = "This action can not be undone. If the address above is incorrect you will lose your TON.";
 "lng_channel_earn_history_title" = "Transaction history";
 "lng_channel_earn_history_in" = "Proceeds from ads";
 "lng_channel_earn_history_in_about" = "Proceeds from ads displayed in";
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index c9c03172d..f474c738c 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -29,7 +29,7 @@ channelEarnOverviewSubMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
 	}
 }
 channelEarnOverviewSubMinorLabelPos: point(4px, 2px);
-channelEarnHistoryLabel: FlatLabel(channelEarnOverviewMajorLabel) {
+channelEarnSemiboldLabel: FlatLabel(channelEarnOverviewMajorLabel) {
 	style: TextStyle(semiboldTextStyle) {
 	}
 }
@@ -88,3 +88,15 @@ channelEarnHistoryRecipientButton: RoundButton {
 channelEarnHistoryRecipientButtonLabel: FlatLabel(channelEarnHistoryRecipientLabel) {
 	align: align(center);
 }
+
+channelEarnBalanceMajorLabel: FlatLabel(channelEarnOverviewMajorLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(22px semibold);
+	}
+}
+channelEarnBalanceMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(16px semibold);
+	}
+}
+channelEarnBalanceMinorLabelSkip: 6px;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index cb1c7867b..d37989e61 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -21,17 +21,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/effects/animation_value.h"
+#include "ui/effects/animation_value_f.h"
+#include "ui/effects/animations.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_statistics.h"
 
@@ -52,6 +57,41 @@ void AddHeader(
 	header->setSubTitle({});
 }
 
+void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
+	const auto wrap = box->addRow(
+		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+			box,
+			object_ptr<Ui::RoundButton>(
+				box,
+				rpl::single(QString()),
+				st::channelEarnHistoryRecipientButton)));
+	const auto container = wrap->entity();
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		container,
+		rpl::single(t),
+		st::channelEarnHistoryRecipientButtonLabel);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->setBreakEverywhere(true);
+	label->setTryMakeSimilarLines(true);
+	label->resizeToWidth(container->width());
+	label->sizeValue(
+	) | rpl::start_with_next([=](const QSize &s) {
+		const auto padding = QMargins(
+			st::chatGiveawayPeerPadding.right(),
+			st::chatGiveawayPeerPadding.top(),
+			st::chatGiveawayPeerPadding.right(),
+			st::chatGiveawayPeerPadding.top());
+		container->resize(
+			container->width(),
+			(Rect(s) + padding).height());
+		label->moveToLeft(0, padding.top());
+	}, container->lifetime());
+	container->setClickedCallback([=] {
+		QGuiApplication::clipboard()->setText(t.text);
+		box->showToast(tr::lng_text_copied(tr::now));
+	});
+}
+
 void AddEmojiToMajor(
 		not_null<Ui::FlatLabel*> label,
 		not_null<Main::Session*> session,
@@ -103,9 +143,11 @@ void InnerWidget::fill() {
 
 	constexpr auto kMinus = QChar(0x2212);
 	const auto currency = u"TON"_q;
+	const auto multiplier = 3.8; // Debug.
 
 	const auto session = &_peer->session();
-	{
+
+	const auto addAboutWithLearn = [&](const tr::phrase<lngtag_link> &text) {
 		const auto emoji = Ui::Text::SingleCustomEmoji(
 			session->data().customEmojiManager().registerInternalEmoji(
 				st::topicButtonArrow,
@@ -115,7 +157,7 @@ void InnerWidget::fill() {
 			container,
 			st::boxDividerLabel);
 		const auto raw = label.data();
-		tr::lng_channel_earn_about(
+		text(
 			lt_link,
 			tr::lng_channel_earn_about_link(
 				lt_emoji,
@@ -137,9 +179,149 @@ void InnerWidget::fill() {
 			std::move(label),
 			st::defaultBoxDividerLabelPadding,
 			RectPart::Top | RectPart::Bottom));
-	}
+	};
+	addAboutWithLearn(tr::lng_channel_earn_about);
 	Ui::AddSkip(container);
-	Ui::AddDivider(container);
+	{
+		const auto value = 54.12; // Debug.
+		Ui::AddSkip(container);
+		AddHeader(container, tr::lng_channel_earn_balance_title);
+		Ui::AddSkip(container);
+
+		const auto labels = container->add(
+			object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
+				container,
+				object_ptr<Ui::RpWidget>(container)))->entity();
+
+		const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
+			labels,
+			st::channelEarnBalanceMajorLabel);
+		AddEmojiToMajor(majorLabel, session, value);
+		majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+		const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
+			labels,
+			QString::number(value - int64(value)).mid(1),
+			st::channelEarnBalanceMinorLabel);
+		minorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+		rpl::combine(
+			majorLabel->sizeValue(),
+			minorLabel->sizeValue()
+		) | rpl::start_with_next([=](
+				const QSize &majorSize,
+				const QSize &minorSize) {
+			labels->resize(
+				majorSize.width() + minorSize.width(),
+				majorSize.height());
+			majorLabel->moveToLeft(0, 0);
+			minorLabel->moveToRight(
+				0,
+				st::channelEarnBalanceMinorLabelSkip);
+		}, labels->lifetime());
+
+		Ui::AddSkip(container);
+		container->add(
+			object_ptr<Ui::CenterWrap<>>(
+				container,
+				object_ptr<Ui::FlatLabel>(
+					container,
+					QString(QChar(0x2248))
+						+ QChar('$')
+						+ QString::number(value * multiplier),
+					st::channelEarnOverviewSubMinorLabel)));
+
+		Ui::AddSkip(container);
+
+		const auto input = container->add(
+			object_ptr<Ui::InputField>(
+				container,
+				st::defaultComposeFiles.caption,
+				Ui::InputField::Mode::MultiLine,
+				tr::lng_channel_earn_balance_placeholder()),
+			st::boxRowPadding);
+
+		Ui::AddSkip(container);
+
+		const auto &stButton = st::defaultActiveButton;
+		const auto button = container->add(
+			object_ptr<Ui::RoundButton>(
+				container,
+				rpl::never<QString>(),
+				stButton),
+			st::boxRowPadding);
+
+		const auto label = Ui::CreateChild<Ui::FlatLabel>(
+			button,
+			tr::lng_channel_earn_balance_button(tr::now),
+			st::channelEarnSemiboldLabel);
+		label->setTextColorOverride(stButton.textFg->c);
+		label->setAttribute(Qt::WA_TransparentForMouseEvents);
+		rpl::combine(
+			button->sizeValue(),
+			label->sizeValue()
+		) | rpl::start_with_next([=](const QSize &b, const QSize &l) {
+			label->moveToLeft(
+				(b.width() - l.width()) / 2,
+				(b.height() - l.height()) / 2);
+		}, label->lifetime());
+
+		const auto fadeAnimation =
+			label->lifetime().make_state<Ui::Animations::Simple>();
+
+		const auto colorText = [=](float64 value) {
+			label->setTextColorOverride(
+				anim::with_alpha(
+					stButton.textFg->c,
+					anim::interpolateF(.5, 1., value)));
+		};
+		colorText(0);
+
+		rpl::single(
+			rpl::empty_value()
+		) | rpl::then(
+			input->changes()
+		) | rpl::map([=, end = (u".ton"_q)] {
+			const auto text = input->getLastText();
+			return (text.size() == 48)
+				|| text.endsWith(end, Qt::CaseInsensitive);
+		}) | rpl::distinct_until_changed(
+		) | rpl::start_with_next([=](bool enabled) {
+			fadeAnimation->stop();
+			const auto from = enabled ? 0. : 1.;
+			const auto to = enabled ? 1. : 0.;
+			fadeAnimation->start(colorText, from, to, st::slideWrapDuration);
+
+			button->setAttribute(Qt::WA_TransparentForMouseEvents, !enabled);
+		}, button->lifetime());
+
+		button->setClickedCallback([=] {
+			_show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+				box->setTitle(tr::lng_channel_earn_balance_button());
+				box->addRow(object_ptr<Ui::FlatLabel>(
+					box,
+					tr::lng_channel_earn_transfer_sure_about1(tr::now),
+					st::boxLabel));
+				Ui::AddSkip(box->verticalLayout());
+				AddRecipient(
+					box,
+					Ui::Text::Wrapped(
+						{ input->getLastText() },
+						EntityType::Code));
+				Ui::AddSkip(box->verticalLayout());
+				box->addRow(object_ptr<Ui::FlatLabel>(
+					box,
+					tr::lng_channel_earn_transfer_sure_about2(tr::now),
+					st::boxLabel));
+				box->addButton(
+					tr::lng_send_button(),
+					[=] { box->closeBox(); });
+				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+			}));
+		});
+
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+	}
+	addAboutWithLearn(tr::lng_channel_earn_balance_about);
 	Ui::AddSkip(container);
 	{
 		Ui::AddSkip(container);
@@ -147,7 +329,6 @@ void InnerWidget::fill() {
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 
-		const auto multiplier = 3.8; // Debug.
 		const auto addOverviewEntry = [&](
 				float64 value,
 				const tr::phrase<> &text) {
@@ -234,7 +415,7 @@ void InnerWidget::fill() {
 			inner->add(object_ptr<Ui::FlatLabel>(
 				inner,
 				text(),
-				st::channelEarnHistoryLabel));
+				st::channelEarnSemiboldLabel));
 
 			const auto recipient = Ui::Text::Wrapped(
 				{ entry.recipient },
@@ -349,38 +530,7 @@ void InnerWidget::fill() {
 				}
 
 				if (!entry.recipient.isEmpty()) {
-					const auto wrap = box->addRow(
-						object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
-							box,
-							object_ptr<Ui::RoundButton>(
-								box,
-								rpl::single(QString()),
-								st::channelEarnHistoryRecipientButton)));
-					const auto container = wrap->entity();
-					const auto label = Ui::CreateChild<Ui::FlatLabel>(
-						container,
-						rpl::single(recipient),
-						st::channelEarnHistoryRecipientButtonLabel);
-					label->setAttribute(Qt::WA_TransparentForMouseEvents);
-					label->setBreakEverywhere(true);
-					label->setTryMakeSimilarLines(true);
-					label->resizeToWidth(container->width());
-					label->sizeValue(
-					) | rpl::start_with_next([=](const QSize &s) {
-						const auto padding = QMargins(
-							st::chatGiveawayPeerPadding.right(),
-							st::chatGiveawayPeerPadding.top(),
-							st::chatGiveawayPeerPadding.right(),
-							st::chatGiveawayPeerPadding.top());
-						container->resize(
-							container->width(),
-							(Rect(s) + padding).height());
-						label->moveToLeft(0, padding.top());
-					}, container->lifetime());
-					container->setClickedCallback([=] {
-						QGuiApplication::clipboard()->setText(recipient.text);
-						box->showToast(tr::lng_text_copied(tr::now));
-					});
+					AddRecipient(box, recipient);
 				}
 				if (entry.in) {
 					const auto peerBubble = box->addRow(
@@ -396,7 +546,7 @@ void InnerWidget::fill() {
 					const auto right = Ui::CreateChild<Ui::FlatLabel>(
 						peerBubble,
 						Info::Profile::NameValue(peer),
-						st::channelEarnHistoryLabel);
+						st::channelEarnSemiboldLabel);
 					rpl::combine(
 						left->sizeValue(),
 						right->sizeValue()

From 778317e1b2aa3703dd0d867a19a14bdf545f35b0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 21 Mar 2024 04:43:53 +0300
Subject: [PATCH 149/596] Added initial slider for earn settings to channel
 earn info section.

---
 Telegram/Resources/langs/lang.strings         |   4 +-
 .../boxes/peers/edit_peer_color_box.cpp       |  66 ++++----
 .../boxes/peers/edit_peer_color_box.h         |  10 ++
 .../earn/info_earn_inner_widget.cpp           | 143 +++++++++++++++++-
 4 files changed, 182 insertions(+), 41 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 3d734f568..a61422998 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4971,8 +4971,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_off" = "Switch Off Ads";
 "lng_channel_earn_off_about" = "You will not be eligible for any rewards if you switch off ads.";
 "lng_channel_earn_cpm_min" = "No Ads";
-"lng_channel_earn_cpm#one" = "{count} CPM";
-"lng_channel_earn_cpm#other" = "{count} CPM";
+"lng_channel_earn_cpm#one" = "{emoji} {count} CPM";
+"lng_channel_earn_cpm#other" = "{emoji} {count} CPM";
 "lng_channel_earn_learn_title" = "Earn From Your Channel";
 "lng_channel_earn_learn_in_subtitle" = "Telegram Ads";
 "lng_channel_earn_learn_in_about" = "Telegram can display ads in your channel.";
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index 50470657a..018d07915 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -521,39 +521,6 @@ void LevelBadge::paintEvent(QPaintEvent *e) {
 	_text.draw(p, context);
 }
 
-void AddLevelBadge(
-		int level,
-		not_null<Ui::SettingsButton*> button,
-		Ui::RpWidget *right,
-		not_null<ChannelData*> channel,
-		const QMargins &padding,
-		rpl::producer<QString> text) {
-	if (channel->levelHint() >= level) {
-		return;
-	}
-	const auto badge = Ui::CreateChild<LevelBadge>(
-		button.get(),
-		level,
-		&channel->session());
-	badge->show();
-	const auto sampleLeft = st::settingsColorSamplePadding.left();
-	const auto badgeLeft = padding.left() + sampleLeft;
-	rpl::combine(
-		button->sizeValue(),
-		std::move(text)
-	) | rpl::start_with_next([=](const QSize &s, const QString &) {
-		if (s.isNull()) {
-			return;
-		}
-		badge->moveToLeft(
-			button->fullTextWidth() + badgeLeft,
-			(s.height() - badge->height()) / 2);
-		const auto rightEdge = right ? right->pos().x() : button->width();
-		badge->setMinimal((rect::right(badge) + sampleLeft) > rightEdge);
-		badge->setVisible((rect::right(badge) + sampleLeft) < rightEdge);
-	}, badge->lifetime());
-}
-
 struct SetValues {
 	uint8 colorIndex = 0;
 	DocumentId backgroundEmojiId = 0;
@@ -1165,6 +1132,39 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 
 } // namespace
 
+void AddLevelBadge(
+		int level,
+		not_null<Ui::SettingsButton*> button,
+		Ui::RpWidget *right,
+		not_null<ChannelData*> channel,
+		const QMargins &padding,
+		rpl::producer<QString> text) {
+	if (channel->levelHint() >= level) {
+		return;
+	}
+	const auto badge = Ui::CreateChild<LevelBadge>(
+		button.get(),
+		level,
+		&channel->session());
+	badge->show();
+	const auto sampleLeft = st::settingsColorSamplePadding.left();
+	const auto badgeLeft = padding.left() + sampleLeft;
+	rpl::combine(
+		button->sizeValue(),
+		std::move(text)
+	) | rpl::start_with_next([=](const QSize &s, const QString &) {
+		if (s.isNull()) {
+			return;
+		}
+		badge->moveToLeft(
+			button->fullTextWidth() + badgeLeft,
+			(s.height() - badge->height()) / 2);
+		const auto rightEdge = right ? right->pos().x() : button->width();
+		badge->setMinimal((rect::right(badge) + sampleLeft) > rightEdge);
+		badge->setVisible((rect::right(badge) + sampleLeft) < rightEdge);
+	}, badge->lifetime());
+}
+
 void EditPeerColorBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<ChatHelpers::Show> show,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
index cf83bfc74..2272123a1 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
@@ -20,14 +20,24 @@ class Show;
 } // namespace ChatHelpers
 
 namespace Ui {
+class RpWidget;
 class GenericBox;
 class ChatStyle;
 class ChatTheme;
 class VerticalLayout;
 struct AskBoostReason;
 class RpWidget;
+class SettingsButton;
 } // namespace Ui
 
+void AddLevelBadge(
+	int level,
+	not_null<Ui::SettingsButton*> button,
+	Ui::RpWidget *right,
+	not_null<ChannelData*> channel,
+	const QMargins &padding,
+	rpl::producer<QString> text);
+
 void EditPeerColorBox(
 	not_null<Ui::GenericBox*> box,
 	std::shared_ptr<ChatHelpers::Show> show,
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index d37989e61..ff1422e26 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/random.h"
 #include "base/unixtime.h"
+#include "boxes/peers/edit_peer_color_box.h" // AddLevelBadge.
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_peer.h"
@@ -19,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "settings/settings_common.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/animation_value.h"
@@ -30,14 +32,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
+#include "styles/style_settings.h"
 #include "styles/style_statistics.h"
 
 #include <QUuid>
@@ -92,10 +97,8 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 	});
 }
 
-void AddEmojiToMajor(
-		not_null<Ui::FlatLabel*> label,
-		not_null<Main::Session*> session,
-		float64 value) {
+[[nodiscard]] TextWithEntities EmojiCurrency(
+		not_null<Main::Session*> session) {
 	auto emoji = TextWithEntities{
 		.text = (QString(QChar(0xD83D)) + QChar(0xDC8E)),
 	};
@@ -105,6 +108,14 @@ void AddEmojiToMajor(
 			emoji = Data::SingleCustomEmoji(sticker.document);
 		}
 	}
+	return emoji;
+}
+
+void AddEmojiToMajor(
+		not_null<Ui::FlatLabel*> label,
+		not_null<Main::Session*> session,
+		float64 value) {
+	auto emoji = EmojiCurrency(session);
 	label->setMarkedText(
 		emoji.append(' ').append(QString::number(int64(value))),
 		Core::MarkedTextContext{
@@ -142,6 +153,7 @@ void InnerWidget::fill() {
 	const auto container = this;
 
 	constexpr auto kMinus = QChar(0x2212);
+	constexpr auto kApproximately = QChar(0x2248);
 	const auto currency = u"TON"_q;
 	const auto multiplier = 3.8; // Debug.
 
@@ -224,7 +236,7 @@ void InnerWidget::fill() {
 				container,
 				object_ptr<Ui::FlatLabel>(
 					container,
-					QString(QChar(0x2248))
+					QString(kApproximately)
 						+ QChar('$')
 						+ QString::number(value * multiplier),
 					st::channelEarnOverviewSubMinorLabel)));
@@ -346,7 +358,7 @@ void InnerWidget::fill() {
 				st::channelEarnOverviewMinorLabel);
 			const auto secondMinorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
-				QString(QChar(0x2248))
+				QString(kApproximately)
 					+ QChar('$')
 					+ QString::number(value * multiplier),
 				st::channelEarnOverviewSubMinorLabel);
@@ -651,6 +663,125 @@ void InnerWidget::fill() {
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
+	if (const auto channel = _peer->asChannel()) {
+		constexpr auto kMaxCPM = 50; // Debug.
+		const auto &phrase = tr::lng_channel_earn_off;
+		const auto button = container->add(object_ptr<Ui::SettingsButton>(
+			container,
+			phrase(),
+			st::settingsButtonNoIcon));
+
+		constexpr auto kMinLevel = 30; // Debug.
+		AddLevelBadge(
+			kMinLevel,
+			button,
+			nullptr,
+			channel,
+			QMargins(st::boxRowPadding.left(), 0, 0, 0),
+			phrase());
+
+		const auto wrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)),
+			st::boxRowPadding);
+		const auto inner = wrap->entity();
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+		const auto line = inner->add(object_ptr<Ui::RpWidget>(inner));
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+		const auto left = Ui::CreateChild<Ui::FlatLabel>(
+			line,
+			tr::lng_channel_earn_cpm_min(),
+			st::defaultFlatLabel);
+		const auto center = Ui::CreateChild<Ui::FlatLabel>(
+			line,
+			st::defaultFlatLabel);
+		const auto right = Ui::CreateChild<Ui::FlatLabel>(
+			line,
+			st::defaultFlatLabel);
+		AddEmojiToMajor(right, session, kMaxCPM);
+		const auto slider = Ui::CreateChild<Ui::MediaSlider>(
+			line,
+			st::settingsScale);
+		rpl::combine(
+			line->sizeValue(),
+			left->sizeValue(),
+			center->sizeValue(),
+			right->sizeValue()
+		) | rpl::start_with_next([=](
+				const QSize &s,
+				const QSize &leftSize,
+				const QSize &centerSize,
+				const QSize &rightSize) {
+			const auto sliderHeight = st::settingsScale.seekSize.height();
+			line->resize(
+				line->width(),
+				leftSize.height() + sliderHeight * 2);
+			{
+				const auto r = line->rect();
+				slider->setGeometry(
+					0,
+					r.height() - sliderHeight,
+					r.width(),
+					sliderHeight);
+			}
+			left->moveToLeft(0, 0);
+			right->moveToRight(0, 0);
+			center->moveToLeft((s.width() - centerSize.width()) / 2, 0);
+		}, line->lifetime());
+
+		const auto updateLabels = [=](int cpm) {
+			const auto activeColor = st::windowActiveTextFg->c;
+			left->setTextColorOverride(!cpm
+				? std::make_optional(activeColor)
+				: std::nullopt);
+
+			if (cpm > 0 && cpm < kMaxCPM) {
+				center->setMarkedText(
+					tr::lng_channel_earn_cpm(
+						tr::now,
+						lt_count,
+						cpm,
+						lt_emoji,
+						EmojiCurrency(session),
+						Ui::Text::RichLangValue),
+					Core::MarkedTextContext{
+						.session = session,
+						.customEmojiRepaint = [center] { center->update(); },
+					});
+			} else {
+				center->setText({});
+			}
+			center->setTextColorOverride(activeColor);
+
+			right->setTextColorOverride((cpm == kMaxCPM)
+				? std::make_optional(activeColor)
+				: std::nullopt);
+		};
+		const auto current = kMaxCPM / 2;
+		slider->setPseudoDiscrete(
+			kMaxCPM + 1,
+			[=](int index) { return index; },
+			current,
+			updateLabels,
+			updateLabels);
+		updateLabels(current);
+
+		wrap->toggle(false, anim::type::instant);
+		button->toggleOn(
+			rpl::single(false) // Debug.
+		)->toggledChanges(
+		) | rpl::filter([=](bool toggled) {
+			return true;
+		}) | rpl::start_with_next([=](bool toggled) {
+			wrap->toggle(toggled, anim::type::normal);
+		}, container->lifetime());
+
+		Ui::AddDividerText(container, tr::lng_channel_earn_off_about());
+	}
+	Ui::AddSkip(container);
 }
 
 void InnerWidget::saveState(not_null<Memento*> memento) {

From 5d2726036f7fcadf9faa9bb1c6c74865c08a4a38 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 21 Mar 2024 05:04:14 +0300
Subject: [PATCH 150/596] Slightly improved style of channel earn info section.

---
 .../earn/channel_earn.style                   |   1 +
 .../earn/info_earn_inner_widget.cpp           | 141 +++++++++---------
 2 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index f474c738c..1dea3e14c 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -10,6 +10,7 @@ using "boxes/boxes.style";
 
 channelEarnLearnArrowMargins: margins(-2px, 5px, 0px, 0px);
 
+channelEarnOverviewTitleSkip: 11px;
 channelEarnOverviewMajorLabel: FlatLabel(defaultFlatLabel) {
 	maxHeight: 30px;
 	style: TextStyle(defaultTextStyle) {
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index ff1422e26..bb354144d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -54,12 +54,14 @@ namespace {
 void AddHeader(
 		not_null<Ui::VerticalLayout*> content,
 		tr::phrase<> text) {
+	Ui::AddSkip(content);
 	const auto header = content->add(
-		object_ptr<Statistic::Header>(content),
-		st::statisticsLayerMargins + st::boostsChartHeaderPadding);
+		object_ptr<Ui::FlatLabel>(
+			content,
+			text(),
+			st::channelEarnSemiboldLabel),
+		st::boxRowPadding);
 	header->resizeToWidth(header->width());
-	header->setTitle(text(tr::now));
-	header->setSubTitle({});
 }
 
 void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
@@ -194,6 +196,69 @@ void InnerWidget::fill() {
 	};
 	addAboutWithLearn(tr::lng_channel_earn_about);
 	Ui::AddSkip(container);
+	{
+		AddHeader(container, tr::lng_channel_earn_overview_title);
+		Ui::AddSkip(container, st::channelEarnOverviewTitleSkip);
+
+		const auto addOverviewEntry = [&](
+				float64 value,
+				const tr::phrase<> &text) {
+			value = base::RandomIndex(1000000) / 1000.; // Debug.
+			const auto line = container->add(
+				Ui::CreateSkipWidget(container, 0),
+				st::boxRowPadding);
+			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				st::channelEarnOverviewMajorLabel);
+			AddEmojiToMajor(majorLabel, session, value);
+			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				QString::number(value - int64(value)).mid(1),
+				st::channelEarnOverviewMinorLabel);
+			const auto secondMinorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				QString(kApproximately)
+					+ QChar('$')
+					+ QString::number(value * multiplier),
+				st::channelEarnOverviewSubMinorLabel);
+			rpl::combine(
+				line->widthValue(),
+				majorLabel->sizeValue()
+			) | rpl::start_with_next([=](int available, const QSize &size) {
+				line->resize(line->width(), size.height());
+				minorLabel->moveToLeft(
+					size.width(),
+					st::channelEarnOverviewMinorLabelSkip);
+				secondMinorLabel->resizeToWidth(available
+					- size.width()
+					- minorLabel->width());
+				secondMinorLabel->moveToLeft(
+					rect::right(minorLabel)
+						+ st::channelEarnOverviewSubMinorLabelPos.x(),
+					st::channelEarnOverviewSubMinorLabelPos.y());
+			}, minorLabel->lifetime());
+
+			Ui::AddSkip(container);
+			const auto sub = container->add(
+				object_ptr<Ui::FlatLabel>(
+					container,
+					text(),
+					st::channelEarnOverviewSubMinorLabel),
+				st::boxRowPadding);
+			sub->setTextColorOverride(st::windowSubTextFg->c);
+		};
+		addOverviewEntry(0, tr::lng_channel_earn_available);
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		addOverviewEntry(0, tr::lng_channel_earn_reward);
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		addOverviewEntry(0, tr::lng_channel_earn_total);
+		Ui::AddSkip(container);
+	}
+	Ui::AddSkip(container);
+	Ui::AddDivider(container);
+	Ui::AddSkip(container);
 	{
 		const auto value = 54.12; // Debug.
 		Ui::AddSkip(container);
@@ -332,79 +397,15 @@ void InnerWidget::fill() {
 
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
-	}
-	addAboutWithLearn(tr::lng_channel_earn_balance_about);
-	Ui::AddSkip(container);
-	{
-		Ui::AddSkip(container);
-		AddHeader(container, tr::lng_channel_earn_overview_title);
-		Ui::AddSkip(container);
-		Ui::AddSkip(container);
-
-		const auto addOverviewEntry = [&](
-				float64 value,
-				const tr::phrase<> &text) {
-			value = base::RandomIndex(1000000) / 1000.; // Debug.
-			const auto line = container->add(
-				Ui::CreateSkipWidget(container, 0),
-				st::boxRowPadding);
-			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
-				line,
-				st::channelEarnOverviewMajorLabel);
-			AddEmojiToMajor(majorLabel, session, value);
-			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
-				line,
-				QString::number(value - int64(value)).mid(1),
-				st::channelEarnOverviewMinorLabel);
-			const auto secondMinorLabel = Ui::CreateChild<Ui::FlatLabel>(
-				line,
-				QString(kApproximately)
-					+ QChar('$')
-					+ QString::number(value * multiplier),
-				st::channelEarnOverviewSubMinorLabel);
-			rpl::combine(
-				line->widthValue(),
-				majorLabel->sizeValue()
-			) | rpl::start_with_next([=](int available, const QSize &size) {
-				line->resize(line->width(), size.height());
-				minorLabel->moveToLeft(
-					size.width(),
-					st::channelEarnOverviewMinorLabelSkip);
-				secondMinorLabel->resizeToWidth(available
-					- size.width()
-					- minorLabel->width());
-				secondMinorLabel->moveToLeft(
-					rect::right(minorLabel)
-						+ st::channelEarnOverviewSubMinorLabelPos.x(),
-					st::channelEarnOverviewSubMinorLabelPos.y());
-			}, minorLabel->lifetime());
-
-			Ui::AddSkip(container);
-			const auto sub = container->add(
-				object_ptr<Ui::FlatLabel>(
-					container,
-					text(),
-					st::channelEarnOverviewSubMinorLabel),
-				st::boxRowPadding);
-			sub->setTextColorOverride(st::windowSubTextFg->c);
-		};
-		addOverviewEntry(0, tr::lng_channel_earn_available);
-		Ui::AddSkip(container);
-		Ui::AddSkip(container);
-		addOverviewEntry(0, tr::lng_channel_earn_reward);
-		Ui::AddSkip(container);
-		Ui::AddSkip(container);
-		addOverviewEntry(0, tr::lng_channel_earn_total);
+		addAboutWithLearn(tr::lng_channel_earn_balance_about);
 		Ui::AddSkip(container);
 	}
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 	{
-		Ui::AddSkip(container);
 		AddHeader(container, tr::lng_channel_earn_history_title);
 		Ui::AddSkip(container);
-		Ui::AddSkip(container);
 
 		struct HistoryEntry final {
 			TimeId from = 0;
@@ -690,7 +691,6 @@ void InnerWidget::fill() {
 		Ui::AddSkip(inner);
 		const auto line = inner->add(object_ptr<Ui::RpWidget>(inner));
 		Ui::AddSkip(inner);
-		Ui::AddSkip(inner);
 		const auto left = Ui::CreateChild<Ui::FlatLabel>(
 			line,
 			tr::lng_channel_earn_cpm_min(),
@@ -779,6 +779,7 @@ void InnerWidget::fill() {
 			wrap->toggle(toggled, anim::type::normal);
 		}, container->lifetime());
 
+		Ui::AddSkip(container);
 		Ui::AddDividerText(container, tr::lng_channel_earn_off_about());
 	}
 	Ui::AddSkip(container);

From 538934a88a2ab4eba37c8ff4a7742151e518696b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 21 Mar 2024 19:32:38 +0300
Subject: [PATCH 151/596] Added learn more box to channel earn info section.

---
 .../earn/channel_earn.style                   |   6 +
 .../earn/info_earn_inner_widget.cpp           | 205 ++++++++++++++----
 2 files changed, 174 insertions(+), 37 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 1dea3e14c..653f3c87b 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -101,3 +101,9 @@ channelEarnBalanceMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
 	}
 }
 channelEarnBalanceMinorLabelSkip: 6px;
+
+channelEarnLearnDescription: FlatLabel(defaultFlatLabel) {
+	maxHeight: 0px;
+	minWidth: 280px;
+	align: align(top);
+}
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index bb354144d..189e56652 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -14,28 +14,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_peer.h"
 #include "data/data_session.h"
-#include "data/data_session.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "info/info_controller.h"
 #include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "settings/settings_common.h"
-#include "statistics/widgets/chart_header_widget.h"
 #include "ui/controls/userpic_button.h"
-#include "ui/effects/animation_value.h"
 #include "ui/effects/animation_value_f.h"
-#include "ui/effects/animations.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
-#include "ui/widgets/buttons.h"
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/fields/input_field.h"
-#include "ui/widgets/labels.h"
-#include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
 #include "styles/style_channel_earn.h"
@@ -113,19 +105,6 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 	return emoji;
 }
 
-void AddEmojiToMajor(
-		not_null<Ui::FlatLabel*> label,
-		not_null<Main::Session*> session,
-		float64 value) {
-	auto emoji = EmojiCurrency(session);
-	label->setMarkedText(
-		emoji.append(' ').append(QString::number(int64(value))),
-		Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = [label] { label->update(); },
-		});
-}
-
 [[nodiscard]] QString FormatDate(TimeId date) {
 	const auto parsedDate = base::unixtime::parse(date);
 	return tr::lng_group_call_starts_short_date(
@@ -160,13 +139,27 @@ void InnerWidget::fill() {
 	const auto multiplier = 3.8; // Debug.
 
 	const auto session = &_peer->session();
+	const auto makeContext = [=](not_null<Ui::FlatLabel*> l) {
+		return Core::MarkedTextContext{
+			.session = session,
+			.customEmojiRepaint = [=] { l->update(); },
+		};
+	};
+	const auto addEmojiToMajor = [=](
+			not_null<Ui::FlatLabel*> label,
+			float64 value) {
+		auto emoji = EmojiCurrency(session);
+		label->setMarkedText(
+			emoji.append(' ').append(QString::number(int64(value))),
+			makeContext(label));
+	};
 
+	const auto arrow = Ui::Text::SingleCustomEmoji(
+		session->data().customEmojiManager().registerInternalEmoji(
+			st::topicButtonArrow,
+			st::channelEarnLearnArrowMargins,
+			false));
 	const auto addAboutWithLearn = [&](const tr::phrase<lngtag_link> &text) {
-		const auto emoji = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::topicButtonArrow,
-				st::channelEarnLearnArrowMargins,
-				false));
 		auto label = object_ptr<Ui::FlatLabel>(
 			container,
 			st::boxDividerLabel);
@@ -175,18 +168,159 @@ void InnerWidget::fill() {
 			lt_link,
 			tr::lng_channel_earn_about_link(
 				lt_emoji,
-				rpl::single(emoji),
+				rpl::single(arrow),
 				Ui::Text::RichLangValue
 			) | rpl::map([](TextWithEntities text) {
 				return Ui::Text::Link(std::move(text), 1);
 			}),
 			Ui::Text::RichLangValue
 		) | rpl::start_with_next([=](const TextWithEntities &text) {
-			raw->setMarkedText(
-				text,
-				Core::MarkedTextContext{ .session = session });
+			raw->setMarkedText(text, makeContext(raw));
 		}, label->lifetime());
 		label->setLink(1, std::make_shared<LambdaClickHandler>([=] {
+			_show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+				box->setNoContentMargin(true);
+
+				const auto content = box->verticalLayout().get();
+
+				Ui::AddSkip(content);
+				Ui::AddSkip(content);
+				Ui::AddSkip(content);
+				box->addRow(object_ptr<Ui::CenterWrap<>>(
+					content,
+					object_ptr<Ui::FlatLabel>(
+						content,
+						tr::lng_channel_earn_learn_title(),
+						st::boxTitle)));
+				Ui::AddSkip(content);
+				Ui::AddSkip(content);
+				Ui::AddSkip(content);
+				Ui::AddSkip(content);
+				{
+					const auto padding = QMargins(
+						st::settingsButton.padding.left(),
+						st::boxRowPadding.top(),
+						st::boxRowPadding.right(),
+						st::boxRowPadding.bottom());
+					const auto addEntry = [&](
+							rpl::producer<QString> title,
+							rpl::producer<QString> about,
+							const style::icon &icon) {
+						const auto top = content->add(
+							object_ptr<Ui::FlatLabel>(
+								content,
+								std::move(title),
+								st::channelEarnSemiboldLabel),
+							padding);
+						Ui::AddSkip(content, st::channelEarnHistoryThreeSkip);
+						content->add(
+							object_ptr<Ui::FlatLabel>(
+								content,
+								std::move(about),
+								st::channelEarnHistoryRecipientLabel),
+							padding);
+						const auto left = Ui::CreateChild<Ui::RpWidget>(
+							box->verticalLayout().get());
+						left->paintRequest(
+						) | rpl::start_with_next([=] {
+							auto p = Painter(left);
+							icon.paint(p, 0, 0, left->width());
+						}, left->lifetime());
+						left->resize(icon.size());
+						top->geometryValue(
+						) | rpl::start_with_next([=](const QRect &g) {
+							left->moveToLeft(
+								(g.left() - left->width()) / 2,
+								g.top() + st::channelEarnHistoryThreeSkip);
+						}, left->lifetime());
+					};
+					addEntry(
+						tr::lng_channel_earn_learn_in_subtitle(),
+						tr::lng_channel_earn_learn_in_about(),
+						st::getBoostsButtonIcon);
+					Ui::AddSkip(content);
+					Ui::AddSkip(content);
+					addEntry(
+						tr::lng_channel_earn_learn_split_subtitle(),
+						tr::lng_channel_earn_learn_split_about(),
+						st::getBoostsButtonIcon);
+					Ui::AddSkip(content);
+					Ui::AddSkip(content);
+					addEntry(
+						tr::lng_channel_earn_learn_out_subtitle(),
+						tr::lng_channel_earn_learn_out_about(),
+						st::getBoostsButtonIcon);
+					Ui::AddSkip(content);
+					Ui::AddSkip(content);
+				}
+				Ui::AddSkip(content);
+				Ui::AddSkip(content);
+				{
+					const auto l = box->addRow(
+						object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+							content,
+							object_ptr<Ui::FlatLabel>(
+								content,
+								st::boxTitle)))->entity();
+					tr::lng_channel_earn_learn_coin_title(
+						lt_emoji,
+						rpl::single(
+							Ui::Text::Link(EmojiCurrency(session), 1)),
+						Ui::Text::RichLangValue
+					) | rpl::start_with_next([=](TextWithEntities t) {
+						l->setMarkedText(std::move(t), makeContext(l));
+					}, l->lifetime());
+					const auto diamonds = l->lifetime().make_state<int>(0);
+					l->setLink(1, std::make_shared<LambdaClickHandler>([=] {
+						const auto count = (*diamonds);
+						box->showToast((count == 100)
+							? u"You are rich now!"_q
+							: (u"You have earned "_q
+								+ QString::number(++(*diamonds))
+								+ (!count
+									? u" diamond!"_q
+									: u" diamonds!"_q)));
+					}));
+				}
+				Ui::AddSkip(content);
+				{
+					const auto label = box->addRow(
+						object_ptr<Ui::FlatLabel>(
+							content,
+							st::channelEarnLearnDescription));
+					tr::lng_channel_earn_learn_coin_about(
+						lt_link,
+						tr::lng_channel_earn_about_link(
+							lt_emoji,
+							rpl::single(arrow),
+							Ui::Text::RichLangValue
+						) | rpl::map([](TextWithEntities text) {
+							return Ui::Text::Link(std::move(text), 1);
+						}),
+						Ui::Text::RichLangValue
+					) | rpl::start_with_next([=, l = label](
+							TextWithEntities t) {
+						l->setMarkedText(std::move(t), makeContext(l));
+						l->resizeToWidth(box->width()
+							- rect::m::sum::h(st::boxRowPadding));
+					}, label->lifetime());
+				}
+				Ui::AddSkip(content);
+				Ui::AddSkip(content);
+				{
+					const auto &st = st::premiumPreviewDoubledLimitsBox;
+					box->setStyle(st);
+					auto button = object_ptr<Ui::RoundButton>(
+						container,
+						tr::lng_channel_earn_learn_close(),
+						st::defaultActiveButton);
+					button->resizeToWidth(box->width()
+						- st.buttonPadding.left()
+						- st.buttonPadding.left());
+					button->setClickedCallback([=] { box->closeBox(); });
+					box->addButton(std::move(button));
+				}
+			}));
 		}));
 		container->add(object_ptr<Ui::DividerLabel>(
 			container,
@@ -210,7 +344,7 @@ void InnerWidget::fill() {
 			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
 				st::channelEarnOverviewMajorLabel);
-			AddEmojiToMajor(majorLabel, session, value);
+			addEmojiToMajor(majorLabel, value);
 			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
 				QString::number(value - int64(value)).mid(1),
@@ -273,7 +407,7 @@ void InnerWidget::fill() {
 		const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
 			st::channelEarnBalanceMajorLabel);
-		AddEmojiToMajor(majorLabel, session, value);
+		addEmojiToMajor(majorLabel, value);
 		majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 		const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
@@ -701,7 +835,7 @@ void InnerWidget::fill() {
 		const auto right = Ui::CreateChild<Ui::FlatLabel>(
 			line,
 			st::defaultFlatLabel);
-		AddEmojiToMajor(right, session, kMaxCPM);
+		addEmojiToMajor(right, kMaxCPM);
 		const auto slider = Ui::CreateChild<Ui::MediaSlider>(
 			line,
 			st::settingsScale);
@@ -747,10 +881,7 @@ void InnerWidget::fill() {
 						lt_emoji,
 						EmojiCurrency(session),
 						Ui::Text::RichLangValue),
-					Core::MarkedTextContext{
-						.session = session,
-						.customEmojiRepaint = [center] { center->update(); },
-					});
+					makeContext(center));
 			} else {
 				center->setText({});
 			}

From 479bb2a1d652a6b5bf8d957c854750fe3e9bfe2e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 21 Mar 2024 19:47:48 +0300
Subject: [PATCH 152/596] Added focus to input field in channel earn info
 section.

---
 .../channel_statistics/earn/info_earn_inner_widget.cpp    | 8 ++++++++
 .../info/channel_statistics/earn/info_earn_inner_widget.h | 2 ++
 .../info/channel_statistics/earn/info_earn_widget.cpp     | 4 ++++
 .../info/channel_statistics/earn/info_earn_widget.h       | 1 +
 4 files changed, 15 insertions(+)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 189e56652..cc3b347ec 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -449,6 +449,10 @@ void InnerWidget::fill() {
 				Ui::InputField::Mode::MultiLine,
 				tr::lng_channel_earn_balance_placeholder()),
 			st::boxRowPadding);
+		_focusRequested.events(
+		) | rpl::start_with_next([=] {
+			input->setFocusFast();
+		}, input->lifetime());
 
 		Ui::AddSkip(container);
 
@@ -942,6 +946,10 @@ void InnerWidget::showFinished() {
 	_showFinished.fire({});
 }
 
+void InnerWidget::setInnerFocus() {
+	_focusRequested.fire({});
+}
+
 not_null<PeerData*> InnerWidget::peer() const {
 	return _peer;
 }
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
index 00cf03149..a4a63fda3 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
@@ -38,6 +38,7 @@ public:
 	[[nodiscard]] rpl::producer<ShowRequest> showRequests() const;
 
 	void showFinished();
+	void setInnerFocus();
 
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
@@ -55,6 +56,7 @@ private:
 	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
 	rpl::event_stream<ShowRequest> _showRequests;
 	rpl::event_stream<> _showFinished;
+	rpl::event_stream<> _focusRequested;
 	rpl::event_stream<bool> _loaded;
 
 };
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.cpp
index fb50472db..b0c38e1ad 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.cpp
@@ -95,6 +95,10 @@ void Widget::showFinished() {
 	_inner->showFinished();
 }
 
+void Widget::setInnerFocus() {
+	_inner->setInnerFocus();
+}
+
 std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
 	auto result = std::make_shared<Memento>(controller());
 	saveState(result.get());
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
index a79dd897a..287e72338 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
@@ -47,6 +47,7 @@ public:
 	rpl::producer<QString> title() override;
 	rpl::producer<bool> desiredShadowVisibility() const override;
 	void showFinished() override;
+	void setInnerFocus() override;
 
 	[[nodiscard]] not_null<PeerData*> peer() const;
 

From a278aa0f89175094a871f72e469d2ece136463a3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 20:56:58 +0300
Subject: [PATCH 153/596] Added initial api support for channel earn
 statistics.

---
 Telegram/SourceFiles/api/api_statistics.cpp | 108 ++++++++++++++++++++
 Telegram/SourceFiles/api/api_statistics.h   |  21 ++++
 Telegram/SourceFiles/data/data_statistics.h |  49 +++++++++
 3 files changed, 178 insertions(+)

diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index 789211f33..78028313b 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_statistics.h"
 
 #include "apiwrap.h"
+#include "base/unixtime.h"
 #include "data/data_channel.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
@@ -746,4 +747,111 @@ Data::BoostStatus Boosts::boostStatus() const {
 	return _boostStatus;
 }
 
+EarnStatistics::EarnStatistics(not_null<ChannelData*> channel)
+: StatisticsRequestSender(channel) {
+}
+
+rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		makeRequest(MTPstats_GetBroadcastRevenueStats(
+			MTP_flags(0),
+			channel()->inputChannel
+		)).done([=](const MTPstats_BroadcastRevenueStats &result) {
+			const auto &data = result.data();
+
+			_data = Data::EarnStatistics{
+				.topHoursGraph = StatisticalGraphFromTL(
+					data.vtop_hours_graph()),
+				.revenueGraph = StatisticalGraphFromTL(data.vrevenue_graph()),
+				.currentBalance = data.vcurrent_balance().v,
+				.availableBalance = data.vavailable_balance().v,
+				.overallRevenue = data.voverall_revenue().v,
+				.usdRate = data.vusd_rate().v,
+			};
+
+			requestBoosts({}, [=](Data::EarnHistorySlice &&slice) {
+				_data.firstHistorySlice = std::move(slice);
+				consumer.put_done();
+			});
+		}).fail([=](const MTP::Error &error) {
+			consumer.put_error_copy(error.type());
+		}).send();
+
+		return lifetime;
+	};
+}
+
+void EarnStatistics::requestBoosts(
+		const Data::EarnHistorySlice::OffsetToken &token,
+		Fn<void(Data::EarnHistorySlice)> done) {
+	if (_requestId) {
+		return;
+	}
+	constexpr auto kTlFirstSlice = tl::make_int(kFirstSlice);
+	constexpr auto kTlLimit = tl::make_int(kLimit);
+	_requestId = api().request(MTPstats_GetBroadcastRevenueTransactions(
+		channel()->inputChannel,
+		MTP_int(token),
+		(!token) ? kTlFirstSlice : kTlLimit
+	)).done([=](const MTPstats_BroadcastRevenueTransactions &result) {
+		_requestId = 0;
+
+		const auto &tlTransactions = result.data().vtransactions().v;
+
+		auto list = std::vector<Data::EarnHistoryEntry>();
+		list.reserve(tlTransactions.size());
+		for (const auto &tlTransaction : tlTransactions) {
+			list.push_back(tlTransaction.match([&](
+					const MTPDbroadcastRevenueTransactionProceeds &d) {
+				return Data::EarnHistoryEntry{
+					.type = Data::EarnHistoryEntry::Type::In,
+					.amount = d.vamount().v,
+					.date = base::unixtime::parse(d.vfrom_date().v),
+					.dateTo = base::unixtime::parse(d.vto_date().v),
+				};
+			}, [&](const MTPDbroadcastRevenueTransactionWithdrawal &d) {
+				return Data::EarnHistoryEntry{
+					.type = Data::EarnHistoryEntry::Type::Out,
+					.status = d.is_pending()
+						? Data::EarnHistoryEntry::Status::Pending
+						: d.is_failed()
+						? Data::EarnHistoryEntry::Status::Failed
+						: Data::EarnHistoryEntry::Status::Success,
+					.amount = d.vamount().v,
+					.date = base::unixtime::parse(d.vdate().v),
+					.provider = qs(d.vprovider()),
+					.successDate = d.vtransaction_date()
+						? base::unixtime::parse(d.vtransaction_date()->v)
+						: QDateTime(),
+					.successLink = d.vtransaction_url()
+						? qs(*d.vtransaction_url())
+						: QString(),
+				};
+			}, [&](const MTPDbroadcastRevenueTransactionRefund &d) {
+				return Data::EarnHistoryEntry{
+					.type = Data::EarnHistoryEntry::Type::Return,
+					.amount = d.vamount().v,
+					.date = base::unixtime::parse(d.vdate().v),
+					.provider = qs(d.vprovider()),
+				};
+			}));
+		}
+		const auto nextToken = token + tlTransactions.size();
+		done(Data::EarnHistorySlice{
+			.list = std::move(list),
+			.total = result.data().vcount().v,
+			.allLoaded = (result.data().vcount().v == nextToken),
+			.token = Data::EarnHistorySlice::OffsetToken(nextToken),
+		});
+	}).fail([=] {
+		_requestId = 0;
+	}).send();
+}
+
+Data::EarnStatistics EarnStatistics::data() const {
+	return _data;
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_statistics.h b/Telegram/SourceFiles/api/api_statistics.h
index f5360adb2..2643ae1bc 100644
--- a/Telegram/SourceFiles/api/api_statistics.h
+++ b/Telegram/SourceFiles/api/api_statistics.h
@@ -107,6 +107,27 @@ private:
 
 };
 
+class EarnStatistics final : public StatisticsRequestSender {
+public:
+	explicit EarnStatistics(not_null<ChannelData*> channel);
+
+	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
+	void requestBoosts(
+		const Data::EarnHistorySlice::OffsetToken &token,
+		Fn<void(Data::EarnHistorySlice)> done);
+
+	[[nodiscard]] Data::EarnStatistics data() const;
+
+	static constexpr auto kFirstSlice = int(10);
+	static constexpr auto kLimit = int(40);
+
+private:
+	Data::EarnStatistics _data;
+
+	mtpRequestId _requestId = 0;
+
+};
+
 class Boosts final {
 public:
 	explicit Boosts(not_null<PeerData*> peer);
diff --git a/Telegram/SourceFiles/data/data_statistics.h b/Telegram/SourceFiles/data/data_statistics.h
index 9d2b2c74a..5e438d88d 100644
--- a/Telegram/SourceFiles/data/data_statistics.h
+++ b/Telegram/SourceFiles/data/data_statistics.h
@@ -155,4 +155,53 @@ struct PublicForwardsSlice final {
 	OffsetToken token;
 };
 
+struct EarnHistoryEntry final {
+	enum class Type {
+		In,
+		Out,
+		Return,
+	};
+
+	enum class Status {
+		Success,
+		Failed,
+		Pending,
+	};
+
+	Type type;
+	Status status;
+
+	uint64 amount = 0;
+	QDateTime date;
+	QDateTime dateTo;
+
+	QString provider;
+
+	QDateTime successDate;
+	QString successLink;
+
+};
+
+struct EarnHistorySlice final {
+	using OffsetToken = int;
+	std::vector<EarnHistoryEntry> list;
+	int total = 0;
+	bool allLoaded = false;
+	OffsetToken token;
+};
+
+struct EarnStatistics final {
+	explicit operator bool() const {
+		return !!usdRate;
+	}
+	Data::StatisticalGraph topHoursGraph;
+	Data::StatisticalGraph revenueGraph;
+	uint64 currentBalance = 0;
+	uint64 availableBalance = 0;
+	uint64 overallRevenue = 0;
+	float64 usdRate = 0.;
+
+	EarnHistorySlice firstHistorySlice;
+};
+
 } // namespace Data

From a14c0f5253ab38d9ab9067358646ebdfb8e56b03 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Mar 2024 21:41:09 +0300
Subject: [PATCH 154/596] Added initial support of channel earn data in
 appropriate info section.

---
 .../earn/info_earn_inner_widget.cpp           | 152 +++++++++---------
 .../earn/info_earn_inner_widget.h             |   3 +-
 .../earn/info_earn_widget.h                   |   6 +-
 3 files changed, 77 insertions(+), 84 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index cc3b347ec..fa973c65f 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/channel_statistics/earn/info_earn_inner_widget.h"
 
+#include "api/api_statistics.h"
 #include "base/random.h"
 #include "base/unixtime.h"
 #include "boxes/peers/edit_peer_color_box.h" // AddLevelBadge.
@@ -15,8 +16,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "info/channel_statistics/earn/info_earn_widget.h"
 #include "info/info_controller.h"
 #include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
+#include "info/statistics/info_statistics_inner_widget.h" // FillLoading.
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/controls/userpic_button.h"
@@ -37,12 +40,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_settings.h"
 #include "styles/style_statistics.h"
 
-#include <QUuid>
 #include <QtWidgets/QApplication>
 
 namespace Info::ChannelEarn {
 namespace {
 
+constexpr auto kMinorPartLength = 9;
+
 void AddHeader(
 		not_null<Ui::VerticalLayout*> content,
 		tr::phrase<> text) {
@@ -105,14 +109,13 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 	return emoji;
 }
 
-[[nodiscard]] QString FormatDate(TimeId date) {
-	const auto parsedDate = base::unixtime::parse(date);
+[[nodiscard]] QString FormatDate(const QDateTime &date) {
 	return tr::lng_group_call_starts_short_date(
 		tr::now,
 		lt_date,
-		langDayOfMonth(parsedDate.date()),
+		langDayOfMonth(date.date()),
 		lt_time,
-		QLocale().toString(parsedDate.time(), QLocale::ShortFormat));
+		QLocale().toString(date.time(), QLocale::ShortFormat));
 }
 
 } // namespace
@@ -128,15 +131,34 @@ InnerWidget::InnerWidget(
 }
 
 void InnerWidget::load() {
+	const auto api = lifetime().make_state<Api::EarnStatistics>(
+		_peer->asChannel());
+
+	Info::Statistics::FillLoading(
+		this,
+		_loaded.events_starting_with(false) | rpl::map(!rpl::mappers::_1),
+		_showFinished.events());
+
+	_showFinished.events(
+	) | rpl::take(1) | rpl::start_with_next([=] {
+		api->request(
+		) | rpl::start_with_error_done([](const QString &error) {
+		}, [=] {
+			_state = api->data();
+			_loaded.fire(true);
+			fill();
+		}, lifetime());
+	}, lifetime());
 }
 
 void InnerWidget::fill() {
 	const auto container = this;
+	const auto &data = _state;
 
 	constexpr auto kMinus = QChar(0x2212);
 	constexpr auto kApproximately = QChar(0x2248);
 	const auto currency = u"TON"_q;
-	const auto multiplier = 3.8; // Debug.
+	const auto multiplier = data.usdRate;
 
 	const auto session = &_peer->session();
 	const auto makeContext = [=](not_null<Ui::FlatLabel*> l) {
@@ -150,7 +172,7 @@ void InnerWidget::fill() {
 			float64 value) {
 		auto emoji = EmojiCurrency(session);
 		label->setMarkedText(
-			emoji.append(' ').append(QString::number(int64(value))),
+			emoji.append(' ').append(QString::number(uint64(value))),
 			makeContext(label));
 	};
 
@@ -334,10 +356,9 @@ void InnerWidget::fill() {
 		AddHeader(container, tr::lng_channel_earn_overview_title);
 		Ui::AddSkip(container, st::channelEarnOverviewTitleSkip);
 
-		const auto addOverviewEntry = [&](
+		const auto addOverview = [&](
 				float64 value,
 				const tr::phrase<> &text) {
-			value = base::RandomIndex(1000000) / 1000.; // Debug.
 			const auto line = container->add(
 				Ui::CreateSkipWidget(container, 0),
 				st::boxRowPadding);
@@ -347,7 +368,7 @@ void InnerWidget::fill() {
 			addEmojiToMajor(majorLabel, value);
 			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
-				QString::number(value - int64(value)).mid(1),
+				QString::number(value - uint64(value)).mid(1),
 				st::channelEarnOverviewMinorLabel);
 			const auto secondMinorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
@@ -371,6 +392,7 @@ void InnerWidget::fill() {
 						+ st::channelEarnOverviewSubMinorLabelPos.x(),
 					st::channelEarnOverviewSubMinorLabelPos.y());
 			}, minorLabel->lifetime());
+			Ui::ToggleChildrenVisibility(line, true);
 
 			Ui::AddSkip(container);
 			const auto sub = container->add(
@@ -381,20 +403,20 @@ void InnerWidget::fill() {
 				st::boxRowPadding);
 			sub->setTextColorOverride(st::windowSubTextFg->c);
 		};
-		addOverviewEntry(0, tr::lng_channel_earn_available);
+		addOverview(data.availableBalance, tr::lng_channel_earn_available);
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
-		addOverviewEntry(0, tr::lng_channel_earn_reward);
+		addOverview(data.currentBalance, tr::lng_channel_earn_reward);
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
-		addOverviewEntry(0, tr::lng_channel_earn_total);
+		addOverview(data.overallRevenue, tr::lng_channel_earn_total);
 		Ui::AddSkip(container);
 	}
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 	{
-		const auto value = 54.12; // Debug.
+		const auto value = data.availableBalance;
 		Ui::AddSkip(container);
 		AddHeader(container, tr::lng_channel_earn_balance_title);
 		Ui::AddSkip(container);
@@ -411,7 +433,7 @@ void InnerWidget::fill() {
 		majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 		const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
-			QString::number(value - int64(value)).mid(1),
+			QString::number(value - uint64(value)).mid(1),
 			st::channelEarnBalanceMinorLabel);
 		minorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 		rpl::combine(
@@ -428,6 +450,7 @@ void InnerWidget::fill() {
 				0,
 				st::channelEarnBalanceMinorLabelSkip);
 		}, labels->lifetime());
+		Ui::ToggleChildrenVisibility(labels, true);
 
 		Ui::AddSkip(container);
 		container->add(
@@ -532,6 +555,7 @@ void InnerWidget::fill() {
 				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 			}));
 		});
+		Ui::ToggleChildrenVisibility(button, true);
 
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
@@ -545,16 +569,8 @@ void InnerWidget::fill() {
 		AddHeader(container, tr::lng_channel_earn_history_title);
 		Ui::AddSkip(container);
 
-		struct HistoryEntry final {
-			TimeId from = 0;
-			TimeId to = 0;
-			float64 value = 0;
-			QString recipient;
-			bool in = false;
-		};
-
 		const auto addHistoryEntry = [&](
-				const HistoryEntry &entry,
+				const Data::EarnHistoryEntry &entry,
 				const tr::phrase<> &text) {
 			const auto wrap = container->add(
 				object_ptr<Ui::PaddingWrap<Ui::VerticalLayout>>(
@@ -568,10 +584,11 @@ void InnerWidget::fill() {
 				text(),
 				st::channelEarnSemiboldLabel));
 
+			const auto isIn = entry.type == Data::EarnHistoryEntry::Type::In;
 			const auto recipient = Ui::Text::Wrapped(
-				{ entry.recipient },
+				{ entry.provider },
 				EntityType::Code);
-			if (!entry.recipient.isEmpty()) {
+			if (!recipient.text.isEmpty()) {
 				Ui::AddSkip(inner, st::channelEarnHistoryThreeSkip);
 				const auto label = inner->add(object_ptr<Ui::FlatLabel>(
 					inner,
@@ -584,23 +601,23 @@ void InnerWidget::fill() {
 				Ui::AddSkip(inner, st::channelEarnHistoryTwoSkip);
 			}
 
-			const auto dateText = entry.to
-				? (FormatDate(entry.from)
+			const auto dateText = !entry.dateTo.isNull()
+				? (FormatDate(entry.date)
 					+ ' '
 					+ QChar(8212)
 					+ ' '
-					+ FormatDate(entry.to))
-				: FormatDate(entry.from);
+					+ FormatDate(entry.dateTo))
+				: FormatDate(entry.date);
 			inner->add(object_ptr<Ui::FlatLabel>(
 				inner,
 				dateText,
 				st::channelEarnHistorySubLabel));
 
-			const auto color = (entry.in
+			const auto color = (isIn
 				? st::boxTextFgGood
 				: st::menuIconAttentionColor)->c;
-			const auto majorText = (entry.in ? '+' : kMinus)
-				+ QString::number(int64(entry.value));
+			const auto majorText = (isIn ? '+' : kMinus)
+				+ QString::number(uint64(entry.amount));
 			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				wrap,
 				majorText,
@@ -608,7 +625,7 @@ void InnerWidget::fill() {
 			majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 			majorLabel->setTextColorOverride(color);
 			const auto minorText =
-				QString::number(entry.value - int64(entry.value)).mid(1)
+				QString::number(entry.amount - uint64(entry.amount)).mid(1)
 					+ ' '
 					+ currency;
 			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
@@ -620,6 +637,7 @@ void InnerWidget::fill() {
 			const auto button = Ui::CreateChild<Ui::SettingsButton>(
 				wrap,
 				rpl::single(QString()));
+			Ui::ToggleChildrenVisibility(wrap, true);
 
 			const auto detailsBox = [=, peer = _peer](
 					not_null<Ui::GenericBox*> box) {
@@ -671,19 +689,19 @@ void InnerWidget::fill() {
 					box,
 					object_ptr<Ui::FlatLabel>(
 						box,
-						entry.in
+						isIn
 							? tr::lng_channel_earn_history_in_about()
 							: tr::lng_channel_earn_history_out(),
 						st::channelEarnHistoryMajorLabel)));
 				Ui::AddSkip(box->verticalLayout());
-				if (entry.in) {
+				if (isIn) {
 					Ui::AddSkip(box->verticalLayout());
 				}
 
-				if (!entry.recipient.isEmpty()) {
+				if (!recipient.text.isEmpty()) {
 					AddRecipient(box, recipient);
 				}
-				if (entry.in) {
+				if (isIn) {
 					const auto peerBubble = box->addRow(
 						object_ptr<Ui::CenterWrap<>>(
 							box,
@@ -763,41 +781,13 @@ void InnerWidget::fill() {
 				button->lower();
 			}, wrap->lifetime());
 		};
-		const auto randomRecipient = [&] { // Debug.
-			const auto format = QUuid::StringFormat::Id128;
-			return (QUuid::createUuid().toString(format)
-				+ QUuid::createUuid().toString(format)).mid(0, 48);
-		};
-		addHistoryEntry(
-			{
-				.from = base::unixtime::now(),
-				.to = base::unixtime::now() - base::RandomIndex(200000),
-				.value = base::RandomIndex(1000000) / 1000.,
-				.in = true,
-			},
-			tr::lng_channel_earn_history_in);
-		addHistoryEntry(
-			{
-				.from = base::unixtime::now(),
-				.recipient = randomRecipient(),
-				.value = base::RandomIndex(1000000) / 1000.,
-			},
-			tr::lng_channel_earn_history_out);
-		addHistoryEntry(
-			{
-				.from = base::unixtime::now(),
-				.to = base::unixtime::now() - base::RandomIndex(200000),
-				.value = base::RandomIndex(1000000) / 1000.,
-				.in = true,
-			},
-			tr::lng_channel_earn_history_in);
-		addHistoryEntry(
-			{
-				.from = base::unixtime::now(),
-				.recipient = randomRecipient(),
-				.value = base::RandomIndex(1000000) / 1000.,
-			},
-			tr::lng_channel_earn_history_out);
+		for (const auto &entry : data.firstHistorySlice.list) {
+			addHistoryEntry(
+				entry,
+				(entry.type == Data::EarnHistoryEntry::Type::In)
+					? tr::lng_channel_earn_history_in
+					: tr::lng_channel_earn_history_out);
+		}
 	}
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
@@ -916,21 +906,25 @@ void InnerWidget::fill() {
 
 		Ui::AddSkip(container);
 		Ui::AddDividerText(container, tr::lng_channel_earn_off_about());
+		Ui::ToggleChildrenVisibility(line, true);
 	}
 	Ui::AddSkip(container);
+
+	Ui::ToggleChildrenVisibility(container, true);
+	Ui::RpWidget::resizeToWidth(width());
 }
 
 void InnerWidget::saveState(not_null<Memento*> memento) {
-	// memento->setState(base::take(_state));
+	memento->setState(base::take(_state));
 }
 
 void InnerWidget::restoreState(not_null<Memento*> memento) {
-	// _state = memento->state();
-	// if (!_state.link.isEmpty()) {
+	_state = memento->state();
+	if (_state) {
 		fill();
-	// } else {
-	// 	load();
-	// }
+	} else {
+		load();
+	}
 	Ui::RpWidget::resizeToWidth(width());
 }
 
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
index a4a63fda3..472badfbf 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/data_statistics.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/vertical_layout.h"
 
@@ -51,7 +52,7 @@ private:
 	not_null<PeerData*> _peer;
 	std::shared_ptr<Ui::Show> _show;
 
-	// Data::ChannelEarnStatus _state;
+	Data::EarnStatistics _state;
 
 	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
 	rpl::event_stream<ShowRequest> _showRequests;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
index 287e72338..3c7540954 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/data_statistics.h"
 #include "info/info_content_widget.h"
 
 namespace Info::ChannelEarn {
@@ -26,10 +27,7 @@ public:
 
 	Section section() const override;
 
-	struct ChannelEarnStatus{
-	};
-
-	using SavedState = ChannelEarnStatus;
+	using SavedState = Data::EarnStatistics;
 
 	void setState(SavedState states);
 	[[nodiscard]] SavedState state();

From b5a7a351f6cc9b2bea9c23e820678966fe1b2a17 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 25 Mar 2024 00:13:53 +0300
Subject: [PATCH 155/596] Added initial support for integer format of channel
 earn amount data.

---
 .../earn/info_earn_inner_widget.cpp           | 71 ++++++++++++++-----
 1 file changed, 55 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index fa973c65f..6e7cf8a08 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -46,6 +46,50 @@ namespace Info::ChannelEarn {
 namespace {
 
 constexpr auto kMinorPartLength = 9;
+constexpr auto kZero = QChar('0');
+constexpr auto kDot = QChar('.');
+
+[[nodiscard]] QString MajorPart(uint64 value) {
+	const auto string = QString::number(value);
+	return (string.size() < kMinorPartLength)
+		? QString(kZero)
+		: string.mid(0, kMinorPartLength);
+}
+
+[[nodiscard]] QString MinorPart(uint64 value) {
+	if (!value) {
+		return QString(kDot) + kZero;
+	}
+	const auto string = QString::number(value);
+	const auto diff = int(string.size()) - kMinorPartLength;
+	const auto result = (diff < 0)
+		? kDot + u"%1"_q.arg(0, std::abs(diff), 10, kZero) + string
+		: kDot + string.mid(diff);
+	const auto begin = (result.constData());
+	const auto end = (begin + result.size());
+	auto ch = end - 1;
+	auto zeroCount = 0;
+	while (ch != begin) {
+		if ((*ch) == kZero) {
+			zeroCount++;
+		} else {
+			break;
+		}
+		ch--;
+	}
+	return result.chopped(zeroCount);
+}
+
+[[nodiscard]] QString ToUsd(uint64 value, float64 rate) {
+	constexpr auto kApproximately = QChar(0x2248);
+	constexpr auto kMultiplier = uint64(1000000000);
+	const auto multiplier = uint64(rate * kMultiplier);
+	const auto result = (value * multiplier) / kMultiplier;
+	return QString(kApproximately)
+		+ QChar('$')
+		+ MajorPart(result)
+		+ MinorPart(result);
+}
 
 void AddHeader(
 		not_null<Ui::VerticalLayout*> content,
@@ -169,10 +213,10 @@ void InnerWidget::fill() {
 	};
 	const auto addEmojiToMajor = [=](
 			not_null<Ui::FlatLabel*> label,
-			float64 value) {
+			uint64 value) {
 		auto emoji = EmojiCurrency(session);
 		label->setMarkedText(
-			emoji.append(' ').append(QString::number(uint64(value))),
+			emoji.append(' ').append(MajorPart(value)),
 			makeContext(label));
 	};
 
@@ -357,7 +401,7 @@ void InnerWidget::fill() {
 		Ui::AddSkip(container, st::channelEarnOverviewTitleSkip);
 
 		const auto addOverview = [&](
-				float64 value,
+				uint64 value,
 				const tr::phrase<> &text) {
 			const auto line = container->add(
 				Ui::CreateSkipWidget(container, 0),
@@ -368,13 +412,11 @@ void InnerWidget::fill() {
 			addEmojiToMajor(majorLabel, value);
 			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
-				QString::number(value - uint64(value)).mid(1),
+				MinorPart(value),
 				st::channelEarnOverviewMinorLabel);
 			const auto secondMinorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
-				QString(kApproximately)
-					+ QChar('$')
-					+ QString::number(value * multiplier),
+				ToUsd(value, multiplier),
 				st::channelEarnOverviewSubMinorLabel);
 			rpl::combine(
 				line->widthValue(),
@@ -433,7 +475,7 @@ void InnerWidget::fill() {
 		majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 		const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
-			QString::number(value - uint64(value)).mid(1),
+			MinorPart(value),
 			st::channelEarnBalanceMinorLabel);
 		minorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 		rpl::combine(
@@ -458,9 +500,7 @@ void InnerWidget::fill() {
 				container,
 				object_ptr<Ui::FlatLabel>(
 					container,
-					QString(kApproximately)
-						+ QChar('$')
-						+ QString::number(value * multiplier),
+					ToUsd(value, multiplier),
 					st::channelEarnOverviewSubMinorLabel)));
 
 		Ui::AddSkip(container);
@@ -617,17 +657,16 @@ void InnerWidget::fill() {
 				? st::boxTextFgGood
 				: st::menuIconAttentionColor)->c;
 			const auto majorText = (isIn ? '+' : kMinus)
-				+ QString::number(uint64(entry.amount));
+				+ MajorPart(entry.amount);
 			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				wrap,
 				majorText,
 				st::channelEarnHistoryMajorLabel);
 			majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 			majorLabel->setTextColorOverride(color);
-			const auto minorText =
-				QString::number(entry.amount - uint64(entry.amount)).mid(1)
-					+ ' '
-					+ currency;
+			const auto minorText = MinorPart(entry.amount)
+				+ ' '
+				+ currency;
 			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				wrap,
 				minorText,

From f28f4984670f9e03c975ac174a9e8633b7afff2c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 25 Mar 2024 00:19:55 +0300
Subject: [PATCH 156/596] Added support of level of boosts for restriction of
 sponsored messages.

---
 Telegram/SourceFiles/data/data_premium_limits.cpp           | 6 ++++++
 Telegram/SourceFiles/data/data_premium_limits.h             | 1 +
 .../info/channel_statistics/earn/info_earn_inner_widget.cpp | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_premium_limits.cpp b/Telegram/SourceFiles/data/data_premium_limits.cpp
index f9d870212..6421f722a 100644
--- a/Telegram/SourceFiles/data/data_premium_limits.cpp
+++ b/Telegram/SourceFiles/data/data_premium_limits.cpp
@@ -256,6 +256,12 @@ int LevelLimits::channelCustomWallpaperLevelMin() const {
 		10);
 }
 
+int LevelLimits::channelRestrictSponsoredLevelMin() const {
+	return _session->appConfig().get<int>(
+		u"channel_restrict_sponsored_level_min"_q,
+		20);
+}
+
 int LevelLimits::groupTranscribeLevelMin() const {
 	return _session->appConfig().get<int>(
 		u"group_transcribe_level_min"_q,
diff --git a/Telegram/SourceFiles/data/data_premium_limits.h b/Telegram/SourceFiles/data/data_premium_limits.h
index 5c50d7a12..f1cfe146d 100644
--- a/Telegram/SourceFiles/data/data_premium_limits.h
+++ b/Telegram/SourceFiles/data/data_premium_limits.h
@@ -101,6 +101,7 @@ public:
 	[[nodiscard]] int channelEmojiStatusLevelMin() const;
 	[[nodiscard]] int channelWallpaperLevelMin() const;
 	[[nodiscard]] int channelCustomWallpaperLevelMin() const;
+	[[nodiscard]] int channelRestrictSponsoredLevelMin() const;
 	[[nodiscard]] int groupTranscribeLevelMin() const;
 	[[nodiscard]] int groupEmojiStickersLevelMin() const;
 	[[nodiscard]] int groupProfileBgIconLevelMin() const;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 6e7cf8a08..ffbac0619 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_peer.h"
+#include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "info/channel_statistics/earn/info_earn_widget.h"
@@ -839,9 +840,8 @@ void InnerWidget::fill() {
 			phrase(),
 			st::settingsButtonNoIcon));
 
-		constexpr auto kMinLevel = 30; // Debug.
 		AddLevelBadge(
-			kMinLevel,
+			Data::LevelLimits(session).channelRestrictSponsoredLevelMin(),
 			button,
 			nullptr,
 			channel,

From 393d9e9f1fd9eba124b6f7074863dcb193ef81d1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 26 Mar 2024 03:37:50 +0300
Subject: [PATCH 157/596] Slightly improved style of channel earn info section.

---
 Telegram/Resources/langs/lang.strings         |  7 +-
 Telegram/SourceFiles/api/api_statistics.cpp   | 10 +-
 Telegram/SourceFiles/data/data_statistics.h   | 10 +-
 .../earn/channel_earn.style                   |  4 +-
 .../earn/info_earn_inner_widget.cpp           | 91 ++++++-------------
 5 files changed, 47 insertions(+), 75 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index a61422998..eaffa6251 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4967,7 +4967,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_history_title" = "Transaction history";
 "lng_channel_earn_history_in" = "Proceeds from ads";
 "lng_channel_earn_history_in_about" = "Proceeds from ads displayed in";
-"lng_channel_earn_history_out" = "Balance withdrawal to";
+"lng_channel_earn_history_out" = "Withdrawal";
+"lng_channel_earn_history_out_failed" = "Not Completed";
+"lng_channel_earn_history_out_about_failed" = "Withdrawal failed";
+"lng_channel_earn_history_return" = "Refund";
+"lng_channel_earn_history_return_about" = "Refunded back";
+"lng_channel_earn_history_pending" = "Pending";
 "lng_channel_earn_off" = "Switch Off Ads";
 "lng_channel_earn_off_about" = "You will not be eligible for any rewards if you switch off ads.";
 "lng_channel_earn_cpm_min" = "No Ads";
diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index 78028313b..4418aa3d5 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -819,9 +819,13 @@ void EarnStatistics::requestBoosts(
 						: d.is_failed()
 						? Data::EarnHistoryEntry::Status::Failed
 						: Data::EarnHistoryEntry::Status::Success,
-					.amount = d.vamount().v,
+					.amount = d.is_failed()
+						? (std::numeric_limits<Data::EarnInt>::max()
+							- d.vamount().v
+							+ 1)
+						: d.vamount().v,
 					.date = base::unixtime::parse(d.vdate().v),
-					.provider = qs(d.vprovider()),
+					// .provider = qs(d.vprovider()),
 					.successDate = d.vtransaction_date()
 						? base::unixtime::parse(d.vtransaction_date()->v)
 						: QDateTime(),
@@ -834,7 +838,7 @@ void EarnStatistics::requestBoosts(
 					.type = Data::EarnHistoryEntry::Type::Return,
 					.amount = d.vamount().v,
 					.date = base::unixtime::parse(d.vdate().v),
-					.provider = qs(d.vprovider()),
+					// .provider = qs(d.vprovider()),
 				};
 			}));
 		}
diff --git a/Telegram/SourceFiles/data/data_statistics.h b/Telegram/SourceFiles/data/data_statistics.h
index 5e438d88d..2599cfc49 100644
--- a/Telegram/SourceFiles/data/data_statistics.h
+++ b/Telegram/SourceFiles/data/data_statistics.h
@@ -155,6 +155,8 @@ struct PublicForwardsSlice final {
 	OffsetToken token;
 };
 
+using EarnInt = uint64;
+
 struct EarnHistoryEntry final {
 	enum class Type {
 		In,
@@ -171,7 +173,7 @@ struct EarnHistoryEntry final {
 	Type type;
 	Status status;
 
-	uint64 amount = 0;
+	EarnInt amount = 0;
 	QDateTime date;
 	QDateTime dateTo;
 
@@ -196,9 +198,9 @@ struct EarnStatistics final {
 	}
 	Data::StatisticalGraph topHoursGraph;
 	Data::StatisticalGraph revenueGraph;
-	uint64 currentBalance = 0;
-	uint64 availableBalance = 0;
-	uint64 overallRevenue = 0;
+	EarnInt currentBalance = 0;
+	EarnInt availableBalance = 0;
+	EarnInt overallRevenue = 0;
 	float64 usdRate = 0.;
 
 	EarnHistorySlice firstHistorySlice;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 653f3c87b..c3007e16d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -48,7 +48,7 @@ channelEarnHistoryRecipientLabel: FlatLabel(channelEarnOverviewSubMinorLabel) {
 }
 channelEarnHistoryMajorLabel: FlatLabel(channelEarnOverviewMajorLabel) {
 	style: TextStyle(defaultTextStyle) {
-		font: font(13px semibold);
+		font: font(14px semibold);
 	}
 }
 channelEarnHistoryMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
@@ -56,7 +56,7 @@ channelEarnHistoryMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
 		font: font(12px semibold);
 	}
 }
-channelEarnHistoryMinorLabelSkip: 1px;
+channelEarnHistoryMinorLabelSkip: 2px;
 channelEarnHistoryOuter: margins(0px, 6px, 0px, 6px);
 channelEarnHistoryTwoSkip: 5px;
 channelEarnHistoryThreeSkip: 3px;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index ffbac0619..0a7714baf 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -46,18 +46,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Info::ChannelEarn {
 namespace {
 
+using EarnInt = Data::EarnInt;
+
 constexpr auto kMinorPartLength = 9;
 constexpr auto kZero = QChar('0');
 constexpr auto kDot = QChar('.');
 
-[[nodiscard]] QString MajorPart(uint64 value) {
+[[nodiscard]] QString MajorPart(EarnInt value) {
 	const auto string = QString::number(value);
 	return (string.size() < kMinorPartLength)
 		? QString(kZero)
 		: string.mid(0, kMinorPartLength);
 }
 
-[[nodiscard]] QString MinorPart(uint64 value) {
+[[nodiscard]] QString MinorPart(EarnInt value) {
 	if (!value) {
 		return QString(kDot) + kZero;
 	}
@@ -81,10 +83,10 @@ constexpr auto kDot = QChar('.');
 	return result.chopped(zeroCount);
 }
 
-[[nodiscard]] QString ToUsd(uint64 value, float64 rate) {
+[[nodiscard]] QString ToUsd(EarnInt value, float64 rate) {
 	constexpr auto kApproximately = QChar(0x2248);
-	constexpr auto kMultiplier = uint64(1000000000);
-	const auto multiplier = uint64(rate * kMultiplier);
+	constexpr auto kMultiplier = EarnInt(1000000000);
+	const auto multiplier = EarnInt(rate * kMultiplier);
 	const auto result = (value * multiplier) / kMultiplier;
 	return QString(kApproximately)
 		+ QChar('$')
@@ -214,7 +216,7 @@ void InnerWidget::fill() {
 	};
 	const auto addEmojiToMajor = [=](
 			not_null<Ui::FlatLabel*> label,
-			uint64 value) {
+			EarnInt value) {
 		auto emoji = EmojiCurrency(session);
 		label->setMarkedText(
 			emoji.append(' ').append(MajorPart(value)),
@@ -402,7 +404,7 @@ void InnerWidget::fill() {
 		Ui::AddSkip(container, st::channelEarnOverviewTitleSkip);
 
 		const auto addOverview = [&](
-				uint64 value,
+				EarnInt value,
 				const tr::phrase<> &text) {
 			const auto line = container->add(
 				Ui::CreateSkipWidget(container, 0),
@@ -506,20 +508,6 @@ void InnerWidget::fill() {
 
 		Ui::AddSkip(container);
 
-		const auto input = container->add(
-			object_ptr<Ui::InputField>(
-				container,
-				st::defaultComposeFiles.caption,
-				Ui::InputField::Mode::MultiLine,
-				tr::lng_channel_earn_balance_placeholder()),
-			st::boxRowPadding);
-		_focusRequested.events(
-		) | rpl::start_with_next([=] {
-			input->setFocusFast();
-		}, input->lifetime());
-
-		Ui::AddSkip(container);
-
 		const auto &stButton = st::defaultActiveButton;
 		const auto button = container->add(
 			object_ptr<Ui::RoundButton>(
@@ -552,49 +540,9 @@ void InnerWidget::fill() {
 					stButton.textFg->c,
 					anim::interpolateF(.5, 1., value)));
 		};
-		colorText(0);
-
-		rpl::single(
-			rpl::empty_value()
-		) | rpl::then(
-			input->changes()
-		) | rpl::map([=, end = (u".ton"_q)] {
-			const auto text = input->getLastText();
-			return (text.size() == 48)
-				|| text.endsWith(end, Qt::CaseInsensitive);
-		}) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](bool enabled) {
-			fadeAnimation->stop();
-			const auto from = enabled ? 0. : 1.;
-			const auto to = enabled ? 1. : 0.;
-			fadeAnimation->start(colorText, from, to, st::slideWrapDuration);
-
-			button->setAttribute(Qt::WA_TransparentForMouseEvents, !enabled);
-		}, button->lifetime());
+		colorText(1.);
 
 		button->setClickedCallback([=] {
-			_show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
-				box->setTitle(tr::lng_channel_earn_balance_button());
-				box->addRow(object_ptr<Ui::FlatLabel>(
-					box,
-					tr::lng_channel_earn_transfer_sure_about1(tr::now),
-					st::boxLabel));
-				Ui::AddSkip(box->verticalLayout());
-				AddRecipient(
-					box,
-					Ui::Text::Wrapped(
-						{ input->getLastText() },
-						EntityType::Code));
-				Ui::AddSkip(box->verticalLayout());
-				box->addRow(object_ptr<Ui::FlatLabel>(
-					box,
-					tr::lng_channel_earn_transfer_sure_about2(tr::now),
-					st::boxLabel));
-				box->addButton(
-					tr::lng_send_button(),
-					[=] { box->closeBox(); });
-				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-			}));
 		});
 		Ui::ToggleChildrenVisibility(button, true);
 
@@ -642,17 +590,28 @@ void InnerWidget::fill() {
 				Ui::AddSkip(inner, st::channelEarnHistoryTwoSkip);
 			}
 
-			const auto dateText = !entry.dateTo.isNull()
+			const auto isFailed = entry.status
+				== Data::EarnHistoryEntry::Status::Failed;
+			const auto isPending = entry.status
+				== Data::EarnHistoryEntry::Status::Pending;
+			const auto dateText = (!entry.dateTo.isNull() || isFailed)
 				? (FormatDate(entry.date)
 					+ ' '
 					+ QChar(8212)
 					+ ' '
-					+ FormatDate(entry.dateTo))
+					+ (isFailed
+						? tr::lng_channel_earn_history_out_failed(tr::now)
+						: FormatDate(entry.dateTo)))
+				: isPending
+				? tr::lng_channel_earn_history_pending(tr::now)
 				: FormatDate(entry.date);
 			inner->add(object_ptr<Ui::FlatLabel>(
 				inner,
 				dateText,
-				st::channelEarnHistorySubLabel));
+				st::channelEarnHistorySubLabel)
+			)->setTextColorOverride(isFailed
+				? std::make_optional<QColor>(st::menuIconAttentionColor->c)
+				: std::nullopt);
 
 			const auto color = (isIn
 				? st::boxTextFgGood
@@ -826,6 +785,8 @@ void InnerWidget::fill() {
 				entry,
 				(entry.type == Data::EarnHistoryEntry::Type::In)
 					? tr::lng_channel_earn_history_in
+					: (entry.type == Data::EarnHistoryEntry::Type::Return)
+					? tr::lng_channel_earn_history_return
 					: tr::lng_channel_earn_history_out);
 		}
 	}

From 9c52f245ac8075dbadf8506e39e9379974031a46 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 26 Mar 2024 05:49:31 +0300
Subject: [PATCH 158/596] Added initial support of statistical charts in earn
 channel section.

---
 .../icons/statistics/mini_currency_graph.png  | Bin 0 -> 388 bytes
 .../statistics/mini_currency_graph@2x.png     | Bin 0 -> 609 bytes
 .../statistics/mini_currency_graph@3x.png     | Bin 0 -> 893 bytes
 Telegram/Resources/langs/lang.strings         |   2 ++
 .../SourceFiles/data/data_statistics_chart.h  |   1 +
 .../earn/info_earn_inner_widget.cpp           |  28 ++++++++++++++++++
 .../statistics/chart_rulers_data.cpp          |  14 +++++++--
 .../statistics/chart_rulers_data.h            |   3 +-
 .../SourceFiles/statistics/statistics.style   |   2 ++
 .../statistics_data_deserialize.cpp           |   9 +++++-
 .../statistics/view/chart_rulers_view.cpp     |  15 ++++++++--
 .../statistics/view/chart_rulers_view.h       |   1 +
 .../widgets/point_details_widget.cpp          |  16 ++++++++--
 .../statistics/widgets/point_details_widget.h |   1 +
 14 files changed, 84 insertions(+), 8 deletions(-)
 create mode 100644 Telegram/Resources/icons/statistics/mini_currency_graph.png
 create mode 100644 Telegram/Resources/icons/statistics/mini_currency_graph@2x.png
 create mode 100644 Telegram/Resources/icons/statistics/mini_currency_graph@3x.png

diff --git a/Telegram/Resources/icons/statistics/mini_currency_graph.png b/Telegram/Resources/icons/statistics/mini_currency_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..cce4957b3b1ff168be1dc003ef7280fbafeafc5c
GIT binary patch
literal 388
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$e-g&w>hG>Z1
z?YHN12@p7T|DBl-ORJl@(?bTX)+3B1GEO0z%ma4zxGcIF7^v|_Q-x1)QQ(HjTPsz*
zG0dKu^y%#T+4}i%PWIvEHG;mEcdc9hy6dFgu|l0Lro+ksp;L8E2Z}T<U#0bB-RlL`
zeZp;t0xTAv1-lkqDfOMCa^`$_V?w0Z0u|4S-+iI?zh};>n%B<BasT^d70I@TJp8&G
zOmhx?{`0R%qs#YlflPUh!WRqv%O;Jvv!2<UKahL7@3F<{O`p$wd^y*MXYzB)IgWu-
zmSwgj>YOg(tGT%D^|aKTxwBIv<KJj2aV*M>=7?Equc&|3A>?G}lZTT)A>iri=d#Wz
Gp$P!a28JpC

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/statistics/mini_currency_graph@2x.png b/Telegram/Resources/icons/statistics/mini_currency_graph@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b48cf0572e41540bc1b6fdc973a96ebf7ef9ff4d
GIT binary patch
literal 609
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWzSVF5FO4N|zKE$K5**=bJ~#}E(R
zx1qW#4mrq#|Itv2ViojdYgU`>X)yCjl8{)8fKJ$I$L@n>CLC(r8NxkHCzm|va%A%l
zG}NqHxbJ>-b<g9nj_9hy>Hog(zJL7f{<~*WjM^?X*579|E^a@VU@+J3_S>>&tEBea
zfB(0x-fsTt=@J|@s-9JuGQa=c%i6l?t%QJw-*Vx9GRGa=vTnUKTedT%kHuE5UxCA6
z-g))T{i{zuHDY@8)ynnPFIkZrIcAP}Q@up~<-IDfxc2(%*Q&3-|El=Q3h=ed_a86X
z`R7mTU&&84{k5f5bH6h#zR0n~N6q<?-KvkrTmoI9l_z#6Etsb;)8|mFjhr@1uB+D6
zraB85Eh8fa>j)jO8;&MYp&YZiPo^~WRM_ZgpKNei*r2+qeHL@lMv0hZmsj5WQ>-$T
zVfyK<x8I(7zWMy~%Q;@0Y|V^Dn{Mhz2CTly5T+&CwI*GPtMv*0#k9>Q{RKE!^roLq
z+kCL{%HtK+wnXW^*&d;Dit%oq_~jbA^=YqM_QdJm+Iu&z@K-_Qfm*ZKkvd{?%X}iY
zMzy|wS+eVHo`z5-%j9M9CA;sgzRGn?VsG60V&!lD8&)3Q+mipkz`{hT_wmOQPb3yx
fWL(U=hOdVC{&mAhHf^=1py>5<^>bP0l+XkKeKYh*

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/statistics/mini_currency_graph@3x.png b/Telegram/Resources/icons/statistics/mini_currency_graph@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..14cdf7ca3d2872946ffefcd8c3ce62c5185da8d6
GIT binary patch
literal 893
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Ney!1UbH#W5s;
z^KH1jM^T{2`72og6I!B{=*qBck8yEqamt*K!KpO8C~MM$S*mwrN(xpw7Ibk4buVjb
znxkT*BqP%#AYS}A|JwK87V=3y_q?~OzI?p4S?2uTx%VyKf4^t>eP1VMAt!4KlM~~@
zh5(0&Oj40wzI`iG5HOJ7+2moi;9|y{xpQS@Wj7`ot)4x5cKoWi*RNl{nPT;A)9I&5
z4!iHZE89IOVXmLKv2pX#u+?8bepKwd`1<SR%a<dHtmZCXzI>8|-t%kM#5hZeij1@p
zl9QVa4BQgety{;Ty!wJhTYcS~+La+p*PlOse(BOAm8fkCrcM=I_3Yup#G<00NiL1W
zxw*YB)~#Q!diVxw=GI%wm#ZgzsIZyD(>3>J%{+-(yZZ$OyB7p#xNHO(aCl>K)tx-^
ziFS5&eA(wTPGp#btqwi1NO4V=wtv++^{VRX*{7d6q;J1%$Wc+jSzJ(HU~kWFJ=N=B
z>=XVe?zeKb#jS6zuC1+I%J%MfPf$i;;=-FbN=xF_&p!LiZeDJICQBF4k`gOk=FGD4
z@|#PxNOd30uyb8}F>38G;YB>j8zWxy9n3SD`Rm{$E=w6cAFdO@defILTlOm<vN>E)
zVDH|&szRI+n>TO%{rh*$s|uTS7ysPVP@d?q{BmOR@%UDQ_wV2D$bU0Mpr@lv^pFJ`
z+x5G5@BTPxq5S>ZH;tPgKW<EMtZ=CCIbhIcovx=RaWB|J>Qkb;>ubel?M{EYjA!zQ
zKYs6cFkynrskF`ZTu#-CPj2kGF8}w(@0b`KiEBrbCT1P_nG&!t#mMvD;ls{)dRrap
z_Rkl(fB*h>Zm#yjH<TV6FKhI5UK_K=#@yUIMA&LhkJCbjW9QEC>34To^w@dDuM9b{
zAYR6-;7NetL?$g6Wp;1H>dMMU#@1aIjvjTLvzR@5*Nz<l=B-KFu3inD^MB>C>C>n0
z+-Z4K<UaG0{ipXmR{fWFuVQapjwVoi@jf4wLoMDK3L*kr9Kf{qe<f2rgOOpN{uM**
Q9iXJ|>FVdQ&MBb@0E8lg0ssI2

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index eaffa6251..45a22a71b 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4988,6 +4988,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_learn_coin_title" = "What is {emoji} TON?";
 "lng_channel_earn_learn_coin_about" = "TON is a blockchain platform and cryptocurrency that Telegram uses for its record scalability and ultra low commissions on transactions. {link}";
 "lng_channel_earn_learn_close" = "Got it";
+"lng_channel_earn_chart_top_hours" = "Ad impressions";
+"lng_channel_earn_chart_revenue" = "Ad revenue";
 
 "lng_contact_add" = "Add";
 "lng_contact_send_message" = "message";
diff --git a/Telegram/SourceFiles/data/data_statistics_chart.h b/Telegram/SourceFiles/data/data_statistics_chart.h
index d7448e273..48309e49f 100644
--- a/Telegram/SourceFiles/data/data_statistics_chart.h
+++ b/Telegram/SourceFiles/data/data_statistics_chart.h
@@ -65,6 +65,7 @@ struct StatisticalChart {
 	bool isFooterHidden = false;
 	bool hasPercentages = false;
 	bool weekFormat = false;
+	bool isCurrency = false;
 
 	// View data.
 	int dayStringMaxWidth = 0;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 0a7714baf..95dc86e4e 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/statistics/info_statistics_inner_widget.h" // FillLoading.
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "statistics/chart_widget.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/animation_value_f.h"
 #include "ui/layers/generic_box.h"
@@ -223,6 +224,33 @@ void InnerWidget::fill() {
 			makeContext(label));
 	};
 
+	{
+		using Type = Statistic::ChartViewType;
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		if (data.topHoursGraph.chart) {
+			const auto widget = container->add(
+				object_ptr<Statistic::ChartWidget>(container),
+				st::statisticsLayerMargins);
+
+			widget->setChartData(data.topHoursGraph.chart, Type::Linear);
+			widget->setTitle(tr::lng_channel_earn_chart_top_hours());
+		}
+		if (data.revenueGraph.chart) {
+			Ui::AddSkip(container);
+			Ui::AddDivider(container);
+			Ui::AddSkip(container);
+			Ui::AddSkip(container);
+			const auto widget = container->add(
+				object_ptr<Statistic::ChartWidget>(container),
+				st::statisticsLayerMargins);
+
+			widget->setChartData(data.revenueGraph.chart, Type::StackBar);
+			widget->setTitle(tr::lng_channel_earn_chart_revenue());
+		}
+		Ui::AddSkip(container);
+	}
+
 	const auto arrow = Ui::Text::SingleCustomEmoji(
 		session->data().customEmojiManager().registerInternalEmoji(
 			st::topicButtonArrow,
diff --git a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
index f4a8f9edd..99aec0198 100644
--- a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
+++ b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
@@ -28,13 +28,21 @@ constexpr auto kStep = 5.;
 		: QString::number(absoluteValue);
 }
 
+[[nodiscard]] QString FormatF(float64 absoluteValue) {
+	constexpr auto kTooMuch = int(10'000);
+	return (absoluteValue >= kTooMuch)
+		? Lang::FormatCountToShort(absoluteValue).string
+		: QString::number(absoluteValue);
+}
+
 } // namespace
 
 ChartRulersData::ChartRulersData(
 		int newMaxHeight,
 		int newMinHeight,
 		bool useMinHeight,
-		float64 rightRatio) {
+		float64 rightRatio,
+		int valueDivider) {
 	if (!useMinHeight) {
 		const auto v = (newMaxHeight > 100)
 			? Round(newMaxHeight)
@@ -92,7 +100,9 @@ ChartRulersData::ChartRulersData(
 			const auto value = int(i * step);
 			line.absoluteValue = newMinHeight + value;
 			line.relativeValue = 1. - value / float64(diffAbsoluteValue);
-			line.caption = Format(line.absoluteValue);
+			line.caption = valueDivider
+				? FormatF(line.absoluteValue / float64(valueDivider))
+				: Format(line.absoluteValue);
 			if (rightRatio > 0) {
 				const auto v = (newMinHeight + i * step) / rightRatio;
 				line.scaledLineCaption = (!skipFloatValues)
diff --git a/Telegram/SourceFiles/statistics/chart_rulers_data.h b/Telegram/SourceFiles/statistics/chart_rulers_data.h
index 41833ce67..4df719ac0 100644
--- a/Telegram/SourceFiles/statistics/chart_rulers_data.h
+++ b/Telegram/SourceFiles/statistics/chart_rulers_data.h
@@ -15,7 +15,8 @@ public:
 		int newMaxHeight,
 		int newMinHeight,
 		bool useMinHeight,
-		float64 rightRatio);
+		float64 rightRatio,
+		int valueDivider);
 
 	void computeRelative(
 		int newMaxHeight,
diff --git a/Telegram/SourceFiles/statistics/statistics.style b/Telegram/SourceFiles/statistics/statistics.style
index 395d458ca..3ba67a2c8 100644
--- a/Telegram/SourceFiles/statistics/statistics.style
+++ b/Telegram/SourceFiles/statistics/statistics.style
@@ -172,3 +172,5 @@ boostsListGiftMiniIcon: icon{{ "boosts/mini_gift", historyPeer8UserpicBg2 }};
 boostsListGiveawayMiniIcon: icon{{ "boosts/mini_giveaway", historyPeer4UserpicBg2 }};
 boostsListUnclaimedIcon: icon{{ "boosts/boost_unknown", premiumButtonFg }};
 boostsListUnknownIcon: icon{{ "boosts/boost_unclaimed", premiumButtonFg }};
+
+statisticsCurrencyIcon: icon {{ "statistics/mini_currency_graph", windowSubTextFg }};
diff --git a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
index 355c500c1..df7345d75 100644
--- a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
+++ b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
@@ -61,7 +61,7 @@ Data::StatisticalChart StatisticalChartFromJSON(const QByteArray &json) {
 			line.isHiddenOnStart = ranges::contains(hiddenLines, columnId);
 			line.y.resize(length);
 			for (auto i = 0; i < length; i++) {
-				const auto value = array.at(i + 1).toInt();
+				const auto value = array.at(i + 1).toInteger();
 				line.y[i] = value;
 				if (value > line.maxValue) {
 					line.maxValue = value;
@@ -132,6 +132,13 @@ Data::StatisticalChart StatisticalChartFromJSON(const QByteArray &json) {
 			result.weekFormat = tooltipFormat.contains(u"'week'"_q);
 		}
 	}
+	{
+		const auto tickFormatIt = root.constFind(u"yTickFormatter"_q);
+		if (tickFormatIt != root.constEnd()) {
+			const auto tickFormat = tickFormatIt->toString();
+			result.isCurrency = tickFormat.contains(u"TON"_q);
+		}
+	}
 
 	const auto colors = root.value(u"colors"_q).toObject();
 	const auto names = root.value(u"names"_q).toObject();
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
index b77211168..89864dec9 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
@@ -23,6 +23,9 @@ void ChartRulersView::setChartData(
 		std::shared_ptr<LinesFilterController> linesFilter) {
 	_rulers.clear();
 	_isDouble = (type == ChartViewType::DoubleLinear);
+	_currencyIcon = chartData.isCurrency
+		? &st::statisticsCurrencyIcon
+		: nullptr;
 	if (_isDouble && (chartData.lines.size() == 2)) {
 		_linesFilter = std::move(linesFilter);
 		_leftPen = QPen(chartData.lines.front().color);
@@ -69,6 +72,7 @@ void ChartRulersView::paintCaptionsToRulers(
 	for (auto &ruler : _rulers) {
 		const auto rulerAlpha = alpha * ruler.alpha;
 		p.setOpacity(rulerAlpha);
+		const auto left = _currencyIcon ? _currencyIcon->width() : 0;
 		for (const auto &line : ruler.lines) {
 			const auto y = offset + r.height() * line.relativeValue;
 			const auto hasLinesFilter = _isDouble && _linesFilter;
@@ -78,8 +82,14 @@ void ChartRulersView::paintCaptionsToRulers(
 			} else {
 				p.setPen(st::windowSubTextFg);
 			}
+			if (_currencyIcon) {
+				const auto iconTop = y
+					- _currencyIcon->height()
+					+ st::statisticsChartRulerCaptionSkip;
+				_currencyIcon->paint(p, 0, iconTop, r.width());
+			}
 			p.drawText(
-				0,
+				left,
 				y,
 				(!_isDouble)
 					? line.caption
@@ -131,7 +141,8 @@ void ChartRulersView::add(Limits newHeight, bool animated) {
 		newHeight.max,
 		newHeight.min,
 		true,
-		_isDouble ? _scaledLineRatio : 0.);
+		_isDouble ? _scaledLineRatio : 0.,
+		_currencyIcon ? 1000000000 : 0);
 	if (_isDouble) {
 		const auto &font = st::statisticsDetailsBottomCaptionStyle.font;
 		for (auto &line : newLinesData.lines) {
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.h b/Telegram/SourceFiles/statistics/view/chart_rulers_view.h
index 7fdfb7d29..ba355fd50 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.h
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.h
@@ -42,6 +42,7 @@ private:
 	QPen _rightPen;
 	int _leftLineId = 0;
 	int _rightLineId = 0;
+	const style::icon *_currencyIcon = nullptr;
 
 	std::vector<ChartRulersData> _rulers;
 
diff --git a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
index c820aab97..e31ecb99c 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
@@ -132,7 +132,8 @@ PointDetailsWidget::PointDetailsWidget(
 , _zoomEnabled(zoomEnabled)
 , _chartData(chartData)
 , _textStyle(st::statisticsDetailsPopupStyle)
-, _headerStyle(st::statisticsDetailsPopupHeaderStyle) {
+, _headerStyle(st::statisticsDetailsPopupHeaderStyle)
+, _valueIcon(chartData.isCurrency ? &st::statisticsCurrencyIcon : nullptr) {
 
 	if (zoomEnabled) {
 		rpl::single(rpl::empty_value()) | rpl::then(
@@ -201,6 +202,7 @@ PointDetailsWidget::PointDetailsWidget(
 			+ rect::m::sum::h(st::statisticsDetailsPopupPadding)
 			+ st::statisticsDetailsPopupPadding.left() // Between strings.
 			+ maxNameTextWidth
+			+ (_valueIcon ? _valueIcon->width() : 0)
 			+ _maxPercentageWidth;
 	}();
 	sizeValue(
@@ -278,7 +280,9 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 		textLine.name.setText(_textStyle, dataLine.name);
 		textLine.value.setText(
 			_textStyle,
-			QString("%L1").arg(dataLine.y[xIndex]));
+			_chartData.isCurrency
+				? QString::number(dataLine.y[xIndex] / float64(1000000000))
+				: QString("%L1").arg(dataLine.y[xIndex]));
 		hasPositiveValues |= (dataLine.y[xIndex] > 0);
 		textLine.valueColor = QColor(dataLine.color);
 		_lines.push_back(std::move(textLine));
@@ -381,6 +385,14 @@ void PointDetailsWidget::paintEvent(QPaintEvent *e) {
 				.outerWidth = _textRect.width(),
 				.availableWidth = valueWidth,
 			};
+			if (_valueIcon) {
+				_valueIcon->paint(
+					p,
+					valueContext.position.x() - _valueIcon->width(),
+					lineY,
+					valueContext.outerWidth,
+					line.valueColor);
+			}
 			const auto nameContext = Ui::Text::PaintContext{
 				.position = QPoint(
 					_textRect.x() + _maxPercentageWidth,
diff --git a/Telegram/SourceFiles/statistics/widgets/point_details_widget.h b/Telegram/SourceFiles/statistics/widgets/point_details_widget.h
index 52ed7dd34..a1e3dcccc 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.h
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.h
@@ -47,6 +47,7 @@ private:
 	const style::TextStyle &_textStyle;
 	const style::TextStyle &_headerStyle;
 	Ui::Text::String _header;
+	const style::icon *_valueIcon = nullptr;
 
 	void invalidateCache();
 

From 32a39525247fc1b4aa1b86087225cc1ef58568a0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 26 Mar 2024 06:27:58 +0300
Subject: [PATCH 159/596] Added initial support of channel cpm from earn
 channel api.

---
 Telegram/SourceFiles/api/api_statistics.cpp        | 14 +++++++++++++-
 Telegram/SourceFiles/data/data_statistics.h        |  1 +
 .../earn/info_earn_inner_widget.cpp                | 13 ++++++-------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index 4418aa3d5..fa617293f 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -773,7 +773,19 @@ rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
 
 			requestBoosts({}, [=](Data::EarnHistorySlice &&slice) {
 				_data.firstHistorySlice = std::move(slice);
-				consumer.put_done();
+
+				api().request(
+					MTPchannels_GetFullChannel(channel()->inputChannel)
+				).done([=](const MTPmessages_ChatFull &result) {
+					result.data().vfull_chat().match([&](
+							const MTPDchannelFull &d) {
+						_data.minCpm = d.vsponsored_min_cpm().value_or(-1);
+					}, [](const auto &) {
+					});
+					consumer.put_done();
+				}).fail([=](const MTP::Error &error) {
+					consumer.put_error_copy(error.type());
+				}).send();
 			});
 		}).fail([=](const MTP::Error &error) {
 			consumer.put_error_copy(error.type());
diff --git a/Telegram/SourceFiles/data/data_statistics.h b/Telegram/SourceFiles/data/data_statistics.h
index 2599cfc49..9746b067e 100644
--- a/Telegram/SourceFiles/data/data_statistics.h
+++ b/Telegram/SourceFiles/data/data_statistics.h
@@ -202,6 +202,7 @@ struct EarnStatistics final {
 	EarnInt availableBalance = 0;
 	EarnInt overallRevenue = 0;
 	float64 usdRate = 0.;
+	int minCpm = -1;
 
 	EarnHistorySlice firstHistorySlice;
 };
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 95dc86e4e..d81213f35 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -49,20 +49,20 @@ namespace {
 
 using EarnInt = Data::EarnInt;
 
+constexpr auto kMultiplier = EarnInt(1000000000);
 constexpr auto kMinorPartLength = 9;
 constexpr auto kZero = QChar('0');
 constexpr auto kDot = QChar('.');
 
 [[nodiscard]] QString MajorPart(EarnInt value) {
 	const auto string = QString::number(value);
-	return (string.size() < kMinorPartLength)
-		? QString(kZero)
-		: string.mid(0, kMinorPartLength);
+	const auto diff = int(string.size()) - kMinorPartLength;
+	return (diff <= 0) ? QString(kZero) : string.mid(0, diff);
 }
 
 [[nodiscard]] QString MinorPart(EarnInt value) {
 	if (!value) {
-		return QString(kDot) + kZero;
+		return QString(kDot) + kZero + kZero;
 	}
 	const auto string = QString::number(value);
 	const auto diff = int(string.size()) - kMinorPartLength;
@@ -86,7 +86,6 @@ constexpr auto kDot = QChar('.');
 
 [[nodiscard]] QString ToUsd(EarnInt value, float64 rate) {
 	constexpr auto kApproximately = QChar(0x2248);
-	constexpr auto kMultiplier = EarnInt(1000000000);
 	const auto multiplier = EarnInt(rate * kMultiplier);
 	const auto result = (value * multiplier) / kMultiplier;
 	return QString(kApproximately)
@@ -857,7 +856,7 @@ void InnerWidget::fill() {
 		const auto right = Ui::CreateChild<Ui::FlatLabel>(
 			line,
 			st::defaultFlatLabel);
-		addEmojiToMajor(right, kMaxCPM);
+		addEmojiToMajor(right, kMaxCPM * kMultiplier);
 		const auto slider = Ui::CreateChild<Ui::MediaSlider>(
 			line,
 			st::settingsScale);
@@ -913,7 +912,7 @@ void InnerWidget::fill() {
 				? std::make_optional(activeColor)
 				: std::nullopt);
 		};
-		const auto current = kMaxCPM / 2;
+		const auto current = std::max(0, data.minCpm);
 		slider->setPseudoDiscrete(
 			kMaxCPM + 1,
 			[=](int index) { return index; },

From 3c266b6dc417d3e4d438ed1101241beb744d97f1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 26 Mar 2024 18:06:44 +0300
Subject: [PATCH 160/596] Moved out data structures for channel earn to td_ui.

---
 Telegram/SourceFiles/api/api_statistics.h     |  1 +
 Telegram/SourceFiles/data/data_channel_earn.h | 70 +++++++++++++++++++
 Telegram/SourceFiles/data/data_statistics.h   | 52 --------------
 .../earn/info_earn_inner_widget.cpp           |  7 +-
 .../earn/info_earn_inner_widget.h             |  2 +-
 .../earn/info_earn_widget.h                   |  2 +-
 .../statistics/view/chart_rulers_view.cpp     |  4 +-
 .../widgets/point_details_widget.cpp          |  4 +-
 Telegram/cmake/td_ui.cmake                    |  1 +
 9 files changed, 82 insertions(+), 61 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_channel_earn.h

diff --git a/Telegram/SourceFiles/api/api_statistics.h b/Telegram/SourceFiles/api/api_statistics.h
index 2643ae1bc..cf48d3cf2 100644
--- a/Telegram/SourceFiles/api/api_statistics.h
+++ b/Telegram/SourceFiles/api/api_statistics.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/timer.h"
 #include "data/data_boosts.h"
+#include "data/data_channel_earn.h"
 #include "data/data_statistics.h"
 #include "mtproto/sender.h"
 
diff --git a/Telegram/SourceFiles/data/data_channel_earn.h b/Telegram/SourceFiles/data/data_channel_earn.h
new file mode 100644
index 000000000..7b47eff80
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_channel_earn.h
@@ -0,0 +1,70 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_statistics_chart.h"
+
+#include <QtCore/QDateTime>
+
+namespace Data {
+
+using EarnInt = uint64;
+
+constexpr auto kEarnMultiplier = EarnInt(1000000000);
+
+struct EarnHistoryEntry final {
+	enum class Type {
+		In,
+		Out,
+		Return,
+	};
+
+	enum class Status {
+		Success,
+		Failed,
+		Pending,
+	};
+
+	Type type;
+	Status status;
+
+	EarnInt amount = 0;
+	QDateTime date;
+	QDateTime dateTo;
+
+	QString provider;
+
+	QDateTime successDate;
+	QString successLink;
+
+};
+
+struct EarnHistorySlice final {
+	using OffsetToken = int;
+	std::vector<EarnHistoryEntry> list;
+	int total = 0;
+	bool allLoaded = false;
+	OffsetToken token;
+};
+
+struct EarnStatistics final {
+	explicit operator bool() const {
+		return !!usdRate;
+	}
+	Data::StatisticalGraph topHoursGraph;
+	Data::StatisticalGraph revenueGraph;
+	EarnInt currentBalance = 0;
+	EarnInt availableBalance = 0;
+	EarnInt overallRevenue = 0;
+	float64 usdRate = 0.;
+	int minCpm = -1;
+
+	EarnHistorySlice firstHistorySlice;
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_statistics.h b/Telegram/SourceFiles/data/data_statistics.h
index 9746b067e..9d2b2c74a 100644
--- a/Telegram/SourceFiles/data/data_statistics.h
+++ b/Telegram/SourceFiles/data/data_statistics.h
@@ -155,56 +155,4 @@ struct PublicForwardsSlice final {
 	OffsetToken token;
 };
 
-using EarnInt = uint64;
-
-struct EarnHistoryEntry final {
-	enum class Type {
-		In,
-		Out,
-		Return,
-	};
-
-	enum class Status {
-		Success,
-		Failed,
-		Pending,
-	};
-
-	Type type;
-	Status status;
-
-	EarnInt amount = 0;
-	QDateTime date;
-	QDateTime dateTo;
-
-	QString provider;
-
-	QDateTime successDate;
-	QString successLink;
-
-};
-
-struct EarnHistorySlice final {
-	using OffsetToken = int;
-	std::vector<EarnHistoryEntry> list;
-	int total = 0;
-	bool allLoaded = false;
-	OffsetToken token;
-};
-
-struct EarnStatistics final {
-	explicit operator bool() const {
-		return !!usdRate;
-	}
-	Data::StatisticalGraph topHoursGraph;
-	Data::StatisticalGraph revenueGraph;
-	EarnInt currentBalance = 0;
-	EarnInt availableBalance = 0;
-	EarnInt overallRevenue = 0;
-	float64 usdRate = 0.;
-	int minCpm = -1;
-
-	EarnHistorySlice firstHistorySlice;
-};
-
 } // namespace Data
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index d81213f35..90277d90a 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -49,7 +49,6 @@ namespace {
 
 using EarnInt = Data::EarnInt;
 
-constexpr auto kMultiplier = EarnInt(1000000000);
 constexpr auto kMinorPartLength = 9;
 constexpr auto kZero = QChar('0');
 constexpr auto kDot = QChar('.');
@@ -86,8 +85,8 @@ constexpr auto kDot = QChar('.');
 
 [[nodiscard]] QString ToUsd(EarnInt value, float64 rate) {
 	constexpr auto kApproximately = QChar(0x2248);
-	const auto multiplier = EarnInt(rate * kMultiplier);
-	const auto result = (value * multiplier) / kMultiplier;
+	const auto multiplier = EarnInt(rate * Data::kEarnMultiplier);
+	const auto result = (value * multiplier) / Data::kEarnMultiplier;
 	return QString(kApproximately)
 		+ QChar('$')
 		+ MajorPart(result)
@@ -856,7 +855,7 @@ void InnerWidget::fill() {
 		const auto right = Ui::CreateChild<Ui::FlatLabel>(
 			line,
 			st::defaultFlatLabel);
-		addEmojiToMajor(right, kMaxCPM * kMultiplier);
+		addEmojiToMajor(right, kMaxCPM * Data::kEarnMultiplier);
 		const auto slider = Ui::CreateChild<Ui::MediaSlider>(
 			line,
 			st::settingsScale);
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
index 472badfbf..69d1587d8 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "data/data_statistics.h"
+#include "data/data_channel_earn.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/vertical_layout.h"
 
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
index 3c7540954..73b373769 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_widget.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "data/data_statistics.h"
+#include "data/data_channel_earn.h"
 #include "info/info_content_widget.h"
 
 namespace Info::ChannelEarn {
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
index 89864dec9..859db9e1a 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "statistics/view/chart_rulers_view.h"
 
-#include "data/data_statistics_chart.h"
+#include "data/data_channel_earn.h" // Data::kEarnMultiplier.
 #include "statistics/chart_lines_filter_controller.h"
 #include "statistics/statistics_common.h"
 #include "styles/style_basic.h"
@@ -142,7 +142,7 @@ void ChartRulersView::add(Limits newHeight, bool animated) {
 		newHeight.min,
 		true,
 		_isDouble ? _scaledLineRatio : 0.,
-		_currencyIcon ? 1000000000 : 0);
+		_currencyIcon ? Data::kEarnMultiplier : 0);
 	if (_isDouble) {
 		const auto &font = st::statisticsDetailsBottomCaptionStyle.font;
 		for (auto &line : newLinesData.lines) {
diff --git a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
index e31ecb99c..d30cfa7d6 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "statistics/widgets/point_details_widget.h"
 
+#include "data/data_channel_earn.h" // Data::kEarnMultiplier.
 #include "statistics/statistics_common.h"
 #include "statistics/statistics_format_values.h"
 #include "statistics/view/stack_linear_chart_common.h"
@@ -270,6 +271,7 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 			nullptr,
 			{ float64(xIndex), float64(xIndex) }).parts
 		: std::vector<PiePartData::Part>();
+	const auto multiplier = float64(Data::kEarnMultiplier);
 	for (auto i = 0; i < _chartData.lines.size(); i++) {
 		const auto &dataLine = _chartData.lines[i];
 		auto textLine = Line();
@@ -281,7 +283,7 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 		textLine.value.setText(
 			_textStyle,
 			_chartData.isCurrency
-				? QString::number(dataLine.y[xIndex] / float64(1000000000))
+				? QString::number(dataLine.y[xIndex] / multiplier)
 				: QString("%L1").arg(dataLine.y[xIndex]));
 		hasPositiveValues |= (dataLine.y[xIndex] > 0);
 		textLine.valueColor = QColor(dataLine.color);
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index aaad4c10c..e52a53bf4 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -79,6 +79,7 @@ PRIVATE
 
     data/data_birthday.cpp
     data/data_birthday.h
+    data/data_channel_earn.h
     data/data_statistics_chart.cpp
     data/data_statistics_chart.h
     data/data_subscription_option.h

From 3845a87f2ec11055cc887d438ede7912b781b42c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 26 Mar 2024 18:56:00 +0300
Subject: [PATCH 161/596] Added fade animation to center label of slider in
 earn channel section.

---
 .../info/channel_statistics/earn/channel_earn.style         | 1 +
 .../info/channel_statistics/earn/info_earn_inner_widget.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index c3007e16d..7f0815fc4 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -101,6 +101,7 @@ channelEarnBalanceMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
 	}
 }
 channelEarnBalanceMinorLabelSkip: 6px;
+channelEarnFadeDuration: 60;
 
 channelEarnLearnDescription: FlatLabel(defaultFlatLabel) {
 	maxHeight: 0px;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 90277d90a..0526f52bb 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "statistics/chart_widget.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/animation_value_f.h"
+#include "ui/effects/fade_animation.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
@@ -852,6 +853,8 @@ void InnerWidget::fill() {
 		const auto center = Ui::CreateChild<Ui::FlatLabel>(
 			line,
 			st::defaultFlatLabel);
+		const auto fade = lifetime().make_state<Ui::FadeAnimation>(center);
+		fade->setUpdatedCallback([=](float64 o) { center->setOpacity(o); });
 		const auto right = Ui::CreateChild<Ui::FlatLabel>(
 			line,
 			st::defaultFlatLabel);
@@ -902,8 +905,9 @@ void InnerWidget::fill() {
 						EmojiCurrency(session),
 						Ui::Text::RichLangValue),
 					makeContext(center));
+				fade->fadeIn(st::channelEarnFadeDuration);
 			} else {
-				center->setText({});
+				fade->fadeOut(st::channelEarnFadeDuration);
 			}
 			center->setTextColorOverride(activeColor);
 

From 57789c1272d2037ee1e28e6ae46c0f3a54f03c60 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 27 Mar 2024 02:56:17 +0300
Subject: [PATCH 162/596] Added second button to sponsored right.

---
 .../data/data_sponsored_messages.cpp          |  4 +
 .../data/data_sponsored_messages.h            |  2 +
 .../history/history_item_helpers.cpp          |  5 ++
 .../history/history_item_helpers.h            |  1 +
 .../history/view/history_view_message.cpp     | 77 +++++++++++++++++--
 Telegram/SourceFiles/ui/chat/chat.style       |  1 +
 Telegram/SourceFiles/ui/chat/chat_style.cpp   |  1 +
 Telegram/SourceFiles/ui/chat/chat_style.h     |  4 +
 8 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index fb6f03308..2289dfbd1 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -273,6 +273,7 @@ void SponsoredMessages::append(
 			.isRecommended = data.is_recommended(),
 			.isForceUserpicDisplay = data.is_show_peer_photo(),
 			.buttonText = qs(data.vbutton_text().value_or_empty()),
+			.canReport = data.is_can_report(),
 		};
 	};
 	const auto externalLink = data.vwebpage()
@@ -289,6 +290,7 @@ void SponsoredMessages::append(
 				.externalLink = externalLink,
 				.webpageOrBotPhotoId = photoId,
 				.isForceUserpicDisplay = message.data().is_show_peer_photo(),
+				.canReport = message.data().is_can_report(),
 			};
 		} else if (const auto fromId = data.vfrom_id()) {
 			const auto peerId = peerFromMTP(*fromId);
@@ -327,6 +329,7 @@ void SponsoredMessages::append(
 				.isChannel = data.is_channel(),
 				.isPublic = data.is_public(),
 				.isForceUserpicDisplay = message.data().is_show_peer_photo(),
+				.canReport = message.data().is_can_report(),
 			};
 		}, [&](const MTPDchatInviteAlready &data) {
 			const auto chat = _session->data().processChat(data.vchat());
@@ -461,6 +464,7 @@ SponsoredMessages::Details SponsoredMessages::lookupDetails(
 			? tr::lng_view_button_bot(tr::now)
 			: QString(),
 		.botLinkInfo = data.from.botLinkInfo,
+		.canReport = data.from.canReport,
 	};
 }
 
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.h b/Telegram/SourceFiles/data/data_sponsored_messages.h
index d5107fd4e..fe55520fc 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.h
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.h
@@ -36,6 +36,7 @@ struct SponsoredFrom {
 	PhotoId webpageOrBotPhotoId = PhotoId(0);
 	bool isForceUserpicDisplay = false;
 	QString buttonText;
+	bool canReport = false;
 };
 
 struct SponsoredMessage {
@@ -66,6 +67,7 @@ public:
 		bool isForceUserpicDisplay = false;
 		QString buttonText;
 		std::optional<Window::PeerByLinkInfo> botLinkInfo;
+		bool canReport = false;
 	};
 	using RandomId = QByteArray;
 	explicit SponsoredMessages(not_null<Session*> owner);
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index e6c9b1e5a..7841959ad 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -367,6 +367,11 @@ ClickHandlerPtr HideSponsoredClickHandler() {
 	});
 }
 
+ClickHandlerPtr ReportSponsoredClickHandler() {
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+	});
+}
+
 MessageFlags FlagsFromMTP(
 		MsgId id,
 		MTPDmessage::Flags flags,
diff --git a/Telegram/SourceFiles/history/history_item_helpers.h b/Telegram/SourceFiles/history/history_item_helpers.h
index e468f1497..cdd9af7cd 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.h
+++ b/Telegram/SourceFiles/history/history_item_helpers.h
@@ -142,6 +142,7 @@ ClickHandlerPtr JumpToStoryClickHandler(
 	not_null<PeerData*> peer,
 	StoryId storyId);
 [[nodiscard]] ClickHandlerPtr HideSponsoredClickHandler();
+[[nodiscard]] ClickHandlerPtr ReportSponsoredClickHandler();
 
 [[nodiscard]] not_null<HistoryItem*> GenerateJoinedMessage(
 	not_null<History*> history,
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 419644095..2100599a0 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -358,6 +358,11 @@ QString FastReplyText() {
 	});
 }
 
+struct SecondRightAction final {
+	std::unique_ptr<Ui::RippleAnimation> ripple;
+	ClickHandlerPtr link;
+};
+
 } // namespace
 
 struct Message::CommentsButton {
@@ -379,6 +384,7 @@ struct Message::RightAction {
 	std::unique_ptr<Ui::RippleAnimation> ripple;
 	ClickHandlerPtr link;
 	QPoint lastPoint;
+	std::unique_ptr<SecondRightAction> second;
 };
 
 LogEntryOriginal::LogEntryOriginal() = default;
@@ -428,6 +434,16 @@ Message::Message(
 			_bottomInfo.continueReactionAnimations(std::move(animations));
 		}
 	}
+	if (data->isSponsored()) {
+		const auto &messages = data->history()->owner().sponsoredMessages();
+		const auto details = messages.lookupDetails(data->fullId());
+		if (details.canReport) {
+			_rightAction = std::make_unique<RightAction>();
+			_rightAction->second = std::make_unique<SecondRightAction>();
+
+			_rightAction->second->link = ReportSponsoredClickHandler();
+		}
+	}
 }
 
 Message::~Message() {
@@ -1826,8 +1842,28 @@ void Message::clickHandlerPressedChanged(
 	Element::clickHandlerPressedChanged(handler, pressed);
 	if (!handler) {
 		return;
-	} else if (_rightAction && (handler == _rightAction->link)) {
-		toggleRightActionRipple(pressed);
+	} else if (_rightAction) {
+		if (_rightAction->second && (handler == _rightAction->second->link)) {
+			const auto rightSize = rightActionSize();
+			Assert(rightSize != std::nullopt);
+			if (pressed) {
+				if (!_rightAction->second->ripple) {
+					// Create a ripple.
+					_rightAction->second->ripple =
+						std::make_unique<Ui::RippleAnimation>(
+							st::defaultRippleAnimation,
+							Ui::RippleAnimation::RoundRectMask(
+								Size(rightSize->width()),
+								rightSize->width() / 2),
+							[=] { repaint(); });
+				}
+				_rightAction->second->ripple->add(_rightAction->lastPoint);
+			} else if (_rightAction->second->ripple) {
+				_rightAction->second->ripple->lastStop();
+			}
+		} else if (handler == _rightAction->link) {
+			toggleRightActionRipple(pressed);
+		}
 	} else if (_comments && (handler == _comments->link)) {
 		toggleCommentsButtonRipple(pressed);
 	} else if (_topicButton && (handler == _topicButton->link)) {
@@ -1859,15 +1895,18 @@ void Message::toggleCommentsButtonRipple(bool pressed) {
 void Message::toggleRightActionRipple(bool pressed) {
 	Expects(_rightAction != nullptr);
 
-	const auto size = rightActionSize();
-	Assert(size != std::nullopt);
+	const auto rightSize = rightActionSize();
+	Assert(rightSize != std::nullopt);
 
 	if (pressed) {
 		if (!_rightAction->ripple) {
 			// Create a ripple.
+			const auto size = _rightAction->second
+				? Size(rightSize->width())
+				: *rightSize;
 			_rightAction->ripple = std::make_unique<Ui::RippleAnimation>(
 				st::defaultRippleAnimation,
-				Ui::RippleAnimation::RoundRectMask(*size, size->width() / 2),
+				Ui::RippleAnimation::RoundRectMask(size, size.width() / 2),
 				[=] { repaint(); });
 		}
 		_rightAction->ripple->add(_rightAction->lastPoint);
@@ -3450,7 +3489,9 @@ std::optional<QSize> Message::rightActionSize() const {
 			: QSize(st::historyFastShareSize, st::historyFastShareSize);
 	}
 	return data()->isSponsored()
-		? QSize(st::historyFastCloseSize, st::historyFastCloseSize)
+		? ((_rightAction && _rightAction->second)
+			? QSize(st::historyFastCloseSize, st::historyFastCloseSize * 2)
+			: QSize(st::historyFastCloseSize, st::historyFastCloseSize))
 		: (displayFastShare() || displayGoToOriginal())
 		? QSize(st::historyFastShareSize, st::historyFastShareSize)
 		: std::optional<QSize>();
@@ -3516,6 +3557,19 @@ void Message::drawRightAction(
 			_rightAction->ripple.reset();
 		}
 	}
+	if (_rightAction->second && _rightAction->second->ripple) {
+		const auto &stm = context.messageStyle();
+		const auto colorOverride = &stm->msgWaveformInactive->c;
+		_rightAction->second->ripple->paint(
+			p,
+			left,
+			top + st::historyFastCloseSize,
+			size->width(),
+			colorOverride);
+		if (_rightAction->second->ripple->empty()) {
+			_rightAction->second->ripple.reset();
+		}
+	}
 
 	p.setPen(Qt::NoPen);
 	p.setBrush(st->msgServiceBg());
@@ -3553,6 +3607,13 @@ void Message::drawRightAction(
 				views->repliesSmall.text,
 				views->repliesSmall.textWidth);
 		}
+	} else if (_rightAction->second) {
+		st->historyFastCloseIcon().paintInCenter(
+			p,
+			{ left, top, size->width(), size->width() });
+		st->historyFastMoreIcon().paintInCenter(
+			p,
+			{ left, size->width() + top, size->width(), size->width() });
 	} else {
 		const auto &icon = data()->isSponsored()
 			? st->historyFastCloseIcon()
@@ -3574,6 +3635,10 @@ ClickHandlerPtr Message::rightActionLink(
 	if (pressPoint) {
 		_rightAction->lastPoint = *pressPoint;
 	}
+	if (_rightAction->second
+		&& (_rightAction->lastPoint.y() > st::historyFastCloseSize)) {
+		return _rightAction->second->link;
+	}
 	return _rightAction->link;
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 8b294604d..b1307c8b7 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -578,6 +578,7 @@ historyGoToOriginalIcon: icon {{ "fast_to_original", msgServiceFg, point(1px, 0p
 historyFastCommentsIcon: icon {{ "fast_comments", msgServiceFg }};
 historyFastCloseSize: 30px;
 historyFastCloseIcon: icon {{ "box_button_close", msgServiceFg }};
+historyFastMoreIcon: icon {{ "title_menu_dots", msgServiceFg, point(0px, -2px)  }};
 historyFastTranscribeIcon: icon {{ "chat/voice_to_text", msgServiceFg }};
 historyFastTranscribeLock: icon {{ "chat/mini_lock", msgServiceFg }};
 historyFastTranscribeLockPos: point(18px, 13px);
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index 88f5ddd38..9470d71d6 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -192,6 +192,7 @@ ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
 	make(_historyFastTranscribeLock, st::historyFastTranscribeLock);
 	make(_historyGoToOriginalIcon, st::historyGoToOriginalIcon);
 	make(_historyFastCloseIcon, st::historyFastCloseIcon);
+	make(_historyFastMoreIcon, st::historyFastMoreIcon);
 	make(_historyMapPoint, st::historyMapPoint);
 	make(_historyMapPointInner, st::historyMapPointInner);
 	make(_youtubeIcon, st::youtubeIcon);
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.h b/Telegram/SourceFiles/ui/chat/chat_style.h
index dca47f0f8..1053d630a 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.h
+++ b/Telegram/SourceFiles/ui/chat/chat_style.h
@@ -397,6 +397,9 @@ public:
 	[[nodiscard]] const style::icon &historyFastCloseIcon() const {
 		return _historyFastCloseIcon;
 	}
+	[[nodiscard]] const style::icon &historyFastMoreIcon() const {
+		return _historyFastMoreIcon;
+	}
 	[[nodiscard]] const style::icon &historyMapPoint() const {
 		return _historyMapPoint;
 	}
@@ -519,6 +522,7 @@ private:
 	style::icon _msgBotKbWebviewIcon = { Qt::Uninitialized };
 	style::icon _historyFastCommentsIcon = { Qt::Uninitialized };
 	style::icon _historyFastShareIcon = { Qt::Uninitialized };
+	style::icon _historyFastMoreIcon = { Qt::Uninitialized };
 	style::icon _historyFastTranscribeIcon = { Qt::Uninitialized };
 	style::icon _historyFastTranscribeLock = { Qt::Uninitialized };
 	style::icon _historyGoToOriginalIcon = { Qt::Uninitialized };

From 341b9e4a296f16a3419c8c3a885a478f3d163003 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 27 Mar 2024 16:07:43 +0300
Subject: [PATCH 163/596] Added menu with about box to sponsored messages that
 can be reported.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../Resources/icons/sponsored/large_about.png | Bin 0 -> 1180 bytes
 .../icons/sponsored/large_about@2x.png        | Bin 0 -> 2303 bytes
 .../icons/sponsored/large_about@3x.png        | Bin 0 -> 3405 bytes
 .../icons/sponsored/privacy_about.png         | Bin 0 -> 534 bytes
 .../icons/sponsored/privacy_about@2x.png      | Bin 0 -> 928 bytes
 .../icons/sponsored/privacy_about@3x.png      | Bin 0 -> 1299 bytes
 .../icons/sponsored/remove_about.png          | Bin 0 -> 771 bytes
 .../icons/sponsored/remove_about@2x.png       | Bin 0 -> 1540 bytes
 .../icons/sponsored/remove_about@3x.png       | Bin 0 -> 2194 bytes
 .../icons/sponsored/revenue_split.png         | Bin 0 -> 651 bytes
 .../icons/sponsored/revenue_split@2x.png      | Bin 0 -> 1287 bytes
 .../icons/sponsored/revenue_split@3x.png      | Bin 0 -> 1944 bytes
 Telegram/Resources/langs/lang.strings         |  11 +
 .../history/history_item_helpers.cpp          |  10 +-
 .../history/history_item_helpers.h            |   3 +-
 .../history/view/history_view_message.cpp     |   2 +-
 .../earn/channel_earn.style                   |   5 +
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 235 ++++++++++++++++++
 Telegram/SourceFiles/menu/menu_sponsored.h    |  24 ++
 20 files changed, 289 insertions(+), 3 deletions(-)
 create mode 100644 Telegram/Resources/icons/sponsored/large_about.png
 create mode 100644 Telegram/Resources/icons/sponsored/large_about@2x.png
 create mode 100644 Telegram/Resources/icons/sponsored/large_about@3x.png
 create mode 100644 Telegram/Resources/icons/sponsored/privacy_about.png
 create mode 100644 Telegram/Resources/icons/sponsored/privacy_about@2x.png
 create mode 100644 Telegram/Resources/icons/sponsored/privacy_about@3x.png
 create mode 100644 Telegram/Resources/icons/sponsored/remove_about.png
 create mode 100644 Telegram/Resources/icons/sponsored/remove_about@2x.png
 create mode 100644 Telegram/Resources/icons/sponsored/remove_about@3x.png
 create mode 100644 Telegram/Resources/icons/sponsored/revenue_split.png
 create mode 100644 Telegram/Resources/icons/sponsored/revenue_split@2x.png
 create mode 100644 Telegram/Resources/icons/sponsored/revenue_split@3x.png
 create mode 100644 Telegram/SourceFiles/menu/menu_sponsored.cpp
 create mode 100644 Telegram/SourceFiles/menu/menu_sponsored.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2c5feb862..9ec116fd3 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1141,6 +1141,8 @@ PRIVATE
     menu/menu_mute.h
     menu/menu_send.cpp
     menu/menu_send.h
+    menu/menu_sponsored.cpp
+    menu/menu_sponsored.h
     menu/menu_ttl_validator.cpp
     menu/menu_ttl_validator.h
     mtproto/config_loader.cpp
diff --git a/Telegram/Resources/icons/sponsored/large_about.png b/Telegram/Resources/icons/sponsored/large_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..95fb27be4545417485bccf1151346e9ee6fa0a1e
GIT binary patch
literal 1180
zcmV;N1Y`S&P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG21!IgR9Fe^Sj#JJQ55GBc}&R7
zMF^oxBz+`(1{e^TP@=rb%pV~m`ousfq=<n?ky0{X;uU6eDFcr@FHz+Eyua(*zSh}i
z?|t?;pF8{ZXzjJu@3+?3XP>p#K7M|_;adUU3jE&{@V7x95D<`)lT%z=oRN|7^J_#$
zM}z15{QURV*xcNlo10r-Uw?mpx4~}#;&Qph#>TF%uRj$A+~5p|g#hZV1qB5Q3kwQq
za9jWcTs@YFXGBEA)YKFwjz!hv<Rqv}f|;6gb8`<44lITix`PUYra^@cH8nM_udhOS
zTLut<Rv1!ZC@Cp<d3muF)C2@tkV`^yOjy|a`+E~&FU%mf@a{rGLk|xRy$GiSMF<4q
zEQV3l*4Cy(DRtW2-L0ysDk>^kUS1YCB9JjUt4T{sdwzZvQK;xqojW@_Lqb9{Y7mN0
z2m~ve0W<IK?-$`!^xNCp#?A5e_9nt29Fu_VEDH<_JUcs!jErQQ=oIh%@$r#retZpR
z#>dAS8XEB2)Cw61;rL^e+Vtw`DkdfdwSa5&D=jS*Jqq*_6B9T|jYtF=8XAH_W@e_*
z3XNoifI?6%>aVi5w-+AVv9YlsdP)HE^Yej9O-<!e%M(ISigM6NQc@C~Qh8)#MAA#3
z)=_6mG80snP+VM`h--g;Uu5!9&ji&a6dxb&CA$qc6I7RwzrXIIqwLJWQq%X!x`a+n
zPDJc=b#;<W9TXHK0-EZNkB_O3YC_rB*`uSQQBhG8tjP|Cqp`6Ovc3N6=;+AE`A=h7
zrawMD_V)IE=?D6Htx_y5F2=^j8rkKaeP3T6h3Ga-Sy|c4%nUV)<d&8e`rQFoU0n@l
z^cC&x?Ok16Pft%87S$iMTe3UL%gcp9u@!D^Zn%Y!Q8qU>(_9l05~u@Kv7(|vbEvPc
zrzS?m%>)@!DpnpI9%eAyDZ1m};9v^IA;@^{?Cjvafw#=)>2zRVfRb?Jl#~?3_M^46
zmExzTr)eY=8TCCqJ)M&9W$XYII-L2*$;loHoGmIS>f?61J#d*29v*&rdP<QZ8CNaO
zZk2R~TsXe=u&^*$9@K`a^YHM%C1RAbv$IW2P2Jtyj9xwkx#cT%Wo4y&KgvT&tZ2vZ
zsnh3ImAAIGB)s-aD3T}ysu@r}G_v2mLfAKG<!BTOGA=Rp)<A?pIhJ?pCduI_6;WH&
zFD)(M@0LkCxf$KD@kCr(TdS?D9UL6Iyu4J&>Gt*(b)m4ZP#%l1>JC@Uh7)adbu}w1
z%j1gMR!>h4dI9VzDA5>UE8w<}n3#y;T^lG!7Z(@WUp?)Y-pa~~@P6Z=RuP;|=iS{M
u?qBos^Bo->d3kv%D4&mS1$-+YSb;w?eG-p=69s?(0000<MNUMnLSTXl^8*3^

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/large_about@2x.png b/Telegram/Resources/icons/sponsored/large_about@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8af8a580fb84572bc8717dc3891f5813f70757c4
GIT binary patch
literal 2303
zcmZuzc|6oz7ax(W8H4Nw*|KH{V<cG`89Z6WzLPz>P!rj=!8{Cwc`S({*|Hmwo$T2g
zYhkP*TiN3I_0RkM@xGt)Irp4%@A;hjIro0gxfg4orv;(sq6dLM5N#9^4M_VxOnV6!
zy-vRR0D|HXT1x{|J_K6_45YKUw#)tdAaOva1yRJggQ)(v0L%q22t=7j0ipyX#h<yn
zOaEE5&!haW{>QOc&Q1>q;jWETH-18~m5uqtU<K=0nEGj1u7C_uB=x2XhsA5eqneRb
zECN`hAv(U)P)L{d;y5lP)dnj`s<Kt)Z}M2!78&+P!mMN~^$*-GP~PtuBP^Uv?f~Xa
z_Wm;Yjah=)|EF2n<sL5?X=zo}7Wc8jGRxYN(^Zq^r-%OJzTbyS?JvW^tbG<fKHFRF
zRaLFnUmdpl7;=32Ye!ZY#;0~|v`GJDxlL2h_AF87g*dg}ov`z>qur&Rzj<b=U7=4n
z-B9_o4FfM#FE%DhKAbU1v*fdpwUaEmiWa*Pp}e<`)<z2WBNt2PuX40!CzxTsiW%m2
zM$=v0o^Rgd)<<?KKi;-y8N-IFEq3OqM`>LAGcMaD&w!fkCl^pdxL~)R7^q~fA)qis
zxE!&w-7(8M7}(us{sUIZ#byu@rHfecQ=qA5l`x%c4zBkG?fzKe*d~KmdYqQJaTV4?
zX8jr$Q(veEPn_e8gSC+*a({+PXpdM-S_7AaJjW)fdKE}?DQT>mt$fipgyV2~?i8va
z5+%v76a?c4+!$X^zT4AAyIRooRxjsPGOtQi@fPt#7e*tVzM#svKUXCfUe7dbrTS<E
z9D$4+0ghnnw{B#tNr`C;lu?CT@3WA~nA;4c%AenrfOPj~NQdn%b~OfW#zH^fyEmsQ
zd`MN~u0-~&>00iaPN?<KH-Qr=o^B)gm*tpk)Wgm(`zxfDdIR|n!N0sW#*4cWSRcW>
z#tI>Xdz54<vS_9F_*=uMgZB|MuM%NO{;v%S?vdJ(U`nH{Z0bywb#N~o=4qFzqqOVy
znFogmcrH*h?JM_=Z%l7Z%cgsh`348#gloet&Rfs^CZwU5@<g1PXE^0tqFIX~a;GZn
zlDQT2jQwWuAxA&j)Kmqi)+P(gy5&sY41i~J@i?;`MI42I+VPc?!2P+#K*7X!G#fj!
z!?`L=0qf|(jN{+EK9A)Eyk_dkjEht6Hv4|l$dIyedkRbV(AtB3XDp_aye8(rdnd&F
z!1$hBjT_!i^U2W<{^Li76C9={iazt-Gqd1c{|r=@x^^qjCPow9=;K;F0&Y)=f1j@H
zx8JI9>P-b}$;F-=ZWgULGG##2qKlnN;)y|9)0TON0WcaT*LH<nYG7@BroJM53=VR@
z+iR|bLbO$2TQl{)3|M>s0H1D5NNBo1x%mp?n1^o|vEljo)dsT^*?UoIz|GA!J+6r6
zCnRTPU}0A{^Tvww6D5TSQpFIB@DNv(2=zP9PUKTWBEYHkF(9Ir@CN_L*J3%5I3wm#
z#%oKtqDl@W!2)!qv<5Nstm6<w_MSsiM|w@9kU77a%PZ3|O9l5fs}n)0Pm(;n&-+GS
zWyhz%8A+^{gz!x3k$Q{QCpB%c61S3t+UO|+gv%Wl*>?cgp!O~rr^F^oEsWw+<Za=I
z_y9VJ2V^xN!J@QIQe$Ar>m?R!b;oBy0oSS&vX6Ygt>_)k5e=&JuoAk8+F58(-S-cj
z>xcS_nJQ0}+iZf5NxC;yp})kmCGZ;G>I}HUWlT#<%XpN7-kan)U80l2AA@sj>+Z%e
zY=e6<WgY9hW`H)JM9kYCFC7l-#N_B%)Y@ln`|k0kU*=N($thkqD>=rKI$JJD))9U<
z`Wh>qPaoo0o?=Wdp0kft>O=U;VD^@Qa7ru-k@x#v$Yd#atdzjR8~n*S{gz*ucIKO#
zI)!lZ#i(S|O3>-gt;5YJ_FjLsZZjQx0{|=h3h0)^SpuAelrCu@plD%kE{g6dFC#u$
z^%oVj>Ue8dfJBQ29OA&XV>KZ{t;U|BdnxV#^_{lCs@(*ClV3Xvd~nZ9tCWf;SfaJg
z-g7zdhE3Uww;^UITZws#I+;z<{HtTPX8zI@V_i${zUN{ETFEY3U#c*<3LfeG4WW35
zhf7Ig{xwoA|N2c|gK;pHW%{#f*g32rOdVk`5RL&7z;P>XP)a-(H7ZOB;n`U3P1E@H
zp6@-gR?owd7wo*=!izb&jn%fzPf5n~ffkm}dLJh9J_P!LnPO=>251A3k(ca55K4LZ
zZMm*MtN6%}$w<iAFC(2UPs#-U^t3Zuq*!Z<qM;shw~I@RAGkgDjg+DN>3DmPZZ4&w
z1SXxX>G5-*nb<n@PReg}D5tb1IGa@Co>tCla}ME#KS_#xq<b%tfG=0{4^4N-S?8sM
zU*Gi)JuPyAC+%a}5LK<+ZeQkg>tieIT2h%wKotP>Fn1u@mqg@-dvd^vAT%?$^UocU
zFYi2S$7Fpmady|@jJmfQTQEj<i;{-H8233>`T%bj@Hvk&fEvtU&lcEfeD}3+Y7P^2
zIbkT)4^EkSft#QRx}|wC)PWA&oGgQ#wP*ovQ9J!Lw2J4*;2`>_6MIz<GGMFpTk_PY
z?4|>pPso+>yJNgw2llGS5v52LsLY9=_Uw31xbcUle3~kc>;vSGxE{6H%~iN8Qb;#H
z=;UCXT4b|ST(?d}xpMr%D}v|-jtiG<!^j#2i77|BiM^gRc?a?s1duq`FbdR_bAP%@
z=$W~uK~5YQ2fQV|xq{Q-wKe<0mm^l6y5~-oTBOYpt0HGB9eW6JuA{Bo`ef8mb!VTU
zj&G%Pk{Q&x?%?}md!r1Iq4ymd<s<-Gxy!HK1YB{+a2K<z^VD8RLDICGnO*BuK{Hwt
zq+_tWt04w!$60D0uk$)f{6!Tr+*yCVZ_3#P<-22D1x2fX_FQFm!1M?AYpE+4+D`Pz
zeJ_rWiUq$T9&oo88x?&)w7aspU3W$?{VyGb@&DlaOJ_j5W0%M1&*wv1Qx93LVITP~
DrdU$7

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/large_about@3x.png b/Telegram/Resources/icons/sponsored/large_about@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d8147c28694f6065a0c1ca12352ba4eaf269fe
GIT binary patch
literal 3405
zcmb7HcR1To_YbjZl}0p_nzgB|B5K!OsadqttlFuHUFnEfqxOhctyxr2l#XcZP@}e@
zcFiJYdB6SV_xtyKpXZ)??t1PzpL0I<#+aGtGSPF=gFqlAeLZa?pp*Uy9VL)^2nKEe
ziUNhy)damIajgOsZC4w8H)CUv7*M7IQD7f{sQwKBgcA@D2#luyfdNhNuMJQ6f4xa~
z@c)<p4OCO3j|PDl8}+p{EYK7idG66{J?tH$kBs{(VbZ*#(N31}2$V@_CJXqMbRmBQ
z?;0(*Fq5Shb~BnjR(ZLyG!yzuZaKHE?SK#*1PgL^FK@1Z_YQ~IgtVCEZL2v<LrKbc
zNsbXT6i=UMeCBmzk*0%DF;f1Q)f$XCr+C7Y&nrdmiLcKYGDOVhw<05gcbEQ-Zr%G)
zX$z)ZIh;G#`qhyb_4M-fyQj<fKl^f&co69A-=o(Xjg!;2u3+a1Ch8xapBz-%Hw8rg
z-OqSm6{&bg-k4nM$w)jq<5mu!I{zCyeJY%&-rzOf{CJ}|V6nR;XzR>+_aZBuCYR=-
zLc$iia=^mM_o5DB!j(^9M}_0YPGbUW-$kBq?rhLf{JtXZQ4{g^xcc6w7Zig#w@agB
zO9k=h++>&T)H2_nZI`9&{iZ}UDa{%8&16Yamq_+kRUpD9VP~gJECFvX6$q9Sw@@ig
zGuv|n4$qb~>IZWo@e|~Z(z(sM)i}dfLdF?V4w<a_MT=Q9B8eAZ^Oo@=tCqlCfm4Ul
z1lz?r(k+z|h|ak-I6VV{<I|%$$t1)N7)qLc2tm`}9cYj)(UpSf7_fTH{MrfcorECZ
zP4jQ&-wa36Bnopl@w$c31XRQp8)o>B*T-?%HgQN;T$k1NfEI_%siuSV@gi#2MY(S-
zj6qjIgO3>V$G&b$*Kk@A{PGj7LLiXvT697GgUpL`e-4_iNQzmOFSP74aO1#Kcs~MI
zR<^>T?9ZP?LvHd(valH_nlXYjX!X|qXr#hALfa~z1frB69cvif`GTPycO7+aic|(O
z%tjZiut7t0giUdK*Izd)&~o{DzhPx6m~{KJOUwVJ*;HQHnHayLl1*B<X!gBkII`8P
zFIz3*)Q{-+$&f;1_T4JP&dx7O&i!W4rhOT*#7m4-tq-sbX(8U2qep1+PFb#^_niu>
zDv6$#gcreo7Wfo{mq~f)-i<Sawc#?<?B}Sl$(GQA&1nE6F$_Y5?*Y7Z>jt%BN2~9h
z14c>@cPnu^-dkOrj)*K19LlHueD?Qb2#krY*}VB+u-L_gd`=AqF&g;KI|6f&_sMKn
z;JnK{8P_EqKhqbrhJpy)g8{OJ=@N-NYF0i^?HKbB!Gi@_*iOAFhZd`<5D;B_@^i5k
zPD4mFRNP9MC7RxNx;bzJ&gjEz+#|gOAiTRi2sc-xn>g|Q0c6CIf|7=}TY>6Ua;T0O
z!J-QQ=^OjNWezF31_^gkZW$-XCS^=i_db`(W3L<LYb2TIAYMyDWvK$jt?8By$7xDI
zI2TQ3$g)nAT_dx?Oi)K0yJR;`wT0UEyEc{pV$rKw6&UvHNtbLxA=T$58-0~LhxIx;
zEu!U>8TD?ndYn9}z5gxZ>~vKZ%SudDi;Tztc?7_cC@VksT-x0*$%C(k&k6}9U5i*9
zyhikW*HhH{z{aBLZfi()7n8b@_r%`n(3^Su4gCwnAeHdrNBf$<)mM~-Cg;LYOGXAa
z#w?o63N$AhybWJ3{8{Yre#ay~I!qW~cTDp*q=m%Z^Dt0#drEApz%-}S)kmJ6nE}95
zg`-DEQ8%#^65I4^LfOKED|WgQb8X=#r5`mSa`DaPU4Bsg3#Uv-B$OAu-UogH<zb0|
zSL(#EcUQSe4AeU7Zra!9a<I&N@Yj+wot|o+g9h5PhU}+`_r>o29<5HRd(Ibp4j)_l
zCCXf#L|Ca~dyK4*x~O$Yb@&fsfb)qAdOZ$23k~~4r(9{2CEKkug<vBuQe;qG=ZzEL
zUyzRVkJ(Ns9Iti8vW53T7%=NE32l+*r1cw1;k>SR1FWd2DZ_$*{y1c}U5qED8>Mcm
z9v4j8$tm(7OLR}~{l{y36^{@@3>Yu2rL-LF62g4rv#h5xY*gcUS6_$b5H)hsVvys6
z)C@@hm)pvwuANQodMqpjSIK98L+h<vI+MPjY>Pc5Q<ur)4ZGx9n#=-f>d!LRjO*O`
zidUR*HY_fDSkWyfyy=&n%!8=ZC^2rKPD6uF0I*&K3XEvy+W0Nn<raWbfxRuvtqh<6
z_r*Bd+O9&yERwwE;jObj@B;!nYa<o#by0_AdHtIU)8(!v!<jsF=xT=+A<WYx!dv?$
z{;xfhOcWjq{07uZI_Y0$(L3|s3bYo6-?j1Y`k#sMMRY&2s=A{f&#ZqWvxs<Ol!YwT
zW6j}&NH#kWUbw8~-SGb^G^vgXH@{8soLZdg!r~3cvu_^+_8KfHH4KE@`*E%49sVw#
zAC&qJN6Mk(+e&#VL3iuij1Bye?tV7iB9@}etkL>mLYCI9Pco`2EX71SE9$Yy`&?i0
z3NoI}ILQxOmWGrkymlrk0KTe>-p0E#z+x{$qZzQ&o8ZB_Koo8Do723=tR*7PhpwY<
zCCsLYTT7Am9c*3SFkblb5tIDzquYv6Z@0i$KU?7G;SOr4m+!qGrR~bK!ff>0cT}7q
z$Pt-q35SBkv+cH;rFPV0n5>>hR?=r#T2!`+^S9J<*(NsAZ<RK+_YIiKNnG$pdQ<A(
zb@{oJd}ky`)_ks8Gp!{bzF*eCNgGY_3FMo&q)T4S5-;(5Vxw)x;01|gms~T@<k7nO
zIc+dA&2?vzhxQc?>U3VC9z}Uf&*7X$?0>R8QE$ja_dL~NC@BDz-2ZN{>+qLcnCQL1
zh1{Laltm$vPoW1sqC*SOM;_@P#OOs=$1(ot8ljc@7g9z-_Se2;Gss1Gj+7_BWHf`u
zS4(x!7<OA_{QE2)FcKwqF9KNjvX*D%M-)zhd%T!BMuQez`&ia@1|d3Y!Fs!1=#Qgn
z7BBIA7YV(6??)NO&~M9l5yu};hbH|l>&xel&494uV2-pGdFa6C?$UZ~lrT#YNKTaM
ziZ$2lf9N%U*T7VM{7C>9K!;CR1Lc)myY}V1{izjFFUEeyPyG6In>sHS??#7a?3|}!
zoqKPlQ_r&16*;?0TR#O=?9z%_rx&_jja2LC48Q?W;qOtSKd}-KpD|^9#Ble1EM%fv
zrDK>1{27l!(prVUC`BY?96y6Z_32}58~2^<Em$bT7{HF(_m-K{r5x6Nc&h-uRr>g5
z*x`WWK7VIPp}j?4Aggq{yN)m>;8;p#F}~&)`$a-+?Uhf~E`Y|bG%_oH%naI$v*rC=
zbzq%iB?)FbSf^xH8wCZIyhZ@#qB4(;83WA}Y+-4VJ@1^f7NT+BywW~yp-gyS`B2*h
z@kEbuAZ)|E!pyjG1hiS|Jav{3Ck@)(Mw!x4({sF0y3Aw7Momx_c2i*!*|fI6-|4#e
z9XzK*dDH2dLGa}o-`_t#?N6`LTgLQ0oBtN~M!WZ~9OC8uqT+CoDaAy!utW85jf3!4
z*);VJN6E7%1fiAmoLAPmUJjl%!HZ#yKGPC*Fhiyt_QvXfYCX0G?5P_CwMlp)XXiG%
z%%hH%+_y=S^LOr3sd^5Vvd(!T?C(Qgq}0GaQil+oVtx4(O}a?%z_rx-ZP{b2B?KeI
z^t(F92D1Q%BVm|A@Y=c8k@V}-=Q3JGnGr~2%3Z%mlr>_-WAtqv*dWxHih)Bll#D<v
z#gDSZy*2$PX~tSibo+EK=yum&LY8iBG+%M@Zhgi|P%V-^t*9MfbMcYBmR_7{s3LlM
zw!K|@i*~4lo<EWLW`uBn^KtfzdW{BOey`lu^hu*qd%s8fM{&{Rh^S`NG6|X(yO;g+
zYyeB=nPZ-#y|J4c6PqngrCpN1rJSPrNzIGAuQuHh)CgWY+WklLrZoNlVU1SVEhm>L
zY0$7;<>l5x;D7R%EJXPP%lFr0u6MYYr>*Z@<c6olN2(}AEjAp+Y~uifL#6D;c$kw$
zQj+K&u57z1(%fNfuQl(f@E<9+WL|fL+~^zCp$igRl*JgdeRA=x^gliH$3@H&A<J4i
zs+-3EIYIbI@T7V>L0j=cDt+QLffpyl>n)mvf$*;wLo@!LxorJ>RMo~gia^=`-n32}
z^tc7@4r|yEnfiO-=`}(c9$9Elsdn`{#U5)1S*b{cIDdMr0b@!*6Tz5#W5E1@<p5Ps
zr`|>V$NjI#*CD;;MYojM<1`B-r<T+e<d*##>kqF4Gi?BGBE&H|3X;;%Ii^3kVrmkL
zLZ(;g^2cF!m;0BSwCfR5gv2@ipZUd#96Snal`(6@^|#XhmoI|)N4{+}O0_iqyfFTW
Qe_t7W9TV-hnvR(N0Eg*N4*&oF

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/privacy_about.png b/Telegram/Resources/icons/sponsored/privacy_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..67fc01990330f2349f4409ac4e8c9928d28598b2
GIT binary patch
literal 534
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgftijX8F~maf
zY{>4urT~G|*0u$#YZn%3=jtwa#IDiNX?ouw{ki=Q_3Y$KR^FDDYbn*ziXtI1R#acx
zy|eLkf#%(n=jIfr&G_vU_%FJ~gDohubZgYjZM^=omi_+wuWYyHpDiY{&j!SZ9KCML
zFrjJ5-CCVA$D0oe416b70{Jah!d*YS{wk&XL2r+^hlfk!q8<;i-$Jf|p`p2=njYIy
zbLS=Qx>#amJOBLpya^NHDh;GgzS>o{|Gw^Np(`INcsvzens79oe)?$w8_x#LuXC%n
z#OO^{;XEwBex*Fs#P_pJ{`T9JeUqQ>yzox{Zr=9ek0)N+rITZ@edoEf$9qn1$~j#t
zVfL`7L~3H{{PPM+%`7iuY>cR}XI>Edt?T9E=XQq;+!o*OXDpb+!rZ$_r#M!8Dnp8`
zI=j?C@#BW&-VW*guXfGzQ4=zsp3ppVxzYixS<61w#(!Ghz`~r9b25p0UcTAv*I%`2
z75OC+9;@<{%;Q*W@U6z~y)>8q^Af9**HmjB=Dy_L`{|r<CtKJaP@H(W`njxgN@xNA
DfyB=A

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/privacy_about@2x.png b/Telegram/Resources/icons/sponsored/privacy_about@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e63d296dc8db3cd5713791d6c455012d4b09669a
GIT binary patch
literal 928
zcmV;R17G}!P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF3Q0skR9Fe^m%mG@Q5eU&l9-xC
zl8X*1fs2T3cS&%mp*<X&nu3N1{|8qIp~2-kISBm;4MHusiIX5?iGvtIB>ot(`@KDI
zc>Qr+pZ7g=>0W$?IOjay@8@~Wd5@>_uC1+})e5Mszz;S1A9o-S@caE}wA<~+$47Ob
zNrKPkyS%(?wOa3*2VD#zWD;uHc7A?77z{L(Of?aLz%<;jF_+7U{MXmlsZ{Fc$AbpC
zA_SRXv<U;IPAQ+Bo(>NW=Lr}@h%{fmPS_murjT-bdwaeb8u55MR1?HsyPvROY3c_D
z2eN8t9P30%SoD=jQTk0`qi`s+pJ3sL&1izbAWa&Zm*a<w^e}Stq_Oa&VmCAz4US95
zgpuPiP>{>zBI4`oD+euP!pLzMD2Rho*L=Hz)|qp{(XzX{OX658=61W68bhHFX<&rC
z*Xu2{ums_7_~z#3?d^?zGUoom4hT@JlsckhGO6=V)M#-)0jQG>A-($$&W~EHwz;_p
zP&S*rySsaNdC|u$jBagh?eFiW(`kpp(eL-8(P*>TT&P?!NJs5xG}_zSTOwtI0Rak&
z$~@?2krs<(I2^)%b#*lxGusCWK&&_5GKMtZ^?ElpHejn%Dl)UtaYEVccEDv`X+c)2
zl{}b`%xrXApaguLAT4NK`gcaYT|wNFT4#B1aG#u<Ku{<Ys@1BFk`q!b2)Fy&+gsWb
zXJ=>ec>MnUo|9OnQGI0>7Z+lOqJgd~6LVa(Ag9x*%{0^1hL~;Df{MkWHq%U38)CLq
z_fV-+!m6B}o+4j9pGTLOSSC{~2;5&Ek1T=Fan)C5G~ZJFzf;g;GNIY5uYba8ok0os
z{DMhW==u4XY>`N0-ezuuP{0CihJYg&*OyMGv$L~f#y{-=1SkN3osO`3xOdXszFw~%
z9UXDLG#0X9gdGr610b*qWvszWCIiYRJ^->3>xhnzkGtKjdQE@;rIUz4dS4yFj7w)C
zk-&$a&1MsW{Kj}Zet38&m&>@M^Ia?DY6bq675ELIi<7>KeyQmI0000<MNUMnLSTa3
COqy%}

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/privacy_about@3x.png b/Telegram/Resources/icons/sponsored/privacy_about@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b95f5bc66e833288e27d42a3cefd23e819a5ece
GIT binary patch
literal 1299
zcmV+u1?>8XP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS<eMv+?RA>e5T1_i;Q55#NV&E#}
zqr3<cB&4KtDFaM>#UC({GGOQr_yh7WHe*8O;wq)Q5~VOuqL*8@kdFc4eK@r&?z!9E
z=k9&(_1b5&&faT1&$HG(XYYOYxoK(kvK6ouuobWs_yHC8Wi-c<l9H~juC}(e-)|SV
z{=Qw|aCmun`Rwe>D7z8x*4Ebb_4OCwh4kQNgx&;bet!Pq;-WC451nw%%gZyNL?>o#
zZSC>#@dx2AFVD}<cmV&rT`+L_$pIk<)Tu)+7Q|g&UvtrWdwWAeLq$bJoCvpQL>Ko&
zV2b93Cy<ZT?d|R0;9z=sI!}q)=z;^>C_RJ&g!`m~&EKoj)6@F;dKp=8gEQp@5Sb|d
zd@#9@I1GYhR*pV6^Knb9d6LiUc)(OEiV&&`pj5+6`C}C(S(p+8?^Qen2;p-H0ONVe
zx5s_C<srJeyUBTKY6`PC-AWn=K_EGEKx#~aF+V@=j2QHNn%U*mAduEK0Lll(^VBe6
z#l^)A`o+b?`T2P~CUH9g5$^a9pg2U_t06HOCG0B1Wa3^5CqS{kxK~4BIXO8F2WD+C
znYfq22~g}W?$wZ(m>^lbHnC(?-Yf5aJ7O7LEAkpwU0q#TTAG!W<$x3v6buXucm_nc
z6AQr3&Q5HO4-O7Iqj?F;&CQ*dnBco|+EVE?Kmj7qc~Pkv)6vlpjYjn*AVvcnNL6*J
z`S<qrK0Q5&b(rV{DX5jSDjdI6RaI?oZ)ay`I|L684@*l+TU%QvCnrjjGR|dXWlc>@
zJv}{{nVF9N-Q8VdW8>lBp-i}%57MB~*xlW&tE*FsSN8@5h=>#d)G@w_C@(K3g3HTG
zE&J53IA8lg1UjO|NXkSh_>7E<5c=ros6u4Iu47|kL=72|c(Mz0Wo0EHuC1++?Srwp
zx=Jiu1~s}GvWXQI7E=8F{yy107@UsF5L3%0#!oUHA0Ne_dV4t?mmy}6O-ziEg1t7e
z6dV+xBs*fl@`yVtDk^ZIhO-)6FmNmO_qBInVS!djCE}Wznwy&&iiLq&G%A5mIAll$
z8h;dLXJ>=KAXkH1H1ZY`w%Nq+Q=p}#C02JR6rx`VvAtSa%qE5tLf0iV5D0u4MlH#3
z5VMKl)Y|nw4`_@;B3y@d+iYTxJ3c-hE84X&*3FL=&$A-L4G#~~H%l0}RaNX^R!r#l
zO;X>?%*@=}Tth<x{C9SC?(gp<0~2xcBQfa1iN(goMj}F0V~xLKs)BU++r)HL(l4AJ
zKVnx`S5#~LXJ7>FW^g(#!_D`-O?Jfi1_Eca?*Qg4PKVDFnhCLOrBxCK-5D7^trH*u
z9Z^Gu=ESg<Jvurfg2~BAA94c)h=>#dT({JTrrOunM;tIv$o~F*{sJUQz~TW5a6VRG
zgaGEE)tsK5=DGQ4gIa4UAHnc!BqcYH`tanZ;gR6)o6&Itk+&yM;lm#vJiNrs&CTuY
z?fAHE;u|s6E6nUGD=V9un;!m7$E8}^R=`%kR=`%kR^S^};2$%xkoAWk#<&0g002ov
JPDHLkV1i3wLEQiV

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/remove_about.png b/Telegram/Resources/icons/sponsored/remove_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..06a33dc3c089717f0c8ad67beca035d1daea3184
GIT binary patch
literal 771
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfhpJ1#WBP}
z@NS5$$Erk;bMvQMaB<}3bQMwMIJlc*nzQ`{F%6D~HJvgnf+n{_SR7?aiUf04EY#$2
z(a02<xF};+_l}T`XGvWF|L&_V4X^&a;^#f%6PC{_&wc!}_x_nP_1ZF*B)g9){W9lj
zKYa7vy|C3+`T6+|Kb(;E>g%uR)5W`wIx)}BT^m+iUw=PudwhKS`Sa)Po0YpyKb<#k
z-nS~-_QMAm`eSzQ-hDRh^P4w5I%4|z`io`$*fLA5bzK~Ipl-kX1{Wnm37-9SDq`IW
z1*V^NRZ3j9e!cMIFg`v$wq{2gx#K!!=H}A9Y(dWR=FjhSdu%e>>xk-&fB)>V_*$K&
zdZ|wI(9zRdBwmr0o^IF&v}pEhX{UdyHgulO+RDYkG~@X3<JQ*J($do5;o%t@F2A&~
zvs<KbC?!O#Q%p>3)zw!sN(u`bU8H)|=AYM|>eYYz^Or9!M}t?YcWT^w`}XavTT;KY
zM7Xr3zIySZLn+{yieQ+wQ0KCTK`XcH+SN7jX_2MI<qPGz&Og@{>n_?kM~Sob(CO2s
zw{JI}eb$Wk;Nd<0cJADnW7fTN(FA+>Cf}JpY9<v$MVH=xpX;Z7(sk|pANNJ?q$mii
zxc<7jx_ZC+qpwwkUOSQ<9u`P213mv(;>S#Fsl%T?e_k8L{aSvux3@P(n1)Esx8Ejr
z^UTkQHXomCH2bW@U&G#?<}-aJv1?8~If0|xVMW<)S>IG6NtwI+@;o{#Zogf(W{pCG
z)>Ng5e#@0R1@>&++A0c+C}!2VG}WnIQ%^tjP-(i9wN+~V`Q;TAr!Baz`2EbBeEhMj
toZPa@nL6BtCN`S_&s~pBO!@cv-2T3`qBhw)RyRQj(9_k=Wt~$(69A{aJm3HT

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/remove_about@2x.png b/Telegram/Resources/icons/sponsored/remove_about@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..996851dbc9f57f50181b43546053c9f9a7389393
GIT binary patch
literal 1540
zcmV+f2K)JmP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHZb?KzR9Fe^SXn5hZ5U>3VeFD6
zOUM?b$Tl%UYRs4j2ew2)NLdQWgsD+z!~q8s2TGVDLu!yEJK2+xiG!K3jAm?OU;h94
z-FfDn?|r?#@B8QAuity{d7gW@?)!b7dwVG;JUkC4@NfeEvlCF{zpt8_+S%C|pDs5=
zOG_&)EzQl%O<7sFySux!we{fOKw30kU*EmGy}7wLTU%RcbwuUD!ot3P|Na-}SzcbY
zw6qje;xO~`^GWyHw{Pz5?i`NHOI20X>gsCd$@uvA%*+gJ@xqFV0+%CTLtkHiVPS#P
ze*XOV{P}YMAt^{!R#uaflZ3OevGMHLGg5l}`ZW;)0|TXixe?LP(HR&RAhq-J^SHP;
zX*F-<LPJA;{P;l#y}i9gMn<<B1zla;i;D}ea&mGQ@%{zk`u+R&gm`^@otKw)zs`+>
zii%2QWhE(IU0oFw6+L?NNJ4jie;)!RB_$Gc+A0fDk!4X)QQO<w85tS4?DFz*Q&ZFI
z>}&u*UQbUiC@4rnLxZoIl$7M<<puiI)>dq6Y=3`0U*=y?3JMD7b@AKQ)`mDGI1394
zBnx9nEZ~Q+vGHAo#ZO3Bi+j%T@$q!)unJ4s+S;Up@E;u=m2d^yw{PEa)%gbGap=vP
zH{76m@!|zCj%?4*&zqQ-Ff+I~xQGYxB!Kv1T)~CR4%yh)(2*o3Co@D3509Ol9WuGT
zzHV=C&selbPf!0N4oRi}&_hB(P~)-a>+54yr>3TSe0<;vD5x>GEKg5Q#{Gi}0f(%u
ztziIZvbMIywY0jr3ZGD9K{PNhKs*Hp2Qz`e!9nCX+seHVa7bNU9dM{@d{B7#^yyPN
zIYdu;dwXJHB8egC!o$N)PEPn*GEoE^64yUGJbd}`B|0|5aI*~!4TXh;q|(vRAwxsB
z!;H)h0SEmgCMKq;s){g?=e4!9l<H$+W8mIlODeKF4gnYmg*?yA&BX#+q!?NaB|K52
zGA<+};1I<ox{{FmZ?t#s-l6rPMt~X-5z*7rgWma@gzOsuhcF2N2f0SkEsojT-2Cd*
zE0j%$`T6+`4-cD}nTe~2a|Ik48XAI*l9CcGLR^`+I2epO^cv32&KSfT9UY}nlvW1e
z37-%O$YE}=7S~68N1=ii9?Yyyo;<lrUc7Y(&yhgK+^DIk3DB=!zoLH~A0G=E`1I*h
zSy>qk?HI(my1Hoa#mhuTM}PS6fv*LJ(EHFX?;45tD*sSiTwG>nXX%Z_e{nEW+@baO
z@#BvlKa%|A<z-4r3Ljnkg!uBmC`dFEV(Rk<5d;VSSz1~;Jw5&W`LmOg6KO)Lsi}#*
zLveBOFT|Ub{0<RNeSJO9kB*KoYfC_5i%vqeU0q!n7ei)6MFsPzuC5L#!npJiA=`a1
zWh^jw5Oiv4Dwj@cZ*Onn(&Wk&$jZvXJWgD6Jyt{zYSYuxtl@A~q+KsAE&>-Qd<A@u
zl1UUHJ~uKl65}}ujEsz6$Rrtrnn)V*aU?03nVAI2y%!Qf>=Wy*wi*x+KtTgBOa$iU
z=91`g?D1xZTp-re)JUj1I5?0)7;`09Y>U^}+}tFwFJHc(crup!i<XuaAnxw&vQQu_
zBs^Kd$Ds&1hRl_f6_Nyq;QflI3$XnC{RvJYjqU90h>jsiK#fB(G&G!;m>^-CH<~er
zDc2JJNdX)Zr?j+`zK-$nMJETkH2=`Rkcm=GK4GRn{K@6WtrGeP3LwGZmwl{ZjbZ3k
z>Yl$CG8-Ek2}Jys?*Sq<MhiM8<`x#6ot?6dL72W15)!!8l9?B7u8b|XKxW|^2p=9O
q-xz?9%z|PM#D^1jID!A>3H%L+7`mZr(d-}q0000<MNUMnLSTY;iMhQ1

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/remove_about@3x.png b/Telegram/Resources/icons/sponsored/remove_about@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0863b33e8df564738eaaae505f5f6d44a73ab374
GIT binary patch
literal 2194
zcmYLLcOca7AHQ=l%9fdokQ_2Ak@>|TbjT(v>&wrcot+Wq98oSKdqi0$d)#rHLeeFq
zIwPm^wb#k~efs_J`~LBM-p?Md=k<O)Pa50|#(G}xJO~70H8Rw*0KDNJW1<7nuV@Jl
zz=1<7V7j3C4?<L+pyy$0<Y{UOf&zIa5IEHbME|D?V1j^wK#&qJ2m*NUpSlvd|F;^J
zK>p4D>6oQxumJ)w9vkWD-1k1WmLE3E<G_L2+re@-sVi!m5Z2iUY!~(Kv%v8<`ZM^d
zw!RK03(Lg|vW+}lJcIrH>;5qtsYjSwg(w6qwo8Ql#}BRR*bs_I5s-}f<*Q7{Z)^Wd
z7=~msUSZc0esU+vUf3|tK9MUsCpY(g4ZKv=t~vVj_;&Vh{}3gw4~`|;;I;|))?}Rx
zxy6Tj|9Eeiw!Jj6G?JGGwSt05<s4d%H|HUKQw`4OWN=^xT0b~=d-R2J+{vNGi;6Sn
zo<~+~{@)L#+bxT3hZtal)x%{Y*1xT{B%m%zThQBGnPQ9ny<KUC^^|@Zaj@w+M*I5K
zcQBpjE+^48$Dz%C>^VtSMB`D5-%Rr}8JlM7#J<>*N1dV4OsrOQ)-flCZyO<zz_3c=
zXKt_ZhE>zeiZxGY8{{i&k^8GN0?M8((@SFov~L|DN?*%iXg$JkVLFeDX5^;!G`KtF
zsMU2KMVEsK-X1tF4$JhGetoYie2s;oYVS=MEAYxVjMZBKR!tJe0jKK<r7jd?kI?IW
z-dP^MamFoW*1i@cgVE{sox08!8~d>%cuDDw@vz`cKa7YlTZ>=cE6eJYwbUV5{li`A
z<(jh+!nsto%faPaspGlQBw+rx&I#3~1r#*0?7D5E=zE`(?(xfNp>PSd68V9rm-(mR
zetq>$UDqFUM-FF+DXF^l(|<}#fH0mO|F+C}$o!a*{kl_Ui;EEWW=L=J?}xv3sif~+
z5q%LGFI_AyVN`schAVG=C{kB6_y@o3Khr!Yx)bTx=%SOtBA~)}YkDfZLosL&K<bQ$
z7O|hOtTtPEmjk;eN_1#`m{t{(l-5+F7WRp|XFi@aXF#ul3#k=zSP|9}v}lmVC7Fby
zTOFyZz7uo!IbfZy!qtaVwInB^;+<6*`o{ikhV1;i94V{X`-;QU&kNsdle{JhZ-=lf
zV9+{(U$9>HM#e0wOcd$!WNb30oaFnvA~y0>eB83A#DziRg_GBI*j@OYz^oLiUX{*c
zhLp&%{Xrz3zD;}pxi{*k`WeqaI<FkmI4AUywH^9)@K4pix%ez_ASF}i_NQ#s8?1MO
zKjU;)aw9f=^kn94ko%-$$n8Pp8Qb<BinWT17(@*(9GsqXB`|MHj3|WXGik=1cH<au
z`-@hN?SZ93Xn-<%E0YGXyQ?$G&uwy&84&_i5Dl5dQu^5d!V}KLArwia2SNMM<PK}~
zo1teG80m5yV8ACaMhZ}Dpf-oSF-I#bb^1u&LS8k5+pYbTNu=L^{EjFUxO=F1sd>3U
zP_zGJ?IeJ@#}(Y#Y}?w5I~`5Ud0umv2P;bk-~pC!?v518#MLem(Uy^1ETBrp6Mj{p
zZr2(^u^O`?H6VOA!)8#cM&VU1{S3N_ER{2{(^c-$=1I1?dd#yD$T-^+e9_#8f{p;P
zW>eCyaRG%#yWaoX;yz{U66fkI?zXEImENSPvCgo6lGv+nE=d`K_7@$zbs1Nt8szb)
zBdh-HM%VRk9sTd=t|<_s`Yv|#mX(bLgH%f@74&jR#B4~I?B^Qu@{CWcT`GwE)h5b`
zx-iDI(Gly3ip;+dcb>)$Q)X;Ypa%j=_c#VE$|_@7m0_JcAk~y-`ps;qXw_tP=oP%x
z&rWO;6fNL+buPS@UhzQ$-d!r95$iR+B5rH2hMOpd0R(N>nyj@dUwEMv7poI25HQ;+
z_ZEs*rQ;v+C=@%s6nFLK@QR4UtD^lTXG}fan3!C=M_<@K&nbWL8pOW#S#50K!QP7)
zf@?_}`dUTf0kVDZ(Nx;hxLff8ehi$p7<-^K4QF|*EY}Q>mfRQT?8~iX^3sDa2@uh(
z5$}3@u;t&H?17O)J6hi_P0)r79aSR(bN|Y~BIP>&o`kx3gOR*)WlBD`<Q)gHU>U6{
zbB<8E<_aeWib|?R|N7n=gV1=07ZOwU9OV$aPy&9_(7`K7#oRE~{LeBsD8(B2ONU4(
z5Z8|q0|3Wf+S;5SK=mqrT^@a5Ng|b$;+flkQ2#sHMFAyAT_#a>{R_iar_EW)RTfJ1
z0A;;a%%q3|)R>Ckx2y^DpKTq}X4tP$=0ecSk@N9fPSQfZ#MDPwpViiVgmBco&yx>;
ze|c?3!qM*!4?Z9uj?g2Oa5jDg(JBT&>0*x$noPhYAr62HVz?pV?NK{bk}r3N;$(4s
z4ms&Eg80i$XfeaEEGWF!eQs-x!eOORv-c5@)YmZGRwCZ`{8em*t$ZZJ<!Gz)Jpkyr
zaXuA5#Zg{(590+;odinBdK_hr61+j6xf3(P#IcK1DGTGQ4qojPmueQ_$9(#Y4ove!
zocU?oQim3aJ-FU1DsN*b)q=P<%eTx=$mP(7A`Q|X7HgvoyuI(uGP}8{LX#h#n}e$b
zC`wg5iT6x4tXw7_8fJnB)N$68$+~LTVrrV&(3a`OEaK7X5r%ero(JmK8ETZz{<$qm
z@qm)-%k&$uLm8V%=Vi2i>FB_Hx}D{}2fRXiy4hpNN2TCba^$<iogH9dR-FLyyK7zc
z^=5^Oy(^Oa1QBhG5pN^kooW4_2dAo?aI8*i0NG4%rp3pS?`g@zH}NR$`UgF=ru_}M
z@rJpH&v^@+jme5#^yva$Y#u}p1<}@>zFReO!!Z9o#vD;|aZ3q(;DZ4jEgQL|i9i1V
NBYiWydR>>q{{ktQFPs1X

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/revenue_split.png b/Telegram/Resources/icons/sponsored/revenue_split.png
new file mode 100644
index 0000000000000000000000000000000000000000..94390bce46b994669692708272717e63c5d253cf
GIT binary patch
literal 651
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?5n4XV~B;|
z-H^Sj8v`Z2f9y(9aMf&fJmC;IWsy!;b5gLFQ9#<#luf4&<RwmUoG8+*_mlbE1LdAm
zizI69{NDY2@43SJhZ9Pd-T(Zt`rh-uw$Ck<F5Z^g_~5(@U;F8&lTN1Wsoxq^Y9*Vn
z{r1}HucOzB6(~*2*nWHVS+@gA(>6xziP8J~^Uvq9S!dPc&prR#>&6_RHT7KD<^%(e
zOr|F#R)I&Kf9Cw7KYL>Y&)y9ttxgZWRz?0#G3s<%d_-T7W7ix%^`uV?k1c8z+<!04
z!{)dmXl2jw<i^j(dyYR2cxIQdF+!~S==HZ#PCxzqBKVBhs;gPgKi_=+ef8B>IcD6f
zh5?6;%WRF(HPlStF5P|i@y86a**{elU(^u0{JQC5x{>55^$y(@NoP|NQ>k9A)~1sw
zN+%hldfk*33SAb6<}h4+b=K*pZHIwwy8Hh75^Jwy!RQldn>D9;*%{05Ie!V!a_v|e
z#Q8~ZvT_IO*DBew>XSXsoO}FHA#rESB$J&nebIhCTsQg(_zyl=-XFg@Z1wk~;AIRO
zTPHB2sR-SCTlQv2sMgd4hvxsxaV^;Sw#@o;<ofF`OJ;rTj*E?2v)ylbbpXe@^z$4g
ztr3k543-N6IA$N|`s)8JZhiZ5?(@86zaM{3h)qngRQQ%)a3Iu5hVS;<GOM|E@1Dx;
Zy{}--60)ev>>wy1c)I$ztaD0e0sxRT7Ht3k

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/revenue_split@2x.png b/Telegram/Resources/icons/sponsored/revenue_split@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..23a23ff0a6cd7ebcc0fcd51d0449067aa354d924
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGaY;l$R9Fe^SXn4-Q5ZHH^GuSV
zcrZMO%;iCfl$7y>LV3f3DU>|m1$i(P3dIA-^k6O`C1jQtnUXSPj%4QE@3ypTXRl-L
zea_`}>zs$vzrXeGe|`JgYyJPfwuXlKr&d6%!2hOzwzjsBkrAJ@v9U29<RhAVh>HXU
z21Z6k`uh4>TU&E+Vn01S)zs8<c6QPsTU*<Og#{ZMo5aM#o}M0pYieqaj*f<fg;iEo
z=H=y4XK9AMzJ6_O?c3YiuP=YAtE=3&@$vD*y}P@c;&yg+1Uxx8p`ao|rf8s|q9QXh
z6Qd6g5194r?2PXTg&G?hx%k-F*y7@%qoX4iKRP;UZ*Px_i>s=t;yO#P@urA2Gcz;x
z_VyC){3h43vNDK#e}Dh;Y_yn<gjEb2Z|d;ykm;ZbSWr-KetwPxDj~?q$_f<f@9!6R
zkE^R|S65d;LV_6oo0}W5#?8#k#Q6X5kxHn(zMi~dF%z`3w7?mOK#cRdk9a~>R#wr`
z(MwB9<e?#wrKP3dOvq|TPJ(V94q^!D=;#y|7h~rWD)j&L^|iXX8fok!oa&YsLJbWK
zlmy?HoSZ}rQJu+q1VKWco}M&`x3#soxVRV?82J19Bb~myybylL$;m%QC_O!$%(}C)
zqowsJcf`iV-re0{G&?(+Nhl&BVsLOUDJh9L$_51$DlIJ~gy!ex`5_=!OiYZPo*sV)
z2$B%)eSUss*8fir$Go2jLKuPv1O(*d<j5_T?d|QpzP`uDN9Mhoo14H74h~QWm<|k3
zP$3Hoi__CnA`<@b&`69~Sy?_lK8$dmArljmsHiArKl9m<b0tU!zUXf*E-ol1YV7Up
zAsy)I>T=?#Y>FX-NgNy;P=<GRcPSfcpbj$oMkT3<Bt)Y-IXPk1pe9^iUQ$j-0n|ZN
zLn<LUpSijD)YKH=w6?ZJajxO)>|9t_=;h_b1qEzDLT+wuB_$;u9v=Ka=%xuFMGfoL
z))pMDuCADQLCI~8W)v%TZf-6mB}I-CWx27jAvZ)WQ3PSgWHM%bRoGKAV^MH_e;>A?
zp<!!lYj}8gZ*MPFF%lipbZ%}gaT^*MqW)Y1#~7$MFff2_or`~E3%)XR9YlG$gyoFo
z<z=G8SJSY@lze5#K;GWo<>lolTXJF1kkr-H1qB76ILHkte<`RC4GkIm{QQQ8hsin(
z4Gl%vr=v<3N-9KWf(&REvDJYbA0JOlObAveY_8zoU=$D<glj0dsJS6vH#av!7?Fp9
zk&%&*kdXEDb?iqpRdS)&m*~Lp3T9_#*~6-#$Uq2=PFF(vfjxprv24HNpqQ4HHa$I^
zk&$tGdn@+Q{^3zt;aLPHOOYQN#>dCWgQ87ChQ#{F&(CjaYNAhHR8)koFdZEo(1wDN
z4JAIuxVyWP^oRw^olnwHRpBl}UPlLrk5Pgjtmxe6T=6XiXAg)$K^VA9O-)6vy1u^V
x;y+=dUYeSk@@JB8jOX91M$`(Z75J+P{070bH|ix9ny3H(002ovPDHLkV1m@QL0td<

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/revenue_split@3x.png b/Telegram/Resources/icons/sponsored/revenue_split@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4086a7714e82a908e85e25e9306d8729a96a0774
GIT binary patch
literal 1944
zcmV;J2WR++P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?0!c(cRA>e5T3JX}O%&Ix)XFv6
zwA{#r7L_D|$f&4<a06dNG|>vOhtdZhOdq6$C{rkjkTxvxDX~Bz0<j{3#BeE1dnhnl
zE!#+fvhVwS-_ZHyo4MXQ|NEbR3*7&Mo;h>o%sJ=Iob6sOFX!i2z_Ea10mlN41sn@F
z7Wi2f@V2qhv}x1A!^6YE!lq1_V!nK2WaPz*7lt&mX3Z)uFJH81(Z!1wZ{EBq)6AVa
zclYky0RaK0PMv!2;DJn_6SHB%hRc^PkB^W4rS_YcnAovnhoJ=5u3ck1K(lJqDuD(j
zgEEZZ)2B}h7cLYCv<+doOP4OGsq;Uo-rinWh#50xeE<HP=nft{D9|ifvV>*<l$4YR
z1eQaKv&7azt6R5j<>uyEvXcq!-Mc3v@yv&ZhY3G8I7l!9o<D#7`SWK&K6><sU`1f6
z3f;ML=TcHqi1O{*w|DQ}g)}%tgfs*o{pr)E4X5(*@^E=@#x7jAfNLhuynp|`u(0sh
zv17Q3M~@!8efzdRpkau6MW+Ji=lJpCI7k}!{&E)Z7Ni)o`sMQI5dfZ@eBhfmZ~mZX
zW#K#!ul)V}nUQd>prjsy+2Rrx7kA^v4FtxMCr`rSws`zll$x4K=diA>?g!fD|KQ-@
zz`#J8i@m(=+_^)-l$Dj4^Rakhd~RXs1I>4W8+`fl<*Qe(wr<^OPC41^vSrI?iiZj5
z0<d!BN;1-sBS&0VDUl8h4KY@T7Sf~=qPe-5gvrUtF<+w;$IMwM&W419Fv`%-P{kzz
z+4k+*5j+zU6I)wb;j4vNVd!zikQ}9@rLA4NmK1{oO-)U3Maa=!zkV$UWHN;7+P80?
z34se!?i|JF=;-$Lb~-#V@b&B00|ySc>)%|^h9kAD7!pfl<+3s|rmL$fDk_TGQx9n2
z742<;=y&GK8KikC%Mnp<Vf_63REX7SJfc`bLqkwd5D9^dcJJQ3xb(ihz6fRO*RL0{
zUS!yoaf!I;0c;#aI6Xu>I&xpWe39!&2)AX+78E8#hLl1@V#HNNr>g&n!Tfw!@95}&
z1C)indi830dOGq?Hl-5W;9XItffB6*{zS;kfzj{oaoG5skZSNl9!8ag3szKAG=2JX
zlwSOlA>7#5IB(uOOd)unUs6+3V@Sr3`W1Wf<O#pu#*G_c-47o=@JNDDiSFOOpN8hZ
z{Q2{VV8Ma~1RDbSk0O!-)T6XnL`1~(>(`T$lL=!RfTv|^zkU0L5O15$KMQR*53D+W
z{ycdF0`A|xkNN=d&C=K=5@UH)Rh0%a*;5QH!LhM1Qb`6LKYol$1!us!854c<PuWup
za-ggj7#NUM5-_-9@ca7Zw&ZAAF>szab0!=Ee2JipJVZdZlteRuJBl$;yuH0wuU?I0
z7a^G1C$eq@1qGT#H)rR*VmyB&^2kC^dcboEx{Z#GBH`kRJqznqjAZrk@u{e&5Om{v
zvP3BW2p(`bD$O$eaZC`!aEN5GwzgKNf>Dwh5)(2%KOZ+1&Gv^6AL2C);SB-(ilJ+L
z<;s=L&dxo1_84wS$iBWlf&swU@Ix6seE2Y{N+Tm9Evo_jDHT$<tgI}Eg=4&Q>C)2D
z(#hIeLZ|83vuCn0JZ9?D|D<)d?zVBqkofSIr>(6Gbtf+$gEw#9jLe8A(I&7=*kL2~
z@(DEonx`^P7ce#yLt~7@Wx&UeAJMzb$jDf}d^xhA?Cfl0deDR?!#fuhv2X;yfA;Lz
zD#T_qHWUN9vuDrpLR-S<RcU``so!}(v7I}2QYLO@wtwgFN_NwxO?X>vNvV^--V<XI
zKwOm1{6!KT9g4I=hYtPJxJ<TjM={0(PJG?Eb(NKsDCwDE@7}#bbOvXHY1-&#1MVwE
z68H4<Fva@&`w8hez$16eP+V$$Jbn7qkU#~wX3d&y+qNM<s}P&fXnbNTR;<9M5y<i5
z<KxY?oO}+=N%qXqV@^s+nw(H!M(>M1g$>O}5SPjQoH%j9jMU4^;wVzz4_wg7HRt8&
zSp<68f`<v|0)Ui^szWHLQZKl`-9^&O%uLoihWnW_XO4@jCGy|ua|nDRgzARRh9!BG
z5r60hEJ~mC;ngGmAr(R`+VSe29O1o$V8-I&Vst@(tgf!c_e{bphUfzA+O-RZAAj-o
zP$tlW!2#&*?k11q5`ctQ5F$1<mhvnB7zzYv$k7()PolFg5U30-ydq<PxPkWoEiEl7
z90eK#3;}~uijpY+ix)2z2oe$!2!l7*Xus0XQ-GEaF;P(B>l*e<0Lb+v;tEbLBS4G6
zo-#^zOkj-|;O3{ZF)=Z$BZ5Y^@OFmng^UNO6Yf}jeLYU2Ab>M;EZ|tcv4CR%#{!N8
e91Hwj7Wf<CKLm8{<XTk#0000<MNUMnLSTZ*2c2yI

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 45a22a71b..d198a8be6 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4656,6 +4656,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sponsored_info_description2" = "Sponsored Messages are currently in test mode. Once they are fully launched and allow Telegram to cover its basic costs, we will start sharing ad revenue with the owners of public channels in which sponsored messages are displayed.\n\nOnline ads should no longer be synonymous with abuse of user privacy. Let us redefine how a tech company should operate – together.";
 "lng_sponsored_info_menu" = "About this ad";
 "lng_sponsored_info_submenu" = "Advertiser: {text}";
+"lng_sponsored_menu_revenued_about" = "About These Ads";
+"lng_sponsored_revenued_subtitle" = "Telegram Ads are very different from ads on other platforms. Ads such as this one:";
+"lng_sponsored_revenued_info1_title" = "Respect Your Privacy";
+"lng_sponsored_revenued_info1_description" = "Ads on Telegram do not use your personal information and are abased on the channel in which you see them.";
+"lng_sponsored_revenued_info2_title" = "Help the Channel Creator";
+"lng_sponsored_revenued_info2_description" = "50% of the revenue from Telegram Ads goes to the owner of the channel where they are displayed.";
+"lng_sponsored_revenued_info3_title" = "Can Be Removed";
+"lng_sponsored_revenued_info3_description#one" = "You can turn off ads by subscribing to {link}, and Level {count} channels can remove them for their subscribers.";
+"lng_sponsored_revenued_info3_description#other" = "You can turn off ads by subscribing to {link}, and Level {count} channels can remove them for their subscribers.";
+"lng_sponsored_revenued_footer_title" = "Can I Launch an Ad?";
+"lng_sponsored_revenued_footer_description" = "Anyone can create an ad to display in this channel — with minimal budgets. Check out the **Telegram Ad Platform** for details. {link}";
 
 "lng_telegram_features_url" = "https://t.me/TelegramTips";
 
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 7841959ad..7b51f751c 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "menu/menu_sponsored.h"
 #include "platform/platform_notifications_manager.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
@@ -367,8 +368,15 @@ ClickHandlerPtr HideSponsoredClickHandler() {
 	});
 }
 
-ClickHandlerPtr ReportSponsoredClickHandler() {
+ClickHandlerPtr ReportSponsoredClickHandler(not_null<HistoryItem*> item) {
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto controller = my.sessionWindow.get()) {
+			Menu::ShowSponsored(
+				controller->widget(),
+				controller->uiShow(),
+				item);
+		}
 	});
 }
 
diff --git a/Telegram/SourceFiles/history/history_item_helpers.h b/Telegram/SourceFiles/history/history_item_helpers.h
index cdd9af7cd..3d67e29ec 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.h
+++ b/Telegram/SourceFiles/history/history_item_helpers.h
@@ -142,7 +142,8 @@ ClickHandlerPtr JumpToStoryClickHandler(
 	not_null<PeerData*> peer,
 	StoryId storyId);
 [[nodiscard]] ClickHandlerPtr HideSponsoredClickHandler();
-[[nodiscard]] ClickHandlerPtr ReportSponsoredClickHandler();
+[[nodiscard]] ClickHandlerPtr ReportSponsoredClickHandler(
+	not_null<HistoryItem*> item);
 
 [[nodiscard]] not_null<HistoryItem*> GenerateJoinedMessage(
 	not_null<History*> history,
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 2100599a0..100fff459 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -441,7 +441,7 @@ Message::Message(
 			_rightAction = std::make_unique<RightAction>();
 			_rightAction->second = std::make_unique<SecondRightAction>();
 
-			_rightAction->second->link = ReportSponsoredClickHandler();
+			_rightAction->second->link = ReportSponsoredClickHandler(data);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 7f0815fc4..12bf06c42 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -108,3 +108,8 @@ channelEarnLearnDescription: FlatLabel(defaultFlatLabel) {
 	minWidth: 280px;
 	align: align(top);
 }
+
+sponsoredAboutTitleIcon: icon {{ "sponsored/large_about", activeButtonFg }};
+sponsoredAboutPrivacyIcon: icon {{ "sponsored/privacy_about", boxTextFg }};
+sponsoredAboutRemoveIcon: icon {{ "sponsored/remove_about", boxTextFg }};
+sponsoredAboutSplitIcon: icon {{ "sponsored/revenue_split", boxTextFg }};
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
new file mode 100644
index 000000000..a6c13a662
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -0,0 +1,235 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/menu_sponsored.h"
+
+#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "data/data_premium_limits.h"
+#include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "styles/style_channel_earn.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+
+namespace Menu {
+namespace {
+
+void AboutBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session) {
+	constexpr auto kUrl = "https://promote.telegram.org"_cs;
+
+	box->setNoContentMargin(true);
+
+	const auto content = box->verticalLayout().get();
+	const auto levels = Data::LevelLimits(session)
+		.channelRestrictSponsoredLevelMin();
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto &icon = st::sponsoredAboutTitleIcon;
+		const auto rect = Rect(icon.size() * 1.4);
+		auto owned = object_ptr<Ui::RpWidget>(content);
+		owned->resize(rect.size());
+		const auto widget = box->addRow(object_ptr<Ui::CenterWrap<>>(
+			content,
+			std::move(owned)))->entity();
+		widget->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = Painter(widget);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::activeButtonBg);
+			p.drawEllipse(rect);
+			icon.paintInCenter(p, rect);
+		}, widget->lifetime());
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	box->addRow(object_ptr<Ui::CenterWrap<>>(
+		content,
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_sponsored_menu_revenued_about(),
+			st::boxTitle)));
+	Ui::AddSkip(content);
+	box->addRow(object_ptr<Ui::CenterWrap<>>(
+		content,
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_sponsored_revenued_subtitle(),
+			st::channelEarnLearnDescription)));
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto padding = QMargins(
+			st::settingsButton.padding.left(),
+			st::boxRowPadding.top(),
+			st::boxRowPadding.right(),
+			st::boxRowPadding.bottom());
+		const auto addEntry = [&](
+				rpl::producer<QString> title,
+				rpl::producer<TextWithEntities> about,
+				const style::icon &icon) {
+			const auto top = content->add(
+				object_ptr<Ui::FlatLabel>(
+					content,
+					std::move(title),
+					st::channelEarnSemiboldLabel),
+				padding);
+			Ui::AddSkip(content, st::channelEarnHistoryThreeSkip);
+			content->add(
+				object_ptr<Ui::FlatLabel>(
+					content,
+					std::move(about),
+					st::channelEarnHistoryRecipientLabel),
+				padding);
+			const auto left = Ui::CreateChild<Ui::RpWidget>(
+				box->verticalLayout().get());
+			left->paintRequest(
+			) | rpl::start_with_next([=] {
+				auto p = Painter(left);
+				icon.paint(p, 0, 0, left->width());
+			}, left->lifetime());
+			left->resize(icon.size());
+			top->geometryValue(
+			) | rpl::start_with_next([=](const QRect &g) {
+				left->moveToLeft(
+					(g.left() - left->width()) / 2,
+					g.top() + st::channelEarnHistoryThreeSkip);
+			}, left->lifetime());
+		};
+		addEntry(
+			tr::lng_sponsored_revenued_info1_title(),
+			tr::lng_sponsored_revenued_info1_description(
+				Ui::Text::RichLangValue),
+			st::sponsoredAboutPrivacyIcon);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		addEntry(
+			tr::lng_sponsored_revenued_info2_title(),
+			tr::lng_sponsored_revenued_info2_description(
+				Ui::Text::RichLangValue),
+			st::sponsoredAboutSplitIcon);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		addEntry(
+			tr::lng_sponsored_revenued_info3_title(),
+			tr::lng_sponsored_revenued_info3_description(
+				lt_count,
+				rpl::single(float64(levels)),
+				lt_link,
+				tr::lng_settings_privacy_premium_link(
+				) | rpl::map([=](QString t) {
+					return Ui::Text::Link(t, kUrl.utf8());
+				}),
+				Ui::Text::RichLangValue),
+			st::sponsoredAboutRemoveIcon);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		box->addRow(
+			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+				content,
+				object_ptr<Ui::FlatLabel>(
+					content,
+					tr::lng_sponsored_revenued_footer_title(),
+					st::boxTitle)));
+	}
+	Ui::AddSkip(content);
+	{
+		const auto arrow = Ui::Text::SingleCustomEmoji(
+			session->data().customEmojiManager().registerInternalEmoji(
+				st::topicButtonArrow,
+				st::channelEarnLearnArrowMargins,
+				false));
+		const auto label = box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				st::channelEarnLearnDescription));
+		tr::lng_sponsored_revenued_footer_description(
+			lt_link,
+			tr::lng_channel_earn_about_link(
+				lt_emoji,
+				rpl::single(arrow),
+				Ui::Text::RichLangValue
+			) | rpl::map([=](TextWithEntities text) {
+				return Ui::Text::Link(std::move(text), kUrl.utf8());
+			}),
+			Ui::Text::RichLangValue
+		) | rpl::start_with_next([=, l = label](
+				TextWithEntities t) {
+			l->setMarkedText(
+				std::move(t),
+				Core::MarkedTextContext{
+					.session = session,
+					.customEmojiRepaint = [=] { l->update(); },
+				});
+			l->resizeToWidth(box->width()
+				- rect::m::sum::h(st::boxRowPadding));
+		}, label->lifetime());
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto &st = st::premiumPreviewDoubledLimitsBox;
+		box->setStyle(st);
+		auto button = object_ptr<Ui::RoundButton>(
+			box,
+			tr::lng_box_ok(),
+			st::defaultActiveButton);
+		button->resizeToWidth(box->width()
+			- st.buttonPadding.left()
+			- st.buttonPadding.left());
+		button->setClickedCallback([=] { box->closeBox(); });
+		box->addButton(std::move(button));
+	}
+
+}
+
+} // namespace
+
+void ShowSponsored(
+		not_null<Ui::RpWidget*> parent,
+		std::shared_ptr<Ui::Show> show,
+		not_null<HistoryItem*> item) {
+	Expects(item->isSponsored());
+
+	struct State final {
+	};
+	const auto state = std::make_shared<State>();
+
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		parent.get(),
+		st::popupMenuWithIcons);
+
+	menu->addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
+		show->show(Box(AboutBox, &item->history()->session()));
+	}, &st::menuIconInfo);
+
+	menu->popup(QCursor::pos());
+}
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.h b/Telegram/SourceFiles/menu/menu_sponsored.h
new file mode 100644
index 000000000..ecdde20c4
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_sponsored.h
@@ -0,0 +1,24 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+class RpWidget;
+class Show;
+} // namespace Ui
+
+class HistoryItem;
+
+namespace Menu {
+
+void ShowSponsored(
+	not_null<Ui::RpWidget*> parent,
+	std::shared_ptr<Ui::Show> show,
+	not_null<HistoryItem*> item);
+
+} // namespace Menu

From 508119a1274761bbe5eae199e61c250e33175a2b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 27 Mar 2024 04:47:42 +0300
Subject: [PATCH 164/596] Added ability to report sponsored messages.

---
 Telegram/Resources/langs/lang.strings         |  5 ++
 .../data/data_sponsored_messages.cpp          | 77 ++++++++++++++++++
 .../data/data_sponsored_messages.h            | 21 +++++
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 81 ++++++++++++++++++-
 Telegram/SourceFiles/menu/menu_sponsored.h    |  7 +-
 5 files changed, 187 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d198a8be6..d0c8c8a9b 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1575,6 +1575,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_report_button" = "Report";
 "lng_report_thanks" = "Thank you! Your report will be reviewed by our team very soon.";
 
+"lng_report_sponsored_hidden" = "Sponsored messages will be hidden.";
+"lng_report_sponsored_reported" = "We will review this ad to ensure it matches out {link}.";
+"lng_report_sponsored_reported_link" = "Ad Policies and Guidelines";
+
 "lng_channel_add_members" = "Add members";
 "lng_channel_add_users" = "Add users";
 "lng_channel_add_removed" = "Remove user";
@@ -4657,6 +4661,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sponsored_info_menu" = "About this ad";
 "lng_sponsored_info_submenu" = "Advertiser: {text}";
 "lng_sponsored_menu_revenued_about" = "About These Ads";
+"lng_sponsored_menu_revenued_report" = "Report Ad";
 "lng_sponsored_revenued_subtitle" = "Telegram Ads are very different from ads on other platforms. Ads such as this one:";
 "lng_sponsored_revenued_info1_title" = "Respect Your Privacy";
 "lng_sponsored_revenued_info1_description" = "Ads on Telegram do not use your personal information and are abased on the channel in which you see them.";
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index 2289dfbd1..ae37e9191 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -482,6 +482,83 @@ void SponsoredMessages::clicked(const FullMsgId &fullId) {
 	)).send();
 }
 
+
+auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
+-> Fn<void(SponsoredReportResult::Id, Fn<void(SponsoredReportResult)>)> {
+	using TLChoose = MTPDchannels_sponsoredMessageReportResultChooseOption;
+	using TLAdsHidden = MTPDchannels_sponsoredMessageReportResultAdsHidden;
+	using TLReported = MTPDchannels_sponsoredMessageReportResultReported;
+	using Result = SponsoredReportResult;
+
+	struct State final {
+#ifdef _DEBUG
+		~State() {
+			qDebug() << "SponsoredMessages Report ~State().";
+		}
+#endif
+		mtpRequestId requestId = 0;
+	};
+	const auto state = std::make_shared<State>();
+
+	return [=](Result::Id optionId, Fn<void(Result)> done) {
+		const auto entry = find(fullId);
+		if (!entry) {
+			return;
+		}
+
+		const auto history = entry->item->history();
+		const auto channel = history->peer->asChannel();
+		if (!channel) {
+			return;
+		}
+
+		state->requestId = _session->api().request(
+			MTPchannels_ReportSponsoredMessage(
+				channel->inputChannel,
+				MTP_bytes(entry->sponsored.randomId),
+				MTP_bytes(optionId))
+		).done([=](
+				const MTPchannels_SponsoredMessageReportResult &result,
+				mtpRequestId requestId) {
+			if (state->requestId != requestId) {
+				return;
+			}
+			state->requestId = 0;
+			done(result.match([&](const TLChoose &data) {
+				const auto t = qs(data.vtitle());
+				auto list = Result::Options();
+				list.reserve(data.voptions().v.size());
+				for (const auto &tl : data.voptions().v) {
+					list.emplace_back(Result::Option{
+						.id = tl.data().voption().v,
+						.text = qs(tl.data().vtext()),
+					});
+				}
+				return Result{ .options = std::move(list), .title = t };
+			}, [](const TLAdsHidden &data) -> Result {
+				return { .result = Result::FinalStep::Hidden };
+			}, [&](const TLReported &data) -> Result {
+				const auto it = _data.find(history);
+				if (it != end(_data)) {
+					auto &list = it->second.entries;
+					const auto proj = [&](const Entry &e) {
+						return e.itemFullId == fullId;
+					};
+					list.erase(ranges::remove_if(list, proj), end(list));
+				}
+				return { .result = Result::FinalStep::Reported };
+			}));
+		}).fail([=](const MTP::Error &error) {
+			state->requestId = 0;
+			if (error.type() == u"PREMIUM_ACCOUNT_REQUIRED"_q) {
+				done({ .result = Result::FinalStep::Premium });
+			} else {
+				done({ .error = error.type() });
+			}
+		}).send();
+	};
+}
+
 SponsoredMessages::State SponsoredMessages::state(
 		not_null<History*> history) const {
 	const auto it = _data.find(history);
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.h b/Telegram/SourceFiles/data/data_sponsored_messages.h
index fe55520fc..04f0cd196 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.h
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.h
@@ -22,6 +22,24 @@ namespace Data {
 
 class Session;
 
+struct SponsoredReportResult final {
+	using Id = QByteArray;
+	struct Option final {
+		Id id = 0;
+		QString text;
+	};
+	using Options = std::vector<Option>;
+	enum class FinalStep {
+		Hidden,
+		Reported,
+		Premium,
+	};
+	Options options;
+	QString title;
+	QString error;
+	FinalStep result;
+};
+
 struct SponsoredFrom {
 	PeerData *peer = nullptr;
 	QString title;
@@ -92,6 +110,9 @@ public:
 
 	[[nodiscard]] State state(not_null<History*> history) const;
 
+	[[nodiscard]] auto createReportCallback(const FullMsgId &fullId)
+	-> Fn<void(SponsoredReportResult::Id, Fn<void(SponsoredReportResult)>)>;
+
 private:
 	using OwnedItem = std::unique_ptr<HistoryItem, HistoryItem::Destroyer>;
 	struct Entry {
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index a6c13a662..97be48253 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -7,18 +7,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "menu/menu_sponsored.h"
 
+#include "boxes/premium_preview_box.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
+#include "data/data_sponsored_messages.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "history/history.h"
-#include "history/history_item.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
@@ -209,11 +212,75 @@ void AboutBox(
 
 }
 
+void ShowReportSponsoredBox(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<HistoryItem*> item) {
+	const auto peer = item->history()->peer;
+	auto &sponsoredMessages = peer->session().data().sponsoredMessages();
+	const auto fullId = item->fullId();
+	const auto report = sponsoredMessages.createReportCallback(fullId);
+
+	auto performRequest = [=](
+			const auto &repeatRequest,
+			Data::SponsoredReportResult::Id id) -> void {
+		report(id, [=](const Data::SponsoredReportResult &result) {
+			if (!result.error.isEmpty()) {
+				show->showToast(result.error);
+			}
+			if (!result.options.empty()) {
+				show->show(Box([=](not_null<Ui::GenericBox*> box) {
+					box->setTitle(rpl::single(result.title));
+
+					for (const auto &option : result.options) {
+						const auto button = box->verticalLayout()->add(
+							object_ptr<Ui::SettingsButton>(
+								box,
+								rpl::single(option.text),
+								st::settingsButtonNoIcon));
+						button->setClickedCallback([=] {
+							repeatRequest(repeatRequest, option.id);
+						});
+					}
+					if (!id.isNull()) {
+						box->addLeftButton(
+							tr::lng_create_group_back(),
+							[=] { box->closeBox(); });
+					}
+					box->addButton(
+						tr::lng_close(),
+						[=] { show->hideLayer(); });
+				}));
+			} else {
+				switch (result.result) {
+				case Data::SponsoredReportResult::FinalStep::Hidden: {
+					show->showToast(tr::lng_report_sponsored_hidden(tr::now));
+				} break;
+				case Data::SponsoredReportResult::FinalStep::Reported: {
+					auto text = tr::lng_report_sponsored_reported(
+						tr::now,
+						lt_link,
+						Ui::Text::Link(
+							tr::lng_report_sponsored_reported_link(tr::now),
+							u"https://promote.telegram.org/guidelines"_q),
+						Ui::Text::WithEntities);
+					show->showToast({ .text = std::move(text) });
+				} break;
+				case Data::SponsoredReportResult::FinalStep::Premium: {
+					ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
+				} break;
+				}
+				show->hideLayer();
+			}
+		});
+	};
+	performRequest(performRequest, Data::SponsoredReportResult::Id());
+}
+
 } // namespace
 
 void ShowSponsored(
 		not_null<Ui::RpWidget*> parent,
-		std::shared_ptr<Ui::Show> show,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<HistoryItem*> item) {
 	Expects(item->isSponsored());
 
@@ -229,6 +296,16 @@ void ShowSponsored(
 		show->show(Box(AboutBox, &item->history()->session()));
 	}, &st::menuIconInfo);
 
+	menu->addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
+		ShowReportSponsoredBox(show, item);
+	}, &st::menuIconBlock);
+
+	menu->addSeparator(&st::expandedMenuSeparator);
+
+	menu->addAction(tr::lng_sponsored_hide_ads(tr::now), [=] {
+		ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
+	}, &st::menuIconCancel);
+
 	menu->popup(QCursor::pos());
 }
 
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.h b/Telegram/SourceFiles/menu/menu_sponsored.h
index ecdde20c4..7402931fa 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.h
+++ b/Telegram/SourceFiles/menu/menu_sponsored.h
@@ -7,9 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Ui {
 class RpWidget;
-class Show;
 } // namespace Ui
 
 class HistoryItem;
@@ -18,7 +21,7 @@ namespace Menu {
 
 void ShowSponsored(
 	not_null<Ui::RpWidget*> parent,
-	std::shared_ptr<Ui::Show> show,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<HistoryItem*> item);
 
 } // namespace Menu

From 4e0d770d051de30b36572f4c109ee6d618d6ac4f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 26 Mar 2024 20:41:07 +0300
Subject: [PATCH 165/596] Removed cpm configuration.

---
 Telegram/Resources/langs/lang.strings         |   4 +
 Telegram/SourceFiles/api/api_statistics.cpp   |   2 +-
 Telegram/SourceFiles/data/data_channel_earn.h |   2 +-
 .../data/data_sponsored_messages.cpp          |  18 +++
 .../data/data_sponsored_messages.h            |  10 ++
 .../earn/info_earn_inner_widget.cpp           | 134 +++++-------------
 Telegram/SourceFiles/ui/boxes/boost_box.cpp   |  18 ++-
 Telegram/SourceFiles/ui/boxes/boost_box.h     |   7 +-
 8 files changed, 88 insertions(+), 107 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d0c8c8a9b..be00ea9c9 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2475,6 +2475,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_boost_channel_needs_level_reactions#one" = "Your channel needs to reach **Level {count}** to add **{same_count}** custom emoji as a reaction.";
 "lng_boost_channel_needs_level_reactions#other" = "Your channel needs to reach **Level {count}** to add **{same_count}** custom emoji as reactions.";
 
+"lng_boost_channel_title_cpm" = "Boost Channel";
+"lng_boost_channel_needs_level_cpm#one" = "Your channel needs to reach **Level {count}** to switch off ads.";
+"lng_boost_channel_needs_level_cpm#other" = "Your channel needs to reach **Level {count}** to switch off ads.";
+
 "lng_boost_group_title_emoji" = "Enable emoji pack";
 "lng_boost_group_needs_level_emoji#one" = "Your group needs to reach **Level {count}** to set emoji pack.";
 "lng_boost_group_needs_level_emoji#other" = "Your group needs to reach **Level {count}** to set emoji pack.";
diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index fa617293f..2779c7900 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -779,7 +779,7 @@ rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
 				).done([=](const MTPmessages_ChatFull &result) {
 					result.data().vfull_chat().match([&](
 							const MTPDchannelFull &d) {
-						_data.minCpm = d.vsponsored_min_cpm().value_or(-1);
+						_data.switchedOff = d.is_restricted_sponsored();
 					}, [](const auto &) {
 					});
 					consumer.put_done();
diff --git a/Telegram/SourceFiles/data/data_channel_earn.h b/Telegram/SourceFiles/data/data_channel_earn.h
index 7b47eff80..c4db98f28 100644
--- a/Telegram/SourceFiles/data/data_channel_earn.h
+++ b/Telegram/SourceFiles/data/data_channel_earn.h
@@ -62,7 +62,7 @@ struct EarnStatistics final {
 	EarnInt availableBalance = 0;
 	EarnInt overallRevenue = 0;
 	float64 usdRate = 0.;
-	int minCpm = -1;
+	bool switchedOff = false;
 
 	EarnHistorySlice firstHistorySlice;
 };
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index ae37e9191..a88111fbe 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -566,3 +566,21 @@ SponsoredMessages::State SponsoredMessages::state(
 }
 
 } // namespace Data
+
+namespace Api {
+
+void RestrictSponsored(
+		not_null<ChannelData*> channel,
+		bool restricted,
+		Fn<void(QString)> failed) {
+	channel->session().api().request(MTPchannels_RestrictSponsoredMessages(
+		channel->inputChannel,
+		MTP_bool(restricted))
+	).done([=](const MTPUpdates &updates) {
+		channel->session().api().applyUpdates(updates);
+	}).fail([=](const MTP::Error &error) {
+		failed(error.type());
+	}).send();
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.h b/Telegram/SourceFiles/data/data_sponsored_messages.h
index 04f0cd196..e124dd1d4 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.h
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.h
@@ -158,3 +158,13 @@ private:
 };
 
 } // namespace Data
+
+namespace Api {
+
+void RestrictSponsored(
+	not_null<ChannelData*> channel,
+	bool restricted,
+	Fn<void(QString)> failed);
+
+} // namespace Api
+
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 0526f52bb..22c8db5c6 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -13,9 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/edit_peer_color_box.h" // AddLevelBadge.
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "data/data_channel.h"
 #include "data/data_peer.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
+#include "data/data_sponsored_messages.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "info/channel_statistics/earn/info_earn_widget.h"
 #include "info/info_controller.h"
@@ -24,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "statistics/chart_widget.h"
+#include "ui/boxes/boost_box.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/animation_value_f.h"
 #include "ui/effects/fade_animation.h"
@@ -822,121 +825,56 @@ void InnerWidget::fill() {
 	Ui::AddSkip(container);
 	if (const auto channel = _peer->asChannel()) {
 		constexpr auto kMaxCPM = 50; // Debug.
+		const auto requiredLevel = Data::LevelLimits(session)
+			.channelRestrictSponsoredLevelMin();
 		const auto &phrase = tr::lng_channel_earn_off;
 		const auto button = container->add(object_ptr<Ui::SettingsButton>(
 			container,
 			phrase(),
-			st::settingsButtonNoIcon));
+			st::settingsButtonNoIconLocked));
+		const auto toggled = lifetime().make_state<rpl::event_stream<bool>>();
+		const auto isLocked = channel->levelHint() < requiredLevel;
+		const auto reason = Ui::AskBoostReason{
+			.data = Ui::AskBoostCpm{ .requiredLevel = requiredLevel },
+		};
 
 		AddLevelBadge(
-			Data::LevelLimits(session).channelRestrictSponsoredLevelMin(),
+			requiredLevel,
 			button,
 			nullptr,
 			channel,
 			QMargins(st::boxRowPadding.left(), 0, 0, 0),
 			phrase());
 
-		const auto wrap = container->add(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				container,
-				object_ptr<Ui::VerticalLayout>(container)),
-			st::boxRowPadding);
-		const auto inner = wrap->entity();
-		Ui::AddSkip(inner);
-		Ui::AddSkip(inner);
-		const auto line = inner->add(object_ptr<Ui::RpWidget>(inner));
-		Ui::AddSkip(inner);
-		const auto left = Ui::CreateChild<Ui::FlatLabel>(
-			line,
-			tr::lng_channel_earn_cpm_min(),
-			st::defaultFlatLabel);
-		const auto center = Ui::CreateChild<Ui::FlatLabel>(
-			line,
-			st::defaultFlatLabel);
-		const auto fade = lifetime().make_state<Ui::FadeAnimation>(center);
-		fade->setUpdatedCallback([=](float64 o) { center->setOpacity(o); });
-		const auto right = Ui::CreateChild<Ui::FlatLabel>(
-			line,
-			st::defaultFlatLabel);
-		addEmojiToMajor(right, kMaxCPM * Data::kEarnMultiplier);
-		const auto slider = Ui::CreateChild<Ui::MediaSlider>(
-			line,
-			st::settingsScale);
-		rpl::combine(
-			line->sizeValue(),
-			left->sizeValue(),
-			center->sizeValue(),
-			right->sizeValue()
-		) | rpl::start_with_next([=](
-				const QSize &s,
-				const QSize &leftSize,
-				const QSize &centerSize,
-				const QSize &rightSize) {
-			const auto sliderHeight = st::settingsScale.seekSize.height();
-			line->resize(
-				line->width(),
-				leftSize.height() + sliderHeight * 2);
-			{
-				const auto r = line->rect();
-				slider->setGeometry(
-					0,
-					r.height() - sliderHeight,
-					r.width(),
-					sliderHeight);
+		button->toggleOn(rpl::single(
+			data.switchedOff
+		) | rpl::then(toggled->events()));
+		button->setToggleLocked(isLocked);
+
+		button->toggledChanges(
+		) | rpl::start_with_next([=](bool value) {
+			if (isLocked && value) {
+				toggled->fire(false);
+				CheckBoostLevel(
+					_controller->uiShow(),
+					_peer,
+					[=](int level) {
+						return (level < requiredLevel)
+							? std::make_optional(reason)
+							: std::nullopt;
+					},
+					[] {});
 			}
-			left->moveToLeft(0, 0);
-			right->moveToRight(0, 0);
-			center->moveToLeft((s.width() - centerSize.width()) / 2, 0);
-		}, line->lifetime());
-
-		const auto updateLabels = [=](int cpm) {
-			const auto activeColor = st::windowActiveTextFg->c;
-			left->setTextColorOverride(!cpm
-				? std::make_optional(activeColor)
-				: std::nullopt);
-
-			if (cpm > 0 && cpm < kMaxCPM) {
-				center->setMarkedText(
-					tr::lng_channel_earn_cpm(
-						tr::now,
-						lt_count,
-						cpm,
-						lt_emoji,
-						EmojiCurrency(session),
-						Ui::Text::RichLangValue),
-					makeContext(center));
-				fade->fadeIn(st::channelEarnFadeDuration);
-			} else {
-				fade->fadeOut(st::channelEarnFadeDuration);
+			if (!isLocked) {
+				Api::RestrictSponsored(channel, value, [=](const QString &e) {
+					toggled->fire(false);
+					_controller->uiShow()->showToast(e);
+				});
 			}
-			center->setTextColorOverride(activeColor);
-
-			right->setTextColorOverride((cpm == kMaxCPM)
-				? std::make_optional(activeColor)
-				: std::nullopt);
-		};
-		const auto current = std::max(0, data.minCpm);
-		slider->setPseudoDiscrete(
-			kMaxCPM + 1,
-			[=](int index) { return index; },
-			current,
-			updateLabels,
-			updateLabels);
-		updateLabels(current);
-
-		wrap->toggle(false, anim::type::instant);
-		button->toggleOn(
-			rpl::single(false) // Debug.
-		)->toggledChanges(
-		) | rpl::filter([=](bool toggled) {
-			return true;
-		}) | rpl::start_with_next([=](bool toggled) {
-			wrap->toggle(toggled, anim::type::normal);
-		}, container->lifetime());
+		}, button->lifetime());
 
 		Ui::AddSkip(container);
 		Ui::AddDividerText(container, tr::lng_channel_earn_off_about());
-		Ui::ToggleChildrenVisibility(line, true);
 	}
 	Ui::AddSkip(container);
 
diff --git a/Telegram/SourceFiles/ui/boxes/boost_box.cpp b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
index 0486d0cc3..008726ee6 100644
--- a/Telegram/SourceFiles/ui/boxes/boost_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
@@ -678,17 +678,18 @@ void AskBoostBox(
 
 	box->addTopButton(st::boxTitleClose, [=] { box->closeBox(); });
 
-	auto title = v::match(data.reason.data, [&](
-			AskBoostChannelColor data) {
+	auto title = v::match(data.reason.data, [](AskBoostChannelColor) {
 		return tr::lng_boost_channel_title_color();
-	}, [&](AskBoostWallpaper data) {
+	}, [](AskBoostWallpaper) {
 		return tr::lng_boost_channel_title_wallpaper();
-	}, [&](AskBoostEmojiStatus data) {
+	}, [](AskBoostEmojiStatus) {
 		return tr::lng_boost_channel_title_status();
-	}, [&](AskBoostEmojiPack data) {
+	}, [](AskBoostEmojiPack) {
 		return tr::lng_boost_group_title_emoji();
-	}, [&](AskBoostCustomReactions data) {
+	}, [](AskBoostCustomReactions) {
 		return tr::lng_boost_channel_title_reactions();
+	}, [](AskBoostCpm) {
+		return tr::lng_boost_channel_title_cpm();
 	});
 	auto reasonText = v::match(data.reason.data, [&](
 			AskBoostChannelColor data) {
@@ -722,6 +723,11 @@ void AskBoostBox(
 			lt_same_count,
 			rpl::single(TextWithEntities{ QString::number(data.count) }),
 			Ui::Text::RichLangValue);
+	}, [&](AskBoostCpm data) {
+		return tr::lng_boost_channel_needs_level_cpm(
+			lt_count,
+			rpl::single(float64(data.requiredLevel)),
+			Ui::Text::RichLangValue);
 	});
 	auto text = rpl::combine(
 		std::move(reasonText),
diff --git a/Telegram/SourceFiles/ui/boxes/boost_box.h b/Telegram/SourceFiles/ui/boxes/boost_box.h
index 78e046cba..ecac121b9 100644
--- a/Telegram/SourceFiles/ui/boxes/boost_box.h
+++ b/Telegram/SourceFiles/ui/boxes/boost_box.h
@@ -89,13 +89,18 @@ struct AskBoostCustomReactions {
 	int count = 0;
 };
 
+struct AskBoostCpm {
+	int requiredLevel = 0;
+};
+
 struct AskBoostReason {
 	std::variant<
 		AskBoostChannelColor,
 		AskBoostWallpaper,
 		AskBoostEmojiStatus,
 		AskBoostEmojiPack,
-		AskBoostCustomReactions> data;
+		AskBoostCustomReactions,
+		AskBoostCpm> data;
 };
 
 struct AskBoostBoxData {

From a1264a6088c12e8c66990e3f63b8c1e62db3ad47 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 27 Mar 2024 21:24:00 +0300
Subject: [PATCH 166/596] Slightly improved style of learn more box in channel
 earn info section.

---
 .../Resources/icons/sponsored/channel.png     | Bin 0 -> 642 bytes
 .../Resources/icons/sponsored/channel@2x.png  | Bin 0 -> 1135 bytes
 .../Resources/icons/sponsored/channel@3x.png  | Bin 0 -> 1644 bytes
 .../Resources/icons/sponsored/large_earn.png  | Bin 0 -> 1779 bytes
 .../icons/sponsored/large_earn@2x.png         | Bin 0 -> 3559 bytes
 .../icons/sponsored/large_earn@3x.png         | Bin 0 -> 5219 bytes
 .../Resources/icons/sponsored/withdrawals.png | Bin 0 -> 680 bytes
 .../icons/sponsored/withdrawals@2x.png        | Bin 0 -> 1289 bytes
 .../icons/sponsored/withdrawals@3x.png        | Bin 0 -> 2054 bytes
 .../earn/channel_earn.style                   |   4 +
 .../earn/info_earn_inner_widget.cpp           |  81 +++++++++++-------
 11 files changed, 55 insertions(+), 30 deletions(-)
 create mode 100644 Telegram/Resources/icons/sponsored/channel.png
 create mode 100644 Telegram/Resources/icons/sponsored/channel@2x.png
 create mode 100644 Telegram/Resources/icons/sponsored/channel@3x.png
 create mode 100644 Telegram/Resources/icons/sponsored/large_earn.png
 create mode 100644 Telegram/Resources/icons/sponsored/large_earn@2x.png
 create mode 100644 Telegram/Resources/icons/sponsored/large_earn@3x.png
 create mode 100644 Telegram/Resources/icons/sponsored/withdrawals.png
 create mode 100644 Telegram/Resources/icons/sponsored/withdrawals@2x.png
 create mode 100644 Telegram/Resources/icons/sponsored/withdrawals@3x.png

diff --git a/Telegram/Resources/icons/sponsored/channel.png b/Telegram/Resources/icons/sponsored/channel.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f66a591170e943578015cc6db63442e65ccdb83
GIT binary patch
literal 642
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?2V_3V~B;|
z(~!NZ8v`Z2-}F`bG&SYp)Jcw~6q+5yBz?*zZIawzurXmm(pUA4lZ$l9PG%`QQC8}#
zx&Qpzr+x2j-+8~QcprK1e&xLT@5|3s&VMc=_4Yj9v)$^+Ml=1E2QLl!`up$eufNv)
zId(m3>)NpF{rBIO?atcz%UgW?_1$snPe0w{pm5>!*A23ZFLqRKENEfWo4)#Dh6E3r
z5I+l3-F|zi-e;dHJ=TV;KKxKYs8it9^(lVK(>LF|{F24nw(n(0*2ahvMivY1=Bc~q
zSxE5ciE+0dKKQV}ZeM@Y+G$=(1$dKOWX?YRDAIkjYHuG$Le<Wgg#P}*qLv@xK`Tp)
zW=<$RZ<ypOVLN^A86mfTD7*RpgB)BHdZc>W&Oe`g`f13O=Y@~b(~Tr&pS||_D_b*T
zNQ=(olPO%SivlzpgdY@Uh|4TyC_0%^v@<5@ExW8lr^~k6xfU{cX0soEoN>p(<7c40
zT>ti)Id}5Rr#19Cluq$d?LO+Y{POX~h7&y;?t80D`usD;Y<8e+Wt`U358Rwg20^Q@
zN*sJzboTk@vfX#zmRZl`n|)S|J1}Q!RAOrLK?cr^5j<{IbNSRAO&@)%&=C{nYOR<c
z6rwftV#buyPZP2?-{jHbQT;ma$Iry(?M!k8lTWgo73FGeJN$6&fBF6M>-Jsy-Ibg>
P9~A$du6{1-oD!M<RUizf

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/channel@2x.png b/Telegram/Resources/icons/sponsored/channel@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..765e4cf31d13591d86d908e7b18eb586c776a779
GIT binary patch
literal 1135
zcmV-#1d#iQP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF*-1n}R9Fe^SWPH&Q5g0!#{WkM
zWkEy6Mv44n;io91(JY53F$*HGQ$k{?Bpb4_Av;-2lb;1eWc-#L5=rD|WSB;L-&1d0
zw|kDuz0=J1)pzgW_MYecJ?}l|yyv|E0otQwK+C{?mVrP&%r`nZx~;7(FE3B0)7kCz
zxw*Ngrzb!7<-0JO&3AWqzeUgS@o{QuDqq^Cs9vuh8ygcM+1%W8I2<(G+uI8a^vB2f
zoM2j7+Sb+<xxc!)Dl01^USD4yffW@MpVGdj>gww5@9)X+($Z35Vxr(NHa7O{?G3D+
zo*n`8ArTT1GCDd+p}fDp_xJY)1qDg`Ih{@j3=R%Ta2o2kr~rnChZh$Yr=+C7lK{#P
zt*xy^MMV&}zP@f~Xjolcl@V6P!lLWy>Uw^Drs*nrBaY<c<gfh6XNa$bd@L_7D+)po
z9v&WMKa<#vnt+CehRDIj#zs|DRZ>#YukRi#Qc?*G4Hdg*Y59OSYbZTEy|=d)hHN%l
zZEfwx#|LYaMci&T3#ve*TL30ZCKJwh5FH&IKa56&<F8aW0T~PiNMoCvo}PZC<~y7d
z5Vkt};biljR~gHkfMlfoz|sQxF3Fq>p$0+ghqdB6`-=ITfNpMXU<P}QR<~l4-YIYb
zT3cI#&EVkR_V#w~jH}V+1hlfUvcA3!W2j12t5uCvFLXGi1E+IybMwK$L1bj))YR0#
zz`*|g{>#gYycZN463EKRg08%<8g6!W_U`VkP{V&t;KtI}*eK&tad9PEM@L76g@rIZ
zK0c0A-QM1woSd+3(BfodWZ=GmUgGuj6}=9GXJ%$fOG`UDJAtq&-Xi#FNRP|qiiwF~
zZNV`mFE=+A+=7CFv$Hco4i68FMkA{tpCQhomYA5Ho(2*T5n-`dBrFU)9uI+NdO&P%
zZzHmWg$2;~=sP<*_4V~6AiU`+fvdiNC?+shOd8f%O?)HDM@dPEn2Y-wVkOq(<YZV_
z7;*FS^9e))DVA48<8n<_a&mGcnn(k&*ggxl{qys4;$nq$cX#7pyS%&v^7#0ekdPoT
zrC=Br7l#WW3{6Z-NYt>&$z^qQwS<Ks6c-m4NkIH=YHDJIl_9gUv#|K^@F1xts4(OS
z%^}w!x|f!g7Fy}3k~pF&D=WE@%E0pSa&nAwQmmPonMrs}O^q05X?&xos3;a!kKj)V
zeB&G+85yDO7|j=D4)|aAp@HIXadAQUz?)ih8qUwptDmShn&_!1PeNEAux#-Q!5gz;
zT{S;xu(MEA;^X6SeB)k#EiJaF(OL$y4E*C6_yfu%!okPwsuTbK002ovPDHLkV1kd%
B`!@gp

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/channel@3x.png b/Telegram/Resources/icons/sponsored/channel@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..21a5c1f9e73ee1ec7e079e84753c8cc83260b865
GIT binary patch
literal 1644
zcmV-y29x=TP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS=)=5M`RA>e5T3bjJT@>~%rC@kX
zO+``AUqrkh;x)lEQSpMJg4#nRkqLsL5&9qmC4wZqh(-tr3Yr*{g}#VTg5+H(MZ96D
z<t5F$l=}Z44Xie!XU-g*V{`cDJRH8+`<uPjx7OZ!_MSC*ddg4nfZ_qg1BwR}4=5f`
zJaASXFg&Y{PSTHofq{dA!};^)x3{-Xa=#4k2?z*iX=#C;e}Dg0R#xik>)qVkWN4~b
zlZ=dvDl01w4h}d;?EmWOYG`Pv*oI`qyL9Q&+qZ97F+9ApvlAU1Ei0SV8xt27hatx*
z`Sj^iU0q#6Ljz((<sUzOG&Gd;((p$r41Mt6!QtT{Sr1%QRb^^w%8_hrZ2J5AsWvk+
z^Uuw)MUIY+Jv}{SGyvk0kdVML*w4?8IMvnFyjs~^#>U2e`SOJ<2I%eWb#`_>*3j?Y
zzjMrvj*epqvM9vxyMO;aJN#fYLSbxdtja!eL3ekzD$ZXnx3{;4acrR0*4C1el7!9D
zNSKjuTfACq1%iWvgMxyvAuuyD<JF44OiN3%wY4RFUteEFM#k*yER~!czzDf>=g#NP
zpIJ9cf*(D4WMX0>Mu|od6Vsp`;sd8jB7<$@+qZA2si~qY_)XGCnEIiJG4t--I~Nxh
z@fL_-E-x>KgoI2_Pm3X+fTKp3zP^5IYb&ej#fukhZEbj5!hf3fhaJ<vzyNnwV`HQC
zRG|ws!tjg_4-e-|+1lE=dGls-bF-#;h>rsZVJ!57wE+x-8!av_CPGnB(P>msJ7)ug
zggH4m`TP5Gc3_%eKYBJcNz#juFdrWu>Z7Zxi?B`rAz|1bkOrFcR3dXAB#cfC(6G6=
zDRU(}^Mr))sJeBj2-B^2>FFsEQz9l44+ss#_4ReKQs>^n3JF_SSRi46fq{f|0tgAi
z;SxJ~PDXlqI(wLxzcwLZdwYBB?d_ZfYisM;+FBgX<S&V{P)HaU6%`e~e*NO8DJdy<
zwWKSPP0c}bYHI4<y?c1u%xQ~=i1_f~!_d&s`}gm^e*MZ7ivPE;uplx{(}e#Tz>6gI
zC5$8(C+M=WGQ7_duS%nrIbxf|O98C@l1O43>Fn%8!a<}FS`mi6EiEm}%gg8H=2**4
zkC7|F2p6MGTf(@$kwhgiNFe;9?uYS4{Jgw8(7nCAvA|Lx!2bR|X0qBPSG&R>Z*Xvs
zGYj*?)zwwl**Q5mq#-dek;qwDS(H8D2(Mqi#zTb&M}bDdG?=^8(~~DpI1C?OzkZ#{
zj|D$}{-kpDRd!QT6M{c7GD5XiuU^G^8x|HuB|JbOg(G-X(p+A+aDnpq*memgPVw}k
zh#^Wm3(lQ8htC0s0D#A4X=y2GAilY|Ic3~w+d#FFfoIR2ku^uNk8C&b@$tmGcI_Hl
zML0V<8+$jR0la$k%F4=$2mtx{`9yg5@F80zC60`Yq;7=$7ZVdh%o{gus4~LS({prm
zl$ZeX^Ye%{MlT-g1qB88UVy8`#Kss_)s6(^larHNPZ&HGFJ4sD;^oVi$=utwZ>yrA
z9K-VI)2BqH#-W5QeEj&aKqC@VVJ1+2ckkX+)gn?VL@O*TR7Iom+}zwBKYq|HJTNvk
z#wGyhE-3+`gjjJMBYLWu#zBsZD=8^aMPtjoyu9ALc|&(`0CB6SsS&SA%_f-bkB66*
zmR`PmnVg)Aat{v=EFrk$ad1h817Lx~IeR1a*;xAVbrC+ofk>>n6B852X5nGL(zJ-t
zJ^2+uJ2oqg?GkZr-MXbkYou)&$qKR?*+4c$h>qaw=g*%LLEzyltyO64v?pQ=mEqxG
z8e`b?VL)Qx#&ZeV_A6Je`1<;CMlUWdy1TpU(wB$GdhYJ-Qdm?0-S_~CH*%29<$buu
z%EML&dwkw4I&+D=9G<`9<KwKPjg1Xt;-jLX&R)i8=h#t;?d<Hhue|UX$IQ$OX5CSa
qQlfZ3@qpq1#RG~56c7AAJ@6mA%HLjku>u(Y0000<MNUMnLSTZA!2Ztw

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/large_earn.png b/Telegram/Resources/icons/sponsored/large_earn.png
new file mode 100644
index 0000000000000000000000000000000000000000..c41ac837833be36d9b9c336c2c917d4b319aede1
GIT binary patch
literal 1779
zcmV<P1`PR$P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NIT}ebiR9Fe^m|IAdOBBabOYElM
zr4mfMQF%c+L{y4JW~7*uS@e*l7D7-jfe%qcq0p)5MIS7LB2$F0P<#-LO6;MCC?by8
zLt&+P=|XlYEmP0=9T!bs-^{n&?z4Mq9=0=U{_DTitZ!z`8mCSB-F{UBX3d(lW5<rm
zmoImAcK$ul=rBac)UUE?<n{6KDJm-J?d|=?p)myjm{Hx!!kIH?Ub%9`!IPiFzyN#M
zyp7J^-~ZOFTR)j~IcRThN5w|s&EeUzXN?YYbaXT~HyfuaD=WR}ft4#QEzM{W;r8v@
zgMxybW>K{Ac&$(Tb(7WA)rpCTVk0^_`sB%zV`F1B7>ZtVLJ`Hq#o5d-yn6Mj00IL8
z!^6X+fB5iW9f`W4a^3NDJ*{SQa&lB(buL}HL_aw>`St799QB%-8a!h^DS+y1+O$da
zz0;|!t<~3^o}LantMBUSlG#t6K7IT4O-G{crXTJ`NPQ72uY~RC)2FeqvCEb%J8<B@
z!-o&2PoHkZNPpqNg}U&6N$%dgtFN2=TUJ&!fBt+c^{G>*bR_Clj2HS%O-;HPk&KRx
zK6vne^A!;hfu(?e0R5|>?xqul@ESF{ySsHcdGh7Umq(8t{bQnqgoG3q7k~Nk<@4vy
zq$MjJn04r3f8M-#d-v`Q3kyR(H#b+0P<(tmQ*7#rii)bLDoIF7mMqbcTefTwCl)PQ
z<mcz-i9_5$w{PEu`plU#=+BumXJ}~1X6f3sYedD$&Kla<+H5cahB~k{Yt}Gz^X5%Y
z3W1W665*Az4c+O}r)`!PzJ2?aWW9LtVh$Hyu&=LA$Dk-qCnY6~kB<Y`vuBTW8I$)}
z!K+uV&^&kUoI(=}%<J}$u#HkvQ;k!oSfeP{GkHtVy46{_bg8hDU91WlHf+$ZDx)7F
z<N%^#Wgtj06&f09l~2-Ny?V8%=@k~+TtC%DpMU|jS%Of&D_5?xO}QFw-n?1VR;*Z|
z<2G*G*x%o8bV3OM0Mm6L6bvTxSw{&QS=1UE8;zj3bLXBoabjR#KzX1#2$=$4RD@8F
z>Z}-HcA;_z<wJ)K*{8pceSLj7$y{N7PBc0U5q_Vy|Ak8V?TJHjM4_Mzby~6Aro$L@
zNW>eV^~51|rFvj+b#N`{d)&c+A7WHcL|wdrP|k#h4v~=d@87R-^t*TOSSVG;?Afz_
z*fjM300WGQxI(^$3PRToncs5Twr#7guZKuBL{wB1mw8@Zo~m`oM$eu-d;IwE^XJdy
z*@{<`i!{Iq2?<n4>dqn?amnBfU|@VQ+~Qq8v`lL;$#{3lvQ%M}pP!H9{rmSfZrqS1
z3c$rLFu-^2+yQg(;zh9op{QWOWO<tTL~w5iIy*bts`l~Y$Mx&ia}}&zyOuLGI5^01
zDWdO9G|b<>f1luyga7~oOcbpQim<1r$10zsuZ}%QWx;|4pd~`KvPMejf`S4?$E`^K
zC~B4D{Q2`LLQtvH<+Q2I5mI!Nr@WmbBO{f>;|?TH+3H=L%~i!n@JB{QC@mg6deqR+
zpewsCp=yJKGIDr$m`Y3Scb#F92xVqwl0qOVEG$Hs{1zM>tg|>t081IUYSk)8pn}i|
zEON6$Qs5CDg3LSc!i5WLUKA(@c@t7e9zTA3>(;F^X3Vg$i-aTu02pAo)!9anKm{SR
zXo(4%y5o>sB8QW7BA|l@4<a!ZL!=q1FdCLb%liBE>sN*<<)|k)CXD9I5qk0B1t|xG
z-Me>-+M73T=<r^q;3_XKXZ7SmnPNk5!f7gCgcATTz;$(Xz<ALLc-O97bRfrsNZkEB
za^wgr<4q$mHy(Srp?DecCZUmaN=r-8ays@<K?neHcl}T}_Q8`UPf#WqW@Tj=9hy=e
zf&?lEp>=T;nm-wCaTjJ}WDr<(AO9WOw{M^F)q@WIvw{RF2%&}CiNw(%6v*x=DJiY3
zt@L?R@XJPFp>7r-zyPmXw+_Xam>7Pcf^ce=25NevR+q0sz-d$?+}=DO+35_A9Xm$y
zq%B{*T;6W%SpceN0fV|;@au-AAffQsxpU|B>(`BE`#(2L4KOMws=8%TlRlFoYyc82
z*_OuxFDx4OrPUZYiR<&PiADv`($ezb!v`CK>*16g(&^YMc!?a_Tva;Yx5TRv_!pjI
V+drBuu7dyo002ovPDHLkV1k_yK@<Q0

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/large_earn@2x.png b/Telegram/Resources/icons/sponsored/large_earn@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..79232dd2b4fb96672d75a854d07dcd16d839f985
GIT binary patch
literal 3559
zcmYK>cRUn+*mu@h*_*r0mQnUroOLAQerJm_&X&Cj*;~$bNM=7Am&~ke<xom-_BcdF
zB>E}wUhg08`^PiB&+~jf-}THib5p}>^nCOH0N|PtTn|B}sJ}o<LB@W+*8Ir?7>qE4
z0r2kxcF7Apw2hJby?X#jGEWNtrg#CU{+f`1j|>0+Wd#sGNv6QRvI>g-)1oRU|DXSB
zSg+t@O5W7MNKXeD0X!)4*f%xfdULu`)r!;q)<^xpD3vdso9aXL995cQJc_j{iPl2J
z_>-vPj;J~=nF{xFCH&6S>hjgTT<7YS+vvR2=;O^L>_4v+!Vj@ng)g^nAVi$TwJ=MR
z<612J5IFChna4IaonA-%K0CNuAbDDJ=NA3d>6g&G*(R_?m_tvP%xfqK)#uO^q~JdJ
zDv&hRujSA@m<bn%9b0j`yg0XRvO7KbV#cg>!p|T?D+GBoDc4ebJNnl#=}rIRtIN)?
z-@Q5lqIK!4JH^=X0;#zV)rQe$$ub%Z<~#~V7AnXVH>0H{zhFws3YK<@6bL1ylFw|^
z@rHhdX#gushTuA#C{Z%-uROX(Q8C^-|LS_rL7Uf1@=o}EH!C|&`iAb4@~@*A+>7mm
zmW!Ex&7P`<67s~~k7e=8@b1%d%h+-BS?S#kCX4qMT&-XGEh<yq%MsGwkJu;p%;CYc
zg*EB9E4wrQ{{DP%c3`i&x!e;TgSPel&6y_tm^7Ak0BP^KI9%>=9m}k@#94j)RL|*2
zW6>Y;hY76iw%sW;SjT1-vhm+BDQs$*V2yXcir(c)Is0+2_;Wagxg>u}#sK_7#N6_D
zV^oG8b#tjZ6vw?ZRjTsyRrqilcT(Usud;7(*R4s>h%yRldU&H+@V4(9{(h;lA3c|}
z#6+cvFA+71x;fY;R-D=i0ly)iMD(G1-`oo)obtE%R&oE8-gM`qwZR5LoNB~T1)Gt%
zkk4%6>g(uW&xD2&tw$Zc!}$9>$O4_Ep70kBmb;H?j0@76u~t5j8D0Q*d(MoPkhP!^
z67Mii>OPxq^*~_Oh5aitxMb2-`(pk)9Lwa*;FNm)*>1(98&PY#{%{YY@%Hz-R9T$w
zW}QX#$J)DdmAW9_JtM4q?W%Uw_FPRGD&#GA6YSLY@H8Sk=Fczmn!C?RlYQqTR)Lgh
z!*#M)W5oX8PX|E*&|fmV{!A_Sd2M*JwA+mxRDnu{(bTsvZUB=y$*J9Clz!qhSwT(g
zdlc?5o!OGcE^e1@&qXm{Te-S``RU^Bv<FC4@m%f>)d)WvIdyxB8O+TK$M`*cBPz-l
z1#E8PSsr2)Hn6#EGY6|W1~CZ~D|#Vjp5Lo|ro1Mf(d8}617KO^GN|h#djZ6LW5B@U
zUa4}{4U_ns2{_0W0IyH1=2!CGjCHg+KHOjI%;s!e9?D(A`mWU8Evk71UT${Qy-^UL
z_?t4De<DZNkZ%WPi5pvQ=^C8;)e=em7P%8o(PA;^jas&x+o50clNY~t7-aF$Yngf+
zE_L0BxiBw#^91Z#V$CS9gp&kO%ovMYQY}7kxu1Rg&TOFq!~=cy%#NRy@i_Txf4)^G
zfu@AAL^HBQx4*7|j$O=CJ#F|Jk1Ui)+_N#HKkD2C>WV6ouz(5T5Vh&BeQnLhm%Zkd
zFk?a-lyGu>;sLU3NPk-KX{OqcxjLN`Tl`B**&!REg=mHnx!`X5vgjso^wni_awUi2
zOlCcZ8A9~JZ1H>^L8J26+m^b5eHcG<qeI1W0_huNPP#*Og?P)nV7$Fn3oA;7PXzvE
ziB|V4!=h}uOz&$eE$9rzzQ_~zEJ4Xm6ZOeyg6v{aI;WI(;SrSkmLpOVlD0Kb#Q$&y
zyxZKD>S`KnUspAQ*5oJlUh;i9@^9bq__op~<9Boz;Z?jj-{zH9nU29p|AZ~}HISVu
zcY}~9y3ImQH_vj{O6>hp4Ud=ygiJMf9hD57mAZ_5$4KxC$G(N!K|E%;Oum72K!f}g
zY?~ulVxF4LE8ZZ-Kfiy5PnT;wI-72FME=7WN5`l(u(k%5)Ac+_OF&^H{YHX%zceNZ
zOws;Ba9f;IB*?92RtBsOA)3ve-F|mr*VG>XlCl%ce*fsdqss1f5u$E0&-vw_9<*O#
zQk{O650f;zrg?$PHyvl)5hu|2b2h?vwrAvk)F`LEs)8oNc$gTr@CyJs<fvF_1--6t
z8>y(l688{!|G5e8nP^a*A*`A{3387Tu~0<^p}y8}723otcLvJM5(tRg)6Uy7kyx=2
zQf=<C`hd)@pijb2(on7&kJl^dSS4xap@p8&7_!DNe<f-Wz_FjUjfGQRy>JJZO<*z~
zRAtWUDBiHal=)E|4wJYzl#5x9KP%C+p0fzfg7vOn<5QFXgy_*OgdZ+pt+&Zew;%Jl
zgCX9YzCK=XV7E99gxa>?O<|%KA-;4?IL*m7&J&w*%DYKx3(2I(?FyGjGXpsnyHR0<
zxEd`h;Xq2+!anwjgo`Pc79dYvCpndpYB6z0TYd#TzyKh#txl)F5+8EJw4oS(nyNUE
zPWrJs!@zwrWJSOzhs7(?g%7asl@X(T?E@xHQY}NSi=_yq>kpaq%_)?&MRbRFiQixU
z>`WV6SbBR6h%haBd7@)en>E5l7lQqr$`+>m=;tB&;aQK>cVcLrzM7b<8yx^OCg`WB
z@z&D>XVnC!ZPhap6uvlGAKv_BRcAivN&*wj<0Uy3o~pXA%4#Ewg?6Ej*}b2eVDl~2
zJdSzjG%&j31-G1TkGit>a?^<fPGJ>NFrV*?hJJYm77FMEk45Cimu1Kq97zjcF$T4G
z-}x3J<*b-rKXzAhZ<@*@3lb$uD|leSZ*!5udSfj4z?E0z>(+@ra|shAx{+fzSNuKo
zU=uENEY{*7b_qmn!1^8hqjYE2pK9DtM=?+3VsGvRJ%}m=t*OiD2*6f}mSWul;e4`1
zU4*VgykgZ&o{i(;>-<o(gN^c_ZL7tee@PLED{?OKD>?UWLIX@jDvsjEG??ivGJ<w}
zq(_x7cI?vnZk7G4KQ_nNZ!C5AElw2OnqbRvCthjoZgd@oLdBnzv96=fPc>{JDt9>E
zb>JPkV9!A~oqX3P4u(^8VGMBFDzf9*e!Nsqoip@akBTO@1CHf%S%R(FV%(VWiiKpH
zV}Fd+B{5(?HAqvX-=W$tTiM06S4`S_Qv4TNHg-(ZN63zSQphf?pXp;Fwi#X`a69Ui
z)!~*E{(+i9xjZ_(mg5ao;TD7;&ZFE?i@@i58HKSuovzePD=VE~ucSf^WUv_3fJfds
z^@JS^#8C>5uy(6r0AgQWpu~g@pp6tRyB}*W1Yw(=@$EW!6f~$<4*K#n@JO3b&PzJY
zpiTIE3mWab@AXbTuJQn`RQKAPI{agV?Z*0diI?Q^<z~AU7%fO!gf-)7kFCk!b=$Y2
zB&K^(<w*St?#J-4tiHc&TLD6#!n`_z8mTH}(d-j<Qp(t@UQU%LWguYG-WKHKkL(Eq
z%B}(BIXv7vwmO4Io7tctw6t56_s34#O1`aaC*{2|k6d~fBo1NN3k!tdg0fIr^~AGp
zt7bCB=1H&#TI?Vr57vSSS(_;4DK^x*b<Mi4%}>(Hxz&9tXv%#|_jr6To|=K@!noi*
z=;gUcVgoTC5`UgvlTQxAmU(SUW6$_TdaV0$t+Y<@)ksR;5V-{r&E_tVQT;8wLal7;
z5GM>FdM|gk&$??HGsYA>xpbHFOLkGv=fhHs9Hwo1@nUlabH@xtlGLN#s82uFM^5tV
zZd-XFec~HiYW}EskxrCr--hPtyh;!;xJcsdM6hLQ3wm4N{br{YMBvG6_he5JZG$#O
z=#*R{A8seeI@G%ijPi9Hi^<rvK?_Y-QfhQ~MXV<ARQ6FL7UVGGE8!hQU<UBMGDm=V
z9*U@Md*3*Rm4QwqA3smWYeO8Lan@J=9akr!pQkBa3h&A{&@#ta{y{VNiw*;?MyYiX
zWu$&q=67?Jd{^Un;#&c-_8*K@KY_~2NUq0*>Ww2u)nBpNvYuN;m0PqQD}wnWO6HLB
zSx~6gY7d3Iy@7XwwEv%TC=#<VH7Av6U(0k0?&Dgt^MY}aJr<Z7@*Y5=ympY(=o1yr
z;%!svnX+25dP1nPe!qZhG>!xEK#dXrG#%2%aL_Ik`My-eELsg^<KhjPZ9z{^FuG>j
z^fez(Ny@f`(wGDH^_M0|i$+qMdNsspW?p%{f;Fad)w}l2xCJ81wm)0I<Y4>|&04H5
zt@Dxs4pClQXd^|*koyDyQrpy`WQ-6vqfj!Q)vDim`o#wJ&L@3LNxoi=@Cn(ZXrP)=
z$<i)S#BYJ-rhwCJuwQw~PbkMn1er;^<WszE*_^zAyU8?~ilo|smN9Hd1YS~6@x)q4
z8J)u8S^J|)Atp(=LhLDm_oRoER+HYCDj*?)2aBC*&jh0e*;xIgxj$gqd?%Ct$<w)u
zp2*dvyeu{cs#O#+(pkXk;)>P21aIqb^s!AkBQt_T^umd8sKmUDcPa%JIfx&>sJDs(
z{@Y{Lh@eB7ex#PNlTT0`WyXARIdu42)ap)))!B@~6L%9F0@q5_Jgv_e%2-)xhL(x7
zHERt4QsfH1k>MW1g?H>D+^U2}`W|>I!jg-_Fkq`o1fa;*)DarvEuQO8{&&Rr-#Lej
bZXhl|2h*iLC+vWne}^n1eN#O=3>E)B8AFee

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/large_earn@3x.png b/Telegram/Resources/icons/sponsored/large_earn@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d722c06c591cad252ed6c721b185c8122e1d03f
GIT binary patch
literal 5219
zcmZWtXE>bS)85si3u5&Wy)L2?(bwu$4Z&I^L~qf1XZ0GQixQoP5<<l4C5s>kqL&aY
zI{(d=_xIubFwe|$&Ro~I&Y8LIGiTy-wbe)n=?DP;0Es$8Ss$ZQ{s{pV=KGS}`w*jm
zp89HvfVy#p9n6oit%<swmKJ~)V-o;?F%AHne=ZoI!w3L?T?7PRV>IyJSP|C$&88G#
z|7ZVml$R%r1pp|=)Rh$se1X5;dhau-P!72Bxbzpd;c)8`81eHQ^uNXG#{$MrJqyQq
z`7-PmP7IcUQbK1YTffGNN_;2PEY{)mgY!*~`P`+2u7!Yu_O0`qyNiv2_W9h)@%;VY
z<Kx=GD(CfkVRiT&OxylN{~5q3Y}lK~cee#Wf9Ge-T)U`^OyKh&_nQR)2c~wpw%<+d
zaR-v+?=Gfv<bzJeB<?TI56@;TLym{IKHuM6zf;&J2*}1b!gS=$=Isk__v%02?cL&w
zYQ2P<B)KUqMCADVa5%@zG$IE42L^{@$(30fek({!J(HF3{j);$^rD9@Op%K`cFtvv
z&60}VrEPV=_45mEHVY(qQv9Imxu*LmPhH0@uTXuqog&4q|GUDqA`8EbOfKzw6KQfF
zmTnAM^85J{o_~ABtWCGF52@i+@zy!<G5w?zO&qs=A8rjU;*Tzvx?4}z5!~La90Qkb
zU3`*6KTehvsb0`{(3kTI;;%RohK+xBd%j#A$nZfJWu>q4Cy*jB==yJMdG;!)FeluE
zLiX*F9g5aIa1AN3*nJ{@{gqND-*a5bwd*V^gc6@C8g5~KEe~4a$Tt7wW;$8bJTA?r
zC%@!1wG?pJrQqy5nnOce6+vHv85h@yLenPeY#Kd$UE99-rud=L4QRfXl^|4n#sJoJ
z@hd@GA_|S%sl%l)2OESVnI8*_0Zb~I4n8gii!)Ofg&g(Mn5qdh^kCse&b_g6H1gGv
zE%4v1S`Ijr%ZrfRk;OagzCP&s`{UIRM|OrpFN5c(uvJf}=Y-t(h|uR#s+Wj91LA`?
zcc}1T(}<w>p)dNd^RRm(%S@1ZTe67EW6^ye^~nm4scoNCO#Ha~*%u<A%HSh*k$L%z
z47dZ2O-M#AZvV=7ay-duJYU^5Ehy7@eK1vg$mQx+g3w(bnS7;4P;AcctmQ`g3E2}(
zX8bDIb%o5_*=6?uM#ILZ%A<9{?C^>7w&-q51_fQ6@^E?{cAa-0bnMxfm9+hCT{vFM
z^V`gozg$npXYvhoCmh1t*vPgN6gM8C^lt2b1he%KN#$2895LOvJeiP>i#a77dUg2e
zB<WjZFKIzoTKni6RA)3z=1&hc$;8z?`$t_o0HFku*9Kjt&Ynl7<?{K~Cv!f=w+Dz1
zLQCIoAtiopuhC_0wJx}%lfH57zBJg39Mtkdt8;0Ijy+LVLgf}oUMy8$QWMYNSqyBL
zxIFzQdzVtQ&w)AJ8VdrI*pAsp#Br4EAFu`8<PcTesR+#l<Lkv@fBTC+tLSz^UGUQ`
zQ$r1D<RD0&R=%l5;f#R!Tj%fAyx&?zs-;duI5W}X>@F?eRMEH!RI1*Lb*uac$SC~j
z?djC#+rMThHad1JlEm9BFbp)hDlDCxcKB`UUR{WoA&_F)lB<zveOA#N&jt;bq=@<H
zh5y9d-Cz=#DDdy!z1hRn7-rI$@?-4cEZ=F-#}&bU@m33iuXYYQ_UbTa`m~ZdJw@{a
zgU=lNlq-S`x_L}qrpXMI1M(dTH3+m!Dz2fBG8Zcm8w@%0mr*npzJshWZGIjTs$nVb
z%U^&X7RH65{joJxlAAe*tmlqZEWV?Dk6_s?KM=`s;nQMyxkvLN<4qrIO?;*+^%mvc
z*EB&7rrm}{nOUC5;3<3;ZL;_D=a&{8DOF4U8FGK?%o8OGp+)f5Xp?H=`4z!O-8~VD
z+V*MXA@_IH5!}2hE_;%DcjN{$VtE&s$jdCQdO9Aj4;8GLSq7bDUPXR78J7v7QfEr6
zAGtm|eW)<f^y^E`{lyxYN15Fl2Tl)F2@D=3mIJ2*91Hw5O?_9RIFf%m@JNwBY1c^f
zke7ZKWR396rhEKwsIYZER$nhzyuzH)w9I~{vBlB!%Z3+T-&9Po{l6Y*%lx+S?Y-YZ
z(Yrcb#KJB0=Liyc*XIz)Vi%X{IewMZH|@%a*;w>CrmvU0$>eYTIJeHLc6BVBAYHQO
zZ&a-RHo*IS2AwaJNx4d@9=u)-dOef5;QaBeS;87W>b*!F)aKLKW}d4yaP5QCRz57;
z@9uI7R#1e^6srF`OQerjbOm-!09o~r#(>(~$oQ}ChZ&>Jm2jfEPshX2BqSr}>C$R}
zUn$gZ`gum2I$fI%JQ=3!hoD5#C?`XaIP?3P6CK{&;}Id_`5#Gx9~~XN{QqD`T3u<Y
zFywAg{njAdy=Twy_lMamks$6@wI7UDlL?7YPE}C>&xdXDVIHkCQMp`Ki_xB!>VI<`
zU#<$V+LXk)zdpmQ+J(j@0<%nW5_+rMn4%wwc~<b%wxkU&KT_^+6zV!nYoRBk)u@hJ
z<ly}*pPCFVP-z|$&*PQncsQ#iJ|9`$a+hYPz2NL@7OP74>e?=3&Vm@jA;f%Y`pdNV
zQI>b6F=*Dn({E}MGKaE=2Q-B!;`Ma>^UJM5`^yAI`Lk(Q^wE4FCd%o&S+A9|YF{L|
zj}0(~@C)3XPU+0V1UsHz?bQpJQNJ_zh((zW785gL(j}&DKp$g5H0j<2l@ch~$8aIq
z$X~0~9`e1$%%xqWRY0}a$;n9Mv3~#hpb;oHvxZ4DvffU%74fd2!@}}KJxj4*(;!=`
z0^v@Z`7l~T=xy~JJciNZG6)1Fdkkw#ir}kjQzQ&rPgP^ka+K_svGgGwN?$eHcNkN^
zXJmJOR0>vXyV`v(daT@1IccsL`;G8KHjLajlzz;wf72&Hc4GhzGwv1%0kL;!(k#2_
zE*7@deIi+^{rHoYq=BSjK5}l`{he`>PO$-HDQu^40>~)4c@ZROHWZ<*Iw5M@>0gd|
z{*ji;YPU4G_=~xdX|yYb0RP?P2c3saU;UGX@zTNkgT!bg$LG%X{Fm>`D`_E#->D{{
zv!>nH>y+<ssYcz-*POQpb2B!VFt>>K9o@EwRQRkDTn1v6Jm-+neNt@oEO*~;h5osl
z9z4c|9_7a#e0w%)TFfBYCo*g9Nvk|jNG5km4$I&_Jzq~Ak9H*PNwiJ_k_ML6dZqSG
zq6>Fvo?`dfCbE#^=>t*TKf(*SNyY#YR@Kx)ZmGRS`}X-Vi4y@;!3hGbDas*)eeVLb
zH^vRGh)!3P8KKTm_<`&_O7bcm)q-hG0wtO`U<Hfo#L}3oD!nm|`n;{U4Cd_cc<z~r
zFk&|cdO`hfGfFn5pPx_+kINh~^s}H0bDND~b_}`{l)thuQ0r;pHdQYfU9!ZZtyo(_
z8+|)Xwk$q`?t=K2g=EzQZezJ|RQWrACJWZrb~wb$DmtsBP(r`BU4tazIOOp+HD*?2
zfwmG0z5?Z*A5X+NtpIc0voGX;*UhOE{lUr^LDsA_TXOjHqfd&9Wr~NF6ZyHo&fmhB
z_^jL=wcyB7N}X=b1kaq1p)U!(qt7H6j}`@}cdiZ3oz*5%gsm?xGrzD)B^?A`HE&{L
zZML;Zs{GWz7pla1?qaP|Bg3y<=83I3>dTgDL7`?TqYliN5N-DZYPcwLYa+ahUM15#
z3tbCtDYMU`0|Rvb#6@2JSbBj5umISRY6l9P_=)x%oj4@rTpFbFnWw(1n>om%Bm$s$
zH~NR1m5q>dLoeRVYe4BaWEi@=d;cX#aG4w?Jl6#o!utdS_9?ut>)?g$C*`=uONbBQ
zB-Mu>CkYAxPrxD{Jr(rKSxU7ns>TRF@0uqeZ<Dk10x|S5m}yMInR)Ij`~Vc84&toM
zq_S$NQYfkH1!4oR=hPUzGq%`8lp1Z6VI%LK@l;vsrPk^qfjO&Ei^NX=b`_j&7#qGm
zHYl;9!S{npbMxz4yEE)W3Cvm0QgbUZLK!)SV4-O$tqXEiiJc%w<tw&&bMCUOMx14<
z@muv_i9^L>lkun5`w9_wN2)^yQsulJlnzOl3YEN(V4|*n<O3HRKyY?wsN&H_KG30M
z7>)$l^QQ)eJWkK8%W%d8jJTSxd}XRrrOb;Hm!^if(dNE1AHP{G-3Qjj5=Mny7Rs%N
zDLvwd>UXjZ+Gg)=#Jl_Ps(vH4>Nq_Tk;o?^->_YhP(3O}e)PuO5MAuC05{XM9dwu|
z^j$`3|K&n#n4yMt2D@D;*+(rw**ReinoRku)o1eUi40JnV1;X00>eXwieEU1_(jut
zEVG%@Y=#+BKj{cjlco~lsUwE9SjkcEzl2g>JmOsN`02N0>ww!OwwdAi0!D#dEesF^
z+r6)C{WSwBgWzJa?|zwwb&zFfG$xkarR(f_&030=M3lW8g7BtSwH0>=z5cdwJ@3}F
z+KgXwISjo!s+P<wU*J8-aZUkf`&!unY5EXbav%+*jr`dau)tqrmA$Xq0GdbX1QQtx
zE{$NG4_!BciKa8=h6kFgxyDNMb9P)Qwzv4xt88ZJEdKd2nqA9Pt*Xn}tf4FsPNV!<
zD=^N>H^oN9H%8^$cm-e1YE)Lpq-uoMlcR6Aq(a#OPmgVrWC9Rh5L5I}e32eoz8RG?
zf$WD|R^nnYO#a)LN6JJRgkDKmdiisEeOD~4bM;1|1JG2CIssHM1#gaawU1{#-JKah
zO{#lYVSN`jCns|F0PKUN<!&pqeIBw7tI{I{@Q4EDs+}ukF(CFB5#Zq>e~zehT&LK;
zCJE)B3Gw|g6(0&GTz=xT-XpU-RfE?EBzy^QLXHU#f~>?BoJ1ep`^*Vy_W-FTpHm97
zv<O;pBRJ&bRDC`>(SCwb192o9hp~O%JU8rdDm@D<HTT~sw_&WxWRpeKy+sP5BFLT+
zke{U!ojCm&F|#o2ft-0vKSkgkttHD_{JiR52Y=c#X(Dx7F}5)?1R}uESCLL+j?JAN
zVG4Pu?~@p=TQM%Hs}6+=8q+df+1y{n*SI20CT<A`9$JN&Fa5^-Nr)Zo#k9dy;LBDz
zTX0evIGj>9&1q{ajE&&tEjr+ZoAUu|*zg)=y1Iyw<-x;O#3(o3z7P9ZV`AHvYTbB-
zRrsU~5b5ZaM2;c-q+~N%jSQ0cdjZ2R>5LLOZ1xHy))T}b!wUUq8~2R<eOQf0g~dx*
z!JHg$N?S;p`X5ZO<X-N1a<((YmHRT89_-<eCPS~%6pmbwT>(Jx02iuC=Iry1r71B^
zbNC)&31R2G7;=5lmWVwSsww&|K;9;E^C!Gg(2`Pmh5#qDvR)!|q-Ov+la#)RVqh`N
zL7jauV5%gxK2G0FSBfE(ySrGMY3`35_0{_$G4@&sBHoDvmc`!cd!=#@oaQ<5dNz-C
z(N_36{YV3mXrE6=p1{#hTSUB^i9ovZ)G{tTCOe~r^v*TSIHQkhaoP;ZFe$&G|LgSO
z%x%kbOhBE2^I%bTGNTXrMTWh`W*j7}oZDuwjO_e0^n*lFMarA0-dFc;Ue&EyYer4`
zhSGxiqCG@DE~ZWaZ9+Ag-Sv2A)Lb>~B3saUfrca|X_0*zdCu1ANmj<5?HPKGaS#PY
zs2&pNP{G6f0Dln8lux;|YKz;%7x5$`!)_s<pQ53L$Gm|Z+R*;RHv5I@y{@203RH<_
zQJp{yH-1_zJfsIeWa9uB9}0I&Knw$hlF2kb+Sd8uX<8#zG6U&%sGfRl6Q!_Z%4Ke9
zG@6l78c)}Z7HB0kGmq;tQr(9FjfMvVzP)0v^1-8Y79%(L%56(c3M%oC&!5tiP;xzh
z#Pk;4oDze;wk<`I#m4=Q9;0?RI6HWROOgVT7^Fm?Jc=QaizYXhC)ry#EZ}kmhLVFG
z9w|8<VQf{!1D=X}HtLhV-IyY1!Tp}X;T0?4Bp}B}ze&W6z-34u$}~U>dY1?i4j-#1
z(^{uKvfipOk9nL+uM8wD3VpX3xk@;WilUUVs^PUdH(K!j$f^|GF#XKVbRcS4!~uYD
zGC)cKjpwpnR%->urea4!yQOjf&B(>m!{z%KV@r;p@|}-#<lOi`h8au-JunOm?k58Q
z2p;f|p?<#N0i)pRmaErK%AXvB%Eg5BkheNY^@Jr;PB(MJW#SO$<!BXor6RsI|BiN4
zWY~ceVaN!f^$t>6O$d6^_BAJ@dRs9aQe9fPByaeFh{YHLX3@%*Ow~%i95-B5w_ffJ
zTHv*$K#WVS5l>h=1Otg|;@<mFiHn~X+S-A3ZcZlba~4~{BCpH(HdzW&N&i6$ti;%!
zqFj`@*uG@v_SUO4Wpz)##9J36Q_&)-vEGJm?i$_(DoHjfQ|u~k;R6hP&5ESgR;%)Y
zOa_qjTLfvpse)~c5A{k_Q&W`4U`-pFURK5aG2gTZNc2k>S$d9em=XlEwbd%cs7NZt
zL-e16TWXPoGs*jPZy$lfk@=*LYa>KR^)ftm8qNc}qn4aOdu3B+zYKeo)x)aIkN-N7
z;KGDK&9~P`?~XRMB@O;Y9BdZ_++;J#f|^I8eGtvs!3SfMBP%<hKx{~Rx$g7turnqE
zF(*7ny45Tpd(SUMs;KESe!@B0$0TjK-tx24*5o(dUpxf?R0{A*nyD!-KI@s;SX=l4
zE<aIXT4!P%XL&-Ug~1XjZW&Dq_zQD+0xF47#sOVcL+k9l_#G%Js}crDgP9s>N_pIY
zLRs2#imqM*eS01fUme+$9K9H2HeKe2xs}z@icjA)s{>(gRSGCyGo?O8@ThM<s%d&P
zv!3aHjKx0ojHP_7fBJxTrdqJ^zZTm6YpTIy|HyaR8#NEt+2a0d@Tse4E7vJnh5ru-
C<n3Sp

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/withdrawals.png b/Telegram/Resources/icons/sponsored/withdrawals.png
new file mode 100644
index 0000000000000000000000000000000000000000..4baf224d726c9fc409edee3d7212a421b70661f5
GIT binary patch
literal 680
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfl0{I#WBP}
z@N9@}zoVnbR{<5J5}{5u-d-oCKMarf0~SnQVIsxr=&HCVAaC(!_Lg}$svZ4J8Y(6s
zLMj~3C6B%N{K;(g)Hi;H?`)sn`Ms_>-A(Oxe)nXJ6IolU_Qp*<$#S-6=bI9%%{P6V
z^qp9n55}!8-x(wDzcSk30TYX=&<8F_o;J6|8}GmGKDy{`UOH<5V^b4@(KMl33)&AS
z?!Ui1LdWUd!)Bn+%9tM_E>?5j39A0%W=s+2zWn2}M)V>vGajRkn{~F!+uY1%pG`43
zSr}tCe>rcEhKNU@-F(kQ2NNdvEl*q=U$_7M%MzhK^Ef8Y^IOi>o@^tRZ8Ga^S$AUj
z?%0kRJNa*6t6T3rE!ufEuOxl@?T6lrFP=!-Tx%(OF++q|ZRf`D)uAF9(@!VX-x1?k
z8e}=s=hRc9sfsL(N1iT?uqf?5+H~W_=9@ZpqMa@pOv+;2lD%#LA}$=3>m1&7YPk1Y
z%?j0;TC{Uc)LONUxb^2#j9%PL+br18S?%AVbT-X+wT1{+)LJvSeqn>DUJDDSdbM6v
zXvyX9UwCr|V@Z(9To09NuS?g4t-k)c{jj14*TzT%Hx8!A3EMBm`b=>R)w)_^$KJPd
z%kA80O}vI0j3;(4VmFfElkY!%`DIIbLvN++1RZVRy-JM^2OfXiuq%HZ$CCWrTU5kf
z{d#Nc^xA#@g%k3&Ip@8-HwQfC_18W7mHn9LuOoVMswZyx3rZ!Pu6{1-oD!M<tyT!O

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/withdrawals@2x.png b/Telegram/Resources/icons/sponsored/withdrawals@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..93d2225f1e19e6b165ca93b8c661a974d9c0129f
GIT binary patch
literal 1289
zcmV+k1@`)hP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGb4f%&R9Fe^n9D1DQ546oXOi-m
z`7uzWJZ6dsiNerK8IdyZio7MFD3m`y3L_%}W~5A%GV>}jK;$Qik@xHO`()L&?>^_;
zd(ZVN_gBu~w$57L^<C?%z4zLCUytYK`KdrCR3I!Y>|do3BvD#gT4iNrQBl#ak0&`f
znS?GbE`EPJ>+9=FOG_swC;uu-N1oW&*zWG`t*xy;0X)C}<KjqXX9%=H5fKq}b#+5S
zLsUfZP=mw6L#YZ%sa9rYCiPPota#1L%)Gt5Ddks%^z`(dogGya<o^EtoSYmdUQ7TC
z7f77&?)0UlrPtTjlFiZ4QFV27fKwP4U|hr(5~$q8wxVlmYhPYogmGkKBsx0Uit(+%
z1xI0k3PRs_UsgUyvbn#%ud1r@1@&jc9TL)lFvvPF<T6rscXtH^1^y!Xw?iU1LF;-x
zv8L3N{9<kNOresogPah$$&XxLU$5qkAE-;SnoooX)Rk6tetu3uERY~(vF|Vt%DN+j
zZO@Ff`ZqT>OZTIfJU>4xKwMm0Nl8h3e7w>GBHZ5IuCA^!5d{n(wDa@xgdotw#Dsqm
z*%=sSz2ER<dwY8_j&6Uqx3{CBqEujLWr7k&DIEp6zQp4@bWmPip4&WhywTPn7puO>
z=;1!)*49>m8WfE8&CLy_)6-LSE7q-gXvgA$pp*z%Sy`8tmzb`uuJj5K403TH+-GcC
zX<=aj=<)Hf)!NzFDJ<-=y0y5tSo8?GzP-I&^o@;;x?W^LU?rT@<fYlz*Z{Y(vf`!v
zc!`OLp*&d6&d!h(z&4?zq$H{6{{DVsq|MSH1XP4mJR*b}@3Ou)GZ=baA0HnF2L};S
zQ&U@7TC4zFGcYian3#yBtE=nv^;I{CEFmPE)%vM<dU_)9(b3UQl_rIUhs#>y>m?pW
zYlSj0GFaa5tgWqS-d-Xh01(bg>+zTsGR(&7`}=!eUmr@c>Fw<`tm<`qe4JTKypE0z
zr3_Nw5D3xi?5q!ej?7>l9v&DwU`B-s3k$LG%+1aDARz=8>$%&kP#{Cw)6+vF=JoLK
zuo04`H#s?pl8xQyWCqe{vf3v^r!oBXSC+=&;v$-wnwsqFY~4gF%FoY7Lt5-sy2+3w
zgzf6_LOL}@FObJW(_`&WbFMpT$jZvfWW>1-vGEx$`m2k^=(Kg{bRthrPm>T&Q&W=&
zQ&UqS_&r*<*g6PiySZ8uN=ZqP6X5RduH?bSj=-z$!<W0wmB8HYBmfh_nuo3#8ygd(
z{##K|p<}GF+WQD(wc2O`KcFQfB&Zvb<g~oJY{RIj{2tIWtR@D2gl%YOQ01XB<>uyU
zG&W)|M_6cF9rD}S+71p5Ha9oR%gb$2&{V-6@*&|sBg4VW{r+o^e3iN=aw7iXWe9gj
z7~J45ijq@kU8Pl>)KdEXKN}<`=99X}Qg&oot#RlUr2Jw6V7Ne{W1Qsw^A9WaHT29-
z`AbjbBm#SINc`z(q@`Z<JFZgx2tO70o(lX0V{?Y%4t5av00000NkvXXu0mjfc3oSH

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/sponsored/withdrawals@3x.png b/Telegram/Resources/icons/sponsored/withdrawals@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8827877fcd43684fdd1663fb0b1730a24d7a6e79
GIT binary patch
literal 2054
zcmV+h2>JJkP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?a7jc#RA>e5n@MODO%TTujWGtl
zL<ovt#E2Nt7!gH5Fa{Sy3<xTC5j?qohg{TyTcRXxh)6`d2#N|h<RYRMJt)K#6-3++
zG42YYiQ>Vye?M)k6x02BX5O1eKJvYHh&9z!|ElVxy1Hk~%gg<8J&@~xTo2@W;D68q
z`PqxHprByPm@(tVjVmuN|L4ySTc7^?UcP+!@ZrP9j~{>k{yj?$Bpg_Ne*VmvGw08r
zKYRA<>C>kV7%;%&_qT7~u3x`?;lhP;=gwWabm`ZxUmoFJYpSTI*s){BvuDrnFO46H
zr~}e#0oaC_Y{!lrqx;i{C!hidPypIi;&L*YiY%OM+qTu$*Rz~#!%v<(VS<^p^x?w?
z78f$83>h-StUV^}=+UEXMHb$H0|!7hDz-p&IkRTXA_oMzoX49tZ*JYXwYs`Gih0Bk
zM#aVf91~GMl9XAsYSq`TU$r+se*8Fc<Vf0!1Vz*V(U_RPP?COou=@A!-_p{e%|o9#
zb7tbii5{(pO@IIu0LL6gBO;_JR$5w0YSxCyX0^4oX~LyY12B+XF^cIF;u*8)wm?+m
zhGD~oWen^90M_hm(utVP*0_<W#0&&WqOh>g;Z#B_z%ijMGA9$lRxm7LZDY%pEvhk#
zB!;xzgmVdLSLZ-FGK-;D(0bf(Be6YzEmiMVO#Q6RKr601%<1)pGq_}n#pdkWw@)Sm
z$tp|P!tWMFb)Li}zkGNrWt%Pn6VL479{iQSwDd17Wm->Ck_z1E)2IJh>79S|-i>2^
zCwxUPWzM5Vk4%C4^XJb=lP2A}ch3pOGH}+xPGLWj3YZMxl%X!UefxI5e*I`gZ0y*v
zPoF+@N`^2wAjxp0%7jy=PQ7;R8fHW?LxOUV)8~{aQ=HD}42gSAnGhytVZC0R)on>h
z$-8&&GK|Ej{`&Rn!Gj0eF5-sB;~q}hG9jFrni_%NSmBhetE&^4#EH3c=Q@q*GY(EV
zWnelEh(?rq3(+}s>Xgu$;P|K?Dd(7znj<t<AcF=C;_>t6&s=f{UlT<|MRVrN5zd=8
zZ-mwa&M^NC2PZFHyr^5l>C2Zd%OIpWHL{K$Ja`~tt5>g1h0AH$h(V;1*|>3|K;61^
zE0q||h!{?$5_9uOaZ*Edbac3d{%{vBUMyx<7{$fKPT|nNh7KM2@#9B<nm2Er6UQ)d
z$w=a4yll+&CpL~BKkl(X)77h2MR?PuO-|v^zz!WcBp~cpP7q<@k_gA!sTVC;B$}Hy
zZx%!+K~*Zkth%zYGF!|a*!c0|rM_X6PM9#kM$jBw5{tO1n}q(o+1WqtZiUHxt<X-Q
zy}e!fm~(DuN7x{H_wJP$b@=e%`}gnLGMb}Z(ynS5cVN1F4x~P<EHvw$(!@NjUAuPF
zs8P}sN{|WJHjEheZH<kMp(@%X?W$G`4=l>%-rc)*Pn<Yma0d<?*woadZFp$%sxH-c
z?b`MB?OTt$Y0@sm3oI1c7HDW_`10k8;V)mloWjzUu{kSNte8A`vf;mY@nZk}{kBYc
z9QTMt>5_oG=g*%XJb2JB83+14AYebTH#9dl3!nMi-Q6vZ9zu_jc2%o{2gZ%GR`Ad}
zckW~_G6D-1E(|@qtzW->#E20_o<ga$wbcWzo3u;u0^|5CK-{wn?I$`rJ9qEiEi!xd
z>=D`~h7TXUVZ#RDuUof{3@(p;Lc640^=tiZjkQ5*I10j7uU^R}vvlcF(`xTyq;(NH
zdGe$N38mBDpre;mwi7E?t`v`X)nYcNKw#8+a!pTJR9RVR<9ImfmsEg8DT1B0xv$lg
z@tQSj5DNr$_Uu^+KJGQBE`qtea{Az7vKNVM-t_oHtv0(d)`2Zput1Qzy1JYtm<8Fx
zz!_1GzG3$0M>%NrNL$pED_6ukMV1ci&Ye5bL}Ij5Ll_YcnkiADTn(gD&dbyN!X6;E
z4Eid8r9zqF0kNABxEcU7%4LpiTR2?T$;ilAOJDmeTeeJuBN7Q*=3t5Lk<$c8tg5Oi
zqIo06ZJDG#N@NMr5X{wBXb5XS9K*f12tD%p!c@*CJ<Va%(W6HL@yO$h88gDPgYB^{
zOoPgSXLf2CG<*uJk^<@@M~>w7MuHKdt*tE}8Ty#;6*u-Wd?~Sg`*w-P5bxi=k9A<f
zhvZ*M07@yH$!jF`Ywj~-v2iKQ=N+NrqXn|{8VMVjzxbo%U9w~ehh_iQRXQG_bta_#
zO6<j-G0-<()tcA>pLfuaS$(w$xE?FkXWXh%#yo`Rv!6o{ci;Sg#SAFp7Wm+UNka7$
zw=Qu`4?uJwX0`{+Vbm#~Jd<1^m;1&%37sX8cA0}B>ar^sOiU#FVMmmnAnoe?&A7r}
zjurof&-&uO5mZ65clW^$F(p9iNor+XQp)JXB>({`-U}4*BTEE}g!7vmDC35NBI;=`
zQ9G!NrlJGx@8{`MPt&GN^A}Kz&y5>5&YwTeJ6`iqkqwwOC*i=fA6&fk;(sX6p5*9U
k59E3v*8{m8=(9cWFFoSWUOT0!jsO4v07*qoM6N<$f^Z7h)Bpeg

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 12bf06c42..0667ce763 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -113,3 +113,7 @@ sponsoredAboutTitleIcon: icon {{ "sponsored/large_about", activeButtonFg }};
 sponsoredAboutPrivacyIcon: icon {{ "sponsored/privacy_about", boxTextFg }};
 sponsoredAboutRemoveIcon: icon {{ "sponsored/remove_about", boxTextFg }};
 sponsoredAboutSplitIcon: icon {{ "sponsored/revenue_split", boxTextFg }};
+
+channelEarnLearnTitleIcon: icon {{ "sponsored/large_earn", activeButtonFg }};
+channelEarnLearnChannelIcon: icon {{ "sponsored/channel", boxTextFg }};
+channelEarnLearnWithdrawalsIcon: icon {{ "sponsored/withdrawals", boxTextFg }};
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 22c8db5c6..44f124c0b 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -226,33 +226,6 @@ void InnerWidget::fill() {
 			makeContext(label));
 	};
 
-	{
-		using Type = Statistic::ChartViewType;
-		Ui::AddSkip(container);
-		Ui::AddSkip(container);
-		if (data.topHoursGraph.chart) {
-			const auto widget = container->add(
-				object_ptr<Statistic::ChartWidget>(container),
-				st::statisticsLayerMargins);
-
-			widget->setChartData(data.topHoursGraph.chart, Type::Linear);
-			widget->setTitle(tr::lng_channel_earn_chart_top_hours());
-		}
-		if (data.revenueGraph.chart) {
-			Ui::AddSkip(container);
-			Ui::AddDivider(container);
-			Ui::AddSkip(container);
-			Ui::AddSkip(container);
-			const auto widget = container->add(
-				object_ptr<Statistic::ChartWidget>(container),
-				st::statisticsLayerMargins);
-
-			widget->setChartData(data.revenueGraph.chart, Type::StackBar);
-			widget->setTitle(tr::lng_channel_earn_chart_revenue());
-		}
-		Ui::AddSkip(container);
-	}
-
 	const auto arrow = Ui::Text::SingleCustomEmoji(
 		session->data().customEmojiManager().registerInternalEmoji(
 			st::topicButtonArrow,
@@ -285,6 +258,26 @@ void InnerWidget::fill() {
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);
+				{
+					const auto &icon = st::channelEarnLearnTitleIcon;
+					const auto rect = Rect(icon.size() * 1.4);
+					auto owned = object_ptr<Ui::RpWidget>(content);
+					owned->resize(rect.size());
+					const auto widget = box->addRow(
+						object_ptr<Ui::CenterWrap<>>(
+							content,
+							std::move(owned)))->entity();
+					widget->paintRequest(
+					) | rpl::start_with_next([=] {
+						auto p = Painter(widget);
+						p.setPen(Qt::NoPen);
+						p.setBrush(st::activeButtonBg);
+						p.drawEllipse(rect);
+						icon.paintInCenter(p, rect);
+					}, widget->lifetime());
+				}
+				Ui::AddSkip(content);
+				Ui::AddSkip(content);
 				box->addRow(object_ptr<Ui::CenterWrap<>>(
 					content,
 					object_ptr<Ui::FlatLabel>(
@@ -336,19 +329,19 @@ void InnerWidget::fill() {
 					addEntry(
 						tr::lng_channel_earn_learn_in_subtitle(),
 						tr::lng_channel_earn_learn_in_about(),
-						st::getBoostsButtonIcon);
+						st::channelEarnLearnChannelIcon);
 					Ui::AddSkip(content);
 					Ui::AddSkip(content);
 					addEntry(
 						tr::lng_channel_earn_learn_split_subtitle(),
 						tr::lng_channel_earn_learn_split_about(),
-						st::getBoostsButtonIcon);
+						st::sponsoredAboutSplitIcon);
 					Ui::AddSkip(content);
 					Ui::AddSkip(content);
 					addEntry(
 						tr::lng_channel_earn_learn_out_subtitle(),
 						tr::lng_channel_earn_learn_out_about(),
-						st::getBoostsButtonIcon);
+						st::channelEarnLearnWithdrawalsIcon);
 					Ui::AddSkip(content);
 					Ui::AddSkip(content);
 				}
@@ -428,6 +421,34 @@ void InnerWidget::fill() {
 			RectPart::Top | RectPart::Bottom));
 	};
 	addAboutWithLearn(tr::lng_channel_earn_about);
+	{
+		using Type = Statistic::ChartViewType;
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		if (data.topHoursGraph.chart) {
+			const auto widget = container->add(
+				object_ptr<Statistic::ChartWidget>(container),
+				st::statisticsLayerMargins);
+
+			widget->setChartData(data.topHoursGraph.chart, Type::Linear);
+			widget->setTitle(tr::lng_channel_earn_chart_top_hours());
+		}
+		if (data.revenueGraph.chart) {
+			Ui::AddSkip(container);
+			Ui::AddDivider(container);
+			Ui::AddSkip(container);
+			Ui::AddSkip(container);
+			const auto widget = container->add(
+				object_ptr<Statistic::ChartWidget>(container),
+				st::statisticsLayerMargins);
+
+			widget->setChartData(data.revenueGraph.chart, Type::StackBar);
+			widget->setTitle(tr::lng_channel_earn_chart_revenue());
+		}
+		Ui::AddSkip(container);
+	}
+	Ui::AddSkip(container);
+	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 	{
 		AddHeader(container, tr::lng_channel_earn_overview_title);

From c66b5b2490ff802c2dea4c08935c3a753750215e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 27 Mar 2024 21:31:20 +0300
Subject: [PATCH 167/596] Added support of permission to manage channel earn.

---
 Telegram/SourceFiles/data/data_channel.cpp |  6 +-
 Telegram/SourceFiles/data/data_channel.h   | 67 +++++++++++-----------
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index 469351af2..b32c85c53 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -1070,7 +1070,8 @@ void ApplyChannelUpdate(
 		| Flag::Location
 		| Flag::ParticipantsHidden
 		| Flag::CanGetStatistics
-		| Flag::ViewAsMessages;
+		| Flag::ViewAsMessages
+		| Flag::CanViewRevenue;
 	channel->setFlags((channel->flags() & ~mask)
 		| (update.is_can_set_username() ? Flag::CanSetUsername : Flag())
 		| (update.is_can_view_participants()
@@ -1086,7 +1087,8 @@ void ApplyChannelUpdate(
 		| (update.is_can_view_stats() ? Flag::CanGetStatistics : Flag())
 		| (update.is_view_forum_as_messages()
 			? Flag::ViewAsMessages
-			: Flag()));
+			: Flag())
+		| (update.is_can_view_revenue() ? Flag::CanViewRevenue : Flag()));
 	channel->setUserpicPhoto(update.vchat_photo());
 	if (const auto migratedFrom = update.vmigrated_from_chat_id()) {
 		channel->addFlags(Flag::Megagroup);
diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h
index afeb20cbd..d22352020 100644
--- a/Telegram/SourceFiles/data/data_channel.h
+++ b/Telegram/SourceFiles/data/data_channel.h
@@ -32,39 +32,40 @@ struct ChannelLocation {
 	}
 };
 
-enum class ChannelDataFlag {
-	Left = (1 << 0),
-	Creator = (1 << 1),
-	Forbidden = (1 << 2),
-	CallActive = (1 << 3),
-	CallNotEmpty = (1 << 4),
-	Signatures = (1 << 5),
-	Verified = (1 << 6),
-	Scam = (1 << 7),
-	Fake = (1 << 8),
-	Megagroup = (1 << 9),
-	Broadcast = (1 << 10),
-	Gigagroup = (1 << 11),
-	Username = (1 << 12),
-	Location = (1 << 13),
-	CanSetUsername = (1 << 14),
-	CanSetStickers = (1 << 15),
-	PreHistoryHidden = (1 << 16),
-	CanViewParticipants = (1 << 17),
-	HasLink = (1 << 18),
-	SlowmodeEnabled = (1 << 19),
-	NoForwards = (1 << 20),
-	JoinToWrite = (1 << 21),
-	RequestToJoin = (1 << 22),
-	Forum = (1 << 23),
-	AntiSpam = (1 << 24),
-	ParticipantsHidden = (1 << 25),
-	StoriesHidden = (1 << 26),
-	HasActiveStories = (1 << 27),
-	HasUnreadStories = (1 << 28),
-	CanGetStatistics = (1 << 29),
-	ViewAsMessages = (1 << 30),
-	SimilarExpanded = (1 << 31),
+enum class ChannelDataFlag : uint64 {
+	Left = (1ULL << 0),
+	Creator = (1ULL << 1),
+	Forbidden = (1ULL << 2),
+	CallActive = (1ULL << 3),
+	CallNotEmpty = (1ULL << 4),
+	Signatures = (1ULL << 5),
+	Verified = (1ULL << 6),
+	Scam = (1ULL << 7),
+	Fake = (1ULL << 8),
+	Megagroup = (1ULL << 9),
+	Broadcast = (1ULL << 10),
+	Gigagroup = (1ULL << 11),
+	Username = (1ULL << 12),
+	Location = (1ULL << 13),
+	CanSetUsername = (1ULL << 14),
+	CanSetStickers = (1ULL << 15),
+	PreHistoryHidden = (1ULL << 16),
+	CanViewParticipants = (1ULL << 17),
+	HasLink = (1ULL << 18),
+	SlowmodeEnabled = (1ULL << 19),
+	NoForwards = (1ULL << 20),
+	JoinToWrite = (1ULL << 21),
+	RequestToJoin = (1ULL << 22),
+	Forum = (1ULL << 23),
+	AntiSpam = (1ULL << 24),
+	ParticipantsHidden = (1ULL << 25),
+	StoriesHidden = (1ULL << 26),
+	HasActiveStories = (1ULL << 27),
+	HasUnreadStories = (1ULL << 28),
+	CanGetStatistics = (1ULL << 29),
+	ViewAsMessages = (1ULL << 30),
+	SimilarExpanded = (1ULL << 31),
+	CanViewRevenue = (1ULL << 32),
 };
 inline constexpr bool is_flag_type(ChannelDataFlag) { return true; };
 using ChannelDataFlags = base::flags<ChannelDataFlag>;

From 9b0f3bedffec7c0b2cf5ff06e5e699076dfbefd6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 27 Mar 2024 21:32:42 +0300
Subject: [PATCH 168/596] Added entry point for channel earn info section.

---
 Telegram/Resources/icons/menu/earn.png           | Bin 0 -> 568 bytes
 Telegram/Resources/icons/menu/earn@2x.png        | Bin 0 -> 1260 bytes
 Telegram/Resources/icons/menu/earn@3x.png        | Bin 0 -> 1839 bytes
 Telegram/SourceFiles/ui/menu_icons.style         |   1 +
 Telegram/SourceFiles/window/window_peer_menu.cpp |   9 +++++++++
 5 files changed, 10 insertions(+)
 create mode 100644 Telegram/Resources/icons/menu/earn.png
 create mode 100644 Telegram/Resources/icons/menu/earn@2x.png
 create mode 100644 Telegram/Resources/icons/menu/earn@3x.png

diff --git a/Telegram/Resources/icons/menu/earn.png b/Telegram/Resources/icons/menu/earn.png
new file mode 100644
index 0000000000000000000000000000000000000000..a922012bd275b48c85d87354214107f50a4bb47d
GIT binary patch
literal 568
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY>}snV~B;|
z(<%G=7z0I)>9eW|?dDwc<vC}`B-e+6CX2qaUAdPut22p9bS|4<r~8bQJq<xh(o#qM
zmF1k<JM-p*-dwZl)$i+`TYvvE+t};x{>vFAI;TI`yuWMDux^6=3zvlf5qi_x4<9U?
z<G1|tGkJ#Vk3V*B9(??K)zw#d+ogNmZswS+X*<%w5P4&jq?4i)58JFDEwS#Sj|(R|
zHoS?8TjJ|*nLX#WS&E62X{E#wwZ(?LOZ3xRUzSwa&7Xh%`Q?{eZsrv2oU>x$Mg7g+
zt^8JBo#mr;`)$~jyLsC~wD$f=-x#qZNYhYJy8rkNj>U}3X(qqcg{;4R`~CN$Nf%XE
zm5;fullrjJAfq;1Yof=56Hkj~`Yr!jb=Ra(@UhYoJzovRCC&9~!xqbKzPaXZUiV8m
zj_KbX&7aM`nY%|bVAi>etx=}4eT_r*-;ZB^{b`ZqOrK|;e|o4SMF~DmGK#mb`RAkN
zEO!0%RI{DyqF06-(Y2{FtYx}$NM1$TOoos7<(=OOl`n3KCfeT+GJfz_)bX#icQv<n
q+?5}1@?E?Zd_Vv1#*?-7e0B^M?EbKOHZT1KiZxGHKbLh*2~7ZX8Rh~2

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/earn@2x.png b/Telegram/Resources/icons/menu/earn@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf8d10d34872c173a7dcf55d5fa5c5f7233b9f6f
GIT binary patch
literal 1260
zcmV<I1QYv-P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGR!KxbR9Fe^m`^AzaTLezMOgS-
zgjYzC1qn;+#D<MT7L<f6l%i}bNQ#uQQ6dZ077`oEj;thqv!Te74TVVly^njIpK0#Q
z@6KG$>%F?OnERXa`=0MP_sp4d&Wy(sIzkZ$Mc{iQ;0=yGF)^{Ks;Z)*A|oT?hwp&r
zr|&pDJzZU0U0z<kzP=8Q+?`fUP0iZc+SAk1oAv+z46r+PkH<xXN=r*eM@LIaN|cTL
z{r#Ptor{YLLW7V<rKP166cps;<tfa@#zt>%@A~?>lKg>1czF2u__&J5;o)I-cXxJn
zwjDKF0DvhK)FH9MyOSp*B&@8g2sM#tZ*O-<4Gb_Uq6-OB?ri&`p*T1=5XQyD#n{+b
ze~ey&3W~x2)t7wYFRIv#jEsbZh3ReE?V^afij%_tTd=9T86F<C*fxmB<;=`XgTP`5
ziTDJq#dbgu&y>1T`q(5TCEefO^PFd8Woc+3QTGmV4bpmx2Nj1%NqyeL#KiRX_lxTj
z6B9W(Io5PODO8f<uB!kAO>FR(XbdzqHs0Oc2~y54FE6BvMg>Aax~rKKS=1;bngpz^
ztrhCm*H_xb$;k-|k#u!++4%&a)F({XVa#&+lynA)n|aT0eSCb3d2RuvS;YDI`FMtK
zc6QbPG%ukAg9!|o_bjiQnwsQ~YHD$Ea<X6s1_q2IDJdx}EiHOW(26dGjJme#xw$zM
z_V)H{5gt!mT%3?jO-*TFc3Y66jv;@5MXgIuPX|ZW^hYbn&CSj3?k<<Dt*t{tL-FzP
zYRkz&$i<KeZ{ZM48xTF*1T|fDc6L5KK6<_0zP`Tm^K<g1tgOt0vAYy<F=U7Nl;7Uo
z63?EVo==g@s<^m#dwW~%ot!B!<>loz@J})1;4$<m`dC>+2<XRdfZwgHt-`{>%F4>6
zr6rzu&`e9TzmATM0GhsSr-qJ>j)0DhjX5Dz7-reY$;s#EXLKo#xw*M&%YOkmFbw%`
zSwx7^0*-#^kJd=2Km?|tp#cnSi)7b;g<K4oU=|KR4M>$clY+XetE;Q8uUD6{n4h1&
zyu4(skC2dyArpherIW%~R8&OFIojIVj1<w)(GL#~$Y*9|jB?{z6-HX2QEt0-(mGO8
zQyDoh%$a@}85s#3X|%Ag@b2c@n<lSaw+^VCG*{sj^E9Tbt1DS^-rU@bh={QK$H6pL
zh#Za|&CSh5KX8SIe|maa)60S!Kk&)nfEE=MH8?mZv7v|1TrC45!r%uq^qr5eOs?EA
zl8ISX<IPt`Sg6&IuO9+IGT{fTTk6Fl$RQsyB%pc?;+;W1>g!{pyn#?Ng=$ECZ~a>@
zisBSLsW?&Wc}yJsMPPtYk(7tzORufQ=s~UW3HERO*zkXTjxk1ynn@j(*AlrGmS+IK
z+`WAH%(#e<(Jg9mb#*nL^q7l%U-aImUebl*?CgwBdW>v;>64z(t<X9Yflve-MBo<+
W44=JP6ukcc0000<MNUMnLSTZ|eMt8J

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/earn@3x.png b/Telegram/Resources/icons/menu/earn@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ff7dd69b692ee566d75b9eb053c878a107fc7fa
GIT binary patch
literal 1839
zcmV+~2hjM5P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>nMp)JRA>e5noCGmPZY<s2V!KT
zf>8vP6$beL(@mRH#Gn>hLTzdh39Z_RiXbgqlm-bB*e0lrE>sW&SN7OsM7A=u2O3eU
z>_tjhVD<Soe-Fcb{bug({`&Wq`&;PTne+Ibb7$t9Idjv};$Q56*aNW#Vh_X~h&}Mv
zc_2L%h|<&3i;9XWD=QBiI8azvn4h1&Wy_YVtSodbE-rrl{Q1?ZSI?e3o1UJ&ckkYl
zCr^I<{Fw?Ek;%lK!-o&wxN+m{+qYmf{6P#0jIc)rB`QH+I(6#Q^XJbEjqxOd9U)Pf
z7lD(is;auWy2{JTJ>B%?&6^i5UVQxckx2*v6EZtHd*8l&J9qB%q@SFeY;JD8d-tyA
z=pX9by?giA*qGb>@7}$;b?esg<Hyyy@<hWB1du`OmVj7<dorfHlfA)#>Bo;B{r&y)
zuV263Ts_3FzzDl;A;Rf5mlF-;`Sa($fB&xI7#|-$c<^8{(qTu4E)x|fN=BvyFAlzT
z?V7HBZf@?#ks}r&0!a~tKwUoStfoMqc>h6%Rd?>($<596Cl51%KsFDDZD9nN^Dr@V
zeZ9TC8#Zh(XE&!rEW&kNDV&omWqn;WH8q(74M&Lzu?^KJ*-O}b^*s=GT45#ZHZ(Mx
zK7D%Q#*J2t`g;RF^f5q>SF9`B8At?IzGqvvG7LrfdIN?Pdjeu|3z-sZSs``{k`E=}
z>({Rdl(~jcr|*-1agl`TU=}@k^hgY|-PuW<T3cJceEA|0dU|^5>+7xFIZA~cFwx|b
zB&H&i0BY`>%*;$Orj?ZyVb>dvA3rWFEj5>>$8I2*GkR0v8_C&8dCYT*yu3WpS=|zM
zo3yyBtjt@ns~6Rha{(#Ym&P$k09md3zP>(Tr19ay2d2=(#KgkFg5Ll1>C<)V*14?k
z?f`)B0?eDpu$LoX2w8^?9TKi@-@ctYcTQFmW}H2HmMugGwr$&H2uAlZzzn%O$avjy
z7AA(6Cu|olUKHGIZEbGRM~@zT|NcERyjb_BUk?BzmI5sNY%DG=7JO_2e)`<~0|NuX
z=yw3!x^-)aXbTLH3_Q1L=?R+OdI~c<JS;p38|tvE$hL3a?n(dY)2Ej&UwRG&bm}m4
zcy5*;!>BO{gVjbqJ3A|k?d|Q9sN^xph7LoAXD3#2nb)shTXF8+zh6(6skEIudD47|
z2I~ThnvK8<rt}?Uswfd8hrUEU1D7sclEt7J0P5)Iz-Au~({8{hfgxt{zdB?K8XO!n
zRl7<@7Jv2XRflcr@xg-!XU?3F0I<qo`X4Y#4)9EQ9CU;rCF17In~ovF$GW<@nVA_+
z^9aqgwY7$FbTYswfxy%IE!xQ&hBBhfv17+r^pX&Xo%E0&TLAh^8i8Rl6^Dj~Y}LEz
z_w3oz+1aV$ve-uB#EBDb;(#8&DE9DEF`3Q75839;n+X8=DTYf4s~kc$kNNp|KP?IR
zLvQy9<ff&OOzP=kO-)Tg79lX)?t=m}@kfc{uozIR7M11=(){l3ZlNzJDUo(?0~k{D
z7kHj5L56XEB|KJ6<#KFvbaZ57L_mlfX*_)RP}&6r1=0>~=rDA6!CcPK&`I#r)RbD^
zT=4n5>I)Yx$QE+t$`z+>pJ($V*hj$c?$E~;u8st>XAIo5X%nRZp=oSv48pNG7TK`{
zf%-u+IGbM8{?GrGmKFg`<M!>_6%`fgq>QtwtE=zdzb^zt%N;v*=<I%N00>u72Tc^{
zhgS2_Kt@Ie3qU}q23tHEv;=(_y?ptypCyj|C`$u4I9xGj@7}$B$&{Ex<NEdMhBc3f
zi#hl#boq^iM1gvFd0Dqa+T@B>rO$}VZy3f)OQvATjWZV|k|;7EIlNFWK&)e?1w5vt
zV2ZxvOWcxYQ0opbz;h^7C2plG$x8`Y_uNi+qW9}e?WF`-sVGUZ&pNTaM&jJb9TGQ5
zRx=R2DZfTS2Vq37WUP^kKQ&d>=2fk-ZEaqzV;ig4VcQz{975)#zTVhQ2%zSdOiGC3
zFYJ00MkXp!__2UPy*#p)==&r%h{9~^q?cB;QHWuIQGz(4_#qq>qVA72hyi+hQ-BmE
z4o?5=M`9Lvji1lROA>z8$Hm{$(h?FV=H%q${OzChiK&ELa%DLO$g8tzz>W~x2rd{>
z*Z>o&g(IL`7n&HBqEBZdn2K&!VWIx9^R8XHsC=m6$N%zUXSaoMPwau%1F;8U55yjb
dJrK$RzW~e{XZ^XX@)-aC002ovPDHLkV1nJITYCTi

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 60fa215bf..862caf79d 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -53,6 +53,7 @@ menuIconManage: icon {{ "menu/manage", menuIconColor }};
 menuIconDiscussion: icon {{ "menu/discussion", menuIconColor }};
 menuIconStats: icon {{ "menu/stats", menuIconColor }};
 menuIconBoosts: icon {{ "menu/boosts", menuIconColor }};
+menuIconEarn: icon {{ "menu/earn", menuIconColor }};
 menuIconCreatePoll: icon {{ "menu/create_poll", menuIconColor }};
 menuIconQrCode: icon {{ "menu/qr_code", menuIconColor }};
 menuIconExpand: icon {{ "menu/expand", menuIconColor }};
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index d3920c5a5..924f0de8b 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -64,6 +64,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "info/channel_statistics/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/earn/info_earn_widget.h"
 #include "info/profile/info_profile_values.h"
 #include "info/statistics/info_statistics_widget.h"
 #include "info/stories/info_stories_widget.h"
@@ -1039,6 +1040,7 @@ void Filler::addViewStatistics() {
 		const auto peer = _peer;
 		using Flag = ChannelDataFlag;
 		const auto canGetStats = (channel->flags() & Flag::CanGetStatistics);
+		const auto canViewEarn = (channel->flags() & Flag::CanViewRevenue);
 		if (canGetStats) {
 			_addAction(tr::lng_stats_title(tr::now), [=] {
 				if (const auto strong = weak.get()) {
@@ -1062,6 +1064,13 @@ void Filler::addViewStatistics() {
 				}
 			}, &st::menuIconBoosts);
 		}
+		if (canViewEarn) {
+			_addAction(tr::lng_channel_earn_title(tr::now), [=] {
+				if (const auto strong = weak.get()) {
+					controller->showSection(Info::ChannelEarn::Make(peer));
+				}
+			}, &st::menuIconEarn);
+		}
 	}
 }
 

From 2f07bb397300d568408845488f930f34284032cc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 27 Mar 2024 23:36:29 +0300
Subject: [PATCH 169/596] Added initial support of withdraw button in channel
 earn info section.

---
 Telegram/CMakeLists.txt                       |  2 +
 Telegram/Resources/langs/lang.strings         |  6 +-
 Telegram/SourceFiles/api/api_earn.cpp         | 88 +++++++++++++++++++
 Telegram/SourceFiles/api/api_earn.h           | 29 ++++++
 .../data/data_sponsored_messages.cpp          | 18 ----
 .../data/data_sponsored_messages.h            | 10 ---
 .../earn/info_earn_inner_widget.cpp           | 30 +++++--
 7 files changed, 146 insertions(+), 37 deletions(-)
 create mode 100644 Telegram/SourceFiles/api/api_earn.cpp
 create mode 100644 Telegram/SourceFiles/api/api_earn.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 9ec116fd3..4988f34b3 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -120,6 +120,8 @@ PRIVATE
     api/api_common.h
     api/api_confirm_phone.cpp
     api/api_confirm_phone.h
+    api/api_earn.cpp
+    api/api_earn.h
     api/api_editing.cpp
     api/api_editing.h
     api/api_global_privacy.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index be00ea9c9..47f5d390b 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4979,9 +4979,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_reward" = "Proceeds since last withdrawal";
 "lng_channel_earn_total" = "Total lifetime proceeds";
 "lng_channel_earn_balance_title" = "Available balance";
-"lng_channel_earn_balance_placeholder" = "Enter your TON address";
 "lng_channel_earn_balance_button" = "Withdraw";
-"lng_channel_earn_balance_about" = "By the end of May, you will be able to collect your reward using Fragment, a third-party platform used by the advertiser to pay for the ad. {link}";
+"lng_channel_earn_balance_password_title" = "Two-step verification";
+"lng_channel_earn_balance_password_description" = "Please enter your password to withdraw.";
+"lng_channel_earn_balance_about" = "Collect your reward using Fragment, a third-party platform used by the advertiser to pay for the ad. {link}";
+"lng_channel_earn_balance_about_temp" = "By the end of May, you will be able to collect your reward using Fragment, a third-party platform used by the advertiser to pay for the ad. {link}";
 "lng_channel_earn_transfer_sure_about1" = "Check the address of the recipient:";
 "lng_channel_earn_transfer_sure_about2" = "This action can not be undone. If the address above is incorrect you will lose your TON.";
 "lng_channel_earn_history_title" = "Transaction history";
diff --git a/Telegram/SourceFiles/api/api_earn.cpp b/Telegram/SourceFiles/api/api_earn.cpp
new file mode 100644
index 000000000..e8f38e06b
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_earn.cpp
@@ -0,0 +1,88 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_earn.h"
+
+#include "api/api_cloud_password.h"
+#include "apiwrap.h"
+#include "boxes/passcode_box.h"
+#include "data/data_channel.h"
+#include "data/data_session.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/widgets/buttons.h"
+
+namespace Api {
+
+void RestrictSponsored(
+		not_null<ChannelData*> channel,
+		bool restricted,
+		Fn<void(QString)> failed) {
+	channel->session().api().request(MTPchannels_RestrictSponsoredMessages(
+		channel->inputChannel,
+		MTP_bool(restricted))
+	).done([=](const MTPUpdates &updates) {
+		channel->session().api().applyUpdates(updates);
+	}).fail([=](const MTP::Error &error) {
+		failed(error.type());
+	}).send();
+}
+
+void HandleWithdrawalButton(
+		not_null<ChannelData*> channel,
+		not_null<Ui::RippleButton*> button,
+		std::shared_ptr<Ui::Show> show) {
+	struct State {
+		rpl::lifetime lifetime;
+		bool loading = false;
+	};
+
+	const auto state = button->lifetime().make_state<State>();
+	const auto session = &channel->session();
+
+	session->api().cloudPassword().reload();
+	button->setClickedCallback([=] {
+		if (state->loading) {
+			return;
+		}
+		state->loading = true;
+		state->lifetime = session->api().cloudPassword().state(
+		) | rpl::take(
+			1
+		) | rpl::start_with_next([=](const Core::CloudPasswordState &pass) {
+			state->loading = false;
+
+			auto fields = PasscodeBox::CloudFields::From(pass);
+			fields.customTitle =
+				tr::lng_channel_earn_balance_password_title();
+			fields.customDescription =
+				tr::lng_channel_earn_balance_password_description(tr::now);
+			fields.customSubmitButton = tr::lng_passcode_submit();
+			fields.customCheckCallback = crl::guard(button, [=](
+					const Core::CloudPasswordResult &result) {
+				session->api().request(
+					MTPstats_GetBroadcastRevenueWithdrawalUrl(
+						channel->inputChannel,
+						result.result
+				)).done([=](const MTPstats_BroadcastRevenueWithdrawalUrl &r) {
+					const auto url = qs(r.data().vurl());
+
+					if (!url.isEmpty()) {
+						UrlClickHandler::Open(url);
+					}
+				}).fail([=](const MTP::Error &error) {
+					show->showToast(error.type());
+				}).send();
+			});
+			show->show(Box<PasscodeBox>(session, fields));
+		});
+
+	});
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_earn.h b/Telegram/SourceFiles/api/api_earn.h
new file mode 100644
index 000000000..93f2bf6eb
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_earn.h
@@ -0,0 +1,29 @@
+/*
+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 ChannelData;
+
+namespace Ui {
+class RippleButton;
+class Show;
+} // namespace Ui
+
+namespace Api {
+
+void RestrictSponsored(
+	not_null<ChannelData*> channel,
+	bool restricted,
+	Fn<void(QString)> failed);
+
+void HandleWithdrawalButton(
+	not_null<ChannelData*> channel,
+	not_null<Ui::RippleButton*> button,
+	std::shared_ptr<Ui::Show> show);
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index a88111fbe..ae37e9191 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -566,21 +566,3 @@ SponsoredMessages::State SponsoredMessages::state(
 }
 
 } // namespace Data
-
-namespace Api {
-
-void RestrictSponsored(
-		not_null<ChannelData*> channel,
-		bool restricted,
-		Fn<void(QString)> failed) {
-	channel->session().api().request(MTPchannels_RestrictSponsoredMessages(
-		channel->inputChannel,
-		MTP_bool(restricted))
-	).done([=](const MTPUpdates &updates) {
-		channel->session().api().applyUpdates(updates);
-	}).fail([=](const MTP::Error &error) {
-		failed(error.type());
-	}).send();
-}
-
-} // namespace Api
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.h b/Telegram/SourceFiles/data/data_sponsored_messages.h
index e124dd1d4..04f0cd196 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.h
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.h
@@ -158,13 +158,3 @@ private:
 };
 
 } // namespace Data
-
-namespace Api {
-
-void RestrictSponsored(
-	not_null<ChannelData*> channel,
-	bool restricted,
-	Fn<void(QString)> failed);
-
-} // namespace Api
-
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 44f124c0b..5a961819a 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/channel_statistics/earn/info_earn_inner_widget.h"
 
+#include "api/api_earn.h"
 #include "api/api_statistics.h"
 #include "base/random.h"
 #include "base/unixtime.h"
@@ -17,13 +18,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
-#include "data/data_sponsored_messages.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "info/channel_statistics/earn/info_earn_widget.h"
 #include "info/info_controller.h"
 #include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
 #include "info/statistics/info_statistics_inner_widget.h" // FillLoading.
 #include "lang/lang_keys.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "statistics/chart_widget.h"
 #include "ui/boxes/boost_box.h"
@@ -36,6 +37,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/continuous_sliders.h"
+#include "main/main_account.h"
+#include "main/main_app_config.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
@@ -97,6 +100,11 @@ constexpr auto kDot = QChar('.');
 		+ MinorPart(result);
 }
 
+[[nodiscard]] bool WithdrawalEnabled(not_null<Main::Session*> session) {
+	const auto key = u"channel_revenue_withdrawal_enabled"_q;
+	return session->appConfig().get<bool>(key, false);
+}
+
 void AddHeader(
 		not_null<Ui::VerticalLayout*> content,
 		tr::phrase<> text) {
@@ -211,6 +219,8 @@ void InnerWidget::fill() {
 	const auto multiplier = data.usdRate;
 
 	const auto session = &_peer->session();
+	const auto channel = _peer->asChannel();
+	const auto withdrawalEnabled = WithdrawalEnabled(session);
 	const auto makeContext = [=](not_null<Ui::FlatLabel*> l) {
 		return Core::MarkedTextContext{
 			.session = session,
@@ -511,7 +521,7 @@ void InnerWidget::fill() {
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
-	{
+	if (channel) {
 		const auto value = data.availableBalance;
 		Ui::AddSkip(container);
 		AddHeader(container, tr::lng_channel_earn_balance_title);
@@ -591,15 +601,21 @@ void InnerWidget::fill() {
 					stButton.textFg->c,
 					anim::interpolateF(.5, 1., value)));
 		};
-		colorText(1.);
+		colorText(withdrawalEnabled ? 1. : 0.);
+#ifndef _DEBUG
+		button->setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			!withdrawalEnabled);
+#endif
 
-		button->setClickedCallback([=] {
-		});
+		Api::HandleWithdrawalButton(channel, button, _controller->uiShow());
 		Ui::ToggleChildrenVisibility(button, true);
 
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
-		addAboutWithLearn(tr::lng_channel_earn_balance_about);
+		addAboutWithLearn(withdrawalEnabled
+			? tr::lng_channel_earn_balance_about
+			: tr::lng_channel_earn_balance_about_temp);
 		Ui::AddSkip(container);
 	}
 	Ui::AddSkip(container);
@@ -844,7 +860,7 @@ void InnerWidget::fill() {
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
-	if (const auto channel = _peer->asChannel()) {
+	if (channel) {
 		constexpr auto kMaxCPM = 50; // Debug.
 		const auto requiredLevel = Data::LevelLimits(session)
 			.channelRestrictSponsoredLevelMin();

From 496247c1d8e0980a766a7507994df9998b5b3dfc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 28 Mar 2024 03:55:35 +0300
Subject: [PATCH 170/596] Added ability to load chunked history transactions in
 earn info section.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 Telegram/SourceFiles/api/api_statistics.cpp   | 12 +--
 Telegram/SourceFiles/api/api_statistics.h     |  6 +-
 .../earn/info_earn_inner_widget.cpp           | 99 ++++++++++++++++---
 4 files changed, 95 insertions(+), 24 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 47f5d390b..32888bec3 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4995,6 +4995,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_history_return" = "Refund";
 "lng_channel_earn_history_return_about" = "Refunded back";
 "lng_channel_earn_history_pending" = "Pending";
+"lng_channel_earn_history_show_more#one" = "Show {count} More Transaction";
+"lng_channel_earn_history_show_more#other" = "Show {count} More Transactions";
 "lng_channel_earn_off" = "Switch Off Ads";
 "lng_channel_earn_off_about" = "You will not be eligible for any rewards if you switch off ads.";
 "lng_channel_earn_cpm_min" = "No Ads";
diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index 2779c7900..9bc31c483 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -771,7 +771,7 @@ rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
 				.usdRate = data.vusd_rate().v,
 			};
 
-			requestBoosts({}, [=](Data::EarnHistorySlice &&slice) {
+			requestHistory({}, [=](Data::EarnHistorySlice &&slice) {
 				_data.firstHistorySlice = std::move(slice);
 
 				api().request(
@@ -795,7 +795,7 @@ rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
 	};
 }
 
-void EarnStatistics::requestBoosts(
+void EarnStatistics::requestHistory(
 		const Data::EarnHistorySlice::OffsetToken &token,
 		Fn<void(Data::EarnHistorySlice)> done) {
 	if (_requestId) {
@@ -831,11 +831,9 @@ void EarnStatistics::requestBoosts(
 						: d.is_failed()
 						? Data::EarnHistoryEntry::Status::Failed
 						: Data::EarnHistoryEntry::Status::Success,
-					.amount = d.is_failed()
-						? (std::numeric_limits<Data::EarnInt>::max()
-							- d.vamount().v
-							+ 1)
-						: d.vamount().v,
+					.amount = (std::numeric_limits<Data::EarnInt>::max()
+						- d.vamount().v
+						+ 1),
 					.date = base::unixtime::parse(d.vdate().v),
 					// .provider = qs(d.vprovider()),
 					.successDate = d.vtransaction_date()
diff --git a/Telegram/SourceFiles/api/api_statistics.h b/Telegram/SourceFiles/api/api_statistics.h
index cf48d3cf2..f18cba71d 100644
--- a/Telegram/SourceFiles/api/api_statistics.h
+++ b/Telegram/SourceFiles/api/api_statistics.h
@@ -113,14 +113,14 @@ public:
 	explicit EarnStatistics(not_null<ChannelData*> channel);
 
 	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
-	void requestBoosts(
+	void requestHistory(
 		const Data::EarnHistorySlice::OffsetToken &token,
 		Fn<void(Data::EarnHistorySlice)> done);
 
 	[[nodiscard]] Data::EarnStatistics data() const;
 
-	static constexpr auto kFirstSlice = int(10);
-	static constexpr auto kLimit = int(40);
+	static constexpr auto kFirstSlice = int(5);
+	static constexpr auto kLimit = int(10);
 
 private:
 	Data::EarnStatistics _data;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 5a961819a..b21b13a6d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -31,14 +31,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/animation_value_f.h"
 #include "ui/effects/fade_animation.h"
+#include "ui/effects/toggle_arrow.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/continuous_sliders.h"
-#include "main/main_account.h"
-#include "main/main_app_config.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
@@ -48,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
 #include "styles/style_statistics.h"
+#include "styles/style_window.h" // mainMenuToggleFourStrokes.
 
 #include <QtWidgets/QApplication>
 
@@ -105,6 +105,27 @@ constexpr auto kDot = QChar('.');
 	return session->appConfig().get<bool>(key, false);
 }
 
+void AddArrow(not_null<Ui::RpWidget*> parent) {
+	const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
+	arrow->paintRequest(
+	) | rpl::start_with_next([=](const QRect &r) {
+		auto p = QPainter(arrow);
+
+		const auto path = Ui::ToggleUpDownArrowPath(
+			st::statisticsShowMoreButtonArrowSize,
+			st::statisticsShowMoreButtonArrowSize,
+			st::statisticsShowMoreButtonArrowSize,
+			st::mainMenuToggleFourStrokes,
+			0.);
+
+		auto hq = PainterHighQualityEnabler(p);
+		p.fillPath(path, st::lightButtonFg);
+	}, arrow->lifetime());
+	arrow->resize(Size(st::statisticsShowMoreButtonArrowSize * 2));
+	arrow->move(st::statisticsShowMoreButtonArrowPosition);
+	arrow->show();
+}
+
 void AddHeader(
 		not_null<Ui::VerticalLayout*> content,
 		tr::phrase<> text) {
@@ -625,13 +646,15 @@ void InnerWidget::fill() {
 		AddHeader(container, tr::lng_channel_earn_history_title);
 		Ui::AddSkip(container);
 
-		const auto addHistoryEntry = [&](
+		const auto historyList = container->add(
+			object_ptr<Ui::VerticalLayout>(container));
+		const auto addHistoryEntry = [=](
 				const Data::EarnHistoryEntry &entry,
 				const tr::phrase<> &text) {
-			const auto wrap = container->add(
+			const auto wrap = historyList->add(
 				object_ptr<Ui::PaddingWrap<Ui::VerticalLayout>>(
-					container,
-					object_ptr<Ui::VerticalLayout>(container),
+					historyList,
+					object_ptr<Ui::VerticalLayout>(historyList),
 					QMargins()));
 			const auto inner = wrap->entity();
 			inner->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -847,14 +870,62 @@ void InnerWidget::fill() {
 				button->lower();
 			}, wrap->lifetime());
 		};
-		for (const auto &entry : data.firstHistorySlice.list) {
-			addHistoryEntry(
-				entry,
-				(entry.type == Data::EarnHistoryEntry::Type::In)
-					? tr::lng_channel_earn_history_in
-					: (entry.type == Data::EarnHistoryEntry::Type::Return)
-					? tr::lng_channel_earn_history_return
-					: tr::lng_channel_earn_history_out);
+		const auto handleSlice = [=](const Data::EarnHistorySlice &slice) {
+			for (const auto &entry : slice.list) {
+				addHistoryEntry(
+					entry,
+					(entry.type == Data::EarnHistoryEntry::Type::In)
+						? tr::lng_channel_earn_history_in
+						: (entry.type == Data::EarnHistoryEntry::Type::Return)
+						? tr::lng_channel_earn_history_return
+						: tr::lng_channel_earn_history_out);
+			}
+			historyList->resizeToWidth(container->width());
+		};
+		handleSlice(data.firstHistorySlice);
+		if (!data.firstHistorySlice.allLoaded) {
+			struct ShowMoreState final {
+				ShowMoreState(not_null<ChannelData*> channel)
+				: api(channel) {
+				}
+				Api::EarnStatistics api;
+				bool loading = false;
+				Data::EarnHistorySlice::OffsetToken token;
+				rpl::variable<int> showed = 0;
+			};
+			const auto state = lifetime().make_state<ShowMoreState>(channel);
+			state->token = data.firstHistorySlice.token;
+			state->showed = data.firstHistorySlice.list.size();
+			const auto max = data.firstHistorySlice.total;
+			const auto wrap = container->add(
+				object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+					container,
+					object_ptr<Ui::SettingsButton>(
+						container,
+						tr::lng_channel_earn_history_show_more(
+							lt_count,
+							state->showed.value(
+							) | rpl::map(
+								max - rpl::mappers::_1
+							) | tr::to_count()),
+						st::statisticsShowMoreButton)));
+			const auto button = wrap->entity();
+			AddArrow(button);
+
+			wrap->toggle(true, anim::type::instant);
+			const auto handleReceived = [=](Data::EarnHistorySlice slice) {
+				state->loading = false;
+				handleSlice(slice);
+				wrap->toggle(!slice.allLoaded, anim::type::instant);
+				state->token = slice.token;
+				state->showed = state->showed.current() + slice.list.size();
+			};
+			button->setClickedCallback([=] {
+				if (!state->loading) {
+					state->loading = true;
+					state->api.requestHistory(state->token, handleReceived);
+				}
+			});
 		}
 	}
 	Ui::AddSkip(container);

From 1a7a906ced2bd1aadcc2f7fb9eaedfbb656342e3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 28 Mar 2024 04:33:42 +0300
Subject: [PATCH 171/596] Added ability to review history entry in channel earn
 info section.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../earn/info_earn_inner_widget.cpp           | 43 ++++++++++++++++---
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 32888bec3..9cd62fde0 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4992,6 +4992,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_history_out" = "Withdrawal";
 "lng_channel_earn_history_out_failed" = "Not Completed";
 "lng_channel_earn_history_out_about_failed" = "Withdrawal failed";
+"lng_channel_earn_history_out_button" = "View in Blockchain Explorer";
 "lng_channel_earn_history_return" = "Refund";
 "lng_channel_earn_history_return_about" = "Refunded back";
 "lng_channel_earn_history_pending" = "Pending";
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index b21b13a6d..b79a6855e 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -9,13 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_earn.h"
 #include "api/api_statistics.h"
-#include "base/random.h"
-#include "base/unixtime.h"
 #include "boxes/peers/edit_peer_color_box.h" // AddLevelBadge.
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_channel.h"
-#include "data/data_peer.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/stickers/data_custom_emoji.h"
@@ -24,20 +21,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
 #include "info/statistics/info_statistics_inner_widget.h" // FillLoading.
 #include "lang/lang_keys.h"
+#include "ui/widgets/popup_menu.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "statistics/chart_widget.h"
+#include "ui/basic_click_handlers.h"
 #include "ui/boxes/boost_box.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/animation_value_f.h"
-#include "ui/effects/fade_animation.h"
 #include "ui/effects/toggle_arrow.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
-#include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
@@ -105,6 +102,16 @@ constexpr auto kDot = QChar('.');
 	return session->appConfig().get<bool>(key, false);
 }
 
+void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(box.get());
+	menu->addAction(tr::lng_context_copy_link(tr::now), [=] {
+		TextUtilities::SetClipboardText(TextForMimeData::Simple(text));
+		box->uiShow()->showToast(tr::lng_background_link_copied(tr::now));
+	});
+	menu->popup(QCursor::pos());
+}
+
+
 void AddArrow(not_null<Ui::RpWidget*> parent) {
 	const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
 	arrow->paintRequest(
@@ -842,6 +849,32 @@ void InnerWidget::fill() {
 						p.drawRoundedRect(rect, radius, radius);
 					}, peerBubble->lifetime());
 				}
+				{
+					const auto &st = st::premiumPreviewDoubledLimitsBox;
+					box->setStyle(st);
+					auto button = object_ptr<Ui::RoundButton>(
+						container,
+						(!entry.successLink.isEmpty())
+							? tr::lng_channel_earn_history_out_button()
+							: tr::lng_box_ok(),
+						st::defaultActiveButton);
+					button->resizeToWidth(box->width()
+						- st.buttonPadding.left()
+						- st.buttonPadding.left());
+					if (!entry.successLink.isEmpty()) {
+						button->setAcceptBoth();
+						button->addClickHandler([=](Qt::MouseButton button) {
+							if (button == Qt::LeftButton) {
+								UrlClickHandler::Open(entry.successLink);
+							} else if (button == Qt::RightButton) {
+								ShowMenu(box, entry.successLink);
+							}
+						});
+					} else {
+						button->setClickedCallback([=] { box->closeBox(); });
+					}
+					box->addButton(std::move(button));
+				}
 				Ui::AddSkip(box->verticalLayout());
 				Ui::AddSkip(box->verticalLayout());
 				box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });

From 586983eb9bf32b55605a1e02b25cbba29e583421 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 28 Mar 2024 04:53:23 +0300
Subject: [PATCH 172/596] Added divider text to box for reporting of sponsored
 messages.

---
 Telegram/Resources/langs/lang.strings        |  1 +
 Telegram/SourceFiles/menu/menu_sponsored.cpp | 21 +++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9cd62fde0..a5ba2a744 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1578,6 +1578,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_report_sponsored_hidden" = "Sponsored messages will be hidden.";
 "lng_report_sponsored_reported" = "We will review this ad to ensure it matches out {link}.";
 "lng_report_sponsored_reported_link" = "Ad Policies and Guidelines";
+"lng_report_sponsored_reported_learn" = "Learn more about our {link}.";
 
 "lng_channel_add_members" = "Add members";
 "lng_channel_add_users" = "Add users";
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 97be48253..41e72a432 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -219,6 +219,9 @@ void ShowReportSponsoredBox(
 	auto &sponsoredMessages = peer->session().data().sponsoredMessages();
 	const auto fullId = item->fullId();
 	const auto report = sponsoredMessages.createReportCallback(fullId);
+	const auto guideLink = Ui::Text::Link(
+		tr::lng_report_sponsored_reported_link(tr::now),
+		u"https://promote.telegram.org/guidelines"_q);
 
 	auto performRequest = [=](
 			const auto &repeatRequest,
@@ -245,6 +248,20 @@ void ShowReportSponsoredBox(
 						box->addLeftButton(
 							tr::lng_create_group_back(),
 							[=] { box->closeBox(); });
+					} else {
+						const auto container = box->verticalLayout();
+						Ui::AddSkip(container);
+						container->add(object_ptr<Ui::DividerLabel>(
+							container,
+							object_ptr<Ui::FlatLabel>(
+								container,
+								tr::lng_report_sponsored_reported_learn(
+									lt_link,
+									rpl::single(guideLink),
+									Ui::Text::WithEntities),
+								st::boxDividerLabel),
+							st::defaultBoxDividerLabelPadding,
+							RectPart::Top | RectPart::Bottom));
 					}
 					box->addButton(
 						tr::lng_close(),
@@ -259,9 +276,7 @@ void ShowReportSponsoredBox(
 					auto text = tr::lng_report_sponsored_reported(
 						tr::now,
 						lt_link,
-						Ui::Text::Link(
-							tr::lng_report_sponsored_reported_link(tr::now),
-							u"https://promote.telegram.org/guidelines"_q),
+						guideLink,
 						Ui::Text::WithEntities);
 					show->showToast({ .text = std::move(text) });
 				} break;

From 1563a85fea7b8e2540e626013cd3ecea652e231b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 28 Mar 2024 05:13:59 +0300
Subject: [PATCH 173/596] Improved style for right action of forwarded
 messages.

---
 .../Resources/icons/filled_go_to_message.png     | Bin 0 -> 596 bytes
 .../Resources/icons/filled_go_to_message@2x.png  | Bin 0 -> 1097 bytes
 .../Resources/icons/filled_go_to_message@3x.png  | Bin 0 -> 1607 bytes
 Telegram/SourceFiles/ui/chat/chat.style          |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 Telegram/Resources/icons/filled_go_to_message.png
 create mode 100644 Telegram/Resources/icons/filled_go_to_message@2x.png
 create mode 100644 Telegram/Resources/icons/filled_go_to_message@3x.png

diff --git a/Telegram/Resources/icons/filled_go_to_message.png b/Telegram/Resources/icons/filled_go_to_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..19ad56f87621e2af205a71d539f7fa94ca293e46
GIT binary patch
literal 596
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY@er#V~B;|
z(<yt`F$RjXdYT9YUU;Ee!C=3%#mRNcB7s(~l>$@K?lpF`o#O8BQV#40TQs5LN9G@O
zmXkYP$8Ac#Z>ui%;9l_Bz2ARbn_1kmG2-8wO?4JCFTdnrYnJP0pLaIRSgO}=`DOO~
zNg~}xtM=Y|{IOzFtB`MxNW;#j1s1p7njIG1bT#W>T3T=4-8^|7Hm)mInt0QiMONL+
znKdDOZ(RTJ$ETkL^+@%$9k`#WA#$lSc1K{=EVlOZ&!g9d)o>XLxQ49_du(@!fvc5?
zVgG&oO${1N%Pwmk6e!=8w>?^KI<qhb%eB|0H-W->)445$I$I8XyxirsIEC5COnT+(
zuU_^neEaXe&txgIo3B2Zv*r5hrFQ&_mZe(ATnclN;cG9j;K{a{d#p2)>&OGoP%Y7-
zf<hZP<%t|QD?_@L9|+c)&S~Cq`suB=Wj2qNb{|#pIhi69es1~gx7Xg5N!x_q%$XJ)
zzw7?{@YSIcn*`6ynY!!t+gY1k*z?0yhD=(rLcF{6fQ#kqvvzxA-f!_y`+Vrb&J)i+
z&-F{UoBudqM{-Vs(D98od(7MHkF4jH{>Qb$eo4>qWTVKn_vLaN=KfdP$6#F?xk$k+
ReIqDFJzf1=);T3K0RX@k?pgo<

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/filled_go_to_message@2x.png b/Telegram/Resources/icons/filled_go_to_message@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdc4724522bb53f9526e4bc8ad2c9b4d4435dea1
GIT binary patch
literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFvq?ljR9Fe^Sj#K4Q5ZLqjk{P-
zBdf`sTpC+N%G4mX{s39YR&1G#okWrp5)umwD})*>Y-}XgTxW#h!w|k-rk+mop7%ND
zow4}pn|JlR&-1%H?{RJ;E-v=OMj$o<|JexGBKuyu-R^R^YHDg64oCLS^ZosOdwY9x
zb8~rlxxT)>ySw}K^%a@8HCA0+-SqVI-Q68JU>*Pf1K66nC3Jm#{pRK-(}c7H3W%1B
z)Zo<A)Y;itsh?&Nbcm>(bP(m`<%frdn#K$aB9PK?<S^CM)z8n*jE$udq#(%o@wL3X
zyg(pe$x;c1AY^%8c@=;1lamvr0RULu{r&w74Gl9hGdg(4MlzoU1_pH0f${l#^i6|<
zgE}mT6Gba1Dk}Q;_|TCCW^HYaL~S<P(9n>Q2ys{tOC8M3%_&7iKx=C&iK3_B;bE~V
zjbT9)MUaw`^7{HJRWVDxzrQy(H<K=U8W|Ze1BddkNKQ^B3Kz7sweecgYA_gVY-}W5
z^fWp;Dn(KfMug{r$;nCLSPIaS$KxSs^fWd$#wfsuz+Au_SXkkI*ysNKzP7fO)Nv^o
zA0IdCX=7u9kX&$jdMcGzTwF{~Pv@Aj8hV<apO*^4NX9Va-rnA%{L<1=16C`6BTOm?
zBO~8#Og%n68k5LGxaFG@A08fzM)Ahf)zwv2R+cf38CqFcd3}8yR>I^JGdnvw+uPfe
z!MI|pq*pPxxVR8sP2;7dCFuz3Byo97N=hQ>l9Cd?-)}}-SXdw=7j$-Zno00^tQxVK
z;^Jba8%T9^b#Z-AEjKrpH<nhhS%^C?jw;;wrN~ecJ4jAW4w)(f9N>(Wv9z_dg#(8~
z3kwVJ^TP-eGrF5lNYw3ii)21NJ3ABaHw6U+nD{&eRq>pmFX4ifl@+CE2rw}*K|=ZY
z`B<b%;_~t`QFH?gyXI~B{QNv4BLlji=yZc~-syDe_95b$nwma8Kb4;g0B*{wtE(?B
zFG?^3TUuH~7i)2Mcem2R5}>`ko$o+$bch6ey7(GRjLS(!M+Yu$(TK$1_qnA3FasYQ
z9aU9TMb!$(IHYtYsaX@D{L|Bu*XvD7ON+J}@NrEJGsCb?O-&siABW|ouh<*=`uZ|6
zGk>8KNMPqZI5-fUupQ&D45^oumG$=aVmsN}+k-LI4vqp$xc&WoY+zUl6%`d>w}5Ed
z>gnl0H?YA!32=YF#e-3d|9Kd|FO(7!6S3_kBqaQTR!kx`0<jVJmqy?(CE3)se|U_U
P00000NkvXXu0mjftP9?z

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/filled_go_to_message@3x.png b/Telegram/Resources/icons/filled_go_to_message@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a6bde9b8641498007ff4a03546ef6671ceb6c3b
GIT binary patch
literal 1607
zcmV-N2Dtf&P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS=u}MThRA>e5T3IM=Ulcc7B=f99
z#s_66^KcOvQc@mFujGM{AqkN;lGM!;c~GA4aG!*DkU}mQ5*~;QT@Nx{^L&4$dpdXT
z?>lFo{hiPM{_A`%_FjAK-}<d}&R%ElwV9Y`KP>`U1hfcf5zr!_ML>(dXGOr&*oI6^
zO<i1E?Ck7pZEa!e=H}-5`ugnb?EU@SsHTnLn76lgc6N3~Mn-UOu)n{*wY4?j!~OmJ
z-rnB!_V(1&)cE-L(a{m1@NadKl9IZ+yEivC@iY|uFa;Aa{onEjY%()5=jP@VIiph<
zAb|QO+`}uku&|($CAScOfc?+hb98k4{{1^Qd)bKqhl$U2FDfbut6!F!feJ7IL!akc
zRaMpF<D-G38K=V#%zcJ$9UUEvoK#eUQRDhnU0tmrT}4nZZ7kmk3k%=g-W0J>Q5mK|
zKz-j*Qc?_ASD-aCG*nhr*3;92Z3myjAOIR_`etQiwX?Is$L3>}H~~aNM11TOIRHTe
zWK{F5rKN>~gfQjq?(WN%FJd<E?fm>)P*BupZf+Js@wc&~y}i9vWSda__3M|JnHj+#
zGBWbw;)2j*>4FR>5okQ!k&zJ=d(t|^#l^I3e0=$Q10@<wnIteUP?b!GGuYR!UuoOX
z(b1Qem(oF@M?ne1Xfy?quC6W`mrnxU5)%_?+p)2+S65d`F+q%mQXn}#K2~Z{LLZAQ
zAt8Y_9~T#=)He{Laabjxp`j8i`G(*d+@Kl6$H!wx5hm!-I82h-+FC`H7?tsG@cPjV
z@G$YZGJ-%2^k@)4LS|uM0FAJ)FmYF{w!OXm<m6;bObh`yKR=K2C8|AyTwhn3o>VdC
z$B!S#TKaIs@|Twvd|t#7aU0PUcR$)lhB-MosCE!TsC=NjV`F1O$m#CV(h?mVT1|(9
zC39foS5i_!*P(R4F^d@YrTqDWWi_|9wlWh|pxEBtF1y%3PXVG>6)%`9y3Q0Q2H|Vt
zg_Jc7dJ^DL$wOk<2#5gz0YY2F1`8~Enjwj?tg-$5eIFkma;9N@H#fJ#!$a981|11I
zf1M@>y@P`TFE1}bNOXODeYdu@W@l${#3F`dyPch#bXG*6e|mbFW&h4!7#|oIkPRER
zLVbNb?K!+!TU%qq?C<ZV5tt-6$urtes@BlZKr?W5c3xdwWrwP$sGvcZB<}9+udlD{
zmKZe~8yji!PEJlMD=Ul$A8H1jTxMow6d99MZfa`M>DBV`vg};3!tU-ajiW%KZXpr1
z6WTTk^w=DUNwc)u+S+I+1rlV%r>7?tOR_pT_b3hy4%m^(&LtG^X_igb@=kvH_Km>h
z=mLbcgl+!f;vxqce?AnGK(gX1xd@D(pP%X7I=te$SVP^;)zwwZkiT75S0}LKXn+b~
z8+YwEeQ`ixN_lxXfyUppw6w%UI3JIXS;@)Cf_ZqweXom80$rjMka-$GK|$QLTln_#
z=g<87d{0l$)YMe=y#*0UoKwQX!+F?C&jBa3G9<y6rHdPhw6rv7hWw+YrKKz+RM)`<
zsGy*LpEt|QlamwGdCLM;R#vib<Ja-<@Q@{;t^&R^d3kyKj2UO<=H{x)TN({pEk8d$
zMs5bF_4V~hQ&DRa*ABhCz4*)+M3-^0xw$#Awp!Hn;lQQQ(NXDQC?jE3HQaIOV*@!#
z0|s6=A@vOp4~K+=uo6;54|lEW>+AX)8yp<Ozayglfi3*T#)dvMopO|1CnhFpYHC<2
zQ>ys#7l^)#G92d9)6@S_H8DZ*EGjC(KM0JCjp0OyJ7}>>4-XHxBZo6kK(SukDl)-D
zri;rF;x$9b5%;B8Sy?hO{|sY&;y{U?g@wf*nQ{M0mEQ!*r>CbViQ)8tDk6f7V>~va
zc!dN7*#_1RZXsmVGzBdJS_HHRXc5pNphZB7!2dD=zX3`O#u#HP0&xHU002ovPDHLk
FV1nnb+w%Yb

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index b1307c8b7..3634be953 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -574,7 +574,7 @@ historyFastShareSize: 31px;
 historyFastShareLeft: 13px;
 historyFastShareBottom: 5px;
 historyFastShareIcon: icon {{ "fast_share", msgServiceFg }};
-historyGoToOriginalIcon: icon {{ "fast_to_original", msgServiceFg, point(1px, 0px) }};
+historyGoToOriginalIcon: icon {{ "filled_go_to_message", msgServiceFg, point(0px, 0px) }};
 historyFastCommentsIcon: icon {{ "fast_comments", msgServiceFg }};
 historyFastCloseSize: 30px;
 historyFastCloseIcon: icon {{ "box_button_close", msgServiceFg }};

From 3311a50750bd2c1e1174e7d875051c35c77d2dfa Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 28 Mar 2024 06:40:16 +0300
Subject: [PATCH 174/596] Added second rulers to currency chart in channel earn
 info section.

---
 .../SourceFiles/data/data_statistics_chart.h  |  2 +-
 .../channel_statistics/earn/earn_format.cpp   | 58 +++++++++++++++++++
 .../channel_statistics/earn/earn_format.h     | 18 ++++++
 .../earn/info_earn_inner_widget.cpp           | 52 ++---------------
 .../statistics/chart_rulers_data.cpp          | 20 +++----
 .../statistics/chart_rulers_data.h            |  3 +-
 .../statistics_data_deserialize.cpp           |  7 ---
 .../statistics/view/chart_rulers_view.cpp     | 37 +++++++++---
 .../statistics/view/chart_rulers_view.h       |  3 +
 .../widgets/point_details_widget.cpp          |  4 +-
 Telegram/cmake/td_ui.cmake                    |  3 +
 11 files changed, 131 insertions(+), 76 deletions(-)
 create mode 100644 Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
 create mode 100644 Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h

diff --git a/Telegram/SourceFiles/data/data_statistics_chart.h b/Telegram/SourceFiles/data/data_statistics_chart.h
index 48309e49f..5a29ebef7 100644
--- a/Telegram/SourceFiles/data/data_statistics_chart.h
+++ b/Telegram/SourceFiles/data/data_statistics_chart.h
@@ -65,7 +65,7 @@ struct StatisticalChart {
 	bool isFooterHidden = false;
 	bool hasPercentages = false;
 	bool weekFormat = false;
-	bool isCurrency = false;
+	float64 currencyRate = 0.;
 
 	// View data.
 	int dayStringMaxWidth = 0;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
new file mode 100644
index 000000000..e79fa89ce
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
@@ -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
+*/
+#include "info/channel_statistics/earn/earn_format.h"
+
+namespace Info::ChannelEarn {
+
+using EarnInt = Data::EarnInt;
+
+constexpr auto kMinorPartLength = 9;
+constexpr auto kZero = QChar('0');
+constexpr auto kDot = QChar('.');
+
+QString MajorPart(EarnInt value) {
+	const auto string = QString::number(value);
+	const auto diff = int(string.size()) - kMinorPartLength;
+	return (diff <= 0) ? QString(kZero) : string.mid(0, diff);
+}
+
+QString MinorPart(EarnInt value) {
+	if (!value) {
+		return QString(kDot) + kZero + kZero;
+	}
+	const auto string = QString::number(value);
+	const auto diff = int(string.size()) - kMinorPartLength;
+	const auto result = (diff < 0)
+		? kDot + u"%1"_q.arg(0, std::abs(diff), 10, kZero) + string
+		: kDot + string.mid(diff);
+	const auto begin = (result.constData());
+	const auto end = (begin + result.size());
+	auto ch = end - 1;
+	auto zeroCount = 0;
+	while (ch != begin) {
+		if ((*ch) == kZero) {
+			zeroCount++;
+		} else {
+			break;
+		}
+		ch--;
+	}
+	return result.chopped(zeroCount);
+}
+
+QString ToUsd(EarnInt value, float64 rate) {
+	constexpr auto kApproximately = QChar(0x2248);
+	const auto multiplier = EarnInt(rate * Data::kEarnMultiplier);
+	const auto result = (value * multiplier) / Data::kEarnMultiplier;
+	return QString(kApproximately)
+		+ QChar('$')
+		+ MajorPart(result)
+		+ MinorPart(result);
+}
+
+} // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h
new file mode 100644
index 000000000..4a7b401ab
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h
@@ -0,0 +1,18 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_channel_earn.h"
+
+namespace Info::ChannelEarn {
+
+[[nodiscard]] QString MajorPart(Data::EarnInt value);
+[[nodiscard]] QString MinorPart(Data::EarnInt value);
+[[nodiscard]] QString ToUsd(Data::EarnInt value, float64 rate);
+
+} // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index b79a6855e..fb190736c 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -16,12 +16,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "info/channel_statistics/earn/earn_format.h"
 #include "info/channel_statistics/earn/info_earn_widget.h"
 #include "info/info_controller.h"
 #include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
 #include "info/statistics/info_statistics_inner_widget.h" // FillLoading.
 #include "lang/lang_keys.h"
-#include "ui/widgets/popup_menu.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "statistics/chart_widget.h"
@@ -36,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
 #include "styles/style_channel_earn.h"
@@ -53,50 +54,6 @@ namespace {
 
 using EarnInt = Data::EarnInt;
 
-constexpr auto kMinorPartLength = 9;
-constexpr auto kZero = QChar('0');
-constexpr auto kDot = QChar('.');
-
-[[nodiscard]] QString MajorPart(EarnInt value) {
-	const auto string = QString::number(value);
-	const auto diff = int(string.size()) - kMinorPartLength;
-	return (diff <= 0) ? QString(kZero) : string.mid(0, diff);
-}
-
-[[nodiscard]] QString MinorPart(EarnInt value) {
-	if (!value) {
-		return QString(kDot) + kZero + kZero;
-	}
-	const auto string = QString::number(value);
-	const auto diff = int(string.size()) - kMinorPartLength;
-	const auto result = (diff < 0)
-		? kDot + u"%1"_q.arg(0, std::abs(diff), 10, kZero) + string
-		: kDot + string.mid(diff);
-	const auto begin = (result.constData());
-	const auto end = (begin + result.size());
-	auto ch = end - 1;
-	auto zeroCount = 0;
-	while (ch != begin) {
-		if ((*ch) == kZero) {
-			zeroCount++;
-		} else {
-			break;
-		}
-		ch--;
-	}
-	return result.chopped(zeroCount);
-}
-
-[[nodiscard]] QString ToUsd(EarnInt value, float64 rate) {
-	constexpr auto kApproximately = QChar(0x2248);
-	const auto multiplier = EarnInt(rate * Data::kEarnMultiplier);
-	const auto result = (value * multiplier) / Data::kEarnMultiplier;
-	return QString(kApproximately)
-		+ QChar('$')
-		+ MajorPart(result)
-		+ MinorPart(result);
-}
-
 [[nodiscard]] bool WithdrawalEnabled(not_null<Main::Session*> session) {
 	const auto key = u"channel_revenue_withdrawal_enabled"_q;
 	return session->appConfig().get<bool>(key, false);
@@ -480,7 +437,10 @@ void InnerWidget::fill() {
 				object_ptr<Statistic::ChartWidget>(container),
 				st::statisticsLayerMargins);
 
-			widget->setChartData(data.revenueGraph.chart, Type::StackBar);
+			auto chart = data.revenueGraph.chart;
+			chart.currencyRate = multiplier;
+
+			widget->setChartData(chart, Type::StackBar);
 			widget->setTitle(tr::lng_channel_earn_chart_revenue());
 		}
 		Ui::AddSkip(container);
diff --git a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
index 99aec0198..1b4e9c33a 100644
--- a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
+++ b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
@@ -28,13 +28,6 @@ constexpr auto kStep = 5.;
 		: QString::number(absoluteValue);
 }
 
-[[nodiscard]] QString FormatF(float64 absoluteValue) {
-	constexpr auto kTooMuch = int(10'000);
-	return (absoluteValue >= kTooMuch)
-		? Lang::FormatCountToShort(absoluteValue).string
-		: QString::number(absoluteValue);
-}
-
 } // namespace
 
 ChartRulersData::ChartRulersData(
@@ -42,7 +35,8 @@ ChartRulersData::ChartRulersData(
 		int newMinHeight,
 		bool useMinHeight,
 		float64 rightRatio,
-		int valueDivider) {
+		Fn<QString(float64)> leftCustomCaption,
+		Fn<QString(float64)> rightCustomCaption) {
 	if (!useMinHeight) {
 		const auto v = (newMaxHeight > 100)
 			? Round(newMaxHeight)
@@ -100,12 +94,14 @@ ChartRulersData::ChartRulersData(
 			const auto value = int(i * step);
 			line.absoluteValue = newMinHeight + value;
 			line.relativeValue = 1. - value / float64(diffAbsoluteValue);
-			line.caption = valueDivider
-				? FormatF(line.absoluteValue / float64(valueDivider))
+			line.caption = leftCustomCaption
+				? leftCustomCaption(line.absoluteValue)
 				: Format(line.absoluteValue);
-			if (rightRatio > 0) {
+			if (rightRatio > 0 || rightCustomCaption) {
 				const auto v = (newMinHeight + i * step) / rightRatio;
-				line.scaledLineCaption = (!skipFloatValues)
+				line.scaledLineCaption = rightCustomCaption
+					? rightCustomCaption(line.absoluteValue)
+					: (!skipFloatValues)
 					? Format(v)
 					: ((v - int(v)) < 0.01)
 					? Format(v)
diff --git a/Telegram/SourceFiles/statistics/chart_rulers_data.h b/Telegram/SourceFiles/statistics/chart_rulers_data.h
index 4df719ac0..4b5d63202 100644
--- a/Telegram/SourceFiles/statistics/chart_rulers_data.h
+++ b/Telegram/SourceFiles/statistics/chart_rulers_data.h
@@ -16,7 +16,8 @@ public:
 		int newMinHeight,
 		bool useMinHeight,
 		float64 rightRatio,
-		int valueDivider);
+		Fn<QString(float64)> leftCustomCaption = nullptr,
+		Fn<QString(float64)> rightCustomCaption = nullptr);
 
 	void computeRelative(
 		int newMaxHeight,
diff --git a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
index df7345d75..e6368052e 100644
--- a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
+++ b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
@@ -132,13 +132,6 @@ Data::StatisticalChart StatisticalChartFromJSON(const QByteArray &json) {
 			result.weekFormat = tooltipFormat.contains(u"'week'"_q);
 		}
 	}
-	{
-		const auto tickFormatIt = root.constFind(u"yTickFormatter"_q);
-		if (tickFormatIt != root.constEnd()) {
-			const auto tickFormat = tickFormatIt->toString();
-			result.isCurrency = tickFormat.contains(u"TON"_q);
-		}
-	}
 
 	const auto colors = root.value(u"colors"_q).toObject();
 	const auto names = root.value(u"names"_q).toObject();
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
index 859db9e1a..334f0eead 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
@@ -8,12 +8,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "statistics/view/chart_rulers_view.h"
 
 #include "data/data_channel_earn.h" // Data::kEarnMultiplier.
+#include "info/channel_statistics/earn/earn_format.h"
+#include "lang/lang_keys.h"
 #include "statistics/chart_lines_filter_controller.h"
 #include "statistics/statistics_common.h"
 #include "styles/style_basic.h"
 #include "styles/style_statistics.h"
 
 namespace Statistic {
+namespace {
+
+[[nodiscard]] QString FormatF(float64 absoluteValue) {
+	constexpr auto kTooMuch = int(10'000);
+	return (absoluteValue >= kTooMuch)
+		? Lang::FormatCountToShort(absoluteValue).string
+		: QString::number(absoluteValue);
+}
+
+} // namespace
 
 ChartRulersView::ChartRulersView() = default;
 
@@ -22,10 +34,18 @@ void ChartRulersView::setChartData(
 		ChartViewType type,
 		std::shared_ptr<LinesFilterController> linesFilter) {
 	_rulers.clear();
-	_isDouble = (type == ChartViewType::DoubleLinear);
-	_currencyIcon = chartData.isCurrency
-		? &st::statisticsCurrencyIcon
-		: nullptr;
+	_isDouble = (type == ChartViewType::DoubleLinear)
+		|| chartData.currencyRate;
+	if (chartData.currencyRate) {
+		_currencyIcon = &st::statisticsCurrencyIcon;
+		_leftCustomCaption = [=](float64 value) {
+			return FormatF(value / float64(Data::kEarnMultiplier));
+		};
+		_rightCustomCaption = [=, rate = chartData.currencyRate](float64 v) {
+			return Info::ChannelEarn::ToUsd(v, rate).mid(1);
+		};
+		_rightPen = QPen(st::windowSubTextFg);
+	}
 	if (_isDouble && (chartData.lines.size() == 2)) {
 		_linesFilter = std::move(linesFilter);
 		_leftPen = QPen(chartData.lines.front().color);
@@ -96,8 +116,10 @@ void ChartRulersView::paintCaptionsToRulers(
 					: _isLeftLineScaled
 					? line.scaledLineCaption
 					: line.caption);
-			if (hasLinesFilter) {
-				p.setOpacity(rulerAlpha * _linesFilter->alpha(_rightLineId));
+			if (hasLinesFilter || _rightCustomCaption) {
+				if (_linesFilter) {
+					p.setOpacity(rulerAlpha * _linesFilter->alpha(_rightLineId));
+				}
 				p.setPen(_rightPen);
 				p.drawText(
 					r.width() - line.rightCaptionWidth,
@@ -142,7 +164,8 @@ void ChartRulersView::add(Limits newHeight, bool animated) {
 		newHeight.min,
 		true,
 		_isDouble ? _scaledLineRatio : 0.,
-		_currencyIcon ? Data::kEarnMultiplier : 0);
+		_leftCustomCaption,
+		_rightCustomCaption);
 	if (_isDouble) {
 		const auto &font = st::statisticsDetailsBottomCaptionStyle.font;
 		for (auto &line : newLinesData.lines) {
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.h b/Telegram/SourceFiles/statistics/view/chart_rulers_view.h
index ba355fd50..44326d15e 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.h
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.h
@@ -44,6 +44,9 @@ private:
 	int _rightLineId = 0;
 	const style::icon *_currencyIcon = nullptr;
 
+	Fn<QString(float64)> _leftCustomCaption = nullptr;
+	Fn<QString(float64)> _rightCustomCaption = nullptr;
+
 	std::vector<ChartRulersData> _rulers;
 
 	std::shared_ptr<LinesFilterController> _linesFilter;
diff --git a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
index d30cfa7d6..4bd871ffa 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
@@ -134,7 +134,7 @@ PointDetailsWidget::PointDetailsWidget(
 , _chartData(chartData)
 , _textStyle(st::statisticsDetailsPopupStyle)
 , _headerStyle(st::statisticsDetailsPopupHeaderStyle)
-, _valueIcon(chartData.isCurrency ? &st::statisticsCurrencyIcon : nullptr) {
+, _valueIcon(chartData.currencyRate ? &st::statisticsCurrencyIcon : nullptr) {
 
 	if (zoomEnabled) {
 		rpl::single(rpl::empty_value()) | rpl::then(
@@ -282,7 +282,7 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 		textLine.name.setText(_textStyle, dataLine.name);
 		textLine.value.setText(
 			_textStyle,
-			_chartData.isCurrency
+			_chartData.currencyRate
 				? QString::number(dataLine.y[xIndex] / multiplier)
 				: QString("%L1").arg(dataLine.y[xIndex]));
 		hasPositiveValues |= (dataLine.y[xIndex] > 0);
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index e52a53bf4..3cd0defa7 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -131,6 +131,9 @@ PRIVATE
     info/channel_statistics/boosts/giveaway/select_countries_box.cpp
     info/channel_statistics/boosts/giveaway/select_countries_box.h
 
+    info/channel_statistics/earn/earn_format.cpp
+    info/channel_statistics/earn/earn_format.h
+
     intro/intro_code_input.cpp
     intro/intro_code_input.h
 

From 0b22e5928ca5e6822fe36becc659355d3575f10c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 29 Mar 2024 03:15:13 +0300
Subject: [PATCH 175/596] Fixed bottom fade effect for input message fields in
 compose controls.

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

diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index c5c04a43c..648c5c98c 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -505,7 +505,11 @@ void InitMessageFieldFade(
 	}, topFade->lifetime());
 
 	topFade->show();
-	bottomFade->show();
+	bottomFade->showOn(
+	field->scrollTop().value(
+	) | rpl::map([field, descent = field->st().font->descent](int scroll) {
+		return (scroll + descent) < field->scrollTopMax();
+	}) | rpl::distinct_until_changed());
 }
 
 InlineBotQuery ParseInlineBotQuery(

From 24c1151101c1a074c4f35d0d1fb5271f806a24cf Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 29 Mar 2024 03:20:49 +0300
Subject: [PATCH 176/596] Fixed incorrect handling of error from channel
 ownership request.

---
 Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index 6268db65b..e5f4b4d1b 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -668,8 +668,8 @@ void EditAdminBox::sendTransferRequestFrom(
 		}();
 		const auto recoverable = [&] {
 			return (type == u"PASSWORD_MISSING"_q)
-				|| (type == u"PASSWORD_TOO_FRESH_XXX"_q)
-				|| (type == u"SESSION_TOO_FRESH_XXX"_q);
+				|| type.startsWith(u"PASSWORD_TOO_FRESH_"_q)
+				|| type.startsWith(u"SESSION_TOO_FRESH_"_q);
 		}();
 		const auto weak = Ui::MakeWeak(this);
 		getDelegate()->show(Ui::MakeInformBox(problem));

From 8718d94e7d9cbacd41ae532e426719422eaf7a49 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 29 Mar 2024 05:19:37 +0300
Subject: [PATCH 177/596] Added sub-button to top of sponsored messages that
 can be reported.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 .../view/media/history_view_web_page.cpp      | 100 ++++++++++++++++++
 .../view/media/history_view_web_page.h        |   7 ++
 Telegram/SourceFiles/menu/menu_sponsored.cpp  |   6 ++
 Telegram/SourceFiles/menu/menu_sponsored.h    |   2 +
 Telegram/SourceFiles/ui/chat/chat.style       |   1 +
 6 files changed, 117 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index a5ba2a744..cfab9c867 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1960,6 +1960,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_forwarded_imported" = "This message was imported from another app. It may not be real.";
 "lng_signed_author" = "Author: {user}";
 "lng_sponsored_message_title" = "Sponsored";
+"lng_sponsored_message_revenue_button" = "what's this?";
 "lng_recommended_message_title" = "Recommended";
 "lng_edited" = "edited";
 "lng_commented" = "commented";
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 2cf19510a..fbd61a00e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_media_common.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "menu/menu_sponsored.h"
 #include "ui/chat/chat_style.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
@@ -136,6 +137,15 @@ constexpr auto kMaxOriginalEntryLines = 8192;
 	});
 }
 
+[[nodiscard]] ClickHandlerPtr AboutSponsoredClickHandler() {
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto controller = my.sessionWindow.get()) {
+			Menu::ShowSponsoredAbout(controller->uiShow());
+		}
+	});
+}
+
 [[nodiscard]] TextWithEntities PageToPhrase(not_null<WebPageData*> page) {
 	const auto type = page->type;
 	const auto text = Ui::Text::Upper(page->iv
@@ -223,6 +233,7 @@ WebPage::WebPage(
 	auto result = std::make_optional<SponsoredData>();
 	result->buttonText = details.buttonText;
 	result->hasExternalLink = (details.externalLink == _data->url);
+	result->canReport = details.canReport;
 #ifdef _DEBUG
 	if (details.peer) {
 #else
@@ -337,6 +348,10 @@ QSize WebPage::countOptimalSize() {
 			_openl = SponsoredLink(_sponsoredData->hasExternalLink
 				? _data->url
 				: QString());
+
+			if (_sponsoredData->canReport) {
+				_sponsoredData->hintLink = AboutSponsoredClickHandler();
+			}
 		}
 	}
 
@@ -480,6 +495,16 @@ QSize WebPage::countOptimalSize() {
 	if (_asArticle) {
 		minHeight = resizeGetHeight(maxWidth);
 	}
+	if (_sponsoredData && _sponsoredData->canReport) {
+		_sponsoredData->widthBeforeHint =
+			st::webPageTitleStyle.font->width(siteName);
+		const auto &font = st::webPageSponsoredHintFont;
+		_sponsoredData->hintSize = QSize(
+			font->width(tr::lng_sponsored_message_revenue_button(tr::now))
+				+ font->height,
+			font->height);
+		maxWidth += _sponsoredData->hintSize.width();
+	}
 	return { maxWidth, minHeight };
 }
 
@@ -790,6 +815,50 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			endskip,
 			false,
 			context.selection);
+		if (asSponsored
+			&& _sponsoredData->canReport
+			&& (paintw >
+					_sponsoredData->widthBeforeHint
+						+ _sponsoredData->hintSize.width())) {
+			if (_sponsoredData->hintRipple) {
+				_sponsoredData->hintRipple->paint(
+					p,
+					_sponsoredData->lastHintPos.x(),
+					_sponsoredData->lastHintPos.y(),
+					width(),
+					&cache->bg);
+				if (_sponsoredData->hintRipple->empty()) {
+					_sponsoredData->hintRipple = nullptr;
+				}
+			}
+
+			auto color = cache->icon;
+			color.setAlphaF(color.alphaF() * 0.15);
+
+			const auto height = st::webPageSponsoredHintFont->height;
+			const auto radius = height / 2;
+
+			_sponsoredData->lastHintPos = QPoint(
+				radius + inner.left() + _sponsoredData->widthBeforeHint,
+				tshift
+					+ (_siteName.style()->font->height - height) / 2
+					+ st::webPageSponsoredHintFont->descent / 2);
+			const auto rect = QRect(
+				_sponsoredData->lastHintPos,
+				_sponsoredData->hintSize);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(color);
+			p.drawRoundedRect(rect, radius, radius);
+
+			p.setPen(cache->icon);
+			p.setBrush(Qt::NoBrush);
+			p.setFont(st::webPageSponsoredHintFont);
+			p.drawText(
+				rect,
+				tr::lng_sponsored_message_revenue_button(tr::now),
+				style::al_center);
+		}
 		tshift += lineHeight;
 
 		p.setTextPalette(stm->textPalette);
@@ -1076,6 +1145,15 @@ TextState WebPage::textState(QPoint point, StateRequest request) const {
 	if ((!result.link || _sponsoredData) && outer.contains(point)) {
 		result.link = _openl;
 	}
+	if (_sponsoredData && _sponsoredData->canReport) {
+		const auto contains = QRect(
+			_sponsoredData->lastHintPos,
+			_sponsoredData->hintSize).contains(point
+				- QPoint(0, st::msgDateFont->height));
+		if (contains) {
+			result.link = _sponsoredData->hintLink;
+		}
+	}
 	_lastPoint = point - outer.topLeft();
 
 	result.symbol += symbolAdd;
@@ -1145,6 +1223,28 @@ void WebPage::clickHandlerActiveChanged(
 void WebPage::clickHandlerPressedChanged(
 		const ClickHandlerPtr &p,
 		bool pressed) {
+	if (_sponsoredData && _sponsoredData->hintLink == p) {
+		if (pressed) {
+			if (!_sponsoredData->hintRipple) {
+				const auto owner = &parent()->history()->owner();
+				auto ripple = std::make_unique<Ui::RippleAnimation>(
+					st::defaultRippleAnimation,
+					Ui::RippleAnimation::RoundRectMask(
+						_sponsoredData->hintSize,
+						_st.radius),
+					[=] { owner->requestViewRepaint(parent()); });
+				_sponsoredData->hintRipple = std::move(ripple);
+			}
+			const auto full = Rect(currentSize());
+			const auto outer = full - inBubblePadding();
+			_sponsoredData->hintRipple->add(_lastPoint
+				+ outer.topLeft()
+				- _sponsoredData->lastHintPos);
+		} else if (_sponsoredData->hintRipple) {
+			_sponsoredData->hintRipple->lastStop();
+		}
+		return;
+	}
 	if (p == _openl) {
 		if (pressed) {
 			if (!_ripple) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index b048cfc39..61c834eea 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -135,6 +135,13 @@ private:
 		Ui::PeerUserpicView userpicView;
 		QString buttonText;
 		bool hasExternalLink = false;
+
+		bool canReport = false;
+		QSize hintSize;
+		QPoint lastHintPos;
+		int widthBeforeHint = 0;
+		std::unique_ptr<Ui::RippleAnimation> hintRipple;
+		ClickHandlerPtr hintLink;
 	};
 	mutable std::optional<SponsoredData> _sponsoredData;
 
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 41e72a432..51aaad13e 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -324,4 +324,10 @@ void ShowSponsored(
 	menu->popup(QCursor::pos());
 }
 
+void ShowSponsoredAbout(std::shared_ptr<ChatHelpers::Show> show) {
+	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+		AboutBox(box, &show->session());
+	}));
+}
+
 } // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.h b/Telegram/SourceFiles/menu/menu_sponsored.h
index 7402931fa..ddd011ad6 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.h
+++ b/Telegram/SourceFiles/menu/menu_sponsored.h
@@ -24,4 +24,6 @@ void ShowSponsored(
 	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<HistoryItem*> item);
 
+void ShowSponsoredAbout(std::shared_ptr<ChatHelpers::Show> show);
+
 } // namespace Menu
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 3634be953..ef46e0405 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -602,6 +602,7 @@ historyPsaForwardPalette: TextPalette(defaultTextPalette) {
 
 webPageTitleFont: semiboldFont;
 webPageTitleStyle: semiboldTextStyle;
+webPageSponsoredHintFont: font(10px);
 webPageDescriptionFont: normalFont;
 webPageDescriptionStyle: defaultTextStyle;
 webPagePhotoDelta: 8px;

From 4db885d8b4024046fb94a7a837180bfae4a2155d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 31 Mar 2024 16:46:05 +0300
Subject: [PATCH 178/596] Replaced exported data of callbacks from markup
 replies with base64.

---
 .../export/output/export_output_json.cpp        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index 5bd7f2c37..ed50aa5c8 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -804,7 +804,22 @@ QByteArray SerializeMessage(
 					});
 				}
 				if (!entry.data.isEmpty()) {
-					pairs.push_back({ "data", SerializeString(entry.data) });
+					using Type = HistoryMessageMarkupButton::Type;
+					const auto isCallback = (entry.type == Type::Callback)
+						|| (entry.type == Type::CallbackWithPassword);
+					const auto data = isCallback
+						? entry.data.toBase64(QByteArray::Base64UrlEncoding
+							| QByteArray::OmitTrailingEquals)
+						: entry.data;
+					if (isCallback) {
+						pairs.push_back({
+							"dataBase64",
+							SerializeString(data),
+						});
+						pairs.push_back({ "data", SerializeString({}) });
+					} else {
+						pairs.push_back({ "data", SerializeString(data) });
+					}
 				}
 				if (!entry.forwardText.isEmpty()) {
 					pairs.push_back({

From 04acf08d341f8184fc4324ee1249d4df7f233793 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 31 Mar 2024 17:23:03 +0300
Subject: [PATCH 179/596] Limited list of data for non-owners of channel in
 earn section.

---
 Telegram/Resources/langs/lang.strings                |  4 ++--
 .../earn/info_earn_inner_widget.cpp                  | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index cfab9c867..99cee3ef8 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4985,7 +4985,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_balance_password_title" = "Two-step verification";
 "lng_channel_earn_balance_password_description" = "Please enter your password to withdraw.";
 "lng_channel_earn_balance_about" = "Collect your reward using Fragment, a third-party platform used by the advertiser to pay for the ad. {link}";
-"lng_channel_earn_balance_about_temp" = "By the end of May, you will be able to collect your reward using Fragment, a third-party platform used by the advertiser to pay for the ad. {link}";
+"lng_channel_earn_balance_about_temp" = "In the coming weeks you will be able to collect your reward using Fragment, a third-party platform used by advertisers to pay ads. {link}";
 "lng_channel_earn_transfer_sure_about1" = "Check the address of the recipient:";
 "lng_channel_earn_transfer_sure_about2" = "This action can not be undone. If the address above is incorrect you will lose your TON.";
 "lng_channel_earn_history_title" = "Transaction history";
@@ -5013,7 +5013,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_learn_out_subtitle" = "Flexible withdrawals";
 "lng_channel_earn_learn_out_about" = "You can withdraw your TON any time.";
 "lng_channel_earn_learn_coin_title" = "What is {emoji} TON?";
-"lng_channel_earn_learn_coin_about" = "TON is a blockchain platform and cryptocurrency that Telegram uses for its record scalability and ultra low commissions on transactions. {link}";
+"lng_channel_earn_learn_coin_about" = "TON is a blockchain platform and cryptocurrency that Telegram uses for its high speed and low commissions on transactions. {link}";
 "lng_channel_earn_learn_close" = "Got it";
 "lng_channel_earn_chart_top_hours" = "Ad impressions";
 "lng_channel_earn_chart_revenue" = "Ad revenue";
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index fb190736c..463cb1cca 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_earn.h"
 #include "api/api_statistics.h"
+#include "base/unixtime.h"
 #include "boxes/peers/edit_peer_color_box.h" // AddLevelBadge.
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
@@ -203,9 +204,13 @@ void InnerWidget::fill() {
 	const auto currency = u"TON"_q;
 	const auto multiplier = data.usdRate;
 
+	constexpr auto kNonInteractivePeriod = 1717200000;
+	const auto nonInteractive = base::unixtime::now() < kNonInteractivePeriod;
+
 	const auto session = &_peer->session();
 	const auto channel = _peer->asChannel();
-	const auto withdrawalEnabled = WithdrawalEnabled(session);
+	const auto withdrawalEnabled = WithdrawalEnabled(session)
+		&& !nonInteractive;
 	const auto makeContext = [=](not_null<Ui::FlatLabel*> l) {
 		return Core::MarkedTextContext{
 			.session = session,
@@ -506,6 +511,11 @@ void InnerWidget::fill() {
 		addOverview(data.overallRevenue, tr::lng_channel_earn_total);
 		Ui::AddSkip(container);
 	}
+	if (!channel->amCreator()) {
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		return;
+	}
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);

From d3cd3bb0a4015d65728c9ea525ab661b136e74d0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 31 Mar 2024 20:52:19 +0300
Subject: [PATCH 180/596] Slightly improved style of box for reporting of
 sponsored messages.

---
 .../data/data_sponsored_messages.cpp          |  3 ++
 .../data/data_sponsored_messages.h            |  1 +
 .../earn/channel_earn.style                   |  5 ++
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 46 +++++++++++++++++--
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index ae37e9191..a856e6156 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -546,6 +546,9 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 					};
 					list.erase(ranges::remove_if(list, proj), end(list));
 				}
+				if (optionId == Result::Id("1")) { // I don't like it.
+					return { .result = Result::FinalStep::Silence };
+				}
 				return { .result = Result::FinalStep::Reported };
 			}));
 		}).fail([=](const MTP::Error &error) {
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.h b/Telegram/SourceFiles/data/data_sponsored_messages.h
index 04f0cd196..cad8a6134 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.h
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.h
@@ -33,6 +33,7 @@ struct SponsoredReportResult final {
 		Hidden,
 		Reported,
 		Premium,
+		Silence,
 	};
 	Options options;
 	QString title;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 0667ce763..4c7acfe31 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -117,3 +117,8 @@ sponsoredAboutSplitIcon: icon {{ "sponsored/revenue_split", boxTextFg }};
 channelEarnLearnTitleIcon: icon {{ "sponsored/large_earn", activeButtonFg }};
 channelEarnLearnChannelIcon: icon {{ "sponsored/channel", boxTextFg }};
 channelEarnLearnWithdrawalsIcon: icon {{ "sponsored/withdrawals", boxTextFg }};
+
+sponsoredReportLabel: FlatLabel(defaultFlatLabel) {
+	style: boxTextStyle;
+	minWidth: 150px;
+}
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 51aaad13e..3d7105fe9 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -238,8 +238,42 @@ void ShowReportSponsoredBox(
 						const auto button = box->verticalLayout()->add(
 							object_ptr<Ui::SettingsButton>(
 								box,
-								rpl::single(option.text),
+								rpl::single(QString()),
 								st::settingsButtonNoIcon));
+						const auto label = Ui::CreateChild<Ui::FlatLabel>(
+							button,
+							rpl::single(option.text),
+							st::sponsoredReportLabel);
+						const auto icon = Ui::CreateChild<Ui::RpWidget>(
+							button);
+						icon->resize(st::settingsPremiumArrow.size());
+						icon->paintRequest(
+						) | rpl::start_with_next([=, w = icon->width()] {
+							auto p = Painter(icon);
+							st::settingsPremiumArrow.paint(p, 0, 0, w);
+						}, icon->lifetime());
+						button->sizeValue(
+						) | rpl::start_with_next([=](const QSize &size) {
+							const auto left = button->st().padding.left();
+							const auto right = button->st().padding.right();
+							icon->moveToRight(
+								right,
+								(size.height() - icon->height()) / 2);
+							label->resizeToWidth(size.width()
+								- icon->width()
+								- left
+								- st::settingsButtonRightSkip
+								- right);
+							label->moveToLeft(
+								left,
+								(size.height() - label->height()) / 2);
+							button->resize(
+								button->width(),
+								rect::m::sum::v(button->st().padding)
+									+ label->height());
+						}, button->lifetime());
+						label->setAttribute(Qt::WA_TransparentForMouseEvents);
+						icon->setAttribute(Qt::WA_TransparentForMouseEvents);
 						button->setClickedCallback([=] {
 							repeatRequest(repeatRequest, option.id);
 						});
@@ -268,9 +302,12 @@ void ShowReportSponsoredBox(
 						[=] { show->hideLayer(); });
 				}));
 			} else {
+				constexpr auto kToastDuration = crl::time(4000);
 				switch (result.result) {
 				case Data::SponsoredReportResult::FinalStep::Hidden: {
-					show->showToast(tr::lng_report_sponsored_hidden(tr::now));
+					show->showToast(
+						tr::lng_report_sponsored_hidden(tr::now),
+						kToastDuration);
 				} break;
 				case Data::SponsoredReportResult::FinalStep::Reported: {
 					auto text = tr::lng_report_sponsored_reported(
@@ -278,7 +315,10 @@ void ShowReportSponsoredBox(
 						lt_link,
 						guideLink,
 						Ui::Text::WithEntities);
-					show->showToast({ .text = std::move(text) });
+					show->showToast({
+						.text = std::move(text),
+						.duration = kToastDuration,
+					});
 				} break;
 				case Data::SponsoredReportResult::FinalStep::Premium: {
 					ShowPremiumPreviewBox(show, PremiumFeature::NoAds);

From 5dd974f2ab59a14c71e1f223c6751f225f63b72f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 1 Apr 2024 01:44:33 +0300
Subject: [PATCH 181/596] Added line with converted currency amount to point
 details widget.

---
 Telegram/Resources/langs/lang.strings         |  2 ++
 .../earn/info_earn_inner_widget.cpp           |  2 +-
 .../statistics/view/chart_rulers_view.cpp     |  2 +-
 .../widgets/point_details_widget.cpp          | 31 ++++++++++++++++---
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 99cee3ef8..f63f63e72 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5017,6 +5017,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_learn_close" = "Got it";
 "lng_channel_earn_chart_top_hours" = "Ad impressions";
 "lng_channel_earn_chart_revenue" = "Ad revenue";
+"lng_channel_earn_chart_overriden_detail_currency" = "Revenue in TON";
+"lng_channel_earn_chart_overriden_detail_usd" = "Revenue in USD";
 
 "lng_contact_add" = "Add";
 "lng_contact_send_message" = "message";
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 463cb1cca..505900670 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -430,7 +430,7 @@ void InnerWidget::fill() {
 				object_ptr<Statistic::ChartWidget>(container),
 				st::statisticsLayerMargins);
 
-			widget->setChartData(data.topHoursGraph.chart, Type::Linear);
+			widget->setChartData(data.topHoursGraph.chart, Type::Bar);
 			widget->setTitle(tr::lng_channel_earn_chart_top_hours());
 		}
 		if (data.revenueGraph.chart) {
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
index 334f0eead..6925f30e5 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
@@ -42,7 +42,7 @@ void ChartRulersView::setChartData(
 			return FormatF(value / float64(Data::kEarnMultiplier));
 		};
 		_rightCustomCaption = [=, rate = chartData.currencyRate](float64 v) {
-			return Info::ChannelEarn::ToUsd(v, rate).mid(1);
+			return Info::ChannelEarn::ToUsd(v, rate);
 		};
 		_rightPen = QPen(st::windowSubTextFg);
 	}
diff --git a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
index 4bd871ffa..50d56fec5 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
@@ -8,6 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "statistics/widgets/point_details_widget.h"
 
 #include "data/data_channel_earn.h" // Data::kEarnMultiplier.
+#include "info/channel_statistics/earn/earn_format.h"
+#include "lang/lang_keys.h"
 #include "statistics/statistics_common.h"
 #include "statistics/statistics_format_values.h"
 #include "statistics/view/stack_linear_chart_common.h"
@@ -237,7 +239,7 @@ void PointDetailsWidget::setLineAlpha(int lineId, float64 alpha) {
 void PointDetailsWidget::resizeHeight() {
 	resize(
 		width(),
-		lineYAt(_chartData.lines.size())
+		lineYAt(_chartData.lines.size() + (_chartData.currencyRate ? 1 : 0))
 			+ st::statisticsDetailsPopupMargins.bottom());
 }
 
@@ -282,11 +284,30 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 		textLine.name.setText(_textStyle, dataLine.name);
 		textLine.value.setText(
 			_textStyle,
-			_chartData.currencyRate
-				? QString::number(dataLine.y[xIndex] / multiplier)
-				: QString("%L1").arg(dataLine.y[xIndex]));
+			QString("%L1").arg(dataLine.y[xIndex]));
 		hasPositiveValues |= (dataLine.y[xIndex] > 0);
 		textLine.valueColor = QColor(dataLine.color);
+		if (_chartData.currencyRate) {
+			auto copy = Line();
+			copy.id = dataLine.id * 100;
+			copy.valueColor = QColor(dataLine.color);
+			copy.name.setText(
+				_textStyle,
+				tr::lng_channel_earn_chart_overriden_detail_currency(
+					tr::now));
+			copy.value.setText(
+				_textStyle,
+				QString::number(dataLine.y[xIndex] / multiplier));
+			_lines.push_back(std::move(copy));
+			textLine.name.setText(
+				_textStyle,
+				tr::lng_channel_earn_chart_overriden_detail_usd(tr::now));
+			textLine.value.setText(
+				_textStyle,
+				Info::ChannelEarn::ToUsd(
+					dataLine.y[xIndex],
+					_chartData.currencyRate));
+		}
 		_lines.push_back(std::move(textLine));
 	}
 	const auto clickable = _zoomEnabled && hasPositiveValues;
@@ -387,7 +408,7 @@ void PointDetailsWidget::paintEvent(QPaintEvent *e) {
 				.outerWidth = _textRect.width(),
 				.availableWidth = valueWidth,
 			};
-			if (_valueIcon) {
+			if (!i && _valueIcon) {
 				_valueIcon->paint(
 					p,
 					valueContext.position.x() - _valueIcon->width(),

From 8492b7144f2a8a4312981941fe8dec5b03d93819 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 1 Apr 2024 03:13:36 +0300
Subject: [PATCH 182/596] Replaced emoji with icon for currency in earn
 section.

---
 .../earn/channel_earn.style                   |   3 +
 .../earn/info_earn_inner_widget.cpp           | 105 ++++++++++++++----
 2 files changed, 88 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 4c7acfe31..3c20cedbf 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -109,6 +109,9 @@ channelEarnLearnDescription: FlatLabel(defaultFlatLabel) {
 	align: align(top);
 }
 
+channelEarnCurrencyCommonMargins: margins(0px, 3px, 1px, 0px);
+channelEarnCurrencyLearnMargins: margins(0px, 2px, 0px, 0px);
+
 sponsoredAboutTitleIcon: icon {{ "sponsored/large_about", activeButtonFg }};
 sponsoredAboutPrivacyIcon: icon {{ "sponsored/privacy_about", boxTextFg }};
 sponsoredAboutRemoveIcon: icon {{ "sponsored/remove_about", boxTextFg }};
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 505900670..2d922d344 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -48,6 +48,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_statistics.h"
 #include "styles/style_window.h" // mainMenuToggleFourStrokes.
 
+#include <QtSvg/QSvgRenderer>
 #include <QtWidgets/QApplication>
 
 namespace Info::ChannelEarn {
@@ -69,6 +70,30 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
 	menu->popup(QCursor::pos());
 }
 
+[[nodiscard]] QByteArray CurrencySvg(const QColor &c) {
+	const auto color = u"rgb(%1,%2,%3)"_q
+		.arg(c.red())
+		.arg(c.green())
+		.arg(c.blue())
+		.toUtf8();
+	return R"(
+<svg width="72px" height="72px" viewBox="0 0 72 72">
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(9.000000, 14.000000)
+        " stroke-width="7.2" stroke=")" + color + R"(">
+            <path d="M2.96014341,0 L50.9898193,0 C51.9732032,-7.06402744e-15
+ 52.7703933,0.797190129 52.7703933,1.78057399 C52.7703933,2.08038611
+ 52.6946886,2.3753442 52.5502994,2.63809702 L29.699977,44.2200383
+ C28.7527832,45.9436969 26.5876295,46.5731461 24.8639708,45.6259523
+ C24.2556953,45.2916896 23.7583564,44.7869606 23.4331014,44.1738213
+ L1.38718565,2.61498853 C0.926351231,1.74626794 1.25700829,0.668450654
+ 2.12572888,0.20761623 C2.38272962,0.0712838007 2.6692209,4.97530809e-16
+ 2.96014341,0 Z"></path>
+            <line x1="27" y1="44.4532875" x2="27" y2="0"></line>
+        </g>
+    </g>
+</svg>)";
+}
 
 void AddArrow(not_null<Ui::RpWidget*> parent) {
 	const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
@@ -139,6 +164,7 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 	});
 }
 
+#if 0
 [[nodiscard]] TextWithEntities EmojiCurrency(
 		not_null<Main::Session*> session) {
 	auto emoji = TextWithEntities{
@@ -152,6 +178,24 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 	}
 	return emoji;
 }
+#endif
+
+[[nodiscard]] QImage IconCurrency(
+		const style::FlatLabel &label,
+		const QColor &c) {
+	const auto s = Size(label.style.font->ascent);
+	auto svg = QSvgRenderer(CurrencySvg(c));
+	auto image = QImage(
+		s * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	{
+		auto p = QPainter(&image);
+		svg.render(&p, Rect(s));
+	}
+	return image;
+}
 
 [[nodiscard]] QString FormatDate(const QDateTime &date) {
 	return tr::lng_group_call_starts_short_date(
@@ -201,7 +245,6 @@ void InnerWidget::fill() {
 
 	constexpr auto kMinus = QChar(0x2212);
 	constexpr auto kApproximately = QChar(0x2248);
-	const auto currency = u"TON"_q;
 	const auto multiplier = data.usdRate;
 
 	constexpr auto kNonInteractivePeriod = 1717200000;
@@ -219,13 +262,35 @@ void InnerWidget::fill() {
 	};
 	const auto addEmojiToMajor = [=](
 			not_null<Ui::FlatLabel*> label,
-			EarnInt value) {
-		auto emoji = EmojiCurrency(session);
+			EarnInt value,
+			std::optional<bool> isIn,
+			std::optional<QMargins> margins) {
+		const auto &st = label->st();
+		auto icon = Ui::Text::SingleCustomEmoji(
+			session->data().customEmojiManager().registerInternalEmoji(
+				IconCurrency(
+					st,
+					!isIn
+						? st::activeButtonBg->c
+						: (*isIn)
+						? st::boxTextFgGood->c
+						: st::menuIconAttentionColor->c),
+				margins ? *margins : st::channelEarnCurrencyCommonMargins,
+				false));
+		auto prepended = !isIn
+			? TextWithEntities()
+			: TextWithEntities::Simple((*isIn) ? QChar('+') : kMinus);
 		label->setMarkedText(
-			emoji.append(' ').append(MajorPart(value)),
+			prepended.append(icon).append(MajorPart(value)),
 			makeContext(label));
 	};
 
+	const auto bigCurrencyIcon = Ui::Text::SingleCustomEmoji(
+		session->data().customEmojiManager().registerInternalEmoji(
+			IconCurrency(st::boxTitle, st::activeButtonBg->c),
+			st::channelEarnCurrencyLearnMargins,
+			false));
+
 	const auto arrow = Ui::Text::SingleCustomEmoji(
 		session->data().customEmojiManager().registerInternalEmoji(
 			st::topicButtonArrow,
@@ -357,7 +422,7 @@ void InnerWidget::fill() {
 					tr::lng_channel_earn_learn_coin_title(
 						lt_emoji,
 						rpl::single(
-							Ui::Text::Link(EmojiCurrency(session), 1)),
+							Ui::Text::Link(bigCurrencyIcon, 1)),
 						Ui::Text::RichLangValue
 					) | rpl::start_with_next([=](TextWithEntities t) {
 						l->setMarkedText(std::move(t), makeContext(l));
@@ -406,6 +471,8 @@ void InnerWidget::fill() {
 						container,
 						tr::lng_channel_earn_learn_close(),
 						st::defaultActiveButton);
+					button->setTextTransform(
+						Ui::RoundButton::TextTransform::NoTransform);
 					button->resizeToWidth(box->width()
 						- st.buttonPadding.left()
 						- st.buttonPadding.left());
@@ -466,7 +533,7 @@ void InnerWidget::fill() {
 			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
 				st::channelEarnOverviewMajorLabel);
-			addEmojiToMajor(majorLabel, value);
+			addEmojiToMajor(majorLabel, value, {}, {});
 			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
 				MinorPart(value),
@@ -511,17 +578,18 @@ void InnerWidget::fill() {
 		addOverview(data.overallRevenue, tr::lng_channel_earn_total);
 		Ui::AddSkip(container);
 	}
+#ifndef _DEBUG
 	if (!channel->amCreator()) {
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 		return;
 	}
+#endif
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 	if (channel) {
 		const auto value = data.availableBalance;
-		Ui::AddSkip(container);
 		AddHeader(container, tr::lng_channel_earn_balance_title);
 		Ui::AddSkip(container);
 
@@ -533,7 +601,11 @@ void InnerWidget::fill() {
 		const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
 			st::channelEarnBalanceMajorLabel);
-		addEmojiToMajor(majorLabel, value);
+		{
+			const auto &m = st::channelEarnCurrencyCommonMargins;
+			const auto p = QMargins(m.left(), 0, m.right(), m.bottom());
+			addEmojiToMajor(majorLabel, value, {}, p);
+		}
 		majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 		const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
@@ -616,9 +688,6 @@ void InnerWidget::fill() {
 			: tr::lng_channel_earn_balance_about_temp);
 		Ui::AddSkip(container);
 	}
-	Ui::AddSkip(container);
-	Ui::AddDivider(container);
-	Ui::AddSkip(container);
 	{
 		AddHeader(container, tr::lng_channel_earn_history_title);
 		Ui::AddSkip(container);
@@ -683,20 +752,16 @@ void InnerWidget::fill() {
 			const auto color = (isIn
 				? st::boxTextFgGood
 				: st::menuIconAttentionColor)->c;
-			const auto majorText = (isIn ? '+' : kMinus)
-				+ MajorPart(entry.amount);
 			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				wrap,
-				majorText,
 				st::channelEarnHistoryMajorLabel);
+			addEmojiToMajor(majorLabel, entry.amount, isIn, {});
 			majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 			majorLabel->setTextColorOverride(color);
-			const auto minorText = MinorPart(entry.amount)
-				+ ' '
-				+ currency;
+			const auto minorText = MinorPart(entry.amount);
 			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				wrap,
-				minorText,
+				rpl::single(minorText),
 				st::channelEarnHistoryMinorLabel);
 			minorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 			minorLabel->setTextColorOverride(color);
@@ -705,7 +770,7 @@ void InnerWidget::fill() {
 				rpl::single(QString()));
 			Ui::ToggleChildrenVisibility(wrap, true);
 
-			const auto detailsBox = [=, peer = _peer](
+			const auto detailsBox = [=, amount = entry.amount, peer = _peer](
 					not_null<Ui::GenericBox*> box) {
 				Ui::AddSkip(box->verticalLayout());
 				Ui::AddSkip(box->verticalLayout());
@@ -716,8 +781,8 @@ void InnerWidget::fill() {
 
 				const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 					labels,
-					majorText,
 					st::channelEarnOverviewMajorLabel);
+				addEmojiToMajor(majorLabel, amount, isIn, {});
 				majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 				majorLabel->setTextColorOverride(color);
 				const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(

From bb438880e3f1b54de022ef09b864a746c157a7e2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 1 Apr 2024 04:35:54 +0300
Subject: [PATCH 183/596] Added ability to view all of user's own groups.

---
 .../SourceFiles/window/window_main_menu.cpp   | 74 ++++++++++++-------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index f15aeb484..d94e1648b 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -52,6 +52,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_account.h"
 #include "main/main_domain.h"
 #include "mtproto/mtproto_config.h"
+#include "data/data_chat.h"
 #include "data/data_document_media.h"
 #include "data/data_folder.h"
 #include "data/data_session.h"
@@ -111,7 +112,8 @@ public:
 
 not_null<Ui::SettingsButton*> AddMyChannelsBox(
 		not_null<Ui::SettingsButton*> button,
-		not_null<SessionController*> controller) {
+		not_null<SessionController*> controller,
+		bool chats) {
 	button->setAcceptBoth(true);
 
 	const auto myChannelsBox = [=](not_null<Ui::GenericBox*> box) {
@@ -126,16 +128,21 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 		public:
 			using Ui::SettingsButton::SettingsButton;
 
-			void setPeer(not_null<ChannelData*> c) {
-				_text.setText(st::defaultPeerListItem.nameStyle, c->name());
+			void setPeer(not_null<PeerData*> p) {
+				const auto c = p->asChannel();
+				const auto g = p->asChat();
+				_text.setText(st::defaultPeerListItem.nameStyle, p->name());
+				const auto count = c ? c->membersCount() : g->count;
 				_status.setText(
 					st::defaultTextStyle,
-					!c->username().isEmpty()
-						? ('@' + c->username())
-						: tr::lng_chat_status_subscribers(
+					!p->userName().isEmpty()
+						? ('@' + p->userName())
+						: count
+						? tr::lng_chat_status_subscribers(
 							tr::now,
 							lt_count,
-							c->membersCount()));
+							count)
+						: QString());
 			}
 
 			int resizeGetHeight(int) override {
@@ -168,34 +175,42 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 
 		};
 
-		controller->session().data().enumerateBroadcasts([&](
-				not_null<ChannelData*> channel) {
-			if (!channel->amCreator()) {
-				return;
-			}
-
+		const auto add = [&](not_null<PeerData*> peer) {
 			const auto row = box->addRow(
 				object_ptr<Button>(box, rpl::single(QString())),
 				{});
-			row->setPeer(channel);
+			row->setPeer(peer);
 			row->setClickedCallback([=] {
-				controller->showPeerHistory(channel);
+				controller->showPeerHistory(peer);
 			});
-			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
-				row,
-				channel,
-				*st);
+			using Button = Ui::UserpicButton;
+			const auto userpic = Ui::CreateChild<Button>(row, peer, *st);
 			userpic->move(st::defaultPeerListItem.photoPosition);
 			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
-		});
+		};
+
+		const auto &data = controller->session().data();
+		if (chats) {
+			data.enumerateGroups([&](not_null<PeerData*> peer) {
+				const auto c = peer->asChannel();
+				const auto g = peer->asChat();
+				if ((c && c->amCreator()) || (g && g->amCreator())) {
+					add(peer);
+				}
+			});
+		} else {
+			data.enumerateBroadcasts([&](not_null<ChannelData*> channel) {
+				if (channel->amCreator()) {
+					add(channel);
+				}
+			});
+		}
 	};
 
 	using Menu = base::unique_qptr<Ui::PopupMenu>;
 	const auto menu = button->lifetime().make_state<Menu>();
 	button->addClickHandler([=](Qt::MouseButton which) {
-		if ((which != Qt::RightButton)
-			|| !((button->clickModifiers() & Qt::ShiftModifier)
-				&& (button->clickModifiers() & Qt::AltModifier))) {
+		if (which != Qt::RightButton) {
 			return;
 		}
 
@@ -203,7 +218,7 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 			button,
 			st::defaultPopupMenu);
 		(*menu)->addAction(
-			u"My Channels"_q,
+			chats ? u"My Groups"_q : u"My Channels"_q,
 			[=] { controller->uiShow()->showBox(Box(myChannelsBox)); },
 			nullptr);
 		(*menu)->popup(QCursor::pos());
@@ -957,16 +972,19 @@ void MainMenu::setupMenu() {
 			std::move(descriptor));
 	};
 	if (!_controller->session().supportMode()) {
-		addAction(
+		AddMyChannelsBox(addAction(
 			tr::lng_create_group_title(),
 			{ &st::menuIconGroups }
-		)->setClickedCallback([=] {
-			controller->showNewGroup();
+		), controller, true)->addClickHandler([=](Qt::MouseButton which) {
+			if (which == Qt::LeftButton) {
+				controller->showNewGroup();
+			}
 		});
+
 		AddMyChannelsBox(addAction(
 			tr::lng_create_channel_title(),
 			{ &st::menuIconChannel }
-		), controller)->addClickHandler([=](Qt::MouseButton which) {
+		), controller, false)->addClickHandler([=](Qt::MouseButton which) {
 			if (which == Qt::LeftButton) {
 				controller->showNewChannel();
 			}

From 2795af8c7fd87e056efbe2805b796a44a94f9741 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 1 Apr 2024 05:55:59 +0300
Subject: [PATCH 184/596] Slightly improved style of channel earn info section.

---
 .../earn/channel_earn.style                   |  5 +++++
 .../earn/info_earn_inner_widget.cpp           | 20 ++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 3c20cedbf..01b72005a 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 using "ui/basic.style";
 using "boxes/boxes.style";
+using "statistics/statistics.style";
 
 channelEarnLearnArrowMargins: margins(-2px, 5px, 0px, 0px);
 
@@ -34,6 +35,10 @@ channelEarnSemiboldLabel: FlatLabel(channelEarnOverviewMajorLabel) {
 	style: TextStyle(semiboldTextStyle) {
 	}
 }
+channelEarnHeaderLabel: FlatLabel(channelEarnOverviewMajorLabel) {
+	style: TextStyle(statisticsHeaderTitleTextStyle) {
+	}
+}
 channelEarnHistorySubLabel: FlatLabel(channelEarnOverviewSubMinorLabel) {
 	style: TextStyle(defaultTextStyle) {
 		font: font(12px);
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 2d922d344..89606a2e3 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -124,7 +124,7 @@ void AddHeader(
 		object_ptr<Ui::FlatLabel>(
 			content,
 			text(),
-			st::channelEarnSemiboldLabel),
+			st::channelEarnHeaderLabel),
 		st::boxRowPadding);
 	header->resizeToWidth(header->width());
 }
@@ -515,11 +515,13 @@ void InnerWidget::fill() {
 			widget->setChartData(chart, Type::StackBar);
 			widget->setTitle(tr::lng_channel_earn_chart_revenue());
 		}
+	}
+	if (data.topHoursGraph.chart || data.revenueGraph.chart) {
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		Ui::AddDivider(container);
 		Ui::AddSkip(container);
 	}
-	Ui::AddSkip(container);
-	Ui::AddDivider(container);
-	Ui::AddSkip(container);
 	{
 		AddHeader(container, tr::lng_channel_earn_overview_title);
 		Ui::AddSkip(container, st::channelEarnOverviewTitleSkip);
@@ -540,7 +542,7 @@ void InnerWidget::fill() {
 				st::channelEarnOverviewMinorLabel);
 			const auto secondMinorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
-				ToUsd(value, multiplier),
+				value ? ToUsd(value, multiplier) : QString(),
 				st::channelEarnOverviewSubMinorLabel);
 			rpl::combine(
 				line->widthValue(),
@@ -688,7 +690,7 @@ void InnerWidget::fill() {
 			: tr::lng_channel_earn_balance_about_temp);
 		Ui::AddSkip(container);
 	}
-	{
+	if (!data.firstHistorySlice.list.empty()) {
 		AddHeader(container, tr::lng_channel_earn_history_title);
 		Ui::AddSkip(container);
 
@@ -995,10 +997,10 @@ void InnerWidget::fill() {
 				}
 			});
 		}
+		Ui::AddSkip(container);
+		Ui::AddDivider(container);
+		Ui::AddSkip(container);
 	}
-	Ui::AddSkip(container);
-	Ui::AddDivider(container);
-	Ui::AddSkip(container);
 	if (channel) {
 		constexpr auto kMaxCPM = 50; // Debug.
 		const auto requiredLevel = Data::LevelLimits(session)

From 3e968aecc86ff59e3408cb2290bddf1168b71cba Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 1 Apr 2024 06:57:09 +0300
Subject: [PATCH 185/596] Added link for learn more about currency from channel
 earn section.

---
 .../earn/info_earn_inner_widget.cpp           | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 89606a2e3..04d46a0b5 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -12,16 +12,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "boxes/peers/edit_peer_color_box.h" // AddLevelBadge.
 #include "chat_helpers/stickers_emoji_pack.h"
+#include "core/application.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_channel.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
+#include "data/data_web_page.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "history/view/controls/history_view_webpage_processor.h"
 #include "info/channel_statistics/earn/earn_format.h"
 #include "info/channel_statistics/earn/info_earn_widget.h"
 #include "info/info_controller.h"
 #include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
 #include "info/statistics/info_statistics_inner_widget.h" // FillLoading.
+#include "iv/iv_instance.h"
 #include "lang/lang_keys.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
@@ -70,6 +74,39 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
 	menu->popup(QCursor::pos());
 }
 
+[[nodiscard]] ClickHandlerPtr LearnMoreCurrencyLink(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::GenericBox*> box) {
+	const auto url = u"https://telegram.org/blog/monetization-for-channels"_q;
+
+	using Resolver = HistoryView::Controls::WebpageResolver;
+	const auto resolver = box->lifetime().make_state<Resolver>(
+		&controller->session());
+	resolver->request(url);
+	return std::make_shared<GenericClickHandler>([=](ClickContext context) {
+		if (context.button != Qt::LeftButton) {
+			return;
+		}
+		const auto data = resolver->lookup(url);
+		const auto iv = data ? (*data)->iv.get() : nullptr;
+		if (iv) {
+			Core::App().iv().show(controller, iv, QString());
+		} else {
+			resolver->resolved(
+			) | rpl::start_with_next([=](const QString &s) {
+				if (s == url) {
+					if (const auto d = resolver->lookup(url)) {
+						if (const auto iv = (*d)->iv.get()) {
+							Core::App().iv().show(controller, iv, QString());
+						}
+					}
+				}
+			}, box->lifetime());
+			resolver->request(url);
+		}
+	});
+}
+
 [[nodiscard]] QByteArray CurrencySvg(const QColor &c) {
 	const auto color = u"rgb(%1,%2,%3)"_q
 		.arg(c.red())
@@ -461,6 +498,11 @@ void InnerWidget::fill() {
 						l->resizeToWidth(box->width()
 							- rect::m::sum::h(st::boxRowPadding));
 					}, label->lifetime());
+					label->setLink(
+						1,
+						LearnMoreCurrencyLink(
+							_controller->parentController(),
+							box));
 				}
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);

From f95817861af4373688db49ad507b0774100c40d7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 10:19:18 +0400
Subject: [PATCH 186/596] Fix build on Windows.

---
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 2 +-
 Telegram/SourceFiles/menu/menu_sponsored.cpp                  | 4 ++--
 .../SourceFiles/statistics/statistics_data_deserialize.cpp    | 3 ++-
 Telegram/lib_ui                                               | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 229b37636..4d3cd7f95 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3253,7 +3253,7 @@ not_null<QWidget*> OverlayWidget::widget() const {
 
 void OverlayWidget::hide() {
 	clearBeforeHide();
-	applyHideWindowWorkaround();
+	//applyHideWindowWorkaround();
 	_window->hide();
 }
 
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 3d7105fe9..bb8109d2b 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -143,7 +143,7 @@ void AboutBox(
 				lt_link,
 				tr::lng_settings_privacy_premium_link(
 				) | rpl::map([=](QString t) {
-					return Ui::Text::Link(t, kUrl.utf8());
+					return Ui::Text::Link(t, kUrl.utf16());
 				}),
 				Ui::Text::RichLangValue),
 			st::sponsoredAboutRemoveIcon);
@@ -179,7 +179,7 @@ void AboutBox(
 				rpl::single(arrow),
 				Ui::Text::RichLangValue
 			) | rpl::map([=](TextWithEntities text) {
-				return Ui::Text::Link(std::move(text), kUrl.utf8());
+				return Ui::Text::Link(std::move(text), kUrl.utf16());
 			}),
 			Ui::Text::RichLangValue
 		) | rpl::start_with_next([=, l = label](
diff --git a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
index e6368052e..ac649cf13 100644
--- a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
+++ b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
@@ -61,7 +61,8 @@ Data::StatisticalChart StatisticalChartFromJSON(const QByteArray &json) {
 			line.isHiddenOnStart = ranges::contains(hiddenLines, columnId);
 			line.y.resize(length);
 			for (auto i = 0; i < length; i++) {
-				const auto value = array.at(i + 1).toInteger();
+				const auto value = int(base::SafeRound(
+					array.at(i + 1).toDouble()));
 				line.y[i] = value;
 				if (value > line.maxValue) {
 					line.maxValue = value;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 476d75125..bdf4ff34f 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 476d751251c8571e11260b7c712c885f4191d717
+Subproject commit bdf4ff34f24ef75d5209addf756633f9db6cb232

From 139d1a9aa369a377a52d24f9cde66fb509f30c61 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 11:20:11 +0400
Subject: [PATCH 187/596] Allow saving just the sticker in custom intro.

---
 Telegram/SourceFiles/data/business/data_business_common.h   | 6 +++++-
 .../SourceFiles/history/view/history_view_about_view.cpp    | 4 ++--
 .../SourceFiles/settings/business/settings_chat_intro.cpp   | 3 ---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/business/data_business_common.h b/Telegram/SourceFiles/data/business/data_business_common.h
index dc9f65256..d6f4121a6 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.h
+++ b/Telegram/SourceFiles/data/business/data_business_common.h
@@ -187,10 +187,14 @@ struct ChatIntro {
 	QString description;
 	DocumentData *sticker = nullptr;
 
-	explicit operator bool() const {
+	[[nodiscard]] bool customPhrases() const {
 		return !title.isEmpty() || !description.isEmpty();
 	}
 
+	explicit operator bool() const {
+		return customPhrases() || sticker;
+	}
+
 	friend inline bool operator==(
 		const ChatIntro &a,
 		const ChatIntro &b) = default;
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index a748f962d..924035744 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -95,10 +95,10 @@ auto GenerateChatIntro(
 				margins,
 				links));
 		};
-		const auto title = data
+		const auto title = data.customPhrases()
 			? data.title
 			: tr::lng_chat_intro_default_title(tr::now);
-		const auto description = data
+		const auto description = data.customPhrases()
 			? data.description
 			: tr::lng_chat_intro_default_message(tr::now);
 		pushText(Ui::Text::Bold(title), st::chatIntroTitleMargin);
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 0be98f8fa..e7da8a27f 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -649,9 +649,6 @@ void ChatIntro::setupContent(
 void ChatIntro::save() {
 	const auto show = controller()->uiShow();
 	const auto fail = [=](QString error) {
-		if (error == u"BUSINESS_RECIPIENTS_EMPTY"_q) {
-			show->showToast(tr::lng_greeting_recipients_empty(tr::now));
-		}
 	};
 	controller()->session().data().businessInfo().saveChatIntro(
 		_intro.current(),

From d35c8232d2caa7592b3231e114a56257c0fe3dcd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 12:47:23 +0400
Subject: [PATCH 188/596] Fix send-messages privacy phrase.

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

diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index eb5d0e78a..404cb9d62 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -296,7 +296,7 @@ void AddMessagesPrivacyButton(
 	const auto privacy = &session->api().globalPrivacy();
 	auto label = rpl::conditional(
 		privacy->newRequirePremium(),
-		tr::lng_edit_privacy_premium(),
+		tr::lng_edit_privacy_contacts_and_premium(),
 		tr::lng_edit_privacy_everyone());
 	const auto &st = st::settingsButtonNoIcon;
 	const auto button = AddButtonWithLabel(

From d21418cf04e5a2439a991191f5e8e0e2439b1525 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 12:47:38 +0400
Subject: [PATCH 189/596] Handle already-premium state in gift link usage.

---
 Telegram/Resources/langs/lang.strings         |  5 +-
 .../SourceFiles/boxes/gift_premium_box.cpp    | 62 ++++++++++++++++---
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f63f63e72..f080928c0 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1103,7 +1103,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_privacy_everyone" = "Everybody";
 "lng_edit_privacy_contacts" = "My contacts";
 "lng_edit_privacy_close_friends" = "Close friends";
-"lng_edit_privacy_contacts_and_premium" = "Contacts and Premium";
+"lng_edit_privacy_contacts_and_premium" = "Contacts & Premium";
 "lng_edit_privacy_nobody" = "Nobody";
 "lng_edit_privacy_premium" = "Premium users";
 "lng_edit_privacy_exceptions" = "Add exceptions";
@@ -2687,6 +2687,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_link_also_send" = "You can also {link} to a friend as a gift.";
 "lng_gift_link_also_send_link" = "send this link";
 "lng_gift_link_use" = "Use Link";
+"lng_gift_link_already_title" = "You already have Telegram Premium";
+"lng_gift_link_already_about" = "You can activate this link after {date} or {link} to a friend.";
+"lng_gift_link_already_link" = "send the link";
 "lng_gift_link_used_title" = "Used Gift Link";
 "lng_gift_link_used_about" = "This link was used to activate\na **Telegram Premium** subscription.";
 "lng_gift_link_used_footer" = "This link was used on {date}.";
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 1cac5db25..fb4c25c2c 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -45,6 +45,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rect.h"
 #include "ui/vertical_list.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/gradient_round_button.h"
 #include "ui/wrap/padding_wrap.h"
@@ -892,6 +893,52 @@ void AddTable(
 	}
 }
 
+void ShareWithFriend(
+		not_null<Window::SessionNavigation*> navigation,
+		const QString &slug) {
+	const auto chosen = [=](not_null<Data::Thread*> thread) {
+		const auto content = navigation->parentController()->content();
+		return content->shareUrl(
+			thread,
+			MakeGiftCodeLink(&navigation->session(), slug).link,
+			QString());
+	};
+	Window::ShowChooseRecipientBox(navigation, chosen);
+}
+
+[[nodiscard]] void ShowAlreadyPremiumToast(
+		not_null<Window::SessionNavigation*> navigation,
+		const QString &slug,
+		TimeId date) {
+	const auto instance = std::make_shared<
+		base::weak_ptr<Ui::Toast::Instance>
+	>();
+	const auto shareLink = [=](
+			const ClickHandlerPtr &,
+			Qt::MouseButton button) {
+		if (button == Qt::LeftButton) {
+			if (const auto strong = instance->get()) {
+				strong->hideAnimated();
+			}
+			ShareWithFriend(navigation, slug);
+		}
+		return false;
+	};
+	*instance = navigation->showToast({
+		.title = tr::lng_gift_link_already_title(tr::now),
+		.text = tr::lng_gift_link_already_about(
+			tr::now,
+			lt_date,
+			Ui::Text::Bold(langDateTime(base::unixtime::parse(date))),
+			lt_link,
+			Ui::Text::Link(
+				Ui::Text::Bold(tr::lng_gift_link_already_link(tr::now))),
+			Ui::Text::WithEntities),
+		.duration = 6 * crl::time(1000),
+		.filter = crl::guard(navigation, shareLink),
+	});
+}
+
 } // namespace
 
 GiftPremiumValidator::GiftPremiumValidator(
@@ -1157,14 +1204,7 @@ void GiftCodeBox(
 			st::giveawayGiftCodeFooter),
 		st::giveawayGiftCodeFooterMargin);
 	footer->setClickHandlerFilter([=](const auto &...) {
-		const auto chosen = [=](not_null<Data::Thread*> thread) {
-			const auto content = controller->parentController()->content();
-			return content->shareUrl(
-				thread,
-				MakeGiftCodeLink(&controller->session(), slug).link,
-				QString());
-		};
-		Window::ShowChooseRecipientBox(controller, chosen);
+		ShareWithFriend(controller, slug);
 		return false;
 	});
 
@@ -1189,14 +1229,20 @@ void GiftCodeBox(
 		} else if (!state->sent) {
 			state->sent = true;
 			const auto done = crl::guard(box, [=](const QString &error) {
+				const auto activePrefix = u"PREMIUM_SUB_ACTIVE_UNTIL_"_q;
 				if (error.isEmpty()) {
 					auto copy = state->data.current();
 					copy.used = base::unixtime::now();
 					state->data = std::move(copy);
 
 					Ui::StartFireworks(box->parentWidget());
+				} else if (error.startsWith(activePrefix)) {
+					const auto date = error.mid(activePrefix.size()).toInt();
+					ShowAlreadyPremiumToast(controller, slug, date);
+					state->sent = false;
 				} else {
 					box->uiShow()->showToast(error);
+					state->sent = false;
 				}
 			});
 			controller->session().api().premium().applyGiftCode(slug, done);

From 8cbb1abff2af65636621c43f92993f21283e942f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 12:59:25 +0400
Subject: [PATCH 190/596] Fix wrong non-album image size in send preview.

Regression was introduced in 84288112fc2.
---
 Telegram/SourceFiles/storage/storage_media_prepare.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index 8b04450cf..36fa14097 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -293,8 +293,11 @@ void PrepareDetails(PreparedFile &file, int previewWidth, int sideLimit) {
 		if (ValidPhotoForAlbum(*image, file.information->filemime)) {
 			UpdateImageDetails(file, previewWidth, sideLimit);
 			file.type = PreparedFile::Type::Photo;
-		} else if (image->animated) {
-			file.type = PreparedFile::Type::None;
+		} else {
+			file.originalDimensions = image->data.size();
+			if (image->animated) {
+				file.type = PreparedFile::Type::None;
+			}
 		}
 	} else if (const auto video = std::get_if<Video>(
 			&file.information->media)) {

From 1e6fb202f0b2964b44719ce671dd90d2cb4889dd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 16:17:42 +0400
Subject: [PATCH 191/596] Re-apply "Disable system proxy support on Linux".

This reverts commit c71c24a6bca2db0b836910264047a24630f8ffea.
---
 Telegram/SourceFiles/core/sandbox.cpp | 7 +++++--
 cmake                                 | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 6feacdb5b..fb145f7f1 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QSessionManager>
 #include <QtGui/QScreen>
 #include <QtGui/qpa/qplatformscreen.h>
+#include <ksandbox.h>
 
 namespace Core {
 namespace {
@@ -517,8 +518,10 @@ void Sandbox::refreshGlobalProxy() {
 		|| proxy.type == MTP::ProxyData::Type::Http) {
 		QNetworkProxy::setApplicationProxy(
 			MTP::ToNetworkProxy(MTP::ToDirectIpProxy(proxy)));
-	} else if (!Core::IsAppLaunched()
-		|| Core::App().settings().proxy().isSystem()) {
+	} else if ((!Core::IsAppLaunched()
+		|| Core::App().settings().proxy().isSystem())
+		// this works stable only in sandboxed environment where it works through portal
+		&& (!Platform::IsLinux() || KSandbox::isInside() || cDebugMode())) {
 		QNetworkProxyFactory::setUseSystemConfiguration(true);
 	} else {
 		QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);
diff --git a/cmake b/cmake
index 199ce0e7c..b875d0ae2 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 199ce0e7c8b6e6ce939491ac7ee5973129e6e2eb
+Subproject commit b875d0ae2bf457ec94aaddd08431753e14ec71ac

From 5741bd9cca3ee0cba7de5ed0ba2f8232ddaf2a48 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 17:03:04 +0400
Subject: [PATCH 192/596] Support "premiums and ..." privacy editing.

---
 Telegram/Resources/langs/lang.strings         |   4 +
 Telegram/SourceFiles/api/api_user_privacy.cpp |  21 +-
 Telegram/SourceFiles/api/api_user_privacy.h   |   9 +-
 .../SourceFiles/boxes/edit_privacy_box.cpp    | 265 ++++++++++++++++--
 Telegram/SourceFiles/boxes/edit_privacy_box.h |  10 +-
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  22 +-
 Telegram/SourceFiles/boxes/peer_list_box.h    |   3 +
 Telegram/SourceFiles/data/data_birthday.h     |   2 +-
 Telegram/SourceFiles/settings/settings.style  |   1 +
 .../settings/settings_information.cpp         |   5 +-
 .../SourceFiles/settings/settings_main.cpp    |   5 +-
 .../settings/settings_privacy_controllers.cpp |   5 +
 .../settings/settings_privacy_controllers.h   |   1 +
 .../settings/settings_privacy_security.cpp    |  30 +-
 14 files changed, 328 insertions(+), 55 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f080928c0..706824f92 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1107,9 +1107,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_privacy_nobody" = "Nobody";
 "lng_edit_privacy_premium" = "Premium users";
 "lng_edit_privacy_exceptions" = "Add exceptions";
+"lng_edit_privacy_user_types" = "User types";
+"lng_edit_privacy_users_and_groups" = "Users and groups";
+"lng_edit_privacy_premium_status" = "all Telegram Premium subscribers";
 
 "lng_edit_privacy_exceptions_count#one" = "{count} user";
 "lng_edit_privacy_exceptions_count#other" = "{count} users";
+"lng_edit_privacy_exceptions_premium_and" = "Premium & {users}";
 "lng_edit_privacy_exceptions_add" = "Add users or groups";
 
 "lng_edit_privacy_phone_number_title" = "Phone number privacy";
diff --git a/Telegram/SourceFiles/api/api_user_privacy.cpp b/Telegram/SourceFiles/api/api_user_privacy.cpp
index ce9dc91f9..dd5693cee 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -26,7 +26,9 @@ using TLInputRules = MTPVector<MTPInputPrivacyRule>;
 using TLRules = MTPVector<MTPPrivacyRule>;
 
 TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
-	const auto collectInputUsers = [](const auto &peers) {
+	using Exceptions = UserPrivacy::Exceptions;
+	const auto collectInputUsers = [](const Exceptions &exceptions) {
+		const auto &peers = exceptions.peers;
 		auto result = QVector<MTPInputUser>();
 		result.reserve(peers.size());
 		for (const auto &peer : peers) {
@@ -36,7 +38,8 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 		}
 		return result;
 	};
-	const auto collectInputChats = [](const auto &peers) {
+	const auto collectInputChats = [](const Exceptions &exceptions) {
+		const auto &peers = exceptions.peers;
 		auto result = QVector<MTPlong>();
 		result.reserve(peers.size());
 		for (const auto &peer : peers) {
@@ -47,6 +50,7 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 		return result;
 	};
 
+	using Option = UserPrivacy::Option;
 	auto result = QVector<MTPInputPrivacyRule>();
 	result.reserve(kMaxRules);
 	if (!rule.ignoreAlways) {
@@ -62,6 +66,9 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 				MTP_inputPrivacyValueAllowChatParticipants(
 					MTP_vector<MTPlong>(chats)));
 		}
+		if (rule.always.premiums && (rule.option != Option::Everyone)) {
+			result.push_back(MTP_inputPrivacyValueAllowPremium());
+		}
 	}
 	if (!rule.ignoreNever) {
 		const auto users = collectInputUsers(rule.never);
@@ -78,14 +85,11 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 		}
 	}
 	result.push_back([&] {
-		using Option = UserPrivacy::Option;
 		switch (rule.option) {
 		case Option::Everyone: return MTP_inputPrivacyValueAllowAll();
 		case Option::Contacts: return MTP_inputPrivacyValueAllowContacts();
 		case Option::CloseFriends:
 			return MTP_inputPrivacyValueAllowCloseFriends();
-		case Option::ContactsAndPremium:
-			return MTP_inputPrivacyValueAllowPremium();
 		case Option::Nobody: return MTP_inputPrivacyValueDisallowAll();
 		}
 		Unexpected("Option value in Api::UserPrivacy::RulesToTL.");
@@ -102,6 +106,7 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 	using Option = UserPrivacy::Option;
 	auto result = UserPrivacy::Rule();
 	auto optionSet = false;
+	auto allowPremium = false;
 	const auto setOption = [&](Option option) {
 		if (optionSet) {
 			return;
@@ -109,8 +114,8 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 		optionSet = true;
 		result.option = option;
 	};
-	auto &always = result.always;
-	auto &never = result.never;
+	auto &always = result.always.peers;
+	auto &never = result.never.peers;
 	const auto feed = [&](const MTPPrivacyRule &rule) {
 		rule.match([&](const MTPDprivacyValueAllowAll &) {
 			setOption(Option::Everyone);
@@ -119,7 +124,7 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 		}, [&](const MTPDprivacyValueAllowCloseFriends &) {
 			setOption(Option::CloseFriends);
 		}, [&](const MTPDprivacyValueAllowPremium &) {
-			setOption(Option::ContactsAndPremium);
+			result.always.premiums = true;
 		}, [&](const MTPDprivacyValueAllowUsers &data) {
 			const auto &users = data.vusers().v;
 			always.reserve(always.size() + users.size());
diff --git a/Telegram/SourceFiles/api/api_user_privacy.h b/Telegram/SourceFiles/api/api_user_privacy.h
index 884000fb7..471f41f48 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.h
+++ b/Telegram/SourceFiles/api/api_user_privacy.h
@@ -36,13 +36,16 @@ public:
 		Everyone,
 		Contacts,
 		CloseFriends,
-		ContactsAndPremium,
 		Nobody,
 	};
+	struct Exceptions {
+		std::vector<not_null<PeerData*>> peers;
+		bool premiums = false;
+	};
 	struct Rule {
 		Option option = Option::Everyone;
-		std::vector<not_null<PeerData*>> always;
-		std::vector<not_null<PeerData*>> never;
+		Exceptions always;
+		Exceptions never;
 		bool ignoreAlways = false;
 		bool ignoreNever = false;
 	};
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 9dfcf5ade..031fe5ee6 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -8,6 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/edit_privacy_box.h"
 
 #include "api/api_global_privacy.h"
+#include "boxes/filters/edit_filter_chats_list.h"
+#include "ui/effects/premium_graphics.h"
 #include "ui/layers/generic_box.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/shadow.h"
@@ -30,12 +32,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_peer_values.h"
 #include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
 #include "styles/style_settings.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 
 namespace {
-namespace {
+
+constexpr auto kPremiumsRowId = PeerId(FakeChatId(BareId(1))).value;
+
+using Exceptions = Api::UserPrivacy::Exceptions;
 
 void CreateRadiobuttonLock(
 		not_null<Ui::RpWidget*> widget,
@@ -90,37 +96,167 @@ void AddPremiumRequiredRow(
 	}, row->lifetime());
 }
 
-} // namespace
-
 class PrivacyExceptionsBoxController : public ChatsListBoxController {
 public:
 	PrivacyExceptionsBoxController(
 		not_null<Main::Session*> session,
 		rpl::producer<QString> title,
-		const std::vector<not_null<PeerData*>> &selected);
+		const Exceptions &selected,
+		bool allowChoosePremiums);
 
 	Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
+	bool isForeignRow(PeerListRowId itemId) override;
+	bool handleDeselectForeignRow(PeerListRowId itemId) override;
+
+	[[nodiscard]] bool premiumsSelected() const;
 
 protected:
 	void prepareViewHook() override;
 	std::unique_ptr<Row> createRow(not_null<History*> history) override;
 
 private:
+	[[nodiscard]] object_ptr<Ui::RpWidget> preparePremiumsRowList();
+
 	const not_null<Main::Session*> _session;
 	rpl::producer<QString> _title;
-	std::vector<not_null<PeerData*>> _selected;
+	Exceptions _selected;
+	bool _allowChoosePremiums = false;
+
+	PeerListContentDelegate *_typesDelegate = nullptr;
+	Fn<void(PeerListRowId)> _deselectOption;
 
 };
 
+struct RowSelectionChange {
+	not_null<PeerListRow*> row;
+	bool checked = false;
+};
+
+class PremiumsRow final : public PeerListRow {
+public:
+	PremiumsRow();
+
+	QString generateName() override;
+	QString generateShortName() override;
+	PaintRoundImageCallback generatePaintUserpicCallback(
+		bool forceRound) override;
+	bool useForumLikeUserpic() const override;
+
+};
+
+class TypesController final : public PeerListController {
+public:
+	TypesController(not_null<Main::Session*> session, bool premiums);
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+
+	[[nodiscard]] bool premiumsSelected() const;
+	[[nodiscard]] rpl::producer<bool> premiumsChanges() const;
+	[[nodiscard]] auto rowSelectionChanges() const
+		-> rpl::producer<RowSelectionChange>;
+
+private:
+	[[nodiscard]] std::unique_ptr<PeerListRow> createRow() const;
+
+	const not_null<Main::Session*> _session;
+	bool _premiums = false;
+
+	rpl::event_stream<> _selectionChanged;
+	rpl::event_stream<RowSelectionChange> _rowSelectionChanges;
+
+};
+
+PremiumsRow::PremiumsRow() : PeerListRow(kPremiumsRowId) {
+	setCustomStatus(tr::lng_edit_privacy_premium_status(tr::now));
+}
+
+QString PremiumsRow::generateName() {
+	return tr::lng_edit_privacy_premium(tr::now);
+}
+
+QString PremiumsRow::generateShortName() {
+	return generateName();
+}
+
+PaintRoundImageCallback PremiumsRow::generatePaintUserpicCallback(
+		bool forceRound) {
+	return [=](QPainter &p, int x, int y, int outerWidth, int size) {
+		auto gradient = QLinearGradient(
+			QPointF(x, y),
+			QPointF(x + size, y + size));
+		gradient.setStops(Ui::Premium::ButtonGradientStops());
+
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(gradient);
+		if (forceRound) {
+			p.drawEllipse(x, y, size, size);
+		} else {
+			const auto radius = size * Ui::ForumUserpicRadiusMultiplier();
+			p.drawRoundedRect(x, y, size, size, radius, radius);
+		}
+		st::settingsPrivacyPremium.paintInCenter(p, { x, y, size, size });
+	};
+}
+
+bool PremiumsRow::useForumLikeUserpic() const {
+	return true;
+}
+
+TypesController::TypesController(
+	not_null<Main::Session*> session,
+	bool premiums)
+: _session(session)
+, _premiums(premiums) {
+}
+
+Main::Session &TypesController::session() const {
+	return *_session;
+}
+
+void TypesController::prepare() {
+	delegate()->peerListAppendRow(std::make_unique<PremiumsRow>());
+	delegate()->peerListRefreshRows();
+}
+
+bool TypesController::premiumsSelected() const {
+	const auto row = delegate()->peerListFindRow(kPremiumsRowId);
+	Assert(row != nullptr);
+
+	return row->checked();
+}
+
+void TypesController::rowClicked(not_null<PeerListRow*> row) {
+	const auto checked = !row->checked();
+	delegate()->peerListSetRowChecked(row, checked);
+	_rowSelectionChanges.fire({ row, checked });
+}
+
+rpl::producer<bool> TypesController::premiumsChanges() const {
+	return _rowSelectionChanges.events(
+	) | rpl::map([=] {
+		return premiumsSelected();
+	});
+}
+
+auto TypesController::rowSelectionChanges() const
+-> rpl::producer<RowSelectionChange> {
+	return _rowSelectionChanges.events();
+}
+
 PrivacyExceptionsBoxController::PrivacyExceptionsBoxController(
 	not_null<Main::Session*> session,
 	rpl::producer<QString> title,
-	const std::vector<not_null<PeerData*>> &selected)
+	const Exceptions &selected,
+	bool allowChoosePremiums)
 : ChatsListBoxController(session)
 , _session(session)
 , _title(std::move(title))
-, _selected(selected) {
+, _selected(selected)
+, _allowChoosePremiums(allowChoosePremiums) {
 }
 
 Main::Session &PrivacyExceptionsBoxController::session() const {
@@ -129,7 +265,81 @@ Main::Session &PrivacyExceptionsBoxController::session() const {
 
 void PrivacyExceptionsBoxController::prepareViewHook() {
 	delegate()->peerListSetTitle(std::move(_title));
-	delegate()->peerListAddSelectedPeers(_selected);
+	if (_allowChoosePremiums || _selected.premiums) {
+		delegate()->peerListSetAboveWidget(preparePremiumsRowList());
+	}
+	delegate()->peerListAddSelectedPeers(_selected.peers);
+}
+
+bool PrivacyExceptionsBoxController::isForeignRow(PeerListRowId itemId) {
+	return (itemId == kPremiumsRowId);
+}
+
+bool PrivacyExceptionsBoxController::handleDeselectForeignRow(
+		PeerListRowId itemId) {
+	if (isForeignRow(itemId)) {
+		_deselectOption(itemId);
+		return true;
+	}
+	return false;
+}
+
+auto PrivacyExceptionsBoxController::preparePremiumsRowList()
+-> object_ptr<Ui::RpWidget> {
+	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = result.data();
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_edit_privacy_user_types()));
+	auto &lifetime = container->lifetime();
+	_typesDelegate = lifetime.make_state<PeerListContentDelegateSimple>();
+	const auto controller = lifetime.make_state<TypesController>(
+		&session(),
+		_selected.premiums);
+	const auto content = result->add(object_ptr<PeerListContent>(
+		container,
+		controller));
+	_typesDelegate->setContent(content);
+	controller->setDelegate(_typesDelegate);
+
+	if (_selected.premiums) {
+		const auto row = _typesDelegate->peerListFindRow(kPremiumsRowId);
+		Assert(row != nullptr);
+
+		content->changeCheckState(row, true, anim::type::instant);
+		this->delegate()->peerListSetForeignRowChecked(
+			row,
+			true,
+			anim::type::instant);
+	}
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_edit_privacy_users_and_groups()));
+
+	controller->premiumsChanges(
+	) | rpl::start_with_next([=](bool premiums) {
+		_selected.premiums = premiums;
+	}, lifetime);
+
+	controller->rowSelectionChanges(
+	) | rpl::start_with_next([=](RowSelectionChange update) {
+		this->delegate()->peerListSetForeignRowChecked(
+			update.row,
+			update.checked,
+			anim::type::normal);
+	}, lifetime);
+
+	_deselectOption = [=](PeerListRowId itemId) {
+		if (const auto row = _typesDelegate->peerListFindRow(itemId)) {
+			_typesDelegate->peerListSetRowChecked(row, false);
+		}
+	};
+
+	return result;
+}
+
+[[nodiscard]] bool PrivacyExceptionsBoxController::premiumsSelected() const {
+	return _selected.premiums;
 }
 
 void PrivacyExceptionsBoxController::rowClicked(not_null<PeerListRow*> row) {
@@ -145,7 +355,8 @@ void PrivacyExceptionsBoxController::rowClicked(not_null<PeerListRow*> row) {
 	}
 }
 
-std::unique_ptr<PrivacyExceptionsBoxController::Row> PrivacyExceptionsBoxController::createRow(not_null<History*> history) {
+auto PrivacyExceptionsBoxController::createRow(not_null<History*> history)
+-> std::unique_ptr<Row> {
 	if (history->peer->isSelf() || history->peer->isRepliesChat()) {
 		return nullptr;
 	} else if (!history->peer->isUser()
@@ -210,11 +421,13 @@ void EditPrivacyBox::editExceptions(
 	auto controller = std::make_unique<PrivacyExceptionsBoxController>(
 		&_window->session(),
 		_controller->exceptionBoxTitle(exception),
-		exceptions(exception));
+		exceptions(exception),
+		_controller->allowPremiumsToggle(exception));
 	auto initBox = [=, controller = controller.get()](
 			not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_settings_save(), crl::guard(this, [=] {
-			exceptions(exception) = box->collectSelectedRows();
+			exceptions(exception).peers = box->collectSelectedRows();
+			exceptions(exception).premiums = controller->premiumsSelected();
 			const auto type = [&] {
 				switch (exception) {
 				case Exception::Always: return Exception::Never;
@@ -222,8 +435,8 @@ void EditPrivacyBox::editExceptions(
 				}
 				Unexpected("Invalid exception value.");
 			}();
-			auto &removeFrom = exceptions(type);
-			for (const auto peer : exceptions(exception)) {
+			auto &removeFrom = exceptions(type).peers;
+			for (const auto peer : exceptions(exception).peers) {
 				removeFrom.erase(
 					ranges::remove(removeFrom, peer),
 					end(removeFrom));
@@ -237,7 +450,7 @@ void EditPrivacyBox::editExceptions(
 		Box<PeerListBox>(std::move(controller), std::move(initBox)));
 }
 
-std::vector<not_null<PeerData*>> &EditPrivacyBox::exceptions(Exception exception) {
+EditPrivacyBox::Exceptions &EditPrivacyBox::exceptions(Exception exception) {
 	switch (exception) {
 	case Exception::Always: return _value.always;
 	case Exception::Never: return _value.never;
@@ -340,16 +553,28 @@ void EditPrivacyBox::setupContent() {
 	const auto addExceptionLink = [=](Exception exception) {
 		const auto update = Ui::CreateChild<rpl::event_stream<>>(content);
 		auto label = update->events_starting_with({}) | rpl::map([=] {
-			return Settings::ExceptionUsersCount(exceptions(exception));
-		}) | rpl::map([](int count) {
-			return count
-				? tr::lng_edit_privacy_exceptions_count(tr::now, lt_count, count)
+			const auto &value = exceptions(exception);
+			const auto count = Settings::ExceptionUsersCount(value.peers);
+			const auto users = count
+				? tr::lng_edit_privacy_exceptions_count(
+					tr::now,
+					lt_count,
+					count)
 				: tr::lng_edit_privacy_exceptions_add(tr::now);
+			return !value.premiums
+				? users
+				: !count
+				? tr::lng_edit_privacy_premium(tr::now)
+				: tr::lng_edit_privacy_exceptions_premium_and(
+					tr::now,
+					lt_users,
+					users);
 		});
 		_controller->handleExceptionsChange(
 			exception,
 			update->events_starting_with({}) | rpl::map([=] {
-				return Settings::ExceptionUsersCount(exceptions(exception));
+				return Settings::ExceptionUsersCount(
+					exceptions(exception).peers);
 			}));
 		auto text = _controller->exceptionButtonTextKey(exception);
 		const auto button = content->add(
@@ -448,7 +673,7 @@ void EditPrivacyBox::setupContent() {
 
 	addButton(tr::lng_settings_save(), [=] {
 		const auto someAreDisallowed = (_value.option != Option::Everyone)
-			|| !_value.never.empty();
+			|| !_value.never.peers.empty();
 		_controller->confirmSave(someAreDisallowed, crl::guard(this, [=] {
 			_value.ignoreAlways = !showExceptionLink(Exception::Always);
 			_value.ignoreNever = !showExceptionLink(Exception::Never);
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.h b/Telegram/SourceFiles/boxes/edit_privacy_box.h
index da8bc98cf..3aae28403 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.h
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.h
@@ -48,7 +48,8 @@ public:
 	[[nodiscard]] virtual rpl::producer<TextWithEntities> warning() const {
 		return nullptr;
 	}
-	virtual void prepareWarningLabel(not_null<Ui::FlatLabel*> warning) const {
+	virtual void prepareWarningLabel(
+			not_null<Ui::FlatLabel*> warning) const {
 	}
 	[[nodiscard]] virtual rpl::producer<QString> exceptionButtonTextKey(
 		Exception exception) const = 0;
@@ -56,6 +57,10 @@ public:
 		Exception exception) const = 0;
 	[[nodiscard]] virtual auto exceptionsDescription()
 		const -> rpl::producer<QString> = 0;
+	[[nodiscard]] virtual bool allowPremiumsToggle(
+			Exception exception) const {
+		return false;
+	}
 	virtual void handleExceptionsChange(
 		Exception exception,
 		rpl::producer<int> value) {
@@ -117,6 +122,7 @@ class EditPrivacyBox final : public Ui::BoxContent {
 public:
 	using Value = Api::UserPrivacy::Rule;
 	using Option = Api::UserPrivacy::Option;
+	using Exceptions = Api::UserPrivacy::Exceptions;
 	using Exception = EditPrivacyController::Exception;
 
 	EditPrivacyBox(
@@ -148,7 +154,7 @@ private:
 		int topSkip);
 
 	void editExceptions(Exception exception, Fn<void()> done);
-	std::vector<not_null<PeerData*>> &exceptions(Exception exception);
+	Exceptions &exceptions(Exception exception);
 
 	const not_null<Window::SessionController*> _window;
 	std::unique_ptr<EditPrivacyController> _controller;
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index fe3a3f28e..2430c583e 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -506,6 +506,22 @@ int PeerListBox::peerListSelectedRowsCount() {
 	return _select ? _select->entity()->getItemsCount() : 0;
 }
 
+std::vector<PeerListRowId> PeerListBox::collectSelectedIds() {
+	auto result = std::vector<PeerListRowId>();
+	auto items = _select
+		? _select->entity()->getItems()
+		: QVector<uint64>();
+	if (!items.empty()) {
+		result.reserve(items.size());
+		for (const auto itemId : items) {
+			if (!_controller->isForeignRow(itemId)) {
+				result.push_back(itemId);
+			}
+		}
+	}
+	return result;
+}
+
 auto PeerListBox::collectSelectedRows()
 -> std::vector<not_null<PeerData*>> {
 	auto result = std::vector<not_null<PeerData*>>();
@@ -887,11 +903,15 @@ void PeerListRow::lazyInitialize(const style::PeerListItem &st) {
 	refreshStatus();
 }
 
+bool PeerListRow::useForumLikeUserpic() const {
+	return !special() && peer()->isForum();
+}
+
 void PeerListRow::createCheckbox(
 		const style::RoundImageCheckbox &st,
 		Fn<void()> updateCallback) {
 	const auto generateRadius = [=](int size) {
-		return (!special() && peer()->isForum())
+		return useForumLikeUserpic()
 			? int(size * Ui::ForumUserpicRadiusMultiplier())
 			: std::optional<int>();
 	};
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 50a37263e..ea7f73b67 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -166,6 +166,8 @@ public:
 		return _name;
 	}
 
+	virtual bool useForumLikeUserpic() const;
+
 	enum class StatusType {
 		Online,
 		LastSeen,
@@ -1042,6 +1044,7 @@ public:
 		std::unique_ptr<PeerListController> controller,
 		Fn<void(not_null<PeerListBox*>)> init);
 
+	[[nodiscard]] std::vector<PeerListRowId> collectSelectedIds();
 	[[nodiscard]] std::vector<not_null<PeerData*>> collectSelectedRows();
 
 	void peerListSetTitle(rpl::producer<QString> title) override {
diff --git a/Telegram/SourceFiles/data/data_birthday.h b/Telegram/SourceFiles/data/data_birthday.h
index ebf4060c8..e728cce42 100644
--- a/Telegram/SourceFiles/data/data_birthday.h
+++ b/Telegram/SourceFiles/data/data_birthday.h
@@ -30,7 +30,7 @@ public:
 	friend inline constexpr auto operator<=>(Birthday, Birthday) = default;
 	friend inline constexpr bool operator==(Birthday, Birthday) = default;
 
-	static constexpr auto kYearMin = 1900;
+	static constexpr auto kYearMin = 1875;
 	static constexpr auto kYearMax = 2100;
 
 private:
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 9c1c98d22..d931f1df7 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -161,6 +161,7 @@ settingsPrivacyOption: Checkbox(settingsCheckbox) {
 settingsPrivacySecurityPadding: 12px;
 settingsPrivacySkip: 14px;
 settingsPrivacySkipTop: 4px;
+settingsPrivacyPremium: icon{{ "profile_premium", premiumButtonFg }};
 
 settingsPrivacyAddBirthday: FlatLabel(defaultFlatLabel) {
 	minWidth: 256px;
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index bf6989647..b6b75b589 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -392,8 +392,9 @@ void SetupBirthday(
 		key
 	) | rpl::map([=](const Api::UserPrivacy::Rule &value) {
 		return (value.option == Api::UserPrivacy::Option::Contacts)
-			&& value.always.empty()
-			&& value.never.empty();
+			&& value.always.peers.empty()
+			&& !value.always.premiums
+			&& value.never.peers.empty();
 	}) | rpl::distinct_until_changed();
 
 	Ui::AddSkip(container);
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index d7005fd9d..ffa288223 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -440,10 +440,7 @@ void SetupPremium(
 	button->addClickHandler([=] {
 		showOther(BusinessId());
 	});
-	constexpr auto kNewExpiresAt = int(1711958400);
-	if (base::unixtime::now() < kNewExpiresAt) {
-		Ui::NewBadge::AddToRight(button);
-	}
+	Ui::NewBadge::AddToRight(button);
 
 	if (controller->session().premiumCanBuy()) {
 		const auto button = AddButtonWithIcon(
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 5308b9cf4..b3829efeb 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -795,6 +795,11 @@ auto GroupsInvitePrivacyController::exceptionsDescription() const
 	return tr::lng_edit_privacy_groups_exceptions();
 }
 
+bool GroupsInvitePrivacyController::allowPremiumsToggle(
+		Exception exception) const {
+	return (exception == Exception::Always);
+}
+
 UserPrivacy::Key CallsPrivacyController::key() const {
 	return Key::Calls;
 }
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
index 5e1083c20..d058649d2 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
@@ -149,6 +149,7 @@ public:
 	rpl::producer<QString> exceptionBoxTitle(
 		Exception exception) const override;
 	rpl::producer<QString> exceptionsDescription() const override;
+	bool allowPremiumsToggle(Exception exception) const override;
 
 };
 
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 404cb9d62..045457819 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -114,31 +114,33 @@ void AddPremiumStar(
 	}, badge->lifetime());
 }
 
-QString PrivacyBase(Privacy::Key key, Privacy::Option option) {
+QString PrivacyBase(Privacy::Key key, const Privacy::Rule &rule) {
 	using Key = Privacy::Key;
 	using Option = Privacy::Option;
 	switch (key) {
 	case Key::CallsPeer2Peer:
-		switch (option) {
+		switch (rule.option) {
 		case Option::Everyone:
 			return tr::lng_edit_privacy_calls_p2p_everyone(tr::now);
 		case Option::Contacts:
 			return tr::lng_edit_privacy_calls_p2p_contacts(tr::now);
-		case Option::CloseFriends:
-			return tr::lng_edit_privacy_close_friends(tr::now); // unused
 		case Option::Nobody:
 			return tr::lng_edit_privacy_calls_p2p_nobody(tr::now);
 		}
-		Unexpected("Value in Privacy::Option.");
+		[[fallthrough]];
 	default:
-		switch (option) {
+		switch (rule.option) {
 		case Option::Everyone: return tr::lng_edit_privacy_everyone(tr::now);
-		case Option::Contacts: return tr::lng_edit_privacy_contacts(tr::now);
+		case Option::Contacts:
+			return rule.always.premiums
+				? tr::lng_edit_privacy_contacts_and_premium(tr::now)
+				: tr::lng_edit_privacy_contacts(tr::now);
 		case Option::CloseFriends:
 			return tr::lng_edit_privacy_close_friends(tr::now);
-		case Option::ContactsAndPremium:
-			return tr::lng_edit_privacy_contacts_and_premium(tr::now);
-		case Option::Nobody: return tr::lng_edit_privacy_nobody(tr::now);
+		case Option::Nobody:
+			return rule.always.premiums
+				? tr::lng_edit_privacy_premium(tr::now)
+				: tr::lng_edit_privacy_nobody(tr::now);
 		}
 		Unexpected("Value in Privacy::Option.");
 	}
@@ -152,17 +154,17 @@ rpl::producer<QString> PrivacyString(
 		key
 	) | rpl::map([=](const Privacy::Rule &value) {
 		auto add = QStringList();
-		if (const auto never = ExceptionUsersCount(value.never)) {
+		if (const auto never = ExceptionUsersCount(value.never.peers)) {
 			add.push_back("-" + QString::number(never));
 		}
-		if (const auto always = ExceptionUsersCount(value.always)) {
+		if (const auto always = ExceptionUsersCount(value.always.peers)) {
 			add.push_back("+" + QString::number(always));
 		}
 		if (!add.isEmpty()) {
-			return PrivacyBase(key, value.option)
+			return PrivacyBase(key, value)
 				+ " (" + add.join(", ") + ")";
 		} else {
-			return PrivacyBase(key, value.option);
+			return PrivacyBase(key, value);
 		}
 	});
 }

From 87acc921c3fedecb8b58d577cd514329150565ee Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 17:54:44 +0400
Subject: [PATCH 193/596] Pass Ui::Show to all add participant handlers.

---
 .../SourceFiles/api/api_chat_participants.cpp |  8 ++---
 .../SourceFiles/api/api_chat_participants.h   |  2 +-
 Telegram/SourceFiles/apiwrap.cpp              |  5 +--
 Telegram/SourceFiles/apiwrap.h                |  2 ++
 .../SourceFiles/boxes/add_contact_box.cpp     | 16 +++++-----
 Telegram/SourceFiles/boxes/add_contact_box.h  |  5 +--
 .../boxes/peers/add_bot_to_chat_box.cpp       | 11 ++++---
 .../boxes/peers/add_bot_to_chat_box.h         |  1 +
 .../boxes/peers/add_participants_box.cpp      |  6 ++--
 .../boxes/peers/edit_participant_box.cpp      |  3 +-
 .../boxes/peers/edit_participants_box.cpp     | 32 ++++++++++++++-----
 .../boxes/peers/edit_participants_box.h       |  5 +++
 .../boxes/peers/edit_peer_info_box.cpp        |  3 +-
 .../group/calls_group_invite_controller.cpp   |  2 +-
 .../SourceFiles/history/history_widget.cpp    |  5 +--
 .../info/profile/info_profile_actions.cpp     |  3 +-
 .../SourceFiles/window/window_peer_menu.cpp   |  9 ++++--
 .../SourceFiles/window/window_peer_menu.h     |  5 ++-
 18 files changed, 82 insertions(+), 41 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
index 7195ee990..0c2fb2030 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.cpp
+++ b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -487,9 +487,9 @@ void ChatParticipants::requestCountDelayed(
 }
 
 void ChatParticipants::add(
+		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		const std::vector<not_null<UserData*>> &users,
-		std::shared_ptr<Ui::Show> show,
 		bool passGroupHistory,
 		Fn<void(bool)> done) {
 	if (const auto chat = peer->asChat()) {
@@ -504,14 +504,14 @@ void ChatParticipants::add(
 				if (done) done(true);
 			}).fail([=](const MTP::Error &error) {
 				const auto type = error.type();
-				ShowAddParticipantsError(type, peer, { 1, user }, show);
+				ShowAddParticipantsError(show, type, peer, { 1, user });
 				if (done) done(false);
 			}).afterDelay(kSmallDelayMs).send();
 		}
 	} else if (const auto channel = peer->asChannel()) {
 		const auto hasBot = ranges::any_of(users, &UserData::isBot);
 		if (!peer->isMegagroup() && hasBot) {
-			ShowAddParticipantsError("USER_BOT", peer, users, show);
+			ShowAddParticipantsError(show, "USER_BOT", peer, users);
 			return;
 		}
 		auto list = QVector<MTPInputUser>();
@@ -531,7 +531,7 @@ void ChatParticipants::add(
 					channel,
 					CollectForbiddenUsers(&channel->session(), result));
 			}).fail([=](const MTP::Error &error) {
-				ShowAddParticipantsError(error.type(), peer, users, show);
+				ShowAddParticipantsError(show, error.type(), peer, users);
 				if (callback) callback(false);
 			}).afterDelay(kSmallDelayMs).send();
 		};
diff --git a/Telegram/SourceFiles/api/api_chat_participants.h b/Telegram/SourceFiles/api/api_chat_participants.h
index 816cc6526..b8fc9fc67 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.h
+++ b/Telegram/SourceFiles/api/api_chat_participants.h
@@ -97,9 +97,9 @@ public:
 		not_null<ChannelData*> channel,
 		const TLMembers &data);
 	void add(
+		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		const std::vector<not_null<UserData*>> &users,
-		std::shared_ptr<Ui::Show> show = nullptr,
 		bool passGroupHistory = true,
 		Fn<void(bool)> done = nullptr);
 
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index ef3b0f01f..09a307700 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3855,13 +3855,14 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 }
 
 void ApiWrap::sendBotStart(
+		std::shared_ptr<Ui::Show> show,
 		not_null<UserData*> bot,
 		PeerData *chat,
 		const QString &startTokenForChat) {
 	Expects(bot->isBot());
 
 	if (chat && chat->isChannel() && !chat->isMegagroup()) {
-		ShowAddParticipantsError("USER_BOT", chat, { 1, bot });
+		ShowAddParticipantsError(show, "USER_BOT", chat, { 1, bot });
 		return;
 	}
 
@@ -3893,7 +3894,7 @@ void ApiWrap::sendBotStart(
 	}).fail([=](const MTP::Error &error) {
 		if (chat) {
 			const auto type = error.type();
-			ShowAddParticipantsError(type, chat, { 1, bot });
+			ShowAddParticipantsError(show, type, chat, { 1, bot });
 		}
 	}).send();
 }
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 0d31126d3..b1c844702 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -53,6 +53,7 @@ class Key;
 
 namespace Ui {
 struct PreparedList;
+class Show;
 } // namespace Ui
 
 namespace Api {
@@ -343,6 +344,7 @@ public:
 		BusinessShortcutId id);
 	void sendMessage(MessageToSend &&message);
 	void sendBotStart(
+		std::shared_ptr<Ui::Show> show,
 		not_null<UserData*> bot,
 		PeerData *chat = nullptr,
 		const QString &startTokenForChat = QString());
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index fc4c29a91..56e4f68a9 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -169,10 +169,10 @@ TextWithEntities PeerFloodErrorText(
 }
 
 void ShowAddParticipantsError(
+		std::shared_ptr<Ui::Show> show,
 		const QString &error,
 		not_null<PeerData*> chat,
-		const std::vector<not_null<UserData*>> &users,
-		std::shared_ptr<Ui::Show> show) {
+		const std::vector<not_null<UserData*>> &users) {
 	if (error == u"USER_BOT"_q) {
 		const auto channel = chat->asChannel();
 		if ((users.size() == 1)
@@ -189,6 +189,7 @@ void ShowAddParticipantsError(
 					}
 				};
 				const auto saveCallback = SaveAdminCallback(
+					show,
 					channel,
 					user,
 					close,
@@ -199,9 +200,10 @@ void ShowAddParticipantsError(
 					ChatAdminRightsInfo(),
 					QString());
 				box->setSaveCallback(saveCallback);
-				*weak = Ui::show(std::move(box));
+				*weak = box.data();
+				show->showBox(std::move(box));
 			};
-			Ui::show(
+			show->showBox(
 				Ui::MakeConfirmBox({
 					.text = tr::lng_cant_invite_offer_admin(),
 					.confirmed = makeAdmin,
@@ -219,7 +221,7 @@ void ShowAddParticipantsError(
 		const auto text = PeerFloodErrorText(&chat->session(), type);
 		Ui::show(Ui::MakeInformBox(text), Ui::LayerOption::KeepOther);
 		return;
-	} else if (error == u"USER_PRIVACY_RESTRICTED"_q && show) {
+	} else if (error == u"USER_PRIVACY_RESTRICTED"_q) {
 		ChatInviteForbidden(show, chat, users);
 		return;
 	}
@@ -231,8 +233,6 @@ void ShowAddParticipantsError(
 		} else if (error == u"USER_KICKED"_q) {
 			// Trying to return a user who was kicked by admin.
 			return tr::lng_cant_invite_banned(tr::now);
-		} else if (error == u"USER_PRIVACY_RESTRICTED"_q) {
-			return tr::lng_cant_invite_privacy(tr::now);
 		} else if (error == u"USER_NOT_MUTUAL_CONTACT"_q) {
 			// Trying to return user who does not have me in contacts.
 			return tr::lng_failed_add_not_mutual(tr::now);
@@ -247,7 +247,7 @@ void ShowAddParticipantsError(
 		}
 		return tr::lng_failed_add_participant(tr::now);
 	}();
-	Ui::show(Ui::MakeInformBox(text), Ui::LayerOption::KeepOther);
+	show->show(Ui::MakeInformBox(text), Ui::LayerOption::KeepOther);
 }
 
 AddContactBox::AddContactBox(
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.h b/Telegram/SourceFiles/boxes/add_contact_box.h
index 6d19a2d7f..ed6adc655 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.h
+++ b/Telegram/SourceFiles/boxes/add_contact_box.h
@@ -34,6 +34,7 @@ template <typename Enum>
 class Radioenum;
 class LinkButton;
 class UserpicButton;
+class Show;
 } // namespace Ui
 
 enum class PeerFloodType {
@@ -46,10 +47,10 @@ enum class PeerFloodType {
 	not_null<Main::Session*> session,
 	PeerFloodType type);
 void ShowAddParticipantsError(
+	std::shared_ptr<Ui::Show> show,
 	const QString &error,
 	not_null<PeerData*> chat,
-	const std::vector<not_null<UserData*>> &users,
-	std::shared_ptr<Ui::Show> show = nullptr);
+	const std::vector<not_null<UserData*>> &users);
 
 class AddContactBox : public Ui::BoxContent {
 public:
diff --git a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
index 1bffcb2ee..e5b659433 100644
--- a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
@@ -217,6 +217,7 @@ void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
 		? bot->botInfo->groupAdminRights
 		: ChatAdminRights();
 	const auto addingAdmin = requestedAddAdmin || (rights != 0);
+	const auto show = controller->uiShow();
 	if (addingAdmin) {
 		const auto scope = _scope;
 		const auto token = _token;
@@ -224,11 +225,12 @@ void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
 				ChatAdminRightsInfo newRights,
 				const QString &rank) {
 			if (scope == Scope::GroupAdmin) {
-				chat->session().api().sendBotStart(bot, chat, token);
+				chat->session().api().sendBotStart(show, bot, chat, token);
 			}
 			close();
 		};
 		const auto saveCallback = SaveAdminCallback(
+			show,
 			chat,
 			bot,
 			done,
@@ -245,7 +247,7 @@ void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
 		controller->show(std::move(box));
 	} else {
 		auto callback = crl::guard(this, [=] {
-			AddBotToGroup(bot, chat, _token);
+			AddBotToGroup(show, bot, chat, _token);
 			controller->hideLayer();
 		});
 		controller->show(Ui::MakeConfirmBox({
@@ -394,13 +396,14 @@ void AddBotToGroupBoxController::prepareViewHook() {
 }
 
 void AddBotToGroup(
+		std::shared_ptr<Ui::Show> show,
 		not_null<UserData*> bot,
 		not_null<PeerData*> chat,
 		const QString &startToken) {
 	if (!startToken.isEmpty()) {
-		chat->session().api().sendBotStart(bot, chat, startToken);
+		chat->session().api().sendBotStart(show, bot, chat, startToken);
 	} else {
-		chat->session().api().chatParticipants().add(chat, { 1, bot });
+		chat->session().api().chatParticipants().add(show, chat, { 1, bot });
 	}
 	if (const auto window = chat->session().tryResolveWindow()) {
 		window->showPeerHistory(chat);
diff --git a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.h b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.h
index 1a129a4d8..350259a27 100644
--- a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.h
+++ b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.h
@@ -76,6 +76,7 @@ private:
 };
 
 void AddBotToGroup(
+	std::shared_ptr<Ui::Show> show,
 	not_null<UserData*> bot,
 	not_null<PeerData*> chat,
 	const QString &startToken);
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index 578bc77bc..1815c0db4 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -433,9 +433,9 @@ void AddParticipantsBoxController::inviteSelectedUsers(
 	const auto show = box->uiShow();
 	const auto request = [=](bool checked) {
 		_peer->session().api().chatParticipants().add(
+			show,
 			_peer,
 			users,
-			show,
 			checked);
 	};
 	if (_peer->isChannel()) {
@@ -945,6 +945,7 @@ void AddSpecialBoxController::showAdmin(
 		user,
 		currentRights,
 		_additional.adminRank(user));
+	const auto show = delegate()->peerListUiShow();
 	if (_additional.canAddOrEditAdmin(user)) {
 		const auto done = crl::guard(this, [=](
 				ChatAdminRightsInfo newRights,
@@ -956,7 +957,8 @@ void AddSpecialBoxController::showAdmin(
 				_editParticipantBox->closeBox();
 			}
 		});
-		box->setSaveCallback(SaveAdminCallback(_peer, user, done, fail));
+		box->setSaveCallback(
+			SaveAdminCallback(show, _peer, user, done, fail));
 	}
 	_editParticipantBox = showBox(std::move(box));
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index e5f4b4d1b..c1c086ad1 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -387,11 +387,12 @@ void EditAdminBox::prepare() {
 				_rank ? _rank->getLastText().trimmed() : QString());
 		};
 		_save = [=] {
+			const auto show = uiShow();
 			if (!_saveCallback) {
 				return;
 			} else if (_addAsAdmin && !_addAsAdmin->checked()) {
 				const auto weak = Ui::MakeWeak(this);
-				AddBotToGroup(user(), peer(), _addingBot->token);
+				AddBotToGroup(show, user(), peer(), _addingBot->token);
 				if (const auto strong = weak.data()) {
 					strong->closeBox();
 				}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index a3faa5711..e627306a6 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -72,6 +72,7 @@ void RemoveAdmin(
 }
 
 void AddChatParticipant(
+		std::shared_ptr<Ui::Show> show,
 		not_null<ChatData*> chat,
 		not_null<UserData*> user,
 		Fn<void()> onDone,
@@ -87,7 +88,7 @@ void AddChatParticipant(
 			onDone();
 		}
 	}).fail([=](const MTP::Error &error) {
-		ShowAddParticipantsError(error.type(), chat, { 1, user });
+		ShowAddParticipantsError(show, error.type(), chat, { 1, user });
 		if (onFail) {
 			onFail();
 		}
@@ -95,6 +96,7 @@ void AddChatParticipant(
 }
 
 void SaveChatAdmin(
+		std::shared_ptr<Ui::Show> show,
 		not_null<ChatData*> chat,
 		not_null<UserData*> user,
 		bool isAdmin,
@@ -115,8 +117,15 @@ void SaveChatAdmin(
 		if (retryOnNotParticipant
 			&& isAdmin
 			&& (type == u"USER_NOT_PARTICIPANT"_q)) {
-			AddChatParticipant(chat, user, [=] {
-				SaveChatAdmin(chat, user, isAdmin, onDone, onFail, false);
+			AddChatParticipant(show, chat, user, [=] {
+				SaveChatAdmin(
+					show,
+					chat,
+					user,
+					isAdmin,
+					onDone,
+					onFail,
+					false);
 			}, onFail);
 		} else if (onFail) {
 			onFail();
@@ -125,6 +134,7 @@ void SaveChatAdmin(
 }
 
 void SaveChannelAdmin(
+		std::shared_ptr<Ui::Show> show,
 		not_null<ChannelData*> channel,
 		not_null<UserData*> user,
 		ChatAdminRightsInfo oldRights,
@@ -145,7 +155,7 @@ void SaveChannelAdmin(
 			onDone();
 		}
 	}).fail([=](const MTP::Error &error) {
-		ShowAddParticipantsError(error.type(), channel, { 1, user });
+		ShowAddParticipantsError(show, error.type(), channel, { 1, user });
 		if (onFail) {
 			onFail();
 		}
@@ -206,6 +216,7 @@ Fn<void(
 	ChatAdminRightsInfo oldRights,
 	ChatAdminRightsInfo newRights,
 	const QString &rank)> SaveAdminCallback(
+		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		not_null<UserData*> user,
 		Fn<void(
@@ -219,6 +230,7 @@ Fn<void(
 		const auto done = [=] { if (onDone) onDone(newRights, rank); };
 		const auto saveForChannel = [=](not_null<ChannelData*> channel) {
 			SaveChannelAdmin(
+				show,
 				channel,
 				user,
 				oldRights,
@@ -229,7 +241,7 @@ Fn<void(
 		};
 		if (const auto chat = peer->asChatNotMigrated()) {
 			const auto saveChatAdmin = [&](bool isAdmin) {
-				SaveChatAdmin(chat, user, isAdmin, done, onFail);
+				SaveChatAdmin(show, chat, user, isAdmin, done, onFail);
 			};
 			if (newRights.flags == chat->defaultAdminRights(user).flags
 				&& rank.isEmpty()) {
@@ -1743,7 +1755,9 @@ void ParticipantsBoxController::showAdmin(not_null<UserData*> user) {
 				_editParticipantBox->closeBox();
 			}
 		});
-		box->setSaveCallback(SaveAdminCallback(_peer, user, done, fail));
+		const auto show = delegate()->peerListUiShow();
+		box->setSaveCallback(
+			SaveAdminCallback(show, _peer, user, done, fail));
 	}
 	_editParticipantBox = showBox(std::move(box));
 }
@@ -1863,7 +1877,8 @@ void ParticipantsBoxController::unkickParticipant(not_null<UserData*> user) {
 		delegate()->peerListRemoveRow(row);
 		refreshRows();
 	}
-	_peer->session().api().chatParticipants().add(_peer, { 1, user });
+	const auto show = delegate()->peerListUiShow();
+	_peer->session().api().chatParticipants().add(show, _peer, { 1, user });
 }
 
 void ParticipantsBoxController::kickParticipantSure(
@@ -1906,7 +1921,8 @@ void ParticipantsBoxController::removeAdminSure(not_null<UserData*> user) {
 	_editBox = nullptr;
 
 	if (const auto chat = _peer->asChat()) {
-		SaveChatAdmin(chat, user, false, crl::guard(this, [=] {
+		const auto show = delegate()->peerListUiShow();
+		SaveChatAdmin(show, chat, user, false, crl::guard(this, [=] {
 			editAdminDone(
 				user,
 				ChatAdminRightsInfo(),
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
index d43d99e27..c9550232d 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
@@ -17,6 +17,10 @@ class PeerListStories;
 struct ChatAdminRightsInfo;
 struct ChatRestrictionsInfo;
 
+namespace Ui {
+class Show;
+} // namespace Ui
+
 namespace Window {
 class SessionNavigation;
 } // namespace Window
@@ -29,6 +33,7 @@ Fn<void(
 	ChatAdminRightsInfo oldRights,
 	ChatAdminRightsInfo newRights,
 	const QString &rank)> SaveAdminCallback(
+		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		not_null<UserData*> user,
 		Fn<void(
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index d6b982c45..31faabec1 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1963,7 +1963,8 @@ void Controller::toggleBotManager(const QString &command) {
 		const auto botPeer = _peer->owner().peerLoaded(
 			peerFromMTP(result.data().vpeer()));
 		if (const auto bot = botPeer ? botPeer->asUser() : nullptr) {
-			_peer->session().api().sendBotStart(bot, bot, command);
+			const auto show = controller->uiShow();
+			_peer->session().api().sendBotStart(show, bot, bot, command);
 			controller->showPeerHistory(bot);
 		}
 	}).send();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
index 6259bcd94..bb8c90855 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
@@ -225,9 +225,9 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 			const std::vector<not_null<UserData*>> &nonMembers,
 			Fn<void()> finish) {
 		peer->session().api().chatParticipants().add(
+			show,
 			peer,
 			nonMembers,
-			show,
 			true,
 			[=](bool) { invite(users); finish(); });
 	};
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index cec389eb8..79994f61f 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4224,7 +4224,8 @@ SendMenu::Type HistoryWidget::sendButtonMenuType() const {
 
 void HistoryWidget::unblockUser() {
 	if (const auto user = _peer ? _peer->asUser() : nullptr) {
-		Window::PeerMenuUnblockUserWithBotRestart(user);
+		const auto show = controller()->uiShow();
+		Window::PeerMenuUnblockUserWithBotRestart(show, user);
 	} else {
 		updateControlsVisibility();
 	}
@@ -4238,7 +4239,7 @@ void HistoryWidget::sendBotStartCommand() {
 		updateControlsVisibility();
 		return;
 	}
-	session().api().sendBotStart(_peer->asUser());
+	session().api().sendBotStart(controller()->uiShow(), _peer->asUser());
 	updateControlsVisibility();
 	updateControlsGeometry();
 }
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 37863f5a5..adba93d89 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1688,7 +1688,8 @@ void ActionsFiller::addBlockAction(not_null<UserData*> user) {
 	});
 	auto callback = [=] {
 		if (user->isBlocked()) {
-			Window::PeerMenuUnblockUserWithBotRestart(user);
+			const auto show = controller->uiShow();
+			Window::PeerMenuUnblockUserWithBotRestart(show, user);
 			if (user->isBot()) {
 				controller->showPeerHistory(user);
 			}
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 924f0de8b..d625b739b 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -781,8 +781,9 @@ void Filler::addBlockUser() {
 				: tr::lng_profile_block_user(tr::now));
 	};
 	const auto blockAction = _addAction(blockText(user), [=] {
+		const auto show = window->uiShow();
 		if (user->isBlocked()) {
-			PeerMenuUnblockUserWithBotRestart(user);
+			PeerMenuUnblockUserWithBotRestart(show, user);
 		} else if (user->isBot()) {
 			user->session().api().blockedPeers().block(user);
 		} else {
@@ -1700,10 +1701,12 @@ void PeerMenuBlockUserBox(
 	});
 }
 
-void PeerMenuUnblockUserWithBotRestart(not_null<UserData*> user) {
+void PeerMenuUnblockUserWithBotRestart(
+		std::shared_ptr<Ui::Show> show,
+		not_null<UserData*> user) {
 	user->session().api().blockedPeers().unblock(user, [=](bool success) {
 		if (success && user->isBot() && !user->isSupport()) {
-			user->session().api().sendBotStart(user);
+			user->session().api().sendBotStart(show, user);
 		}
 	});
 }
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index 44503042b..cc4f56178 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -18,6 +18,7 @@ namespace Ui {
 class RpWidget;
 class BoxContent;
 class GenericBox;
+class Show;
 } // namespace Ui
 
 namespace Data {
@@ -109,7 +110,9 @@ void PeerMenuBlockUserBox(
 	not_null<PeerData*> peer,
 	std::variant<v::null_t, bool> suggestReport,
 	std::variant<v::null_t, ClearChat, ClearReply> suggestClear);
-void PeerMenuUnblockUserWithBotRestart(not_null<UserData*> user);
+void PeerMenuUnblockUserWithBotRestart(
+	std::shared_ptr<Ui::Show> show,
+	not_null<UserData*> user);
 
 void BlockSenderFromRepliesBox(
 	not_null<Ui::GenericBox*> box,

From d2164dc0d0bbeccc19fba7084f7d345fa6662021 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 18:07:00 +0400
Subject: [PATCH 194/596] Suggest premiums in privacy.

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

diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 031fe5ee6..9fcb6b032 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -407,6 +407,11 @@ EditPrivacyBox::EditPrivacyBox(
 : _window(window)
 , _controller(std::move(controller))
 , _value(value) {
+	if (_controller->allowPremiumsToggle(Exception::Always)
+		&& _value.option == Option::Everyone) {
+		// If we switch from Everyone to Contacts or Nobody suggest Premiums.
+		_value.always.premiums = true;
+	}
 }
 
 void EditPrivacyBox::prepare() {

From 3cdb528dfee6ab9447b2c50d5b1a8de26a23d6a3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 21:10:50 +0400
Subject: [PATCH 195/596] Use "Downloads/Telegram Lite" in MacAppStore version.

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

diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 7103e1bd6..26cc17279 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -168,7 +168,11 @@ void ShowInFolder(const QString &filepath) {
 }
 
 QString DefaultDownloadPathFolder(not_null<Main::Session*> session) {
+#if OS_MAC_STORE
+	return u"Telegram Lite"_q;
+#else // OS_MAC_STORE
 	return session->supportMode() ? u"Tsupport Desktop"_q : AppName.utf16();
+#endif // OS_MAC_STORE
 }
 
 QString DefaultDownloadPath(not_null<Main::Session*> session) {

From c0117e72ad1c31b4b0992ce1bb34751187e9608b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 22:39:29 +0400
Subject: [PATCH 196/596] Support complex invite-users responses.

---
 Telegram/Resources/langs/lang.strings         |  18 +
 .../SourceFiles/api/api_chat_participants.cpp |  16 +-
 Telegram/SourceFiles/apiwrap.cpp              |   4 +-
 .../SourceFiles/boxes/add_contact_box.cpp     |  24 +-
 Telegram/SourceFiles/boxes/add_contact_box.h  |   9 +-
 Telegram/SourceFiles/boxes/boxes.style        |  16 +
 .../boxes/peers/add_participants_box.cpp      | 365 +++++++++++++++++-
 .../boxes/peers/add_participants_box.h        |  13 +-
 .../boxes/peers/edit_participants_box.cpp     |   8 +-
 .../boxes/peers/replace_boost_box.cpp         | 140 +++++++
 .../boxes/peers/replace_boost_box.h           |   5 +
 .../SourceFiles/settings/settings_premium.cpp |  35 +-
 .../SourceFiles/settings/settings_premium.h   |   8 +
 .../ui/boxes/show_or_premium_box.cpp          |   6 +-
 .../ui/boxes/show_or_premium_box.h            |   7 +
 15 files changed, 631 insertions(+), 43 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 706824f92..1fedad680 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1319,6 +1319,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_photo_by_you" = "photo set by you";
 "lng_profile_public_photo" = "public photo";
 
+"lng_invite_upgrade_title" = "Upgrade to Premium";
+"lng_invite_upgrade_group_invite#one" = "{users} only accepts invitations to groups from Contacts and **Premium** users.";
+"lng_invite_upgrade_group_invite#other" = "{users} only accept invitations to groups from Contacts and **Premium** users.";
+"lng_invite_upgrade_group_write#one" = "{users} only accepts messages and invitations to groups from Contacts and **Premium** users.";
+"lng_invite_upgrade_group_write#other" = "{users} only accept messages and invitations to groups from Contacts and **Premium** users.";
+"lng_invite_upgrade_channel_invite#one" = "{users} only accepts invitations to channels from Contacts and **Premium** users.";
+"lng_invite_upgrade_channel_invite#other" = "{users} only accept invitations to channels from Contacts and **Premium** users.";
+"lng_invite_upgrade_channel_write#one" = "{users} only accepts messages and invitations to channels from Contacts and **Premium** users.";
+"lng_invite_upgrade_channel_write#other" = "{users} only accept messages and invitations to channels from Contacts and **Premium** users.";
+"lng_invite_upgrade_users_few" = "{users} and {last}";
+"lng_invite_upgrade_users_many#one" = "{users} and **{count}** more person";
+"lng_invite_upgrade_users_many#other" = "{users} and **{count}** more people";
+"lng_invite_upgrade_or" = "or";
+"lng_invite_upgrade_via_title" = "Invite via Link";
+"lng_invite_upgrade_via_group_about" = "You can send an invite link to the group in a private message instead.";
+"lng_invite_upgrade_via_channel_about" = "You can send an invite link to the channel in a private message instead.";
+"lng_invite_status_disabled" = "available only to Premium users";
+
 "lng_via_link_group_one" = "**{user}** restricts adding them to groups.\nYou can send them an invite link as message instead.";
 "lng_via_link_group_many#one" = "**{count} user** restricts adding them to groups.\nYou can send them an invite link as message instead.";
 "lng_via_link_group_many#other" = "**{count} users** restrict adding them to groups.\nYou can send them an invite link as message instead.";
diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
index 0c2fb2030..6761d2fff 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.cpp
+++ b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -502,16 +502,24 @@ void ChatParticipants::add(
 				const auto &data = result.data();
 				chat->session().api().applyUpdates(data.vupdates());
 				if (done) done(true);
+				ChatInviteForbidden(
+					show,
+					chat,
+					CollectForbiddenUsers(&chat->session(), result));
 			}).fail([=](const MTP::Error &error) {
 				const auto type = error.type();
-				ShowAddParticipantsError(show, type, peer, { 1, user });
+				ShowAddParticipantsError(show, type, peer, user);
 				if (done) done(false);
 			}).afterDelay(kSmallDelayMs).send();
 		}
 	} else if (const auto channel = peer->asChannel()) {
 		const auto hasBot = ranges::any_of(users, &UserData::isBot);
 		if (!peer->isMegagroup() && hasBot) {
-			ShowAddParticipantsError(show, "USER_BOT", peer, users);
+			ShowAddParticipantsError(
+				show,
+				u"USER_BOT"_q,
+				peer,
+				{ .users = users });
 			return;
 		}
 		auto list = QVector<MTPInputUser>();
@@ -531,7 +539,9 @@ void ChatParticipants::add(
 					channel,
 					CollectForbiddenUsers(&channel->session(), result));
 			}).fail([=](const MTP::Error &error) {
-				ShowAddParticipantsError(show, error.type(), peer, users);
+				ShowAddParticipantsError(show, error.type(), peer, {
+					.users = users,
+				});
 				if (callback) callback(false);
 			}).afterDelay(kSmallDelayMs).send();
 		};
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 09a307700..e53e7a5d7 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3862,7 +3862,7 @@ void ApiWrap::sendBotStart(
 	Expects(bot->isBot());
 
 	if (chat && chat->isChannel() && !chat->isMegagroup()) {
-		ShowAddParticipantsError(show, "USER_BOT", chat, { 1, bot });
+		ShowAddParticipantsError(show, "USER_BOT", chat, bot);
 		return;
 	}
 
@@ -3894,7 +3894,7 @@ void ApiWrap::sendBotStart(
 	}).fail([=](const MTP::Error &error) {
 		if (chat) {
 			const auto type = error.type();
-			ShowAddParticipantsError(show, type, chat, { 1, bot });
+			ShowAddParticipantsError(show, type, chat, bot);
 		}
 	}).send();
 }
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index 56e4f68a9..ba35e8d98 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -172,16 +172,28 @@ void ShowAddParticipantsError(
 		std::shared_ptr<Ui::Show> show,
 		const QString &error,
 		not_null<PeerData*> chat,
-		const std::vector<not_null<UserData*>> &users) {
+		not_null<UserData*> user) {
+	ShowAddParticipantsError(
+		std::move(show),
+		error,
+		chat,
+		{ .users = { 1, user } });
+}
+
+void ShowAddParticipantsError(
+		std::shared_ptr<Ui::Show> show,
+		const QString &error,
+		not_null<PeerData*> chat,
+		const ForbiddenInvites &forbidden) {
 	if (error == u"USER_BOT"_q) {
 		const auto channel = chat->asChannel();
-		if ((users.size() == 1)
-			&& users.front()->isBot()
+		if ((forbidden.users.size() == 1)
+			&& forbidden.users.front()->isBot()
 			&& channel
 			&& !channel->isMegagroup()
 			&& channel->canAddAdmins()) {
 			const auto makeAdmin = [=] {
-				const auto user = users.front();
+				const auto user = forbidden.users.front();
 				const auto weak = std::make_shared<QPointer<EditAdminBox>>();
 				const auto close = [=](auto&&...) {
 					if (*weak) {
@@ -213,7 +225,7 @@ void ShowAddParticipantsError(
 			return;
 		}
 	}
-	const auto hasBot = ranges::any_of(users, &UserData::isBot);
+	const auto hasBot = ranges::any_of(forbidden.users, &UserData::isBot);
 	if (error == u"PEER_FLOOD"_q) {
 		const auto type = (chat->isChat() || chat->isMegagroup())
 			? PeerFloodType::InviteGroup
@@ -222,7 +234,7 @@ void ShowAddParticipantsError(
 		Ui::show(Ui::MakeInformBox(text), Ui::LayerOption::KeepOther);
 		return;
 	} else if (error == u"USER_PRIVACY_RESTRICTED"_q) {
-		ChatInviteForbidden(show, chat, users);
+		ChatInviteForbidden(show, chat, forbidden);
 		return;
 	}
 	const auto text = [&] {
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.h b/Telegram/SourceFiles/boxes/add_contact_box.h
index ed6adc655..9bc7de652 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.h
+++ b/Telegram/SourceFiles/boxes/add_contact_box.h
@@ -43,6 +43,8 @@ enum class PeerFloodType {
 	InviteChannel,
 };
 
+struct ForbiddenInvites;
+
 [[nodiscard]] TextWithEntities PeerFloodErrorText(
 	not_null<Main::Session*> session,
 	PeerFloodType type);
@@ -50,7 +52,12 @@ void ShowAddParticipantsError(
 	std::shared_ptr<Ui::Show> show,
 	const QString &error,
 	not_null<PeerData*> chat,
-	const std::vector<not_null<UserData*>> &users);
+	const ForbiddenInvites &forbidden);
+void ShowAddParticipantsError(
+	std::shared_ptr<Ui::Show> show,
+	const QString &error,
+	not_null<PeerData*> chat,
+	not_null<UserData*> user);
 
 class AddContactBox : public Ui::BoxContent {
 public:
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index c7a23f366..2ae5bba8d 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -1028,3 +1028,19 @@ birthdayLabel: FlatLabel(infoLabel) {
 	margin: margins(0px, 0px, 0px, 0px);
 }
 birthdayTodayIcon: icon {{ "menu/gift_premium", windowActiveTextFg }};
+
+inviteForbiddenUserpicsPadding: margins(10px, 10px, 10px, 0px);
+inviteForbiddenInfo: FlatLabel(defaultFlatLabel) {
+	minWidth: 240px;
+	align: align(top);
+}
+inviteForbiddenInfoPadding: margins(32px, 10px, 32px, 4px);
+inviteForbiddenSubscribePadding: margins(16px, 12px, 16px, 16px);
+inviteForbiddenOrLabelPadding: margins(32px, 0px, 32px, 0px);
+inviteForbiddenTitle: FlatLabel(boxTitle) {
+	minWidth: 120px;
+	align: align(top);
+}
+inviteForbiddenTitlePadding: margins(32px, 4px, 32px, 0px);
+inviteForbiddenLockBg: dialogsUnreadBgMuted;
+inviteForbiddenLockIcon: icon {{ "emoji/premium_lock", dialogsUnreadFg }};
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index 1815c0db4..04ef17276 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_invite_links.h"
 #include "boxes/peers/edit_participant_box.h"
 #include "boxes/peers/edit_peer_type_box.h"
-#include "ui/boxes/confirm_box.h"
+#include "boxes/peers/replace_boost_box.h"
 #include "boxes/max_invite_box.h"
 #include "lang/lang_keys.h"
 #include "data/data_channel.h"
@@ -20,32 +20,56 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_folder.h"
 #include "data/data_changes.h"
+#include "data/data_peer_values.h"
 #include "history/history.h"
 #include "dialogs/dialogs_indexed_list.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/show_or_premium_box.h"
+#include "ui/effects/premium_graphics.h"
 #include "ui/text/text_utilities.h" // Ui::Text::RichLangValue
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
+#include "ui/widgets/gradient_round_button.h"
 #include "ui/wrap/padding_wrap.h"
+#include "ui/painter.h"
 #include "base/unixtime.h"
 #include "main/main_session.h"
 #include "mtproto/mtproto_config.h"
+#include "settings/settings_premium.h"
 #include "window/window_session_controller.h"
 #include "info/profile/info_profile_icon.h"
 #include "apiwrap.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
+#include "styles/style_premium.h"
 
 namespace {
 
 constexpr auto kParticipantsFirstPageCount = 16;
 constexpr auto kParticipantsPerPage = 200;
+constexpr auto kUserpicsLimit = 3;
+
+class ForbiddenRow final : public PeerListRow {
+public:
+	ForbiddenRow(not_null<PeerData*> peer, bool locked);
+
+	PaintRoundImageCallback generatePaintUserpicCallback(
+		bool forceRound) override;
+
+private:
+	const bool _locked = false;
+	QImage _disabledFrame;
+	InMemoryKey _userpicKey;
+	int _paletteVersion = 0;
+
+};
 
 class InviteForbiddenController final : public PeerListController {
 public:
 	InviteForbiddenController(
 		not_null<PeerData*> peer,
-		std::vector<not_null<UserData*>> users);
+		ForbiddenInvites forbidden);
 
 	Main::Session &session() const override;
 	void prepare() override;
@@ -67,9 +91,14 @@ private:
 	void appendRow(not_null<UserData*> user);
 	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(
 		not_null<UserData*> user) const;
+	[[nodiscard]] bool canInvite(not_null<PeerData*> peer) const;
+
+	void setSimpleCover();
+	void setComplexCover();
 
 	const not_null<PeerData*> _peer;
-	const std::vector<not_null<UserData*>> _users;
+	const ForbiddenInvites _forbidden;
+	const std::vector<not_null<UserData*>> &_users;
 	const bool _can = false;
 	rpl::variable<int> _selected;
 	bool _sending = false;
@@ -91,22 +120,226 @@ base::flat_set<not_null<UserData*>> GetAlreadyInFromPeer(PeerData *peer) {
 	return {};
 }
 
+void FillUpgradeToPremiumCover(
+		not_null<Ui::VerticalLayout*> container,
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<PeerData*> peer,
+		const ForbiddenInvites &forbidden) {
+	const auto noneCanSend = (forbidden.premiumAllowsWrite.size()
+		== forbidden.users.size());
+	const auto &userpicUsers = (forbidden.premiumAllowsInvite.empty()
+		|| noneCanSend)
+		? forbidden.premiumAllowsWrite
+		: forbidden.premiumAllowsInvite;
+	Assert(!userpicUsers.empty());
+
+	auto userpicPeers = userpicUsers | ranges::views::transform([](auto u) {
+		return not_null<PeerData*>(u);
+	}) | ranges::to_vector;
+	container->add(object_ptr<Ui::PaddingWrap<>>(
+		container,
+		CreateUserpicsWithMoreBadge(
+			container,
+			rpl::single(std::move(userpicPeers)),
+			kUserpicsLimit),
+		st::inviteForbiddenUserpicsPadding)
+	)->entity()->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto users = int(userpicUsers.size());
+	const auto names = std::min(users, kUserpicsLimit);
+	const auto remaining = std::max(users - kUserpicsLimit, 0);
+	auto text = TextWithEntities();
+	for (auto i = 0; i != names; ++i) {
+		const auto name = userpicUsers[i]->shortName();
+		if (text.empty()) {
+			text = Ui::Text::Bold(name);
+		} else if (i == names - 1 && !remaining) {
+			text = tr::lng_invite_upgrade_users_few(
+				tr::now,
+				lt_users,
+				text,
+				lt_last,
+				Ui::Text::Bold(name),
+				Ui::Text::RichLangValue);
+		} else {
+			text.append(", ").append(Ui::Text::Bold(name));
+		}
+	}
+	if (remaining > 0) {
+		text = tr::lng_invite_upgrade_users_many(
+			tr::now,
+			lt_count,
+			remaining,
+			lt_users,
+			text,
+			Ui::Text::RichLangValue);
+	}
+	const auto inviteOnly = !forbidden.premiumAllowsInvite.empty()
+		&& (forbidden.premiumAllowsWrite.size() != forbidden.users.size());
+	text = (peer->isBroadcast()
+		? (inviteOnly
+			? tr::lng_invite_upgrade_channel_invite
+			: tr::lng_invite_upgrade_channel_write)
+		: (inviteOnly
+			? tr::lng_invite_upgrade_group_invite
+			: tr::lng_invite_upgrade_group_write))(
+				tr::now,
+				lt_count,
+				int(userpicUsers.size()),
+				lt_users,
+				text,
+				Ui::Text::RichLangValue);
+	container->add(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			rpl::single(text),
+			st::inviteForbiddenInfo),
+		st::inviteForbiddenInfoPadding);
+}
+
+void SimpleForbiddenBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<PeerData*> peer,
+		const ForbiddenInvites &forbidden) {
+	box->setTitle(tr::lng_invite_upgrade_title());
+	box->setWidth(st::boxWideWidth);
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	auto sshow = Main::MakeSessionShow(box->uiShow(), &peer->session());
+	const auto container = box->verticalLayout();
+	FillUpgradeToPremiumCover(container, sshow, peer, forbidden);
+
+	const auto &stButton = st::premiumGiftBox;
+	box->setStyle(stButton);
+	auto raw = Settings::CreateSubscribeButton(
+		sshow,
+		ChatHelpers::ResolveWindowDefault(),
+		{
+			.parent = container,
+			.computeRef = [] { return u"invite_privacy"_q; },
+			.text = tr::lng_messages_privacy_premium_button(),
+			.showPromo = true,
+		});
+	auto button = object_ptr<Ui::GradientButton>::fromRaw(raw);
+	button->resizeToWidth(st::boxWideWidth
+		- stButton.buttonPadding.left()
+		- stButton.buttonPadding.right());
+	box->setShowFinishedCallback([raw = button.data()] {
+		raw->startGlareAnimation();
+	});
+	box->addButton(std::move(button));
+
+	Data::AmPremiumValue(
+		&peer->session()
+	) | rpl::skip(1) | rpl::start_with_next([=] {
+		box->closeBox();
+	}, box->lifetime());
+}
+
 InviteForbiddenController::InviteForbiddenController(
 	not_null<PeerData*> peer,
-	std::vector<not_null<UserData*>> users)
+	ForbiddenInvites forbidden)
 : _peer(peer)
-, _users(std::move(users))
+, _forbidden(std::move(forbidden))
+, _users(_forbidden.users)
 , _can(peer->isChat()
 	? peer->asChat()->canHaveInviteLink()
 	: peer->asChannel()->canHaveInviteLink())
-, _selected(_can ? int(_users.size()) : 0) {
+, _selected(_can
+	? (int(_users.size()) - int(_forbidden.premiumAllowsWrite.size()))
+	: 0) {
 }
 
 Main::Session &InviteForbiddenController::session() const {
 	return _peer->session();
 }
 
-void InviteForbiddenController::prepare() {
+ForbiddenRow::ForbiddenRow(not_null<PeerData*> peer, bool locked)
+: PeerListRow(peer)
+, _locked(locked) {
+	if (_locked) {
+		setCustomStatus(tr::lng_invite_status_disabled(tr::now));
+	}
+}
+
+PaintRoundImageCallback ForbiddenRow::generatePaintUserpicCallback(
+		bool forceRound) {
+	const auto peer = this->peer();
+	const auto saved = peer->isSelf();
+	const auto replies = peer->isRepliesChat();
+	auto userpic = (saved || replies)
+		? Ui::PeerUserpicView()
+		: ensureUserpicView();
+	auto paint = [=](
+			Painter &p,
+			int x,
+			int y,
+			int outerWidth,
+			int size) mutable {
+		peer->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
+	};
+	if (!_locked) {
+		return paint;
+	}
+	return [=](
+			Painter &p,
+			int x,
+			int y,
+			int outerWidth,
+			int size) mutable {
+		const auto wide = size + style::ConvertScale(3);
+		const auto full = QSize(wide, wide) * style::DevicePixelRatio();
+		auto repaint = false;
+		if (_disabledFrame.size() != full) {
+			repaint = true;
+			_disabledFrame = QImage(
+				full,
+				QImage::Format_ARGB32_Premultiplied);
+			_disabledFrame.setDevicePixelRatio(style::DevicePixelRatio());
+		} else {
+			repaint = (_paletteVersion != style::PaletteVersion())
+				|| (!saved
+					&& !replies
+					&& (_userpicKey != peer->userpicUniqueKey(userpic)));
+		}
+		if (repaint) {
+			_paletteVersion = style::PaletteVersion();
+			_userpicKey = peer->userpicUniqueKey(userpic);
+
+			_disabledFrame.fill(Qt::transparent);
+			auto p = Painter(&_disabledFrame);
+			paint(p, 0, 0, wide, size);
+
+			auto hq = PainterHighQualityEnabler(p);
+			p.setBrush(st::boxBg);
+			p.setPen(Qt::NoPen);
+			const auto lock = st::inviteForbiddenLockIcon.size();
+			const auto stroke = style::ConvertScale(2);
+			const auto inner = QRect(
+				size + (stroke / 2) - lock.width(),
+				size + (stroke / 2) - lock.height(),
+				lock.width(),
+				lock.height());
+			const auto half = stroke / 2.;
+			const auto rect = QRectF(inner).marginsAdded(
+				{ half, half, half, half });
+			auto pen = st::boxBg->p;
+			pen.setWidthF(stroke);
+			p.setPen(pen);
+			p.setBrush(st::inviteForbiddenLockBg);
+			p.drawEllipse(rect);
+
+			st::inviteForbiddenLockIcon.paintInCenter(p, inner);
+		}
+		p.drawImage(x, y, _disabledFrame);
+	};
+}
+
+void InviteForbiddenController::setSimpleCover() {
+	delegate()->peerListSetTitle(
+		_can ? tr::lng_profile_add_via_link() : tr::lng_via_link_cant());
 	const auto broadcast = _peer->isBroadcast();
 	const auto count = int(_users.size());
 	const auto phraseCounted = !_can
@@ -135,8 +368,78 @@ void InviteForbiddenController::prepare() {
 			std::move(text),
 			st::requestPeerRestriction),
 		st::boxRowPadding));
-	delegate()->peerListSetTitle(
-		_can ? tr::lng_profile_add_via_link() : tr::lng_via_link_cant());
+}
+
+void InviteForbiddenController::setComplexCover() {
+	delegate()->peerListSetTitle(tr::lng_invite_upgrade_title());
+
+	auto cover = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = cover.data();
+	const auto show = delegate()->peerListUiShow();
+	FillUpgradeToPremiumCover(container, show, _peer, _forbidden);
+
+	container->add(
+		object_ptr<Ui::GradientButton>::fromRaw(
+			Settings::CreateSubscribeButton(
+				show,
+				ChatHelpers::ResolveWindowDefault(),
+				{
+					.parent = container,
+					.computeRef = [] { return u"invite_privacy"_q; },
+					.text = tr::lng_messages_privacy_premium_button(),
+				})),
+				st::inviteForbiddenSubscribePadding);
+
+	if (_forbidden.users.size() > _forbidden.premiumAllowsWrite.size()) {
+		if (_can) {
+			container->add(
+				MakeShowOrLabel(container, tr::lng_invite_upgrade_or()),
+				st::inviteForbiddenOrLabelPadding);
+		}
+		container->add(
+			object_ptr<Ui::FlatLabel>(
+				container,
+				(_can
+					? tr::lng_invite_upgrade_via_title()
+					: tr::lng_via_link_cant()),
+				st::inviteForbiddenTitle),
+			st::inviteForbiddenTitlePadding);
+
+		const auto about = _can
+			? (_peer->isBroadcast()
+				? tr::lng_invite_upgrade_via_channel_about
+				: tr::lng_invite_upgrade_via_group_about)(
+					tr::now,
+					Ui::Text::WithEntities)
+			: (_forbidden.users.size() == 1
+				? tr::lng_via_link_cant_one(
+					tr::now,
+					lt_user,
+					TextWithEntities{ _forbidden.users.front()->shortName() },
+					Ui::Text::RichLangValue)
+				: tr::lng_via_link_cant_many(
+					tr::now,
+					lt_count,
+					int(_forbidden.users.size()),
+					Ui::Text::RichLangValue));
+		container->add(
+			object_ptr<Ui::FlatLabel>(
+				container,
+				rpl::single(about),
+				st::inviteForbiddenInfo),
+			st::inviteForbiddenInfoPadding);
+	}
+	delegate()->peerListSetAboveWidget(std::move(cover));
+}
+
+void InviteForbiddenController::prepare() {
+	if (session().premium()
+		|| (_forbidden.premiumAllowsInvite.empty()
+			&& _forbidden.premiumAllowsWrite.empty())) {
+		setSimpleCover();
+	} else {
+		setComplexCover();
+	}
 
 	for (const auto &user : _users) {
 		appendRow(user);
@@ -144,8 +447,16 @@ void InviteForbiddenController::prepare() {
 	delegate()->peerListRefreshRows();
 }
 
+bool InviteForbiddenController::canInvite(not_null<PeerData*> peer) const {
+	const auto user = peer->asUser();
+	Assert(user != nullptr);
+
+	return _can
+		&& !ranges::contains(_forbidden.premiumAllowsWrite, not_null(user));
+}
+
 void InviteForbiddenController::rowClicked(not_null<PeerListRow*> row) {
-	if (!_can) {
+	if (!canInvite(row->peer())) {
 		return;
 	}
 	const auto checked = row->checked();
@@ -158,7 +469,7 @@ void InviteForbiddenController::appendRow(not_null<UserData*> user) {
 		auto row = createRow(user);
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
-		if (_can) {
+		if (canInvite(user)) {
 			delegate()->peerListSetRowChecked(raw, true);
 		}
 	}
@@ -228,7 +539,8 @@ void InviteForbiddenController::send(
 
 std::unique_ptr<PeerListRow> InviteForbiddenController::createRow(
 		not_null<UserData*> user) const {
-	return std::make_unique<PeerListRow>(user);
+	const auto locked = _can && !canInvite(user);
+	return std::make_unique<ForbiddenRow>(user, locked);
 }
 
 } // namespace
@@ -559,17 +871,23 @@ void AddParticipantsBoxController::Start(
 	Start(navigation, channel, {}, true);
 }
 
-std::vector<not_null<UserData*>> CollectForbiddenUsers(
+ForbiddenInvites CollectForbiddenUsers(
 		not_null<Main::Session*> session,
 		const MTPmessages_InvitedUsers &result) {
 	const auto &data = result.data();
 	const auto owner = &session->data();
-	auto forbidden = std::vector<not_null<UserData*>>();
+	auto forbidden = ForbiddenInvites();
 	for (const auto &missing : data.vmissing_invitees().v) {
-		const auto user = owner->userLoaded(missing.data().vuser_id());
+		const auto &data = missing.data();
+		const auto user = owner->userLoaded(data.vuser_id());
 		if (user) {
-			// #TODO invites
-			forbidden.push_back(user);
+			forbidden.users.push_back(user);
+			if (data.is_premium_would_allow_invite()) {
+				forbidden.premiumAllowsInvite.push_back(user);
+			}
+			if (data.is_premium_required_for_pm()) {
+				forbidden.premiumAllowsWrite.push_back(user);
+			}
 		}
 	}
 	return forbidden;
@@ -578,9 +896,14 @@ std::vector<not_null<UserData*>> CollectForbiddenUsers(
 bool ChatInviteForbidden(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
-		std::vector<not_null<UserData*>> forbidden) {
+		ForbiddenInvites forbidden) {
 	if (forbidden.empty() || !show || !show->valid()) {
 		return false;
+	} else if (forbidden.users.size() <= kUserpicsLimit
+		&& (forbidden.premiumAllowsWrite.size()
+			== forbidden.users.size())) {
+		show->show(Box(SimpleForbiddenBox, peer, forbidden));
+		return true;
 	}
 	auto controller = std::make_unique<InviteForbiddenController>(
 		peer,
@@ -612,6 +935,12 @@ bool ChatInviteForbidden(
 				box->closeBox();
 			});
 		}, box->lifetime());
+
+		Data::AmPremiumValue(
+			&peer->session()
+		) | rpl::skip(1) | rpl::start_with_next([=] {
+			box->closeBox();
+		}, box->lifetime());
 	};
 	show->showBox(
 		Box<PeerListBox>(std::move(controller), std::move(initBox)));
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.h b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
index 8ac842cf1..24d5e1031 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
@@ -73,13 +73,22 @@ private:
 
 };
 
-[[nodiscard]] std::vector<not_null<UserData*>> CollectForbiddenUsers(
+struct ForbiddenInvites {
+	std::vector<not_null<UserData*>> users;
+	std::vector<not_null<UserData*>> premiumAllowsInvite;
+	std::vector<not_null<UserData*>> premiumAllowsWrite;
+
+	[[nodiscard]] bool empty() const {
+		return users.empty();
+	}
+};
+[[nodiscard]] ForbiddenInvites CollectForbiddenUsers(
 	not_null<Main::Session*> session,
 	const MTPmessages_InvitedUsers &result);
 bool ChatInviteForbidden(
 	std::shared_ptr<Ui::Show> show,
 	not_null<PeerData*> peer,
-	std::vector<not_null<UserData*>> forbidden);
+	ForbiddenInvites forbidden);
 
 // Adding an admin, banned or restricted user from channel members
 // with search + contacts search + global search.
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index e627306a6..725427007 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -87,8 +87,12 @@ void AddChatParticipant(
 		if (onDone) {
 			onDone();
 		}
+		ChatInviteForbidden(
+			show,
+			chat,
+			CollectForbiddenUsers(&chat->session(), result));
 	}).fail([=](const MTP::Error &error) {
-		ShowAddParticipantsError(show, error.type(), chat, { 1, user });
+		ShowAddParticipantsError(show, error.type(), chat, user);
 		if (onFail) {
 			onFail();
 		}
@@ -155,7 +159,7 @@ void SaveChannelAdmin(
 			onDone();
 		}
 	}).fail([=](const MTP::Error &error) {
-		ShowAddParticipantsError(show, error.type(), channel, { 1, user });
+		ShowAddParticipantsError(show, error.type(), channel, user);
 		if (onFail) {
 			onFail();
 		}
diff --git a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
index f9a4c5d8f..a13295d00 100644
--- a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
@@ -671,3 +671,143 @@ object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
 	}, overlay->lifetime());
 	return result;
 }
+
+object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
+		not_null<Ui::RpWidget*> parent,
+		rpl::producer<std::vector<not_null<PeerData*>>> peers,
+		int limit) {
+	struct State {
+		std::vector<not_null<PeerData*>> from;
+		std::vector<std::unique_ptr<Ui::UserpicButton>> buttons;
+		QImage layer;
+		QImage badge;
+		rpl::variable<int> count = 0;
+		bool painting = false;
+	};
+	const auto full = st::boostReplaceUserpic.size.height()
+		+ st::boostReplaceIconAdd.y()
+		+ st::lineWidth;
+	auto result = object_ptr<Ui::FixedHeightWidget>(parent, full);
+	const auto raw = result.data();
+	const auto &st = st::boostReplaceUserpic;
+	const auto overlay = CreateChild<Ui::RpWidget>(raw);
+
+	const auto state = raw->lifetime().make_state<State>();
+	std::move(
+		peers
+	) | rpl::start_with_next([=](
+			const std::vector<not_null<PeerData*>> &list) {
+		const auto &st = st::boostReplaceUserpic;
+		auto was = base::take(state->from);
+		auto buttons = base::take(state->buttons);
+		state->from.reserve(list.size());
+		state->buttons.reserve(list.size());
+		for (const auto &peer : list | ranges::views::take(limit)) {
+			state->from.push_back(peer);
+			const auto i = ranges::find(was, peer);
+			if (i != end(was)) {
+				const auto index = int(i - begin(was));
+				Assert(buttons[index] != nullptr);
+				state->buttons.push_back(std::move(buttons[index]));
+			} else {
+				state->buttons.push_back(
+					std::make_unique<Ui::UserpicButton>(raw, peer, st));
+				const auto raw = state->buttons.back().get();
+				base::install_event_filter(raw, [=](not_null<QEvent*> e) {
+					return (e->type() == QEvent::Paint && !state->painting)
+						? base::EventFilterResult::Cancel
+						: base::EventFilterResult::Continue;
+				});
+			}
+		}
+		state->count.force_assign(int(list.size()));
+		overlay->update();
+	}, raw->lifetime());
+
+	rpl::combine(
+		raw->widthValue(),
+		state->count.value()
+	) | rpl::start_with_next([=](int width, int count) {
+		const auto &st = st::boostReplaceUserpic;
+		const auto single = st.size.width();
+		const auto left = width - single;
+		const auto used = std::min(count, int(state->buttons.size()));
+		const auto shift = std::min(
+			st::boostReplaceUserpicsShift,
+			(used > 1 ? (left / (used - 1)) : width));
+		const auto total = used ? (single + (used - 1) * shift) : 0;
+		auto x = (width - total) / 2;
+		for (const auto &single : state->buttons) {
+			single->moveToLeft(x, 0);
+			x += shift;
+		}
+		overlay->setGeometry(QRect(0, 0, width, raw->height()));
+	}, raw->lifetime());
+
+	overlay->paintRequest(
+	) | rpl::filter([=] {
+		return !state->buttons.empty();
+	}) | rpl::start_with_next([=] {
+		const auto outerw = overlay->width();
+		const auto ratio = style::DevicePixelRatio();
+		if (state->layer.size() != QSize(outerw, full) * ratio) {
+			state->layer = QImage(
+				QSize(outerw, full) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			state->layer.setDevicePixelRatio(ratio);
+		}
+		state->layer.fill(Qt::transparent);
+
+		auto q = QPainter(&state->layer);
+		auto hq = PainterHighQualityEnabler(q);
+		const auto stroke = st::boostReplaceIconOutline;
+		const auto half = stroke / 2.;
+		auto pen = st::windowBg->p;
+		pen.setWidthF(stroke * 2.);
+		state->painting = true;
+		for (const auto &button : state->buttons) {
+			q.setPen(pen);
+			q.setBrush(Qt::NoBrush);
+			q.drawEllipse(button->geometry());
+			const auto position = button->pos();
+			button->render(&q, position, QRegion(), QWidget::DrawChildren);
+		}
+		state->painting = false;
+		const auto last = state->buttons.back().get();
+		const auto add = st::boostReplaceIconAdd;
+		const auto skip = st::boostReplaceIconSkip;
+		const auto w = st::boostReplaceIcon.width() + 2 * skip;
+		const auto h = st::boostReplaceIcon.height() + 2 * skip;
+		const auto x = last->x() + last->width() - w + add.x();
+		const auto y = last->y() + last->height() - h + add.y();
+
+		const auto text = (state->count.current() > limit)
+			? ('+' + QString::number(state->count.current() - limit))
+			: QString();
+		if (!text.isEmpty()) {
+			const auto &font = st::semiboldFont;
+			const auto width = font->width(text);
+			const auto padded = std::max(w, width + 2 * font->spacew);
+			const auto rect = QRect(x - (padded - w) / 2, y, padded, h);
+			auto brush = QLinearGradient(rect.bottomRight(), rect.topLeft());
+			brush.setStops(Ui::Premium::ButtonGradientStops());
+			q.setBrush(brush);
+			pen.setWidthF(stroke);
+			q.setPen(pen);
+			const auto rectf = QRectF(rect);
+			const auto radius = std::min(rect.width(), rect.height()) / 2.;
+			q.drawRoundedRect(
+				rectf.marginsAdded(QMarginsF{ half, half, half, half }),
+				radius,
+				radius);
+			q.setFont(font);
+			q.setPen(st::premiumButtonFg);
+			q.drawText(rect, Qt::AlignCenter, text);
+		}
+		q.end();
+
+		auto p = QPainter(overlay);
+		p.drawImage(0, 0, state->layer);
+	}, overlay->lifetime());
+	return result;
+}
diff --git a/Telegram/SourceFiles/boxes/peers/replace_boost_box.h b/Telegram/SourceFiles/boxes/peers/replace_boost_box.h
index 0f7d01106..c84b0d306 100644
--- a/Telegram/SourceFiles/boxes/peers/replace_boost_box.h
+++ b/Telegram/SourceFiles/boxes/peers/replace_boost_box.h
@@ -57,3 +57,8 @@ object_ptr<Ui::BoxContent> ReassignBoostsBox(
 	not_null<Ui::RpWidget*> parent,
 	rpl::producer<std::vector<not_null<PeerData*>>> from,
 	not_null<PeerData*> to);
+
+[[nodiscard]] object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
+	not_null<Ui::RpWidget*> parent,
+	rpl::producer<std::vector<not_null<PeerData*>>> peers,
+	int limit);
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 2addb7fe4..d1962e407 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -1464,9 +1464,26 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 		SubscribeButtonArgs &&args) {
 	Expects(args.show || args.controller);
 
-	if (!args.show && args.controller) {
-		args.show = args.controller->uiShow();
-	}
+	auto show = args.show ? std::move(args.show) : args.controller->uiShow();
+	auto resolve = [show](
+			not_null<Main::Session*> session,
+			ChatHelpers::WindowUsage usage) {
+		Expects(session == &show->session());
+
+		return show->resolveWindow(usage);
+	};
+	return CreateSubscribeButton(
+		std::move(show),
+		std::move(resolve),
+		std::move(args));
+}
+
+not_null<Ui::GradientButton*> CreateSubscribeButton(
+		std::shared_ptr<::Main::SessionShow> show,
+		Fn<Window::SessionController*(
+			not_null<::Main::Session*>,
+			ChatHelpers::WindowUsage)> resolveWindow,
+		SubscribeButtonArgs &&args) {
 	const auto result = Ui::CreateChild<Ui::GradientButton>(
 		args.parent.get(),
 		args.gradientStops
@@ -1474,13 +1491,19 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 			: Ui::Premium::ButtonGradientStops());
 
 	result->setClickedCallback([
-			show = args.show,
+			show,
+			resolveWindow,
+			promo = args.showPromo,
 			computeRef = args.computeRef,
 			computeBotUrl = args.computeBotUrl] {
-		const auto window = show->resolveWindow(
+		const auto window = resolveWindow(
+			&show->session(),
 			ChatHelpers::WindowUsage::PremiumPromo);
 		if (!window) {
 			return;
+		} else if (promo) {
+			Settings::ShowPremium(window, computeRef());
+			return;
 		}
 		const auto url = computeBotUrl ? computeBotUrl() : QString();
 		if (!url.isEmpty()) {
@@ -1503,7 +1526,7 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 	const auto &st = st::premiumPreviewBox.button;
 	result->resize(args.parent->width(), st.height);
 
-	const auto premium = &args.show->session().api().premium();
+	const auto premium = &show->session().api().premium();
 	premium->reload();
 	const auto computeCost = [=] {
 		const auto amount = premium->monthlyAmount();
diff --git a/Telegram/SourceFiles/settings/settings_premium.h b/Telegram/SourceFiles/settings/settings_premium.h
index 6dd571812..65d7d18da 100644
--- a/Telegram/SourceFiles/settings/settings_premium.h
+++ b/Telegram/SourceFiles/settings/settings_premium.h
@@ -79,6 +79,7 @@ struct SubscribeButtonArgs final {
 	std::optional<QGradientStops> gradientStops;
 	Fn<QString()> computeBotUrl; // nullable
 	std::shared_ptr<ChatHelpers::Show> show;
+	bool showPromo = false;
 };
 
 
@@ -91,6 +92,13 @@ struct SubscribeButtonArgs final {
 [[nodiscard]] not_null<Ui::GradientButton*> CreateSubscribeButton(
 	SubscribeButtonArgs &&args);
 
+[[nodiscard]] not_null<Ui::GradientButton*> CreateSubscribeButton(
+	std::shared_ptr<::Main::SessionShow> show,
+	Fn<Window::SessionController*(
+		not_null<::Main::Session*>,
+		ChatHelpers::WindowUsage)> resolveWindow,
+	SubscribeButtonArgs &&args);
+
 [[nodiscard]] std::vector<PremiumFeature> PremiumFeaturesOrder(
 	not_null<::Main::Session*> session);
 
diff --git a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
index 5f00e1b7e..485af50a8 100644
--- a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
@@ -52,7 +52,9 @@ constexpr auto kShowOrLineOpacity = 0.3;
 	return result;
 }
 
-[[nodiscard]] object_ptr<RpWidget> MakeShowOrLabel(
+} // namespace
+
+object_ptr<RpWidget> MakeShowOrLabel(
 		not_null<RpWidget*> parent,
 		rpl::producer<QString> text) {
 	auto result = object_ptr<FlatLabel>(
@@ -80,8 +82,6 @@ constexpr auto kShowOrLineOpacity = 0.3;
 	return result;
 }
 
-} // namespace
-
 void ShowOrPremiumBox(
 		not_null<GenericBox*> box,
 		ShowOrPremium type,
diff --git a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.h b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.h
index 4c0a10104..25bcfc9f9 100644
--- a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.h
+++ b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.h
@@ -7,8 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/object_ptr.h"
+
 namespace Ui {
 
+class RpWidget;
 class GenericBox;
 
 enum class ShowOrPremium : uchar {
@@ -22,4 +25,8 @@ void ShowOrPremiumBox(
 	Fn<void()> justShow,
 	Fn<void()> toPremium);
 
+[[nodiscard]] object_ptr<RpWidget> MakeShowOrLabel(
+	not_null<RpWidget*> parent,
+	rpl::producer<QString> text);
+
 } // namespace Ui

From 707146daed9cb62687520e914dba02e6447c8257 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Apr 2024 22:52:25 +0400
Subject: [PATCH 197/596] Version 4.16.

- Instant View on Windows 10+ and macOS.
- Allow scheduling messages in topics.
- Telegram Business: Links to Chats.
- Telegram Business: Custom Intro.
- Telegram Business: Chatbots.
- Sharing Revenue with Channel Owners.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml      |  2 +-
 Telegram/Resources/winrc/Telegram.rc              |  8 ++++----
 Telegram/Resources/winrc/Updater.rc               |  8 ++++----
 Telegram/SourceFiles/api/api_user_privacy.cpp     |  1 -
 Telegram/SourceFiles/boxes/gift_premium_box.cpp   |  2 +-
 .../SourceFiles/boxes/peers/replace_boost_box.cpp |  1 -
 Telegram/SourceFiles/core/version.h               |  6 +++---
 .../earn/info_earn_inner_widget.cpp               |  7 ++-----
 .../info/profile/info_profile_actions.cpp         |  4 ++--
 .../settings/business/settings_chat_intro.cpp     | 15 +--------------
 .../settings/business/settings_chat_links.cpp     |  1 -
 .../SourceFiles/settings/settings_information.cpp |  2 --
 Telegram/build/version                            | 12 ++++++------
 changelog.txt                                     |  9 +++++++++
 14 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 6c57abb3e..2627ef790 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.15.7.0" />
+    Version="4.16.0.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 9e4970334..09f5f8a95 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 4,15,7,0
- PRODUCTVERSION 4,15,7,0
+ FILEVERSION 4,16,0,0
+ PRODUCTVERSION 4,16,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", "4.15.7.0"
+            VALUE "FileVersion", "4.16.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.7.0"
+            VALUE "ProductVersion", "4.16.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 6c5fb5b1d..95a5053d0 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 4,15,7,0
- PRODUCTVERSION 4,15,7,0
+ FILEVERSION 4,16,0,0
+ PRODUCTVERSION 4,16,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", "4.15.7.0"
+            VALUE "FileVersion", "4.16.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.15.7.0"
+            VALUE "ProductVersion", "4.16.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/api/api_user_privacy.cpp b/Telegram/SourceFiles/api/api_user_privacy.cpp
index dd5693cee..b27580aaa 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -106,7 +106,6 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 	using Option = UserPrivacy::Option;
 	auto result = UserPrivacy::Rule();
 	auto optionSet = false;
-	auto allowPremium = false;
 	const auto setOption = [&](Option option) {
 		if (optionSet) {
 			return;
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index fb4c25c2c..b107af7c9 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -906,7 +906,7 @@ void ShareWithFriend(
 	Window::ShowChooseRecipientBox(navigation, chosen);
 }
 
-[[nodiscard]] void ShowAlreadyPremiumToast(
+void ShowAlreadyPremiumToast(
 		not_null<Window::SessionNavigation*> navigation,
 		const QString &slug,
 		TimeId date) {
diff --git a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
index a13295d00..70648d627 100644
--- a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
@@ -689,7 +689,6 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 		+ st::lineWidth;
 	auto result = object_ptr<Ui::FixedHeightWidget>(parent, full);
 	const auto raw = result.data();
-	const auto &st = st::boostReplaceUserpic;
 	const auto overlay = CreateChild<Ui::RpWidget>(raw);
 
 	const auto state = raw->lifetime().make_state<State>();
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 7dcf0938e..e3374144e 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 = 4015007;
-constexpr auto AppVersionStr = "4.15.7";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 4016000;
+constexpr auto AppVersionStr = "4.16";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 04d46a0b5..1a0cedb1b 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -281,7 +281,7 @@ void InnerWidget::fill() {
 	const auto &data = _state;
 
 	constexpr auto kMinus = QChar(0x2212);
-	constexpr auto kApproximately = QChar(0x2248);
+	//constexpr auto kApproximately = QChar(0x2248);
 	const auto multiplier = data.usdRate;
 
 	constexpr auto kNonInteractivePeriod = 1717200000;
@@ -706,9 +706,6 @@ void InnerWidget::fill() {
 				(b.height() - l.height()) / 2);
 		}, label->lifetime());
 
-		const auto fadeAnimation =
-			label->lifetime().make_state<Ui::Animations::Simple>();
-
 		const auto colorText = [=](float64 value) {
 			label->setTextColorOverride(
 				anim::with_alpha(
@@ -1044,7 +1041,7 @@ void InnerWidget::fill() {
 		Ui::AddSkip(container);
 	}
 	if (channel) {
-		constexpr auto kMaxCPM = 50; // Debug.
+		//constexpr auto kMaxCPM = 50; // Debug.
 		const auto requiredLevel = Data::LevelLimits(session)
 			.channelRestrictSponsoredLevelMin();
 		const auto &phrase = tr::lng_channel_earn_off;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index adba93d89..19d7eebae 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -670,12 +670,12 @@ base::options::toggle ShowPeerIdBelowAbout({
 			const TextWithEntities &value) {
 		slide->show(anim::type::normal);
 	});
-	auto labeled = layout->add(object_ptr<Ui::FlatLabel>(
+	layout->add(object_ptr<Ui::FlatLabel>(
 		layout,
 		std::move(nonEmptyText),
 		st::birthdayLabeled));
 	layout->add(Ui::CreateSkipWidget(layout, st::infoLabelSkip));
-	const auto subtext = layout->add(object_ptr<Ui::FlatLabel>(
+	layout->add(object_ptr<Ui::FlatLabel>(
 		layout,
 		std::move(
 			label
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index e7da8a27f..16072b1f0 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -103,9 +103,6 @@ public:
 		not_null<QWidget*> button;
 	};
 	void show(Descriptor &&descriptor);
-	void repaint();
-
-	[[nodiscard]] bool hasFocus() const;
 
 	struct CustomChosen {
 		not_null<DocumentData*> sticker;
@@ -240,7 +237,6 @@ rpl::producer<std::shared_ptr<StickerPlayer>> IconPlayerValue(
 		stickerChosen(chosen.sticker);
 	}, raw->lifetime());
 
-	const auto session = &show->session();
 	std::move(
 		stickerValue
 	) | rpl::start_with_next([=](DocumentData *sticker) {
@@ -435,7 +431,6 @@ StickerPanel::StickerPanel() = default;
 StickerPanel::~StickerPanel() = default;
 
 void StickerPanel::show(Descriptor &&descriptor) {
-	const auto controller = descriptor.controller;
 	if (!_panel) {
 		create(descriptor);
 
@@ -466,14 +461,6 @@ void StickerPanel::show(Descriptor &&descriptor) {
 	_panel->toggleAnimated();
 }
 
-bool StickerPanel::hasFocus() const {
-	return _panel && Ui::InFocusChain(_panel.get());
-}
-
-void StickerPanel::repaint() {
-	_panel->selector()->update();
-}
-
 void StickerPanel::create(const Descriptor &descriptor) {
 	using Selector = ChatHelpers::TabbedSelector;
 	using Descriptor = ChatHelpers::TabbedSelectorDescriptor;
@@ -572,7 +559,7 @@ void ChatIntro::setupContent(
 		_intro = intro;
 	};
 
-	const auto preview = content->add(
+	content->add(
 		object_ptr<PreviewWrap>(
 			content,
 			session,
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
index 15349246c..796701b22 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
@@ -673,7 +673,6 @@ void LinksController::rowPaintIcon(
 	const auto skip = st::inviteLinkIconSkip;
 	const auto inner = size - 2 * skip;
 	const auto bg = &st::msgFile1Bg;
-	const auto stroke = st::inviteLinkIconStroke;
 	if (_icon.isNull()) {
 		_icon = QImage(
 			QSize(inner, inner) * style::DevicePixelRatio(),
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index b6b75b589..9db8d59a9 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -416,8 +416,6 @@ void SetupPersonalChannel(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
 		not_null<UserData*> self) {
-	const auto session = &self->session();
-
 	Ui::AddSkip(container);
 
 	auto value = rpl::combine(
diff --git a/Telegram/build/version b/Telegram/build/version
index a9c7b538f..7da53e563 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4015007
-AppVersionStrMajor 4.15
-AppVersionStrSmall 4.15.7
-AppVersionStr      4.15.7
-BetaChannel        1
+AppVersion         4016000
+AppVersionStrMajor 4.16
+AppVersionStrSmall 4.16
+AppVersionStr      4.16.0
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.15.7.beta
+AppVersionOriginal 4.16
diff --git a/changelog.txt b/changelog.txt
index 17ff9b6e3..a0e595060 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,12 @@
+4.16 (01.04.24)
+
+- Instant View on Windows 10+ and macOS.
+- Allow scheduling messages in topics.
+- Telegram Business: Links to Chats.
+- Telegram Business: Custom Intro.
+- Telegram Business: Chatbots.
+- Sharing Revenue with Channel Owners.
+
 4.15.7 beta (01.04.24)
 
 - Test crashfix on Linux.

From 3fc4030ca6d6250962db9b94343edbb29fc47ab3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 2 Apr 2024 10:25:46 +0400
Subject: [PATCH 198/596] Migrate xz in Dockerfile to the URL used in
 prepare.py

---
 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 cb0fcbaa6..290146ce3 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -79,7 +79,7 @@ RUN git init zlib \
 	&& rm -rf zlib
 
 FROM builder AS xz
-RUN git clone -b v5.4.4 --depth=1 {{ GIT }}/tukaani-project/xz.git \
+RUN git clone -b v5.4.4 --depth=1 https://git.tukaani.org/xz.git \
 	&& cd xz \
 	&& cmake -B build . -DCMAKE_BUILD_TYPE=None \
 	&& cmake --build build -j$(nproc) \

From e02b60d8fa05ebe4537e9fc757911cbdffe0c1ad Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 11:26:18 +0400
Subject: [PATCH 199/596] Fix placeholder in chat intro setup.

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

diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 16072b1f0..7bd61ca90 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -160,7 +160,7 @@ private:
 		object_ptr<Ui::InputField>(
 			container,
 			st::settingsChatIntroField,
-			tr::lng_chat_intro_enter_title(),
+			std::move(placeholder),
 			current),
 		st::settingsChatIntroFieldMargins);
 	field->setMaxLength(limit);

From 615ad85d26f5b953322e7733d7c44121163819a8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 11:26:22 +0400
Subject: [PATCH 200/596] Fix possible crash in notifications setup.

Initial _account assignment triggered sync createManager(),
which in case of native Windows notifications called
ToastNotificationManager::CreateToastNotifier, which could enter
qt-wndproc-message processing with QEvent::ApplicationActivated
delivery and calling updateNonIdle() which called
Window::Controller::account(), that wasn't yet set.
---
 Telegram/SourceFiles/main/main_domain.cpp | 6 ++++--
 Telegram/SourceFiles/main/main_domain.h   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/main/main_domain.cpp b/Telegram/SourceFiles/main/main_domain.cpp
index 26e01229f..cc6bd9457 100644
--- a/Telegram/SourceFiles/main/main_domain.cpp
+++ b/Telegram/SourceFiles/main/main_domain.cpp
@@ -32,11 +32,13 @@ Domain::Domain(const QString &dataName)
 : _dataName(dataName)
 , _local(std::make_unique<Storage::Domain>(this, dataName)) {
 	_active.changes(
-	) | rpl::take(1) | rpl::start_with_next([] {
+	) | rpl::take(1) | rpl::start_with_next([=] {
 		// In case we had a legacy passcoded app we start settings here.
 		Core::App().startSettingsAndBackground();
 
-		Core::App().notifications().createManager();
+		crl::on_main(this, [=] {
+			Core::App().notifications().createManager();
+		});
 	}, _lifetime);
 
 	_active.changes(
diff --git a/Telegram/SourceFiles/main/main_domain.h b/Telegram/SourceFiles/main/main_domain.h
index 1a39e8e7f..2e69222b9 100644
--- a/Telegram/SourceFiles/main/main_domain.h
+++ b/Telegram/SourceFiles/main/main_domain.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/timer.h"
+#include "base/weak_ptr.h"
 
 namespace Storage {
 class Domain;
@@ -23,7 +24,7 @@ namespace Main {
 class Account;
 class Session;
 
-class Domain final {
+class Domain final : public base::has_weak_ptr {
 public:
 	struct AccountWithIndex {
 		int index = 0;

From 1da9df690fe068ea62e0a58d0d963eab8c4465ac Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 11:50:58 +0400
Subject: [PATCH 201/596] Fix memory leak in downloads thumbnail loading.

---
 Telegram/SourceFiles/data/data_download_manager.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_download_manager.cpp b/Telegram/SourceFiles/data/data_download_manager.cpp
index 95c78092d..2fa5f05d4 100644
--- a/Telegram/SourceFiles/data/data_download_manager.cpp
+++ b/Telegram/SourceFiles/data/data_download_manager.cpp
@@ -1123,13 +1123,14 @@ rpl::producer<Ui::DownloadBarContent> MakeDownloadBarContent() {
 				state->thumbnail = Images::Prepare(embed->original(), 0, {
 					.options = Images::Option::Blur,
 				});
+			} else if (!state->downloadTaskLifetime) {
+				state->document->session().downloaderTaskFinished(
+				) | rpl::filter([=] {
+					return self(self);
+				}) | rpl::start_with_next(
+					state->push,
+					state->downloadTaskLifetime);
 			}
-			state->document->session().downloaderTaskFinished(
-			) | rpl::filter([=] {
-				return self(self);
-			}) | rpl::start_with_next(
-				state->push,
-				state->downloadTaskLifetime);
 			return !state->thumbnail.isNull();
 		};
 		const auto resolveThumbnail = [=] {

From 8ab118a8e9916a7d95d42b5bd150ebd13280d6a2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 12:20:27 +0400
Subject: [PATCH 202/596] Fix rare crashes in message sending animations.

---
 .../SourceFiles/history/history_widget.cpp    | 13 ++++---
 .../history/view/history_view_list_widget.cpp |  8 ++--
 .../message_sending_animation_controller.cpp  | 39 +++++++++++++------
 .../message_sending_animation_controller.h    |  6 ++-
 4 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 79994f61f..8d2dff310 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -6244,8 +6244,7 @@ void HistoryWidget::startItemRevealAnimations() {
 void HistoryWidget::startMessageSendingAnimation(
 		not_null<HistoryItem*> item) {
 	auto &sendingAnimation = controller()->sendingAnimation();
-	if (!sendingAnimation.hasLocalMessage(item->fullId().msg)
-		|| !sendingAnimation.checkExpectedType(item)) {
+	if (!sendingAnimation.checkExpectedType(item)) {
 		return;
 	}
 	Assert(item->mainView() != nullptr);
@@ -6257,14 +6256,16 @@ void HistoryWidget::startMessageSendingAnimation(
 		geometryValue() | rpl::to_empty,
 		_scroll->geometryValue() | rpl::to_empty,
 		_list->geometryValue() | rpl::to_empty
-	) | rpl::map([=] {
+	) | rpl::map([=]() -> std::optional<QPoint> {
 		const auto view = item->mainView();
+		const auto top = view ? _list->itemTop(view) : -1;
+		if (top < 0) {
+			return std::nullopt;
+		}
 		const auto additional = (_list->height() == _scroll->height())
 			? view->height()
 			: 0;
-		return _list->mapToGlobal(QPoint(
-			0,
-			_list->itemTop(view) - additional));
+		return _list->mapToGlobal(QPoint(0, top - additional));
 	});
 
 	sendingAnimation.startAnimation({
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index fb8d99130..23b7c0be3 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1839,16 +1839,18 @@ void ListWidget::startItemRevealAnimations() {
 void ListWidget::startMessageSendingAnimation(
 		not_null<HistoryItem*> item) {
 	auto &sendingAnimation = controller()->sendingAnimation();
-	if (!sendingAnimation.hasLocalMessage(item->fullId().msg)
-		|| !sendingAnimation.checkExpectedType(item)) {
+	if (!sendingAnimation.checkExpectedType(item)) {
 		return;
 	}
 
 	auto globalEndTopLeft = rpl::merge(
 		session().data().newItemAdded() | rpl::to_empty,
 		geometryValue() | rpl::to_empty
-	) | rpl::map([=] {
+	) | rpl::map([=]() -> std::optional<QPoint> {
 		const auto view = viewForItem(item);
+		if (!view) {
+			return std::nullopt;
+		}
 		const auto additional = !_visibleTop ? view->height() : 0;
 		return mapToGlobal(QPoint(0, itemTop(view) - additional));
 	});
diff --git a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp
index 84d98f521..552f46412 100644
--- a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp
+++ b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp
@@ -39,7 +39,7 @@ public:
 	Content(
 		not_null<RpWidget*> parent,
 		not_null<Window::SessionController*> controller,
-		const MessageSendingAnimationFrom &fromInfo,
+		MessageSendingAnimationFrom &&fromInfo,
 		MessageSendingAnimationController::SendingInfoTo &&to);
 
 	[[nodiscard]] rpl::producer<> destroyRequests() const;
@@ -79,7 +79,7 @@ private:
 Content::Content(
 	not_null<RpWidget*> parent,
 	not_null<Window::SessionController*> controller,
-	const MessageSendingAnimationFrom &fromInfo,
+	MessageSendingAnimationFrom &&fromInfo,
 	MessageSendingAnimationController::SendingInfoTo &&to)
 : RpWidget(parent)
 , _controller(controller)
@@ -98,8 +98,12 @@ Content::Content(
 	base::take(
 		_toInfo.globalEndTopLeft
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](const QPoint &p) {
-		_to = parent->mapFromGlobal(p);
+	) | rpl::start_with_next([=](const std::optional<QPoint> &p) {
+		if (p) {
+			_to = parent->mapFromGlobal(*p);
+		} else {
+			_destroyRequests.fire({});
+		}
 	}, lifetime());
 
 	_controller->session().downloaderTaskFinished(
@@ -366,6 +370,20 @@ void Content::createBubble() {
 MessageSendingAnimationController::MessageSendingAnimationController(
 	not_null<Window::SessionController*> controller)
 : _controller(controller) {
+	subscribeToDestructions();
+}
+
+void MessageSendingAnimationController::subscribeToDestructions() {
+	_controller->session().data().itemIdChanged(
+	) | rpl::start_with_next([=](Data::Session::IdChange change) {
+		_itemSendPending.remove(change.oldId);
+	}, _lifetime);
+
+	_controller->session().data().itemRemoved(
+	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+		_itemSendPending.remove(item->id);
+		_processing.remove(item);
+	}, _lifetime);
 }
 
 void MessageSendingAnimationController::appendSending(
@@ -389,26 +407,23 @@ void MessageSendingAnimationController::startAnimation(SendingInfoTo &&to) {
 	if (it == end(_itemSendPending)) {
 		return;
 	}
-	const auto msg = it->first;
+	auto from = std::move(it->second);
+	_itemSendPending.erase(it);
 
 	auto content = base::make_unique_q<Content>(
 		container,
 		_controller,
-		it->second,
+		std::move(from),
 		std::move(to));
+
 	content->destroyRequests(
 	) | rpl::start_with_next([=] {
-		_itemSendPending.erase(msg);
 		_processing.erase(item);
 	}, content->lifetime());
 
 	_processing.emplace(item, std::move(content));
 }
 
-bool MessageSendingAnimationController::hasLocalMessage(MsgId msgId) const {
-	return _itemSendPending.contains(msgId);
-}
-
 bool MessageSendingAnimationController::hasAnimatedMessage(
 		not_null<HistoryItem*> item) const {
 	return _processing.contains(item);
@@ -421,7 +436,7 @@ void MessageSendingAnimationController::clear() {
 
 bool MessageSendingAnimationController::checkExpectedType(
 		not_null<HistoryItem*> item) {
-	const auto it = _itemSendPending.find(item->fullId().msg);
+	const auto it = _itemSendPending.find(item->id);
 	if (it == end(_itemSendPending)) {
 		return false;
 	}
diff --git a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.h b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.h
index 92bb9a915..8250e778a 100644
--- a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.h
+++ b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.h
@@ -29,7 +29,7 @@ public:
 		not_null<Window::SessionController*> controller);
 
 	struct SendingInfoTo {
-		rpl::producer<QPoint> globalEndTopLeft;
+		rpl::producer<std::optional<QPoint>> globalEndTopLeft;
 		Fn<HistoryView::Element*()> view;
 		Fn<Ui::ChatPaintContext()> paintContext;
 	};
@@ -37,13 +37,13 @@ public:
 	void appendSending(MessageSendingAnimationFrom from);
 	void startAnimation(SendingInfoTo &&to);
 
-	[[nodiscard]] bool hasLocalMessage(MsgId msgId) const;
 	[[nodiscard]] bool hasAnimatedMessage(not_null<HistoryItem*> item) const;
 	[[nodiscard]] bool checkExpectedType(not_null<HistoryItem*> item);
 
 	void clear();
 
 private:
+	void subscribeToDestructions();
 
 	const not_null<Window::SessionController*> _controller;
 	base::flat_map<MsgId, MessageSendingAnimationFrom> _itemSendPending;
@@ -52,6 +52,8 @@ private:
 		not_null<HistoryItem*>,
 		base::unique_qptr<RpWidget>> _processing;
 
+	rpl::lifetime _lifetime;
+
 };
 
 } // namespace Ui

From 971803803c16b1c8761db25e7157ff889572a4ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 12:47:24 +0400
Subject: [PATCH 203/596] Fix ripple animation on Added sticker set button.

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

diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 01f6a1ed1..5a15a1ec9 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -1760,8 +1760,11 @@ void StickersBox::Inner::setActionDown(int newActionDown) {
 				const auto &st = installedSet
 					? st::stickersTrendingInstalled
 					: st::stickersTrendingAdd;
+				const auto buttonTextWidth = installedSet
+					? _installedWidth
+					: _addWidth;
 				auto rippleMask = Ui::RippleAnimation::RoundRectMask(
-					QSize(_addWidth - st.width, st.height),
+					QSize(buttonTextWidth - st.width, st.height),
 					st::roundRadiusLarge);
 				ensureRipple(
 					st.ripple,

From 9957678fb7df2dd74bf7e5d5c09f60a682713793 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 13:15:03 +0400
Subject: [PATCH 204/596] Fix adding from "Emoji from this message".

---
 Telegram/SourceFiles/boxes/stickers_box.cpp | 36 +++++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 5a15a1ec9..0597a8fa2 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -652,8 +652,8 @@ void StickersBox::prepare() {
 		}
 		if (const auto featured = _featured.widget()) {
 			featured->setInstallSetCallback([=](uint64 setId) {
-				markAsInstalledCallback(setId);
 				installCallback(setId);
+				markAsInstalledCallback(setId);
 			});
 			featured->setRemoveSetCallback(markAsRemovedCallback);
 		}
@@ -1905,9 +1905,19 @@ void StickersBox::Inner::updateSelected() {
 			selected = selectedIndex;
 			local.setY(local.y() - _itemsTop - selectedIndex * _rowHeight);
 			const auto row = _rows[selectedIndex].get();
-			if (!_megagroupSet && (_isInstalledTab || (_section == Section::Featured) || !row->isInstalled() || row->isArchived() || row->removed)) {
+			if (!_megagroupSet
+				&& (_isInstalledTab
+					|| (_section == Section::Featured)
+					|| !row->isInstalled()
+					|| row->isArchived()
+					|| row->removed)) {
 				auto removeButton = (_isInstalledTab && !row->removed);
-				auto rect = myrtlrect(relativeButtonRect(removeButton, false));
+
+				const auto installedSetButton = !_isInstalledTab
+					&& row->isInstalled()
+					&& !row->isArchived()
+					&& !row->removed;
+				auto rect = myrtlrect(relativeButtonRect(removeButton, installedSetButton));
 				actionSel = rect.contains(local) ? selectedIndex : -1;
 			} else {
 				actionSel = -1;
@@ -1960,12 +1970,19 @@ void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 
 	_mouse = e->globalPos();
 	updateSelected();
-	if (_actionDown == _actionSel && _actionSel >= 0) {
-		const auto callback = _rows[_actionDown]->removed
-			? _installSetCallback
-			: _removeSetCallback;
+	const auto down = _actionDown;
+	setActionDown(-1);
+	if (down == _actionSel && _actionSel >= 0) {
+		const auto row = _rows[down].get();
+		const auto installedSet = row->isInstalled()
+			&& !row->isArchived()
+			&& !row->removed;
+		const auto callback = installedSet
+			? _removeSetCallback
+			: _installSetCallback;
 		if (callback) {
-			callback(_rows[_actionDown]->set->id);
+			row->ripple.reset();
+			callback(row->set->id);
 		}
 	} else if (_dragging >= 0) {
 		_rows[_dragging]->yadd.start(0.);
@@ -1976,7 +1993,7 @@ void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 		}
 
 		_dragging = _started = -1;
-	} else if (pressed == _selected && _actionSel < 0 && _actionDown < 0) {
+	} else if (pressed == _selected && _actionSel < 0 && down < 0) {
 		const auto selectedIndex = [&] {
 			if (auto index = std::get_if<int>(&_selected)) {
 				return *index;
@@ -2000,7 +2017,6 @@ void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 			showSetByRow(*_megagroupSelectedSet);
 		}
 	}
-	setActionDown(-1);
 }
 
 void StickersBox::Inner::saveGroupSet(Fn<void()> done) {

From 7fa3c6f8e82ef9f9010f1154426bc29feea619a9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 13:19:22 +0400
Subject: [PATCH 205/596] Return media viewer hiding glitch workaround.

---
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 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 4d3cd7f95..229b37636 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3253,7 +3253,7 @@ not_null<QWidget*> OverlayWidget::widget() const {
 
 void OverlayWidget::hide() {
 	clearBeforeHide();
-	//applyHideWindowWorkaround();
+	applyHideWindowWorkaround();
 	_window->hide();
 }
 

From 587b07a648f42555ccefc15fcd2fcad034b36c4d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 2 Apr 2024 16:26:00 +0400
Subject: [PATCH 206/596] Update Qt to 6.7.0 on Linux

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 290146ce3..0cf935664 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -1,7 +1,7 @@
 {%- set GIT = "https://github.com" -%}
 {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
 {%- set QT = "6.7.0" -%}
-{%- set QT_TAG = "v" ~ QT ~ "-rc2" -%}
+{%- set QT_TAG = "v" ~ QT -%}
 {%- set CMAKE_VER = "3.27.6" -%}
 {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
 {%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%}
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b464b4e91..70eee8050 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -440,7 +440,7 @@ parts:
     override-pull: |
       QT=6.7.0
 
-      git clone -b v${QT}-rc2 --depth=1 https://github.com/qt/qt5.git .
+      git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git .
       git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools
 
       cd qtbase

From c678973119521695207c6da4559b447f54ab9242 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 2 Apr 2024 16:26:58 +0400
Subject: [PATCH 207/596] Update patches on Linux

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 0cf935664..f5f7ab065 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 7b8f30b787691a325d17e20ddd455e87738e7432 \
+	&& git fetch --depth=1 origin 174d6e51435e6eab0596904f9fba80a927ef4177 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 70eee8050..1993f7997 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -168,7 +168,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 7b8f30b787691a325d17e20ddd455e87738e7432
+    source-commit: 174d6e51435e6eab0596904f9fba80a927ef4177
     plugin: dump
     override-pull: |
       craftctl default

From ef04ed447f16fb265db3b2cee95cb97fff3d8bec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 18:18:39 +0400
Subject: [PATCH 208/596] Fix 'listening' state show in group video chats.

Regression was introduced in c3ca8c6258.
---
 .../SourceFiles/calls/group/calls_group_members_row.cpp     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
index a9f41b35a..02ae9cd68 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
@@ -612,9 +612,9 @@ void MembersRow::paintComplexStatusText(
 	x += skip;
 	availableWidth -= skip;
 	const auto &font = st::normalFont;
-	const auto useAbout = (style == MembersRowStyle::Video)
-		? false
-		: ((_state == State::RaisedHand && !_raisedHandStatus)
+	const auto useAbout = !_about.isEmpty()
+		&& (style != MembersRowStyle::Video)
+		&& ((_state == State::RaisedHand && !_raisedHandStatus)
 			|| (_state != State::RaisedHand && !_speaking));
 	if (!useAbout
 		&& _state != State::Invited

From a74c5ee7192f4898dd013dc35041c6b6eda69bc2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 22:50:58 +0400
Subject: [PATCH 209/596] Fix complex-shaped Ui::Text::String geometry.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index bdf4ff34f..2385fb30b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit bdf4ff34f24ef75d5209addf756633f9db6cb232
+Subproject commit 2385fb30b5e13d3806e3aa6db489ef801e77b89b

From 22f504ca21137fc5106e7123a37d2af89ecd5c0a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 22:51:38 +0400
Subject: [PATCH 210/596] Add hidden buttons to langpack.

---
 Telegram/Resources/langs/lang.strings            | 2 ++
 Telegram/SourceFiles/window/window_main_menu.cpp | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1fedad680..d9e5dba0a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -19,6 +19,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_menu_set_status" = "Set Emoji Status";
 "lng_menu_change_status" = "Change Emoji Status";
 "lng_menu_my_stories" = "My Stories";
+"lng_menu_my_groups" = "My Groups";
+"lng_menu_my_channels" = "My Channels";
 
 "lng_disable_notifications_from_tray" = "Disable notifications";
 "lng_enable_notifications_from_tray" = "Enable notifications";
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index d94e1648b..0276c3771 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -218,7 +218,8 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 			button,
 			st::defaultPopupMenu);
 		(*menu)->addAction(
-			chats ? u"My Groups"_q : u"My Channels"_q,
+			(chats ? tr::lng_menu_my_groups : tr::lng_menu_my_channels)(
+				tr::now),
 			[=] { controller->uiShow()->showBox(Box(myChannelsBox)); },
 			nullptr);
 		(*menu)->popup(QCursor::pos());

From 1061fb6c85c3056984781b889c458ff8322e48f8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 15:35:53 +0400
Subject: [PATCH 211/596] Implement collectible username / phone info boxes.

---
 .../animations/collectible_phone.tgs          | Bin 0 -> 3228 bytes
 .../animations/collectible_username.tgs       | Bin 0 -> 4492 bytes
 Telegram/Resources/langs/lang.strings         |   8 +
 .../Resources/qrc/telegram/animations.qrc     |   2 +
 Telegram/SourceFiles/apiwrap.cpp              |   2 +-
 Telegram/SourceFiles/boxes/boxes.style        |  30 ++
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   4 +-
 .../boxes/peers/edit_linked_chat_box.cpp      |   2 +-
 .../boxes/peers/prepare_short_info_box.cpp    |   2 +-
 .../SourceFiles/boxes/premium_limits_box.cpp  |   6 +-
 .../SourceFiles/core/local_url_handlers.cpp   |  36 +++
 Telegram/SourceFiles/data/data_channel.cpp    |   4 +
 Telegram/SourceFiles/data/data_channel.h      |   1 +
 Telegram/SourceFiles/data/data_peer.cpp       |  30 +-
 Telegram/SourceFiles/data/data_peer.h         |   6 +-
 Telegram/SourceFiles/data/data_session.cpp    |   2 +-
 .../data/data_sponsored_messages.cpp          |   2 +-
 Telegram/SourceFiles/data/data_story.cpp      |   2 +-
 Telegram/SourceFiles/data/data_user.cpp       |   4 +
 Telegram/SourceFiles/data/data_user.h         |  16 +-
 Telegram/SourceFiles/data/data_user_names.cpp |   6 +
 Telegram/SourceFiles/data/data_user_names.h   |   1 +
 .../dialogs/dialogs_inner_widget.cpp          |   4 +-
 .../admin_log/history_admin_log_item.cpp      |   2 +-
 .../earn/info_earn_inner_widget.cpp           |  24 +-
 .../earn/info_earn_inner_widget.h             |   4 +
 .../info/profile/info_profile_actions.cpp     |  28 +-
 .../info/profile/info_profile_phone_menu.cpp  |  27 +-
 .../info/profile/info_profile_phone_menu.h    |   2 +
 .../info/profile/info_profile_values.cpp      |  33 ++-
 .../info/profile/info_profile_values.h        |   3 +
 Telegram/SourceFiles/main/main_domain.cpp     |   2 +-
 .../SourceFiles/settings/settings_main.cpp    |   2 +-
 .../ui/boxes/collectible_info_box.cpp         | 271 ++++++++++++++++++
 .../ui/boxes/collectible_info_box.h           |  45 +++
 .../SourceFiles/ui/text/format_values.cpp     |   1 +
 .../SourceFiles/window/window_main_menu.cpp   |   4 +-
 .../window/window_session_controller.cpp      |  77 +++++
 .../window/window_session_controller.h        |   8 +
 Telegram/cmake/td_ui.cmake                    |   2 +
 40 files changed, 630 insertions(+), 75 deletions(-)
 create mode 100644 Telegram/Resources/animations/collectible_phone.tgs
 create mode 100644 Telegram/Resources/animations/collectible_username.tgs
 create mode 100644 Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
 create mode 100644 Telegram/SourceFiles/ui/boxes/collectible_info_box.h

diff --git a/Telegram/Resources/animations/collectible_phone.tgs b/Telegram/Resources/animations/collectible_phone.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..4e7284d5f5ab8c3630c4d68d78b3497e662d2946
GIT binary patch
literal 3228
zcmV;N3}f>jiwFP!000021MOSeZXCxE{gq&!X9j)0@B^F|KLml_2tF{8WD%w$f~1`o
z0{=bdRCUkJ?#_~ww6u(v5V+*_^mKLC{ZzF+Z|;A-+nm{9^V{ZZ6Q?-2&9HfQyE#i{
z*j(Lg&hYCKe#JU${)1oE4V(Av_s0)-$724QH*aL(<=x%edn|W;F>J0ce}8++zdz59
zuRgvJQun`a&cfpLyIUFl1+zbIZuoJj1M>D22mXr%CO>TOrhUMU<}njx&|vUhULr{s
z)8JE?LJot$UhXmf+zjo@m3;A2#Mg&mNub0P3T20YUr?xSpTelC&P41~Z9X8gc8;B6
zxU!%U@&T2;>`Z5LlTC+&!U`c*my~>6P%37syOjE}Ga)yb;t%L#`y`>TB$Uj-k@~{h
zBiYIOP6`XevL@RHJf^mY${1Cdy&3Y_x=Ni>7VYOkc6)9I{JU5j<Xm)Y{%F(8V07(!
zA<K<f19|Ju4tvf;ujY?O=#-)TtPrubQz=7rYeb%N5^h0$Rw%fn6e^AY?OLG#cIwX~
z6d?8aV}*#%{TT7cF`!HH$Jf&djZUqgv86*j$}8f!c%T}6Qdz#gym_mRi;imZ^DSJ|
z)&2T_xHO|K4R3C`7h88=YLBoo6L(C7My5~j*N#%j+vjQyC8djjr^IKNN(n=rth4jj
zvClD2IY;`Yl(#F4;M{-@Yn^_JoMR_z>cxd@?tDAb!V=3Aqko#17qcDX6w3C|<lI0~
z_}fm=Br16b@+5h9NoNCz{zjr>oeJFS=-}l-<&qYLm!JYBOqB+7K05f>8ZnZmnu5%6
z2?k$4*iOMm9V%0T)r}F{iaN{VoCsxO1W#h=L&*jiD#6Q8fbZd2IZV;&7QCHOz)*2h
zOgd?DC1INtY*l(-aMTeWT-$i^79-eOu{`0wH)r>^zrKCg4?NyC1;AfBs*&2bu|XB1
z>?%ehIfYnGtQ<B`Jxnh8oe^iG*vh_oKu!oFY04#>LOrabhYEDH{FY$7*hQT6BYMaj
zA_Tj=BSnkFd=>QwVj@_5)(+QHfjfu3y8x9?iBg9whrj`!btq00J2b+()JIB4G8Bx;
z)R(EiKaByoQff=p2|9yQVM{y&LUwdnRaiC<5RJHJ3}j1M5%Df^1|{phN;6iRhE1<t
z<JD^%(T%#N8|H*+vHd)`5*)6t@=h7Ei<obzjoV<d3cO@7Xjr>x0xwZb+`v>VUc>9f
z=@9sxDWnV~t157d#McKAWv*!+$~siK2f^u(s*lyro&an4iXm&Px`Hu7nv}SYQ&MNd
z5hnvdRRFoFcr<ED@~0BGGe-p;g)K=8NSrLT?5VtuNykkT4)<=KBX@%xLD`qS1IHt8
zK;0bC20Q_)D!u;G8c^V^;Rnbz*DNPBldo_cp=m$~)BxYDtHL@X-G0G=bp*i;`agOH
zOO&@NbSuyWxJeEx;*7@2NY<69RGEfb6BSWjt5f7_d=!nY#0bFmAbr(9uAP#sWUFg)
zjBE7M$zp-C&lLX?MoC~sRFUh~N&VQTRatvE^OLf!aLQuswL5cITJ;H%EtB(I`YLPJ
zrO!WY&LZsXNHxvY)NND>3sM6pbx8%nC3QqCJwsOtJTjd?ENa$%Vm<+1GS#Yrh4Rsj
zL~JqHwsI(0SN3Tp@12l`i#nC4(<83EngEFuQ%)^vkI7(%bEg(H^D-~tuk@G+$4fzb
zH6bKr#yc_U61ohH7<Ghqk8LE=s3G~7Lz54er7+r8x@F4PiS=fL<mzd?c+z|~DAVa#
zgccWaa~~;tk#Y+=T$gzyR<hYQ+Qq2Wr4UagWq;hDq402o&`4uXF6GK>Jg0JEDHoa)
z4cddnE%BOcQG*Ue4VpC^P2lp@o3^}Kc~6&JMed<#0z?+ocCBXhmHC8@<Rp|z+bX@f
zY35AhZLT{sdxp%b+H+Cs<=S5D*;?D_7uCCXGS3aw{{If#aHrJQ(ZLzkp7Ltymb$1R
zVolvFftyIJ+c>i>9f8J+jRW{;xGh;iz$kdD3CJ*RW1ua}6(zmq+!nXhmm_?ewhZvJ
zL~ZDq$$eo)Z7v)-@#q@yM-kjwwRcVG{xtb{P^bdD8op<G9*_%(eM9dW9>X!LRj-}9
zA6GmUx9PcQ={f8%=PoZv&r@yaZ{!l1o_knrnuoFuS>Ny<{5bI#%)R3=&f;2()mkZV
zl0|4X7~4o`8H1+lkwCLHK_6!4i_-L85q86CcidgnZz5J|63!?sOhzPEIhV=U)GH<(
zcl#1%tlV*TFSYnB?l!p(b=;k+=H?;HxI3hV&chaW8x?)t0`HazrWts<wvyihZ&!CE
z&APHQtp0I%|Nd|6TD^a>IeT|`efL(hfc4*Z*Bg0d*^H3d^`d$`KY^-aOgmry`XHmS
z{ts8z*GJaBXW{u~cl}oKzFZx>+uO_Bogm%C6LVyDcfTA=ySqFXl5PKVd-?J1-KX0R
zn}>@w^!M9Ozuw4E+WDS1(OfWJ^i(p_tUS2fDuV1i+Gch=A@Xi@(h6G`=HUYd8)V{I
zYv`b#vrco|d-^y}*H_<Nx#P7X1ovotn`C}`OeTMleh2bG@h5XwJM^I|u5#BIuKB_>
zm&YY4U0Vs;I`e)(@t~e~P)<Co03H+o_v(Ky(h-ozP+fYQc}%LA%VJ;g3z&!03+I!<
z<RU#ZNDmP!w#-AYW*wj5U%7{PO6~z#2gxD5ZD2hj0C-_<(Gm;Nuq5F|G6gNBd4>i`
zoGdQ_pM#4pS2llDzHcZrorHUoIGakw#xLg{ky<5EV@XYsVwCj+U?@YKl=uYi3I4Y}
zX*D<Xz7CrMQq0Y*t;0%TNJu_{Ii>o!r_|4~!Z@(Joww+U`1vsg60pPr2FB_R8CZ+m
zXCRZRkO_El=O8jDVC)48on5joU>$=Uh1A*S6;>gi^DVuC-VvL}cuMy9uhBnN79tyq
zFQI*G5t;}+Nd*X9%Mz_cnHo1^(>~~_u&*=(?RqN#I_JbfQtuow8D<eOM`<da9&kQ~
zZ;6407+@|4J<T{4YbbT#D*q(sA~qQ0kh!TH7Hh0?+O$K2D*_{Pj2cNC6%W2L31oD@
z{Dgu40oiW5b(NT(pgleV!_g`jjM&wVOK4OEh_3oY7!8(+RAYQLL!_<FLjsJ}CBJ>v
zUcO%fEI6AiK^J~qID+$e8>GwO6(a*{dsQyezGu%4Iqc2Y#zbC&VH?|}+#yn^Rf0ne
z?iK9(!C<HD(j!6<k#y{Gc)FvI<@=oTpMQ4fFnYO*fdtXig_Y9T>{Q7d>$c33?W*0b
zOpw=h*ICk<@25<bH#-nGeM`bh^h2vXX<(%Nw{}u!RY~S#+G^O2G0U}a`RYiQR@>s=
z1RiQ!0}ms$EDuQDzkzjdd4UW7AKaI*E-86dS-Er#jdhj<BzkhTN`-TdLD2WO$V7WA
zVaqs#RWc4yMEMr!xveB__JvTxtKNOv{e)2(L4#QQGP(xVALBA}XtD&T$;WsYlkm{H
zx=c7C%ZqqBFDm0WU<M;|N{jvkI|NCa_Ng(>7D7{&6QwT7+d7e~G#JwMb0IijS4r-g
ziEfs}dwFDTPa356!Pp=9yS@+x!&wV&Qv+lzb<vj~*J|_P_##%vHs=vmCNHeCOTh1?
z`OEHL*pUme4Q6zUIsh+e6tDH#Al(+SE(4j2rMCWyT%QxYG^W?{Q!D3NBs)nBJsYjV
zv*m6>zd4bT_H^^<Zqe=GF&dwfyO2w#XtJciCM?t3T>2HsbzTx^Nrx>gizjkHggU-c
zvGE~LFHKoy$3|pG1=Zp=StqwyvYTSpR5rk%j3QBK&<}FYt=&F?tV`07;98lT*ZeV-
z^W<uHAzZd#<HA82!8Axgb39~ZUDwGZ$kehmz01ZRT~6-~*+}HE!$!*<4}19nGHALA
zRAot+ZQ^~b1RDIFfO;yG5fE5o8q`zTMiwb{aPwV1y_X6t&fcCJpe-0^?XtU@5Q*H5
zDQ-C!)>#;(GsdeAb&Z9=uCTDyW!Hxet*ZZ1eCYFJ*qcYF<s~+#JMTrP7uCI0mQgg)
zSfLB^wb3>AXxb%!OjpB&c?qXJ2dX7a8lc!|aT<1?ctOQ2n&T1Q#MZJqhWi;q?M|VE
zxrc-spO;-ay{7Eyo_)sJW3DzBc>zbGvaZQCRFMoPwz3ma8ahb6;{-(V25KfN$tl<4
zbcV=cyNaSjU-8->kJnsG5``>a8O>znbQ+~H6NLKx&-v4*o3%4u?EL3GTbPR}l#;2?
OsQ&@y>1%}=H~;|mPA<6s

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/animations/collectible_username.tgs b/Telegram/Resources/animations/collectible_username.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..f93fd6d746df32fb00594bfe9e5eef882c6b92b2
GIT binary patch
literal 4492
zcmV;75p(VziwFo??&W0w17UP7YIARH0PS5{Z(O+z{wu*e%Llq&{MPF}6)3PpUjje4
ziFcDGj*YQ*+eP62UWpPVIUe&I+8(zBf<?&j%o!d^BtKG=X3y8%ue;NoTa;eZPV9c#
z?@qlGyN}nq)6A|iQ!&5z*Y4CQEp{Io|8kkX^@pp=>o?_F@87?N%g=9aE^cpjr*F^1
z?(_L?7yI)1YybG;m&}#e-Tt;awN1v~FW%i=?cbOz<@$Vo@#S`RYQ*kl4;OyQ-~YP1
zD&!m_e9CXjBI)1xg}M{F{k_ld6PZ7`zW2#nDe`}3_4BO%=S=fO=Z{~c`b9VQFDeSO
zf9+D=E-eDD;JTX+=hqi?@MW;OpZ9ruA8+9em<3s9Az!%bxBGPeM)}Ho{aeuJty;8m
z@Jb51SQYcD6L`_ytbd$kjjqbKPShe@5OQ(KJ#wjdJHIK*SAQ*EHH%GAghizQpTMp9
zcgtU~Uj1%&`qTO6n~S?Pt9Q+$e?7nb00zDMlK=YMAAkR+H_ggFmT7r&^5%#A)i2li
zf)DSzh&EA|m*snxFdrc7FBkitFWwZ9H{fayWd8Z%=i7^Y77AA$6nb;J18whFQNVxA
zg62*<=4SQ|ynp&g*AHC&;PbocP5%UiFF%7{|Kk#_1oeNs-CupWIIQ^(`}6A$AKzuw
z>s1GJzbzAjj-jgV;2B?c|1KW8*gS;a%7D&r4E25GL;Iw@&Yx!g(;lQ1Cq9FFWR2Tf
z`3-daeC@^I+0YLrN{$(<W`jv<!~fg<<K-sfl?xA#zeLW%SUwx-JdELK7!P9?0#{CU
zKL{cIafb*+?59ItDz0*Ke&`c-*C*us%gs+$`^#OK><Iz$D8F38#Jy_})!e9o!vXL4
zHipg~!gluj^7p%2kO30Q%-#cJeGriKcR(fqSr%-ykHN6$u&pG*HoP8KTVYzl1t$fk
z0|m~rfRkD3x9EKmmT2>(UaEt*U8v5~3tMgiudO&Si(ZBFgAx2+g7hcDqDN3{fS4ZO
zp-C@~hvvob@c%lOeaG@6W4Sqm<+~@q_o0xA#;n&GEv#gXp%W7!tez-Ey@(Y3B2vtY
zNU<*>#l46W{~}Vt1}Sn$YF$#?B*`aDRJt;n`@p^;EqbbKRu&zx`?FsXEitG_h}1cQ
zH<8`B?IL|5mDJRbRlQ*m**!fk<|QpM7)qqW^@2jT*I}_nlLL3uxGma6VF>7~q@tBH
zfl^ZUsl<3tX)#XG<EE^mf<loP9LnVBCx`7R7t&s%L=2Re>qblJXz5`ml!yW27a8b@
zjHCngm{AxsxqejSJO)ytjyR9H1x~iLp$AO{qCr#Z7Bwcv8Exp8Hie;XG2=^vg$_bX
z2sEaTxJAqg9FhicXky)hCHqVa1WGR^K8~+y3APJtp^_GD2!R=9B?+@0F$Wt8Ss)E!
zA(4nP3=&YFj4RMhhB898jyQ!@8d5<+0$4{I-GU_KNv9RmlnW}2$Y3P8V4WiZyeJKo
z$1pZ6NZeu*8Fax>NTVJ4v}r+NSEJaHZ77Xt#TX1@>*zTQ<QxVxim@GMXn`S68tU%X
zrUgol)j(_L$RT%JFxX~Wto1Z<k%1C1lno}7EO8}8ktLH(-EU%tf30X8>DV(}$B|In
zN<osyG}=AK$}Taj%wwXQ+o~=R3$g4wiO?|*!BC^Nrc2aaV$J_VyilW-0U^SgAu-Un
zok+{XF42xrdwL!fi8=~H(7G<MDozA7o&CCwy$H)#N{%{M61xpXwGG1`X^D}{21;Xk
zu_I=TrwfQcmUSI@?1&j@=pxLMaqUo|lN~97T=7SG)Lo+L5}l<-O%x`@A5oz00=1*l
zG+Dvx;8CLK5~ZX|MMu}32#?Mpf-6a<1iF|_h!d{o7@cShCFMFsVUBSl$7niF(;C{Y
zVdw$_X_cg@q%~<6QJ|xi(b;I`@x%`e@NSjVC3-qq9Oc`x=T$GeKu4!6Ppt@)Mo;u=
zjF~RSG>Kxpr1iR6CDH{WDNrHKdeh~(72qaE+?OrBM~b0~r{E~J(Y8<F6e)D*5pHwO
zCOuNLqw~N@!=TS$j}#TibQ;LgN&9Z(9w{_5Sh^BJX+28hO158V6=1dxJxb)tvMQ2J
zJp_)FBJIk;k5tj1jl;+(YYnzUE($t&g^^PfJ?cm{3;LMtkf+HsnrJfz^qSy?#FgTK
zSXsfhF*OH2iKJVz<Z`ku9YJE4B+}J`Bmt+}C2k#c^dvsmZkaSB(oM=hB96uYjB>N<
z7<vtjh!dxPp_lnFklEhjpyL!UVWn|E4%(rm<5YyXmCgYf)P4OI?F17mH4YguUEqiq
zscGaUd*-_Lj^hXzxw7bWG?H~whe_f}+mj5K)OGCHMXoe@$yIdC#vpJc7`@VgC)*nq
zHB2MHtU#kA!P}xQre228@t4SMiR<n6q=!6Gpfit$U-uD^Xof`Ewdoa$M88RPql$sr
zo|{%I$qj+Dl@*Dzz4?;-u=2AutPsOe7y{{NCNruYei*kpHeqHt?N+4`DQcznNv6}j
zMJGq3C>piN1xv4ul^l_>f?s6&YTBuiBUa=}`AN46`u?08u|l^rR@wzaMY|be9bIyd
zP2(xGtmOPiqO2Ulo^uObIw{IFMh}s5a-r8ki45xAw^K516`9Btr5*dRGEE}MuyF*I
zm2davv{G`bOnSSsE2-30fsx!b9{Zh2>CHNlb)y~zS7x)pHR<V-$T@iE0AJa|8Y10R
zPp2C@+75fq!Lw40lH=}3slw(6U)jj&prPj2p}R4LtVjEqZ>7=$XoJ%t^8VXrj~~|6
z&WrNznFn?sIaMYm+Vrmn8Xt^KOcX~7cf6ZVot3xnK<AO}q+ab#`ql1aUhPiy)$Zh8
z?N0vH?i8MIr<@jLd8bhR9pjVk=<^Dx(v5d4r}spoSS&y3&Upn6Wb1uP{%W+>8+e2w
zc`GVqC=klgeV|)a(B(vbr5(20kp^9k+la<Ev!KiT7rK2OqG%MAXz*i9X$gtOI7$R~
zCv0}Ra`;d*ib^zOaw*rXNi@bWN15A9HXFkh2|!T=JcyObHiu}8GY=++N;l7gE?NUc
zB^sLLwMq`FVg}?4b3{?;W;KEmjiMU(8#3eaDmo7cIl~~nL};O#P2!6)14T6&4l3^!
z<Fhf4GiJkrQ7p$ONi>RTG;mZQ<?zk(ikzWFgg}jqKn0*w6HsD}r?XG!m;`c;Q9zBr
zP(#P!8$hvI!SkLv8zX}U@?(OxfjBWEPVkVZHa1^r1#*^2lBo3Q0FFmXwT+9l*(8m#
zAl!;dx2j=GF$qvqqoJpE5g-jYLye@0XB4^}#34@Hh!Z@@sy!T}63Dj~OXZNOXmpbr
zaPU=B+SPEVhAU_31aeMYBcZO5jJn1b)CG!a_@Rc$*ovGJuBp6J=w_pUi>ld01FB&c
z<8q`l&I(t^D4vl~px7F<7M{@6zBF${W1N`)1SoWKutILtQ*Ommz1rC&J6L0^PzA)$
z+Yv)SeFhX)V2GYhEw<Erjk6NG6P0dO!$U6dBbVU$VQn*R=28JUtKtfx(#<AukW1VE
zE<AOtjbEJ2Hffxd;FYL!yHVgBJ*rPUtE`RANK&#%<t(FsZv=*KfEj_J8g^t>>qKK5
zlRzO?==Pc`ibhchL{AlAVS$`87hvZ?w<mb0K&O<3XQ{PvS+*C*SqUEAi463Fk^m^G
zf#|7nI>=apoCV@gb1~M)8ektNs)6_^b9`iQM}AxoH!vG!nvJOfjiu^poTEm9+AlGd
z1rV-!3RgTJuBBdVuEUYD)PQ9{+74b;m3M%m8i=7X7fvw<<cx9$s-sG`ssW2kps0o(
zYWNJO$XOT)MzPzCB13U%ps0o!YPeDgH_qxN6&EdZd%!||jguOPp;DEjdjdIUHWcJn
z#mKMl4WOuo8)}pRA!lV2STY7qMGmv!rrAIgm8Gjw)To>TUluAa%c#5z<P<Y<3ZBU?
zcoA|Hf}GV{0i!SqKm`jcpr}SiQMdR|)To?g6u^zZXeR*fswu<Tj-nw)NKS2yvzjZA
zQ#>Q5I53JEYPgP~X)&opO64rv0HZK`Lur@|J*lBahSi~F*uq(f9_o$Fi^hT&q7qaB
zF;uDYJ9dGbReM1{n9+9Ap`b2MR0A<onZ@LUhn!V=0hBvVa|IR$W>g#aD~NLYRI2jE
zStbEBI6WT7$UsqzUWwWz`QjOsbJUO!u5x?08U@W2H7ZdzRiZ)FO0@9f&IYtCfub5=
zsF9LrjML%K<()#GF&BuS%9o$v3*?*CfM0!xO1G&|e+eQQ>x!hIh|Lu~a@P8_ZW(L`
zFA2*7IV}(Hha_<OU<GnkT@L*}zrFvbv=@z{8fr32##ZE<*?@LQp_}0gnml^y@_0Se
zkTwY9tQHGo6owkAc36fIW?DG<8Yq#uXAr<7fnkydy-;t58rDUDoaLa<{d3y`Rzn>R
z6xDD;4Jm^_&Z@kiv#~i~4?3tHP#%I8$dA0O1+FozQG6I`80c+O&Z@j1%`=wK8Uh?B
zsu4$iElW`3tjY^!!*W*hq7qah4JCrCNxtwSZ)(9pDUO9wkW<Oysv4|}0zW?zm2ThE
zg5L0~h8k+fvO;N`1>`UrjG9~-h!Zp7By<GTx#BAMq;ghg1B&6q=mA2S*HfAgW~dR$
zxv<7r4hsIcz1AoenKt->9V&QJXQFUU!2>apI57gi4;0mKLk*YeOcc&q7!>>rn>)kx
zM_8h<u85x$@k$`)v{#^E?->nyWnezcG#_D7BUH0EX2B!DH6$auLUVX>&-iSkl!~Cz
z?G-sdmz`WRO)d(UQ8{Z{3w(o-TcL>81IDAAL)8i7tOO5;VK_S|-)?I~HPnbuXH?Eg
z@UTb<j75?MllWnhIOC_PY81|@y1*okVG;)k-i;`U(>h+ZWWviO7IKMY<dO%QT5(#%
z%jg7hR)UB8&cIK2CrnDXp@d4JF&2745zIJTrePCIPp6rpA4=$G1#(tf1q|Xi$sJ<E
zOfeFsQb#+1oMjNePDWl;P!0e^HKyv*wCdCFs?Pwun!wmS(a_olifT;tr*&E&KkmUp
z*enLx)JRkPX+w=w%j*dzS%en4eVqn~VFzNQss41bx@h4XHDI4HG4>f9oM&*;Nw=gY
zHL6W`CUH>G7P`6EkrEn0g>^N|tcDTDkJ|@@Ge1C44g1X52vE5c`t&Yna<gYdft<CW
z1;vhH6g#llsiw`&G-0Ss70E5H0r`}3!jRzINbo7l;pzo))`k|W;2FyT4XB}K)QB^9
zDS@0-b%BF!jud&|v~Zd+)Kn-h{J0xhHOEiq=w}F(%{3%1%R`SOFq)vyVwyTk{THo}
z&SH($!jHNQe&DRIoFKHBglUl{>}Ek$o6hL=-_FAAZBv7JfE&Vuvz?Vhqg@L-S3FPL
z&w?7%aT;CUE?WDqbm9K33^lwuG)9P%$S8TBECAZ|m_XFXRsk}P@hI?7wcSUJhFu&z
z>oK9IPF0V>S#2iBDT$F&9-L0-KO(O8*8(}G>VcL`V)W`QtPkw`YX_O;1ws_aIfW0T
zdbc^%*Pkhi#=0g-&YA>){HSOA0X-%i)U$PnzMk-Z&Jq9qyXfi_%{h486)3+LjSUU4
zqUTsq=J~M#haL*uo>#yo_w=x{9?eI&CyMw7hd~cN>oH?#Td5e{N`=4ksx9OeJ4ecl
zrK)Wl@Q!S7d(;p2wfe8a>)qRIsH2}8{<clse^OpEY?}?uEJ*SF?KM~sjdnc}o$==%
zrNd`+acA1v?(7vF?o|E<yRg<Q4^4vC`PKYhy`Vq9>A*+gkdU+XcqZ8%yM#}Rg6BsG
ze4O6x{+Gj#Uef=ok6ya}n6JC>oTTSJs%|`nsk(-qAJugB*yESd_vbHtfBw>|J%1@*
ec6q-4R3CJj|G3^?U6*OPyZaAS?`;)WbpQa%27|Ex

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d9e5dba0a..1dbe16fbb 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -471,6 +471,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_bio_placeholder" = "Bio";
 
+"lng_collectible_username_title" = "{username} is a collectible username that belongs to";
+"lng_collectible_username_info" = "This username was bought on **Fragment** on {date} for {price}";
+"lng_collectible_username_copy" = "Copy Link";
+"lng_collectible_phone_title" = "{phone} is a collectible phone number that belongs to";
+"lng_collectible_phone_info" = "This phone number was bought on **Fragment** on {date} for {price}";
+"lng_collectible_phone_copy" = "Copy Phone Number";
+"lng_collectible_learn_more" = "Learn More";
+
 "lng_settings_section_info" = "My info";
 
 "lng_settings_section_notify" = "Notifications";
diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc
index b63b6d15f..5b72c461f 100644
--- a/Telegram/Resources/qrc/telegram/animations.qrc
+++ b/Telegram/Resources/qrc/telegram/animations.qrc
@@ -22,5 +22,7 @@
 	<file alias="hours.tgs">../../animations/hours.tgs</file>
 	<file alias="phone.tgs">../../animations/phone.tgs</file>
     <file alias="chat_link.tgs">../../animations/chat_link.tgs</file>
+    <file alias="collectible_username.tgs">../../animations/collectible_username.tgs</file>
+    <file alias="collectible_phone.tgs">../../animations/collectible_phone.tgs</file>
   </qresource>
 </RCC>
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index e53e7a5d7..b8919617d 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -796,7 +796,7 @@ QString ApiWrap::exportDirectStoryLink(not_null<Data::Story*> story) {
 	const auto storyId = story->fullId();
 	const auto peer = story->peer();
 	const auto fallback = [&] {
-		const auto base = peer->userName();
+		const auto base = peer->username();
 		const auto story = QString::number(storyId.story);
 		const auto query = base + "/s/" + story;
 		return session().createInternalLinkFull(query);
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 2ae5bba8d..f64f2103d 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -1044,3 +1044,33 @@ inviteForbiddenTitle: FlatLabel(boxTitle) {
 inviteForbiddenTitlePadding: margins(32px, 4px, 32px, 0px);
 inviteForbiddenLockBg: dialogsUnreadBgMuted;
 inviteForbiddenLockIcon: icon {{ "emoji/premium_lock", dialogsUnreadFg }};
+
+collectibleIconDiameter: 72px;
+collectibleIcon: 64px;
+collectibleIconPadding: margins(24px, 32px, 24px, 12px);
+collectibleHeader: FlatLabel(boxTitle) {
+	minWidth: 120px;
+	maxHeight: 0px;
+	align: align(top);
+}
+collectibleHeaderPadding: margins(24px, 16px, 24px, 12px);
+collectibleOwnerPadding: margins(24px, 4px, 24px, 8px);
+collectibleInfo: inviteForbiddenInfo;
+collectibleInfoPadding: margins(24px, 12px, 24px, 12px);
+collectibleInfoTonMargins: margins(0px, 3px, 0px, 0px);
+collectibleMore: RoundButton(defaultActiveButton) {
+	height: 36px;
+	textTop: 9px;
+	radius: 6px;
+}
+collectibleMorePadding: margins(24px, 12px, 24px, 0px);
+collectibleCopy: RoundButton(defaultLightButton) {
+	height: 36px;
+	textTop: 9px;
+	radius: 6px;
+}
+collectibleBox: Box(defaultBox) {
+	buttonPadding: margins(24px, 12px, 24px, 12px);
+	buttonHeight: 36px;
+	button: collectibleCopy;
+}
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 2430c583e..149171e5b 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1789,10 +1789,10 @@ crl::time PeerListContent::paintRow(
 	if (row->isSearchResult()
 		&& !_mentionHighlight.isEmpty()
 		&& peer
-		&& peer->userName().startsWith(
+		&& peer->username().startsWith(
 			_mentionHighlight,
 			Qt::CaseInsensitive)) {
-		const auto username = peer->userName();
+		const auto username = peer->username();
 		const auto availableWidth = statusw;
 		auto highlightedPart = '@' + username.mid(0, _mentionHighlight.size());
 		auto grayedPart = username.mid(_mentionHighlight.size());
diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
index f8a7ea6e8..bae3d8a76 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
@@ -100,7 +100,7 @@ void Controller::prepare() {
 			return;
 		}
 		auto row = std::make_unique<PeerListRow>(chat);
-		const auto username = chat->userName();
+		const auto username = chat->username();
 		row->setCustomStatus(!username.isEmpty()
 			? ('@' + username)
 			: (chat->isChannel() && !chat->isMegagroup())
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index a6b442aca..6c19d4055 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -207,7 +207,7 @@ void ProcessFullPhoto(
 			| UpdateFlag::Birthday)
 	) | rpl::map([=] {
 		const auto user = peer->asUser();
-		const auto username = peer->userName();
+		const auto username = peer->username();
 		return PeerShortInfoFields{
 			.name = peer->name(),
 			.phone = user ? Ui::FormatPhone(user->phone()) : QString(),
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
index 2a9c0d4b1..451957c21 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
@@ -322,7 +322,7 @@ void PublicsController::prepare() {
 		auto &owner = _navigation->session().data();
 		for (const auto &chat : chats) {
 			if (const auto peer = owner.processChat(chat)) {
-				if (!peer->isChannel() || peer->userName().isEmpty()) {
+				if (!peer->isChannel() || peer->username().isEmpty()) {
 					continue;
 				}
 				appendRow(peer);
@@ -346,7 +346,7 @@ void PublicsController::rowRightActionClicked(not_null<PeerListRow*> row) {
 	const auto text = textMethod(
 		tr::now,
 		lt_link,
-		peer->session().createInternalLink(peer->userName()),
+		peer->session().createInternalLink(peer->username()),
 		lt_group,
 		peer->name());
 	const auto confirmText = tr::lng_channels_too_much_public_revoke(
@@ -389,7 +389,7 @@ std::unique_ptr<PeerListRow> PublicsController::createRow(
 	auto result = std::make_unique<PeerListRowWithLink>(peer);
 	result->setActionLink(tr::lng_channels_too_much_public_revoke(tr::now));
 	result->setCustomStatus(
-		_navigation->session().createInternalLink(peer->userName()));
+		_navigation->session().createInternalLink(peer->username()));
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 7ddee02d2..58c7af3a6 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -897,6 +897,34 @@ bool ShowEditPersonalChannel(
 	return true;
 }
 
+bool ShowCollectiblePhone(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto phone = match->captured(1);
+	const auto peerId = PeerId(match->captured(2).toULongLong());
+	controller->resolveCollectible(
+		peerId,
+		phone.startsWith('+') ? phone : '+' + phone);
+	return true;
+}
+
+bool ShowCollectibleUsername(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto username = match->captured(1);
+	const auto peerId = PeerId(match->captured(2).toULongLong());
+	controller->resolveCollectible(peerId, username);
+	return true;
+}
+
 void ExportTestChatTheme(
 		not_null<Window::SessionController*> controller,
 		not_null<const Data::CloudTheme*> theme) {
@@ -1299,6 +1327,14 @@ const std::vector<LocalUrlHandler> &InternalUrlHandlers() {
 			u"^edit_personal_channel$"_q,
 			ShowEditPersonalChannel,
 		},
+		{
+			u"^collectible_phone/([\\+0-9\\-\\s]+)@([0-9]+)$"_q,
+			ShowCollectiblePhone,
+		},
+		{
+			u"^collectible_username/([a-zA-Z0-9\\-\\_\\.]+)@([0-9]+)$"_q,
+			ShowCollectibleUsername,
+		},
 	};
 	return Result;
 }
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index b32c85c53..b088be2d7 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -139,6 +139,10 @@ const std::vector<QString> &ChannelData::usernames() const {
 	return _username.usernames();
 }
 
+bool ChannelData::isUsernameEditable(QString username) const {
+	return _username.isEditable(username);
+}
+
 void ChannelData::setAccessHash(uint64 accessHash) {
 	access = accessHash;
 	input = MTP_inputPeerChannel(
diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h
index d22352020..6dbe84329 100644
--- a/Telegram/SourceFiles/data/data_channel.h
+++ b/Telegram/SourceFiles/data/data_channel.h
@@ -182,6 +182,7 @@ public:
 	[[nodiscard]] QString username() const;
 	[[nodiscard]] QString editableUsername() const;
 	[[nodiscard]] const std::vector<QString> &usernames() const;
+	[[nodiscard]] bool isUsernameEditable(QString username) const;
 
 	[[nodiscard]] int membersCount() const {
 		return std::max(_membersCount, 1);
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 76389df4e..9b5d6d379 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -940,7 +940,7 @@ const QString &PeerData::shortName() const {
 	return _name;
 }
 
-QString PeerData::userName() const {
+QString PeerData::username() const {
 	if (const auto user = asUser()) {
 		return user->username();
 	} else if (const auto channel = asChannel()) {
@@ -949,6 +949,34 @@ QString PeerData::userName() const {
 	return QString();
 }
 
+QString PeerData::editableUsername() const {
+	if (const auto user = asUser()) {
+		return user->editableUsername();
+	} else if (const auto channel = asChannel()) {
+		return channel->editableUsername();
+	}
+	return QString();
+}
+
+const std::vector<QString> &PeerData::usernames() const {
+	if (const auto user = asUser()) {
+		return user->usernames();
+	} else if (const auto channel = asChannel()) {
+		return channel->usernames();
+	}
+	static const auto kEmpty = std::vector<QString>();
+	return kEmpty;
+}
+
+bool PeerData::isUsernameEditable(QString username) const {
+	if (const auto user = asUser()) {
+		return user->isUsernameEditable(username);
+	} else if (const auto channel = asChannel()) {
+		return channel->isUsernameEditable(username);
+	}
+	return false;
+}
+
 bool PeerData::changeColorIndex(uint8 index) {
 	index %= Ui::kColorIndexCount;
 	if (_colorIndexCloud && _colorIndex == index) {
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index bf7d4e025..b7f98e599 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -279,7 +279,11 @@ public:
 	[[nodiscard]] const QString &name() const;
 	[[nodiscard]] const QString &shortName() const;
 	[[nodiscard]] const QString &topBarNameText() const;
-	[[nodiscard]] QString userName() const;
+
+	[[nodiscard]] QString username() const;
+	[[nodiscard]] QString editableUsername() const;
+	[[nodiscard]] const std::vector<QString> &usernames() const;
+	[[nodiscard]] bool isUsernameEditable(QString username) const;
 
 	[[nodiscard]] const base::flat_set<QString> &nameWords() const {
 		return _nameWords;
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 6bfd2b74e..4614fae09 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1230,7 +1230,7 @@ PeerData *Session::peerByUsername(const QString &username) const {
 	const auto uname = username.trimmed();
 	for (const auto &[peerId, peer] : _peers) {
 		if (peer->isLoaded()
-			&& !peer->userName().compare(uname, Qt::CaseInsensitive)) {
+			&& !peer->username().compare(uname, Qt::CaseInsensitive)) {
 			return peer.get();
 		}
 	}
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index a856e6156..22cfbfeef 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -303,7 +303,7 @@ void SponsoredMessages::append(
 					? _session->data().processBotApp(peerId, *data.vapp())
 					: nullptr;
 				result.botLinkInfo = Window::PeerByLinkInfo{
-					.usernameOrId = user->userName(),
+					.usernameOrId = user->username(),
 					.resolveType = botAppData
 						? Window::ResolveType::BotApp
 						: data.vstart_param()
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index d4b12de6a..cc0fefe99 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -450,7 +450,7 @@ bool Story::hasDirectLink() const {
 	if (!_privacyPublic || (!_pinned && expired())) {
 		return false;
 	}
-	return !_peer->userName().isEmpty();
+	return !_peer->username().isEmpty();
 }
 
 std::optional<QString> Story::errorTextForForward(
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index cffe8ad67..f4f8faccd 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -472,6 +472,10 @@ const std::vector<QString> &UserData::usernames() const {
 	return _username.usernames();
 }
 
+bool UserData::isUsernameEditable(QString username) const {
+	return _username.isEditable(username);
+}
+
 const QString &UserData::phone() const {
 	return _phone;
 }
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index 7a8a22582..67da9e3f5 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -150,15 +150,11 @@ public:
 	// a full check by canShareThisContact() call.
 	[[nodiscard]] bool canShareThisContactFast() const;
 
-	MTPInputUser inputUser = MTP_inputUserEmpty();
-
-	QString firstName;
-	QString lastName;
 	[[nodiscard]] const QString &phone() const;
 	[[nodiscard]] QString username() const;
 	[[nodiscard]] QString editableUsername() const;
 	[[nodiscard]] const std::vector<QString> &usernames() const;
-	QString nameOrPhone;
+	[[nodiscard]] bool isUsernameEditable(QString username) const;
 
 	enum class ContactStatus : char {
 		Unknown,
@@ -186,8 +182,6 @@ public:
 	void setBirthday(Data::Birthday value);
 	void setBirthday(const tl::conditional<MTPBirthday> &value);
 
-	std::unique_ptr<BotInfo> botInfo;
-
 	void setUnavailableReasons(
 		std::vector<Data::UnavailableReason> &&reasons);
 
@@ -209,6 +203,14 @@ public:
 	[[nodiscard]] MsgId personalChannelMessageId() const;
 	void setPersonalChannel(ChannelId channelId, MsgId messageId);
 
+	MTPInputUser inputUser = MTP_inputUserEmpty();
+
+	QString firstName;
+	QString lastName;
+	QString nameOrPhone;
+
+	std::unique_ptr<BotInfo> botInfo;
+
 private:
 	auto unavailableReasons() const
 		-> const std::vector<Data::UnavailableReason> & override;
diff --git a/Telegram/SourceFiles/data/data_user_names.cpp b/Telegram/SourceFiles/data/data_user_names.cpp
index b69756b5e..c2edd6b01 100644
--- a/Telegram/SourceFiles/data/data_user_names.cpp
+++ b/Telegram/SourceFiles/data/data_user_names.cpp
@@ -80,4 +80,10 @@ const std::vector<QString> &UsernamesInfo::usernames() const {
 	return _usernames;
 }
 
+bool UsernamesInfo::isEditable(const QString &username) const {
+	return (_indexEditableUsername >= 0)
+		&& (_indexEditableUsername < _usernames.size())
+		&& (_usernames[_indexEditableUsername] == username);
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_user_names.h b/Telegram/SourceFiles/data/data_user_names.h
index 03853b520..04912ced9 100644
--- a/Telegram/SourceFiles/data/data_user_names.h
+++ b/Telegram/SourceFiles/data/data_user_names.h
@@ -27,6 +27,7 @@ public:
 	[[nodiscard]] QString username() const;
 	[[nodiscard]] QString editableUsername() const;
 	[[nodiscard]] const std::vector<QString> &usernames() const;
+	[[nodiscard]] bool isEditable(const QString &username) const;
 
 private:
 	std::vector<QString> _usernames;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 354a148eb..0da825209 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1087,7 +1087,7 @@ void InnerWidget::paintPeerSearchResult(
 
 	QRect tr(context.st->textLeft, context.st->textTop, namewidth, st::dialogsTextFont->height);
 	p.setFont(st::dialogsTextFont);
-	QString username = peer->userName();
+	QString username = peer->username();
 	if (!context.active && username.startsWith(_peerSearchQuery, Qt::CaseInsensitive)) {
 		auto first = '@' + username.mid(0, _peerSearchQuery.size());
 		auto second = username.mid(_peerSearchQuery.size());
@@ -4021,7 +4021,7 @@ void InnerWidget::setupShortcuts() {
 				const auto history = thread->owningHistory();
 				const auto isArchived = history->folder()
 					&& (history->folder()->id() == Data::Folder::kId);
-				
+
 				Window::ToggleHistoryArchived(
 					_controller->uiShow(),
 					history,
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 ab1f19958..5899117be 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -496,7 +496,7 @@ auto GenerateParticipantString(
 			data,
 		});
 	}
-	const auto username = peer->userName();
+	const auto username = peer->username();
 	if (username.isEmpty()) {
 		return name;
 	}
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 1a0cedb1b..494f58f9a 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -217,7 +217,18 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 }
 #endif
 
-[[nodiscard]] QImage IconCurrency(
+[[nodiscard]] QString FormatDate(const QDateTime &date) {
+	return tr::lng_group_call_starts_short_date(
+		tr::now,
+		lt_date,
+		langDayOfMonth(date.date()),
+		lt_time,
+		QLocale().toString(date.time(), QLocale::ShortFormat));
+}
+
+} // namespace
+
+QImage IconCurrency(
 		const style::FlatLabel &label,
 		const QColor &c) {
 	const auto s = Size(label.style.font->ascent);
@@ -234,17 +245,6 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 	return image;
 }
 
-[[nodiscard]] QString FormatDate(const QDateTime &date) {
-	return tr::lng_group_call_starts_short_date(
-		tr::now,
-		lt_date,
-		langDayOfMonth(date.date()),
-		lt_time,
-		QLocale().toString(date.time(), QLocale::ShortFormat));
-}
-
-} // namespace
-
 InnerWidget::InnerWidget(
 	QWidget *parent,
 	not_null<Controller*> controller,
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
index 69d1587d8..99e9511be 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.h
@@ -23,6 +23,10 @@ namespace Info::ChannelEarn {
 
 class Memento;
 
+[[nodiscard]] QImage IconCurrency(
+	const style::FlatLabel &label,
+	const QColor &c);
+
 class InnerWidget final : public Ui::VerticalLayout {
 public:
 	struct ShowRequest final {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 19d7eebae..84d8daba3 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -116,16 +116,25 @@ base::options::toggle ShowPeerIdBelowAbout({
 
 [[nodiscard]] Fn<void(QString)> UsernamesLinkCallback(
 		not_null<PeerData*> peer,
-		std::shared_ptr<Ui::Show> show,
+		not_null<Window::SessionController*> controller,
 		const QString &addToLink) {
+	const auto weak = base::make_weak(controller);
 	return [=](QString link) {
-		if (!link.startsWith(u"https://"_q)) {
-			link = peer->session().createInternalLinkFull(peer->userName())
+		if (link.startsWith(u"internal:"_q)) {
+			Core::App().openInternalUrl(link,
+				QVariant::fromValue(ClickHandlerContext{
+					.sessionWindow = weak,
+				}));
+			return;
+		} else if (!link.startsWith(u"https://"_q)) {
+			link = peer->session().createInternalLinkFull(peer->username())
 				+ addToLink;
 		}
 		if (!link.isEmpty()) {
 			QGuiApplication::clipboard()->setText(link);
-			show->showToast(tr::lng_username_copied(tr::now));
+			if (const auto window = weak.get()) {
+				window->showToast(tr::lng_username_copied(tr::now));
+			}
 		}
 	};
 }
@@ -1041,16 +1050,13 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			UsernameValue(user, true) | rpl::map([=](TextWithEntities u) {
 				return u.text.isEmpty()
 					? TextWithEntities()
-					: Ui::Text::Link(
-						u,
-						user->session().createInternalLinkFull(
-							u.text.mid(1)));
+					: Ui::Text::Link(u, UsernameUrl(user, u.text.mid(1)));
 			}),
 			QString(),
 			st::infoProfileLabeledUsernamePadding);
 		const auto callback = UsernamesLinkCallback(
 			_peer,
-			controller->uiShow(),
+			controller,
 			QString());
 		const auto hook = [=](Ui::FlatLabel::ContextMenuRequest request) {
 			if (!request.link) {
@@ -1094,7 +1100,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			}, copyUsername->lifetime());
 			copyUsername->setClickedCallback([=] {
 				const auto link = user->session().createInternalLinkFull(
-					user->userName());
+					user->username());
 				if (!link.isEmpty()) {
 					QGuiApplication::clipboard()->setText(link);
 					controller->showToast(tr::lng_username_copied(tr::now));
@@ -1159,7 +1165,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		const auto controller = _controller->parentController();
 		const auto linkCallback = UsernamesLinkCallback(
 			_peer,
-			controller->uiShow(),
+			controller,
 			addToLink);
 		linkLine.text->overrideLinkClickHandler(linkCallback);
 		linkLine.subtext->overrideLinkClickHandler(linkCallback);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
index 58c51ed31..85fde827f 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
@@ -112,23 +112,22 @@ int TextItem::contentHeight() const {
 
 } // namespace
 
-void AddPhoneMenu(not_null<Ui::PopupMenu*> menu, not_null<UserData*> user) {
-	if (user->isSelf()) {
-		return;
-	}
+bool IsCollectiblePhone(not_null<UserData*> user) {
 	using Strings = std::vector<QString>;
 	const auto prefixes = user->session().appConfig().get<Strings>(
 		u"fragment_prefixes"_q,
-		std::vector<QString>());
-	{
-		const auto proj = [&phone = user->phone()](const QString &p) {
-			return phone.startsWith(p);
-		};
-		if (ranges::none_of(prefixes, proj)) {
-			return;
-		}
-	}
-	if (const auto url = AppConfig::FragmentLink(&user->session())) {
+		Strings{ u"888"_q });
+	const auto phone = user->phone();
+	const auto proj = [&](const QString &p) {
+		return phone.startsWith(p);
+	};
+	return ranges::any_of(prefixes, proj);
+}
+
+void AddPhoneMenu(not_null<Ui::PopupMenu*> menu, not_null<UserData*> user) {
+	if (user->isSelf() || !IsCollectiblePhone(user)) {
+		return;
+	} else if (const auto url = AppConfig::FragmentLink(&user->session())) {
 		menu->addSeparator(&st::expandedMenuSeparator);
 		const auto link = Ui::Text::Link(
 			tr::lng_info_mobile_context_menu_fragment_about_link(tr::now),
diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.h b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.h
index 82ed6bb8c..25e6c8b5c 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.h
@@ -16,6 +16,8 @@ class PopupMenu;
 namespace Info {
 namespace Profile {
 
+[[nodiscard]] bool IsCollectiblePhone(not_null<UserData*> user);
+
 void AddPhoneMenu(not_null<Ui::PopupMenu*> menu, not_null<UserData*> user);
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index 9fe23da1f..6159fe907 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_chat_participants.h"
 #include "apiwrap.h"
+#include "info/profile/info_profile_phone_menu.h"
 #include "info/profile/info_profile_badge.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
@@ -55,7 +56,7 @@ auto PlainUsernameValue(not_null<PeerData*> peer) {
 		peer->session().changes().peerFlagsValue(peer, UpdateFlag::Username),
 		peer->session().changes().peerFlagsValue(peer, UpdateFlag::Usernames)
 	) | rpl::map([=] {
-		return peer->userName();
+		return peer->username();
 	});
 }
 
@@ -136,14 +137,19 @@ rpl::producer<TextWithEntities> PhoneOrHiddenValue(not_null<UserData*> user) {
 		PlainUsernameValue(user),
 		PlainAboutValue(user),
 		tr::lng_info_mobile_hidden()
-	) | rpl::map([](
+	) | rpl::map([user](
 			const TextWithEntities &phone,
 			const QString &username,
 			const QString &about,
 			const QString &hidden) {
-		return (phone.text.isEmpty() && username.isEmpty() && about.isEmpty())
-			? Ui::Text::WithEntities(hidden)
-			: phone;
+		if (phone.text.isEmpty() && username.isEmpty() && about.isEmpty()) {
+			return Ui::Text::WithEntities(hidden);
+		} else if (IsCollectiblePhone(user)) {
+			return Ui::Text::Link(phone, u"internal:collectible_phone/"_q
+				+ user->phone() + '@' + QString::number(user->id.value));
+		} else {
+			return phone;
+		}
 	});
 }
 
@@ -160,15 +166,22 @@ rpl::producer<TextWithEntities> UsernameValue(
 	}) | Ui::Text::ToWithEntities();
 }
 
+QString UsernameUrl(not_null<PeerData*> peer, const QString &username) {
+	return peer->isUsernameEditable(username)
+		? peer->session().createInternalLinkFull(username)
+		: (u"internal:collectible_username/"_q
+			+ username
+			+ "@"
+			+ QString::number(peer->id.value));
+}
+
 rpl::producer<std::vector<TextWithEntities>> UsernamesValue(
 		not_null<PeerData*> peer) {
 	const auto map = [=](const std::vector<QString> &usernames) {
 		return ranges::views::all(
 			usernames
 		) | ranges::views::transform([&](const QString &u) {
-			return Ui::Text::Link(
-				u,
-				peer->session().createInternalLinkFull(u));
+			return Ui::Text::Link(u, UsernameUrl(peer, u));
 		}) | ranges::to_vector;
 	};
 	auto value = rpl::merge(
@@ -224,9 +237,7 @@ rpl::producer<QString> LinkValue(not_null<PeerData*> peer, bool primary) {
 		? PlainPrimaryUsernameValue(peer)
 		: PlainUsernameValue(peer) | rpl::type_erased()
 	) | rpl::map([=](QString &&username) {
-		return username.isEmpty()
-			? QString()
-			: peer->session().createInternalLinkFull(username);
+		return username.isEmpty() ? QString() : UsernameUrl(peer, username);
 	});
 }
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h
index 6b7ccf475..625ccfa2a 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.h
@@ -61,6 +61,9 @@ rpl::producer<not_null<PeerData*>> MigratedOrMeValue(
 	bool primary = false);
 [[nodiscard]] rpl::producer<std::vector<TextWithEntities>> UsernamesValue(
 	not_null<PeerData*> peer);
+[[nodiscard]] QString UsernameUrl(
+	not_null<PeerData*> peer,
+	const QString &username);
 [[nodiscard]] TextWithEntities AboutWithEntities(
 	not_null<PeerData*> peer,
 	const QString &value);
diff --git a/Telegram/SourceFiles/main/main_domain.cpp b/Telegram/SourceFiles/main/main_domain.cpp
index cc6bd9457..aafbcd2ac 100644
--- a/Telegram/SourceFiles/main/main_domain.cpp
+++ b/Telegram/SourceFiles/main/main_domain.cpp
@@ -53,7 +53,7 @@ Domain::Domain(const QString &dataName)
 			: rpl::never<Data::PeerUpdate>();
 	}) | rpl::flatten_latest(
 	) | rpl::start_with_next([](const Data::PeerUpdate &update) {
-		CrashReports::SetAnnotation("Username", update.peer->userName());
+		CrashReports::SetAnnotation("Username", update.peer->username());
 	}, _lifetime);
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index ffa288223..896a38a6b 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -224,7 +224,7 @@ void Cover::initViewers() {
 	}, lifetime());
 
 	_username->overrideLinkClickHandler([=] {
-		const auto username = _user->userName();
+		const auto username = _user->username();
 		if (username.isEmpty()) {
 			_controller->show(Box(UsernamesBox, _user));
 		} else {
diff --git a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
new file mode 100644
index 000000000..4498becad
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
@@ -0,0 +1,271 @@
+/*
+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/boxes/collectible_info_box.h"
+
+#include "base/unixtime.h"
+#include "core/file_utilities.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "info/channel_statistics/earn/earn_format.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/dynamic_image.h"
+#include "ui/painter.h"
+#include "settings/settings_common.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+
+#include <QtCore/QRegularExpression>
+#include <QtGui/QGuiApplication>
+
+namespace Ui {
+namespace {
+
+constexpr auto kTonMultiplier = uint64(1000000000);
+
+[[nodiscard]] QString FormatEntity(CollectibleType type, QString entity) {
+	switch (type) {
+	case CollectibleType::Phone: {
+		static const auto kNonDigits = QRegularExpression(u"[^\\d]"_q);
+		entity.replace(kNonDigits, QString());
+	} return Ui::FormatPhone(entity);
+	case CollectibleType::Username:
+		return entity.startsWith('@') ? entity : ('@' + entity);
+	}
+	Unexpected("CollectibleType in FormatEntity.");
+}
+
+[[nodiscard]] QString FormatDate(TimeId date) {
+	return langDateTime(base::unixtime::parse(date));
+}
+
+[[nodiscard]] TextWithEntities FormatPrice(
+		const CollectibleInfo &info,
+		const CollectibleDetails &details) {
+	auto minor = Info::ChannelEarn::MinorPart(info.cryptoAmount);
+	if (minor.size() == 1 && minor.at(0) == '.') {
+		minor += '0';
+	}
+	auto price = (info.cryptoCurrency == u"TON"_q)
+		? base::duplicate(
+			details.tonEmoji
+		).append(
+			Info::ChannelEarn::MajorPart(info.cryptoAmount)
+		).append(minor)
+		: TextWithEntities{ ('{'
+			+ info.cryptoCurrency + ':' + QString::number(info.cryptoAmount)
+			+ '}') };
+	const auto fiat = Ui::FillAmountAndCurrency(info.amount, info.currency);
+	return Ui::Text::Wrapped(
+		price,
+		EntityType::Bold
+	).append(u" ("_q + fiat + ')');
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeOwnerCell(
+		not_null<QWidget*> parent,
+		const CollectibleInfo &info) {
+	const auto st = &st::defaultMultiSelectItem;
+	const auto size = st->height;
+	auto result = object_ptr<Ui::FixedHeightWidget>(parent.get(), size);
+	const auto raw = result.data();
+
+	const auto name = info.ownerName;
+	const auto userpic = info.ownerUserpic;
+	const auto nameWidth = st->style.font->width(name);
+	const auto added = size + st->padding.left() + st->padding.right();
+	const auto subscribed = std::make_shared<bool>(false);
+	raw->paintRequest() | rpl::start_with_next([=] {
+		const auto use = std::min(nameWidth + added, raw->width());
+		const auto x = (raw->width() - use) / 2;
+		if (const auto available = use - added; available > 0) {
+			auto p = QPainter(raw);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st->textBg);
+			p.drawRoundedRect(x, 0, use, size, size / 2., size / 2.);
+
+			if (!*subscribed) {
+				*subscribed = true;
+				userpic->subscribeToUpdates([=] { raw->update(); });
+			}
+			p.drawImage(QRect(x, 0, size, size), userpic->image(size));
+
+			const auto textx = x + size + st->padding.left();
+			const auto texty = st->padding.top() + st->style.font->ascent;
+			const auto text = (use == nameWidth + added)
+				? name
+				: st->style.font->elided(name, available);
+			p.setPen(st->textFg);
+			p.setFont(st->style.font);
+			p.drawText(textx, texty, text);
+		}
+	}, raw->lifetime());
+
+	return result;
+}
+
+} // namespace
+
+CollectibleType DetectCollectibleType(const QString &entity) {
+	return entity.startsWith('+')
+		? CollectibleType::Phone
+		: CollectibleType::Username;
+}
+
+void CollectibleInfoBox(
+		not_null<Ui::GenericBox*> box,
+		CollectibleInfo info,
+		CollectibleDetails details) {
+	box->setWidth(st::boxWideWidth);
+	box->setStyle(st::collectibleBox);
+
+	const auto type = DetectCollectibleType(info.entity);
+
+	const auto icon = box->addRow(
+		object_ptr<Ui::FixedHeightWidget>(box, st::collectibleIconDiameter),
+		st::collectibleIconPadding);
+	icon->paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		const auto size = icon->height();
+		const auto inner = QRect(
+			(icon->width() - size) / 2,
+			0,
+			size,
+			size);
+		if (!inner.intersects(clip)) {
+			return;
+		}
+		auto p = QPainter(icon);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::defaultActiveButton.textBg);
+		p.setPen(Qt::NoPen);
+		p.drawEllipse(inner);
+	}, icon->lifetime());
+	const auto lottieSize = st::collectibleIcon;
+	auto lottie = Settings::CreateLottieIcon(
+		icon,
+		{
+			.name = (type == CollectibleType::Phone
+				? u"collectible_phone"_q
+				: u"collectible_username"_q),
+			.color = &st::defaultActiveButton.textFg,
+			.sizeOverride = { lottieSize, lottieSize },
+		},
+		QMargins());
+	box->showFinishes(
+	) | rpl::start_with_next([animate = std::move(lottie.animate)] {
+		animate(anim::repeat::once);
+	}, box->lifetime());
+	const auto animation = lottie.widget.release();
+	icon->sizeValue() | rpl::start_with_next([=](QSize size) {
+		const auto skip = (type == CollectibleType::Phone)
+			? style::ConvertScale(2)
+			: 0;
+		animation->move(
+			(size.width() - animation->width()) / 2,
+			skip + (size.height() - animation->height()) / 2);
+	}, animation->lifetime());
+
+	const auto formatted = FormatEntity(type, info.entity);
+	const auto header = (type == CollectibleType::Phone)
+		? tr::lng_collectible_phone_title(
+			tr::now,
+			lt_phone,
+			Ui::Text::Link(formatted),
+			Ui::Text::WithEntities)
+		: tr::lng_collectible_username_title(
+			tr::now,
+			lt_username,
+			Ui::Text::Link(formatted),
+			Ui::Text::WithEntities);
+	const auto copyCallback = [box, type, formatted, text = info.copyText] {
+		QGuiApplication::clipboard()->setText(
+			text.isEmpty() ? formatted : text);
+		box->uiShow()->showToast((type == CollectibleType::Phone)
+			? tr::lng_text_copied(tr::now)
+			: tr::lng_username_copied(tr::now));
+	};
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			rpl::single(header),
+			st::collectibleHeader),
+		st::collectibleHeaderPadding
+	)->setClickHandlerFilter([copyCallback](const auto &...) {
+		copyCallback();
+		return false;
+	});
+
+	box->addRow(MakeOwnerCell(box, info), st::collectibleOwnerPadding);
+
+	const auto text = ((type == CollectibleType::Phone)
+		? tr::lng_collectible_phone_info
+		: tr::lng_collectible_username_info)(
+			tr::now,
+			lt_date,
+			TextWithEntities{ FormatDate(info.date) },
+			lt_price,
+			FormatPrice(info, details),
+			Ui::Text::RichLangValue);
+	const auto label = box->addRow(
+		object_ptr<Ui::FlatLabel>(box, st::collectibleInfo),
+		st::collectibleInfoPadding);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->setMarkedText(text, details.tonEmojiContext());
+
+	const auto more = box->addRow(
+		object_ptr<Ui::RoundButton>(
+			box,
+			tr::lng_collectible_learn_more(),
+			st::collectibleMore),
+		st::collectibleMorePadding);
+	more->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	more->setClickedCallback([url = info.url] {
+		File::OpenUrl(url);
+	});
+
+	const auto phrase = (type == CollectibleType::Phone)
+		? tr::lng_collectible_phone_copy
+		: tr::lng_collectible_username_copy;
+	auto owned = object_ptr<Ui::RoundButton>(
+		box,
+		phrase(),
+		st::collectibleCopy);
+	const auto copy = owned.data();
+	copy->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	copy->setClickedCallback(copyCallback);
+	box->addButton(std::move(owned));
+
+	box->setNoContentMargin(true);
+	const auto buttonsParent = box->verticalLayout().get();
+	const auto close = Ui::CreateChild<Ui::IconButton>(
+		buttonsParent,
+		st::boxTitleClose);
+	close->setClickedCallback([=] {
+		box->closeBox();
+	});
+	box->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		close->moveToRight(0, 0);
+	}, box->lifetime());
+
+	box->widthValue() | rpl::start_with_next([=](int width) {
+		more->setFullWidth(width
+			- st::collectibleMorePadding.left()
+			- st::collectibleMorePadding.right());
+		copy->setFullWidth(width
+			- st::collectibleBox.buttonPadding.left()
+			- st::collectibleBox.buttonPadding.right());
+	}, box->lifetime());
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/collectible_info_box.h b/Telegram/SourceFiles/ui/boxes/collectible_info_box.h
new file mode 100644
index 000000000..8b80b9650
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/collectible_info_box.h
@@ -0,0 +1,45 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+
+class GenericBox;
+class DynamicImage;
+
+enum class CollectibleType {
+	Phone,
+	Username,
+};
+
+[[nodiscard]] CollectibleType DetectCollectibleType(const QString &entity);
+
+struct CollectibleInfo {
+	QString entity;
+	QString copyText;
+	std::shared_ptr<DynamicImage> ownerUserpic;
+	QString ownerName;
+	uint64 cryptoAmount = 0;
+	uint64 amount = 0;
+	QString cryptoCurrency;
+	QString currency;
+	QString url;
+	TimeId date = 0;
+};
+
+struct CollectibleDetails {
+	TextWithEntities tonEmoji;
+	Fn<std::any()> tonEmojiContext;
+};
+
+void CollectibleInfoBox(
+	not_null<Ui::GenericBox*> box,
+	CollectibleInfo info,
+	CollectibleDetails details);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp
index dec5eb312..41e985723 100644
--- a/Telegram/SourceFiles/ui/text/format_values.cpp
+++ b/Telegram/SourceFiles/ui/text/format_values.cpp
@@ -357,6 +357,7 @@ CurrencyRule LookupCurrencyRule(const QString &currency) {
 
 		char do_decimal_point() const override { return decimal; }
 		char do_thousands_sep() const override { return thousands; }
+		std::string do_grouping() const override { return "\3"; }
 
 		char decimal = '.';
 		char thousands = ',';
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 0276c3771..d5c2d3fce 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -135,8 +135,8 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 				const auto count = c ? c->membersCount() : g->count;
 				_status.setText(
 					st::defaultTextStyle,
-					!p->userName().isEmpty()
-						? ('@' + p->userName())
+					!p->username().isEmpty()
+						? ('@' + p->username())
 						: count
 						? tr::lng_chat_status_subscribers(
 							tr::now,
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 18c536cf3..86a5f53c1 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/delete_messages_box.h"
 #include "window/window_controller.h"
 #include "window/window_filters_menu.h"
+#include "info/channel_statistics/earn/info_earn_inner_widget.h"
 #include "info/info_memento.h"
 #include "info/info_controller.h"
 #include "inline_bots/bot_attach_web_view.h"
@@ -26,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_scheduled_section.h"
 #include "media/player/media_player_instance.h"
 #include "media/view/media_view_open_common.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_document_resolver.h"
 #include "data/data_download_manager.h"
 #include "data/data_session.h"
@@ -49,6 +51,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/shortcuts.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
+#include "core/ui_integration.h"
 #include "base/unixtime.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/text/text_utilities.h"
@@ -62,7 +65,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_instance.h" // Core::App().calls().inCall().
 #include "calls/group/calls_group_call.h"
 #include "ui/boxes/calendar_box.h"
+#include "ui/boxes/collectible_info_box.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/dynamic_thumbnails.h"
 #include "mainwidget.h"
 #include "main/main_app_config.h"
 #include "main/main_domain.h"
@@ -83,6 +88,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_premium.h"
 #include "settings/settings_privacy_security.h"
 #include "styles/style_window.h"
+#include "styles/style_boxes.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_layers.h" // st::boxLabel
 
@@ -155,6 +161,47 @@ private:
 	return false;
 }
 
+[[nodiscard]] Ui::CollectibleDetails PrepareCollectibleDetails(
+		not_null<Main::Session*> session) {
+	const auto makeContext = [=] {
+		return Core::MarkedTextContext{
+			.session = session,
+			.customEmojiRepaint = [] {},
+		};
+	};
+	return {
+		.tonEmoji = Ui::Text::SingleCustomEmoji(
+			session->data().customEmojiManager().registerInternalEmoji(
+				Info::ChannelEarn::IconCurrency(
+					st::collectibleInfo,
+					st::collectibleInfo.textFg->c),
+				st::collectibleInfoTonMargins,
+				true)),
+		.tonEmojiContext = makeContext,
+	};
+}
+
+[[nodiscard]] Ui::CollectibleInfo Parse(
+		const QString &entity,
+		not_null<PeerData*> owner,
+		const MTPfragment_CollectibleInfo &info) {
+	const auto &data = info.data();
+	return {
+		.entity = entity,
+		.copyText = (entity.startsWith('+')
+			? QString()
+			: owner->session().createInternalLinkFull(entity)),
+		.ownerUserpic = Ui::MakeUserpicThumbnail(owner, true),
+		.ownerName = owner->name(),
+		.cryptoAmount = data.vcrypto_amount().v,
+		.amount = data.vamount().v,
+		.cryptoCurrency = qs(data.vcrypto_currency()),
+		.currency = qs(data.vcurrency()),
+		.url = qs(data.vurl()),
+		.date = data.vpurchase_date().v,
+	};
+}
+
 MainWindowShow::MainWindowShow(not_null<SessionController*> controller)
 : _window(base::make_weak(controller)) {
 }
@@ -688,6 +735,36 @@ void SessionNavigation::resolveBoostState(not_null<ChannelData*> channel) {
 	}).send();
 }
 
+void SessionNavigation::resolveCollectible(
+		PeerId ownerId,
+		const QString &entity,
+		Fn<void(QString)> fail) {
+	if (_collectibleEntity == entity) {
+		return;
+	} else {
+		_api.request(base::take(_collectibleRequestId)).cancel();
+	}
+	_collectibleEntity = entity;
+	_collectibleRequestId = _api.request(MTPfragment_GetCollectibleInfo(
+		((Ui::DetectCollectibleType(entity) == Ui::CollectibleType::Phone)
+			? MTP_inputCollectiblePhone(MTP_string(entity))
+			: MTP_inputCollectibleUsername(MTP_string(entity)))
+	)).done([=](const MTPfragment_CollectibleInfo &result) {
+		const auto entity = base::take(_collectibleEntity);
+		_collectibleRequestId = 0;
+		uiShow()->show(Box(
+			Ui::CollectibleInfoBox,
+			Parse(entity, _session->data().peer(ownerId), result),
+			PrepareCollectibleDetails(_session)));
+	}).fail([=](const MTP::Error &error) {
+		_collectibleEntity = QString();
+		_collectibleRequestId = 0;
+		if (fail) {
+			fail(error.type());
+		}
+	}).send();
+}
+
 void SessionNavigation::applyBoost(
 		not_null<ChannelData*> channel,
 		Fn<void(Ui::BoostCounters)> done) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 811fb87a3..293dda20c 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -245,6 +245,11 @@ public:
 
 	void resolveBoostState(not_null<ChannelData*> channel);
 
+	void resolveCollectible(
+		PeerId ownerId,
+		const QString &entity,
+		Fn<void(QString)> fail = nullptr);
+
 	base::weak_ptr<Ui::Toast::Instance> showToast(
 		Ui::Toast::Config &&config);
 	base::weak_ptr<Ui::Toast::Instance> showToast(
@@ -304,6 +309,9 @@ private:
 
 	ChannelData *_boostStateResolving = nullptr;
 
+	QString _collectibleEntity;
+	mtpRequestId _collectibleRequestId = 0;
+
 };
 
 class SessionController : public SessionNavigation {
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 3cd0defa7..3a8f8ef34 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -240,6 +240,8 @@ PRIVATE
     ui/boxes/choose_language_box.h
     ui/boxes/choose_time.cpp
     ui/boxes/choose_time.h
+    ui/boxes/collectible_info_box.cpp
+    ui/boxes/collectible_info_box.h
     ui/boxes/confirm_box.cpp
     ui/boxes/confirm_box.h
     ui/boxes/confirm_phone_box.cpp

From 1e0002aa7490faacf0afef508e316fa8cca7fee7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 23:09:26 +0400
Subject: [PATCH 212/596] Fix jump to original from story repost.

---
 .../SourceFiles/media/stories/media_stories_controller.cpp | 7 +++++++
 .../SourceFiles/media/stories/media_stories_controller.h   | 1 +
 .../media/stories/media_stories_repost_view.cpp            | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index a56e10252..d43ff3a27 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -933,6 +933,13 @@ void Controller::show(
 	peer->updateFull();
 }
 
+void Controller::jumpTo(
+		not_null<Data::Story*> story,
+		Data::StoriesContext context) {
+	show(story, std::move(context));
+	_delegate->storiesRedisplay(story);
+}
+
 bool Controller::changeShown(Data::Story *story) {
 	const auto id = story ? story->fullId() : FullStoryId();
 	const auto session = story ? &story->session() : nullptr;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index b8ad1e20b..b8745d4ed 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -141,6 +141,7 @@ public:
 		-> HistoryView::Reactions::CachedIconFactory &;
 
 	void show(not_null<Data::Story*> story, Data::StoriesContext context);
+	void jumpTo(not_null<Data::Story*> story, Data::StoriesContext context);
 	void ready();
 
 	void updateVideoPlayback(const Player::TrackState &state);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
index dd5c55ea7..4dfdd6a56 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
@@ -178,7 +178,7 @@ RepostClickHandler RepostView::lookupHandler(QPoint position) {
 				const auto of = owner->stories().lookup({ peer->id, id });
 				if (of) {
 					using namespace Data;
-					_controller->show(*of, { StoriesContextSingle() });
+					_controller->jumpTo(*of, { StoriesContextSingle() });
 				} else {
 					_controller->uiShow()->show(PrepareShortInfoBox(peer));
 				}

From ae36019ba99131df31a2e7056da720b3bad1b827 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Apr 2024 23:13:05 +0400
Subject: [PATCH 213/596] Version 4.16.1.

- Show information about Fragment phone numbers and usernames.
- Fix jump to original story from a story repost.
- Fix old image display in viewer in some cases.
- Fix several crashes.
---
 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                                | 7 +++++++
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 2627ef790..d97818b8e 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.0.0" />
+    Version="4.16.1.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 09f5f8a95..7e6c0165e 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 4,16,0,0
- PRODUCTVERSION 4,16,0,0
+ FILEVERSION 4,16,1,0
+ PRODUCTVERSION 4,16,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", "4.16.0.0"
+            VALUE "FileVersion", "4.16.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.0.0"
+            VALUE "ProductVersion", "4.16.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 95a5053d0..4b7bc1131 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 4,16,0,0
- PRODUCTVERSION 4,16,0,0
+ FILEVERSION 4,16,1,0
+ PRODUCTVERSION 4,16,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", "4.16.0.0"
+            VALUE "FileVersion", "4.16.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.0.0"
+            VALUE "ProductVersion", "4.16.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index e3374144e..027295e4f 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 = 4016000;
-constexpr auto AppVersionStr = "4.16";
+constexpr auto AppVersion = 4016001;
+constexpr auto AppVersionStr = "4.16.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 7da53e563..91212612f 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016000
+AppVersion         4016001
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16
-AppVersionStr      4.16.0
+AppVersionStrSmall 4.16.1
+AppVersionStr      4.16.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.16
+AppVersionOriginal 4.16.1
diff --git a/changelog.txt b/changelog.txt
index a0e595060..56ff2649b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+4.16.1 (02.04.24)
+
+- Show information about Fragment phone numbers and usernames.
+- Fix jump to original story from a story repost.
+- Fix old image display in viewer in some cases.
+- Fix several crashes.
+
 4.16 (01.04.24)
 
 - Instant View on Windows 10+ and macOS.

From 91f8989f701c1c3bfe299ac8e653efc7d22a38e3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 3 Apr 2024 11:59:33 +0400
Subject: [PATCH 214/596] Remove SendMediaReady legacy helper.

---
 Telegram/SourceFiles/api/api_peer_photo.cpp   |  33 ++--
 Telegram/SourceFiles/api/api_ringtones.cpp    |  33 ++--
 Telegram/SourceFiles/api/api_sending.cpp      |   2 +-
 Telegram/SourceFiles/api/api_sending.h        |   4 +-
 .../boxes/background_preview_box.cpp          |   4 +-
 Telegram/SourceFiles/history/history_widget.h |   1 -
 Telegram/SourceFiles/iv/iv_data.cpp           |   2 +-
 Telegram/SourceFiles/mainwidget.h             |   1 -
 .../passport/passport_form_controller.cpp     |  12 +-
 Telegram/SourceFiles/storage/file_upload.cpp  | 177 +++++-------------
 Telegram/SourceFiles/storage/file_upload.h    |   6 +-
 .../SourceFiles/storage/localimageloader.cpp  |  83 +++-----
 .../SourceFiles/storage/localimageloader.h    |  74 +++-----
 .../window/themes/window_theme.cpp            |  41 ++--
 .../SourceFiles/window/themes/window_theme.h  |   4 +-
 .../window/themes/window_theme_editor_box.cpp |  60 +++---
 16 files changed, 183 insertions(+), 354 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_peer_photo.cpp b/Telegram/SourceFiles/api/api_peer_photo.cpp
index c70ef4491..9c8a470fa 100644
--- a/Telegram/SourceFiles/api/api_peer_photo.cpp
+++ b/Telegram/SourceFiles/api/api_peer_photo.cpp
@@ -34,7 +34,7 @@ namespace {
 
 constexpr auto kSharedMediaLimit = 100;
 
-[[nodiscard]] SendMediaReady PreparePeerPhoto(
+[[nodiscard]] std::shared_ptr<FilePrepareResult> PreparePeerPhoto(
 		MTP::DcId dcId,
 		PeerId peerId,
 		QImage &&image) {
@@ -80,24 +80,17 @@ constexpr auto kSharedMediaLimit = 100;
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId));
 
-	QString file, filename;
-	int64 filesize = 0;
-	QByteArray data;
-
-	return SendMediaReady(
-		SendMediaType::Photo,
-		file,
-		filename,
-		filesize,
-		data,
-		id,
-		id,
-		u"jpg"_q,
-		peerId,
-		photo,
-		photoThumbs,
-		MTP_documentEmpty(MTP_long(0)),
-		jpeg);
+	auto result = MakePreparedFile({
+		.id = id,
+		.type = SendMediaType::Photo,
+	});
+	result->type = SendMediaType::Photo;
+	result->setFileData(jpeg);
+	result->thumbId = id;
+	result->thumbname = "thumb.jpg";
+	result->photo = photo;
+	result->photoThumbs = photoThumbs;
+	return result;
 }
 
 [[nodiscard]] std::optional<MTPVideoSize> PrepareMtpMarkup(
@@ -239,7 +232,7 @@ void PeerPhoto::upload(
 			_api.instance().mainDcId(),
 			peer->id,
 			base::take(photo.image));
-		_session->uploader().uploadMedia(fakeId, ready);
+		_session->uploader().upload(fakeId, ready);
 	}
 }
 
diff --git a/Telegram/SourceFiles/api/api_ringtones.cpp b/Telegram/SourceFiles/api/api_ringtones.cpp
index 87522bf58..307ba580a 100644
--- a/Telegram/SourceFiles/api/api_ringtones.cpp
+++ b/Telegram/SourceFiles/api/api_ringtones.cpp
@@ -24,16 +24,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Api {
 namespace {
 
-SendMediaReady PrepareRingtoneDocument(
+std::shared_ptr<FilePrepareResult> PrepareRingtoneDocument(
 		MTP::DcId dcId,
 		const QString &filename,
 		const QString &filemime,
 		const QByteArray &content) {
+	const auto id = base::RandomValue<DocumentId>();
 	auto attributes = QVector<MTPDocumentAttribute>(
 		1,
 		MTP_documentAttributeFilename(MTP_string(filename)));
-	const auto id = base::RandomValue<DocumentId>();
-	const auto document = MTP_document(
+
+	auto result = MakePreparedFile({
+		.id = id,
+		.type = SendMediaType::File,
+	});
+	result->filename = filename;
+	result->content = content;
+	result->filesize = content.size();
+	result->setFileData(content);
+	result->document = MTP_document(
 		MTP_flags(0),
 		MTP_long(id),
 		MTP_long(0),
@@ -45,21 +54,7 @@ SendMediaReady PrepareRingtoneDocument(
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId),
 		MTP_vector<MTPDocumentAttribute>(std::move(attributes)));
-
-	return SendMediaReady(
-		SendMediaType::File,
-		QString(), // filepath
-		filename,
-		content.size(),
-		content,
-		id,
-		0,
-		QString(),
-		PeerId(),
-		MTP_photoEmpty(MTP_long(0)),
-		PreparedPhotoThumbs(),
-		document,
-		QByteArray());
+	return result;
 }
 
 } // namespace
@@ -102,7 +97,7 @@ void Ringtones::upload(
 		_uploads.erase(already);
 	}
 	_uploads.emplace(fakeId, uploadedData);
-	_session->uploader().uploadMedia(fakeId, ready);
+	_session->uploader().upload(fakeId, ready);
 }
 
 void Ringtones::ready(const FullMsgId &msgId, const MTPInputFile &file) {
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index 72bd06b3d..d91943fe0 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -353,7 +353,7 @@ void FillMessagePostFlags(
 
 void SendConfirmedFile(
 		not_null<Main::Session*> session,
-		const std::shared_ptr<FileLoadResult> &file) {
+		const std::shared_ptr<FilePrepareResult> &file) {
 	const auto isEditing = (file->type != SendMediaType::Audio)
 		&& (file->to.replaceMediaOf != 0);
 	const auto newId = FullMsgId(
diff --git a/Telegram/SourceFiles/api/api_sending.h b/Telegram/SourceFiles/api/api_sending.h
index e17c66f3e..2fdbad843 100644
--- a/Telegram/SourceFiles/api/api_sending.h
+++ b/Telegram/SourceFiles/api/api_sending.h
@@ -14,7 +14,7 @@ class Session;
 class History;
 class PhotoData;
 class DocumentData;
-struct FileLoadResult;
+struct FilePrepareResult;
 
 namespace Api {
 
@@ -40,6 +40,6 @@ void FillMessagePostFlags(
 
 void SendConfirmedFile(
 	not_null<Main::Session*> session,
-	const std::shared_ptr<FileLoadResult> &file);
+	const std::shared_ptr<FilePrepareResult> &file);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 3a9917719..a112c478a 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -593,11 +593,11 @@ void BackgroundPreviewBox::uploadForPeer(bool both) {
 	const auto ready = Window::Theme::PrepareWallPaper(
 		session->mainDcId(),
 		_paper.localThumbnail()->original());
-	const auto documentId = ready.id;
+	const auto documentId = ready->id;
 	_uploadId = FullMsgId(
 		session->userPeerId(),
 		session->data().nextLocalMessageId());
-	session->uploader().uploadMedia(_uploadId, ready);
+	session->uploader().upload(_uploadId, ready);
 	if (_uploadLifetime) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 43966331e..b4d8bb49c 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -18,7 +18,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/fields/input_field.h"
 #include "mtproto/sender.h"
 
-struct FileLoadResult;
 enum class SendMediaType;
 class MessageLinksParser;
 struct InlineBotQuery;
diff --git a/Telegram/SourceFiles/iv/iv_data.cpp b/Telegram/SourceFiles/iv/iv_data.cpp
index bbcca0b2c..5258e6c9f 100644
--- a/Telegram/SourceFiles/iv/iv_data.cpp
+++ b/Telegram/SourceFiles/iv/iv_data.cpp
@@ -25,7 +25,7 @@ QByteArray GeoPointId(Geo point) {
 	const auto lon = int(point.lon * 1000000);
 	const auto combined = (std::uint64_t(std::uint32_t(lat)) << 32)
 		| std::uint64_t(std::uint32_t(lon));
-	return QByteArray::number(combined)
+	return QByteArray::number(quint64(combined))
 		+ ','
 		+ QByteArray::number(point.access);
 }
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 10bea63d4..809086765 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -16,7 +16,6 @@ struct HistoryMessageMarkupButton;
 class MainWindow;
 class HistoryWidget;
 class StackItem;
-struct FileLoadResult;
 class History;
 class Image;
 
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index 684163163..980888ffb 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -1581,14 +1581,10 @@ void FormController::uploadEncryptedFile(
 		&session(),
 		std::make_unique<UploadScanData>(std::move(data)));
 
-	auto prepared = std::make_shared<FileLoadResult>(
-		TaskId(),
-		file.uploadData->fileId,
-		FileLoadTo(PeerId(), Api::SendOptions(), FullReplyTo(), MsgId()),
-		TextWithTags(),
-		false,
-		std::shared_ptr<SendingAlbum>(nullptr));
-	prepared->type = SendMediaType::Secure;
+	auto prepared = MakePreparedFile({
+		.id = file.uploadData->fileId,
+		.type = SendMediaType::Secure,
+	});
 	prepared->content = QByteArray::fromRawData(
 		reinterpret_cast<char*>(file.uploadData->bytes.data()),
 		file.uploadData->bytes.size());
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index c40396955..e0c7f8b57 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -59,22 +59,15 @@ constexpr auto kKillSessionTimeout = 15 * crl::time(1000);
 } // namespace
 
 struct Uploader::File {
-	File(const SendMediaReady &media);
-	File(const std::shared_ptr<FileLoadResult> &file);
+	explicit File(const std::shared_ptr<FilePrepareResult> &file);
 
 	void setDocSize(int64 size);
 	bool setPartSize(uint32 partSize);
 
-	std::shared_ptr<FileLoadResult> file;
-	SendMediaReady media;
+	std::shared_ptr<FilePrepareResult> file;
 	int32 partsCount = 0;
 	mutable int64 fileSentSize = 0;
 
-	uint64 id() const;
-	SendMediaType type() const;
-	uint64 thumbId() const;
-	const QString &filename() const;
-
 	HashMd5 md5Hash;
 
 	std::unique_ptr<QFile> docFile;
@@ -85,27 +78,15 @@ struct Uploader::File {
 
 };
 
-Uploader::File::File(const SendMediaReady &media) : media(media) {
-	partsCount = media.parts.size();
-	if (type() == SendMediaType::File
-		|| type() == SendMediaType::ThemeFile
-		|| type() == SendMediaType::Audio) {
-		setDocSize(media.file.isEmpty()
-			? media.data.size()
-			: media.filesize);
-	} else {
-		docSize = docPartSize = docPartsCount = 0;
-	}
-}
-Uploader::File::File(const std::shared_ptr<FileLoadResult> &file)
+Uploader::File::File(const std::shared_ptr<FilePrepareResult> &file)
 : file(file) {
-	partsCount = (type() == SendMediaType::Photo
-		|| type() == SendMediaType::Secure)
+	partsCount = (file->type == SendMediaType::Photo
+		|| file->type == SendMediaType::Secure)
 		? file->fileparts.size()
 		: file->thumbparts.size();
-	if (type() == SendMediaType::File
-		|| type() == SendMediaType::ThemeFile
-		|| type() == SendMediaType::Audio) {
+	if (file->type == SendMediaType::File
+		|| file->type == SendMediaType::ThemeFile
+		|| file->type == SendMediaType::Audio) {
 		setDocSize(file->filesize);
 	} else {
 		docSize = docPartSize = docPartsCount = 0;
@@ -134,22 +115,6 @@ bool Uploader::File::setPartSize(uint32 partSize) {
 	return (docPartsCount <= kDocumentMaxPartsCountDefault);
 }
 
-uint64 Uploader::File::id() const {
-	return file ? file->id : media.id;
-}
-
-SendMediaType Uploader::File::type() const {
-	return file ? file->type : media.type;
-}
-
-uint64 Uploader::File::thumbId() const {
-	return file ? file->thumbId : media.thumbId;
-}
-
-const QString &Uploader::File::filename() const {
-	return file ? file->filename : media.filename;
-}
-
 Uploader::Uploader(not_null<ApiWrap*> api)
 : _api(api)
 , _nextTimer([=] { sendNext(); })
@@ -282,39 +247,9 @@ Main::Session &Uploader::session() const {
 	return _api->session();
 }
 
-void Uploader::uploadMedia(
-		const FullMsgId &msgId,
-		const SendMediaReady &media) {
-	if (media.type == SendMediaType::Photo) {
-		session().data().processPhoto(media.photo, media.photoThumbs);
-	} else if (media.type == SendMediaType::File
-		|| media.type == SendMediaType::ThemeFile
-		|| media.type == SendMediaType::Audio) {
-		const auto document = media.photoThumbs.empty()
-			? session().data().processDocument(media.document)
-			: session().data().processDocument(
-				media.document,
-				Images::FromImageInMemory(
-					media.photoThumbs.front().second.image,
-					"JPG",
-					media.photoThumbs.front().second.bytes));
-		if (!media.data.isEmpty()) {
-			document->setDataAndCache(media.data);
-			if (media.type == SendMediaType::ThemeFile) {
-				document->checkWallPaperProperties();
-			}
-		}
-		if (!media.file.isEmpty()) {
-			document->setLocation(Core::FileLocation(media.file));
-		}
-	}
-	queue.emplace(msgId, File(media));
-	sendNext();
-}
-
 void Uploader::upload(
 		const FullMsgId &msgId,
-		const std::shared_ptr<FileLoadResult> &file) {
+		const std::shared_ptr<FilePrepareResult> &file) {
 	if (file->type == SendMediaType::Photo) {
 		const auto photo = session().data().processPhoto(
 			file->photo,
@@ -383,13 +318,13 @@ void Uploader::currentFailed() {
 }
 
 void Uploader::notifyFailed(FullMsgId id, const File &file) {
-	const auto type = file.type();
+	const auto type = file.file->type;
 	if (type == SendMediaType::Photo) {
 		_photoFailed.fire_copy(id);
 	} else if (type == SendMediaType::File
 		|| type == SendMediaType::ThemeFile
 		|| type == SendMediaType::Audio) {
-		const auto document = session().data().document(file.id());
+		const auto document = session().data().document(file.file->id);
 		if (document->uploading()) {
 			document->status = FileUploadFailed;
 		}
@@ -439,18 +374,14 @@ void Uploader::sendNext() {
 		}
 	}
 
-	auto &parts = uploadingData.file
-		? ((uploadingData.type() == SendMediaType::Photo
-			|| uploadingData.type() == SendMediaType::Secure)
-			? uploadingData.file->fileparts
-			: uploadingData.file->thumbparts)
-		: uploadingData.media.parts;
-	const auto partsOfId = uploadingData.file
-		? ((uploadingData.type() == SendMediaType::Photo
-			|| uploadingData.type() == SendMediaType::Secure)
-			? uploadingData.file->id
-			: uploadingData.file->thumbId)
-		: uploadingData.media.thumbId;
+	auto &parts = (uploadingData.file->type == SendMediaType::Photo
+		|| uploadingData.file->type == SendMediaType::Secure)
+		? uploadingData.file->fileparts
+		: uploadingData.file->thumbparts;
+	const auto partsOfId = (uploadingData.file->type == SendMediaType::Photo
+		|| uploadingData.file->type == SendMediaType::Secure)
+		? uploadingData.file->id
+		: uploadingData.file->thumbId;
 	if (parts.isEmpty()) {
 		if (uploadingData.docSentParts >= uploadingData.docPartsCount) {
 			if (requestsSent.empty() && docRequestsSent.empty()) {
@@ -462,19 +393,17 @@ void Uploader::sendNext() {
 				const auto attachedStickers = uploadingData.file
 					? uploadingData.file->attachedStickers
 					: std::vector<MTPInputDocument>();
-				if (uploadingData.type() == SendMediaType::Photo) {
-					auto photoFilename = uploadingData.filename();
+				if (uploadingData.file->type == SendMediaType::Photo) {
+					auto photoFilename = uploadingData.file->filename;
 					if (!photoFilename.endsWith(u".jpg"_q, Qt::CaseInsensitive)) {
 						// Server has some extensions checking for inputMediaUploadedPhoto,
 						// so force the extension to be .jpg anyway. It doesn't matter,
 						// because the filename from inputFile is not used anywhere.
 						photoFilename += u".jpg"_q;
 					}
-					const auto md5 = uploadingData.file
-						? uploadingData.file->filemd5
-						: uploadingData.media.jpeg_md5;
+					const auto md5 = uploadingData.file->filemd5;
 					const auto file = MTP_inputFile(
-						MTP_long(uploadingData.id()),
+						MTP_long(uploadingData.file->id),
 						MTP_int(uploadingData.partsCount),
 						MTP_string(photoFilename),
 						MTP_bytes(md5));
@@ -487,34 +416,30 @@ void Uploader::sendNext() {
 						.options = options,
 						.edit = edit,
 					});
-				} else if (uploadingData.type() == SendMediaType::File
-					|| uploadingData.type() == SendMediaType::ThemeFile
-					|| uploadingData.type() == SendMediaType::Audio) {
+				} else if (uploadingData.file->type == SendMediaType::File
+					|| uploadingData.file->type == SendMediaType::ThemeFile
+					|| uploadingData.file->type == SendMediaType::Audio) {
 					QByteArray docMd5(32, Qt::Uninitialized);
 					hashMd5Hex(uploadingData.md5Hash.result(), docMd5.data());
 
 					const auto file = (uploadingData.docSize > kUseBigFilesFrom)
 						? MTP_inputFileBig(
-							MTP_long(uploadingData.id()),
+							MTP_long(uploadingData.file->id),
 							MTP_int(uploadingData.docPartsCount),
-							MTP_string(uploadingData.filename()))
+							MTP_string(uploadingData.file->filename))
 						: MTP_inputFile(
-							MTP_long(uploadingData.id()),
+							MTP_long(uploadingData.file->id),
 							MTP_int(uploadingData.docPartsCount),
-							MTP_string(uploadingData.filename()),
+							MTP_string(uploadingData.file->filename),
 							MTP_bytes(docMd5));
 					const auto thumb = [&]() -> std::optional<MTPInputFile> {
 						if (!uploadingData.partsCount) {
 							return std::nullopt;
 						}
-						const auto thumbFilename = uploadingData.file
-							? uploadingData.file->thumbname
-							: (u"thumb."_q + uploadingData.media.thumbExt);
-						const auto thumbMd5 = uploadingData.file
-							? uploadingData.file->thumbmd5
-							: uploadingData.media.jpeg_md5;
+						const auto thumbFilename = uploadingData.file->thumbname;
+						const auto thumbMd5 = uploadingData.file->thumbmd5;
 						return MTP_inputFile(
-							MTP_long(uploadingData.thumbId()),
+							MTP_long(uploadingData.file->thumbId),
 							MTP_int(uploadingData.partsCount),
 							MTP_string(thumbFilename),
 							MTP_bytes(thumbMd5));
@@ -529,10 +454,10 @@ void Uploader::sendNext() {
 						.options = options,
 						.edit = edit,
 					});
-				} else if (uploadingData.type() == SendMediaType::Secure) {
+				} else if (uploadingData.file->type == SendMediaType::Secure) {
 					_secureReady.fire({
 						uploadingId,
-						uploadingData.id(),
+						uploadingData.file->id,
 						uploadingData.partsCount });
 				}
 				queue.erase(uploadingId);
@@ -542,15 +467,11 @@ void Uploader::sendNext() {
 			return;
 		}
 
-		auto &content = uploadingData.file
-			? uploadingData.file->content
-			: uploadingData.media.data;
+		auto &content = uploadingData.file->content;
 		QByteArray toSend;
 		if (content.isEmpty()) {
 			if (!uploadingData.docFile) {
-				const auto filepath = uploadingData.file
-					? uploadingData.file->filepath
-					: uploadingData.media.file;
+				const auto filepath = uploadingData.file->filepath;
 				uploadingData.docFile = std::make_unique<QFile>(filepath);
 				if (!uploadingData.docFile->open(QIODevice::ReadOnly)) {
 					currentFailed();
@@ -565,9 +486,9 @@ void Uploader::sendNext() {
 			const auto offset = uploadingData.docSentParts
 				* uploadingData.docPartSize;
 			toSend = content.mid(offset, uploadingData.docPartSize);
-			if ((uploadingData.type() == SendMediaType::File
-				|| uploadingData.type() == SendMediaType::ThemeFile
-				|| uploadingData.type() == SendMediaType::Audio)
+			if ((uploadingData.file->type == SendMediaType::File
+				|| uploadingData.file->type == SendMediaType::ThemeFile
+				|| uploadingData.file->type == SendMediaType::Audio)
 				&& uploadingData.docSentParts <= kUseBigFilesFrom) {
 				uploadingData.md5Hash.feed(toSend.constData(), toSend.size());
 			}
@@ -581,7 +502,7 @@ void Uploader::sendNext() {
 		mtpRequestId requestId;
 		if (uploadingData.docSize > kUseBigFilesFrom) {
 			requestId = _api->request(MTPupload_SaveBigFilePart(
-				MTP_long(uploadingData.id()),
+				MTP_long(uploadingData.file->id),
 				MTP_int(uploadingData.docSentParts),
 				MTP_int(uploadingData.docPartsCount),
 				MTP_bytes(toSend)
@@ -592,7 +513,7 @@ void Uploader::sendNext() {
 			}).toDC(MTP::uploadDcId(todc)).send();
 		} else {
 			requestId = _api->request(MTPupload_SaveFilePart(
-				MTP_long(uploadingData.id()),
+				MTP_long(uploadingData.file->id),
 				MTP_int(uploadingData.docSentParts),
 				MTP_bytes(toSend)
 			)).done([=](const MTPBool &result, mtpRequestId requestId) {
@@ -723,18 +644,18 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 			}
 			sentSize -= sentPartSize;
 			sentSizes[dc] -= sentPartSize;
-			if (file.type() == SendMediaType::Photo) {
+			if (file.file->type == SendMediaType::Photo) {
 				file.fileSentSize += sentPartSize;
-				const auto photo = session().data().photo(file.id());
+				const auto photo = session().data().photo(file.file->id);
 				if (photo->uploading() && file.file) {
 					photo->uploadingData->size = file.file->partssize;
 					photo->uploadingData->offset = file.fileSentSize;
 				}
 				_photoProgress.fire_copy(fullId);
-			} else if (file.type() == SendMediaType::File
-				|| file.type() == SendMediaType::ThemeFile
-				|| file.type() == SendMediaType::Audio) {
-				const auto document = session().data().document(file.id());
+			} else if (file.file->type == SendMediaType::File
+				|| file.file->type == SendMediaType::ThemeFile
+				|| file.file->type == SendMediaType::Audio) {
+				const auto document = session().data().document(file.file->id);
 				if (document->uploading()) {
 					const auto doneParts = file.docSentParts
 						- int(docRequestsSent.size());
@@ -743,7 +664,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 						doneParts * file.docPartSize);
 				}
 				_documentProgress.fire_copy(fullId);
-			} else if (file.type() == SendMediaType::Secure) {
+			} else if (file.file->type == SendMediaType::Secure) {
 				file.fileSentSize += sentPartSize;
 				_secureProgress.fire_copy({
 					fullId,
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index 2e68307b9..4347e5c03 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -12,8 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/facade.h"
 
 class ApiWrap;
-struct FileLoadResult;
-struct SendMediaReady;
+struct FilePrepareResult;
 
 namespace Api {
 enum class SendProgressType;
@@ -58,10 +57,9 @@ public:
 		return uploadingId;
 	}
 
-	void uploadMedia(const FullMsgId &msgId, const SendMediaReady &image);
 	void upload(
 		const FullMsgId &msgId,
-		const std::shared_ptr<FileLoadResult> &file);
+		const std::shared_ptr<FilePrepareResult> &file);
 
 	void cancel(const FullMsgId &msgId);
 	void pause(const FullMsgId &msgId);
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index c26b68458..192c7c112 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -222,42 +222,6 @@ int PhotoSideLimit() {
 	return PhotoSideLimit(SendLargePhotos.value());
 }
 
-SendMediaReady::SendMediaReady(
-	SendMediaType type,
-	const QString &file,
-	const QString &filename,
-	int64 filesize,
-	const QByteArray &data,
-	const uint64 &id,
-	const uint64 &thumbId,
-	const QString &thumbExt,
-	const PeerId &peer,
-	const MTPPhoto &photo,
-	const PreparedPhotoThumbs &photoThumbs,
-	const MTPDocument &document,
-	const QByteArray &jpeg)
-: type(type)
-, file(file)
-, filename(filename)
-, filesize(filesize)
-, data(data)
-, thumbExt(thumbExt)
-, id(id)
-, thumbId(thumbId)
-, peer(peer)
-, photo(photo)
-, document(document)
-, photoThumbs(photoThumbs) {
-	if (!jpeg.isEmpty()) {
-		int32 size = jpeg.size();
-		for (int32 i = 0, part = 0; i < size; i += kPhotoUploadPartSize, ++part) {
-			parts.insert(part, jpeg.mid(i, kPhotoUploadPartSize));
-		}
-		jpeg_md5.resize(32);
-		hashMd5Hex(jpeg.constData(), jpeg.size(), jpeg_md5.data());
-	}
-}
-
 TaskQueue::TaskQueue(crl::time stopTimeoutMs) {
 	if (stopTimeoutMs > 0) {
 		_stopTimer = new QTimer(this);
@@ -455,22 +419,17 @@ SendingAlbum::Item::Item(TaskId taskId)
 : taskId(taskId) {
 }
 
-FileLoadResult::FileLoadResult(
-	TaskId taskId,
-	uint64 id,
-	const FileLoadTo &to,
-	const TextWithTags &caption,
-	bool spoiler,
-	std::shared_ptr<SendingAlbum> album)
-: taskId(taskId)
-, id(id)
-, to(to)
-, album(std::move(album))
-, caption(caption)
-, spoiler(spoiler) {
+FilePrepareResult::FilePrepareResult(FilePrepareDescriptor &&descriptor)
+: taskId(descriptor.taskId)
+, id(descriptor.id)
+, to(std::move(descriptor.to))
+, album(std::move(descriptor.album))
+, type(descriptor.type)
+, caption(std::move(descriptor.caption))
+, spoiler(descriptor.spoiler) {
 }
 
-void FileLoadResult::setFileData(const QByteArray &filedata) {
+void FilePrepareResult::setFileData(const QByteArray &filedata) {
 	if (filedata.isEmpty()) {
 		partssize = 0;
 	} else {
@@ -483,7 +442,7 @@ void FileLoadResult::setFileData(const QByteArray &filedata) {
 	}
 }
 
-void FileLoadResult::setThumbData(const QByteArray &thumbdata) {
+void FilePrepareResult::setThumbData(const QByteArray &thumbdata) {
 	if (!thumbdata.isEmpty()) {
 		thumbbytes = thumbdata;
 		int32 size = thumbdata.size();
@@ -495,6 +454,11 @@ void FileLoadResult::setThumbData(const QByteArray &thumbdata) {
 	}
 }
 
+std::shared_ptr<FilePrepareResult> MakePreparedFile(
+		FilePrepareDescriptor &&descriptor) {
+	return std::make_shared<FilePrepareResult>(std::move(descriptor));
+}
+
 FileLoadTask::FileLoadTask(
 	not_null<Main::Session*> session,
 	const QString &filepath,
@@ -710,13 +674,14 @@ bool FileLoadTask::FillImageInformation(
 }
 
 void FileLoadTask::process(Args &&args) {
-	_result = std::make_shared<FileLoadResult>(
-		id(),
-		_id,
-		_to,
-		_caption,
-		_spoiler,
-		_album);
+	_result = MakePreparedFile({
+		.taskId = id(),
+		.id = _id,
+		.to = _to,
+		.caption = _caption,
+		.spoiler = _spoiler,
+		.album = _album,
+	});
 
 	QString filename, filemime;
 	qint64 filesize = 0;
@@ -1062,7 +1027,7 @@ void FileLoadTask::finish() {
 	}
 }
 
-FileLoadResult *FileLoadTask::peekResult() const {
+FilePrepareResult *FileLoadTask::peekResult() const {
 	return _result.get();
 }
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index d2e64b536..8b3b7bca7 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -36,43 +36,8 @@ enum class SendMediaType {
 	Secure,
 };
 
-using UploadFileParts = QMap<int, QByteArray>;
-struct SendMediaReady {
-	SendMediaReady() = default; // temp
-	SendMediaReady(
-		SendMediaType type,
-		const QString &file,
-		const QString &filename,
-		int64 filesize,
-		const QByteArray &data,
-		const uint64 &id,
-		const uint64 &thumbId,
-		const QString &thumbExt,
-		const PeerId &peer,
-		const MTPPhoto &photo,
-		const PreparedPhotoThumbs &photoThumbs,
-		const MTPDocument &document,
-		const QByteArray &jpeg);
-
-	SendMediaType type;
-	QString file, filename;
-	int64 filesize = 0;
-	QByteArray data;
-	QString thumbExt;
-	uint64 id, thumbId; // id always file-id of media, thumbId is file-id of thumb ( == id for photos)
-	PeerId peer;
-
-	MTPPhoto photo;
-	MTPDocument document;
-	PreparedPhotoThumbs photoThumbs;
-	UploadFileParts parts;
-	QByteArray jpeg_md5;
-
-	QString caption;
-
-};
-
 using TaskId = void*; // no interface, just id
+inline constexpr auto kEmptyTaskId = TaskId();
 
 class Task {
 public:
@@ -144,7 +109,7 @@ struct SendingAlbum {
 	struct Item {
 		explicit Item(TaskId taskId);
 
-		TaskId taskId;
+		TaskId taskId = kEmptyTaskId;
 		uint64 randomId = 0;
 		FullMsgId msgId;
 		std::optional<MTPInputSingleMedia> media;
@@ -182,17 +147,21 @@ struct FileLoadTo {
 	MsgId replaceMediaOf;
 };
 
-struct FileLoadResult {
-	FileLoadResult(
-		TaskId taskId,
-		uint64 id,
-		const FileLoadTo &to,
-		const TextWithTags &caption,
-		bool spoiler,
-		std::shared_ptr<SendingAlbum> album);
+using UploadFileParts = QMap<int, QByteArray>;
+struct FilePrepareDescriptor {
+	TaskId taskId = kEmptyTaskId;
+	base::required<uint64> id;
+	SendMediaType type = SendMediaType::File;
+	FileLoadTo to = { PeerId(), Api::SendOptions(), FullReplyTo(), MsgId() };
+	TextWithTags caption;
+	bool spoiler = false;
+	std::shared_ptr<SendingAlbum> album;
+};
+struct FilePrepareResult {
+	explicit FilePrepareResult(FilePrepareDescriptor &&descriptor);
 
-	TaskId taskId;
-	uint64 id;
+	TaskId taskId = kEmptyTaskId;
+	uint64 id = 0;
 	FileLoadTo to;
 	std::shared_ptr<SendingAlbum> album;
 	SendMediaType type = SendMediaType::File;
@@ -216,8 +185,8 @@ struct FileLoadResult {
 	QImage goodThumbnail;
 	QByteArray goodThumbnailBytes;
 
-	MTPPhoto photo;
-	MTPDocument document;
+	MTPPhoto photo = MTP_photoEmpty(MTP_long(0));
+	MTPDocument document = MTP_documentEmpty(MTP_long(0));
 
 	PreparedPhotoThumbs photoThumbs;
 	TextWithTags caption;
@@ -230,6 +199,9 @@ struct FileLoadResult {
 
 };
 
+[[nodiscard]] std::shared_ptr<FilePrepareResult> MakePreparedFile(
+	FilePrepareDescriptor &&descriptor);
+
 class FileLoadTask final : public Task {
 public:
 	static std::unique_ptr<Ui::PreparedFileInformation> ReadMediaInformation(
@@ -276,7 +248,7 @@ public:
 	}
 	void finish() override;
 
-	FileLoadResult *peekResult() const;
+	FilePrepareResult *peekResult() const;
 
 private:
 	static bool CheckForSong(
@@ -312,6 +284,6 @@ private:
 	TextWithTags _caption;
 	bool _spoiler = false;
 
-	std::shared_ptr<FileLoadResult> _result;
+	std::shared_ptr<FilePrepareResult> _result;
 
 };
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 7409a95ee..b225b321e 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -585,11 +585,11 @@ void ChatBackground::checkUploadWallPaper() {
 	}
 
 	const auto ready = PrepareWallPaper(_session->mainDcId(), _original);
-	const auto documentId = ready.id;
+	const auto documentId = ready->id;
 	_wallPaperUploadId = FullMsgId(
 		_session->userPeerId(),
 		_session->data().nextLocalMessageId());
-	_session->uploader().uploadMedia(_wallPaperUploadId, ready);
+	_session->uploader().upload(_wallPaperUploadId, ready);
 	if (_wallPaperUploadLifetime) {
 		return;
 	}
@@ -1529,7 +1529,9 @@ bool ReadPaletteValues(const QByteArray &content, Fn<bool(QLatin1String name, QL
 	};
 }
 
-SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
+std::shared_ptr<FilePrepareResult> PrepareWallPaper(
+		MTP::DcId dcId,
+		const QImage &image) {
 	PreparedPhotoThumbs thumbnails;
 	QVector<MTPPhotoSize> sizes;
 
@@ -1555,6 +1557,7 @@ SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
 	};
 	push("s", scaled(320));
 
+	const auto id = base::RandomValue<DocumentId>();
 	const auto filename = u"wallpaper.jpg"_q;
 	auto attributes = QVector<MTPDocumentAttribute>(
 		1,
@@ -1562,8 +1565,20 @@ SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
 	attributes.push_back(MTP_documentAttributeImageSize(
 		MTP_int(image.width()),
 		MTP_int(image.height())));
-	const auto id = base::RandomValue<DocumentId>();
-	const auto document = MTP_document(
+
+	auto result = MakePreparedFile({
+		.id = id,
+		.type = SendMediaType::ThemeFile,
+	});
+	result->filename = filename;
+	result->content = jpeg;
+	result->filesize = jpeg.size();
+	result->setFileData(jpeg);
+	if (thumbnails.empty()) {
+		result->thumb = thumbnails.front().second.image;
+		result->thumbbytes = thumbnails.front().second.bytes;
+	}
+	result->document = MTP_document(
 		MTP_flags(0),
 		MTP_long(id),
 		MTP_long(0),
@@ -1575,21 +1590,7 @@ SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId),
 		MTP_vector<MTPDocumentAttribute>(attributes));
-
-	return SendMediaReady(
-		SendMediaType::ThemeFile,
-		QString(), // filepath
-		filename,
-		jpeg.size(),
-		jpeg,
-		id,
-		0,
-		QString(),
-		PeerId(),
-		MTP_photoEmpty(MTP_long(0)),
-		thumbnails,
-		document,
-		QByteArray());
+	return result;
 }
 
 std::unique_ptr<Ui::ChatTheme> DefaultChatThemeOn(rpl::lifetime &lifetime) {
diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h
index 1425e4d07..b0497fb0c 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.h
+++ b/Telegram/SourceFiles/window/themes/window_theme.h
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/style/style_core_palette.h"
 
 class QFileSystemWatcher;
-struct SendMediaReady;
+struct FilePrepareResult;
 
 namespace style {
 struct colorizer;
@@ -298,7 +298,7 @@ private:
 
 };
 
-[[nodiscard]] SendMediaReady PrepareWallPaper(
+[[nodiscard]] std::shared_ptr<FilePrepareResult> PrepareWallPaper(
 	MTP::DcId dcId,
 	const QImage &image);
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
index d448ca185..c430b3e28 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
@@ -385,7 +385,7 @@ bool CopyColorsToPalette(
 	});
 }
 
-SendMediaReady PrepareThemeMedia(
+std::shared_ptr<FilePrepareResult> PrepareThemeMedia(
 		MTP::DcId dcId,
 		const QString &name,
 		const QByteArray &content) {
@@ -403,28 +403,29 @@ SendMediaReady PrepareThemeMedia(
 		thumbnail.save(&buffer, "JPG", 87);
 	}
 
-	const auto push = [&](
-			const char *type,
-			QImage &&image,
-			QByteArray bytes = QByteArray()) {
-		sizes.push_back(MTP_photoSize(
-			MTP_string(type),
-			MTP_int(image.width()),
-			MTP_int(image.height()), MTP_int(0)));
-		thumbnails.emplace(type[0], PreparedPhotoThumb{
-			.image = std::move(image),
-			.bytes = std::move(bytes)
-		});
-	};
-	push("s", std::move(thumbnail), thumbnailBytes);
+	sizes.push_back(MTP_photoSize(
+		MTP_string("s"),
+		MTP_int(thumbnail.width()),
+		MTP_int(thumbnail.height()), MTP_int(0)));
 
+	const auto id = base::RandomValue<DocumentId>();
 	const auto filename = base::FileNameFromUserString(name)
 		+ u".tdesktop-theme"_q;
 	auto attributes = QVector<MTPDocumentAttribute>(
 		1,
 		MTP_documentAttributeFilename(MTP_string(filename)));
-	const auto id = base::RandomValue<DocumentId>();
-	const auto document = MTP_document(
+
+	auto result = MakePreparedFile({
+		.id = id,
+		.type = SendMediaType::ThemeFile,
+	});
+	result->filename = filename;
+	result->content = content;
+	result->filesize = content.size();
+	result->thumb = thumbnail;
+	result->thumbname = "thumb.jpg";
+	result->setThumbData(thumbnailBytes);
+	result->document = MTP_document(
 		MTP_flags(0),
 		MTP_long(id),
 		MTP_long(0),
@@ -436,21 +437,7 @@ SendMediaReady PrepareThemeMedia(
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId),
 		MTP_vector<MTPDocumentAttribute>(attributes));
-
-	return SendMediaReady(
-		SendMediaType::ThemeFile,
-		QString(), // filepath
-		filename,
-		content.size(),
-		content,
-		id,
-		0,
-		QString(),
-		PeerId(),
-		MTP_photoEmpty(MTP_long(0)),
-		thumbnails,
-		document,
-		thumbnailBytes);
+	return result;
 }
 
 Fn<void()> SavePreparedTheme(
@@ -570,7 +557,7 @@ Fn<void()> SavePreparedTheme(
 			session->mainDcId(),
 			fields.title,
 			theme);
-		state->filename = media.filename;
+		state->filename = media->filename;
 		state->themeContent = theme;
 
 		session->uploader().documentReady(
@@ -580,7 +567,7 @@ Fn<void()> SavePreparedTheme(
 			uploadTheme(data);
 		}, state->lifetime);
 
-		session->uploader().uploadMedia(state->id, media);
+		session->uploader().upload(state->id, media);
 	};
 
 	const auto save = [=] {
@@ -999,12 +986,15 @@ ParsedTheme ParseTheme(
 [[nodiscard]] QString GenerateSlug() {
 	const auto letters = uint8('Z' + 1 - 'A');
 	const auto digits = uint8('9' + 1 - '0');
+	const auto firstValues = uint8(2 * letters);
 	const auto values = uint8(2 * letters + digits);
 
 	auto result = QString();
 	result.reserve(kRandomSlugSize);
 	for (auto i = 0; i != kRandomSlugSize; ++i) {
-		const auto value = base::RandomValue<uint8>() % values;
+		const auto value = i
+			? (base::RandomValue<uint8>() % values)
+			: (base::RandomValue<uint8>() % firstValues);
 		if (value < letters) {
 			result.append(char('A' + value));
 		} else if (value < 2 * letters) {

From aaaeea297927211fe4e5ea09ce76b324eae24920 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 3 Apr 2024 12:39:08 +0400
Subject: [PATCH 215/596] Use plain vector for prepared upload parts.

---
 Telegram/SourceFiles/storage/file_upload.cpp  | 160 ++++++++----------
 Telegram/SourceFiles/storage/file_upload.h    |  14 +-
 .../SourceFiles/storage/localimageloader.cpp  |   8 +-
 .../SourceFiles/storage/localimageloader.h    |   2 +-
 4 files changed, 88 insertions(+), 96 deletions(-)

diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index e0c7f8b57..b19af82df 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -65,7 +65,10 @@ struct Uploader::File {
 	bool setPartSize(uint32 partSize);
 
 	std::shared_ptr<FilePrepareResult> file;
-	int32 partsCount = 0;
+	const std::vector<QByteArray> &parts;
+	const uint64 partsOfId = 0;
+	int partsSent = 0;
+
 	mutable int64 fileSentSize = 0;
 
 	HashMd5 md5Hash;
@@ -79,11 +82,15 @@ struct Uploader::File {
 };
 
 Uploader::File::File(const std::shared_ptr<FilePrepareResult> &file)
-: file(file) {
-	partsCount = (file->type == SendMediaType::Photo
-		|| file->type == SendMediaType::Secure)
-		? file->fileparts.size()
-		: file->thumbparts.size();
+: file(file)
+, parts((file->type == SendMediaType::Photo
+	|| file->type == SendMediaType::Secure)
+		? file->fileparts
+		: file->thumbparts)
+, partsOfId((file->type == SendMediaType::Photo
+	|| file->type == SendMediaType::Secure)
+		? file->id
+		: file->thumbId) {
 	if (file->type == SendMediaType::File
 		|| file->type == SendMediaType::ThemeFile
 		|| file->type == SendMediaType::Audio) {
@@ -174,7 +181,7 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 
 	_api->instance().nonPremiumDelayedRequests(
 	) | rpl::start_with_next([=](mtpRequestId id) {
-		if (dcMap.contains(id)) {
+		if (_dcIndices.contains(id)) {
 			_nonPremiumDelayed.emplace(id);
 		}
 	}, _lifetime);
@@ -299,7 +306,7 @@ void Uploader::upload(
 }
 
 void Uploader::currentFailed() {
-	auto j = queue.find(uploadingId);
+	auto j = queue.find(_uploadingId);
 	if (j != queue.end()) {
 		const auto [msgId, file] = std::move(*j);
 		queue.erase(j);
@@ -307,11 +314,11 @@ void Uploader::currentFailed() {
 	}
 
 	cancelRequests();
-	dcMap.clear();
-	uploadingId = FullMsgId();
-	sentSize = 0;
+	_dcIndices.clear();
+	_uploadingId = FullMsgId();
+	_sentTotal = 0;
 	for (int i = 0; i < MTP::kUploadSessionsCount; ++i) {
-		sentSizes[i] = 0;
+		_sentPerDc[i] = 0;
 	}
 
 	sendNext();
@@ -343,7 +350,7 @@ void Uploader::stopSessions() {
 }
 
 void Uploader::sendNext() {
-	if (sentSize >= kMaxUploadFileParallelSize || _pausedId.msg) {
+	if (_sentTotal >= kMaxUploadFileParallelSize || _pausedId.msg) {
 		return;
 	}
 
@@ -358,33 +365,25 @@ void Uploader::sendNext() {
 	if (stopping) {
 		_stopSessionsTimer.cancel();
 	}
-	auto i = uploadingId.msg ? queue.find(uploadingId) : queue.begin();
-	if (!uploadingId.msg) {
-		uploadingId = i->first;
+	auto i = _uploadingId.msg ? queue.find(_uploadingId) : queue.begin();
+	if (!_uploadingId.msg) {
+		_uploadingId = i->first;
 	} else if (i == queue.end()) {
 		i = queue.begin();
-		uploadingId = i->first;
+		_uploadingId = i->first;
 	}
 	auto &uploadingData = i->second;
 
 	auto todc = 0;
 	for (auto dc = 1; dc != MTP::kUploadSessionsCount; ++dc) {
-		if (sentSizes[dc] < sentSizes[todc]) {
+		if (_sentPerDc[dc] < _sentPerDc[todc]) {
 			todc = dc;
 		}
 	}
 
-	auto &parts = (uploadingData.file->type == SendMediaType::Photo
-		|| uploadingData.file->type == SendMediaType::Secure)
-		? uploadingData.file->fileparts
-		: uploadingData.file->thumbparts;
-	const auto partsOfId = (uploadingData.file->type == SendMediaType::Photo
-		|| uploadingData.file->type == SendMediaType::Secure)
-		? uploadingData.file->id
-		: uploadingData.file->thumbId;
-	if (parts.isEmpty()) {
+	if (uploadingData.partsSent >= uploadingData.parts.size()) {
 		if (uploadingData.docSentParts >= uploadingData.docPartsCount) {
-			if (requestsSent.empty() && docRequestsSent.empty()) {
+			if (_sentSizes.empty()) {
 				const auto options = uploadingData.file
 					? uploadingData.file->to.options
 					: Api::SendOptions();
@@ -404,11 +403,11 @@ void Uploader::sendNext() {
 					const auto md5 = uploadingData.file->filemd5;
 					const auto file = MTP_inputFile(
 						MTP_long(uploadingData.file->id),
-						MTP_int(uploadingData.partsCount),
+						MTP_int(uploadingData.parts.size()),
 						MTP_string(photoFilename),
 						MTP_bytes(md5));
 					_photoReady.fire({
-						.fullId = uploadingId,
+						.fullId = _uploadingId,
 						.info = {
 							.file = file,
 							.attachedStickers = attachedStickers,
@@ -433,19 +432,19 @@ void Uploader::sendNext() {
 							MTP_string(uploadingData.file->filename),
 							MTP_bytes(docMd5));
 					const auto thumb = [&]() -> std::optional<MTPInputFile> {
-						if (!uploadingData.partsCount) {
+						if (uploadingData.parts.empty()) {
 							return std::nullopt;
 						}
 						const auto thumbFilename = uploadingData.file->thumbname;
 						const auto thumbMd5 = uploadingData.file->thumbmd5;
 						return MTP_inputFile(
 							MTP_long(uploadingData.file->thumbId),
-							MTP_int(uploadingData.partsCount),
+							MTP_int(uploadingData.parts.size()),
 							MTP_string(thumbFilename),
 							MTP_bytes(thumbMd5));
 					}();
 					_documentReady.fire({
-						.fullId = uploadingId,
+						.fullId = _uploadingId,
 						.info = {
 							.file = file,
 							.thumb = thumb,
@@ -456,12 +455,13 @@ void Uploader::sendNext() {
 					});
 				} else if (uploadingData.file->type == SendMediaType::Secure) {
 					_secureReady.fire({
-						uploadingId,
+						_uploadingId,
 						uploadingData.file->id,
-						uploadingData.partsCount });
+						int(uploadingData.parts.size()),
+					});
 				}
-				queue.erase(uploadingId);
-				uploadingId = FullMsgId();
+				queue.erase(_uploadingId);
+				_uploadingId = FullMsgId();
 				sendNext();
 			}
 			return;
@@ -522,36 +522,37 @@ void Uploader::sendNext() {
 				partFailed(error, requestId);
 			}).toDC(MTP::uploadDcId(todc)).send();
 		}
-		docRequestsSent.emplace(requestId, uploadingData.docSentParts);
-		dcMap.emplace(requestId, todc);
-		sentSize += uploadingData.docPartSize;
-		sentSizes[todc] += uploadingData.docPartSize;
+		_sentSizes.emplace(requestId, uploadingData.docPartSize);
+		_docSentRequests.emplace(requestId);
+		_dcIndices.emplace(requestId, todc);
+		_sentTotal += uploadingData.docPartSize;
+		_sentPerDc[todc] += uploadingData.docPartSize;
 
 		uploadingData.docSentParts++;
 	} else {
-		auto part = parts.begin();
+		const auto index = uploadingData.partsSent++;
+		const auto partBytes = uploadingData.parts[index];
+		const auto partSize = int(partBytes.size());
 
 		const auto requestId = _api->request(MTPupload_SaveFilePart(
-			MTP_long(partsOfId),
-			MTP_int(part.key()),
-			MTP_bytes(part.value())
+			MTP_long(uploadingData.partsOfId),
+			MTP_int(index),
+			MTP_bytes(partBytes)
 		)).done([=](const MTPBool &result, mtpRequestId requestId) {
 			partLoaded(result, requestId);
 		}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
 			partFailed(error, requestId);
 		}).toDC(MTP::uploadDcId(todc)).send();
-		requestsSent.emplace(requestId, part.value());
-		dcMap.emplace(requestId, todc);
-		sentSize += part.value().size();
-		sentSizes[todc] += part.value().size();
-
-		parts.erase(part);
+		_sentSizes.emplace(requestId, partSize);
+		_dcIndices.emplace(requestId, todc);
+		_sentTotal += partSize;
+		_sentPerDc[todc] += partSize;
 	}
 	_nextTimer.callOnce(kUploadRequestInterval);
 }
 
 void Uploader::cancel(const FullMsgId &msgId) {
-	if (uploadingId == msgId) {
+	if (_uploadingId == msgId) {
 		currentFailed();
 	} else {
 		queue.erase(msgId);
@@ -559,12 +560,12 @@ void Uploader::cancel(const FullMsgId &msgId) {
 }
 
 void Uploader::cancelAll() {
-	const auto single = queue.empty() ? uploadingId : queue.begin()->first;
+	const auto single = queue.empty() ? _uploadingId : queue.begin()->first;
 	if (!single) {
 		return;
 	}
 	_pausedId = single;
-	if (uploadingId) {
+	if (_uploadingId) {
 		currentFailed();
 	}
 	while (!queue.empty()) {
@@ -589,61 +590,49 @@ void Uploader::confirm(const FullMsgId &msgId) {
 }
 
 void Uploader::cancelRequests() {
-	for (const auto &requestData : requestsSent) {
+	_docSentRequests.clear();
+	for (const auto &requestData : _sentSizes) {
 		_api->request(requestData.first).cancel();
 	}
-	requestsSent.clear();
-	for (const auto &requestData : docRequestsSent) {
-		_api->request(requestData.first).cancel();
-	}
-	docRequestsSent.clear();
+	_sentSizes.clear();
 }
 
 void Uploader::clear() {
 	queue.clear();
 	cancelRequests();
-	dcMap.clear();
-	sentSize = 0;
+	_dcIndices.clear();
+	_sentTotal = 0;
 	for (int i = 0; i < MTP::kUploadSessionsCount; ++i) {
 		_api->instance().stopSession(MTP::uploadDcId(i));
-		sentSizes[i] = 0;
+		_sentPerDc[i] = 0;
 	}
 	_stopSessionsTimer.cancel();
 }
 
 void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
-	auto j = docRequestsSent.end();
-	auto i = requestsSent.find(requestId);
-	if (i == requestsSent.cend()) {
-		j = docRequestsSent.find(requestId);
-	}
+	_docSentRequests.remove(requestId);
+	auto i = _sentSizes.find(requestId);
 	const auto wasNonPremiumDelayed = _nonPremiumDelayed.remove(requestId);
-	if (i != requestsSent.cend() || j != docRequestsSent.cend()) {
+	if (i != _sentSizes.cend()) {
 		if (mtpIsFalse(result)) { // failed to upload current file
 			currentFailed();
 			return;
 		} else {
-			auto dcIt = dcMap.find(requestId);
-			if (dcIt == dcMap.cend()) { // must not happen
+			auto dcIt = _dcIndices.find(requestId);
+			if (dcIt == _dcIndices.cend()) { // must not happen
 				currentFailed();
 				return;
 			}
 			auto dc = dcIt->second;
-			dcMap.erase(dcIt);
+			_dcIndices.erase(dcIt);
 
-			int64 sentPartSize = 0;
-			auto k = queue.find(uploadingId);
+			int64 sentPartSize = i->second;
+			auto k = queue.find(_uploadingId);
 			Assert(k != queue.cend());
 			auto &[fullId, file] = *k;
-			if (i != requestsSent.cend()) {
-				sentPartSize = i->second.size();
-				requestsSent.erase(i);
-			} else {
-				sentPartSize = file.docPartSize;
-				docRequestsSent.erase(j);
-			}
-			sentSize -= sentPartSize;
-			sentSizes[dc] -= sentPartSize;
+			_sentSizes.erase(i);
+			_sentTotal -= sentPartSize;
+			_sentPerDc[dc] -= sentPartSize;
 			if (file.file->type == SendMediaType::Photo) {
 				file.fileSentSize += sentPartSize;
 				const auto photo = session().data().photo(file.file->id);
@@ -658,7 +647,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 				const auto document = session().data().document(file.file->id);
 				if (document->uploading()) {
 					const auto doneParts = file.docSentParts
-						- int(docRequestsSent.size());
+						- int(_docSentRequests.size());
 					document->uploadingData->offset = std::min(
 						document->uploadingData->size,
 						doneParts * file.docPartSize);
@@ -683,8 +672,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 void Uploader::partFailed(const MTP::Error &error, mtpRequestId requestId) {
 	// failed to upload current file
 	_nonPremiumDelayed.remove(requestId);
-	if ((requestsSent.find(requestId) != requestsSent.cend())
-		|| (docRequestsSent.find(requestId) != docRequestsSent.cend())) {
+	if (_sentSizes.find(requestId) != _sentSizes.cend()) {
 		currentFailed();
 	}
 	sendNext();
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index 4347e5c03..a733775ad 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -54,7 +54,7 @@ public:
 	[[nodiscard]] Main::Session &session() const;
 
 	[[nodiscard]] FullMsgId currentUploadId() const {
-		return uploadingId;
+		return _uploadingId;
 	}
 
 	void upload(
@@ -125,14 +125,14 @@ private:
 		int progress = 0);
 
 	const not_null<ApiWrap*> _api;
-	base::flat_map<mtpRequestId, QByteArray> requestsSent;
-	base::flat_map<mtpRequestId, int32> docRequestsSent;
-	base::flat_map<mtpRequestId, int32> dcMap;
+	base::flat_map<mtpRequestId, int> _sentSizes;
+	base::flat_set<mtpRequestId> _docSentRequests;
+	base::flat_map<mtpRequestId, int> _dcIndices;
 	base::flat_set<mtpRequestId> _nonPremiumDelayed;
-	uint32 sentSize = 0; // FileSize: Right now any file size fits 32 bit.
-	uint32 sentSizes[MTP::kUploadSessionsCount] = { 0 };
+	uint32 _sentTotal = 0; // FileSize: Right now any file size fits 32 bit.
+	uint32 _sentPerDc[MTP::kUploadSessionsCount] = { 0 };
 
-	FullMsgId uploadingId;
+	FullMsgId _uploadingId;
 	FullMsgId _pausedId;
 	std::map<FullMsgId, File> queue;
 	base::Timer _nextTimer, _stopSessionsTimer;
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 192c7c112..59f2fb505 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -434,8 +434,10 @@ void FilePrepareResult::setFileData(const QByteArray &filedata) {
 		partssize = 0;
 	} else {
 		partssize = filedata.size();
+		fileparts.reserve(
+			(partssize + kPhotoUploadPartSize - 1) / kPhotoUploadPartSize);
 		for (int32 i = 0, part = 0; i < partssize; i += kPhotoUploadPartSize, ++part) {
-			fileparts.insert(part, filedata.mid(i, kPhotoUploadPartSize));
+			fileparts.push_back(filedata.mid(i, kPhotoUploadPartSize));
 		}
 		filemd5.resize(32);
 		hashMd5Hex(filedata.constData(), filedata.size(), filemd5.data());
@@ -446,8 +448,10 @@ void FilePrepareResult::setThumbData(const QByteArray &thumbdata) {
 	if (!thumbdata.isEmpty()) {
 		thumbbytes = thumbdata;
 		int32 size = thumbdata.size();
+		thumbparts.reserve(
+			(size + kPhotoUploadPartSize - 1) / kPhotoUploadPartSize);
 		for (int32 i = 0, part = 0; i < size; i += kPhotoUploadPartSize, ++part) {
-			thumbparts.insert(part, thumbdata.mid(i, kPhotoUploadPartSize));
+			thumbparts.push_back(thumbdata.mid(i, kPhotoUploadPartSize));
 		}
 		thumbmd5.resize(32);
 		hashMd5Hex(thumbdata.constData(), thumbdata.size(), thumbmd5.data());
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index 8b3b7bca7..2756ac244 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -147,7 +147,7 @@ struct FileLoadTo {
 	MsgId replaceMediaOf;
 };
 
-using UploadFileParts = QMap<int, QByteArray>;
+using UploadFileParts = std::vector<QByteArray>;
 struct FilePrepareDescriptor {
 	TaskId taskId = kEmptyTaskId;
 	base::required<uint64> id;

From e2a0483b9ffec256faad962fc42f75b13d0c0b53 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 3 Apr 2024 19:09:00 +0400
Subject: [PATCH 216/596] Enable artifacts for GH actions

---
 .github/workflows/linux.yml        | 2 +-
 .github/workflows/mac.yml          | 2 +-
 .github/workflows/mac_packaged.yml | 2 +-
 .github/workflows/snap.yml         | 2 +-
 .github/workflows/win.yml          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index fe6d3752c..e7a19397f 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -52,7 +52,7 @@ jobs:
           - "DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION"
 
     env:
-      UPLOAD_ARTIFACT: "false"
+      UPLOAD_ARTIFACT: "true"
 
     steps:
       - name: Get repository name.
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 61561be9f..8271664c0 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -47,7 +47,7 @@ jobs:
         defines:
           - ""
     env:
-      UPLOAD_ARTIFACT: "false"
+      UPLOAD_ARTIFACT: "true"
       ONLY_CACHE: "false"
       PREPARE_PATH: "Telegram/build/prepare/prepare.py"
 
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index 51ba9917a..8ed4ffca1 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -50,7 +50,7 @@ jobs:
     env:
       GIT: "https://github.com"
       OPENALDIR: "/usr/local/opt/openal-soft"
-      UPLOAD_ARTIFACT: "false"
+      UPLOAD_ARTIFACT: "true"
       ONLY_CACHE: "false"
       MANUAL_CACHING: "1"
       AUTO_CACHING: "1"
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index c2e5dbafe..0c2bc4148 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     env:
-      UPLOAD_ARTIFACT: "false"
+      UPLOAD_ARTIFACT: "true"
 
     steps:
       - name: Clone.
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index b42906c7c..f8332c36f 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -50,7 +50,7 @@ jobs:
         generator: ["", "Ninja Multi-Config"]
 
     env:
-      UPLOAD_ARTIFACT: "false"
+      UPLOAD_ARTIFACT: "true"
       ONLY_CACHE: "false"
       PREPARE_PATH: "Telegram/build/prepare/prepare.py"
 

From b09cede0081aabf9b014d5adbb6ab28ce34bc5e9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 3 Apr 2024 22:04:18 +0400
Subject: [PATCH 217/596] Fix uploading artifact on Linux

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

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index e7a19397f..4eaf2ec22 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -115,8 +115,8 @@ jobs:
         if: env.UPLOAD_ARTIFACT == 'true'
         run: |
           cd $REPO_NAME/out/Debug
-          mkdir artifact
-          mv {Telegram,Updater} artifact/
+          sudo mkdir artifact
+          sudo mv {Telegram,Updater} artifact/
       - uses: actions/upload-artifact@master
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.

From 776e80b4d6a24375ba5d3e8086458d62549f1557 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Wed, 3 Apr 2024 00:15:45 +0300
Subject: [PATCH 218/596] Fix tdesktop 4.15.6 build on OpenBSD

7.5-current with clang 16.0.6 and Qt6 fails, not entirely sure why...
---
 .../SourceFiles/platform/linux/notifications_manager_linux.cpp   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 1242c751f..0ea48a7de 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -37,6 +37,7 @@ namespace Notifications {
 namespace {
 
 using namespace gi::repository;
+namespace GObject = gi::repository::GObject;
 
 constexpr auto kService = "org.freedesktop.Notifications";
 constexpr auto kObjectPath = "/org/freedesktop/Notifications";

From 53b75c8ea4f98a79285040ccf21f599166e38141 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Wed, 3 Apr 2024 20:44:29 +0300
Subject: [PATCH 219/596] update lib_base to include OpenBSD fix

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index f95154033..8d4b2efa0 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit f95154033c670cf786fce82b005abde8a5d3922f
+Subproject commit 8d4b2efa0024016c6a6f6b4d8f1dfc3d62bafddc

From 154753c73205309b38b57af7ded618e83616f3af Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 3 Apr 2024 17:35:51 +0300
Subject: [PATCH 220/596] Removed migrated groups from list of user's own
 groups.

---
 Telegram/SourceFiles/window/window_main_menu.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index d5c2d3fce..c49afd1a9 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -117,7 +117,9 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 	button->setAcceptBoth(true);
 
 	const auto myChannelsBox = [=](not_null<Ui::GenericBox*> box) {
-		box->setTitle(tr::lng_notification_channels());
+		box->setTitle(chats
+			? tr::lng_notification_groups()
+			: tr::lng_notification_channels());
 
 		const auto st = box->lifetime().make_state<style::UserpicButton>(
 			st::defaultUserpicButton);
@@ -191,10 +193,16 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 
 		const auto &data = controller->session().data();
 		if (chats) {
+			auto ids = std::vector<PeerId>();
 			data.enumerateGroups([&](not_null<PeerData*> peer) {
+				peer = peer->migrateToOrMe();
 				const auto c = peer->asChannel();
 				const auto g = peer->asChat();
+				if (ranges::contains(ids, peer->id)) {
+					return;
+				}
 				if ((c && c->amCreator()) || (g && g->amCreator())) {
+					ids.push_back(peer->id);
 					add(peer);
 				}
 			});

From e32de38d040be8bb01513f8a8ca0483b22b58c71 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 3 Apr 2024 17:43:41 +0300
Subject: [PATCH 221/596] Added url to learn more about monetization to
 langpack.

---
 Telegram/Resources/langs/lang.strings                           | 1 +
 .../info/channel_statistics/earn/info_earn_inner_widget.cpp     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1dbe16fbb..fabd9238f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5050,6 +5050,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_learn_coin_title" = "What is {emoji} TON?";
 "lng_channel_earn_learn_coin_about" = "TON is a blockchain platform and cryptocurrency that Telegram uses for its high speed and low commissions on transactions. {link}";
 "lng_channel_earn_learn_close" = "Got it";
+"lng_channel_earn_learn_coin_link" = "https://telegram.org/blog/monetization-for-channels";
 "lng_channel_earn_chart_top_hours" = "Ad impressions";
 "lng_channel_earn_chart_revenue" = "Ad revenue";
 "lng_channel_earn_chart_overriden_detail_currency" = "Revenue in TON";
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 494f58f9a..19857a5ea 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -77,7 +77,7 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
 [[nodiscard]] ClickHandlerPtr LearnMoreCurrencyLink(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::GenericBox*> box) {
-	const auto url = u"https://telegram.org/blog/monetization-for-channels"_q;
+	const auto url = tr::lng_channel_earn_learn_coin_link(tr::now);
 
 	using Resolver = HistoryView::Controls::WebpageResolver;
 	const auto resolver = box->lifetime().make_state<Resolver>(

From d675e31a510a5d6c38f5c386aba6b44348d594d5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 3 Apr 2024 18:37:26 +0300
Subject: [PATCH 222/596] Fixed display of integer numbers in channel earn
 section.

---
 .../SourceFiles/info/channel_statistics/earn/earn_format.cpp   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
index e79fa89ce..ea470af93 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
@@ -12,6 +12,7 @@ namespace Info::ChannelEarn {
 using EarnInt = Data::EarnInt;
 
 constexpr auto kMinorPartLength = 9;
+constexpr auto kMaxChoppedZero = kMinorPartLength - 2;
 constexpr auto kZero = QChar('0');
 constexpr auto kDot = QChar('.');
 
@@ -35,7 +36,7 @@ QString MinorPart(EarnInt value) {
 	auto ch = end - 1;
 	auto zeroCount = 0;
 	while (ch != begin) {
-		if ((*ch) == kZero) {
+		if (((*ch) == kZero) && (zeroCount < kMaxChoppedZero)) {
 			zeroCount++;
 		} else {
 			break;

From 2a388ae4b2d321012551cfc84218069200b6bd17 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 3 Apr 2024 19:28:00 +0300
Subject: [PATCH 223/596] Improved FAQ buttons with opening link in instant
 view.

---
 Telegram/CMakeLists.txt                       |  2 +
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/data/data_birthday.cpp   |  1 -
 Telegram/SourceFiles/data/data_faq.cpp        | 53 +++++++++++++++++++
 Telegram/SourceFiles/data/data_faq.h          | 27 ++++++++++
 Telegram/SourceFiles/data/data_session.h      |  5 ++
 .../SourceFiles/settings/settings_intro.cpp   | 11 +++-
 .../SourceFiles/settings/settings_main.cpp    | 37 +++++--------
 Telegram/SourceFiles/settings/settings_main.h |  3 --
 9 files changed, 109 insertions(+), 31 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_faq.cpp
 create mode 100644 Telegram/SourceFiles/data/data_faq.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 4988f34b3..97337d1a4 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -508,6 +508,8 @@ PRIVATE
     data/data_drafts.h
     data/data_emoji_statuses.cpp
     data/data_emoji_statuses.h
+    data/data_faq.cpp
+    data/data_faq.h
     data/data_folder.cpp
     data/data_folder.h
     data/data_forum.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index fabd9238f..74b1518ab 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1068,6 +1068,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_faq_button" = "Go to FAQ";
 "lng_settings_ask_ok" = "Ask a Volunteer";
 "lng_settings_faq" = "Telegram FAQ";
+"lng_settings_faq_link" = "https://telegram.org/faq#general-questions";
 "lng_settings_features" = "Telegram Features";
 "lng_settings_logout" = "Log Out";
 "lng_sure_logout" = "Are you sure you want to log out?";
diff --git a/Telegram/SourceFiles/data/data_birthday.cpp b/Telegram/SourceFiles/data/data_birthday.cpp
index 65707664f..34a2b0737 100644
--- a/Telegram/SourceFiles/data/data_birthday.cpp
+++ b/Telegram/SourceFiles/data/data_birthday.cpp
@@ -127,4 +127,3 @@ rpl::producer<bool> IsBirthdayTodayValue(Birthday date) {
 }
 
 } // namespace Data
-
diff --git a/Telegram/SourceFiles/data/data_faq.cpp b/Telegram/SourceFiles/data/data_faq.cpp
new file mode 100644
index 000000000..97ef86459
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_faq.cpp
@@ -0,0 +1,53 @@
+/*
+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_faq.h"
+
+#include "apiwrap.h"
+#include "core/application.h"
+#include "data/data_session.h"
+#include "data/data_web_page.h"
+#include "iv/iv_instance.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "main/session/session_show.h"
+#include "ui/basic_click_handlers.h"
+
+namespace Data {
+
+void Faq::open(std::shared_ptr<Main::SessionShow> show) {
+	if (!_id) {
+		show->session().api().request(MTPmessages_GetWebPage(
+			MTP_string(tr::lng_settings_faq_link(tr::now)),
+			MTP_int(0)
+		)).done([=](const MTPmessages_WebPage &result) {
+			show->session().data().processUsers(result.data().vusers());
+			show->session().data().processChats(result.data().vchats());
+			const auto page = show->session().data().processWebpage(
+				result.data().vwebpage());
+			if (page && page->iv) {
+				_id = page->id;
+				open(show);
+			} else {
+				UrlClickHandler::Open(tr::lng_settings_faq_link(tr::now));
+			}
+		}).fail([=] {
+			UrlClickHandler::Open(tr::lng_settings_faq_link(tr::now));
+		}).send();
+	} else {
+		const auto page = show->session().data().webpage(_id);
+		if (page && page->iv) {
+			const auto parts = tr::lng_settings_faq_link(tr::now).split('#');
+			const auto hash = (parts.size() > 1) ? parts[1] : u""_q;
+			Core::App().iv().show(show, page->iv.get(), hash);
+		} else {
+			UrlClickHandler::Open(tr::lng_settings_faq_link(tr::now));
+		}
+	}
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_faq.h b/Telegram/SourceFiles/data/data_faq.h
new file mode 100644
index 000000000..7e0179c3b
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_faq.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
+
+namespace Main {
+class SessionShow;
+} // namespace Main
+
+namespace Data {
+
+class Faq final {
+public:
+	constexpr Faq() = default;
+
+	void open(std::shared_ptr<Main::SessionShow> show);
+
+private:
+	WebPageId _id = 0;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 0f7df77f4..41aa27570 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_databases.h"
 #include "dialogs/dialogs_main_list.h"
 #include "data/data_groups.h"
+#include "data/data_faq.h"
 #include "data/data_cloud_file.h"
 #include "history/history_location_manager.h"
 #include "base/timer.h"
@@ -101,6 +102,9 @@ public:
 	[[nodiscard]] const Groups &groups() const {
 		return _groups;
 	}
+	[[nodiscard]] Faq &faq() {
+		return _faq;
+	}
 	[[nodiscard]] ChatFilters &chatsFilters() const {
 		return *_chatsFilters;
 	}
@@ -1068,6 +1072,7 @@ private:
 		mtpRequestId> _viewAsMessagesRequests;
 
 	Groups _groups;
+	Faq _faq;
 	const std::unique_ptr<ChatFilters> _chatsFilters;
 	const std::unique_ptr<CloudThemes> _cloudThemes;
 	const std::unique_ptr<SendActionManager> _sendActionManager;
diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp
index bd38b8c3f..28665c913 100644
--- a/Telegram/SourceFiles/settings/settings_intro.cpp
+++ b/Telegram/SourceFiles/settings/settings_intro.cpp
@@ -11,10 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_main.h"
 #include "settings/settings_chat.h"
 #include "settings/settings_codes.h"
+#include "ui/basic_click_handlers.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/widgets/shadow.h"
-#include "ui/widgets/labels.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/cached_round_corners.h"
@@ -104,7 +104,14 @@ object_ptr<Ui::RpWidget> CreateIntroSettings(
 
 	Ui::AddDivider(result);
 	Ui::AddSkip(result);
-	SetupFaq(result, false);
+
+	AddButtonWithIcon(
+		result,
+		tr::lng_settings_faq(),
+		st::settingsButtonNoIcon
+	)->addClickHandler([] {
+		UrlClickHandler::Open(tr::lng_telegram_features_url(tr::now));
+	});
 
 	return result;
 }
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 896a38a6b..4b2469b71 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -26,13 +26,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/basic_click_handlers.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
-#include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
-#include "ui/wrap/padding_wrap.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
-#include "ui/widgets/labels.h"
 #include "ui/widgets/continuous_sliders.h"
-#include "ui/widgets/buttons.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/new_badges.h"
@@ -43,9 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_cloud_themes.h"
 #include "data/data_chat_filters.h"
-#include "data/data_peer_values.h" // Data::AmPremiumValue
 #include "lang/lang_cloud_manager.h"
-#include "lang/lang_keys.h"
 #include "lang/lang_instance.h"
 #include "storage/localstorage.h"
 #include "main/main_session.h"
@@ -62,13 +56,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
-#include "core/file_utilities.h"
-#include "core/application.h"
 #include "base/call_delayed.h"
-#include "base/unixtime.h"
 #include "base/platform/base_platform_info.h"
 #include "styles/style_settings.h"
-#include "styles/style_boxes.h"
 #include "styles/style_info.h"
 #include "styles/style_menu_icons.h"
 
@@ -611,26 +601,20 @@ void SetupInterfaceScale(
 	}
 }
 
-void OpenFaq() {
-	File::OpenUrl(telegramFaqLink());
-}
-
-void SetupFaq(not_null<Ui::VerticalLayout*> container, bool icon) {
-	AddButtonWithIcon(
-		container,
-		tr::lng_settings_faq(),
-		icon ? st::settingsButton : st::settingsButtonNoIcon,
-		{ icon ? &st::menuIconFaq : nullptr }
-	)->addClickHandler(OpenFaq);
-}
-
 void SetupHelp(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container) {
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 
-	SetupFaq(container);
+	AddButtonWithIcon(
+		container,
+		tr::lng_settings_faq(),
+		st::settingsButton,
+		{ &st::menuIconFaq }
+	)->addClickHandler([=] {
+		controller->session().data().faq().open(controller->uiShow());
+	});
 
 	AddButtonWithIcon(
 		container,
@@ -674,7 +658,10 @@ void SetupHelp(
 		auto box = Ui::MakeConfirmBox({
 			.text = tr::lng_settings_ask_sure(),
 			.confirmed = sure,
-			.cancelled = OpenFaq,
+			.cancelled = [=](Fn<void()> close) {
+				controller->session().data().faq().open(controller->uiShow());
+				close();
+			},
 			.confirmText = tr::lng_settings_ask_ok(),
 			.cancelText = tr::lng_settings_faq_button(),
 			.strictCancel = true,
diff --git a/Telegram/SourceFiles/settings/settings_main.h b/Telegram/SourceFiles/settings/settings_main.h
index 7040fb9fa..303c58c5d 100644
--- a/Telegram/SourceFiles/settings/settings_main.h
+++ b/Telegram/SourceFiles/settings/settings_main.h
@@ -28,9 +28,6 @@ void SetupInterfaceScale(
 	not_null<Window::Controller*> window,
 	not_null<Ui::VerticalLayout*> container,
 	bool icon = true);
-void SetupFaq(
-	not_null<Ui::VerticalLayout*> container,
-	bool icon = true);
 
 class Main : public Section<Main> {
 public:

From b31d43cbed0e8e7097b170b0b5ab30acab0802b0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 3 Apr 2024 19:31:52 +0300
Subject: [PATCH 224/596] Fixed circle drawing in titles of some sections in
 channel earn info.

---
 .../info/channel_statistics/earn/info_earn_inner_widget.cpp      | 1 +
 Telegram/SourceFiles/menu/menu_sponsored.cpp                     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 19857a5ea..80e377e1e 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -372,6 +372,7 @@ void InnerWidget::fill() {
 					widget->paintRequest(
 					) | rpl::start_with_next([=] {
 						auto p = Painter(widget);
+						auto hq = PainterHighQualityEnabler(p);
 						p.setPen(Qt::NoPen);
 						p.setBrush(st::activeButtonBg);
 						p.drawEllipse(rect);
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index bb8109d2b..bfa8427f1 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -60,6 +60,7 @@ void AboutBox(
 		widget->paintRequest(
 		) | rpl::start_with_next([=] {
 			auto p = Painter(widget);
+			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::activeButtonBg);
 			p.drawEllipse(rect);

From 9464f4b095944b1fc657e6e8cc7ab59c2165ff48 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 17:45:15 +0400
Subject: [PATCH 225/596] Fix collectible channel links.

---
 .../info/profile/info_profile_actions.cpp           | 13 +++++++------
 .../info/profile/info_profile_values.cpp            | 11 +++++++++--
 .../SourceFiles/info/profile/info_profile_values.h  |  8 +++++++-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 84d8daba3..dfc7d3baa 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1147,14 +1147,15 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		auto linkText = LinkValue(
 			_peer,
 			true
-		) | rpl::map([=](const QString &link) {
-			return link.isEmpty()
+		) | rpl::map([=](const LinkWithUrl &link) {
+			const auto text = link.text;
+			return text.isEmpty()
 				? TextWithEntities()
 				: Ui::Text::Link(
-					(link.startsWith(u"https://"_q)
-						? link.mid(u"https://"_q.size())
-						: link) + addToLink,
-					link + addToLink);
+					(text.startsWith(u"https://"_q)
+						? text.mid(u"https://"_q.size())
+						: text) + addToLink,
+					(addToLink.isEmpty() ? link.url : (text + addToLink)));
 		});
 		auto linkLine = addInfoOneLine(
 			(topicRootId
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index 6159fe907..3a0f9566e 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -232,12 +232,19 @@ rpl::producer<TextWithEntities> AboutValue(not_null<PeerData*> peer) {
 	});
 }
 
-rpl::producer<QString> LinkValue(not_null<PeerData*> peer, bool primary) {
+rpl::producer<LinkWithUrl> LinkValue(not_null<PeerData*> peer, bool primary) {
 	return (primary
 		? PlainPrimaryUsernameValue(peer)
 		: PlainUsernameValue(peer) | rpl::type_erased()
 	) | rpl::map([=](QString &&username) {
-		return username.isEmpty() ? QString() : UsernameUrl(peer, username);
+		return LinkWithUrl{
+			.text = (username.isEmpty()
+				? QString()
+				: peer->session().createInternalLinkFull(username)),
+			.url = (username.isEmpty()
+				? QString()
+				: UsernameUrl(peer, username)),
+		};
 	});
 }
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h
index 625ccfa2a..72d50055a 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.h
@@ -69,9 +69,15 @@ rpl::producer<not_null<PeerData*>> MigratedOrMeValue(
 	const QString &value);
 [[nodiscard]] rpl::producer<TextWithEntities> AboutValue(
 	not_null<PeerData*> peer);
-[[nodiscard]] rpl::producer<QString> LinkValue(
+
+struct LinkWithUrl {
+	QString text;
+	QString url;
+};
+[[nodiscard]] rpl::producer<LinkWithUrl> LinkValue(
 	not_null<PeerData*> peer,
 	bool primary = false);
+
 [[nodiscard]] rpl::producer<const ChannelLocation*> LocationValue(
 	not_null<ChannelData*> channel);
 [[nodiscard]] rpl::producer<bool> NotificationsEnabledValue(

From 36cb28d5cf5a652e8de5788c567d63278102db20 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 18:20:33 +0400
Subject: [PATCH 226/596] Respect 'try_instant_view' in webapps.

---
 .../inline_bots/bot_attach_web_view.cpp       | 49 +++++++++++++++++++
 .../inline_bots/bot_attach_web_view.h         |  5 ++
 Telegram/SourceFiles/iv/iv_instance.cpp       | 19 ++++---
 Telegram/SourceFiles/iv/iv_instance.h         |  4 ++
 .../ui/chat/attach/attach_bot_webview.cpp     |  6 ++-
 .../ui/chat/attach/attach_bot_webview.h       |  1 +
 6 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 056aa224e..c3f78b2d0 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -17,10 +17,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_session.h"
+#include "data/data_web_page.h"
 #include "main/main_session.h"
 #include "main/main_domain.h"
 #include "storage/storage_domain.h"
 #include "info/profile/info_profile_values.h"
+#include "iv/iv_instance.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/chat/attach/attach_bot_webview.h"
 #include "ui/widgets/checkbox.h"
@@ -653,6 +655,53 @@ void AttachWebView::botHandleMenuButton(Ui::BotWebView::MenuButton button) {
 	}
 }
 
+void AttachWebView::botOpenIvLink(QString uri) {
+	const auto parts = uri.split('#');
+	if (parts.isEmpty()) {
+		return;
+	}
+	const auto hash = (parts.size() > 1) ? parts[1] : u""_q;
+	const auto url = parts[0];
+	if (const auto i = _ivCache.find(url); i != end(_ivCache)) {
+		const auto page = i->second;
+		if (page && page->iv) {
+			const auto window = _context
+				? _context->controller.get()
+				: nullptr;
+			if (window) {
+				Core::App().iv().show(window, page->iv.get(), hash);
+			} else {
+				Core::App().iv().show(_session, page->iv.get(), hash);
+			}
+		} else {
+			UrlClickHandler::Open(uri);
+		}
+		return;
+	} else if (_ivRequestUri == uri) {
+		return;
+	} else if (_ivRequestId) {
+		_session->api().request(_ivRequestId).cancel();
+	}
+	const auto finish = [=](WebPageData *page) {
+		_ivRequestId = 0;
+		_ivRequestUri = QString();
+		_ivCache[url] = page;
+		botOpenIvLink(uri);
+	};
+	_ivRequestUri = uri;
+	_ivRequestId = _session->api().request(MTPmessages_GetWebPage(
+		MTP_string(url),
+		MTP_int(0)
+	)).done([=](const MTPmessages_WebPage &result) {
+		const auto &data = result.data();
+		_session->data().processUsers(data.vusers());
+		_session->data().processChats(data.vchats());
+		finish(_session->data().processWebpage(data.vwebpage()));
+	}).fail([=] {
+		finish(nullptr);
+	}).send();
+}
+
 void AttachWebView::botSendData(QByteArray data) {
 	if (!_context
 		|| _context->fromSwitch
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index d1d2c0e44..c172cd5c3 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -165,6 +165,7 @@ private:
 	bool botHandleLocalUri(QString uri, bool keepOpen) override;
 	void botHandleInvoice(QString slug) override;
 	void botHandleMenuButton(Ui::BotWebView::MenuButton button) override;
+	void botOpenIvLink(QString uri) override;
 	void botSendData(QByteArray data) override;
 	void botSwitchInlineQuery(
 		std::vector<QString> chatTypes,
@@ -266,6 +267,10 @@ private:
 	rpl::event_stream<> _attachBotsUpdates;
 	base::flat_set<not_null<UserData*>> _disclaimerAccepted;
 
+	base::flat_map<QString, WebPageData*> _ivCache;
+	QString _ivRequestUri;
+	mtpRequestId _ivRequestId = 0;
+
 	std::unique_ptr<Ui::BotWebView::Panel> _panel;
 	bool _catchingCancelInShowCall = false;
 
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 517415435..f84d55223 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -63,7 +63,7 @@ class Shown final : public base::has_weak_ptr {
 public:
 	Shown(
 		not_null<Delegate*> delegate,
-		std::shared_ptr<Main::SessionShow> show,
+		not_null<Main::Session*> session,
 		not_null<Data*> data,
 		QString hash);
 
@@ -169,12 +169,11 @@ private:
 
 Shown::Shown(
 	not_null<Delegate*> delegate,
-	std::shared_ptr<Main::SessionShow> show,
+	not_null<Main::Session*> session,
 	not_null<Data*> data,
 	QString hash)
 : _delegate(delegate)
-, _session(&show->session())
-, _show(show) {
+, _session(session) {
 	prepare(data, hash);
 }
 
@@ -818,7 +817,13 @@ void Instance::show(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Data*> data,
 		QString hash) {
-	const auto session = &show->session();
+	this->show(&show->session(), data, hash);
+}
+
+void Instance::show(
+		not_null<Main::Session*> session,
+		not_null<Data*> data,
+		QString hash) {
 	const auto guard = gsl::finally([&] {
 		if (data->partial()) {
 			requestFull(session, data->id());
@@ -828,7 +833,7 @@ void Instance::show(
 		_shown->moveTo(data, hash);
 		return;
 	}
-	_shown = std::make_unique<Shown>(_delegate, show, data, hash);
+	_shown = std::make_unique<Shown>(_delegate, session, data, hash);
 	_shownSession = session;
 	_shown->events() | rpl::start_with_next([=](Controller::Event event) {
 		using Type = Controller::Event::Type;
@@ -896,7 +901,7 @@ void Instance::show(
 				if (page && page->iv) {
 					const auto parts = event.url.split('#');
 					const auto hash = (parts.size() > 1) ? parts[1] : u""_q;
-					this->show(show, page->iv.get(), hash);
+					this->show(_shownSession, page->iv.get(), hash);
 				} else {
 					UrlClickHandler::Open(event.url);
 				}
diff --git a/Telegram/SourceFiles/iv/iv_instance.h b/Telegram/SourceFiles/iv/iv_instance.h
index ba3d8f72c..608c9c283 100644
--- a/Telegram/SourceFiles/iv/iv_instance.h
+++ b/Telegram/SourceFiles/iv/iv_instance.h
@@ -36,6 +36,10 @@ public:
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Data*> data,
 		QString hash);
+	void show(
+		not_null<Main::Session*> session,
+		not_null<Data*> data,
+		QString hash);
 
 	[[nodiscard]] bool hasActiveWindow(
 		not_null<Main::Session*> session) const;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 42eac21de..c9f3f93f8 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -801,6 +801,7 @@ void Panel::openExternalLink(const QJsonObject &args) {
 		return;
 	}
 	const auto url = args["url"].toString();
+	const auto iv = args["try_instant_view"].toBool();
 	const auto lower = url.toLower();
 	if (url.isEmpty()
 		|| (!lower.startsWith("http://") && !lower.startsWith("https://"))) {
@@ -809,8 +810,11 @@ void Panel::openExternalLink(const QJsonObject &args) {
 		return;
 	} else if (!allowOpenLink()) {
 		return;
+	} else if (iv) {
+		_delegate->botOpenIvLink(url);
+	} else {
+		File::OpenUrl(url);
 	}
-	File::OpenUrl(url);
 }
 
 void Panel::openInvoice(const QJsonObject &args) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index 9c4be46d0..bb22a4dfc 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -57,6 +57,7 @@ public:
 	virtual bool botHandleLocalUri(QString uri, bool keepOpen) = 0;
 	virtual void botHandleInvoice(QString slug) = 0;
 	virtual void botHandleMenuButton(MenuButton button) = 0;
+	virtual void botOpenIvLink(QString uri) = 0;
 	virtual void botSendData(QByteArray data) = 0;
 	virtual void botSwitchInlineQuery(
 		std::vector<QString> chatTypes,

From ede6e18bc9064801e62ba547b7bb9f6ea48fe056 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 18:32:01 +0400
Subject: [PATCH 227/596] Fix QOI image reader.

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

diff --git a/cmake b/cmake
index b875d0ae2..9f1b85aa9 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b875d0ae2bf457ec94aaddd08431753e14ec71ac
+Subproject commit 9f1b85aa9d51025ccefe63992d05c878bc267774

From f6f8eefaa0e2f149c031fd83bcf0ee3f5759546e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 18:36:00 +0400
Subject: [PATCH 228/596] Revert "Use plain vector for prepared upload parts."

This reverts commit aaaeea297927211fe4e5ea09ce76b324eae24920.
---
 Telegram/SourceFiles/storage/file_upload.cpp  | 160 ++++++++++--------
 Telegram/SourceFiles/storage/file_upload.h    |  14 +-
 .../SourceFiles/storage/localimageloader.cpp  |   8 +-
 .../SourceFiles/storage/localimageloader.h    |   2 +-
 4 files changed, 96 insertions(+), 88 deletions(-)

diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index b19af82df..e0c7f8b57 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -65,10 +65,7 @@ struct Uploader::File {
 	bool setPartSize(uint32 partSize);
 
 	std::shared_ptr<FilePrepareResult> file;
-	const std::vector<QByteArray> &parts;
-	const uint64 partsOfId = 0;
-	int partsSent = 0;
-
+	int32 partsCount = 0;
 	mutable int64 fileSentSize = 0;
 
 	HashMd5 md5Hash;
@@ -82,15 +79,11 @@ struct Uploader::File {
 };
 
 Uploader::File::File(const std::shared_ptr<FilePrepareResult> &file)
-: file(file)
-, parts((file->type == SendMediaType::Photo
-	|| file->type == SendMediaType::Secure)
-		? file->fileparts
-		: file->thumbparts)
-, partsOfId((file->type == SendMediaType::Photo
-	|| file->type == SendMediaType::Secure)
-		? file->id
-		: file->thumbId) {
+: file(file) {
+	partsCount = (file->type == SendMediaType::Photo
+		|| file->type == SendMediaType::Secure)
+		? file->fileparts.size()
+		: file->thumbparts.size();
 	if (file->type == SendMediaType::File
 		|| file->type == SendMediaType::ThemeFile
 		|| file->type == SendMediaType::Audio) {
@@ -181,7 +174,7 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 
 	_api->instance().nonPremiumDelayedRequests(
 	) | rpl::start_with_next([=](mtpRequestId id) {
-		if (_dcIndices.contains(id)) {
+		if (dcMap.contains(id)) {
 			_nonPremiumDelayed.emplace(id);
 		}
 	}, _lifetime);
@@ -306,7 +299,7 @@ void Uploader::upload(
 }
 
 void Uploader::currentFailed() {
-	auto j = queue.find(_uploadingId);
+	auto j = queue.find(uploadingId);
 	if (j != queue.end()) {
 		const auto [msgId, file] = std::move(*j);
 		queue.erase(j);
@@ -314,11 +307,11 @@ void Uploader::currentFailed() {
 	}
 
 	cancelRequests();
-	_dcIndices.clear();
-	_uploadingId = FullMsgId();
-	_sentTotal = 0;
+	dcMap.clear();
+	uploadingId = FullMsgId();
+	sentSize = 0;
 	for (int i = 0; i < MTP::kUploadSessionsCount; ++i) {
-		_sentPerDc[i] = 0;
+		sentSizes[i] = 0;
 	}
 
 	sendNext();
@@ -350,7 +343,7 @@ void Uploader::stopSessions() {
 }
 
 void Uploader::sendNext() {
-	if (_sentTotal >= kMaxUploadFileParallelSize || _pausedId.msg) {
+	if (sentSize >= kMaxUploadFileParallelSize || _pausedId.msg) {
 		return;
 	}
 
@@ -365,25 +358,33 @@ void Uploader::sendNext() {
 	if (stopping) {
 		_stopSessionsTimer.cancel();
 	}
-	auto i = _uploadingId.msg ? queue.find(_uploadingId) : queue.begin();
-	if (!_uploadingId.msg) {
-		_uploadingId = i->first;
+	auto i = uploadingId.msg ? queue.find(uploadingId) : queue.begin();
+	if (!uploadingId.msg) {
+		uploadingId = i->first;
 	} else if (i == queue.end()) {
 		i = queue.begin();
-		_uploadingId = i->first;
+		uploadingId = i->first;
 	}
 	auto &uploadingData = i->second;
 
 	auto todc = 0;
 	for (auto dc = 1; dc != MTP::kUploadSessionsCount; ++dc) {
-		if (_sentPerDc[dc] < _sentPerDc[todc]) {
+		if (sentSizes[dc] < sentSizes[todc]) {
 			todc = dc;
 		}
 	}
 
-	if (uploadingData.partsSent >= uploadingData.parts.size()) {
+	auto &parts = (uploadingData.file->type == SendMediaType::Photo
+		|| uploadingData.file->type == SendMediaType::Secure)
+		? uploadingData.file->fileparts
+		: uploadingData.file->thumbparts;
+	const auto partsOfId = (uploadingData.file->type == SendMediaType::Photo
+		|| uploadingData.file->type == SendMediaType::Secure)
+		? uploadingData.file->id
+		: uploadingData.file->thumbId;
+	if (parts.isEmpty()) {
 		if (uploadingData.docSentParts >= uploadingData.docPartsCount) {
-			if (_sentSizes.empty()) {
+			if (requestsSent.empty() && docRequestsSent.empty()) {
 				const auto options = uploadingData.file
 					? uploadingData.file->to.options
 					: Api::SendOptions();
@@ -403,11 +404,11 @@ void Uploader::sendNext() {
 					const auto md5 = uploadingData.file->filemd5;
 					const auto file = MTP_inputFile(
 						MTP_long(uploadingData.file->id),
-						MTP_int(uploadingData.parts.size()),
+						MTP_int(uploadingData.partsCount),
 						MTP_string(photoFilename),
 						MTP_bytes(md5));
 					_photoReady.fire({
-						.fullId = _uploadingId,
+						.fullId = uploadingId,
 						.info = {
 							.file = file,
 							.attachedStickers = attachedStickers,
@@ -432,19 +433,19 @@ void Uploader::sendNext() {
 							MTP_string(uploadingData.file->filename),
 							MTP_bytes(docMd5));
 					const auto thumb = [&]() -> std::optional<MTPInputFile> {
-						if (uploadingData.parts.empty()) {
+						if (!uploadingData.partsCount) {
 							return std::nullopt;
 						}
 						const auto thumbFilename = uploadingData.file->thumbname;
 						const auto thumbMd5 = uploadingData.file->thumbmd5;
 						return MTP_inputFile(
 							MTP_long(uploadingData.file->thumbId),
-							MTP_int(uploadingData.parts.size()),
+							MTP_int(uploadingData.partsCount),
 							MTP_string(thumbFilename),
 							MTP_bytes(thumbMd5));
 					}();
 					_documentReady.fire({
-						.fullId = _uploadingId,
+						.fullId = uploadingId,
 						.info = {
 							.file = file,
 							.thumb = thumb,
@@ -455,13 +456,12 @@ void Uploader::sendNext() {
 					});
 				} else if (uploadingData.file->type == SendMediaType::Secure) {
 					_secureReady.fire({
-						_uploadingId,
+						uploadingId,
 						uploadingData.file->id,
-						int(uploadingData.parts.size()),
-					});
+						uploadingData.partsCount });
 				}
-				queue.erase(_uploadingId);
-				_uploadingId = FullMsgId();
+				queue.erase(uploadingId);
+				uploadingId = FullMsgId();
 				sendNext();
 			}
 			return;
@@ -522,37 +522,36 @@ void Uploader::sendNext() {
 				partFailed(error, requestId);
 			}).toDC(MTP::uploadDcId(todc)).send();
 		}
-		_sentSizes.emplace(requestId, uploadingData.docPartSize);
-		_docSentRequests.emplace(requestId);
-		_dcIndices.emplace(requestId, todc);
-		_sentTotal += uploadingData.docPartSize;
-		_sentPerDc[todc] += uploadingData.docPartSize;
+		docRequestsSent.emplace(requestId, uploadingData.docSentParts);
+		dcMap.emplace(requestId, todc);
+		sentSize += uploadingData.docPartSize;
+		sentSizes[todc] += uploadingData.docPartSize;
 
 		uploadingData.docSentParts++;
 	} else {
-		const auto index = uploadingData.partsSent++;
-		const auto partBytes = uploadingData.parts[index];
-		const auto partSize = int(partBytes.size());
+		auto part = parts.begin();
 
 		const auto requestId = _api->request(MTPupload_SaveFilePart(
-			MTP_long(uploadingData.partsOfId),
-			MTP_int(index),
-			MTP_bytes(partBytes)
+			MTP_long(partsOfId),
+			MTP_int(part.key()),
+			MTP_bytes(part.value())
 		)).done([=](const MTPBool &result, mtpRequestId requestId) {
 			partLoaded(result, requestId);
 		}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
 			partFailed(error, requestId);
 		}).toDC(MTP::uploadDcId(todc)).send();
-		_sentSizes.emplace(requestId, partSize);
-		_dcIndices.emplace(requestId, todc);
-		_sentTotal += partSize;
-		_sentPerDc[todc] += partSize;
+		requestsSent.emplace(requestId, part.value());
+		dcMap.emplace(requestId, todc);
+		sentSize += part.value().size();
+		sentSizes[todc] += part.value().size();
+
+		parts.erase(part);
 	}
 	_nextTimer.callOnce(kUploadRequestInterval);
 }
 
 void Uploader::cancel(const FullMsgId &msgId) {
-	if (_uploadingId == msgId) {
+	if (uploadingId == msgId) {
 		currentFailed();
 	} else {
 		queue.erase(msgId);
@@ -560,12 +559,12 @@ void Uploader::cancel(const FullMsgId &msgId) {
 }
 
 void Uploader::cancelAll() {
-	const auto single = queue.empty() ? _uploadingId : queue.begin()->first;
+	const auto single = queue.empty() ? uploadingId : queue.begin()->first;
 	if (!single) {
 		return;
 	}
 	_pausedId = single;
-	if (_uploadingId) {
+	if (uploadingId) {
 		currentFailed();
 	}
 	while (!queue.empty()) {
@@ -590,49 +589,61 @@ void Uploader::confirm(const FullMsgId &msgId) {
 }
 
 void Uploader::cancelRequests() {
-	_docSentRequests.clear();
-	for (const auto &requestData : _sentSizes) {
+	for (const auto &requestData : requestsSent) {
 		_api->request(requestData.first).cancel();
 	}
-	_sentSizes.clear();
+	requestsSent.clear();
+	for (const auto &requestData : docRequestsSent) {
+		_api->request(requestData.first).cancel();
+	}
+	docRequestsSent.clear();
 }
 
 void Uploader::clear() {
 	queue.clear();
 	cancelRequests();
-	_dcIndices.clear();
-	_sentTotal = 0;
+	dcMap.clear();
+	sentSize = 0;
 	for (int i = 0; i < MTP::kUploadSessionsCount; ++i) {
 		_api->instance().stopSession(MTP::uploadDcId(i));
-		_sentPerDc[i] = 0;
+		sentSizes[i] = 0;
 	}
 	_stopSessionsTimer.cancel();
 }
 
 void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
-	_docSentRequests.remove(requestId);
-	auto i = _sentSizes.find(requestId);
+	auto j = docRequestsSent.end();
+	auto i = requestsSent.find(requestId);
+	if (i == requestsSent.cend()) {
+		j = docRequestsSent.find(requestId);
+	}
 	const auto wasNonPremiumDelayed = _nonPremiumDelayed.remove(requestId);
-	if (i != _sentSizes.cend()) {
+	if (i != requestsSent.cend() || j != docRequestsSent.cend()) {
 		if (mtpIsFalse(result)) { // failed to upload current file
 			currentFailed();
 			return;
 		} else {
-			auto dcIt = _dcIndices.find(requestId);
-			if (dcIt == _dcIndices.cend()) { // must not happen
+			auto dcIt = dcMap.find(requestId);
+			if (dcIt == dcMap.cend()) { // must not happen
 				currentFailed();
 				return;
 			}
 			auto dc = dcIt->second;
-			_dcIndices.erase(dcIt);
+			dcMap.erase(dcIt);
 
-			int64 sentPartSize = i->second;
-			auto k = queue.find(_uploadingId);
+			int64 sentPartSize = 0;
+			auto k = queue.find(uploadingId);
 			Assert(k != queue.cend());
 			auto &[fullId, file] = *k;
-			_sentSizes.erase(i);
-			_sentTotal -= sentPartSize;
-			_sentPerDc[dc] -= sentPartSize;
+			if (i != requestsSent.cend()) {
+				sentPartSize = i->second.size();
+				requestsSent.erase(i);
+			} else {
+				sentPartSize = file.docPartSize;
+				docRequestsSent.erase(j);
+			}
+			sentSize -= sentPartSize;
+			sentSizes[dc] -= sentPartSize;
 			if (file.file->type == SendMediaType::Photo) {
 				file.fileSentSize += sentPartSize;
 				const auto photo = session().data().photo(file.file->id);
@@ -647,7 +658,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 				const auto document = session().data().document(file.file->id);
 				if (document->uploading()) {
 					const auto doneParts = file.docSentParts
-						- int(_docSentRequests.size());
+						- int(docRequestsSent.size());
 					document->uploadingData->offset = std::min(
 						document->uploadingData->size,
 						doneParts * file.docPartSize);
@@ -672,7 +683,8 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 void Uploader::partFailed(const MTP::Error &error, mtpRequestId requestId) {
 	// failed to upload current file
 	_nonPremiumDelayed.remove(requestId);
-	if (_sentSizes.find(requestId) != _sentSizes.cend()) {
+	if ((requestsSent.find(requestId) != requestsSent.cend())
+		|| (docRequestsSent.find(requestId) != docRequestsSent.cend())) {
 		currentFailed();
 	}
 	sendNext();
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index a733775ad..4347e5c03 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -54,7 +54,7 @@ public:
 	[[nodiscard]] Main::Session &session() const;
 
 	[[nodiscard]] FullMsgId currentUploadId() const {
-		return _uploadingId;
+		return uploadingId;
 	}
 
 	void upload(
@@ -125,14 +125,14 @@ private:
 		int progress = 0);
 
 	const not_null<ApiWrap*> _api;
-	base::flat_map<mtpRequestId, int> _sentSizes;
-	base::flat_set<mtpRequestId> _docSentRequests;
-	base::flat_map<mtpRequestId, int> _dcIndices;
+	base::flat_map<mtpRequestId, QByteArray> requestsSent;
+	base::flat_map<mtpRequestId, int32> docRequestsSent;
+	base::flat_map<mtpRequestId, int32> dcMap;
 	base::flat_set<mtpRequestId> _nonPremiumDelayed;
-	uint32 _sentTotal = 0; // FileSize: Right now any file size fits 32 bit.
-	uint32 _sentPerDc[MTP::kUploadSessionsCount] = { 0 };
+	uint32 sentSize = 0; // FileSize: Right now any file size fits 32 bit.
+	uint32 sentSizes[MTP::kUploadSessionsCount] = { 0 };
 
-	FullMsgId _uploadingId;
+	FullMsgId uploadingId;
 	FullMsgId _pausedId;
 	std::map<FullMsgId, File> queue;
 	base::Timer _nextTimer, _stopSessionsTimer;
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 59f2fb505..192c7c112 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -434,10 +434,8 @@ void FilePrepareResult::setFileData(const QByteArray &filedata) {
 		partssize = 0;
 	} else {
 		partssize = filedata.size();
-		fileparts.reserve(
-			(partssize + kPhotoUploadPartSize - 1) / kPhotoUploadPartSize);
 		for (int32 i = 0, part = 0; i < partssize; i += kPhotoUploadPartSize, ++part) {
-			fileparts.push_back(filedata.mid(i, kPhotoUploadPartSize));
+			fileparts.insert(part, filedata.mid(i, kPhotoUploadPartSize));
 		}
 		filemd5.resize(32);
 		hashMd5Hex(filedata.constData(), filedata.size(), filemd5.data());
@@ -448,10 +446,8 @@ void FilePrepareResult::setThumbData(const QByteArray &thumbdata) {
 	if (!thumbdata.isEmpty()) {
 		thumbbytes = thumbdata;
 		int32 size = thumbdata.size();
-		thumbparts.reserve(
-			(size + kPhotoUploadPartSize - 1) / kPhotoUploadPartSize);
 		for (int32 i = 0, part = 0; i < size; i += kPhotoUploadPartSize, ++part) {
-			thumbparts.push_back(thumbdata.mid(i, kPhotoUploadPartSize));
+			thumbparts.insert(part, thumbdata.mid(i, kPhotoUploadPartSize));
 		}
 		thumbmd5.resize(32);
 		hashMd5Hex(thumbdata.constData(), thumbdata.size(), thumbmd5.data());
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index 2756ac244..8b3b7bca7 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -147,7 +147,7 @@ struct FileLoadTo {
 	MsgId replaceMediaOf;
 };
 
-using UploadFileParts = std::vector<QByteArray>;
+using UploadFileParts = QMap<int, QByteArray>;
 struct FilePrepareDescriptor {
 	TaskId taskId = kEmptyTaskId;
 	base::required<uint64> id;

From 09f07a7a9dde2c2b58c5a29fa6c20a95f4522dea Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 18:36:07 +0400
Subject: [PATCH 229/596] Revert "Remove SendMediaReady legacy helper."

This reverts commit 91f8989f701c1c3bfe299ac8e653efc7d22a38e3.
---
 Telegram/SourceFiles/api/api_peer_photo.cpp   |  33 ++--
 Telegram/SourceFiles/api/api_ringtones.cpp    |  33 ++--
 Telegram/SourceFiles/api/api_sending.cpp      |   2 +-
 Telegram/SourceFiles/api/api_sending.h        |   4 +-
 .../boxes/background_preview_box.cpp          |   4 +-
 Telegram/SourceFiles/history/history_widget.h |   1 +
 Telegram/SourceFiles/iv/iv_data.cpp           |   2 +-
 Telegram/SourceFiles/mainwidget.h             |   1 +
 .../passport/passport_form_controller.cpp     |  12 +-
 Telegram/SourceFiles/storage/file_upload.cpp  | 177 +++++++++++++-----
 Telegram/SourceFiles/storage/file_upload.h    |   6 +-
 .../SourceFiles/storage/localimageloader.cpp  |  83 +++++---
 .../SourceFiles/storage/localimageloader.h    |  74 +++++---
 .../window/themes/window_theme.cpp            |  41 ++--
 .../SourceFiles/window/themes/window_theme.h  |   4 +-
 .../window/themes/window_theme_editor_box.cpp |  60 +++---
 16 files changed, 354 insertions(+), 183 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_peer_photo.cpp b/Telegram/SourceFiles/api/api_peer_photo.cpp
index 9c8a470fa..c70ef4491 100644
--- a/Telegram/SourceFiles/api/api_peer_photo.cpp
+++ b/Telegram/SourceFiles/api/api_peer_photo.cpp
@@ -34,7 +34,7 @@ namespace {
 
 constexpr auto kSharedMediaLimit = 100;
 
-[[nodiscard]] std::shared_ptr<FilePrepareResult> PreparePeerPhoto(
+[[nodiscard]] SendMediaReady PreparePeerPhoto(
 		MTP::DcId dcId,
 		PeerId peerId,
 		QImage &&image) {
@@ -80,17 +80,24 @@ constexpr auto kSharedMediaLimit = 100;
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId));
 
-	auto result = MakePreparedFile({
-		.id = id,
-		.type = SendMediaType::Photo,
-	});
-	result->type = SendMediaType::Photo;
-	result->setFileData(jpeg);
-	result->thumbId = id;
-	result->thumbname = "thumb.jpg";
-	result->photo = photo;
-	result->photoThumbs = photoThumbs;
-	return result;
+	QString file, filename;
+	int64 filesize = 0;
+	QByteArray data;
+
+	return SendMediaReady(
+		SendMediaType::Photo,
+		file,
+		filename,
+		filesize,
+		data,
+		id,
+		id,
+		u"jpg"_q,
+		peerId,
+		photo,
+		photoThumbs,
+		MTP_documentEmpty(MTP_long(0)),
+		jpeg);
 }
 
 [[nodiscard]] std::optional<MTPVideoSize> PrepareMtpMarkup(
@@ -232,7 +239,7 @@ void PeerPhoto::upload(
 			_api.instance().mainDcId(),
 			peer->id,
 			base::take(photo.image));
-		_session->uploader().upload(fakeId, ready);
+		_session->uploader().uploadMedia(fakeId, ready);
 	}
 }
 
diff --git a/Telegram/SourceFiles/api/api_ringtones.cpp b/Telegram/SourceFiles/api/api_ringtones.cpp
index 307ba580a..87522bf58 100644
--- a/Telegram/SourceFiles/api/api_ringtones.cpp
+++ b/Telegram/SourceFiles/api/api_ringtones.cpp
@@ -24,25 +24,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Api {
 namespace {
 
-std::shared_ptr<FilePrepareResult> PrepareRingtoneDocument(
+SendMediaReady PrepareRingtoneDocument(
 		MTP::DcId dcId,
 		const QString &filename,
 		const QString &filemime,
 		const QByteArray &content) {
-	const auto id = base::RandomValue<DocumentId>();
 	auto attributes = QVector<MTPDocumentAttribute>(
 		1,
 		MTP_documentAttributeFilename(MTP_string(filename)));
-
-	auto result = MakePreparedFile({
-		.id = id,
-		.type = SendMediaType::File,
-	});
-	result->filename = filename;
-	result->content = content;
-	result->filesize = content.size();
-	result->setFileData(content);
-	result->document = MTP_document(
+	const auto id = base::RandomValue<DocumentId>();
+	const auto document = MTP_document(
 		MTP_flags(0),
 		MTP_long(id),
 		MTP_long(0),
@@ -54,7 +45,21 @@ std::shared_ptr<FilePrepareResult> PrepareRingtoneDocument(
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId),
 		MTP_vector<MTPDocumentAttribute>(std::move(attributes)));
-	return result;
+
+	return SendMediaReady(
+		SendMediaType::File,
+		QString(), // filepath
+		filename,
+		content.size(),
+		content,
+		id,
+		0,
+		QString(),
+		PeerId(),
+		MTP_photoEmpty(MTP_long(0)),
+		PreparedPhotoThumbs(),
+		document,
+		QByteArray());
 }
 
 } // namespace
@@ -97,7 +102,7 @@ void Ringtones::upload(
 		_uploads.erase(already);
 	}
 	_uploads.emplace(fakeId, uploadedData);
-	_session->uploader().upload(fakeId, ready);
+	_session->uploader().uploadMedia(fakeId, ready);
 }
 
 void Ringtones::ready(const FullMsgId &msgId, const MTPInputFile &file) {
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index d91943fe0..72bd06b3d 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -353,7 +353,7 @@ void FillMessagePostFlags(
 
 void SendConfirmedFile(
 		not_null<Main::Session*> session,
-		const std::shared_ptr<FilePrepareResult> &file) {
+		const std::shared_ptr<FileLoadResult> &file) {
 	const auto isEditing = (file->type != SendMediaType::Audio)
 		&& (file->to.replaceMediaOf != 0);
 	const auto newId = FullMsgId(
diff --git a/Telegram/SourceFiles/api/api_sending.h b/Telegram/SourceFiles/api/api_sending.h
index 2fdbad843..e17c66f3e 100644
--- a/Telegram/SourceFiles/api/api_sending.h
+++ b/Telegram/SourceFiles/api/api_sending.h
@@ -14,7 +14,7 @@ class Session;
 class History;
 class PhotoData;
 class DocumentData;
-struct FilePrepareResult;
+struct FileLoadResult;
 
 namespace Api {
 
@@ -40,6 +40,6 @@ void FillMessagePostFlags(
 
 void SendConfirmedFile(
 	not_null<Main::Session*> session,
-	const std::shared_ptr<FilePrepareResult> &file);
+	const std::shared_ptr<FileLoadResult> &file);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index a112c478a..3a9917719 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -593,11 +593,11 @@ void BackgroundPreviewBox::uploadForPeer(bool both) {
 	const auto ready = Window::Theme::PrepareWallPaper(
 		session->mainDcId(),
 		_paper.localThumbnail()->original());
-	const auto documentId = ready->id;
+	const auto documentId = ready.id;
 	_uploadId = FullMsgId(
 		session->userPeerId(),
 		session->data().nextLocalMessageId());
-	session->uploader().upload(_uploadId, ready);
+	session->uploader().uploadMedia(_uploadId, ready);
 	if (_uploadLifetime) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index b4d8bb49c..43966331e 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/fields/input_field.h"
 #include "mtproto/sender.h"
 
+struct FileLoadResult;
 enum class SendMediaType;
 class MessageLinksParser;
 struct InlineBotQuery;
diff --git a/Telegram/SourceFiles/iv/iv_data.cpp b/Telegram/SourceFiles/iv/iv_data.cpp
index 5258e6c9f..bbcca0b2c 100644
--- a/Telegram/SourceFiles/iv/iv_data.cpp
+++ b/Telegram/SourceFiles/iv/iv_data.cpp
@@ -25,7 +25,7 @@ QByteArray GeoPointId(Geo point) {
 	const auto lon = int(point.lon * 1000000);
 	const auto combined = (std::uint64_t(std::uint32_t(lat)) << 32)
 		| std::uint64_t(std::uint32_t(lon));
-	return QByteArray::number(quint64(combined))
+	return QByteArray::number(combined)
 		+ ','
 		+ QByteArray::number(point.access);
 }
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 809086765..10bea63d4 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -16,6 +16,7 @@ struct HistoryMessageMarkupButton;
 class MainWindow;
 class HistoryWidget;
 class StackItem;
+struct FileLoadResult;
 class History;
 class Image;
 
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index 980888ffb..684163163 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -1581,10 +1581,14 @@ void FormController::uploadEncryptedFile(
 		&session(),
 		std::make_unique<UploadScanData>(std::move(data)));
 
-	auto prepared = MakePreparedFile({
-		.id = file.uploadData->fileId,
-		.type = SendMediaType::Secure,
-	});
+	auto prepared = std::make_shared<FileLoadResult>(
+		TaskId(),
+		file.uploadData->fileId,
+		FileLoadTo(PeerId(), Api::SendOptions(), FullReplyTo(), MsgId()),
+		TextWithTags(),
+		false,
+		std::shared_ptr<SendingAlbum>(nullptr));
+	prepared->type = SendMediaType::Secure;
 	prepared->content = QByteArray::fromRawData(
 		reinterpret_cast<char*>(file.uploadData->bytes.data()),
 		file.uploadData->bytes.size());
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index e0c7f8b57..c40396955 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -59,15 +59,22 @@ constexpr auto kKillSessionTimeout = 15 * crl::time(1000);
 } // namespace
 
 struct Uploader::File {
-	explicit File(const std::shared_ptr<FilePrepareResult> &file);
+	File(const SendMediaReady &media);
+	File(const std::shared_ptr<FileLoadResult> &file);
 
 	void setDocSize(int64 size);
 	bool setPartSize(uint32 partSize);
 
-	std::shared_ptr<FilePrepareResult> file;
+	std::shared_ptr<FileLoadResult> file;
+	SendMediaReady media;
 	int32 partsCount = 0;
 	mutable int64 fileSentSize = 0;
 
+	uint64 id() const;
+	SendMediaType type() const;
+	uint64 thumbId() const;
+	const QString &filename() const;
+
 	HashMd5 md5Hash;
 
 	std::unique_ptr<QFile> docFile;
@@ -78,15 +85,27 @@ struct Uploader::File {
 
 };
 
-Uploader::File::File(const std::shared_ptr<FilePrepareResult> &file)
+Uploader::File::File(const SendMediaReady &media) : media(media) {
+	partsCount = media.parts.size();
+	if (type() == SendMediaType::File
+		|| type() == SendMediaType::ThemeFile
+		|| type() == SendMediaType::Audio) {
+		setDocSize(media.file.isEmpty()
+			? media.data.size()
+			: media.filesize);
+	} else {
+		docSize = docPartSize = docPartsCount = 0;
+	}
+}
+Uploader::File::File(const std::shared_ptr<FileLoadResult> &file)
 : file(file) {
-	partsCount = (file->type == SendMediaType::Photo
-		|| file->type == SendMediaType::Secure)
+	partsCount = (type() == SendMediaType::Photo
+		|| type() == SendMediaType::Secure)
 		? file->fileparts.size()
 		: file->thumbparts.size();
-	if (file->type == SendMediaType::File
-		|| file->type == SendMediaType::ThemeFile
-		|| file->type == SendMediaType::Audio) {
+	if (type() == SendMediaType::File
+		|| type() == SendMediaType::ThemeFile
+		|| type() == SendMediaType::Audio) {
 		setDocSize(file->filesize);
 	} else {
 		docSize = docPartSize = docPartsCount = 0;
@@ -115,6 +134,22 @@ bool Uploader::File::setPartSize(uint32 partSize) {
 	return (docPartsCount <= kDocumentMaxPartsCountDefault);
 }
 
+uint64 Uploader::File::id() const {
+	return file ? file->id : media.id;
+}
+
+SendMediaType Uploader::File::type() const {
+	return file ? file->type : media.type;
+}
+
+uint64 Uploader::File::thumbId() const {
+	return file ? file->thumbId : media.thumbId;
+}
+
+const QString &Uploader::File::filename() const {
+	return file ? file->filename : media.filename;
+}
+
 Uploader::Uploader(not_null<ApiWrap*> api)
 : _api(api)
 , _nextTimer([=] { sendNext(); })
@@ -247,9 +282,39 @@ Main::Session &Uploader::session() const {
 	return _api->session();
 }
 
+void Uploader::uploadMedia(
+		const FullMsgId &msgId,
+		const SendMediaReady &media) {
+	if (media.type == SendMediaType::Photo) {
+		session().data().processPhoto(media.photo, media.photoThumbs);
+	} else if (media.type == SendMediaType::File
+		|| media.type == SendMediaType::ThemeFile
+		|| media.type == SendMediaType::Audio) {
+		const auto document = media.photoThumbs.empty()
+			? session().data().processDocument(media.document)
+			: session().data().processDocument(
+				media.document,
+				Images::FromImageInMemory(
+					media.photoThumbs.front().second.image,
+					"JPG",
+					media.photoThumbs.front().second.bytes));
+		if (!media.data.isEmpty()) {
+			document->setDataAndCache(media.data);
+			if (media.type == SendMediaType::ThemeFile) {
+				document->checkWallPaperProperties();
+			}
+		}
+		if (!media.file.isEmpty()) {
+			document->setLocation(Core::FileLocation(media.file));
+		}
+	}
+	queue.emplace(msgId, File(media));
+	sendNext();
+}
+
 void Uploader::upload(
 		const FullMsgId &msgId,
-		const std::shared_ptr<FilePrepareResult> &file) {
+		const std::shared_ptr<FileLoadResult> &file) {
 	if (file->type == SendMediaType::Photo) {
 		const auto photo = session().data().processPhoto(
 			file->photo,
@@ -318,13 +383,13 @@ void Uploader::currentFailed() {
 }
 
 void Uploader::notifyFailed(FullMsgId id, const File &file) {
-	const auto type = file.file->type;
+	const auto type = file.type();
 	if (type == SendMediaType::Photo) {
 		_photoFailed.fire_copy(id);
 	} else if (type == SendMediaType::File
 		|| type == SendMediaType::ThemeFile
 		|| type == SendMediaType::Audio) {
-		const auto document = session().data().document(file.file->id);
+		const auto document = session().data().document(file.id());
 		if (document->uploading()) {
 			document->status = FileUploadFailed;
 		}
@@ -374,14 +439,18 @@ void Uploader::sendNext() {
 		}
 	}
 
-	auto &parts = (uploadingData.file->type == SendMediaType::Photo
-		|| uploadingData.file->type == SendMediaType::Secure)
-		? uploadingData.file->fileparts
-		: uploadingData.file->thumbparts;
-	const auto partsOfId = (uploadingData.file->type == SendMediaType::Photo
-		|| uploadingData.file->type == SendMediaType::Secure)
-		? uploadingData.file->id
-		: uploadingData.file->thumbId;
+	auto &parts = uploadingData.file
+		? ((uploadingData.type() == SendMediaType::Photo
+			|| uploadingData.type() == SendMediaType::Secure)
+			? uploadingData.file->fileparts
+			: uploadingData.file->thumbparts)
+		: uploadingData.media.parts;
+	const auto partsOfId = uploadingData.file
+		? ((uploadingData.type() == SendMediaType::Photo
+			|| uploadingData.type() == SendMediaType::Secure)
+			? uploadingData.file->id
+			: uploadingData.file->thumbId)
+		: uploadingData.media.thumbId;
 	if (parts.isEmpty()) {
 		if (uploadingData.docSentParts >= uploadingData.docPartsCount) {
 			if (requestsSent.empty() && docRequestsSent.empty()) {
@@ -393,17 +462,19 @@ void Uploader::sendNext() {
 				const auto attachedStickers = uploadingData.file
 					? uploadingData.file->attachedStickers
 					: std::vector<MTPInputDocument>();
-				if (uploadingData.file->type == SendMediaType::Photo) {
-					auto photoFilename = uploadingData.file->filename;
+				if (uploadingData.type() == SendMediaType::Photo) {
+					auto photoFilename = uploadingData.filename();
 					if (!photoFilename.endsWith(u".jpg"_q, Qt::CaseInsensitive)) {
 						// Server has some extensions checking for inputMediaUploadedPhoto,
 						// so force the extension to be .jpg anyway. It doesn't matter,
 						// because the filename from inputFile is not used anywhere.
 						photoFilename += u".jpg"_q;
 					}
-					const auto md5 = uploadingData.file->filemd5;
+					const auto md5 = uploadingData.file
+						? uploadingData.file->filemd5
+						: uploadingData.media.jpeg_md5;
 					const auto file = MTP_inputFile(
-						MTP_long(uploadingData.file->id),
+						MTP_long(uploadingData.id()),
 						MTP_int(uploadingData.partsCount),
 						MTP_string(photoFilename),
 						MTP_bytes(md5));
@@ -416,30 +487,34 @@ void Uploader::sendNext() {
 						.options = options,
 						.edit = edit,
 					});
-				} else if (uploadingData.file->type == SendMediaType::File
-					|| uploadingData.file->type == SendMediaType::ThemeFile
-					|| uploadingData.file->type == SendMediaType::Audio) {
+				} else if (uploadingData.type() == SendMediaType::File
+					|| uploadingData.type() == SendMediaType::ThemeFile
+					|| uploadingData.type() == SendMediaType::Audio) {
 					QByteArray docMd5(32, Qt::Uninitialized);
 					hashMd5Hex(uploadingData.md5Hash.result(), docMd5.data());
 
 					const auto file = (uploadingData.docSize > kUseBigFilesFrom)
 						? MTP_inputFileBig(
-							MTP_long(uploadingData.file->id),
+							MTP_long(uploadingData.id()),
 							MTP_int(uploadingData.docPartsCount),
-							MTP_string(uploadingData.file->filename))
+							MTP_string(uploadingData.filename()))
 						: MTP_inputFile(
-							MTP_long(uploadingData.file->id),
+							MTP_long(uploadingData.id()),
 							MTP_int(uploadingData.docPartsCount),
-							MTP_string(uploadingData.file->filename),
+							MTP_string(uploadingData.filename()),
 							MTP_bytes(docMd5));
 					const auto thumb = [&]() -> std::optional<MTPInputFile> {
 						if (!uploadingData.partsCount) {
 							return std::nullopt;
 						}
-						const auto thumbFilename = uploadingData.file->thumbname;
-						const auto thumbMd5 = uploadingData.file->thumbmd5;
+						const auto thumbFilename = uploadingData.file
+							? uploadingData.file->thumbname
+							: (u"thumb."_q + uploadingData.media.thumbExt);
+						const auto thumbMd5 = uploadingData.file
+							? uploadingData.file->thumbmd5
+							: uploadingData.media.jpeg_md5;
 						return MTP_inputFile(
-							MTP_long(uploadingData.file->thumbId),
+							MTP_long(uploadingData.thumbId()),
 							MTP_int(uploadingData.partsCount),
 							MTP_string(thumbFilename),
 							MTP_bytes(thumbMd5));
@@ -454,10 +529,10 @@ void Uploader::sendNext() {
 						.options = options,
 						.edit = edit,
 					});
-				} else if (uploadingData.file->type == SendMediaType::Secure) {
+				} else if (uploadingData.type() == SendMediaType::Secure) {
 					_secureReady.fire({
 						uploadingId,
-						uploadingData.file->id,
+						uploadingData.id(),
 						uploadingData.partsCount });
 				}
 				queue.erase(uploadingId);
@@ -467,11 +542,15 @@ void Uploader::sendNext() {
 			return;
 		}
 
-		auto &content = uploadingData.file->content;
+		auto &content = uploadingData.file
+			? uploadingData.file->content
+			: uploadingData.media.data;
 		QByteArray toSend;
 		if (content.isEmpty()) {
 			if (!uploadingData.docFile) {
-				const auto filepath = uploadingData.file->filepath;
+				const auto filepath = uploadingData.file
+					? uploadingData.file->filepath
+					: uploadingData.media.file;
 				uploadingData.docFile = std::make_unique<QFile>(filepath);
 				if (!uploadingData.docFile->open(QIODevice::ReadOnly)) {
 					currentFailed();
@@ -486,9 +565,9 @@ void Uploader::sendNext() {
 			const auto offset = uploadingData.docSentParts
 				* uploadingData.docPartSize;
 			toSend = content.mid(offset, uploadingData.docPartSize);
-			if ((uploadingData.file->type == SendMediaType::File
-				|| uploadingData.file->type == SendMediaType::ThemeFile
-				|| uploadingData.file->type == SendMediaType::Audio)
+			if ((uploadingData.type() == SendMediaType::File
+				|| uploadingData.type() == SendMediaType::ThemeFile
+				|| uploadingData.type() == SendMediaType::Audio)
 				&& uploadingData.docSentParts <= kUseBigFilesFrom) {
 				uploadingData.md5Hash.feed(toSend.constData(), toSend.size());
 			}
@@ -502,7 +581,7 @@ void Uploader::sendNext() {
 		mtpRequestId requestId;
 		if (uploadingData.docSize > kUseBigFilesFrom) {
 			requestId = _api->request(MTPupload_SaveBigFilePart(
-				MTP_long(uploadingData.file->id),
+				MTP_long(uploadingData.id()),
 				MTP_int(uploadingData.docSentParts),
 				MTP_int(uploadingData.docPartsCount),
 				MTP_bytes(toSend)
@@ -513,7 +592,7 @@ void Uploader::sendNext() {
 			}).toDC(MTP::uploadDcId(todc)).send();
 		} else {
 			requestId = _api->request(MTPupload_SaveFilePart(
-				MTP_long(uploadingData.file->id),
+				MTP_long(uploadingData.id()),
 				MTP_int(uploadingData.docSentParts),
 				MTP_bytes(toSend)
 			)).done([=](const MTPBool &result, mtpRequestId requestId) {
@@ -644,18 +723,18 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 			}
 			sentSize -= sentPartSize;
 			sentSizes[dc] -= sentPartSize;
-			if (file.file->type == SendMediaType::Photo) {
+			if (file.type() == SendMediaType::Photo) {
 				file.fileSentSize += sentPartSize;
-				const auto photo = session().data().photo(file.file->id);
+				const auto photo = session().data().photo(file.id());
 				if (photo->uploading() && file.file) {
 					photo->uploadingData->size = file.file->partssize;
 					photo->uploadingData->offset = file.fileSentSize;
 				}
 				_photoProgress.fire_copy(fullId);
-			} else if (file.file->type == SendMediaType::File
-				|| file.file->type == SendMediaType::ThemeFile
-				|| file.file->type == SendMediaType::Audio) {
-				const auto document = session().data().document(file.file->id);
+			} else if (file.type() == SendMediaType::File
+				|| file.type() == SendMediaType::ThemeFile
+				|| file.type() == SendMediaType::Audio) {
+				const auto document = session().data().document(file.id());
 				if (document->uploading()) {
 					const auto doneParts = file.docSentParts
 						- int(docRequestsSent.size());
@@ -664,7 +743,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 						doneParts * file.docPartSize);
 				}
 				_documentProgress.fire_copy(fullId);
-			} else if (file.file->type == SendMediaType::Secure) {
+			} else if (file.type() == SendMediaType::Secure) {
 				file.fileSentSize += sentPartSize;
 				_secureProgress.fire_copy({
 					fullId,
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index 4347e5c03..2e68307b9 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -12,7 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/facade.h"
 
 class ApiWrap;
-struct FilePrepareResult;
+struct FileLoadResult;
+struct SendMediaReady;
 
 namespace Api {
 enum class SendProgressType;
@@ -57,9 +58,10 @@ public:
 		return uploadingId;
 	}
 
+	void uploadMedia(const FullMsgId &msgId, const SendMediaReady &image);
 	void upload(
 		const FullMsgId &msgId,
-		const std::shared_ptr<FilePrepareResult> &file);
+		const std::shared_ptr<FileLoadResult> &file);
 
 	void cancel(const FullMsgId &msgId);
 	void pause(const FullMsgId &msgId);
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 192c7c112..c26b68458 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -222,6 +222,42 @@ int PhotoSideLimit() {
 	return PhotoSideLimit(SendLargePhotos.value());
 }
 
+SendMediaReady::SendMediaReady(
+	SendMediaType type,
+	const QString &file,
+	const QString &filename,
+	int64 filesize,
+	const QByteArray &data,
+	const uint64 &id,
+	const uint64 &thumbId,
+	const QString &thumbExt,
+	const PeerId &peer,
+	const MTPPhoto &photo,
+	const PreparedPhotoThumbs &photoThumbs,
+	const MTPDocument &document,
+	const QByteArray &jpeg)
+: type(type)
+, file(file)
+, filename(filename)
+, filesize(filesize)
+, data(data)
+, thumbExt(thumbExt)
+, id(id)
+, thumbId(thumbId)
+, peer(peer)
+, photo(photo)
+, document(document)
+, photoThumbs(photoThumbs) {
+	if (!jpeg.isEmpty()) {
+		int32 size = jpeg.size();
+		for (int32 i = 0, part = 0; i < size; i += kPhotoUploadPartSize, ++part) {
+			parts.insert(part, jpeg.mid(i, kPhotoUploadPartSize));
+		}
+		jpeg_md5.resize(32);
+		hashMd5Hex(jpeg.constData(), jpeg.size(), jpeg_md5.data());
+	}
+}
+
 TaskQueue::TaskQueue(crl::time stopTimeoutMs) {
 	if (stopTimeoutMs > 0) {
 		_stopTimer = new QTimer(this);
@@ -419,17 +455,22 @@ SendingAlbum::Item::Item(TaskId taskId)
 : taskId(taskId) {
 }
 
-FilePrepareResult::FilePrepareResult(FilePrepareDescriptor &&descriptor)
-: taskId(descriptor.taskId)
-, id(descriptor.id)
-, to(std::move(descriptor.to))
-, album(std::move(descriptor.album))
-, type(descriptor.type)
-, caption(std::move(descriptor.caption))
-, spoiler(descriptor.spoiler) {
+FileLoadResult::FileLoadResult(
+	TaskId taskId,
+	uint64 id,
+	const FileLoadTo &to,
+	const TextWithTags &caption,
+	bool spoiler,
+	std::shared_ptr<SendingAlbum> album)
+: taskId(taskId)
+, id(id)
+, to(to)
+, album(std::move(album))
+, caption(caption)
+, spoiler(spoiler) {
 }
 
-void FilePrepareResult::setFileData(const QByteArray &filedata) {
+void FileLoadResult::setFileData(const QByteArray &filedata) {
 	if (filedata.isEmpty()) {
 		partssize = 0;
 	} else {
@@ -442,7 +483,7 @@ void FilePrepareResult::setFileData(const QByteArray &filedata) {
 	}
 }
 
-void FilePrepareResult::setThumbData(const QByteArray &thumbdata) {
+void FileLoadResult::setThumbData(const QByteArray &thumbdata) {
 	if (!thumbdata.isEmpty()) {
 		thumbbytes = thumbdata;
 		int32 size = thumbdata.size();
@@ -454,11 +495,6 @@ void FilePrepareResult::setThumbData(const QByteArray &thumbdata) {
 	}
 }
 
-std::shared_ptr<FilePrepareResult> MakePreparedFile(
-		FilePrepareDescriptor &&descriptor) {
-	return std::make_shared<FilePrepareResult>(std::move(descriptor));
-}
-
 FileLoadTask::FileLoadTask(
 	not_null<Main::Session*> session,
 	const QString &filepath,
@@ -674,14 +710,13 @@ bool FileLoadTask::FillImageInformation(
 }
 
 void FileLoadTask::process(Args &&args) {
-	_result = MakePreparedFile({
-		.taskId = id(),
-		.id = _id,
-		.to = _to,
-		.caption = _caption,
-		.spoiler = _spoiler,
-		.album = _album,
-	});
+	_result = std::make_shared<FileLoadResult>(
+		id(),
+		_id,
+		_to,
+		_caption,
+		_spoiler,
+		_album);
 
 	QString filename, filemime;
 	qint64 filesize = 0;
@@ -1027,7 +1062,7 @@ void FileLoadTask::finish() {
 	}
 }
 
-FilePrepareResult *FileLoadTask::peekResult() const {
+FileLoadResult *FileLoadTask::peekResult() const {
 	return _result.get();
 }
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index 8b3b7bca7..d2e64b536 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -36,8 +36,43 @@ enum class SendMediaType {
 	Secure,
 };
 
+using UploadFileParts = QMap<int, QByteArray>;
+struct SendMediaReady {
+	SendMediaReady() = default; // temp
+	SendMediaReady(
+		SendMediaType type,
+		const QString &file,
+		const QString &filename,
+		int64 filesize,
+		const QByteArray &data,
+		const uint64 &id,
+		const uint64 &thumbId,
+		const QString &thumbExt,
+		const PeerId &peer,
+		const MTPPhoto &photo,
+		const PreparedPhotoThumbs &photoThumbs,
+		const MTPDocument &document,
+		const QByteArray &jpeg);
+
+	SendMediaType type;
+	QString file, filename;
+	int64 filesize = 0;
+	QByteArray data;
+	QString thumbExt;
+	uint64 id, thumbId; // id always file-id of media, thumbId is file-id of thumb ( == id for photos)
+	PeerId peer;
+
+	MTPPhoto photo;
+	MTPDocument document;
+	PreparedPhotoThumbs photoThumbs;
+	UploadFileParts parts;
+	QByteArray jpeg_md5;
+
+	QString caption;
+
+};
+
 using TaskId = void*; // no interface, just id
-inline constexpr auto kEmptyTaskId = TaskId();
 
 class Task {
 public:
@@ -109,7 +144,7 @@ struct SendingAlbum {
 	struct Item {
 		explicit Item(TaskId taskId);
 
-		TaskId taskId = kEmptyTaskId;
+		TaskId taskId;
 		uint64 randomId = 0;
 		FullMsgId msgId;
 		std::optional<MTPInputSingleMedia> media;
@@ -147,21 +182,17 @@ struct FileLoadTo {
 	MsgId replaceMediaOf;
 };
 
-using UploadFileParts = QMap<int, QByteArray>;
-struct FilePrepareDescriptor {
-	TaskId taskId = kEmptyTaskId;
-	base::required<uint64> id;
-	SendMediaType type = SendMediaType::File;
-	FileLoadTo to = { PeerId(), Api::SendOptions(), FullReplyTo(), MsgId() };
-	TextWithTags caption;
-	bool spoiler = false;
-	std::shared_ptr<SendingAlbum> album;
-};
-struct FilePrepareResult {
-	explicit FilePrepareResult(FilePrepareDescriptor &&descriptor);
+struct FileLoadResult {
+	FileLoadResult(
+		TaskId taskId,
+		uint64 id,
+		const FileLoadTo &to,
+		const TextWithTags &caption,
+		bool spoiler,
+		std::shared_ptr<SendingAlbum> album);
 
-	TaskId taskId = kEmptyTaskId;
-	uint64 id = 0;
+	TaskId taskId;
+	uint64 id;
 	FileLoadTo to;
 	std::shared_ptr<SendingAlbum> album;
 	SendMediaType type = SendMediaType::File;
@@ -185,8 +216,8 @@ struct FilePrepareResult {
 	QImage goodThumbnail;
 	QByteArray goodThumbnailBytes;
 
-	MTPPhoto photo = MTP_photoEmpty(MTP_long(0));
-	MTPDocument document = MTP_documentEmpty(MTP_long(0));
+	MTPPhoto photo;
+	MTPDocument document;
 
 	PreparedPhotoThumbs photoThumbs;
 	TextWithTags caption;
@@ -199,9 +230,6 @@ struct FilePrepareResult {
 
 };
 
-[[nodiscard]] std::shared_ptr<FilePrepareResult> MakePreparedFile(
-	FilePrepareDescriptor &&descriptor);
-
 class FileLoadTask final : public Task {
 public:
 	static std::unique_ptr<Ui::PreparedFileInformation> ReadMediaInformation(
@@ -248,7 +276,7 @@ public:
 	}
 	void finish() override;
 
-	FilePrepareResult *peekResult() const;
+	FileLoadResult *peekResult() const;
 
 private:
 	static bool CheckForSong(
@@ -284,6 +312,6 @@ private:
 	TextWithTags _caption;
 	bool _spoiler = false;
 
-	std::shared_ptr<FilePrepareResult> _result;
+	std::shared_ptr<FileLoadResult> _result;
 
 };
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index b225b321e..7409a95ee 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -585,11 +585,11 @@ void ChatBackground::checkUploadWallPaper() {
 	}
 
 	const auto ready = PrepareWallPaper(_session->mainDcId(), _original);
-	const auto documentId = ready->id;
+	const auto documentId = ready.id;
 	_wallPaperUploadId = FullMsgId(
 		_session->userPeerId(),
 		_session->data().nextLocalMessageId());
-	_session->uploader().upload(_wallPaperUploadId, ready);
+	_session->uploader().uploadMedia(_wallPaperUploadId, ready);
 	if (_wallPaperUploadLifetime) {
 		return;
 	}
@@ -1529,9 +1529,7 @@ bool ReadPaletteValues(const QByteArray &content, Fn<bool(QLatin1String name, QL
 	};
 }
 
-std::shared_ptr<FilePrepareResult> PrepareWallPaper(
-		MTP::DcId dcId,
-		const QImage &image) {
+SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
 	PreparedPhotoThumbs thumbnails;
 	QVector<MTPPhotoSize> sizes;
 
@@ -1557,7 +1555,6 @@ std::shared_ptr<FilePrepareResult> PrepareWallPaper(
 	};
 	push("s", scaled(320));
 
-	const auto id = base::RandomValue<DocumentId>();
 	const auto filename = u"wallpaper.jpg"_q;
 	auto attributes = QVector<MTPDocumentAttribute>(
 		1,
@@ -1565,20 +1562,8 @@ std::shared_ptr<FilePrepareResult> PrepareWallPaper(
 	attributes.push_back(MTP_documentAttributeImageSize(
 		MTP_int(image.width()),
 		MTP_int(image.height())));
-
-	auto result = MakePreparedFile({
-		.id = id,
-		.type = SendMediaType::ThemeFile,
-	});
-	result->filename = filename;
-	result->content = jpeg;
-	result->filesize = jpeg.size();
-	result->setFileData(jpeg);
-	if (thumbnails.empty()) {
-		result->thumb = thumbnails.front().second.image;
-		result->thumbbytes = thumbnails.front().second.bytes;
-	}
-	result->document = MTP_document(
+	const auto id = base::RandomValue<DocumentId>();
+	const auto document = MTP_document(
 		MTP_flags(0),
 		MTP_long(id),
 		MTP_long(0),
@@ -1590,7 +1575,21 @@ std::shared_ptr<FilePrepareResult> PrepareWallPaper(
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId),
 		MTP_vector<MTPDocumentAttribute>(attributes));
-	return result;
+
+	return SendMediaReady(
+		SendMediaType::ThemeFile,
+		QString(), // filepath
+		filename,
+		jpeg.size(),
+		jpeg,
+		id,
+		0,
+		QString(),
+		PeerId(),
+		MTP_photoEmpty(MTP_long(0)),
+		thumbnails,
+		document,
+		QByteArray());
 }
 
 std::unique_ptr<Ui::ChatTheme> DefaultChatThemeOn(rpl::lifetime &lifetime) {
diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h
index b0497fb0c..1425e4d07 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.h
+++ b/Telegram/SourceFiles/window/themes/window_theme.h
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/style/style_core_palette.h"
 
 class QFileSystemWatcher;
-struct FilePrepareResult;
+struct SendMediaReady;
 
 namespace style {
 struct colorizer;
@@ -298,7 +298,7 @@ private:
 
 };
 
-[[nodiscard]] std::shared_ptr<FilePrepareResult> PrepareWallPaper(
+[[nodiscard]] SendMediaReady PrepareWallPaper(
 	MTP::DcId dcId,
 	const QImage &image);
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
index c430b3e28..d448ca185 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
@@ -385,7 +385,7 @@ bool CopyColorsToPalette(
 	});
 }
 
-std::shared_ptr<FilePrepareResult> PrepareThemeMedia(
+SendMediaReady PrepareThemeMedia(
 		MTP::DcId dcId,
 		const QString &name,
 		const QByteArray &content) {
@@ -403,29 +403,28 @@ std::shared_ptr<FilePrepareResult> PrepareThemeMedia(
 		thumbnail.save(&buffer, "JPG", 87);
 	}
 
-	sizes.push_back(MTP_photoSize(
-		MTP_string("s"),
-		MTP_int(thumbnail.width()),
-		MTP_int(thumbnail.height()), MTP_int(0)));
+	const auto push = [&](
+			const char *type,
+			QImage &&image,
+			QByteArray bytes = QByteArray()) {
+		sizes.push_back(MTP_photoSize(
+			MTP_string(type),
+			MTP_int(image.width()),
+			MTP_int(image.height()), MTP_int(0)));
+		thumbnails.emplace(type[0], PreparedPhotoThumb{
+			.image = std::move(image),
+			.bytes = std::move(bytes)
+		});
+	};
+	push("s", std::move(thumbnail), thumbnailBytes);
 
-	const auto id = base::RandomValue<DocumentId>();
 	const auto filename = base::FileNameFromUserString(name)
 		+ u".tdesktop-theme"_q;
 	auto attributes = QVector<MTPDocumentAttribute>(
 		1,
 		MTP_documentAttributeFilename(MTP_string(filename)));
-
-	auto result = MakePreparedFile({
-		.id = id,
-		.type = SendMediaType::ThemeFile,
-	});
-	result->filename = filename;
-	result->content = content;
-	result->filesize = content.size();
-	result->thumb = thumbnail;
-	result->thumbname = "thumb.jpg";
-	result->setThumbData(thumbnailBytes);
-	result->document = MTP_document(
+	const auto id = base::RandomValue<DocumentId>();
+	const auto document = MTP_document(
 		MTP_flags(0),
 		MTP_long(id),
 		MTP_long(0),
@@ -437,7 +436,21 @@ std::shared_ptr<FilePrepareResult> PrepareThemeMedia(
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId),
 		MTP_vector<MTPDocumentAttribute>(attributes));
-	return result;
+
+	return SendMediaReady(
+		SendMediaType::ThemeFile,
+		QString(), // filepath
+		filename,
+		content.size(),
+		content,
+		id,
+		0,
+		QString(),
+		PeerId(),
+		MTP_photoEmpty(MTP_long(0)),
+		thumbnails,
+		document,
+		thumbnailBytes);
 }
 
 Fn<void()> SavePreparedTheme(
@@ -557,7 +570,7 @@ Fn<void()> SavePreparedTheme(
 			session->mainDcId(),
 			fields.title,
 			theme);
-		state->filename = media->filename;
+		state->filename = media.filename;
 		state->themeContent = theme;
 
 		session->uploader().documentReady(
@@ -567,7 +580,7 @@ Fn<void()> SavePreparedTheme(
 			uploadTheme(data);
 		}, state->lifetime);
 
-		session->uploader().upload(state->id, media);
+		session->uploader().uploadMedia(state->id, media);
 	};
 
 	const auto save = [=] {
@@ -986,15 +999,12 @@ ParsedTheme ParseTheme(
 [[nodiscard]] QString GenerateSlug() {
 	const auto letters = uint8('Z' + 1 - 'A');
 	const auto digits = uint8('9' + 1 - '0');
-	const auto firstValues = uint8(2 * letters);
 	const auto values = uint8(2 * letters + digits);
 
 	auto result = QString();
 	result.reserve(kRandomSlugSize);
 	for (auto i = 0; i != kRandomSlugSize; ++i) {
-		const auto value = i
-			? (base::RandomValue<uint8>() % values)
-			: (base::RandomValue<uint8>() % firstValues);
+		const auto value = base::RandomValue<uint8>() % values;
 		if (value < letters) {
 			result.append(char('A' + value));
 		} else if (value < 2 * letters) {

From ea178862d8ddf0da7671c14816abfee888869f74 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 20:41:13 +0400
Subject: [PATCH 230/596] Open some telegram.org and Telegram links in IV.

---
 .../SourceFiles/core/click_handler_types.h    |   1 +
 Telegram/SourceFiles/core/ui_integration.cpp  |   8 ++
 .../inline_bots/bot_attach_web_view.cpp       |  48 +------
 .../inline_bots/bot_attach_web_view.h         |   4 -
 Telegram/SourceFiles/iv/iv_instance.cpp       | 124 ++++++++++++++++--
 Telegram/SourceFiles/iv/iv_instance.h         |  21 +++
 6 files changed, 146 insertions(+), 60 deletions(-)

diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h
index 15a7dc1f9..e064d1e2d 100644
--- a/Telegram/SourceFiles/core/click_handler_types.h
+++ b/Telegram/SourceFiles/core/click_handler_types.h
@@ -46,6 +46,7 @@ struct ClickHandlerContext {
 	bool mayShowConfirmation = false;
 	bool skipBotAutoLogin = false;
 	bool botStartAutoSubmit = false;
+	bool ignoreIv = false;
 	// Is filled from peer info.
 	PeerData *peer = nullptr;
 };
diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index e6b62203d..6de0c7570 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_session.h"
 #include "data/data_sponsored_messages.h"
+#include "iv/iv_instance.h"
 #include "ui/text/text_custom_emoji.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/emoji_config.h"
@@ -237,6 +238,13 @@ bool UiIntegration::handleUrlClick(
 	} else if (local.startsWith(u"internal:"_q, Qt::CaseInsensitive)) {
 		Core::App().openInternalUrl(local, context);
 		return true;
+	} else if (Iv::PreferForUri(url)
+		&& !context.value<ClickHandlerContext>().ignoreIv) {
+		const auto my = context.value<ClickHandlerContext>();
+		if (const auto controller = my.sessionWindow.get()) {
+			Core::App().iv().openWithIvPreferred(controller, url, context);
+			return true;
+		}
 	}
 
 	auto parsed = UrlForAutoLogin(url);
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index c3f78b2d0..682afe3de 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -656,50 +656,12 @@ void AttachWebView::botHandleMenuButton(Ui::BotWebView::MenuButton button) {
 }
 
 void AttachWebView::botOpenIvLink(QString uri) {
-	const auto parts = uri.split('#');
-	if (parts.isEmpty()) {
-		return;
+	const auto window = _context ? _context->controller.get() : nullptr;
+	if (window) {
+		Core::App().iv().openWithIvPreferred(window, uri);
+	} else {
+		Core::App().iv().openWithIvPreferred(_session, uri);
 	}
-	const auto hash = (parts.size() > 1) ? parts[1] : u""_q;
-	const auto url = parts[0];
-	if (const auto i = _ivCache.find(url); i != end(_ivCache)) {
-		const auto page = i->second;
-		if (page && page->iv) {
-			const auto window = _context
-				? _context->controller.get()
-				: nullptr;
-			if (window) {
-				Core::App().iv().show(window, page->iv.get(), hash);
-			} else {
-				Core::App().iv().show(_session, page->iv.get(), hash);
-			}
-		} else {
-			UrlClickHandler::Open(uri);
-		}
-		return;
-	} else if (_ivRequestUri == uri) {
-		return;
-	} else if (_ivRequestId) {
-		_session->api().request(_ivRequestId).cancel();
-	}
-	const auto finish = [=](WebPageData *page) {
-		_ivRequestId = 0;
-		_ivRequestUri = QString();
-		_ivCache[url] = page;
-		botOpenIvLink(uri);
-	};
-	_ivRequestUri = uri;
-	_ivRequestId = _session->api().request(MTPmessages_GetWebPage(
-		MTP_string(url),
-		MTP_int(0)
-	)).done([=](const MTPmessages_WebPage &result) {
-		const auto &data = result.data();
-		_session->data().processUsers(data.vusers());
-		_session->data().processChats(data.vchats());
-		finish(_session->data().processWebpage(data.vwebpage()));
-	}).fail([=] {
-		finish(nullptr);
-	}).send();
 }
 
 void AttachWebView::botSendData(QByteArray data) {
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index c172cd5c3..aebf99332 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -267,10 +267,6 @@ private:
 	rpl::event_stream<> _attachBotsUpdates;
 	base::flat_set<not_null<UserData*>> _disclaimerAccepted;
 
-	base::flat_map<QString, WebPageData*> _ivCache;
-	QString _ivRequestUri;
-	mtpRequestId _ivRequestId = 0;
-
 	std::unique_ptr<Ui::BotWebView::Panel> _panel;
 	bool _catchingCancelInShowCall = false;
 
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index f84d55223..62527e35f 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/file_utilities.h"
 #include "core/shortcuts.h"
+#include "core/click_handler_types.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_cloud_file.h"
@@ -926,20 +927,104 @@ void Instance::show(
 		}
 	}, _shown->lifetime());
 
-	if (!_tracking.contains(session)) {
-		_tracking.emplace(session);
-		session->lifetime().add([=] {
-			_tracking.remove(session);
-			_joining.remove(session);
-			_fullRequested.remove(session);
-			if (_shownSession == session) {
-				_shownSession = nullptr;
-			}
-			if (_shown && _shown->showingFrom(session)) {
-				_shown = nullptr;
-			}
-		});
+	trackSession(session);
+}
+
+void Instance::trackSession(not_null<Main::Session*> session) {
+	if (!_tracking.emplace(session).second) {
+		return;
 	}
+	session->lifetime().add([=] {
+		_tracking.remove(session);
+		_joining.remove(session);
+		_fullRequested.remove(session);
+		_ivCache.remove(session);
+		if (_ivRequestSession == session) {
+			session->api().request(_ivRequestId).cancel();
+			_ivRequestSession = nullptr;
+			_ivRequestUri = QString();
+			_ivRequestId = 0;
+		}
+		if (_shownSession == session) {
+			_shownSession = nullptr;
+		}
+		if (_shown && _shown->showingFrom(session)) {
+			_shown = nullptr;
+		}
+	});
+}
+
+void Instance::openWithIvPreferred(
+		not_null<Window::SessionController*> controller,
+		QString uri,
+		QVariant context) {
+	auto my = context.value<ClickHandlerContext>();
+	my.sessionWindow = controller;
+	openWithIvPreferred(
+		&controller->session(),
+		uri,
+		QVariant::fromValue(my));
+}
+
+void Instance::openWithIvPreferred(
+		not_null<Main::Session*> session,
+		QString uri,
+		QVariant context) {
+	const auto openExternal = [=] {
+		auto my = context.value<ClickHandlerContext>();
+		my.ignoreIv = true;
+		UrlClickHandler::Open(uri, QVariant::fromValue(my));
+	};
+	const auto parts = uri.split('#');
+	if (parts.isEmpty() || parts[0].isEmpty()) {
+		return;
+	} else if (!ShowButton()) {
+		return openExternal();
+	}
+	trackSession(session);
+	const auto hash = (parts.size() > 1) ? parts[1] : u""_q;
+	const auto url = parts[0];
+	auto &cache = _ivCache[session];
+	if (const auto i = cache.find(url); i != end(cache)) {
+		const auto page = i->second;
+		if (page && page->iv) {
+			auto my = context.value<ClickHandlerContext>();
+			if (const auto window = my.sessionWindow.get()) {
+				show(window, page->iv.get(), hash);
+			} else {
+				show(session, page->iv.get(), hash);
+			}
+		} else {
+			openExternal();
+		}
+		return;
+	} else if (_ivRequestSession == session.get() && _ivRequestUri == uri) {
+		return;
+	} else if (_ivRequestId) {
+		_ivRequestSession->api().request(_ivRequestId).cancel();
+	}
+	const auto finish = [=](WebPageData *page) {
+		Expects(_ivRequestSession == session);
+
+		_ivRequestId = 0;
+		_ivRequestUri = QString();
+		_ivRequestSession = nullptr;
+		_ivCache[session][url] = page;
+		openWithIvPreferred(session, uri, context);
+	};
+	_ivRequestSession = session;
+	_ivRequestUri = uri;
+	_ivRequestId = session->api().request(MTPmessages_GetWebPage(
+		MTP_string(url),
+		MTP_int(0)
+	)).done([=](const MTPmessages_WebPage &result) {
+		const auto &data = result.data();
+		session->data().processUsers(data.vusers());
+		session->data().processChats(data.vchats());
+		finish(session->data().processWebpage(data.vwebpage()));
+	}).fail([=] {
+		finish(nullptr);
+	}).send();
 }
 
 void Instance::requestFull(
@@ -1033,4 +1118,17 @@ void Instance::closeAll() {
 	_shown = nullptr;
 }
 
+bool PreferForUri(const QString &uri) {
+	const auto url = QUrl(uri);
+	const auto host = url.host().toLower();
+	const auto path = url.path().toLower();
+	return (host == u"telegra.ph"_q)
+		|| (host == u"te.legra.ph"_q)
+		|| (host == u"graph.org"_q)
+		|| (host == u"telegram.org"_q
+			&& (path.startsWith(u"/faq"_q)
+				|| path.startsWith(u"/privacy"_q)
+				|| path.startsWith(u"/blog"_q)));
+}
+
 } // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_instance.h b/Telegram/SourceFiles/iv/iv_instance.h
index 608c9c283..1299bbddd 100644
--- a/Telegram/SourceFiles/iv/iv_instance.h
+++ b/Telegram/SourceFiles/iv/iv_instance.h
@@ -41,6 +41,15 @@ public:
 		not_null<Data*> data,
 		QString hash);
 
+	void openWithIvPreferred(
+		not_null<Window::SessionController*> controller,
+		QString uri,
+		QVariant context = {});
+	void openWithIvPreferred(
+		not_null<Main::Session*> session,
+		QString uri,
+		QVariant context = {});
+
 	[[nodiscard]] bool hasActiveWindow(
 		not_null<Main::Session*> session) const;
 
@@ -56,6 +65,8 @@ private:
 	void processJoinChannel(const QString &context);
 	void requestFull(not_null<Main::Session*> session, const QString &id);
 
+	void trackSession(not_null<Main::Session*> session);
+
 	const not_null<Delegate*> _delegate;
 
 	std::unique_ptr<Shown> _shown;
@@ -68,8 +79,18 @@ private:
 		not_null<Main::Session*>,
 		base::flat_set<QString>> _fullRequested;
 
+	base::flat_map<
+		not_null<Main::Session*>,
+		base::flat_map<QString, WebPageData*>> _ivCache;
+	Main::Session *_ivRequestSession = nullptr;
+	QString _ivRequestUri;
+	mtpRequestId _ivRequestId = 0;
+
+
 	rpl::lifetime _lifetime;
 
 };
 
+[[nodiscard]] bool PreferForUri(const QString &uri);
+
 } // namespace Iv

From 23883ed4a1db231d89fc678e5ef28c461a884945 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 21:08:56 +0400
Subject: [PATCH 231/596] Use generic way for FAQ links.

---
 Telegram/CMakeLists.txt                       |  2 -
 Telegram/SourceFiles/data/data_faq.cpp        | 53 -------------------
 Telegram/SourceFiles/data/data_faq.h          | 27 ----------
 Telegram/SourceFiles/data/data_session.h      |  5 --
 .../SourceFiles/settings/settings_intro.cpp   |  2 +-
 .../SourceFiles/settings/settings_main.cpp    | 13 ++++-
 Telegram/SourceFiles/settings/settings_main.h |  2 +
 Telegram/lib_base                             |  2 +-
 8 files changed, 15 insertions(+), 91 deletions(-)
 delete mode 100644 Telegram/SourceFiles/data/data_faq.cpp
 delete mode 100644 Telegram/SourceFiles/data/data_faq.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 97337d1a4..4988f34b3 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -508,8 +508,6 @@ PRIVATE
     data/data_drafts.h
     data/data_emoji_statuses.cpp
     data/data_emoji_statuses.h
-    data/data_faq.cpp
-    data/data_faq.h
     data/data_folder.cpp
     data/data_folder.h
     data/data_forum.cpp
diff --git a/Telegram/SourceFiles/data/data_faq.cpp b/Telegram/SourceFiles/data/data_faq.cpp
deleted file mode 100644
index 97ef86459..000000000
--- a/Telegram/SourceFiles/data/data_faq.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "data/data_faq.h"
-
-#include "apiwrap.h"
-#include "core/application.h"
-#include "data/data_session.h"
-#include "data/data_web_page.h"
-#include "iv/iv_instance.h"
-#include "lang/lang_keys.h"
-#include "main/main_session.h"
-#include "main/session/session_show.h"
-#include "ui/basic_click_handlers.h"
-
-namespace Data {
-
-void Faq::open(std::shared_ptr<Main::SessionShow> show) {
-	if (!_id) {
-		show->session().api().request(MTPmessages_GetWebPage(
-			MTP_string(tr::lng_settings_faq_link(tr::now)),
-			MTP_int(0)
-		)).done([=](const MTPmessages_WebPage &result) {
-			show->session().data().processUsers(result.data().vusers());
-			show->session().data().processChats(result.data().vchats());
-			const auto page = show->session().data().processWebpage(
-				result.data().vwebpage());
-			if (page && page->iv) {
-				_id = page->id;
-				open(show);
-			} else {
-				UrlClickHandler::Open(tr::lng_settings_faq_link(tr::now));
-			}
-		}).fail([=] {
-			UrlClickHandler::Open(tr::lng_settings_faq_link(tr::now));
-		}).send();
-	} else {
-		const auto page = show->session().data().webpage(_id);
-		if (page && page->iv) {
-			const auto parts = tr::lng_settings_faq_link(tr::now).split('#');
-			const auto hash = (parts.size() > 1) ? parts[1] : u""_q;
-			Core::App().iv().show(show, page->iv.get(), hash);
-		} else {
-			UrlClickHandler::Open(tr::lng_settings_faq_link(tr::now));
-		}
-	}
-}
-
-} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_faq.h b/Telegram/SourceFiles/data/data_faq.h
deleted file mode 100644
index 7e0179c3b..000000000
--- a/Telegram/SourceFiles/data/data_faq.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-namespace Main {
-class SessionShow;
-} // namespace Main
-
-namespace Data {
-
-class Faq final {
-public:
-	constexpr Faq() = default;
-
-	void open(std::shared_ptr<Main::SessionShow> show);
-
-private:
-	WebPageId _id = 0;
-
-};
-
-} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 41aa27570..0f7df77f4 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_databases.h"
 #include "dialogs/dialogs_main_list.h"
 #include "data/data_groups.h"
-#include "data/data_faq.h"
 #include "data/data_cloud_file.h"
 #include "history/history_location_manager.h"
 #include "base/timer.h"
@@ -102,9 +101,6 @@ public:
 	[[nodiscard]] const Groups &groups() const {
 		return _groups;
 	}
-	[[nodiscard]] Faq &faq() {
-		return _faq;
-	}
 	[[nodiscard]] ChatFilters &chatsFilters() const {
 		return *_chatsFilters;
 	}
@@ -1072,7 +1068,6 @@ private:
 		mtpRequestId> _viewAsMessagesRequests;
 
 	Groups _groups;
-	Faq _faq;
 	const std::unique_ptr<ChatFilters> _chatsFilters;
 	const std::unique_ptr<CloudThemes> _cloudThemes;
 	const std::unique_ptr<SendActionManager> _sendActionManager;
diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp
index 28665c913..6ddb33f75 100644
--- a/Telegram/SourceFiles/settings/settings_intro.cpp
+++ b/Telegram/SourceFiles/settings/settings_intro.cpp
@@ -110,7 +110,7 @@ object_ptr<Ui::RpWidget> CreateIntroSettings(
 		tr::lng_settings_faq(),
 		st::settingsButtonNoIcon
 	)->addClickHandler([] {
-		UrlClickHandler::Open(tr::lng_telegram_features_url(tr::now));
+		OpenFaq(nullptr);
 	});
 
 	return result;
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 4b2469b71..a33485c11 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_main.h"
 
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "settings/settings_business.h"
 #include "settings/settings_codes.h"
 #include "settings/settings_chat.h"
@@ -613,7 +614,7 @@ void SetupHelp(
 		st::settingsButton,
 		{ &st::menuIconFaq }
 	)->addClickHandler([=] {
-		controller->session().data().faq().open(controller->uiShow());
+		OpenFaq(controller);
 	});
 
 	AddButtonWithIcon(
@@ -659,7 +660,7 @@ void SetupHelp(
 			.text = tr::lng_settings_ask_sure(),
 			.confirmed = sure,
 			.cancelled = [=](Fn<void()> close) {
-				controller->session().data().faq().open(controller->uiShow());
+				OpenFaq(controller);
 				close();
 			},
 			.confirmText = tr::lng_settings_ask_ok(),
@@ -740,4 +741,12 @@ void Main::setupContent(not_null<Window::SessionController*> controller) {
 	controller->session().data().cloudThemes().refresh();
 }
 
+void OpenFaq(base::weak_ptr<Window::SessionController> weak) {
+	UrlClickHandler::Open(
+		tr::lng_settings_faq_link(tr::now),
+		QVariant::fromValue(ClickHandlerContext{
+			.sessionWindow = weak,
+		}));
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_main.h b/Telegram/SourceFiles/settings/settings_main.h
index 303c58c5d..a0f7e15ca 100644
--- a/Telegram/SourceFiles/settings/settings_main.h
+++ b/Telegram/SourceFiles/settings/settings_main.h
@@ -29,6 +29,8 @@ void SetupInterfaceScale(
 	not_null<Ui::VerticalLayout*> container,
 	bool icon = true);
 
+void OpenFaq(base::weak_ptr<Window::SessionController> weak);
+
 class Main : public Section<Main> {
 public:
 	Main(QWidget *parent, not_null<Window::SessionController*> controller);
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 8d4b2efa0..beef65fac 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 8d4b2efa0024016c6a6f6b4d8f1dfc3d62bafddc
+Subproject commit beef65fac578a812dade36557f4c666ac3d3ba78

From 690d52f7bc8059cf06cd45a1b9e57f4b94f192c4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 21:13:00 +0400
Subject: [PATCH 232/596] Version 4.16.2.

- Use IV by default for Telegraph and some Telegram links.
- Support IV links in bot web-apps.
- Some bug fixes.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index d97818b8e..821e6eb70 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.1.0" />
+    Version="4.16.2.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 7e6c0165e..d2f50744e 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 4,16,1,0
- PRODUCTVERSION 4,16,1,0
+ FILEVERSION 4,16,2,0
+ PRODUCTVERSION 4,16,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.16.1.0"
+            VALUE "FileVersion", "4.16.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.1.0"
+            VALUE "ProductVersion", "4.16.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 4b7bc1131..a395fa632 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 4,16,1,0
- PRODUCTVERSION 4,16,1,0
+ FILEVERSION 4,16,2,0
+ PRODUCTVERSION 4,16,2,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", "4.16.1.0"
+            VALUE "FileVersion", "4.16.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.1.0"
+            VALUE "ProductVersion", "4.16.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 027295e4f..beb3cc33b 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 = 4016001;
-constexpr auto AppVersionStr = "4.16.1";
+constexpr auto AppVersion = 4016002;
+constexpr auto AppVersionStr = "4.16.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 91212612f..20d886536 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016001
+AppVersion         4016002
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.1
-AppVersionStr      4.16.1
+AppVersionStrSmall 4.16.2
+AppVersionStr      4.16.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.16.1
+AppVersionOriginal 4.16.2
diff --git a/changelog.txt b/changelog.txt
index 56ff2649b..a0808da30 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+4.16.2 (04.04.24)
+
+- Use IV by default for Telegraph and some Telegram links.
+- Support IV links in bot web-apps.
+- Some bug fixes.
+
 4.16.1 (02.04.24)
 
 - Show information about Fragment phone numbers and usernames.

From b39e78a4a9bb559f3595fee41e0c8d2137f7d1ef Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 18:36:48 +0400
Subject: [PATCH 233/596] Reapply "Remove SendMediaReady legacy helper."

This reverts commit 09f07a7a9dde2c2b58c5a29fa6c20a95f4522dea.
---
 Telegram/SourceFiles/api/api_peer_photo.cpp   |  33 ++--
 Telegram/SourceFiles/api/api_ringtones.cpp    |  33 ++--
 Telegram/SourceFiles/api/api_sending.cpp      |   2 +-
 Telegram/SourceFiles/api/api_sending.h        |   4 +-
 .../boxes/background_preview_box.cpp          |   4 +-
 Telegram/SourceFiles/history/history_widget.h |   1 -
 Telegram/SourceFiles/iv/iv_data.cpp           |   2 +-
 Telegram/SourceFiles/mainwidget.h             |   1 -
 .../passport/passport_form_controller.cpp     |  12 +-
 Telegram/SourceFiles/storage/file_upload.cpp  | 177 +++++-------------
 Telegram/SourceFiles/storage/file_upload.h    |   6 +-
 .../SourceFiles/storage/localimageloader.cpp  |  83 +++-----
 .../SourceFiles/storage/localimageloader.h    |  74 +++-----
 .../window/themes/window_theme.cpp            |  41 ++--
 .../SourceFiles/window/themes/window_theme.h  |   4 +-
 .../window/themes/window_theme_editor_box.cpp |  60 +++---
 16 files changed, 183 insertions(+), 354 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_peer_photo.cpp b/Telegram/SourceFiles/api/api_peer_photo.cpp
index c70ef4491..9c8a470fa 100644
--- a/Telegram/SourceFiles/api/api_peer_photo.cpp
+++ b/Telegram/SourceFiles/api/api_peer_photo.cpp
@@ -34,7 +34,7 @@ namespace {
 
 constexpr auto kSharedMediaLimit = 100;
 
-[[nodiscard]] SendMediaReady PreparePeerPhoto(
+[[nodiscard]] std::shared_ptr<FilePrepareResult> PreparePeerPhoto(
 		MTP::DcId dcId,
 		PeerId peerId,
 		QImage &&image) {
@@ -80,24 +80,17 @@ constexpr auto kSharedMediaLimit = 100;
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId));
 
-	QString file, filename;
-	int64 filesize = 0;
-	QByteArray data;
-
-	return SendMediaReady(
-		SendMediaType::Photo,
-		file,
-		filename,
-		filesize,
-		data,
-		id,
-		id,
-		u"jpg"_q,
-		peerId,
-		photo,
-		photoThumbs,
-		MTP_documentEmpty(MTP_long(0)),
-		jpeg);
+	auto result = MakePreparedFile({
+		.id = id,
+		.type = SendMediaType::Photo,
+	});
+	result->type = SendMediaType::Photo;
+	result->setFileData(jpeg);
+	result->thumbId = id;
+	result->thumbname = "thumb.jpg";
+	result->photo = photo;
+	result->photoThumbs = photoThumbs;
+	return result;
 }
 
 [[nodiscard]] std::optional<MTPVideoSize> PrepareMtpMarkup(
@@ -239,7 +232,7 @@ void PeerPhoto::upload(
 			_api.instance().mainDcId(),
 			peer->id,
 			base::take(photo.image));
-		_session->uploader().uploadMedia(fakeId, ready);
+		_session->uploader().upload(fakeId, ready);
 	}
 }
 
diff --git a/Telegram/SourceFiles/api/api_ringtones.cpp b/Telegram/SourceFiles/api/api_ringtones.cpp
index 87522bf58..307ba580a 100644
--- a/Telegram/SourceFiles/api/api_ringtones.cpp
+++ b/Telegram/SourceFiles/api/api_ringtones.cpp
@@ -24,16 +24,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Api {
 namespace {
 
-SendMediaReady PrepareRingtoneDocument(
+std::shared_ptr<FilePrepareResult> PrepareRingtoneDocument(
 		MTP::DcId dcId,
 		const QString &filename,
 		const QString &filemime,
 		const QByteArray &content) {
+	const auto id = base::RandomValue<DocumentId>();
 	auto attributes = QVector<MTPDocumentAttribute>(
 		1,
 		MTP_documentAttributeFilename(MTP_string(filename)));
-	const auto id = base::RandomValue<DocumentId>();
-	const auto document = MTP_document(
+
+	auto result = MakePreparedFile({
+		.id = id,
+		.type = SendMediaType::File,
+	});
+	result->filename = filename;
+	result->content = content;
+	result->filesize = content.size();
+	result->setFileData(content);
+	result->document = MTP_document(
 		MTP_flags(0),
 		MTP_long(id),
 		MTP_long(0),
@@ -45,21 +54,7 @@ SendMediaReady PrepareRingtoneDocument(
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId),
 		MTP_vector<MTPDocumentAttribute>(std::move(attributes)));
-
-	return SendMediaReady(
-		SendMediaType::File,
-		QString(), // filepath
-		filename,
-		content.size(),
-		content,
-		id,
-		0,
-		QString(),
-		PeerId(),
-		MTP_photoEmpty(MTP_long(0)),
-		PreparedPhotoThumbs(),
-		document,
-		QByteArray());
+	return result;
 }
 
 } // namespace
@@ -102,7 +97,7 @@ void Ringtones::upload(
 		_uploads.erase(already);
 	}
 	_uploads.emplace(fakeId, uploadedData);
-	_session->uploader().uploadMedia(fakeId, ready);
+	_session->uploader().upload(fakeId, ready);
 }
 
 void Ringtones::ready(const FullMsgId &msgId, const MTPInputFile &file) {
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index 72bd06b3d..d91943fe0 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -353,7 +353,7 @@ void FillMessagePostFlags(
 
 void SendConfirmedFile(
 		not_null<Main::Session*> session,
-		const std::shared_ptr<FileLoadResult> &file) {
+		const std::shared_ptr<FilePrepareResult> &file) {
 	const auto isEditing = (file->type != SendMediaType::Audio)
 		&& (file->to.replaceMediaOf != 0);
 	const auto newId = FullMsgId(
diff --git a/Telegram/SourceFiles/api/api_sending.h b/Telegram/SourceFiles/api/api_sending.h
index e17c66f3e..2fdbad843 100644
--- a/Telegram/SourceFiles/api/api_sending.h
+++ b/Telegram/SourceFiles/api/api_sending.h
@@ -14,7 +14,7 @@ class Session;
 class History;
 class PhotoData;
 class DocumentData;
-struct FileLoadResult;
+struct FilePrepareResult;
 
 namespace Api {
 
@@ -40,6 +40,6 @@ void FillMessagePostFlags(
 
 void SendConfirmedFile(
 	not_null<Main::Session*> session,
-	const std::shared_ptr<FileLoadResult> &file);
+	const std::shared_ptr<FilePrepareResult> &file);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 3a9917719..a112c478a 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -593,11 +593,11 @@ void BackgroundPreviewBox::uploadForPeer(bool both) {
 	const auto ready = Window::Theme::PrepareWallPaper(
 		session->mainDcId(),
 		_paper.localThumbnail()->original());
-	const auto documentId = ready.id;
+	const auto documentId = ready->id;
 	_uploadId = FullMsgId(
 		session->userPeerId(),
 		session->data().nextLocalMessageId());
-	session->uploader().uploadMedia(_uploadId, ready);
+	session->uploader().upload(_uploadId, ready);
 	if (_uploadLifetime) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 43966331e..b4d8bb49c 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -18,7 +18,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/fields/input_field.h"
 #include "mtproto/sender.h"
 
-struct FileLoadResult;
 enum class SendMediaType;
 class MessageLinksParser;
 struct InlineBotQuery;
diff --git a/Telegram/SourceFiles/iv/iv_data.cpp b/Telegram/SourceFiles/iv/iv_data.cpp
index bbcca0b2c..5258e6c9f 100644
--- a/Telegram/SourceFiles/iv/iv_data.cpp
+++ b/Telegram/SourceFiles/iv/iv_data.cpp
@@ -25,7 +25,7 @@ QByteArray GeoPointId(Geo point) {
 	const auto lon = int(point.lon * 1000000);
 	const auto combined = (std::uint64_t(std::uint32_t(lat)) << 32)
 		| std::uint64_t(std::uint32_t(lon));
-	return QByteArray::number(combined)
+	return QByteArray::number(quint64(combined))
 		+ ','
 		+ QByteArray::number(point.access);
 }
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 10bea63d4..809086765 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -16,7 +16,6 @@ struct HistoryMessageMarkupButton;
 class MainWindow;
 class HistoryWidget;
 class StackItem;
-struct FileLoadResult;
 class History;
 class Image;
 
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index 684163163..980888ffb 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -1581,14 +1581,10 @@ void FormController::uploadEncryptedFile(
 		&session(),
 		std::make_unique<UploadScanData>(std::move(data)));
 
-	auto prepared = std::make_shared<FileLoadResult>(
-		TaskId(),
-		file.uploadData->fileId,
-		FileLoadTo(PeerId(), Api::SendOptions(), FullReplyTo(), MsgId()),
-		TextWithTags(),
-		false,
-		std::shared_ptr<SendingAlbum>(nullptr));
-	prepared->type = SendMediaType::Secure;
+	auto prepared = MakePreparedFile({
+		.id = file.uploadData->fileId,
+		.type = SendMediaType::Secure,
+	});
 	prepared->content = QByteArray::fromRawData(
 		reinterpret_cast<char*>(file.uploadData->bytes.data()),
 		file.uploadData->bytes.size());
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index c40396955..e0c7f8b57 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -59,22 +59,15 @@ constexpr auto kKillSessionTimeout = 15 * crl::time(1000);
 } // namespace
 
 struct Uploader::File {
-	File(const SendMediaReady &media);
-	File(const std::shared_ptr<FileLoadResult> &file);
+	explicit File(const std::shared_ptr<FilePrepareResult> &file);
 
 	void setDocSize(int64 size);
 	bool setPartSize(uint32 partSize);
 
-	std::shared_ptr<FileLoadResult> file;
-	SendMediaReady media;
+	std::shared_ptr<FilePrepareResult> file;
 	int32 partsCount = 0;
 	mutable int64 fileSentSize = 0;
 
-	uint64 id() const;
-	SendMediaType type() const;
-	uint64 thumbId() const;
-	const QString &filename() const;
-
 	HashMd5 md5Hash;
 
 	std::unique_ptr<QFile> docFile;
@@ -85,27 +78,15 @@ struct Uploader::File {
 
 };
 
-Uploader::File::File(const SendMediaReady &media) : media(media) {
-	partsCount = media.parts.size();
-	if (type() == SendMediaType::File
-		|| type() == SendMediaType::ThemeFile
-		|| type() == SendMediaType::Audio) {
-		setDocSize(media.file.isEmpty()
-			? media.data.size()
-			: media.filesize);
-	} else {
-		docSize = docPartSize = docPartsCount = 0;
-	}
-}
-Uploader::File::File(const std::shared_ptr<FileLoadResult> &file)
+Uploader::File::File(const std::shared_ptr<FilePrepareResult> &file)
 : file(file) {
-	partsCount = (type() == SendMediaType::Photo
-		|| type() == SendMediaType::Secure)
+	partsCount = (file->type == SendMediaType::Photo
+		|| file->type == SendMediaType::Secure)
 		? file->fileparts.size()
 		: file->thumbparts.size();
-	if (type() == SendMediaType::File
-		|| type() == SendMediaType::ThemeFile
-		|| type() == SendMediaType::Audio) {
+	if (file->type == SendMediaType::File
+		|| file->type == SendMediaType::ThemeFile
+		|| file->type == SendMediaType::Audio) {
 		setDocSize(file->filesize);
 	} else {
 		docSize = docPartSize = docPartsCount = 0;
@@ -134,22 +115,6 @@ bool Uploader::File::setPartSize(uint32 partSize) {
 	return (docPartsCount <= kDocumentMaxPartsCountDefault);
 }
 
-uint64 Uploader::File::id() const {
-	return file ? file->id : media.id;
-}
-
-SendMediaType Uploader::File::type() const {
-	return file ? file->type : media.type;
-}
-
-uint64 Uploader::File::thumbId() const {
-	return file ? file->thumbId : media.thumbId;
-}
-
-const QString &Uploader::File::filename() const {
-	return file ? file->filename : media.filename;
-}
-
 Uploader::Uploader(not_null<ApiWrap*> api)
 : _api(api)
 , _nextTimer([=] { sendNext(); })
@@ -282,39 +247,9 @@ Main::Session &Uploader::session() const {
 	return _api->session();
 }
 
-void Uploader::uploadMedia(
-		const FullMsgId &msgId,
-		const SendMediaReady &media) {
-	if (media.type == SendMediaType::Photo) {
-		session().data().processPhoto(media.photo, media.photoThumbs);
-	} else if (media.type == SendMediaType::File
-		|| media.type == SendMediaType::ThemeFile
-		|| media.type == SendMediaType::Audio) {
-		const auto document = media.photoThumbs.empty()
-			? session().data().processDocument(media.document)
-			: session().data().processDocument(
-				media.document,
-				Images::FromImageInMemory(
-					media.photoThumbs.front().second.image,
-					"JPG",
-					media.photoThumbs.front().second.bytes));
-		if (!media.data.isEmpty()) {
-			document->setDataAndCache(media.data);
-			if (media.type == SendMediaType::ThemeFile) {
-				document->checkWallPaperProperties();
-			}
-		}
-		if (!media.file.isEmpty()) {
-			document->setLocation(Core::FileLocation(media.file));
-		}
-	}
-	queue.emplace(msgId, File(media));
-	sendNext();
-}
-
 void Uploader::upload(
 		const FullMsgId &msgId,
-		const std::shared_ptr<FileLoadResult> &file) {
+		const std::shared_ptr<FilePrepareResult> &file) {
 	if (file->type == SendMediaType::Photo) {
 		const auto photo = session().data().processPhoto(
 			file->photo,
@@ -383,13 +318,13 @@ void Uploader::currentFailed() {
 }
 
 void Uploader::notifyFailed(FullMsgId id, const File &file) {
-	const auto type = file.type();
+	const auto type = file.file->type;
 	if (type == SendMediaType::Photo) {
 		_photoFailed.fire_copy(id);
 	} else if (type == SendMediaType::File
 		|| type == SendMediaType::ThemeFile
 		|| type == SendMediaType::Audio) {
-		const auto document = session().data().document(file.id());
+		const auto document = session().data().document(file.file->id);
 		if (document->uploading()) {
 			document->status = FileUploadFailed;
 		}
@@ -439,18 +374,14 @@ void Uploader::sendNext() {
 		}
 	}
 
-	auto &parts = uploadingData.file
-		? ((uploadingData.type() == SendMediaType::Photo
-			|| uploadingData.type() == SendMediaType::Secure)
-			? uploadingData.file->fileparts
-			: uploadingData.file->thumbparts)
-		: uploadingData.media.parts;
-	const auto partsOfId = uploadingData.file
-		? ((uploadingData.type() == SendMediaType::Photo
-			|| uploadingData.type() == SendMediaType::Secure)
-			? uploadingData.file->id
-			: uploadingData.file->thumbId)
-		: uploadingData.media.thumbId;
+	auto &parts = (uploadingData.file->type == SendMediaType::Photo
+		|| uploadingData.file->type == SendMediaType::Secure)
+		? uploadingData.file->fileparts
+		: uploadingData.file->thumbparts;
+	const auto partsOfId = (uploadingData.file->type == SendMediaType::Photo
+		|| uploadingData.file->type == SendMediaType::Secure)
+		? uploadingData.file->id
+		: uploadingData.file->thumbId;
 	if (parts.isEmpty()) {
 		if (uploadingData.docSentParts >= uploadingData.docPartsCount) {
 			if (requestsSent.empty() && docRequestsSent.empty()) {
@@ -462,19 +393,17 @@ void Uploader::sendNext() {
 				const auto attachedStickers = uploadingData.file
 					? uploadingData.file->attachedStickers
 					: std::vector<MTPInputDocument>();
-				if (uploadingData.type() == SendMediaType::Photo) {
-					auto photoFilename = uploadingData.filename();
+				if (uploadingData.file->type == SendMediaType::Photo) {
+					auto photoFilename = uploadingData.file->filename;
 					if (!photoFilename.endsWith(u".jpg"_q, Qt::CaseInsensitive)) {
 						// Server has some extensions checking for inputMediaUploadedPhoto,
 						// so force the extension to be .jpg anyway. It doesn't matter,
 						// because the filename from inputFile is not used anywhere.
 						photoFilename += u".jpg"_q;
 					}
-					const auto md5 = uploadingData.file
-						? uploadingData.file->filemd5
-						: uploadingData.media.jpeg_md5;
+					const auto md5 = uploadingData.file->filemd5;
 					const auto file = MTP_inputFile(
-						MTP_long(uploadingData.id()),
+						MTP_long(uploadingData.file->id),
 						MTP_int(uploadingData.partsCount),
 						MTP_string(photoFilename),
 						MTP_bytes(md5));
@@ -487,34 +416,30 @@ void Uploader::sendNext() {
 						.options = options,
 						.edit = edit,
 					});
-				} else if (uploadingData.type() == SendMediaType::File
-					|| uploadingData.type() == SendMediaType::ThemeFile
-					|| uploadingData.type() == SendMediaType::Audio) {
+				} else if (uploadingData.file->type == SendMediaType::File
+					|| uploadingData.file->type == SendMediaType::ThemeFile
+					|| uploadingData.file->type == SendMediaType::Audio) {
 					QByteArray docMd5(32, Qt::Uninitialized);
 					hashMd5Hex(uploadingData.md5Hash.result(), docMd5.data());
 
 					const auto file = (uploadingData.docSize > kUseBigFilesFrom)
 						? MTP_inputFileBig(
-							MTP_long(uploadingData.id()),
+							MTP_long(uploadingData.file->id),
 							MTP_int(uploadingData.docPartsCount),
-							MTP_string(uploadingData.filename()))
+							MTP_string(uploadingData.file->filename))
 						: MTP_inputFile(
-							MTP_long(uploadingData.id()),
+							MTP_long(uploadingData.file->id),
 							MTP_int(uploadingData.docPartsCount),
-							MTP_string(uploadingData.filename()),
+							MTP_string(uploadingData.file->filename),
 							MTP_bytes(docMd5));
 					const auto thumb = [&]() -> std::optional<MTPInputFile> {
 						if (!uploadingData.partsCount) {
 							return std::nullopt;
 						}
-						const auto thumbFilename = uploadingData.file
-							? uploadingData.file->thumbname
-							: (u"thumb."_q + uploadingData.media.thumbExt);
-						const auto thumbMd5 = uploadingData.file
-							? uploadingData.file->thumbmd5
-							: uploadingData.media.jpeg_md5;
+						const auto thumbFilename = uploadingData.file->thumbname;
+						const auto thumbMd5 = uploadingData.file->thumbmd5;
 						return MTP_inputFile(
-							MTP_long(uploadingData.thumbId()),
+							MTP_long(uploadingData.file->thumbId),
 							MTP_int(uploadingData.partsCount),
 							MTP_string(thumbFilename),
 							MTP_bytes(thumbMd5));
@@ -529,10 +454,10 @@ void Uploader::sendNext() {
 						.options = options,
 						.edit = edit,
 					});
-				} else if (uploadingData.type() == SendMediaType::Secure) {
+				} else if (uploadingData.file->type == SendMediaType::Secure) {
 					_secureReady.fire({
 						uploadingId,
-						uploadingData.id(),
+						uploadingData.file->id,
 						uploadingData.partsCount });
 				}
 				queue.erase(uploadingId);
@@ -542,15 +467,11 @@ void Uploader::sendNext() {
 			return;
 		}
 
-		auto &content = uploadingData.file
-			? uploadingData.file->content
-			: uploadingData.media.data;
+		auto &content = uploadingData.file->content;
 		QByteArray toSend;
 		if (content.isEmpty()) {
 			if (!uploadingData.docFile) {
-				const auto filepath = uploadingData.file
-					? uploadingData.file->filepath
-					: uploadingData.media.file;
+				const auto filepath = uploadingData.file->filepath;
 				uploadingData.docFile = std::make_unique<QFile>(filepath);
 				if (!uploadingData.docFile->open(QIODevice::ReadOnly)) {
 					currentFailed();
@@ -565,9 +486,9 @@ void Uploader::sendNext() {
 			const auto offset = uploadingData.docSentParts
 				* uploadingData.docPartSize;
 			toSend = content.mid(offset, uploadingData.docPartSize);
-			if ((uploadingData.type() == SendMediaType::File
-				|| uploadingData.type() == SendMediaType::ThemeFile
-				|| uploadingData.type() == SendMediaType::Audio)
+			if ((uploadingData.file->type == SendMediaType::File
+				|| uploadingData.file->type == SendMediaType::ThemeFile
+				|| uploadingData.file->type == SendMediaType::Audio)
 				&& uploadingData.docSentParts <= kUseBigFilesFrom) {
 				uploadingData.md5Hash.feed(toSend.constData(), toSend.size());
 			}
@@ -581,7 +502,7 @@ void Uploader::sendNext() {
 		mtpRequestId requestId;
 		if (uploadingData.docSize > kUseBigFilesFrom) {
 			requestId = _api->request(MTPupload_SaveBigFilePart(
-				MTP_long(uploadingData.id()),
+				MTP_long(uploadingData.file->id),
 				MTP_int(uploadingData.docSentParts),
 				MTP_int(uploadingData.docPartsCount),
 				MTP_bytes(toSend)
@@ -592,7 +513,7 @@ void Uploader::sendNext() {
 			}).toDC(MTP::uploadDcId(todc)).send();
 		} else {
 			requestId = _api->request(MTPupload_SaveFilePart(
-				MTP_long(uploadingData.id()),
+				MTP_long(uploadingData.file->id),
 				MTP_int(uploadingData.docSentParts),
 				MTP_bytes(toSend)
 			)).done([=](const MTPBool &result, mtpRequestId requestId) {
@@ -723,18 +644,18 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 			}
 			sentSize -= sentPartSize;
 			sentSizes[dc] -= sentPartSize;
-			if (file.type() == SendMediaType::Photo) {
+			if (file.file->type == SendMediaType::Photo) {
 				file.fileSentSize += sentPartSize;
-				const auto photo = session().data().photo(file.id());
+				const auto photo = session().data().photo(file.file->id);
 				if (photo->uploading() && file.file) {
 					photo->uploadingData->size = file.file->partssize;
 					photo->uploadingData->offset = file.fileSentSize;
 				}
 				_photoProgress.fire_copy(fullId);
-			} else if (file.type() == SendMediaType::File
-				|| file.type() == SendMediaType::ThemeFile
-				|| file.type() == SendMediaType::Audio) {
-				const auto document = session().data().document(file.id());
+			} else if (file.file->type == SendMediaType::File
+				|| file.file->type == SendMediaType::ThemeFile
+				|| file.file->type == SendMediaType::Audio) {
+				const auto document = session().data().document(file.file->id);
 				if (document->uploading()) {
 					const auto doneParts = file.docSentParts
 						- int(docRequestsSent.size());
@@ -743,7 +664,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 						doneParts * file.docPartSize);
 				}
 				_documentProgress.fire_copy(fullId);
-			} else if (file.type() == SendMediaType::Secure) {
+			} else if (file.file->type == SendMediaType::Secure) {
 				file.fileSentSize += sentPartSize;
 				_secureProgress.fire_copy({
 					fullId,
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index 2e68307b9..4347e5c03 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -12,8 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/facade.h"
 
 class ApiWrap;
-struct FileLoadResult;
-struct SendMediaReady;
+struct FilePrepareResult;
 
 namespace Api {
 enum class SendProgressType;
@@ -58,10 +57,9 @@ public:
 		return uploadingId;
 	}
 
-	void uploadMedia(const FullMsgId &msgId, const SendMediaReady &image);
 	void upload(
 		const FullMsgId &msgId,
-		const std::shared_ptr<FileLoadResult> &file);
+		const std::shared_ptr<FilePrepareResult> &file);
 
 	void cancel(const FullMsgId &msgId);
 	void pause(const FullMsgId &msgId);
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index c26b68458..192c7c112 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -222,42 +222,6 @@ int PhotoSideLimit() {
 	return PhotoSideLimit(SendLargePhotos.value());
 }
 
-SendMediaReady::SendMediaReady(
-	SendMediaType type,
-	const QString &file,
-	const QString &filename,
-	int64 filesize,
-	const QByteArray &data,
-	const uint64 &id,
-	const uint64 &thumbId,
-	const QString &thumbExt,
-	const PeerId &peer,
-	const MTPPhoto &photo,
-	const PreparedPhotoThumbs &photoThumbs,
-	const MTPDocument &document,
-	const QByteArray &jpeg)
-: type(type)
-, file(file)
-, filename(filename)
-, filesize(filesize)
-, data(data)
-, thumbExt(thumbExt)
-, id(id)
-, thumbId(thumbId)
-, peer(peer)
-, photo(photo)
-, document(document)
-, photoThumbs(photoThumbs) {
-	if (!jpeg.isEmpty()) {
-		int32 size = jpeg.size();
-		for (int32 i = 0, part = 0; i < size; i += kPhotoUploadPartSize, ++part) {
-			parts.insert(part, jpeg.mid(i, kPhotoUploadPartSize));
-		}
-		jpeg_md5.resize(32);
-		hashMd5Hex(jpeg.constData(), jpeg.size(), jpeg_md5.data());
-	}
-}
-
 TaskQueue::TaskQueue(crl::time stopTimeoutMs) {
 	if (stopTimeoutMs > 0) {
 		_stopTimer = new QTimer(this);
@@ -455,22 +419,17 @@ SendingAlbum::Item::Item(TaskId taskId)
 : taskId(taskId) {
 }
 
-FileLoadResult::FileLoadResult(
-	TaskId taskId,
-	uint64 id,
-	const FileLoadTo &to,
-	const TextWithTags &caption,
-	bool spoiler,
-	std::shared_ptr<SendingAlbum> album)
-: taskId(taskId)
-, id(id)
-, to(to)
-, album(std::move(album))
-, caption(caption)
-, spoiler(spoiler) {
+FilePrepareResult::FilePrepareResult(FilePrepareDescriptor &&descriptor)
+: taskId(descriptor.taskId)
+, id(descriptor.id)
+, to(std::move(descriptor.to))
+, album(std::move(descriptor.album))
+, type(descriptor.type)
+, caption(std::move(descriptor.caption))
+, spoiler(descriptor.spoiler) {
 }
 
-void FileLoadResult::setFileData(const QByteArray &filedata) {
+void FilePrepareResult::setFileData(const QByteArray &filedata) {
 	if (filedata.isEmpty()) {
 		partssize = 0;
 	} else {
@@ -483,7 +442,7 @@ void FileLoadResult::setFileData(const QByteArray &filedata) {
 	}
 }
 
-void FileLoadResult::setThumbData(const QByteArray &thumbdata) {
+void FilePrepareResult::setThumbData(const QByteArray &thumbdata) {
 	if (!thumbdata.isEmpty()) {
 		thumbbytes = thumbdata;
 		int32 size = thumbdata.size();
@@ -495,6 +454,11 @@ void FileLoadResult::setThumbData(const QByteArray &thumbdata) {
 	}
 }
 
+std::shared_ptr<FilePrepareResult> MakePreparedFile(
+		FilePrepareDescriptor &&descriptor) {
+	return std::make_shared<FilePrepareResult>(std::move(descriptor));
+}
+
 FileLoadTask::FileLoadTask(
 	not_null<Main::Session*> session,
 	const QString &filepath,
@@ -710,13 +674,14 @@ bool FileLoadTask::FillImageInformation(
 }
 
 void FileLoadTask::process(Args &&args) {
-	_result = std::make_shared<FileLoadResult>(
-		id(),
-		_id,
-		_to,
-		_caption,
-		_spoiler,
-		_album);
+	_result = MakePreparedFile({
+		.taskId = id(),
+		.id = _id,
+		.to = _to,
+		.caption = _caption,
+		.spoiler = _spoiler,
+		.album = _album,
+	});
 
 	QString filename, filemime;
 	qint64 filesize = 0;
@@ -1062,7 +1027,7 @@ void FileLoadTask::finish() {
 	}
 }
 
-FileLoadResult *FileLoadTask::peekResult() const {
+FilePrepareResult *FileLoadTask::peekResult() const {
 	return _result.get();
 }
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index d2e64b536..8b3b7bca7 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -36,43 +36,8 @@ enum class SendMediaType {
 	Secure,
 };
 
-using UploadFileParts = QMap<int, QByteArray>;
-struct SendMediaReady {
-	SendMediaReady() = default; // temp
-	SendMediaReady(
-		SendMediaType type,
-		const QString &file,
-		const QString &filename,
-		int64 filesize,
-		const QByteArray &data,
-		const uint64 &id,
-		const uint64 &thumbId,
-		const QString &thumbExt,
-		const PeerId &peer,
-		const MTPPhoto &photo,
-		const PreparedPhotoThumbs &photoThumbs,
-		const MTPDocument &document,
-		const QByteArray &jpeg);
-
-	SendMediaType type;
-	QString file, filename;
-	int64 filesize = 0;
-	QByteArray data;
-	QString thumbExt;
-	uint64 id, thumbId; // id always file-id of media, thumbId is file-id of thumb ( == id for photos)
-	PeerId peer;
-
-	MTPPhoto photo;
-	MTPDocument document;
-	PreparedPhotoThumbs photoThumbs;
-	UploadFileParts parts;
-	QByteArray jpeg_md5;
-
-	QString caption;
-
-};
-
 using TaskId = void*; // no interface, just id
+inline constexpr auto kEmptyTaskId = TaskId();
 
 class Task {
 public:
@@ -144,7 +109,7 @@ struct SendingAlbum {
 	struct Item {
 		explicit Item(TaskId taskId);
 
-		TaskId taskId;
+		TaskId taskId = kEmptyTaskId;
 		uint64 randomId = 0;
 		FullMsgId msgId;
 		std::optional<MTPInputSingleMedia> media;
@@ -182,17 +147,21 @@ struct FileLoadTo {
 	MsgId replaceMediaOf;
 };
 
-struct FileLoadResult {
-	FileLoadResult(
-		TaskId taskId,
-		uint64 id,
-		const FileLoadTo &to,
-		const TextWithTags &caption,
-		bool spoiler,
-		std::shared_ptr<SendingAlbum> album);
+using UploadFileParts = QMap<int, QByteArray>;
+struct FilePrepareDescriptor {
+	TaskId taskId = kEmptyTaskId;
+	base::required<uint64> id;
+	SendMediaType type = SendMediaType::File;
+	FileLoadTo to = { PeerId(), Api::SendOptions(), FullReplyTo(), MsgId() };
+	TextWithTags caption;
+	bool spoiler = false;
+	std::shared_ptr<SendingAlbum> album;
+};
+struct FilePrepareResult {
+	explicit FilePrepareResult(FilePrepareDescriptor &&descriptor);
 
-	TaskId taskId;
-	uint64 id;
+	TaskId taskId = kEmptyTaskId;
+	uint64 id = 0;
 	FileLoadTo to;
 	std::shared_ptr<SendingAlbum> album;
 	SendMediaType type = SendMediaType::File;
@@ -216,8 +185,8 @@ struct FileLoadResult {
 	QImage goodThumbnail;
 	QByteArray goodThumbnailBytes;
 
-	MTPPhoto photo;
-	MTPDocument document;
+	MTPPhoto photo = MTP_photoEmpty(MTP_long(0));
+	MTPDocument document = MTP_documentEmpty(MTP_long(0));
 
 	PreparedPhotoThumbs photoThumbs;
 	TextWithTags caption;
@@ -230,6 +199,9 @@ struct FileLoadResult {
 
 };
 
+[[nodiscard]] std::shared_ptr<FilePrepareResult> MakePreparedFile(
+	FilePrepareDescriptor &&descriptor);
+
 class FileLoadTask final : public Task {
 public:
 	static std::unique_ptr<Ui::PreparedFileInformation> ReadMediaInformation(
@@ -276,7 +248,7 @@ public:
 	}
 	void finish() override;
 
-	FileLoadResult *peekResult() const;
+	FilePrepareResult *peekResult() const;
 
 private:
 	static bool CheckForSong(
@@ -312,6 +284,6 @@ private:
 	TextWithTags _caption;
 	bool _spoiler = false;
 
-	std::shared_ptr<FileLoadResult> _result;
+	std::shared_ptr<FilePrepareResult> _result;
 
 };
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 7409a95ee..b225b321e 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -585,11 +585,11 @@ void ChatBackground::checkUploadWallPaper() {
 	}
 
 	const auto ready = PrepareWallPaper(_session->mainDcId(), _original);
-	const auto documentId = ready.id;
+	const auto documentId = ready->id;
 	_wallPaperUploadId = FullMsgId(
 		_session->userPeerId(),
 		_session->data().nextLocalMessageId());
-	_session->uploader().uploadMedia(_wallPaperUploadId, ready);
+	_session->uploader().upload(_wallPaperUploadId, ready);
 	if (_wallPaperUploadLifetime) {
 		return;
 	}
@@ -1529,7 +1529,9 @@ bool ReadPaletteValues(const QByteArray &content, Fn<bool(QLatin1String name, QL
 	};
 }
 
-SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
+std::shared_ptr<FilePrepareResult> PrepareWallPaper(
+		MTP::DcId dcId,
+		const QImage &image) {
 	PreparedPhotoThumbs thumbnails;
 	QVector<MTPPhotoSize> sizes;
 
@@ -1555,6 +1557,7 @@ SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
 	};
 	push("s", scaled(320));
 
+	const auto id = base::RandomValue<DocumentId>();
 	const auto filename = u"wallpaper.jpg"_q;
 	auto attributes = QVector<MTPDocumentAttribute>(
 		1,
@@ -1562,8 +1565,20 @@ SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
 	attributes.push_back(MTP_documentAttributeImageSize(
 		MTP_int(image.width()),
 		MTP_int(image.height())));
-	const auto id = base::RandomValue<DocumentId>();
-	const auto document = MTP_document(
+
+	auto result = MakePreparedFile({
+		.id = id,
+		.type = SendMediaType::ThemeFile,
+	});
+	result->filename = filename;
+	result->content = jpeg;
+	result->filesize = jpeg.size();
+	result->setFileData(jpeg);
+	if (thumbnails.empty()) {
+		result->thumb = thumbnails.front().second.image;
+		result->thumbbytes = thumbnails.front().second.bytes;
+	}
+	result->document = MTP_document(
 		MTP_flags(0),
 		MTP_long(id),
 		MTP_long(0),
@@ -1575,21 +1590,7 @@ SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId),
 		MTP_vector<MTPDocumentAttribute>(attributes));
-
-	return SendMediaReady(
-		SendMediaType::ThemeFile,
-		QString(), // filepath
-		filename,
-		jpeg.size(),
-		jpeg,
-		id,
-		0,
-		QString(),
-		PeerId(),
-		MTP_photoEmpty(MTP_long(0)),
-		thumbnails,
-		document,
-		QByteArray());
+	return result;
 }
 
 std::unique_ptr<Ui::ChatTheme> DefaultChatThemeOn(rpl::lifetime &lifetime) {
diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h
index 1425e4d07..b0497fb0c 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.h
+++ b/Telegram/SourceFiles/window/themes/window_theme.h
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/style/style_core_palette.h"
 
 class QFileSystemWatcher;
-struct SendMediaReady;
+struct FilePrepareResult;
 
 namespace style {
 struct colorizer;
@@ -298,7 +298,7 @@ private:
 
 };
 
-[[nodiscard]] SendMediaReady PrepareWallPaper(
+[[nodiscard]] std::shared_ptr<FilePrepareResult> PrepareWallPaper(
 	MTP::DcId dcId,
 	const QImage &image);
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
index d448ca185..c430b3e28 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
@@ -385,7 +385,7 @@ bool CopyColorsToPalette(
 	});
 }
 
-SendMediaReady PrepareThemeMedia(
+std::shared_ptr<FilePrepareResult> PrepareThemeMedia(
 		MTP::DcId dcId,
 		const QString &name,
 		const QByteArray &content) {
@@ -403,28 +403,29 @@ SendMediaReady PrepareThemeMedia(
 		thumbnail.save(&buffer, "JPG", 87);
 	}
 
-	const auto push = [&](
-			const char *type,
-			QImage &&image,
-			QByteArray bytes = QByteArray()) {
-		sizes.push_back(MTP_photoSize(
-			MTP_string(type),
-			MTP_int(image.width()),
-			MTP_int(image.height()), MTP_int(0)));
-		thumbnails.emplace(type[0], PreparedPhotoThumb{
-			.image = std::move(image),
-			.bytes = std::move(bytes)
-		});
-	};
-	push("s", std::move(thumbnail), thumbnailBytes);
+	sizes.push_back(MTP_photoSize(
+		MTP_string("s"),
+		MTP_int(thumbnail.width()),
+		MTP_int(thumbnail.height()), MTP_int(0)));
 
+	const auto id = base::RandomValue<DocumentId>();
 	const auto filename = base::FileNameFromUserString(name)
 		+ u".tdesktop-theme"_q;
 	auto attributes = QVector<MTPDocumentAttribute>(
 		1,
 		MTP_documentAttributeFilename(MTP_string(filename)));
-	const auto id = base::RandomValue<DocumentId>();
-	const auto document = MTP_document(
+
+	auto result = MakePreparedFile({
+		.id = id,
+		.type = SendMediaType::ThemeFile,
+	});
+	result->filename = filename;
+	result->content = content;
+	result->filesize = content.size();
+	result->thumb = thumbnail;
+	result->thumbname = "thumb.jpg";
+	result->setThumbData(thumbnailBytes);
+	result->document = MTP_document(
 		MTP_flags(0),
 		MTP_long(id),
 		MTP_long(0),
@@ -436,21 +437,7 @@ SendMediaReady PrepareThemeMedia(
 		MTPVector<MTPVideoSize>(),
 		MTP_int(dcId),
 		MTP_vector<MTPDocumentAttribute>(attributes));
-
-	return SendMediaReady(
-		SendMediaType::ThemeFile,
-		QString(), // filepath
-		filename,
-		content.size(),
-		content,
-		id,
-		0,
-		QString(),
-		PeerId(),
-		MTP_photoEmpty(MTP_long(0)),
-		thumbnails,
-		document,
-		thumbnailBytes);
+	return result;
 }
 
 Fn<void()> SavePreparedTheme(
@@ -570,7 +557,7 @@ Fn<void()> SavePreparedTheme(
 			session->mainDcId(),
 			fields.title,
 			theme);
-		state->filename = media.filename;
+		state->filename = media->filename;
 		state->themeContent = theme;
 
 		session->uploader().documentReady(
@@ -580,7 +567,7 @@ Fn<void()> SavePreparedTheme(
 			uploadTheme(data);
 		}, state->lifetime);
 
-		session->uploader().uploadMedia(state->id, media);
+		session->uploader().upload(state->id, media);
 	};
 
 	const auto save = [=] {
@@ -999,12 +986,15 @@ ParsedTheme ParseTheme(
 [[nodiscard]] QString GenerateSlug() {
 	const auto letters = uint8('Z' + 1 - 'A');
 	const auto digits = uint8('9' + 1 - '0');
+	const auto firstValues = uint8(2 * letters);
 	const auto values = uint8(2 * letters + digits);
 
 	auto result = QString();
 	result.reserve(kRandomSlugSize);
 	for (auto i = 0; i != kRandomSlugSize; ++i) {
-		const auto value = base::RandomValue<uint8>() % values;
+		const auto value = i
+			? (base::RandomValue<uint8>() % values)
+			: (base::RandomValue<uint8>() % firstValues);
 		if (value < letters) {
 			result.append(char('A' + value));
 		} else if (value < 2 * letters) {

From 5b0cac47ad41b6e5e4e4d2f6c195dd67dd120dfc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 18:37:00 +0400
Subject: [PATCH 234/596] Reapply "Use plain vector for prepared upload parts."

This reverts commit f6f8eefaa0e2f149c031fd83bcf0ee3f5759546e.
---
 Telegram/SourceFiles/storage/file_upload.cpp  | 160 ++++++++----------
 Telegram/SourceFiles/storage/file_upload.h    |  14 +-
 .../SourceFiles/storage/localimageloader.cpp  |   8 +-
 .../SourceFiles/storage/localimageloader.h    |   2 +-
 4 files changed, 88 insertions(+), 96 deletions(-)

diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index e0c7f8b57..b19af82df 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -65,7 +65,10 @@ struct Uploader::File {
 	bool setPartSize(uint32 partSize);
 
 	std::shared_ptr<FilePrepareResult> file;
-	int32 partsCount = 0;
+	const std::vector<QByteArray> &parts;
+	const uint64 partsOfId = 0;
+	int partsSent = 0;
+
 	mutable int64 fileSentSize = 0;
 
 	HashMd5 md5Hash;
@@ -79,11 +82,15 @@ struct Uploader::File {
 };
 
 Uploader::File::File(const std::shared_ptr<FilePrepareResult> &file)
-: file(file) {
-	partsCount = (file->type == SendMediaType::Photo
-		|| file->type == SendMediaType::Secure)
-		? file->fileparts.size()
-		: file->thumbparts.size();
+: file(file)
+, parts((file->type == SendMediaType::Photo
+	|| file->type == SendMediaType::Secure)
+		? file->fileparts
+		: file->thumbparts)
+, partsOfId((file->type == SendMediaType::Photo
+	|| file->type == SendMediaType::Secure)
+		? file->id
+		: file->thumbId) {
 	if (file->type == SendMediaType::File
 		|| file->type == SendMediaType::ThemeFile
 		|| file->type == SendMediaType::Audio) {
@@ -174,7 +181,7 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 
 	_api->instance().nonPremiumDelayedRequests(
 	) | rpl::start_with_next([=](mtpRequestId id) {
-		if (dcMap.contains(id)) {
+		if (_dcIndices.contains(id)) {
 			_nonPremiumDelayed.emplace(id);
 		}
 	}, _lifetime);
@@ -299,7 +306,7 @@ void Uploader::upload(
 }
 
 void Uploader::currentFailed() {
-	auto j = queue.find(uploadingId);
+	auto j = queue.find(_uploadingId);
 	if (j != queue.end()) {
 		const auto [msgId, file] = std::move(*j);
 		queue.erase(j);
@@ -307,11 +314,11 @@ void Uploader::currentFailed() {
 	}
 
 	cancelRequests();
-	dcMap.clear();
-	uploadingId = FullMsgId();
-	sentSize = 0;
+	_dcIndices.clear();
+	_uploadingId = FullMsgId();
+	_sentTotal = 0;
 	for (int i = 0; i < MTP::kUploadSessionsCount; ++i) {
-		sentSizes[i] = 0;
+		_sentPerDc[i] = 0;
 	}
 
 	sendNext();
@@ -343,7 +350,7 @@ void Uploader::stopSessions() {
 }
 
 void Uploader::sendNext() {
-	if (sentSize >= kMaxUploadFileParallelSize || _pausedId.msg) {
+	if (_sentTotal >= kMaxUploadFileParallelSize || _pausedId.msg) {
 		return;
 	}
 
@@ -358,33 +365,25 @@ void Uploader::sendNext() {
 	if (stopping) {
 		_stopSessionsTimer.cancel();
 	}
-	auto i = uploadingId.msg ? queue.find(uploadingId) : queue.begin();
-	if (!uploadingId.msg) {
-		uploadingId = i->first;
+	auto i = _uploadingId.msg ? queue.find(_uploadingId) : queue.begin();
+	if (!_uploadingId.msg) {
+		_uploadingId = i->first;
 	} else if (i == queue.end()) {
 		i = queue.begin();
-		uploadingId = i->first;
+		_uploadingId = i->first;
 	}
 	auto &uploadingData = i->second;
 
 	auto todc = 0;
 	for (auto dc = 1; dc != MTP::kUploadSessionsCount; ++dc) {
-		if (sentSizes[dc] < sentSizes[todc]) {
+		if (_sentPerDc[dc] < _sentPerDc[todc]) {
 			todc = dc;
 		}
 	}
 
-	auto &parts = (uploadingData.file->type == SendMediaType::Photo
-		|| uploadingData.file->type == SendMediaType::Secure)
-		? uploadingData.file->fileparts
-		: uploadingData.file->thumbparts;
-	const auto partsOfId = (uploadingData.file->type == SendMediaType::Photo
-		|| uploadingData.file->type == SendMediaType::Secure)
-		? uploadingData.file->id
-		: uploadingData.file->thumbId;
-	if (parts.isEmpty()) {
+	if (uploadingData.partsSent >= uploadingData.parts.size()) {
 		if (uploadingData.docSentParts >= uploadingData.docPartsCount) {
-			if (requestsSent.empty() && docRequestsSent.empty()) {
+			if (_sentSizes.empty()) {
 				const auto options = uploadingData.file
 					? uploadingData.file->to.options
 					: Api::SendOptions();
@@ -404,11 +403,11 @@ void Uploader::sendNext() {
 					const auto md5 = uploadingData.file->filemd5;
 					const auto file = MTP_inputFile(
 						MTP_long(uploadingData.file->id),
-						MTP_int(uploadingData.partsCount),
+						MTP_int(uploadingData.parts.size()),
 						MTP_string(photoFilename),
 						MTP_bytes(md5));
 					_photoReady.fire({
-						.fullId = uploadingId,
+						.fullId = _uploadingId,
 						.info = {
 							.file = file,
 							.attachedStickers = attachedStickers,
@@ -433,19 +432,19 @@ void Uploader::sendNext() {
 							MTP_string(uploadingData.file->filename),
 							MTP_bytes(docMd5));
 					const auto thumb = [&]() -> std::optional<MTPInputFile> {
-						if (!uploadingData.partsCount) {
+						if (uploadingData.parts.empty()) {
 							return std::nullopt;
 						}
 						const auto thumbFilename = uploadingData.file->thumbname;
 						const auto thumbMd5 = uploadingData.file->thumbmd5;
 						return MTP_inputFile(
 							MTP_long(uploadingData.file->thumbId),
-							MTP_int(uploadingData.partsCount),
+							MTP_int(uploadingData.parts.size()),
 							MTP_string(thumbFilename),
 							MTP_bytes(thumbMd5));
 					}();
 					_documentReady.fire({
-						.fullId = uploadingId,
+						.fullId = _uploadingId,
 						.info = {
 							.file = file,
 							.thumb = thumb,
@@ -456,12 +455,13 @@ void Uploader::sendNext() {
 					});
 				} else if (uploadingData.file->type == SendMediaType::Secure) {
 					_secureReady.fire({
-						uploadingId,
+						_uploadingId,
 						uploadingData.file->id,
-						uploadingData.partsCount });
+						int(uploadingData.parts.size()),
+					});
 				}
-				queue.erase(uploadingId);
-				uploadingId = FullMsgId();
+				queue.erase(_uploadingId);
+				_uploadingId = FullMsgId();
 				sendNext();
 			}
 			return;
@@ -522,36 +522,37 @@ void Uploader::sendNext() {
 				partFailed(error, requestId);
 			}).toDC(MTP::uploadDcId(todc)).send();
 		}
-		docRequestsSent.emplace(requestId, uploadingData.docSentParts);
-		dcMap.emplace(requestId, todc);
-		sentSize += uploadingData.docPartSize;
-		sentSizes[todc] += uploadingData.docPartSize;
+		_sentSizes.emplace(requestId, uploadingData.docPartSize);
+		_docSentRequests.emplace(requestId);
+		_dcIndices.emplace(requestId, todc);
+		_sentTotal += uploadingData.docPartSize;
+		_sentPerDc[todc] += uploadingData.docPartSize;
 
 		uploadingData.docSentParts++;
 	} else {
-		auto part = parts.begin();
+		const auto index = uploadingData.partsSent++;
+		const auto partBytes = uploadingData.parts[index];
+		const auto partSize = int(partBytes.size());
 
 		const auto requestId = _api->request(MTPupload_SaveFilePart(
-			MTP_long(partsOfId),
-			MTP_int(part.key()),
-			MTP_bytes(part.value())
+			MTP_long(uploadingData.partsOfId),
+			MTP_int(index),
+			MTP_bytes(partBytes)
 		)).done([=](const MTPBool &result, mtpRequestId requestId) {
 			partLoaded(result, requestId);
 		}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
 			partFailed(error, requestId);
 		}).toDC(MTP::uploadDcId(todc)).send();
-		requestsSent.emplace(requestId, part.value());
-		dcMap.emplace(requestId, todc);
-		sentSize += part.value().size();
-		sentSizes[todc] += part.value().size();
-
-		parts.erase(part);
+		_sentSizes.emplace(requestId, partSize);
+		_dcIndices.emplace(requestId, todc);
+		_sentTotal += partSize;
+		_sentPerDc[todc] += partSize;
 	}
 	_nextTimer.callOnce(kUploadRequestInterval);
 }
 
 void Uploader::cancel(const FullMsgId &msgId) {
-	if (uploadingId == msgId) {
+	if (_uploadingId == msgId) {
 		currentFailed();
 	} else {
 		queue.erase(msgId);
@@ -559,12 +560,12 @@ void Uploader::cancel(const FullMsgId &msgId) {
 }
 
 void Uploader::cancelAll() {
-	const auto single = queue.empty() ? uploadingId : queue.begin()->first;
+	const auto single = queue.empty() ? _uploadingId : queue.begin()->first;
 	if (!single) {
 		return;
 	}
 	_pausedId = single;
-	if (uploadingId) {
+	if (_uploadingId) {
 		currentFailed();
 	}
 	while (!queue.empty()) {
@@ -589,61 +590,49 @@ void Uploader::confirm(const FullMsgId &msgId) {
 }
 
 void Uploader::cancelRequests() {
-	for (const auto &requestData : requestsSent) {
+	_docSentRequests.clear();
+	for (const auto &requestData : _sentSizes) {
 		_api->request(requestData.first).cancel();
 	}
-	requestsSent.clear();
-	for (const auto &requestData : docRequestsSent) {
-		_api->request(requestData.first).cancel();
-	}
-	docRequestsSent.clear();
+	_sentSizes.clear();
 }
 
 void Uploader::clear() {
 	queue.clear();
 	cancelRequests();
-	dcMap.clear();
-	sentSize = 0;
+	_dcIndices.clear();
+	_sentTotal = 0;
 	for (int i = 0; i < MTP::kUploadSessionsCount; ++i) {
 		_api->instance().stopSession(MTP::uploadDcId(i));
-		sentSizes[i] = 0;
+		_sentPerDc[i] = 0;
 	}
 	_stopSessionsTimer.cancel();
 }
 
 void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
-	auto j = docRequestsSent.end();
-	auto i = requestsSent.find(requestId);
-	if (i == requestsSent.cend()) {
-		j = docRequestsSent.find(requestId);
-	}
+	_docSentRequests.remove(requestId);
+	auto i = _sentSizes.find(requestId);
 	const auto wasNonPremiumDelayed = _nonPremiumDelayed.remove(requestId);
-	if (i != requestsSent.cend() || j != docRequestsSent.cend()) {
+	if (i != _sentSizes.cend()) {
 		if (mtpIsFalse(result)) { // failed to upload current file
 			currentFailed();
 			return;
 		} else {
-			auto dcIt = dcMap.find(requestId);
-			if (dcIt == dcMap.cend()) { // must not happen
+			auto dcIt = _dcIndices.find(requestId);
+			if (dcIt == _dcIndices.cend()) { // must not happen
 				currentFailed();
 				return;
 			}
 			auto dc = dcIt->second;
-			dcMap.erase(dcIt);
+			_dcIndices.erase(dcIt);
 
-			int64 sentPartSize = 0;
-			auto k = queue.find(uploadingId);
+			int64 sentPartSize = i->second;
+			auto k = queue.find(_uploadingId);
 			Assert(k != queue.cend());
 			auto &[fullId, file] = *k;
-			if (i != requestsSent.cend()) {
-				sentPartSize = i->second.size();
-				requestsSent.erase(i);
-			} else {
-				sentPartSize = file.docPartSize;
-				docRequestsSent.erase(j);
-			}
-			sentSize -= sentPartSize;
-			sentSizes[dc] -= sentPartSize;
+			_sentSizes.erase(i);
+			_sentTotal -= sentPartSize;
+			_sentPerDc[dc] -= sentPartSize;
 			if (file.file->type == SendMediaType::Photo) {
 				file.fileSentSize += sentPartSize;
 				const auto photo = session().data().photo(file.file->id);
@@ -658,7 +647,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 				const auto document = session().data().document(file.file->id);
 				if (document->uploading()) {
 					const auto doneParts = file.docSentParts
-						- int(docRequestsSent.size());
+						- int(_docSentRequests.size());
 					document->uploadingData->offset = std::min(
 						document->uploadingData->size,
 						doneParts * file.docPartSize);
@@ -683,8 +672,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 void Uploader::partFailed(const MTP::Error &error, mtpRequestId requestId) {
 	// failed to upload current file
 	_nonPremiumDelayed.remove(requestId);
-	if ((requestsSent.find(requestId) != requestsSent.cend())
-		|| (docRequestsSent.find(requestId) != docRequestsSent.cend())) {
+	if (_sentSizes.find(requestId) != _sentSizes.cend()) {
 		currentFailed();
 	}
 	sendNext();
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index 4347e5c03..a733775ad 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -54,7 +54,7 @@ public:
 	[[nodiscard]] Main::Session &session() const;
 
 	[[nodiscard]] FullMsgId currentUploadId() const {
-		return uploadingId;
+		return _uploadingId;
 	}
 
 	void upload(
@@ -125,14 +125,14 @@ private:
 		int progress = 0);
 
 	const not_null<ApiWrap*> _api;
-	base::flat_map<mtpRequestId, QByteArray> requestsSent;
-	base::flat_map<mtpRequestId, int32> docRequestsSent;
-	base::flat_map<mtpRequestId, int32> dcMap;
+	base::flat_map<mtpRequestId, int> _sentSizes;
+	base::flat_set<mtpRequestId> _docSentRequests;
+	base::flat_map<mtpRequestId, int> _dcIndices;
 	base::flat_set<mtpRequestId> _nonPremiumDelayed;
-	uint32 sentSize = 0; // FileSize: Right now any file size fits 32 bit.
-	uint32 sentSizes[MTP::kUploadSessionsCount] = { 0 };
+	uint32 _sentTotal = 0; // FileSize: Right now any file size fits 32 bit.
+	uint32 _sentPerDc[MTP::kUploadSessionsCount] = { 0 };
 
-	FullMsgId uploadingId;
+	FullMsgId _uploadingId;
 	FullMsgId _pausedId;
 	std::map<FullMsgId, File> queue;
 	base::Timer _nextTimer, _stopSessionsTimer;
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 192c7c112..59f2fb505 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -434,8 +434,10 @@ void FilePrepareResult::setFileData(const QByteArray &filedata) {
 		partssize = 0;
 	} else {
 		partssize = filedata.size();
+		fileparts.reserve(
+			(partssize + kPhotoUploadPartSize - 1) / kPhotoUploadPartSize);
 		for (int32 i = 0, part = 0; i < partssize; i += kPhotoUploadPartSize, ++part) {
-			fileparts.insert(part, filedata.mid(i, kPhotoUploadPartSize));
+			fileparts.push_back(filedata.mid(i, kPhotoUploadPartSize));
 		}
 		filemd5.resize(32);
 		hashMd5Hex(filedata.constData(), filedata.size(), filemd5.data());
@@ -446,8 +448,10 @@ void FilePrepareResult::setThumbData(const QByteArray &thumbdata) {
 	if (!thumbdata.isEmpty()) {
 		thumbbytes = thumbdata;
 		int32 size = thumbdata.size();
+		thumbparts.reserve(
+			(size + kPhotoUploadPartSize - 1) / kPhotoUploadPartSize);
 		for (int32 i = 0, part = 0; i < size; i += kPhotoUploadPartSize, ++part) {
-			thumbparts.insert(part, thumbdata.mid(i, kPhotoUploadPartSize));
+			thumbparts.push_back(thumbdata.mid(i, kPhotoUploadPartSize));
 		}
 		thumbmd5.resize(32);
 		hashMd5Hex(thumbdata.constData(), thumbdata.size(), thumbmd5.data());
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index 8b3b7bca7..2756ac244 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -147,7 +147,7 @@ struct FileLoadTo {
 	MsgId replaceMediaOf;
 };
 
-using UploadFileParts = QMap<int, QByteArray>;
+using UploadFileParts = std::vector<QByteArray>;
 struct FilePrepareDescriptor {
 	TaskId taskId = kEmptyTaskId;
 	base::required<uint64> id;

From 0dcc439ddae2d686fc4b63e521c1d5eb829bc3ef Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 3 Apr 2024 13:49:36 +0400
Subject: [PATCH 235/596] Allow upload requests for several files at once.

---
 Telegram/SourceFiles/mtproto/facade.h         |   7 +-
 .../SourceFiles/mtproto/session_private.cpp   |   3 -
 Telegram/SourceFiles/storage/file_upload.cpp  | 675 ++++++++++--------
 Telegram/SourceFiles/storage/file_upload.h    |  75 +-
 4 files changed, 402 insertions(+), 358 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/facade.h b/Telegram/SourceFiles/mtproto/facade.h
index 6f31960da..39e2f732c 100644
--- a/Telegram/SourceFiles/mtproto/facade.h
+++ b/Telegram/SourceFiles/mtproto/facade.h
@@ -40,8 +40,6 @@ constexpr ShiftedDcId groupCallStreamDcId(DcId dcId) {
 	return ShiftDcId(dcId, kGroupCallStreamDcShift);
 }
 
-constexpr auto kUploadSessionsCount = 2;
-
 namespace details {
 
 constexpr ShiftedDcId downloadDcId(DcId dcId, int index) {
@@ -92,7 +90,6 @@ inline DcId getTemporaryIdFromRealDcId(ShiftedDcId shiftedDcId) {
 namespace details {
 
 constexpr ShiftedDcId uploadDcId(DcId dcId, int index) {
-	static_assert(kUploadSessionsCount < kMaxMediaDcCount, "Too large MTPUploadSessionsCount!");
 	return ShiftDcId(dcId, kBaseUploadDcShift + index);
 };
 
@@ -101,14 +98,14 @@ constexpr ShiftedDcId uploadDcId(DcId dcId, int index) {
 // send(req, callbacks, MTP::uploadDcId(index)) - for upload shifted dc id
 // uploading always to the main dc so BareDcId(result) == 0
 inline ShiftedDcId uploadDcId(int index) {
-	Expects(index >= 0 && index < kUploadSessionsCount);
+	Expects(index >= 0 && index < kMaxMediaDcCount);
 
 	return details::uploadDcId(0, index);
 };
 
 constexpr bool isUploadDcId(ShiftedDcId shiftedDcId) {
 	return (shiftedDcId >= details::uploadDcId(0, 0))
-		&& (shiftedDcId < details::uploadDcId(0, kUploadSessionsCount - 1) + kDcShift);
+		&& (shiftedDcId < details::uploadDcId(0, kMaxMediaDcCount - 1) + kDcShift);
 }
 
 inline ShiftedDcId destroyKeyNextDcId(ShiftedDcId shiftedDcId) {
diff --git a/Telegram/SourceFiles/mtproto/session_private.cpp b/Telegram/SourceFiles/mtproto/session_private.cpp
index 729a95ed6..05e968b7f 100644
--- a/Telegram/SourceFiles/mtproto/session_private.cpp
+++ b/Telegram/SourceFiles/mtproto/session_private.cpp
@@ -1108,9 +1108,6 @@ void SessionPrivate::onSentSome(uint64 size) {
 				DEBUG_LOG(("Checking connect for request with size %1 bytes, delay will be %2").arg(size).arg(remain));
 			}
 		}
-		if (isUploadDcId(_shiftedDcId)) {
-			remain *= kUploadSessionsCount;
-		}
 		_waitForReceivedTimer.callOnce(remain);
 	}
 	if (!_firstSentAt) {
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index b19af82df..b718ed95b 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -27,7 +27,7 @@ namespace Storage {
 namespace {
 
 // max 512kb uploaded at the same time in each session
-constexpr auto kMaxUploadFileParallelSize = MTP::kUploadSessionsCount * 512 * 1024;
+constexpr auto kMaxUploadPerSession = 512 * 1024;
 
 constexpr auto kDocumentMaxPartsCountDefault = 4000;
 
@@ -47,7 +47,7 @@ constexpr auto kDocumentUploadPartSize3 = 256 * 1024;
 constexpr auto kDocumentUploadPartSize4 = 512 * 1024;
 
 // One part each half second, if not uploaded faster.
-constexpr auto kUploadRequestInterval = crl::time(500);
+constexpr auto kUploadRequestInterval = crl::time(200);
 
 // How much time without upload causes additional session kill.
 constexpr auto kKillSessionTimeout = 15 * crl::time(1000);
@@ -58,35 +58,52 @@ constexpr auto kKillSessionTimeout = 15 * crl::time(1000);
 
 } // namespace
 
-struct Uploader::File {
-	explicit File(const std::shared_ptr<FilePrepareResult> &file);
+struct Uploader::Entry {
+	Entry(FullMsgId itemId, const std::shared_ptr<FilePrepareResult> &file);
 
 	void setDocSize(int64 size);
-	bool setPartSize(uint32 partSize);
+	bool setPartSize(int partSize);
 
+	// const, but non-const for the move-assignment in the
+	FullMsgId itemId;
 	std::shared_ptr<FilePrepareResult> file;
-	const std::vector<QByteArray> &parts;
-	const uint64 partsOfId = 0;
-	int partsSent = 0;
+	not_null<std::vector<QByteArray>*> parts;
+	uint64 partsOfId = 0;
 
-	mutable int64 fileSentSize = 0;
+	int partsSent = 0;
+	int partsWaiting = 0;
+	int64 partsSentSize = 0;
 
 	HashMd5 md5Hash;
 
 	std::unique_ptr<QFile> docFile;
 	int64 docSize = 0;
-	int64 docPartSize = 0;
-	int docSentParts = 0;
+	int64 docSentSize = 0;
+	int docPartSize = 0;
+	int docPartsSent = 0;
 	int docPartsCount = 0;
+	int docPartsWaiting = 0;
 
 };
 
-Uploader::File::File(const std::shared_ptr<FilePrepareResult> &file)
-: file(file)
+struct Uploader::Request {
+	FullMsgId itemId;
+	crl::time sent = 0;
+	QByteArray bytes;
+	int dcIndex = 0;
+	bool docPart = false;
+	bool nonPremiumDelayed = false;
+};
+
+Uploader::Entry::Entry(
+	FullMsgId itemId,
+	const std::shared_ptr<FilePrepareResult> &file)
+: itemId(itemId)
+, file(file)
 , parts((file->type == SendMediaType::Photo
 	|| file->type == SendMediaType::Secure)
-		? file->fileparts
-		: file->thumbparts)
+		? &file->fileparts
+		: &file->thumbparts)
 , partsOfId((file->type == SendMediaType::Photo
 	|| file->type == SendMediaType::Secure)
 		? file->id
@@ -95,12 +112,10 @@ Uploader::File::File(const std::shared_ptr<FilePrepareResult> &file)
 		|| file->type == SendMediaType::ThemeFile
 		|| file->type == SendMediaType::Audio) {
 		setDocSize(file->filesize);
-	} else {
-		docSize = docPartSize = docPartsCount = 0;
 	}
 }
 
-void Uploader::File::setDocSize(int64 size) {
+void Uploader::Entry::setDocSize(int64 size) {
 	docSize = size;
 	constexpr auto limit0 = 1024 * 1024;
 	constexpr auto limit1 = 32 * limit0;
@@ -115,16 +130,15 @@ void Uploader::File::setDocSize(int64 size) {
 	}
 }
 
-bool Uploader::File::setPartSize(uint32 partSize) {
+bool Uploader::Entry::setPartSize(int partSize) {
 	docPartSize = partSize;
-	docPartsCount = (docSize / docPartSize)
-		+ ((docSize % docPartSize) ? 1 : 0);
+	docPartsCount = (docSize + docPartSize - 1) / docPartSize;
 	return (docPartsCount <= kDocumentMaxPartsCountDefault);
 }
 
 Uploader::Uploader(not_null<ApiWrap*> api)
 : _api(api)
-, _nextTimer([=] { sendNext(); })
+, _nextTimer([=] { maybeSendNext(); })
 , _stopSessionsTimer([=] { stopSessions(); }) {
 	const auto session = &_api->session();
 	photoReady(
@@ -181,22 +195,21 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 
 	_api->instance().nonPremiumDelayedRequests(
 	) | rpl::start_with_next([=](mtpRequestId id) {
-		if (_dcIndices.contains(id)) {
-			_nonPremiumDelayed.emplace(id);
+		const auto i = _requests.find(id);
+		if (i != end(_requests)) {
+			i->second.nonPremiumDelayed = true;
 		}
 	}, _lifetime);
 }
 
-void Uploader::processPhotoProgress(const FullMsgId &newId) {
-	const auto session = &_api->session();
-	if (const auto item = session->data().message(newId)) {
+void Uploader::processPhotoProgress(FullMsgId itemId) {
+	if (const auto item = session().data().message(itemId)) {
 		sendProgressUpdate(item, Api::SendProgressType::UploadPhoto);
 	}
 }
 
-void Uploader::processDocumentProgress(const FullMsgId &newId) {
-	const auto session = &_api->session();
-	if (const auto item = session->data().message(newId)) {
+void Uploader::processDocumentProgress(FullMsgId itemId) {
+	if (const auto item = session().data().message(itemId)) {
 		const auto media = item->media();
 		const auto document = media ? media->document() : nullptr;
 		const auto sendAction = (document && document->isVoiceMessage())
@@ -210,16 +223,14 @@ void Uploader::processDocumentProgress(const FullMsgId &newId) {
 	}
 }
 
-void Uploader::processPhotoFailed(const FullMsgId &newId) {
-	const auto session = &_api->session();
-	if (const auto item = session->data().message(newId)) {
+void Uploader::processPhotoFailed(FullMsgId itemId) {
+	if (const auto item = session().data().message(itemId)) {
 		sendProgressUpdate(item, Api::SendProgressType::UploadPhoto, -1);
 	}
 }
 
-void Uploader::processDocumentFailed(const FullMsgId &newId) {
-	const auto session = &_api->session();
-	if (const auto item = session->data().message(newId)) {
+void Uploader::processDocumentFailed(FullMsgId itemId) {
+	if (const auto item = session().data().message(itemId)) {
 		const auto media = item->media();
 		const auto document = media ? media->document() : nullptr;
 		const auto sendAction = (document && document->isVoiceMessage())
@@ -254,8 +265,12 @@ Main::Session &Uploader::session() const {
 	return _api->session();
 }
 
+FullMsgId Uploader::currentUploadId() const {
+	return _queue.empty() ? FullMsgId() : _queue.front().itemId;
+}
+
 void Uploader::upload(
-		const FullMsgId &msgId,
+		FullMsgId itemId,
 		const std::shared_ptr<FilePrepareResult> &file) {
 	if (file->type == SendMediaType::Photo) {
 		const auto photo = session().data().processPhoto(
@@ -301,211 +316,147 @@ void Uploader::upload(
 			document->checkWallPaperProperties();
 		}
 	}
-	queue.emplace(msgId, File(file));
-	sendNext();
+	_queue.push_back({ itemId, file });
+	maybeSendNext();
 }
 
-void Uploader::currentFailed() {
-	auto j = queue.find(_uploadingId);
-	if (j != queue.end()) {
-		const auto [msgId, file] = std::move(*j);
-		queue.erase(j);
-		notifyFailed(msgId, file);
+void Uploader::failed(FullMsgId itemId) {
+	const auto i = ranges::find(_queue, itemId, &Entry::itemId);
+	if (i != end(_queue)) {
+		const auto entry = std::move(*i);
+		_queue.erase(i);
+		notifyFailed(entry);
 	}
-
-	cancelRequests();
-	_dcIndices.clear();
-	_uploadingId = FullMsgId();
-	_sentTotal = 0;
-	for (int i = 0; i < MTP::kUploadSessionsCount; ++i) {
-		_sentPerDc[i] = 0;
-	}
-
-	sendNext();
+	cancelRequests(itemId);
+	maybeFinishFront();
+	crl::on_main(this, [=] {
+		maybeSendNext();
+	});
 }
 
-void Uploader::notifyFailed(FullMsgId id, const File &file) {
-	const auto type = file.file->type;
+void Uploader::notifyFailed(const Entry &entry) {
+	const auto type = entry.file->type;
 	if (type == SendMediaType::Photo) {
-		_photoFailed.fire_copy(id);
+		_photoFailed.fire_copy(entry.itemId);
 	} else if (type == SendMediaType::File
 		|| type == SendMediaType::ThemeFile
 		|| type == SendMediaType::Audio) {
-		const auto document = session().data().document(file.file->id);
+		const auto document = session().data().document(entry.file->id);
 		if (document->uploading()) {
 			document->status = FileUploadFailed;
 		}
-		_documentFailed.fire_copy(id);
+		_documentFailed.fire_copy(entry.itemId);
 	} else if (type == SendMediaType::Secure) {
-		_secureFailed.fire_copy(id);
+		_secureFailed.fire_copy(entry.itemId);
 	} else {
-		Unexpected("Type in Uploader::currentFailed.");
+		Unexpected("Type in Uploader::failed.");
 	}
 }
 
 void Uploader::stopSessions() {
-	for (int i = 0; i < MTP::kUploadSessionsCount; ++i) {
-		_api->instance().stopSession(MTP::uploadDcId(i));
+	if (ranges::any_of(_sentPerDcIndex, rpl::mappers::_1 != 0)) {
+		_stopSessionsTimer.callOnce(kKillSessionTimeout);
+	} else {
+		for (auto i = 0; i != int(_sentPerDcIndex.size()); ++i) {
+			_api->instance().stopSession(MTP::uploadDcId(i));
+		}
+		_sentPerDcIndex.clear();
 	}
 }
 
-void Uploader::sendNext() {
-	if (_sentTotal >= kMaxUploadFileParallelSize || _pausedId.msg) {
-		return;
+QByteArray Uploader::readDocPart(not_null<Entry*> entry) {
+	const auto checked = [&](QByteArray result) {
+		if ((entry->file->type == SendMediaType::File
+			|| entry->file->type == SendMediaType::ThemeFile
+			|| entry->file->type == SendMediaType::Audio)
+			&& entry->docSize <= kUseBigFilesFrom) {
+			entry->md5Hash.feed(result.data(), result.size());
+		}
+		if (result.isEmpty()
+			|| (result.size() > entry->docPartSize)
+			|| ((result.size() < entry->docPartSize
+				&& entry->docPartsSent + 1 != entry->docPartsCount))) {
+			return QByteArray();
+		}
+		return result;
+	};
+	auto &content = entry->file->content;
+	if (!content.isEmpty()) {
+		const auto offset = entry->docPartsSent * entry->docPartSize;
+		return checked(content.mid(offset, entry->docPartSize));
+	} else if (!entry->docFile) {
+		const auto filepath = entry->file->filepath;
+		entry->docFile = std::make_unique<QFile>(filepath);
+		if (!entry->docFile->open(QIODevice::ReadOnly)) {
+			return QByteArray();
+		}
 	}
+	return checked(entry->docFile->read(entry->docPartSize));
+}
 
+void Uploader::maybeSendNext() {
 	const auto stopping = _stopSessionsTimer.isActive();
-	if (queue.empty()) {
+	if (_queue.empty()) {
 		if (!stopping) {
 			_stopSessionsTimer.callOnce(kKillSessionTimeout);
 		}
+		_pausedId = FullMsgId();
+		return;
+	} else if (_pausedId) {
 		return;
 	}
 
 	if (stopping) {
 		_stopSessionsTimer.cancel();
 	}
-	auto i = _uploadingId.msg ? queue.find(_uploadingId) : queue.begin();
-	if (!_uploadingId.msg) {
-		_uploadingId = i->first;
-	} else if (i == queue.end()) {
-		i = queue.begin();
-		_uploadingId = i->first;
-	}
-	auto &uploadingData = i->second;
 
 	auto todc = 0;
-	for (auto dc = 1; dc != MTP::kUploadSessionsCount; ++dc) {
-		if (_sentPerDc[dc] < _sentPerDc[todc]) {
-			todc = dc;
+	if (_sentPerDcIndex.size() < 2) {
+		todc = int(_sentPerDcIndex.size());
+		_sentPerDcIndex.resize(todc + 1);
+	} else {
+		const auto min = ranges::min_element(_sentPerDcIndex);
+		todc = int(min - begin(_sentPerDcIndex));
+	}
+	const auto alreadySent = _sentPerDcIndex[todc];
+
+	const auto entry = [&]() -> Entry* {
+		for (auto i = begin(_queue); i != end(_queue); ++i) {
+			if (i->partsSent < i->parts->size()
+				|| i->docPartsSent < i->docPartsCount) {
+				return &*i;
+			}
 		}
+		return nullptr;
+	}();
+	if (!entry) {
+		return;
 	}
 
-	if (uploadingData.partsSent >= uploadingData.parts.size()) {
-		if (uploadingData.docSentParts >= uploadingData.docPartsCount) {
-			if (_sentSizes.empty()) {
-				const auto options = uploadingData.file
-					? uploadingData.file->to.options
-					: Api::SendOptions();
-				const auto edit = uploadingData.file &&
-					uploadingData.file->to.replaceMediaOf;
-				const auto attachedStickers = uploadingData.file
-					? uploadingData.file->attachedStickers
-					: std::vector<MTPInputDocument>();
-				if (uploadingData.file->type == SendMediaType::Photo) {
-					auto photoFilename = uploadingData.file->filename;
-					if (!photoFilename.endsWith(u".jpg"_q, Qt::CaseInsensitive)) {
-						// Server has some extensions checking for inputMediaUploadedPhoto,
-						// so force the extension to be .jpg anyway. It doesn't matter,
-						// because the filename from inputFile is not used anywhere.
-						photoFilename += u".jpg"_q;
-					}
-					const auto md5 = uploadingData.file->filemd5;
-					const auto file = MTP_inputFile(
-						MTP_long(uploadingData.file->id),
-						MTP_int(uploadingData.parts.size()),
-						MTP_string(photoFilename),
-						MTP_bytes(md5));
-					_photoReady.fire({
-						.fullId = _uploadingId,
-						.info = {
-							.file = file,
-							.attachedStickers = attachedStickers,
-						},
-						.options = options,
-						.edit = edit,
-					});
-				} else if (uploadingData.file->type == SendMediaType::File
-					|| uploadingData.file->type == SendMediaType::ThemeFile
-					|| uploadingData.file->type == SendMediaType::Audio) {
-					QByteArray docMd5(32, Qt::Uninitialized);
-					hashMd5Hex(uploadingData.md5Hash.result(), docMd5.data());
-
-					const auto file = (uploadingData.docSize > kUseBigFilesFrom)
-						? MTP_inputFileBig(
-							MTP_long(uploadingData.file->id),
-							MTP_int(uploadingData.docPartsCount),
-							MTP_string(uploadingData.file->filename))
-						: MTP_inputFile(
-							MTP_long(uploadingData.file->id),
-							MTP_int(uploadingData.docPartsCount),
-							MTP_string(uploadingData.file->filename),
-							MTP_bytes(docMd5));
-					const auto thumb = [&]() -> std::optional<MTPInputFile> {
-						if (uploadingData.parts.empty()) {
-							return std::nullopt;
-						}
-						const auto thumbFilename = uploadingData.file->thumbname;
-						const auto thumbMd5 = uploadingData.file->thumbmd5;
-						return MTP_inputFile(
-							MTP_long(uploadingData.file->thumbId),
-							MTP_int(uploadingData.parts.size()),
-							MTP_string(thumbFilename),
-							MTP_bytes(thumbMd5));
-					}();
-					_documentReady.fire({
-						.fullId = _uploadingId,
-						.info = {
-							.file = file,
-							.thumb = thumb,
-							.attachedStickers = attachedStickers,
-						},
-						.options = options,
-						.edit = edit,
-					});
-				} else if (uploadingData.file->type == SendMediaType::Secure) {
-					_secureReady.fire({
-						_uploadingId,
-						uploadingData.file->id,
-						int(uploadingData.parts.size()),
-					});
-				}
-				queue.erase(_uploadingId);
-				_uploadingId = FullMsgId();
-				sendNext();
-			}
+	const auto itemId = entry->itemId;
+	if (entry->partsSent >= entry->parts->size()) {
+		const auto willProbablyBeSent = entry->docPartSize;
+		if (alreadySent + willProbablyBeSent >= kMaxUploadPerSession) {
 			return;
 		}
 
-		auto &content = uploadingData.file->content;
-		QByteArray toSend;
-		if (content.isEmpty()) {
-			if (!uploadingData.docFile) {
-				const auto filepath = uploadingData.file->filepath;
-				uploadingData.docFile = std::make_unique<QFile>(filepath);
-				if (!uploadingData.docFile->open(QIODevice::ReadOnly)) {
-					currentFailed();
-					return;
-				}
-			}
-			toSend = uploadingData.docFile->read(uploadingData.docPartSize);
-			if (uploadingData.docSize <= kUseBigFilesFrom) {
-				uploadingData.md5Hash.feed(toSend.constData(), toSend.size());
-			}
-		} else {
-			const auto offset = uploadingData.docSentParts
-				* uploadingData.docPartSize;
-			toSend = content.mid(offset, uploadingData.docPartSize);
-			if ((uploadingData.file->type == SendMediaType::File
-				|| uploadingData.file->type == SendMediaType::ThemeFile
-				|| uploadingData.file->type == SendMediaType::Audio)
-				&& uploadingData.docSentParts <= kUseBigFilesFrom) {
-				uploadingData.md5Hash.feed(toSend.constData(), toSend.size());
-			}
-		}
-		if ((toSend.size() > uploadingData.docPartSize)
-			|| ((toSend.size() < uploadingData.docPartSize
-				&& uploadingData.docSentParts + 1 != uploadingData.docPartsCount))) {
-			currentFailed();
+		Assert(entry->docPartsSent < entry->docPartsCount);
+
+		const auto partBytes = readDocPart(entry);
+		if (partBytes.isEmpty()) {
+			failed(itemId);
 			return;
 		}
+		const auto index = entry->docPartsSent++;
+		++entry->docPartsWaiting;
+
 		mtpRequestId requestId;
-		if (uploadingData.docSize > kUseBigFilesFrom) {
+		if (entry->docSize > kUseBigFilesFrom) {
 			requestId = _api->request(MTPupload_SaveBigFilePart(
-				MTP_long(uploadingData.file->id),
-				MTP_int(uploadingData.docSentParts),
-				MTP_int(uploadingData.docPartsCount),
-				MTP_bytes(toSend)
+				MTP_long(entry->file->id),
+				MTP_int(index),
+				MTP_int(entry->docPartsCount),
+				MTP_bytes(partBytes)
 			)).done([=](const MTPBool &result, mtpRequestId requestId) {
 				partLoaded(result, requestId);
 			}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
@@ -513,29 +464,34 @@ void Uploader::sendNext() {
 			}).toDC(MTP::uploadDcId(todc)).send();
 		} else {
 			requestId = _api->request(MTPupload_SaveFilePart(
-				MTP_long(uploadingData.file->id),
-				MTP_int(uploadingData.docSentParts),
-				MTP_bytes(toSend)
+				MTP_long(entry->file->id),
+				MTP_int(index),
+				MTP_bytes(partBytes)
 			)).done([=](const MTPBool &result, mtpRequestId requestId) {
 				partLoaded(result, requestId);
 			}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
 				partFailed(error, requestId);
 			}).toDC(MTP::uploadDcId(todc)).send();
 		}
-		_sentSizes.emplace(requestId, uploadingData.docPartSize);
-		_docSentRequests.emplace(requestId);
-		_dcIndices.emplace(requestId, todc);
-		_sentTotal += uploadingData.docPartSize;
-		_sentPerDc[todc] += uploadingData.docPartSize;
-
-		uploadingData.docSentParts++;
+		_requests.emplace(requestId, Request{
+			.itemId = itemId,
+			.sent = crl::now(),
+			.bytes = partBytes,
+			.dcIndex = todc,
+			.docPart = true,
+		});
+		_sentPerDcIndex[todc] += int(partBytes.size());
 	} else {
-		const auto index = uploadingData.partsSent++;
-		const auto partBytes = uploadingData.parts[index];
-		const auto partSize = int(partBytes.size());
+		const auto willBeSent = entry->parts->at(entry->partsSent).size();
+		if (alreadySent + willBeSent >= kMaxUploadPerSession) {
+			return;
+		}
 
+		++entry->partsWaiting;
+		const auto index = entry->partsSent++;
+		const auto partBytes = entry->parts->at(index);
 		const auto requestId = _api->request(MTPupload_SaveFilePart(
-			MTP_long(uploadingData.partsOfId),
+			MTP_long(entry->partsOfId),
 			MTP_int(index),
 			MTP_bytes(partBytes)
 		)).done([=](const MTPBool &result, mtpRequestId requestId) {
@@ -543,139 +499,232 @@ void Uploader::sendNext() {
 		}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
 			partFailed(error, requestId);
 		}).toDC(MTP::uploadDcId(todc)).send();
-		_sentSizes.emplace(requestId, partSize);
-		_dcIndices.emplace(requestId, todc);
-		_sentTotal += partSize;
-		_sentPerDc[todc] += partSize;
+
+		_requests.emplace(requestId, Request{
+			.itemId = itemId,
+			.sent = crl::now(),
+			.bytes = partBytes,
+			.dcIndex = todc,
+		});
+		_sentPerDcIndex[todc] += int(partBytes.size());
 	}
 	_nextTimer.callOnce(kUploadRequestInterval);
 }
 
-void Uploader::cancel(const FullMsgId &msgId) {
-	if (_uploadingId == msgId) {
-		currentFailed();
-	} else {
-		queue.erase(msgId);
-	}
+void Uploader::cancel(FullMsgId itemId) {
+	failed(itemId);
 }
 
 void Uploader::cancelAll() {
-	const auto single = queue.empty() ? _uploadingId : queue.begin()->first;
-	if (!single) {
-		return;
-	}
-	_pausedId = single;
-	if (_uploadingId) {
-		currentFailed();
-	}
-	while (!queue.empty()) {
-		const auto [msgId, file] = std::move(*queue.begin());
-		queue.erase(queue.begin());
-		notifyFailed(msgId, file);
+	while (!_queue.empty()) {
+		failed(_queue.front().itemId);
 	}
 	clear();
 	unpause();
 }
 
-void Uploader::pause(const FullMsgId &msgId) {
-	_pausedId = msgId;
+void Uploader::pause(FullMsgId itemId) {
+	_pausedId = itemId;
 }
 
 void Uploader::unpause() {
 	_pausedId = FullMsgId();
-	sendNext();
+	maybeSendNext();
 }
 
-void Uploader::confirm(const FullMsgId &msgId) {
-}
-
-void Uploader::cancelRequests() {
-	_docSentRequests.clear();
-	for (const auto &requestData : _sentSizes) {
-		_api->request(requestData.first).cancel();
+void Uploader::cancelRequests(FullMsgId itemId) {
+	for (auto i = begin(_requests); i != end(_requests);) {
+		if (i->second.itemId == itemId) {
+			const auto bytes = int(i->second.bytes.size());
+			_sentPerDcIndex[i->second.dcIndex] -= bytes;
+			_api->request(i->first).cancel();
+			i = _requests.erase(i);
+		} else {
+			++i;
+		}
 	}
-	_sentSizes.clear();
+}
+
+void Uploader::cancelAllRequests() {
+	for (const auto &[requestId, request] : base::take(_requests)) {
+		_api->request(requestId).cancel();
+	}
+	ranges::fill(_sentPerDcIndex, 0);
 }
 
 void Uploader::clear() {
-	queue.clear();
-	cancelRequests();
-	_dcIndices.clear();
-	_sentTotal = 0;
-	for (int i = 0; i < MTP::kUploadSessionsCount; ++i) {
-		_api->instance().stopSession(MTP::uploadDcId(i));
-		_sentPerDc[i] = 0;
-	}
+	_queue.clear();
+	cancelAllRequests();
+	stopSessions();
 	_stopSessionsTimer.cancel();
 }
 
-void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
-	_docSentRequests.remove(requestId);
-	auto i = _sentSizes.find(requestId);
-	const auto wasNonPremiumDelayed = _nonPremiumDelayed.remove(requestId);
-	if (i != _sentSizes.cend()) {
-		if (mtpIsFalse(result)) { // failed to upload current file
-			currentFailed();
-			return;
-		} else {
-			auto dcIt = _dcIndices.find(requestId);
-			if (dcIt == _dcIndices.cend()) { // must not happen
-				currentFailed();
-				return;
-			}
-			auto dc = dcIt->second;
-			_dcIndices.erase(dcIt);
+Uploader::Request Uploader::finishRequest(mtpRequestId requestId) {
+	const auto taken = _requests.take(requestId);
+	Assert(taken.has_value());
 
-			int64 sentPartSize = i->second;
-			auto k = queue.find(_uploadingId);
-			Assert(k != queue.cend());
-			auto &[fullId, file] = *k;
-			_sentSizes.erase(i);
-			_sentTotal -= sentPartSize;
-			_sentPerDc[dc] -= sentPartSize;
-			if (file.file->type == SendMediaType::Photo) {
-				file.fileSentSize += sentPartSize;
-				const auto photo = session().data().photo(file.file->id);
-				if (photo->uploading() && file.file) {
-					photo->uploadingData->size = file.file->partssize;
-					photo->uploadingData->offset = file.fileSentSize;
-				}
-				_photoProgress.fire_copy(fullId);
-			} else if (file.file->type == SendMediaType::File
-				|| file.file->type == SendMediaType::ThemeFile
-				|| file.file->type == SendMediaType::Audio) {
-				const auto document = session().data().document(file.file->id);
-				if (document->uploading()) {
-					const auto doneParts = file.docSentParts
-						- int(_docSentRequests.size());
-					document->uploadingData->offset = std::min(
-						document->uploadingData->size,
-						doneParts * file.docPartSize);
-				}
-				_documentProgress.fire_copy(fullId);
-			} else if (file.file->type == SendMediaType::Secure) {
-				file.fileSentSize += sentPartSize;
-				_secureProgress.fire_copy({
-					fullId,
-					file.fileSentSize,
-					file.file->partssize });
-			}
-			if (wasNonPremiumDelayed) {
-				_nonPremiumDelays.fire_copy(fullId);
-			}
-		}
+	_sentPerDcIndex[taken->dcIndex] -= int(taken->bytes.size());
+	return *taken;
+}
+
+void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
+	const auto request = finishRequest(requestId);
+
+	const auto bytes = int(request.bytes.size());
+	const auto itemId = request.itemId;
+
+	if (mtpIsFalse(result)) { // failed to upload current file
+		failed(itemId);
+		return;
 	}
 
-	sendNext();
+	const auto i = ranges::find(_queue, itemId, &Entry::itemId);
+	Assert(i != end(_queue));
+	auto &entry = *i;
+
+	if (request.docPart) {
+		--entry.docPartsWaiting;
+		entry.docSentSize += bytes;
+	} else {
+		--entry.partsWaiting;
+		entry.partsSentSize += bytes;
+	}
+
+	if (entry.file->type == SendMediaType::Photo) {
+		const auto photo = session().data().photo(entry.file->id);
+		if (photo->uploading()) {
+			photo->uploadingData->size = entry.file->partssize;
+			photo->uploadingData->offset = entry.partsSentSize;
+		}
+		_photoProgress.fire_copy(itemId);
+	} else if (entry.file->type == SendMediaType::File
+		|| entry.file->type == SendMediaType::ThemeFile
+		|| entry.file->type == SendMediaType::Audio) {
+		const auto document = session().data().document(entry.file->id);
+		if (document->uploading()) {
+			document->uploadingData->offset = std::min(
+				document->uploadingData->size,
+				entry.docSentSize);
+		}
+		_documentProgress.fire_copy(itemId);
+	} else if (entry.file->type == SendMediaType::Secure) {
+		_secureProgress.fire_copy({
+			.fullId = itemId,
+			.offset = entry.partsSentSize,
+			.size = entry.file->partssize,
+		});
+	}
+	if (request.nonPremiumDelayed) {
+		_nonPremiumDelays.fire_copy(itemId);
+	}
+
+	if (!_queue.empty() && itemId == _queue.front().itemId) {
+		maybeFinishFront();
+	}
+	maybeSendNext();
+}
+
+void Uploader::maybeFinishFront() {
+	while (!_queue.empty()) {
+		const auto &entry = _queue.front();
+		if (entry.partsSent >= entry.parts->size()
+			&& entry.docPartsSent >= entry.docPartsCount
+			&& !entry.partsWaiting
+			&& !entry.docPartsWaiting) {
+			finishFront();
+		} else {
+			break;
+		}
+	}
+}
+
+void Uploader::finishFront() {
+	Expects(!_queue.empty());
+
+	auto entry = std::move(_queue.front());
+	_queue.erase(_queue.begin());
+
+	const auto options = entry.file
+		? entry.file->to.options
+		: Api::SendOptions();
+	const auto edit = entry.file &&
+		entry.file->to.replaceMediaOf;
+	const auto attachedStickers = entry.file
+		? entry.file->attachedStickers
+		: std::vector<MTPInputDocument>();
+	if (entry.file->type == SendMediaType::Photo) {
+		auto photoFilename = entry.file->filename;
+		if (!photoFilename.endsWith(u".jpg"_q, Qt::CaseInsensitive)) {
+			// Server has some extensions checking for inputMediaUploadedPhoto,
+			// so force the extension to be .jpg anyway. It doesn't matter,
+			// because the filename from inputFile is not used anywhere.
+			photoFilename += u".jpg"_q;
+		}
+		const auto md5 = entry.file->filemd5;
+		const auto file = MTP_inputFile(
+			MTP_long(entry.file->id),
+			MTP_int(entry.parts->size()),
+			MTP_string(photoFilename),
+			MTP_bytes(md5));
+		_photoReady.fire({
+			.fullId = entry.itemId,
+			.info = {
+				.file = file,
+				.attachedStickers = attachedStickers,
+			},
+			.options = options,
+			.edit = edit,
+		});
+	} else if (entry.file->type == SendMediaType::File
+		|| entry.file->type == SendMediaType::ThemeFile
+		|| entry.file->type == SendMediaType::Audio) {
+		QByteArray docMd5(32, Qt::Uninitialized);
+		hashMd5Hex(entry.md5Hash.result(), docMd5.data());
+
+		const auto file = (entry.docSize > kUseBigFilesFrom)
+			? MTP_inputFileBig(
+				MTP_long(entry.file->id),
+				MTP_int(entry.docPartsCount),
+				MTP_string(entry.file->filename))
+			: MTP_inputFile(
+				MTP_long(entry.file->id),
+				MTP_int(entry.docPartsCount),
+				MTP_string(entry.file->filename),
+				MTP_bytes(docMd5));
+		const auto thumb = [&]() -> std::optional<MTPInputFile> {
+			if (entry.parts->empty()) {
+				return std::nullopt;
+			}
+			const auto thumbFilename = entry.file->thumbname;
+			const auto thumbMd5 = entry.file->thumbmd5;
+			return MTP_inputFile(
+				MTP_long(entry.file->thumbId),
+				MTP_int(entry.parts->size()),
+				MTP_string(thumbFilename),
+				MTP_bytes(thumbMd5));
+		}();
+		_documentReady.fire({
+			.fullId = entry.itemId,
+			.info = {
+				.file = file,
+				.thumb = thumb,
+				.attachedStickers = attachedStickers,
+			},
+			.options = options,
+			.edit = edit,
+		});
+	} else if (entry.file->type == SendMediaType::Secure) {
+		_secureReady.fire({
+			entry.itemId,
+			entry.file->id,
+			int(entry.parts->size()),
+		});
+	}
 }
 
 void Uploader::partFailed(const MTP::Error &error, mtpRequestId requestId) {
-	// failed to upload current file
-	_nonPremiumDelayed.remove(requestId);
-	if (_sentSizes.find(requestId) != _sentSizes.cend()) {
-		currentFailed();
-	}
-	sendNext();
+	const auto request = finishRequest(requestId);
+	failed(request.itemId);
 }
 
 } // namespace Storage
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index a733775ad..f4fced340 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_common.h"
 #include "base/timer.h"
+#include "base/weak_ptr.h"
 #include "mtproto/facade.h"
 
 class ApiWrap;
@@ -46,53 +47,48 @@ struct UploadSecureDone {
 	int partsCount = 0;
 };
 
-class Uploader final : public QObject {
+class Uploader final : public base::has_weak_ptr {
 public:
 	explicit Uploader(not_null<ApiWrap*> api);
 	~Uploader();
 
 	[[nodiscard]] Main::Session &session() const;
-
-	[[nodiscard]] FullMsgId currentUploadId() const {
-		return _uploadingId;
-	}
+	[[nodiscard]] FullMsgId currentUploadId() const;
 
 	void upload(
-		const FullMsgId &msgId,
+		FullMsgId itemId,
 		const std::shared_ptr<FilePrepareResult> &file);
 
-	void cancel(const FullMsgId &msgId);
-	void pause(const FullMsgId &msgId);
-	void confirm(const FullMsgId &msgId);
-
+	void pause(FullMsgId itemId);
+	void cancel(FullMsgId itemId);
 	void cancelAll();
-	void clear();
 
-	rpl::producer<UploadedMedia> photoReady() const {
+	[[nodiscard]] rpl::producer<UploadedMedia> photoReady() const {
 		return _photoReady.events();
 	}
-	rpl::producer<UploadedMedia> documentReady() const {
+	[[nodiscard]] rpl::producer<UploadedMedia> documentReady() const {
 		return _documentReady.events();
 	}
-	rpl::producer<UploadSecureDone> secureReady() const {
+	[[nodiscard]] rpl::producer<UploadSecureDone> secureReady() const {
 		return _secureReady.events();
 	}
-	rpl::producer<FullMsgId> photoProgress() const {
+	[[nodiscard]] rpl::producer<FullMsgId> photoProgress() const {
 		return _photoProgress.events();
 	}
-	rpl::producer<FullMsgId> documentProgress() const {
+	[[nodiscard]] rpl::producer<FullMsgId> documentProgress() const {
 		return _documentProgress.events();
 	}
-	rpl::producer<UploadSecureProgress> secureProgress() const {
+	[[nodiscard]] auto secureProgress() const
+	-> rpl::producer<UploadSecureProgress> {
 		return _secureProgress.events();
 	}
-	rpl::producer<FullMsgId> photoFailed() const {
+	[[nodiscard]] rpl::producer<FullMsgId> photoFailed() const {
 		return _photoFailed.events();
 	}
-	rpl::producer<FullMsgId> documentFailed() const {
+	[[nodiscard]] rpl::producer<FullMsgId> documentFailed() const {
 		return _documentFailed.events();
 	}
-	rpl::producer<FullMsgId> secureFailed() const {
+	[[nodiscard]] rpl::producer<FullMsgId> secureFailed() const {
 		return _secureFailed.events();
 	}
 
@@ -101,23 +97,31 @@ public:
 	}
 
 	void unpause();
-	void sendNext();
 	void stopSessions();
 
 private:
-	struct File;
+	struct Entry;
+	struct Request;
+
+	[[nodiscard]] QByteArray readDocPart(not_null<Entry*> entry);
+	void maybeSendNext();
+	void maybeFinishFront();
+	void finishFront();
 
 	void partLoaded(const MTPBool &result, mtpRequestId requestId);
 	void partFailed(const MTP::Error &error, mtpRequestId requestId);
+	Request finishRequest(mtpRequestId requestId);
 
-	void processPhotoProgress(const FullMsgId &msgId);
-	void processPhotoFailed(const FullMsgId &msgId);
-	void processDocumentProgress(const FullMsgId &msgId);
-	void processDocumentFailed(const FullMsgId &msgId);
+	void processPhotoProgress(FullMsgId itemId);
+	void processPhotoFailed(FullMsgId itemId);
+	void processDocumentProgress(FullMsgId itemId);
+	void processDocumentFailed(FullMsgId itemId);
 
-	void notifyFailed(FullMsgId id, const File &file);
-	void currentFailed();
-	void cancelRequests();
+	void notifyFailed(const Entry &entry);
+	void failed(FullMsgId itemId);
+	void cancelRequests(FullMsgId itemId);
+	void cancelAllRequests();
+	void clear();
 
 	void sendProgressUpdate(
 		not_null<HistoryItem*> item,
@@ -125,16 +129,13 @@ private:
 		int progress = 0);
 
 	const not_null<ApiWrap*> _api;
-	base::flat_map<mtpRequestId, int> _sentSizes;
-	base::flat_set<mtpRequestId> _docSentRequests;
-	base::flat_map<mtpRequestId, int> _dcIndices;
-	base::flat_set<mtpRequestId> _nonPremiumDelayed;
-	uint32 _sentTotal = 0; // FileSize: Right now any file size fits 32 bit.
-	uint32 _sentPerDc[MTP::kUploadSessionsCount] = { 0 };
 
-	FullMsgId _uploadingId;
+	std::vector<Entry> _queue;
+
+	base::flat_map<mtpRequestId, Request> _requests;
+	std::vector<int> _sentPerDcIndex;
+
 	FullMsgId _pausedId;
-	std::map<FullMsgId, File> queue;
 	base::Timer _nextTimer, _stopSessionsTimer;
 
 	rpl::event_stream<UploadedMedia> _photoReady;

From c3f0d2ef311e0ae1cdab9509ecc60ea15db63168 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 3 Apr 2024 19:27:48 +0400
Subject: [PATCH 236/596] Adaptive upload up to 8 sessions.

---
 Telegram/SourceFiles/storage/file_upload.cpp | 394 +++++++++++++------
 Telegram/SourceFiles/storage/file_upload.h   |  30 +-
 2 files changed, 309 insertions(+), 115 deletions(-)

diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index b718ed95b..3028b3e6d 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -52,6 +52,13 @@ constexpr auto kUploadRequestInterval = crl::time(200);
 // How much time without upload causes additional session kill.
 constexpr auto kKillSessionTimeout = 15 * crl::time(1000);
 
+// How much wait after session kill before killing another one.
+constexpr auto kWaitForNormalizeTimeout = 8 * crl::time(1000);
+
+constexpr auto kMaxSessionsCount = 8;
+constexpr auto kFastRequestThreshold = 1 * crl::time(1000);
+constexpr auto kSlowRequestThreshold = 8 * crl::time(1000);
+
 [[nodiscard]] const char *ThumbnailFormat(const QString &mime) {
 	return Core::IsMimeSticker(mime) ? "WEBP" : "JPG";
 }
@@ -70,9 +77,9 @@ struct Uploader::Entry {
 	not_null<std::vector<QByteArray>*> parts;
 	uint64 partsOfId = 0;
 
-	int partsSent = 0;
-	int partsWaiting = 0;
-	int64 partsSentSize = 0;
+	int64 sentSize = 0;
+	ushort partsSent = 0;
+	ushort partsWaiting = 0;
 
 	HashMd5 md5Hash;
 
@@ -80,9 +87,9 @@ struct Uploader::Entry {
 	int64 docSize = 0;
 	int64 docSentSize = 0;
 	int docPartSize = 0;
-	int docPartsSent = 0;
-	int docPartsCount = 0;
-	int docPartsWaiting = 0;
+	ushort docPartsSent = 0;
+	ushort docPartsCount = 0;
+	ushort docPartsWaiting = 0;
 
 };
 
@@ -90,8 +97,10 @@ struct Uploader::Request {
 	FullMsgId itemId;
 	crl::time sent = 0;
 	QByteArray bytes;
-	int dcIndex = 0;
+	ushort part = 0;
+	uchar dcIndex = 0;
 	bool docPart = false;
+	bool bigPart = false;
 	bool nonPremiumDelayed = false;
 };
 
@@ -138,7 +147,7 @@ bool Uploader::Entry::setPartSize(int partSize) {
 
 Uploader::Uploader(not_null<ApiWrap*> api)
 : _api(api)
-, _nextTimer([=] { maybeSendNext(); })
+, _nextTimer([=] { maybeSend(); })
 , _stopSessionsTimer([=] { stopSessions(); }) {
 	const auto session = &_api->session();
 	photoReady(
@@ -317,7 +326,9 @@ void Uploader::upload(
 		}
 	}
 	_queue.push_back({ itemId, file });
-	maybeSendNext();
+	if (!_nextTimer.isActive()) {
+		maybeSend();
+	}
 }
 
 void Uploader::failed(FullMsgId itemId) {
@@ -330,7 +341,7 @@ void Uploader::failed(FullMsgId itemId) {
 	cancelRequests(itemId);
 	maybeFinishFront();
 	crl::on_main(this, [=] {
-		maybeSendNext();
+		maybeSend();
 	});
 }
 
@@ -361,6 +372,7 @@ void Uploader::stopSessions() {
 			_api->instance().stopSession(MTP::uploadDcId(i));
 		}
 		_sentPerDcIndex.clear();
+		_dcIndicesWithFastRequests.clear();
 	}
 }
 
@@ -394,7 +406,181 @@ QByteArray Uploader::readDocPart(not_null<Entry*> entry) {
 	return checked(entry->docFile->read(entry->docPartSize));
 }
 
-void Uploader::maybeSendNext() {
+bool Uploader::canAddDcIndex() const {
+	const auto count = int(_sentPerDcIndex.size());
+	return (count < kMaxSessionsCount)
+		&& (count == int(_dcIndicesWithFastRequests.size()));
+}
+
+std::optional<uchar> Uploader::chooseDcIndexForNextRequest(
+		const base::flat_set<uchar> &used) {
+	for (auto i = 0, count = int(_sentPerDcIndex.size()); i != count; ++i) {
+		if (!_sentPerDcIndex[i] && !used.contains(i)) {
+			return i;
+		}
+	}
+	if (canAddDcIndex()) {
+		const auto result = int(_sentPerDcIndex.size());
+		_sentPerDcIndex.push_back(0);
+		_dcIndicesWithFastRequests.clear();
+		_latestDcIndexAdded = crl::now();
+
+		DEBUG_LOG(("Uploader: Added dc index %1.").arg(result));
+		return result;
+	}
+	auto result = std::optional<int>();
+	for (auto i = 0, count = int(_sentPerDcIndex.size()); i != count; ++i) {
+		if (!used.contains(i)
+			&& (!result.has_value()
+				|| _sentPerDcIndex[i] < _sentPerDcIndex[*result])) {
+			result = i;
+		}
+	}
+	return result;
+}
+
+Uploader::Entry *Uploader::chooseEntryForNextRequest() {
+	if (!_pendingFromRemovedDcIndices.empty()) {
+		const auto itemId = _pendingFromRemovedDcIndices.front().itemId;
+		const auto i = ranges::find(_queue, itemId, &Entry::itemId);
+		Assert(i != end(_queue));
+		return &*i;
+	}
+
+	for (auto i = begin(_queue); i != end(_queue); ++i) {
+		if (i->partsSent < i->parts->size()
+			|| i->docPartsSent < i->docPartsCount) {
+			return &*i;
+		}
+	}
+	return nullptr;
+}
+
+auto Uploader::sendPart(not_null<Entry*> entry, uchar dcIndex)
+-> SendResult {
+	return !_pendingFromRemovedDcIndices.empty()
+		? sendPendingPart(entry, dcIndex)
+		: (entry->partsSent < entry->parts->size())
+		? sendSlicedPart(entry, dcIndex)
+		: sendDocPart(entry, dcIndex);
+}
+
+template <typename Prepared>
+void Uploader::sendPreparedRequest(Prepared &&prepared, Request &&request) {
+	_sentPerDcIndex[request.dcIndex] += int(request.bytes.size());
+
+	const auto requestId = _api->request(
+		std::move(prepared)
+	).done([=](const MTPBool &result, mtpRequestId requestId) {
+		partLoaded(result, requestId);
+	}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
+		partFailed(error, requestId);
+	}).toDC(MTP::uploadDcId(request.dcIndex)).send();
+
+	request.sent = crl::now();
+	_requests.emplace(requestId, std::move(request));
+}
+
+auto Uploader::sendPendingPart(not_null<Entry*> entry, uchar dcIndex)
+-> SendResult {
+	Expects(!_pendingFromRemovedDcIndices.empty());
+	Expects(_pendingFromRemovedDcIndices.front().itemId == entry->itemId);
+
+	auto request = std::move(_pendingFromRemovedDcIndices.front());
+	_pendingFromRemovedDcIndices.erase(begin(_pendingFromRemovedDcIndices));
+
+	const auto part = request.part;
+	const auto bytes = request.bytes;
+	request.dcIndex = dcIndex;
+	if (request.bigPart) {
+		sendPreparedRequest(MTPupload_SaveBigFilePart(
+			MTP_long(entry->file->id),
+			MTP_int(part),
+			MTP_int(entry->docPartsCount),
+			MTP_bytes(bytes)
+		), std::move(request));
+	} else {
+		const auto id = request.docPart ? entry->file->id : entry->partsOfId;
+		sendPreparedRequest(MTPupload_SaveFilePart(
+			MTP_long(id),
+			MTP_int(part),
+			MTP_bytes(bytes)
+		), std::move(request));
+	}
+	return SendResult::Success;
+}
+
+auto Uploader::sendDocPart(not_null<Entry*> entry, uchar dcIndex)
+-> SendResult {
+	const auto itemId = entry->itemId;
+	const auto alreadySent = _sentPerDcIndex[dcIndex];
+	const auto willProbablyBeSent = entry->docPartSize;
+	if (alreadySent + willProbablyBeSent >= kMaxUploadPerSession) {
+		return SendResult::DcIndexFull;
+	}
+
+	Assert(entry->docPartsSent < entry->docPartsCount);
+
+	const auto partBytes = readDocPart(entry);
+	if (partBytes.isEmpty()) {
+		failed(itemId);
+		return SendResult::Failed;
+	}
+	const auto part = entry->docPartsSent++;
+	++entry->docPartsWaiting;
+
+	const auto send = [&](auto &&request, bool big) {
+		sendPreparedRequest(std::move(request), {
+			.itemId = itemId,
+			.bytes = partBytes,
+			.part = part,
+			.dcIndex = dcIndex,
+			.docPart = true,
+			.bigPart = big,
+		});
+	};
+	if (entry->docSize > kUseBigFilesFrom) {
+		send(MTPupload_SaveBigFilePart(
+			MTP_long(entry->file->id),
+			MTP_int(part),
+			MTP_int(entry->docPartsCount),
+			MTP_bytes(partBytes)
+		), true);
+	} else {
+		send(MTPupload_SaveFilePart(
+			MTP_long(entry->file->id),
+			MTP_int(part),
+			MTP_bytes(partBytes)
+		), false);
+	}
+	return SendResult::Success;
+}
+
+auto Uploader::sendSlicedPart(not_null<Entry*> entry, uchar dcIndex)
+-> SendResult {
+	const auto itemId = entry->itemId;
+	const auto alreadySent = _sentPerDcIndex[dcIndex];
+	const auto willBeSent = entry->parts->at(entry->partsSent).size();
+	if (alreadySent + willBeSent >= kMaxUploadPerSession) {
+		return SendResult::DcIndexFull;
+	}
+
+	++entry->partsWaiting;
+	const auto index = entry->partsSent++;
+	const auto partBytes = entry->parts->at(index);
+	sendPreparedRequest(MTPupload_SaveFilePart(
+		MTP_long(entry->partsOfId),
+		MTP_int(index),
+		MTP_bytes(partBytes)
+	), {
+		.itemId = itemId,
+		.bytes = partBytes,
+		.dcIndex = dcIndex,
+	});
+	return SendResult::Success;
+}
+
+void Uploader::maybeSend() {
 	const auto stopping = _stopSessionsTimer.isActive();
 	if (_queue.empty()) {
 		if (!stopping) {
@@ -404,111 +590,35 @@ void Uploader::maybeSendNext() {
 		return;
 	} else if (_pausedId) {
 		return;
-	}
-
-	if (stopping) {
+	} else if (stopping) {
 		_stopSessionsTimer.cancel();
 	}
 
-	auto todc = 0;
-	if (_sentPerDcIndex.size() < 2) {
-		todc = int(_sentPerDcIndex.size());
-		_sentPerDcIndex.resize(todc + 1);
-	} else {
-		const auto min = ranges::min_element(_sentPerDcIndex);
-		todc = int(min - begin(_sentPerDcIndex));
-	}
-	const auto alreadySent = _sentPerDcIndex[todc];
-
-	const auto entry = [&]() -> Entry* {
-		for (auto i = begin(_queue); i != end(_queue); ++i) {
-			if (i->partsSent < i->parts->size()
-				|| i->docPartsSent < i->docPartsCount) {
-				return &*i;
+	auto usedDcIndices = base::flat_set<uchar>();
+	while (true) {
+		const auto maybeDcIndex = chooseDcIndexForNextRequest(usedDcIndices);
+		if (!maybeDcIndex.has_value()) {
+			break;
+		}
+		const auto dcIndex = *maybeDcIndex;
+		while (true) {
+			const auto entry = chooseEntryForNextRequest();
+			if (!entry) {
+				return;
 			}
+			const auto result = sendPart(entry, dcIndex);
+			if (result == SendResult::DcIndexFull) {
+				return;
+			} else if (result == SendResult::Success) {
+				break;
+			}
+			// If this entry failed, we try the next one.
 		}
-		return nullptr;
-	}();
-	if (!entry) {
-		return;
+		usedDcIndices.emplace(dcIndex);
 	}
-
-	const auto itemId = entry->itemId;
-	if (entry->partsSent >= entry->parts->size()) {
-		const auto willProbablyBeSent = entry->docPartSize;
-		if (alreadySent + willProbablyBeSent >= kMaxUploadPerSession) {
-			return;
-		}
-
-		Assert(entry->docPartsSent < entry->docPartsCount);
-
-		const auto partBytes = readDocPart(entry);
-		if (partBytes.isEmpty()) {
-			failed(itemId);
-			return;
-		}
-		const auto index = entry->docPartsSent++;
-		++entry->docPartsWaiting;
-
-		mtpRequestId requestId;
-		if (entry->docSize > kUseBigFilesFrom) {
-			requestId = _api->request(MTPupload_SaveBigFilePart(
-				MTP_long(entry->file->id),
-				MTP_int(index),
-				MTP_int(entry->docPartsCount),
-				MTP_bytes(partBytes)
-			)).done([=](const MTPBool &result, mtpRequestId requestId) {
-				partLoaded(result, requestId);
-			}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
-				partFailed(error, requestId);
-			}).toDC(MTP::uploadDcId(todc)).send();
-		} else {
-			requestId = _api->request(MTPupload_SaveFilePart(
-				MTP_long(entry->file->id),
-				MTP_int(index),
-				MTP_bytes(partBytes)
-			)).done([=](const MTPBool &result, mtpRequestId requestId) {
-				partLoaded(result, requestId);
-			}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
-				partFailed(error, requestId);
-			}).toDC(MTP::uploadDcId(todc)).send();
-		}
-		_requests.emplace(requestId, Request{
-			.itemId = itemId,
-			.sent = crl::now(),
-			.bytes = partBytes,
-			.dcIndex = todc,
-			.docPart = true,
-		});
-		_sentPerDcIndex[todc] += int(partBytes.size());
-	} else {
-		const auto willBeSent = entry->parts->at(entry->partsSent).size();
-		if (alreadySent + willBeSent >= kMaxUploadPerSession) {
-			return;
-		}
-
-		++entry->partsWaiting;
-		const auto index = entry->partsSent++;
-		const auto partBytes = entry->parts->at(index);
-		const auto requestId = _api->request(MTPupload_SaveFilePart(
-			MTP_long(entry->partsOfId),
-			MTP_int(index),
-			MTP_bytes(partBytes)
-		)).done([=](const MTPBool &result, mtpRequestId requestId) {
-			partLoaded(result, requestId);
-		}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
-			partFailed(error, requestId);
-		}).toDC(MTP::uploadDcId(todc)).send();
-
-		_requests.emplace(requestId, Request{
-			.itemId = itemId,
-			.sent = crl::now(),
-			.bytes = partBytes,
-			.dcIndex = todc,
-		});
-		_sentPerDcIndex[todc] += int(partBytes.size());
+	if (!usedDcIndices.empty()) {
+		_nextTimer.callOnce(kUploadRequestInterval);
 	}
-	_nextTimer.callOnce(kUploadRequestInterval);
 }
 
 void Uploader::cancel(FullMsgId itemId) {
@@ -529,7 +639,7 @@ void Uploader::pause(FullMsgId itemId) {
 
 void Uploader::unpause() {
 	_pausedId = FullMsgId();
-	maybeSendNext();
+	maybeSend();
 }
 
 void Uploader::cancelRequests(FullMsgId itemId) {
@@ -543,6 +653,11 @@ void Uploader::cancelRequests(FullMsgId itemId) {
 			++i;
 		}
 	}
+	_pendingFromRemovedDcIndices.erase(ranges::remove(
+		_pendingFromRemovedDcIndices,
+		itemId,
+		&Request::itemId
+	), end(_pendingFromRemovedDcIndices));
 }
 
 void Uploader::cancelAllRequests() {
@@ -582,19 +697,48 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 	Assert(i != end(_queue));
 	auto &entry = *i;
 
+	const auto now = crl::now();
+	const auto duration = now - request.sent;
+	const auto fast = (duration < kFastRequestThreshold);
+	const auto slowish = !fast;
+	const auto slow = (duration >= kSlowRequestThreshold);
+
+	if (slowish) {
+		_dcIndicesWithFastRequests.clear();
+		if (slow) {
+			const auto elapsed = (now - _latestDcIndexRemoved);
+			const auto remove = (elapsed >= kWaitForNormalizeTimeout);
+			if (remove && _sentPerDcIndex.size() > 1) {
+				DEBUG_LOG(("Uploader: Slow request, removing dc index."));
+				removeDcIndex();
+				_latestDcIndexRemoved = now;
+			} else {
+				DEBUG_LOG(("Uploader: Slow request, clear fast records."));
+			}
+		} else {
+			DEBUG_LOG(("Uploader: Slow-ish request, clear fast records."));
+		}
+	} else if (request.sent > _latestDcIndexAdded) {
+		if (_dcIndicesWithFastRequests.emplace(request.dcIndex).second) {
+			DEBUG_LOG(("Uploader: Mark %1 of %2 as fast."
+				).arg(request.dcIndex
+				).arg(_sentPerDcIndex.size()));
+		}
+	}
+
 	if (request.docPart) {
 		--entry.docPartsWaiting;
 		entry.docSentSize += bytes;
 	} else {
 		--entry.partsWaiting;
-		entry.partsSentSize += bytes;
+		entry.sentSize += bytes;
 	}
 
 	if (entry.file->type == SendMediaType::Photo) {
 		const auto photo = session().data().photo(entry.file->id);
 		if (photo->uploading()) {
 			photo->uploadingData->size = entry.file->partssize;
-			photo->uploadingData->offset = entry.partsSentSize;
+			photo->uploadingData->offset = entry.sentSize;
 		}
 		_photoProgress.fire_copy(itemId);
 	} else if (entry.file->type == SendMediaType::File
@@ -610,7 +754,7 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 	} else if (entry.file->type == SendMediaType::Secure) {
 		_secureProgress.fire_copy({
 			.fullId = itemId,
-			.offset = entry.partsSentSize,
+			.offset = entry.sentSize,
 			.size = entry.file->partssize,
 		});
 	}
@@ -621,7 +765,29 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 	if (!_queue.empty() && itemId == _queue.front().itemId) {
 		maybeFinishFront();
 	}
-	maybeSendNext();
+	maybeSend();
+}
+
+void Uploader::removeDcIndex() {
+	Expects(_sentPerDcIndex.size() > 1);
+
+	const auto dcIndex = int(_sentPerDcIndex.size()) - 1;
+	for (auto i = begin(_requests); i != end(_requests);) {
+		if (i->second.dcIndex == dcIndex) {
+			const auto bytes = int(i->second.bytes.size());
+			_sentPerDcIndex[dcIndex] -= bytes;
+			_api->request(i->first).cancel();
+			_pendingFromRemovedDcIndices.push_back(std::move(i->second));
+			i = _requests.erase(i);
+		} else {
+			++i;
+		}
+	}
+	Assert(_sentPerDcIndex.back() == 0);
+	_sentPerDcIndex.pop_back();
+	_dcIndicesWithFastRequests.remove(dcIndex);
+	_api->instance().stopSession(MTP::uploadDcId(dcIndex));
+	DEBUG_LOG(("Uploader: Removed dc index %1.").arg(dcIndex));
 }
 
 void Uploader::maybeFinishFront() {
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index f4fced340..6f87f6a56 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -103,8 +103,30 @@ private:
 	struct Entry;
 	struct Request;
 
+	enum class SendResult : uchar {
+		Success,
+		Failed,
+		DcIndexFull,
+	};
+
+	void maybeSend();
+	[[nodiscard]] bool canAddDcIndex() const;
+	[[nodiscard]] std::optional<uchar> chooseDcIndexForNextRequest(
+		const base::flat_set<uchar> &used);
+	[[nodiscard]] Entry *chooseEntryForNextRequest();
+	[[nodiscard]] SendResult sendPart(not_null<Entry*> entry, uchar dcIndex);
+	[[nodiscard]] auto sendPendingPart(not_null<Entry*> entry, uchar dcIndex)
+		-> SendResult;
+	[[nodiscard]] auto sendDocPart(not_null<Entry*> entry, uchar dcIndex)
+		-> SendResult;
+	[[nodiscard]] auto sendSlicedPart(not_null<Entry*> entry, uchar dcIndex)
+		-> SendResult;
 	[[nodiscard]] QByteArray readDocPart(not_null<Entry*> entry);
-	void maybeSendNext();
+	void removeDcIndex();
+
+	template <typename Prepared>
+	void sendPreparedRequest(Prepared &&prepared, Request &&request);
+
 	void maybeFinishFront();
 	void finishFront();
 
@@ -135,6 +157,12 @@ private:
 	base::flat_map<mtpRequestId, Request> _requests;
 	std::vector<int> _sentPerDcIndex;
 
+	// Fast requests since the latest dc index addition.
+	base::flat_set<uchar> _dcIndicesWithFastRequests;
+	crl::time _latestDcIndexAdded = 0;
+	crl::time _latestDcIndexRemoved = 0;
+	std::vector<Request> _pendingFromRemovedDcIndices;
+
 	FullMsgId _pausedId;
 	base::Timer _nextTimer, _stopSessionsTimer;
 

From a9c1970f414ddd5c0529a04f41d91705464fe381 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 13:50:28 +0400
Subject: [PATCH 237/596] Send up to 1MB of parts to a single session.

---
 .../SourceFiles/mtproto/session_private.cpp   | 62 +++++++++++++------
 Telegram/SourceFiles/storage/file_upload.cpp  | 29 ++++++---
 2 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/session_private.cpp b/Telegram/SourceFiles/mtproto/session_private.cpp
index 05e968b7f..09f078f87 100644
--- a/Telegram/SourceFiles/mtproto/session_private.cpp
+++ b/Telegram/SourceFiles/mtproto/session_private.cpp
@@ -60,6 +60,8 @@ constexpr auto kSendStateRequestWaiting = crl::time(1000);
 // How much time to wait for some more requests, when sending msg acks.
 constexpr auto kAckSendWaiting = 10 * crl::time(1000);
 
+constexpr auto kCutContainerOnSize = 16 * 1024;
+
 auto SyncTimeRequestDuration = kFastRequestDuration;
 
 using namespace details;
@@ -696,7 +698,8 @@ void SessionPrivate::tryToSend() {
 		initSize = initSizeInInts * sizeof(mtpPrime);
 	}
 
-	bool needAnyResponse = false;
+	auto needAnyResponse = false;
+	auto someSkipped = false;
 	SerializedRequest toSendRequest;
 	{
 		QWriteLocker locker1(_sessionData->toSendMutex());
@@ -711,15 +714,33 @@ void SessionPrivate::tryToSend() {
 			locker1.unlock();
 		}
 
-		uint32 toSendCount = toSend.size();
-		if (pingRequest) ++toSendCount;
-		if (ackRequest) ++toSendCount;
-		if (resendRequest) ++toSendCount;
-		if (stateRequest) ++toSendCount;
-		if (httpWaitRequest) ++toSendCount;
-		if (bindDcKeyRequest) ++toSendCount;
+		auto totalSending = int(toSend.size());
+		auto sendingFrom = begin(toSend);
+		auto sendingTill = end(toSend);
+		auto combinedLength = 0;
+		for (auto i = sendingFrom; i != sendingTill; ++i) {
+			combinedLength += i->second->size();
+			if (combinedLength >= kCutContainerOnSize) {
+				++i;
+				if (const auto skipping = int(sendingTill - i)) {
+					sendingTill = i;
+					totalSending -= skipping;
+					Assert(totalSending > 0);
+					someSkipped = true;
+				}
+				break;
+			}
+		}
+		auto sendingRange = ranges::make_subrange(sendingFrom, sendingTill);
+		const auto sendingCount = totalSending;
+		if (pingRequest) ++totalSending;
+		if (ackRequest) ++totalSending;
+		if (resendRequest) ++totalSending;
+		if (stateRequest) ++totalSending;
+		if (httpWaitRequest) ++totalSending;
+		if (bindDcKeyRequest) ++totalSending;
 
-		if (!toSendCount) {
+		if (!totalSending) {
 			return; // nothing to send
 		}
 
@@ -735,11 +756,11 @@ void SessionPrivate::tryToSend() {
 			? httpWaitRequest
 			: bindDcKeyRequest
 			? bindDcKeyRequest
-			: toSend.begin()->second;
-		if (toSendCount == 1 && !first->forceSendInContainer) {
+			: sendingRange.begin()->second;
+		if (totalSending == 1 && !first->forceSendInContainer) {
 			toSendRequest = first;
 			if (sendAll) {
-				toSend.clear();
+				toSend.erase(sendingFrom, sendingTill);
 				locker1.unlock();
 			}
 
@@ -808,7 +829,7 @@ void SessionPrivate::tryToSend() {
 			if (stateRequest) containerSize += stateRequest.messageSize();
 			if (httpWaitRequest) containerSize += httpWaitRequest.messageSize();
 			if (bindDcKeyRequest) containerSize += bindDcKeyRequest.messageSize();
-			for (const auto &[requestId, request] : toSend) {
+			for (const auto &[requestId, request] : sendingRange) {
 				containerSize += request.messageSize();
 				if (needsLayer && request->needsLayer) {
 					containerSize += initSizeInInts;
@@ -825,9 +846,9 @@ void SessionPrivate::tryToSend() {
 			// prepare container + each in invoke after
 			toSendRequest = SerializedRequest::Prepare(
 				containerSize,
-				containerSize + 3 * toSend.size());
+				containerSize + 3 * sendingCount);
 			toSendRequest->push_back(mtpc_msg_container);
-			toSendRequest->push_back(toSendCount);
+			toSendRequest->push_back(totalSending);
 
 			// check for a valid container
 			auto bigMsgId = base::unixtime::mtproto_msg_id();
@@ -839,7 +860,7 @@ void SessionPrivate::tryToSend() {
 			// prepare sent container
 			auto sentIdsWrap = SentContainer();
 			sentIdsWrap.sent = crl::now();
-			sentIdsWrap.messages.reserve(toSendCount);
+			sentIdsWrap.messages.reserve(totalSending);
 
 			if (bindDcKeyRequest) {
 				_bindMsgId = placeToContainer(
@@ -859,7 +880,7 @@ void SessionPrivate::tryToSend() {
 				needAnyResponse = true;
 			}
 
-			for (auto &[requestId, request] : toSend) {
+			for (auto &[requestId, request] : sendingRange) {
 				const auto msgId = prepareToSend(
 					request,
 					bigMsgId,
@@ -904,7 +925,7 @@ void SessionPrivate::tryToSend() {
 					memcpy(toSendRequest->data() + from, request->constData() + 4, len * sizeof(mtpPrime));
 				}
 			}
-			toSend.clear();
+			toSend.erase(sendingFrom, sendingTill);
 
 			if (stateRequest) {
 				const auto msgId = placeToContainer(
@@ -951,6 +972,11 @@ void SessionPrivate::tryToSend() {
 		}
 	}
 	sendSecureRequest(std::move(toSendRequest), needAnyResponse);
+	if (someSkipped) {
+		InvokeQueued(this, [=] {
+			tryToSend();
+		});
+	}
 }
 
 void SessionPrivate::retryByTimer() {
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index 3028b3e6d..95c4b0a1b 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -26,8 +26,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Storage {
 namespace {
 
-// max 512kb uploaded at the same time in each session
-constexpr auto kMaxUploadPerSession = 512 * 1024;
+// max 1mb uploaded at the same time in each session
+constexpr auto kMaxUploadPerSession = 1024 * 1024;
 
 constexpr auto kDocumentMaxPartsCountDefault = 4000;
 
@@ -47,7 +47,7 @@ constexpr auto kDocumentUploadPartSize3 = 256 * 1024;
 constexpr auto kDocumentUploadPartSize4 = 512 * 1024;
 
 // One part each half second, if not uploaded faster.
-constexpr auto kUploadRequestInterval = crl::time(200);
+constexpr auto kUploadRequestInterval = crl::time(250);
 
 // How much time without upload causes additional session kill.
 constexpr auto kKillSessionTimeout = 15 * crl::time(1000);
@@ -59,6 +59,10 @@ constexpr auto kMaxSessionsCount = 8;
 constexpr auto kFastRequestThreshold = 1 * crl::time(1000);
 constexpr auto kSlowRequestThreshold = 8 * crl::time(1000);
 
+// Request is 'fast' if it was done in less than 1s and
+// (it-s size + queued before size) >= 512kb.
+constexpr auto kAcceptAsFastIfTotalAtLeast = 512 * 1024;
+
 [[nodiscard]] const char *ThumbnailFormat(const QString &mime) {
 	return Core::IsMimeSticker(mime) ? "WEBP" : "JPG";
 }
@@ -97,6 +101,7 @@ struct Uploader::Request {
 	FullMsgId itemId;
 	crl::time sent = 0;
 	QByteArray bytes;
+	int queued = 0;
 	ushort part = 0;
 	uchar dcIndex = 0;
 	bool docPart = false;
@@ -467,7 +472,9 @@ auto Uploader::sendPart(not_null<Entry*> entry, uchar dcIndex)
 
 template <typename Prepared>
 void Uploader::sendPreparedRequest(Prepared &&prepared, Request &&request) {
-	_sentPerDcIndex[request.dcIndex] += int(request.bytes.size());
+	auto &sentInSession = _sentPerDcIndex[request.dcIndex];
+	const auto queued = sentInSession;
+	sentInSession += int(request.bytes.size());
 
 	const auto requestId = _api->request(
 		std::move(prepared)
@@ -478,6 +485,7 @@ void Uploader::sendPreparedRequest(Prepared &&prepared, Request &&request) {
 	}).toDC(MTP::uploadDcId(request.dcIndex)).send();
 
 	request.sent = crl::now();
+	request.queued = queued;
 	_requests.emplace(requestId, std::move(request));
 }
 
@@ -515,7 +523,7 @@ auto Uploader::sendDocPart(not_null<Entry*> entry, uchar dcIndex)
 	const auto itemId = entry->itemId;
 	const auto alreadySent = _sentPerDcIndex[dcIndex];
 	const auto willProbablyBeSent = entry->docPartSize;
-	if (alreadySent + willProbablyBeSent >= kMaxUploadPerSession) {
+	if (alreadySent + willProbablyBeSent > kMaxUploadPerSession) {
 		return SendResult::DcIndexFull;
 	}
 
@@ -614,9 +622,13 @@ void Uploader::maybeSend() {
 			}
 			// If this entry failed, we try the next one.
 		}
-		usedDcIndices.emplace(dcIndex);
+		if (_sentPerDcIndex[dcIndex] >= kAcceptAsFastIfTotalAtLeast) {
+			usedDcIndices.emplace(dcIndex);
+		}
 	}
-	if (!usedDcIndices.empty()) {
+	if (usedDcIndices.empty()) {
+		_nextTimer.cancel();
+	} else {
 		_nextTimer.callOnce(kUploadRequestInterval);
 	}
 }
@@ -718,7 +730,8 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 		} else {
 			DEBUG_LOG(("Uploader: Slow-ish request, clear fast records."));
 		}
-	} else if (request.sent > _latestDcIndexAdded) {
+	} else if (request.sent > _latestDcIndexAdded
+		&& (request.queued + bytes >= kAcceptAsFastIfTotalAtLeast)) {
 		if (_dcIndicesWithFastRequests.emplace(request.dcIndex).second) {
 			DEBUG_LOG(("Uploader: Mark %1 of %2 as fast."
 				).arg(request.dcIndex

From 8df6d9db7ee5020c1a54c913a5cb929f51515559 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Apr 2024 17:37:50 +0400
Subject: [PATCH 238/596] Don't update server-time too frequently.

---
 Telegram/SourceFiles/mtproto/session_private.cpp | 6 ++++--
 Telegram/lib_base                                | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/session_private.cpp b/Telegram/SourceFiles/mtproto/session_private.cpp
index 09f078f87..bdd2b9a83 100644
--- a/Telegram/SourceFiles/mtproto/session_private.cpp
+++ b/Telegram/SourceFiles/mtproto/session_private.cpp
@@ -1651,7 +1651,9 @@ SessionPrivate::HandleResult SessionPrivate::handleOneReceived(
 		}
 
 		_sessionSalt = data.vnew_server_salt().v;
-		correctUnixtimeWithBadLocal(info.serverTime);
+
+		// Don't force time update here.
+		base::unixtime::update(info.serverTime);
 
 		if (_bindMsgId) {
 			LOG(("Message Info: bad_server_salt received while binding temp key, restarting."));
@@ -2079,7 +2081,7 @@ void SessionPrivate::correctUnixtimeByFastRequest(
 		locker.unlock();
 
 		SyncTimeRequestDuration = duration;
-		base::unixtime::update(serverTime, true);
+		base::unixtime::update(serverTime);
 		return;
 	}
 }
diff --git a/Telegram/lib_base b/Telegram/lib_base
index beef65fac..3d1ea724a 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit beef65fac578a812dade36557f4c666ac3d3ba78
+Subproject commit 3d1ea724a80c3e3a431a88a653d24f4f418eaea8

From c5847caa91dc89672717e380038386840be85b05 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Apr 2024 14:42:22 +0400
Subject: [PATCH 239/596] Update FFmpeg to 6.1.1: Fix AV1 videos.

---
 Telegram/build/docker/centos_env/Dockerfile |  4 ++--
 Telegram/build/prepare/prepare.py           | 24 ++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index f5f7ab065..2b5cf11cd 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -479,7 +479,7 @@ RUN git clone -b 1.19.0 --depth=1 {{ GIT_FREEDESKTOP }}/wayland.git \
 	&& rm -rf wayland
 
 FROM builder AS nv-codec-headers
-RUN git clone -b n12.0.16.0 --depth=1 {{ GIT }}/FFmpeg/nv-codec-headers.git \
+RUN git clone -b n12.1.14.0 --depth=1 {{ GIT }}/FFmpeg/nv-codec-headers.git \
 	&& DESTDIR="{{ LibrariesPath }}/nv-codec-headers-cache" make -C nv-codec-headers install \
 	&& rm -rf nv-codec-headers
 
@@ -491,7 +491,7 @@ COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache /
 COPY --link --from=libXv {{ LibrariesPath }}/libXv-cache /
 COPY --link --from=nv-codec-headers {{ LibrariesPath }}/nv-codec-headers-cache /
 
-RUN git clone -b n5.1.3 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \
+RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \
 	&& cd FFmpeg \
 	&& ./configure \
 		--extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 8d472eef3..9815fbe18 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -425,7 +425,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout cc0c2f8365
+    git checkout 1fef4b342a
 """)
 
 stage('msys64', """
@@ -696,14 +696,17 @@ mac:
     make install
 """)
 
+# Somehow in x86 Debug build dav1d crashes on AV1 10bpc videos.
 stage('dav1d', """
-    git clone -b 1.4.1 --depth 1 https://code.videolan.org/videolan/dav1d.git
+    git clone -b 1.4.1 https://code.videolan.org/videolan/dav1d.git
     cd dav1d
 win:
     if "%X8664%" equ "x64" (
         SET "TARGET=x86_64"
+        SET "DAV1D_ASM_DISABLE="
     ) else (
         SET "TARGET=x86"
+        SET "DAV1D_ASM_DISABLE=-Denable_asm=false"
     )
     set FILE=cross-file.txt
     echo [binaries] > %FILE%
@@ -719,7 +722,7 @@ win:
 
 depends:python/Scripts/activate.bat
     %THIRDPARTY_DIR%\\python\\Scripts\\activate.bat
-    meson setup --cross-file %FILE% --prefix %LIBS_DIR%/local --default-library=static --buildtype=debug -Denable_tools=false -Denable_tests=false -Db_vscrt=mtd builddir-debug
+    meson setup --cross-file %FILE% --prefix %LIBS_DIR%/local --default-library=static --buildtype=debug -Denable_tools=false -Denable_tests=false %DAV1D_ASM_DISABLE% -Db_vscrt=mtd builddir-debug
     meson compile -C builddir-debug
     meson install -C builddir-debug
 release:
@@ -775,7 +778,7 @@ mac:
 """)
 
 stage('libavif', """
-    git clone -b v1.0.4 --depth 1 https://github.com/AOMediaCodec/libavif.git
+    git clone -b v1.0.4 https://github.com/AOMediaCodec/libavif.git
     cd libavif
 win:
     cmake . ^
@@ -805,7 +808,7 @@ mac:
 """)
 
 stage('libde265', """
-    git clone --depth 1 -b v1.0.15 https://github.com/strukturag/libde265.git
+    git clone -b v1.0.15 https://github.com/strukturag/libde265.git
     cd libde265
 win:
     cmake . ^
@@ -881,7 +884,7 @@ mac:
 """)
 
 stage('libheif', """
-    git clone --depth 1 -b v1.17.6 https://github.com/strukturag/libheif.git
+    git clone -b v1.17.6 https://github.com/strukturag/libheif.git
     cd libheif
 win:
     %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/LIBHEIF_EXPORTS/LIBDE265_STATIC_BUILD/g' libheif/CMakeLists.txt
@@ -933,7 +936,7 @@ mac:
 """)
 
 stage('libjxl', """
-    git clone -b v0.8.2 --depth 1 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
+    git clone -b v0.8.2 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
     cd libjxl
 """ + setVar("cmake_defines", """
     -DBUILD_SHARED_LIBS=OFF
@@ -1052,9 +1055,7 @@ depends:yasm/yasm
 
 stage('nv-codec-headers', """
 win:
-    git clone https://github.com/FFmpeg/nv-codec-headers.git
-    cd nv-codec-headers
-    git checkout n11.1.5.1
+    git clone -b n12.1.14.0 https://github.com/FFmpeg/nv-codec-headers.git
 """)
 
 stage('regex', """
@@ -1062,9 +1063,8 @@ stage('regex', """
 """)
 
 stage('ffmpeg', """
-    git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
+    git clone -b n6.1.1 https://github.com/FFmpeg/FFmpeg.git ffmpeg
     cd ffmpeg
-    git checkout 7268323193
 win:
     SET PATH_BACKUP_=%PATH%
     SET PATH=%ROOT_DIR%\\ThirdParty\\msys64\\usr\\bin;%PATH%

From ad3f705f5060305f053dcd88263e87d2dadb8429 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Apr 2024 15:35:01 +0400
Subject: [PATCH 240/596] Beta version 4.16.3.

- Improve media upload speed.
- Update FFmpeg to 6.1.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          |  6 +++---
 Telegram/build/version                       | 10 +++++-----
 changelog.txt                                |  5 +++++
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 821e6eb70..16a9f2e56 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.2.0" />
+    Version="4.16.3.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index d2f50744e..09de12abf 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 4,16,2,0
- PRODUCTVERSION 4,16,2,0
+ FILEVERSION 4,16,3,0
+ PRODUCTVERSION 4,16,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.16.2.0"
+            VALUE "FileVersion", "4.16.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.2.0"
+            VALUE "ProductVersion", "4.16.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index a395fa632..f70a9486b 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 4,16,2,0
- PRODUCTVERSION 4,16,2,0
+ FILEVERSION 4,16,3,0
+ PRODUCTVERSION 4,16,3,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", "4.16.2.0"
+            VALUE "FileVersion", "4.16.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.2.0"
+            VALUE "ProductVersion", "4.16.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index beb3cc33b..76e05eb4a 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 = 4016002;
-constexpr auto AppVersionStr = "4.16.2";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 4016003;
+constexpr auto AppVersionStr = "4.16.3";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 20d886536..b41f8cd69 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016002
+AppVersion         4016003
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.2
-AppVersionStr      4.16.2
-BetaChannel        0
+AppVersionStrSmall 4.16.3
+AppVersionStr      4.16.3
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 4.16.2
+AppVersionOriginal 4.16.3.beta
diff --git a/changelog.txt b/changelog.txt
index a0808da30..d792c1391 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+4.16.3 beta (05.04.24)
+
+- Improve media upload speed.
+- Update FFmpeg to 6.1.1.
+
 4.16.2 (04.04.24)
 
 - Use IV by default for Telegraph and some Telegram links.

From 0ce6a4cbdb1e01d0a783881153f77e76e5ed2784 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Apr 2024 20:48:06 +0400
Subject: [PATCH 241/596] Beta version 4.16.3: Re-enable system proxy (Linux).

This reverts commit 1e6fb202f0b2964b44719ce671dd90d2cb4889dd.
---
 Telegram/SourceFiles/core/sandbox.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index fb145f7f1..6feacdb5b 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -33,7 +33,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QSessionManager>
 #include <QtGui/QScreen>
 #include <QtGui/qpa/qplatformscreen.h>
-#include <ksandbox.h>
 
 namespace Core {
 namespace {
@@ -518,10 +517,8 @@ void Sandbox::refreshGlobalProxy() {
 		|| proxy.type == MTP::ProxyData::Type::Http) {
 		QNetworkProxy::setApplicationProxy(
 			MTP::ToNetworkProxy(MTP::ToDirectIpProxy(proxy)));
-	} else if ((!Core::IsAppLaunched()
-		|| Core::App().settings().proxy().isSystem())
-		// this works stable only in sandboxed environment where it works through portal
-		&& (!Platform::IsLinux() || KSandbox::isInside() || cDebugMode())) {
+	} else if (!Core::IsAppLaunched()
+		|| Core::App().settings().proxy().isSystem()) {
 		QNetworkProxyFactory::setUseSystemConfiguration(true);
 	} else {
 		QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);

From 8f8725e1af92fb6b8c605fe290ab04b424734cc5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Apr 2024 21:25:04 +0400
Subject: [PATCH 242/596] Beta version 4.16.3: Fix dav1d in FFmpeg on macOS.

---
 Telegram/build/prepare/prepare.py | 2 ++
 cmake                             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 9815fbe18..8188b10f1 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1095,6 +1095,7 @@ depends:yasm/yasm
         --disable-network \
         --disable-everything \
         --enable-protocol=file \
+        --enable-libdav1d \
         --enable-libopus \
         --enable-libvpx \
         --enable-hwaccel=h264_videotoolbox \
@@ -1116,6 +1117,7 @@ depends:yasm/yasm
         --enable-decoder=gif \
         --enable-decoder=h264 \
         --enable-decoder=hevc \
+        --enable-decoder=libdav1d \
         --enable-decoder=libvpx_vp8 \
         --enable-decoder=libvpx_vp9 \
         --enable-decoder=mp1 \
diff --git a/cmake b/cmake
index 9f1b85aa9..022c15d43 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9f1b85aa9d51025ccefe63992d05c878bc267774
+Subproject commit 022c15d437aba149b1495532b1560de2a71b13df

From 9251e6faba96b4c27ff987c793cb8d26572dfa4f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Apr 2024 17:30:41 +0400
Subject: [PATCH 243/596] Use better title in boost box.

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

diff --git a/Telegram/SourceFiles/ui/boxes/boost_box.cpp b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
index 008726ee6..691d84f16 100644
--- a/Telegram/SourceFiles/ui/boxes/boost_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
@@ -397,7 +397,9 @@ void BoostBox(
 		close->parentWidget(),
 		MakeTitle(
 			box,
-			rpl::duplicate(title),
+			(data.group
+				? tr::lng_boost_group_button
+				: tr::lng_boost_channel_button)(),
 			rpl::duplicate(repeated),
 			false));
 	const auto titleInner = faded.data();

From 86d0c49e447ae147d42edea63b9e1bcb61eca979 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Apr 2024 17:49:22 +0400
Subject: [PATCH 244/596] Add "Boost Group/Channel" button to chat menu.

---
 .../SourceFiles/window/window_peer_menu.cpp   | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index d625b739b..c3c0950c2 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -300,6 +300,7 @@ private:
 	void addDeleteTopic();
 	void addVideoChat();
 	void addViewStatistics();
+	void addBoostChat();
 
 	not_null<SessionController*> _controller;
 	Dialogs::EntryState _request;
@@ -1034,6 +1035,20 @@ void Filler::addManageChat() {
 	}, &st::menuIconManage);
 }
 
+void Filler::addBoostChat() {
+	if (const auto channel = _peer->asChannel()) {
+		const auto text = channel->isMegagroup()
+			? tr::lng_boost_group_button(tr::now)
+			: tr::lng_boost_channel_button(tr::now);
+		const auto weak = base::make_weak(_controller);
+		_addAction(text, [=] {
+			if (const auto strong = weak.get()) {
+				strong->resolveBoostState(channel);
+			}
+		}, &st::menuIconBoosts);
+	}
+}
+
 void Filler::addViewStatistics() {
 	if (const auto channel = _peer->asChannel()) {
 		const auto controller = _controller;
@@ -1058,12 +1073,6 @@ void Filler::addViewStatistics() {
 					controller->showSection(Info::Boosts::Make(peer));
 				}
 			}, &st::menuIconBoosts);
-		} else if (channel->isMegagroup()) {
-			_addAction(tr::lng_boost_group_button(tr::now), [=] {
-				if (const auto strong = weak.get()) {
-					controller->resolveBoostState(channel);
-				}
-			}, &st::menuIconBoosts);
 		}
 		if (canViewEarn) {
 			_addAction(tr::lng_channel_earn_title(tr::now), [=] {
@@ -1312,6 +1321,7 @@ void Filler::fillHistoryActions() {
 	addStoryArchive();
 	addSupportInfo();
 	addManageChat();
+	addBoostChat();
 	addCreatePoll();
 	addThemeEdit();
 	addViewDiscussion();

From 6fb1e23ed572a93d75f368bc2e598d6712b61dd6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Apr 2024 18:12:20 +0400
Subject: [PATCH 245/596] Fix file dialog filter for videos from attach menu.

---
 Telegram/SourceFiles/history/history_widget.cpp                 | 2 +-
 .../SourceFiles/history/view/history_view_replies_section.cpp   | 2 +-
 Telegram/SourceFiles/media/stories/media_stories_reply.cpp      | 2 +-
 .../settings/business/settings_shortcut_messages.cpp            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 8d2dff310..a3bd3ebf8 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4496,7 +4496,7 @@ void HistoryWidget::chooseAttach(
 	}
 
 	const auto filter = (overrideSendImagesAsPhotos == true)
-		? FileDialog::ImagesOrAllFilter()
+		? FileDialog::PhotoVideoFilesFilter()
 		: FileDialog::AllOrImagesFilter();
 
 	FileDialog::GetOpenPaths(this, tr::lng_choose_files(tr::now), filter, crl::guard(this, [=](
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 9451bd556..9543eeae0 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -867,7 +867,7 @@ void RepliesWidget::chooseAttach(
 	}
 
 	const auto filter = (overrideSendImagesAsPhotos == true)
-		? FileDialog::ImagesOrAllFilter()
+		? FileDialog::PhotoVideoFilesFilter()
 		: FileDialog::AllOrImagesFilter();
 	FileDialog::GetOpenPaths(this, tr::lng_choose_files(tr::now), filter, crl::guard(this, [=](
 			FileDialog::OpenResult &&result) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index d6959d1a6..b1a33d9c1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -431,7 +431,7 @@ void ReplyArea::chooseAttach(
 	}
 
 	const auto filter = (overrideSendImagesAsPhotos == true)
-		? FileDialog::ImagesOrAllFilter()
+		? FileDialog::PhotoVideoFilesFilter()
 		: FileDialog::AllOrImagesFilter();
 	const auto weak = make_weak(&_shownPeerGuard);
 	const auto callback = [=](FileDialog::OpenResult &&result) {
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index 9422c892c..efeffaac9 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -1428,7 +1428,7 @@ void ShortcutMessages::chooseAttach(
 	_choosingAttach = false;
 
 	const auto filter = (overrideSendImagesAsPhotos == true)
-		? FileDialog::ImagesOrAllFilter()
+		? FileDialog::PhotoVideoFilesFilter()
 		: FileDialog::AllOrImagesFilter();
 	FileDialog::GetOpenPaths(this, tr::lng_choose_files(tr::now), filter, crl::guard(this, [=](
 			FileDialog::OpenResult &&result) {

From f36e3c213eb81759a1f328a78b74ca21785e1f77 Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org.ru>
Date: Sat, 6 Apr 2024 12:23:16 -0400
Subject: [PATCH 246/596] Fix build on FreeBSD 13.3 / llvm 17.0.6 / qt 5.15.13

---
 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 7b390c29c..29b887941 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -510,7 +510,7 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 std::optional<bool> IsDarkMode() {
-	const auto result = base::Platform::XDP::ReadSetting(
+	auto result = base::Platform::XDP::ReadSetting(
 		"org.freedesktop.appearance",
 		"color-scheme");
 

From 7803f8e670b276db7a2a93c463b88f22e8b7ecec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 6 Apr 2024 21:33:23 +0400
Subject: [PATCH 247/596] Simplify escaping when parsing IV.

---
 Telegram/SourceFiles/iv/iv_prepare.cpp | 67 ++++++++++++--------------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp
index ff21e4e55..6069d4407 100644
--- a/Telegram/SourceFiles/iv/iv_prepare.cpp
+++ b/Telegram/SourceFiles/iv/iv_prepare.cpp
@@ -51,7 +51,7 @@ template <typename T, typename = std::enable_if_t<std::is_arithmetic_v<T>>>
 	return Number(base::SafeRound(value * 10000.) / 100.);
 };
 
-[[nodiscard]] QByteArray EscapeAttr(QByteArray value) {
+[[nodiscard]] QByteArray Escape(QByteArray value) {
 	auto result = QByteArray();
 	result.reserve(value.size());
 	for (const auto &ch : value) {
@@ -67,8 +67,8 @@ template <typename T, typename = std::enable_if_t<std::is_arithmetic_v<T>>>
 	return result;
 }
 
-[[nodiscard]] QByteArray EscapeText(QByteArray value) {
-	return EscapeAttr(value);
+[[nodiscard]] QByteArray Date(TimeId date) {
+	return Escape(langDateTimeFull(base::unixtime::parse(date)).toUtf8());
 }
 
 class Parser final {
@@ -391,9 +391,7 @@ QByteArray Parser::block(const MTPDpageBlockSubtitle &data) {
 QByteArray Parser::block(const MTPDpageBlockAuthorDate &data) {
 	auto inner = rich(data.vauthor());
 	if (const auto date = data.vpublished_date().v) {
-		const auto parsed = base::unixtime::parse(date);
-		inner += " \xE2\x80\xA2 "
-			+ tag("time", EscapeText(langDateTimeFull(parsed).toUtf8()));
+		inner += " \xE2\x80\xA2 " + tag("time", Date(date));
 	}
 	return tag("address", inner);
 }
@@ -412,7 +410,7 @@ QByteArray Parser::block(const MTPDpageBlockParagraph &data) {
 
 QByteArray Parser::block(const MTPDpageBlockPreformatted &data) {
 	auto list = Attributes();
-	const auto language = EscapeAttr(utf(data.vlanguage()));
+	const auto language = utf(data.vlanguage());
 	if (!language.isEmpty()) {
 		list.push_back({ "data-language", language });
 		list.push_back({ "class", "lang-" + language });
@@ -430,7 +428,7 @@ QByteArray Parser::block(const MTPDpageBlockDivider &data) {
 }
 
 QByteArray Parser::block(const MTPDpageBlockAnchor &data) {
-	return tag("a", { { "name", EscapeAttr(utf(data.vname())) } });
+	return tag("a", { { "name", utf(data.vname()) } });
 }
 
 QByteArray Parser::block(const MTPDpageBlockList &data) {
@@ -507,15 +505,13 @@ QByteArray Parser::block(
 	};
 	auto result = tag("div", attributes, inner);
 
-	const auto href = data.vurl()
-		? utf(*data.vurl())
-		: photoFullUrl(photo);
+	const auto href = data.vurl() ? utf(*data.vurl()) : photoFullUrl(photo);
 	const auto id = Number(photo.id);
 	result = tag("a", {
 		{ "href", href },
 		{ "oncontextmenu", data.vurl() ? QByteArray() : "return false;" },
 		{ "data-context", data.vurl() ? QByteArray() : "viewer-photo" + id },
-		}, result);
+	}, result);
 	if (!slideshow) {
 		result += caption(data.vcaption());
 	}
@@ -621,9 +617,9 @@ QByteArray Parser::block(const MTPDpageBlockEmbed &data) {
 	attributes.push_back({ "height", iframeHeight });
 	if (const auto url = data.vurl()) {
 		if (!autosize) {
-			attributes.push_back({ "src", EscapeAttr(utf(url)) });
+			attributes.push_back({ "src", utf(url) });
 		} else {
-			attributes.push_back({ "srcdoc", EscapeAttr(utf(url)) });
+			attributes.push_back({ "srcdoc", utf(url) });
 		}
 	} else if (const auto html = data.vhtml()) {
 		attributes.push_back({ "src", embedUrl(html->v) });
@@ -661,12 +657,10 @@ QByteArray Parser::block(const MTPDpageBlockEmbedPost &data) {
 		address += tag(
 			"a",
 			{ { "rel", "author" }, { "onclick", "return false;" } },
-			EscapeText(utf(data.vauthor())));
+			utf(data.vauthor()));
 		if (const auto date = data.vdate().v) {
 			const auto parsed = base::unixtime::parse(date);
-			address += tag(
-				"time",
-				EscapeText(langDateTimeFull(parsed).toUtf8()));
+			address += tag("time", Date(date));
 		}
 		const auto inner = tag("address", address) + list(data.vblocks());
 		result = tag("blockquote", { { "class", "embed-post" } }, inner);
@@ -675,7 +669,7 @@ QByteArray Parser::block(const MTPDpageBlockEmbedPost &data) {
 		const auto inner = tag("strong", utf(data.vauthor()))
 			+ tag(
 				"small",
-				tag("a", { { "href", EscapeAttr(url) } }, EscapeText(url)));
+				tag("a", { { "href", url } }, url));
 		result = tag("section", { { "class", "embed-post" } }, inner);
 	}
 	result += caption(data.vcaption());
@@ -732,7 +726,7 @@ QByteArray Parser::block(const MTPDpageBlockChannel &data) {
 		: "https://t.me/" + username;
 	result = tag(
 		"a",
-		{ { "href", EscapeAttr(link) }, { "data-context", "channel" + id } },
+		{ { "href", link }, { "data-context", "channel" + id } },
 		result);
 	_result.channelIds.emplace(id);
 	return tag("section", {
@@ -839,23 +833,21 @@ QByteArray Parser::block(const MTPDpageRelatedArticle &data) {
 			inner += tag(
 				"span",
 				{ { "class", "related-link-title" } },
-				EscapeText(utf(*title)));
+				utf(*title));
 		}
 		if (description) {
 			inner += tag(
 				"span",
 				{ { "class", "related-link-desc" } },
-				EscapeText(utf(*description)));
+				utf(*description));
 		}
 		if (author || published) {
-			const auto separator = (author && published) ? ", " : "";
-			const auto parsed = base::unixtime::parse(published->v);
 			inner += tag(
 				"span",
 				{ { "class", "related-link-source" } },
-				EscapeText((author ? utf(*author) : QByteArray())
-					+ separator
-					+ langDateTimeFull(parsed).toUtf8()));
+				((author ? utf(*author) : QByteArray())
+					+ ((author && published) ? ", " : QByteArray())
+					+ (published ? Date(published->v) : QByteArray())));
 		}
 		result += tag("span", {
 			{ "class", "related-link-content" },
@@ -912,22 +904,25 @@ QByteArray Parser::block(const MTPDpageListItemBlocks &data) {
 }
 
 QByteArray Parser::block(const MTPDpageListOrderedItemText &data) {
-	return tag("li", { { "value", utf(data.vnum()) } }, rich(data.vtext()));
+	return tag(
+		"li",
+		{ { "value", utf(data.vnum()) } },
+		rich(data.vtext()));
 }
 
 QByteArray Parser::block(const MTPDpageListOrderedItemBlocks &data) {
 	return tag(
 		"li",
-		{ { "value", EscapeAttr(utf(data.vnum())) } },
+		{ { "value", utf(data.vnum()) } },
 		list(data.vblocks()));
 }
 
 QByteArray Parser::utf(const MTPstring &text) {
-	return text.v;
+	return Escape(text.v);
 }
 
 QByteArray Parser::utf(const tl::conditional<MTPstring> &text) {
-	return text ? text->v : QByteArray();
+	return text ? utf(*text) : QByteArray();
 }
 
 QByteArray Parser::tag(
@@ -965,7 +960,7 @@ QByteArray Parser::rich(const MTPRichText &text) {
 			{ "\xE2\x81\xA8", "<span dir=\"auto\">" },
 			{ "\xE2\x81\xA9", "</span>" },
 		};
-		auto text = EscapeText(utf(data.vtext()));
+		auto text = utf(data.vtext());
 		for (const auto &[from, to] : replacements) {
 			text.replace(from, to);
 		}
@@ -1016,8 +1011,8 @@ QByteArray Parser::rich(const MTPRichText &text) {
 		}, rich(data.vtext()));
 	}, [&](const MTPDtextEmail &data) {
 		return tag("a", {
-			{ "href", "mailto:" + EscapeAttr(utf(data.vemail())) },
-			}, rich(data.vtext()));
+			{ "href", "mailto:" + utf(data.vemail()) },
+		}, rich(data.vtext()));
 	}, [&](const MTPDtextSubscript &data) {
 		return tag("sub", rich(data.vtext()));
 	}, [&](const MTPDtextSuperscript &data) {
@@ -1026,11 +1021,11 @@ QByteArray Parser::rich(const MTPRichText &text) {
 		return tag("mark", rich(data.vtext()));
 	}, [&](const MTPDtextPhone &data) {
 		return tag("a", {
-			{ "href", "tel:" + EscapeAttr(utf(data.vphone())) },
+			{ "href", "tel:" + utf(data.vphone()) },
 		}, rich(data.vtext()));
 	}, [&](const MTPDtextAnchor &data) {
 		const auto inner = rich(data.vtext());
-		const auto name = EscapeAttr(utf(data.vname()));
+		const auto name = utf(data.vname());
 		return inner.isEmpty()
 			? tag("a", { { "name", name } })
 			: tag(

From eaaa704fa458f0c6a9a2fcbf5607d865b0b857bc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 6 Apr 2024 22:56:13 +0400
Subject: [PATCH 248/596] Check the URL in IV like in attach bots.

---
 Telegram/SourceFiles/iv/iv_instance.cpp                | 10 +++++++++-
 .../SourceFiles/ui/chat/attach/attach_bot_webview.cpp  |  7 +++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 62527e35f..2362a6b61 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -838,6 +838,9 @@ void Instance::show(
 	_shownSession = session;
 	_shown->events() | rpl::start_with_next([=](Controller::Event event) {
 		using Type = Controller::Event::Type;
+		const auto lower = event.url.toLower();
+		const auto urlChecked = lower.startsWith("http://")
+			|| lower.startsWith("https://");
 		switch (event.type) {
 		case Type::Close:
 			_shown = nullptr;
@@ -852,7 +855,9 @@ void Instance::show(
 			processJoinChannel(event.context);
 			break;
 		case Type::OpenLinkExternal:
-			File::OpenUrl(event.url);
+			if (urlChecked) {
+				File::OpenUrl(event.url);
+			}
 			closeAll();
 			break;
 		case Type::OpenMedia:
@@ -891,6 +896,9 @@ void Instance::show(
 			break;
 		case Type::OpenPage:
 		case Type::OpenLink:
+			if (!urlChecked) {
+				break;
+			}
 			_shownSession->api().request(MTPmessages_GetWebPage(
 				MTP_string(event.url),
 				MTP_int(0)
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index c9f3f93f8..262c852d5 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -800,12 +800,11 @@ void Panel::openExternalLink(const QJsonObject &args) {
 		_delegate->botClose();
 		return;
 	}
-	const auto url = args["url"].toString();
 	const auto iv = args["try_instant_view"].toBool();
+	const auto url = args["url"].toString();
 	const auto lower = url.toLower();
-	if (url.isEmpty()
-		|| (!lower.startsWith("http://") && !lower.startsWith("https://"))) {
-		LOG(("BotWebView Error: Bad 'url' in openExternalLink."));
+	if (!lower.startsWith("http://") && !lower.startsWith("https://")) {
+		LOG(("BotWebView Error: Bad url in openExternalLink: %1").arg(url));
 		_delegate->botClose();
 		return;
 	} else if (!allowOpenLink()) {

From 1a2a1f1c17557466b661895e98d66dafad114b2f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 6 Apr 2024 22:57:31 +0400
Subject: [PATCH 249/596] Version 4.16.4.

- Bug fixes and other minor improvements.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/version.h          |  6 +++---
 Telegram/build/version                       | 10 +++++-----
 changelog.txt                                |  4 ++++
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 16a9f2e56..c4d83fefb 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.3.0" />
+    Version="4.16.4.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 09de12abf..4d01d2396 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 4,16,3,0
- PRODUCTVERSION 4,16,3,0
+ FILEVERSION 4,16,4,0
+ PRODUCTVERSION 4,16,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.16.3.0"
+            VALUE "FileVersion", "4.16.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.3.0"
+            VALUE "ProductVersion", "4.16.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index f70a9486b..945b1bbb8 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 4,16,3,0
- PRODUCTVERSION 4,16,3,0
+ FILEVERSION 4,16,4,0
+ PRODUCTVERSION 4,16,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.16.3.0"
+            VALUE "FileVersion", "4.16.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.3.0"
+            VALUE "ProductVersion", "4.16.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 76e05eb4a..6b30124d7 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 = 4016003;
-constexpr auto AppVersionStr = "4.16.3";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 4016004;
+constexpr auto AppVersionStr = "4.16.4";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index b41f8cd69..7d28e3677 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016003
+AppVersion         4016004
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.3
-AppVersionStr      4.16.3
-BetaChannel        1
+AppVersionStrSmall 4.16.4
+AppVersionStr      4.16.4
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.16.3.beta
+AppVersionOriginal 4.16.4
diff --git a/changelog.txt b/changelog.txt
index d792c1391..bff1b5e4f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.16.4 (06.04.24)
+
+- Bug fixes and other minor improvements.
+
 4.16.3 beta (05.04.24)
 
 - Improve media upload speed.

From 77835a43a5269233aa6fa367ed7b8575ecb67f26 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 7 Apr 2024 11:19:23 +0400
Subject: [PATCH 250/596] Version 4.16.4: Update patches on Linux.

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 2b5cf11cd..3a0b68392 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 174d6e51435e6eab0596904f9fba80a927ef4177 \
+	&& git fetch --depth=1 origin b8e22ca1511513024b22b5381153163ad3406a8c \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 1993f7997..574d3c996 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -168,7 +168,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 174d6e51435e6eab0596904f9fba80a927ef4177
+    source-commit: b8e22ca1511513024b22b5381153163ad3406a8c
     plugin: dump
     override-pull: |
       craftctl default

From 090fdfb4587f2bb9e20ed5925ac6842f83739062 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 3 Mar 2023 18:06:35 +0400
Subject: [PATCH 251/596] Add asan libraries to Docker image

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 3a0b68392..3aa48a91a 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -22,10 +22,10 @@ RUN dnf -y install epel-release \
 		python3.11-pip python3.11-devel gperf flex bison clang lld yasm \
 		file which perl-open perl-XML-Parser perl-IPC-Cmd xorg-x11-util-macros \
 		gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils \
-		libffi-devel fontconfig-devel freetype-devel libX11-devel \
-		alsa-lib-devel pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel \
-		mesa-libgbm-devel libdrm-devel vulkan-devel libva-devel libvdpau-devel \
-		glib2-devel at-spi2-core-devel gtk3-devel boost1.78-devel fmt-devel \
+		gcc-toolset-12-libasan-devel libffi-devel fontconfig-devel freetype-devel \
+		libX11-devel alsa-lib-devel pulseaudio-libs-devel mesa-libGL-devel \
+		mesa-libEGL-devel mesa-libgbm-devel libdrm-devel vulkan-devel libva-devel \
+		libvdpau-devel glib2-devel at-spi2-core-devel gtk3-devel boost1.78-devel fmt-devel \
 	&& dnf clean all
 
 SHELL [ "bash", "-c", ". /opt/rh/gcc-toolset-12/enable; exec bash -c \"$@\"", "-s"]

From 542153d950a6787c3bb457a53cf3786f62700dfa Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 5 Apr 2024 13:34:52 +0400
Subject: [PATCH 252/596] Use nasm from repository

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 3aa48a91a..9568cc7e4 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -19,7 +19,7 @@ ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/loc
 RUN dnf -y install epel-release \
 	&& dnf config-manager --set-enabled powertools \
 	&& dnf -y install autoconf automake libtool pkgconfig make patch git \
-		python3.11-pip python3.11-devel gperf flex bison clang lld yasm \
+		python3.11-pip python3.11-devel gperf flex bison clang lld nasm yasm \
 		file which perl-open perl-XML-Parser perl-IPC-Cmd xorg-x11-util-macros \
 		gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils \
 		gcc-toolset-12-libasan-devel libffi-devel fontconfig-devel freetype-devel \
@@ -55,17 +55,6 @@ RUN git init patches \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
-FROM builder AS nasm
-RUN git clone -b nasm-2.15.05 --depth=1 {{ GIT }}/netwide-assembler/nasm.git \
-	&& cd nasm \
-	&& ./autogen.sh \
-	&& ./configure \
-	&& make -j$(nproc) \
-	&& mkdir -p "{{ LibrariesPath }}/nasm-cache/usr/local/bin" \
-	&& install -c nasm "{{ LibrariesPath }}/nasm-cache/usr/local/bin/nasm" \
-	&& cd .. \
-	&& rm -rf nasm
-
 FROM builder AS zlib
 RUN git init zlib \
 	&& cd zlib \
@@ -166,8 +155,6 @@ RUN git clone -b v1.4 --depth=1 {{ GIT }}/xiph/opus.git \
 	&& rm -rf opus
 
 FROM builder AS dav1d
-COPY --link --from=nasm {{ LibrariesPath }}/nasm-cache /
-
 RUN git clone -b 1.4.1 --depth=1 {{ GIT }}/videolan/dav1d.git \
 	&& cd dav1d \
 	&& meson build \

From 3da835152266630345e113eca6c482584aec337a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 7 Apr 2024 13:31:34 +0400
Subject: [PATCH 253/596] Let Wayland to use QGuiApplication::screenAt
 (forgotten place)

---
 .../calls/group/ui/desktop_capture_choose_source.cpp        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
index ad59290c5..93c5ecf1e 100644
--- a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
@@ -587,11 +587,9 @@ void ChooseSourceProcess::setupGeometryWithParent(
 		not_null<QWidget*> parent) {
 	_window->createWinId();
 	const auto parentScreen = [&] {
-		if (!::Platform::IsWayland()) {
-			if (const auto screen = QGuiApplication::screenAt(
+		if (const auto screen = QGuiApplication::screenAt(
 				parent->geometry().center())) {
-				return screen;
-			}
+			return screen;
 		}
 		return parent->screen();
 	}();

From 84ce72ec7a7f39dddeea5c311a4ec1eb2776847b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 7 Apr 2024 14:19:23 +0400
Subject: [PATCH 254/596] Fix a crash due to half-hidden media viewer

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

diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 26cc17279..1de1e028f 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -159,7 +159,7 @@ void Launch(const QString &filepath) {
 void ShowInFolder(const QString &filepath) {
 	crl::on_main([=] {
 		Ui::PreventDelayedActivation();
-		if (Platform::IsLinux()) {
+		if (Platform::IsX11()) {
 			// Hide mediaview to make other apps visible.
 			Core::App().hideMediaView();
 		}

From 94f1d23788545edecafad311de029f29475ff02b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 8 Apr 2024 04:11:52 +0300
Subject: [PATCH 255/596] Fixed behavior to open section with scheduled
 messages at top.

---
 .../history/view/history_view_scheduled_section.cpp  | 12 +++++++++---
 .../history/view/history_view_scheduled_section.h    |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 188d11338..6c989fd1e 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -58,11 +58,19 @@ namespace HistoryView {
 ScheduledMemento::ScheduledMemento(not_null<History*> history)
 : _history(history)
 , _forumTopic(nullptr) {
+	const auto list = _history->owner().scheduledMessages().list(_history);
+	if (!list.ids.empty()) {
+		_list.setScrollTopState({ .item = { .fullId = list.ids.front() } });
+	}
 }
 
 ScheduledMemento::ScheduledMemento(not_null<Data::ForumTopic*> forumTopic)
 : _history(forumTopic->owningHistory())
 , _forumTopic(forumTopic) {
+	const auto list = _history->owner().scheduledMessages().list(_forumTopic);
+	if (!list.ids.empty()) {
+		_list.setScrollTopState({ .item = { .fullId = list.ids.front() } });
+	}
 }
 
 object_ptr<Window::SectionWidget> ScheduledMemento::createWidget(
@@ -1154,9 +1162,7 @@ Context ScheduledWidget::listContext() {
 }
 
 bool ScheduledWidget::listScrollTo(int top, bool syntetic) {
-	top = (top == ScrollMax && syntetic)
-		? 0
-		: std::clamp(top, 0, _scroll->scrollTopMax());
+	top = std::clamp(top, 0, _scroll->scrollTopMax());
 	if (_scroll->scrollTop() == top) {
 		updateInnerVisibleArea();
 		return false;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 850e56bb7..43702688f 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -280,7 +280,7 @@ private:
 
 };
 
-class ScheduledMemento : public Window::SectionMemento {
+class ScheduledMemento final : public Window::SectionMemento {
 public:
 	ScheduledMemento(not_null<History*> history);
 	ScheduledMemento(not_null<Data::ForumTopic*> forumTopic);

From 47bf099b88ecb0ce02b1701de2e8b02b9ebeb73e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 8 Apr 2024 06:55:44 +0300
Subject: [PATCH 256/596] Fixed updating of field placeholder in compose
 controls while editing.

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

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 185073db1..d47ee6ec1 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1973,6 +1973,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	const auto guard = gsl::finally([&] {
 		updateSendButtonType();
 		updateReplaceMediaButton();
+		updateFieldPlaceholder();
 		updateControlsVisibility();
 		updateControlsGeometry(_wrap->size());
 	});

From 129b07c2c021e7a7c7d708809201cc59f9fc3a9c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 8 Apr 2024 17:02:52 +0300
Subject: [PATCH 257/596] Improved style of box for all of user's own groups
 and channels.

---
 .../SourceFiles/window/window_main_menu.cpp   | 105 ++++++++++++++++--
 1 file changed, 93 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index c49afd1a9..1f833a4d6 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "window/window_main_menu.h"
 
+#include "apiwrap.h"
 #include "window/themes/window_theme.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
@@ -24,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_options.h"
 #include "ui/new_badges.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/vertical_list.h"
 #include "ui/unread_badge_paint.h"
 #include "inline_bots/bot_attach_web_view.h"
@@ -45,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/premium_preview_box.h"
 #include "calls/calls_box_controller.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
 #include "core/click_handler_types.h"
 #include "core/application.h"
 #include "main/main_session.h"
@@ -56,6 +59,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document_media.h"
 #include "data/data_folder.h"
 #include "data/data_session.h"
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
 #include "data/data_user.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
@@ -116,10 +121,76 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 		bool chats) {
 	button->setAcceptBoth(true);
 
+	const auto requestIcon = [=, session = &controller->session()](
+			not_null<Ui::GenericBox*> box,
+			Fn<void(not_null<DocumentData*>)> done) {
+		const auto api = box->lifetime().make_state<MTP::Sender>(
+			&session->mtp());
+		api->request(MTPmessages_GetStickerSet(
+			Data::InputStickerSet({
+				.shortName = u"tg_placeholders_android"_q,
+			}),
+			MTP_int(0)
+		)).done([=](const MTPmessages_StickerSet &result) {
+			result.match([&](const MTPDmessages_stickerSet &data) {
+				const auto &v = data.vdocuments().v;
+				if (v.size() > 1) {
+					done(session->data().processDocument(v[1]));
+				}
+			}, [](const MTPDmessages_stickerSetNotModified &) {
+			});
+		}).send();
+	};
+	const auto addIcon = [=](not_null<Ui::GenericBox*> box) {
+		const auto widget = box->addRow(object_ptr<Ui::RpWidget>(box));
+		widget->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = QPainter(widget);
+			p.setFont(st::boxTextFont);
+			p.setPen(st::windowSubTextFg);
+			p.drawText(
+				widget->rect(),
+				tr::lng_contacts_loading(tr::now),
+				style::al_center);
+		}, widget->lifetime());
+		widget->resize(Size(st::maxStickerSize));
+		widget->show();
+		box->verticalLayout()->resizeToWidth(box->width());
+		requestIcon(box, [=](not_null<DocumentData*> document) {
+			const auto view = document->createMediaView();
+			const auto origin = document->stickerSetOrigin();
+			controller->session().downloaderTaskFinished(
+			) | rpl::take_while([=] {
+				if (view->bytes().isEmpty()) {
+					return true;
+				}
+				auto owned = Lottie::MakeIcon({
+					.json = Images::UnpackGzip(view->bytes()),
+					.sizeOverride = Size(st::maxStickerSize),
+				});
+				const auto icon = owned.get();
+				widget->lifetime().add([kept = std::move(owned)]{});
+				widget->paintRequest(
+				) | rpl::start_with_next([=] {
+					auto p = QPainter(widget);
+					icon->paint(p, (widget->width() - icon->width()) / 2, 0);
+				}, widget->lifetime());
+				icon->animate(
+					[=] { widget->update(); },
+					0,
+					icon->framesCount());
+				return false;
+			}) | rpl::start(widget->lifetime());
+			view->automaticLoad(origin, nullptr);
+			view->videoThumbnailWanted(origin);
+		});
+	};
+
 	const auto myChannelsBox = [=](not_null<Ui::GenericBox*> box) {
 		box->setTitle(chats
 			? tr::lng_notification_groups()
 			: tr::lng_notification_channels());
+		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
 
 		const auto st = box->lifetime().make_state<style::UserpicButton>(
 			st::defaultUserpicButton);
@@ -133,17 +204,22 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 			void setPeer(not_null<PeerData*> p) {
 				const auto c = p->asChannel();
 				const auto g = p->asChat();
-				_text.setText(st::defaultPeerListItem.nameStyle, p->name());
+				_text.setText(
+					st::defaultPeerListItem.nameStyle,
+					((c && c->isMegagroup()) ? u"[s] "_q : QString())
+						+ p->name());
 				const auto count = c ? c->membersCount() : g->count;
 				_status.setText(
 					st::defaultTextStyle,
 					!p->username().isEmpty()
 						? ('@' + p->username())
-						: count
-						? tr::lng_chat_status_subscribers(
-							tr::now,
-							lt_count,
-							count)
+						: (count > 0)
+						? ((c && !c->isMegagroup())
+							? tr::lng_chat_status_subscribers
+							: tr::lng_chat_status_members)(
+								tr::now,
+								lt_count,
+								count)
 						: QString());
 			}
 
@@ -192,15 +268,15 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 		};
 
 		const auto &data = controller->session().data();
+		auto ids = std::vector<PeerId>();
 		if (chats) {
-			auto ids = std::vector<PeerId>();
 			data.enumerateGroups([&](not_null<PeerData*> peer) {
 				peer = peer->migrateToOrMe();
-				const auto c = peer->asChannel();
-				const auto g = peer->asChat();
 				if (ranges::contains(ids, peer->id)) {
 					return;
 				}
+				const auto c = peer->asChannel();
+				const auto g = peer->asChat();
 				if ((c && c->amCreator()) || (g && g->amCreator())) {
 					ids.push_back(peer->id);
 					add(peer);
@@ -208,11 +284,16 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 			});
 		} else {
 			data.enumerateBroadcasts([&](not_null<ChannelData*> channel) {
-				if (channel->amCreator()) {
+				if (channel->amCreator()
+					&& !ranges::contains(ids, channel->id)) {
+					ids.push_back(channel->id);
 					add(channel);
 				}
 			});
 		}
+		if (ids.empty()) {
+			addIcon(box);
+		}
 	};
 
 	using Menu = base::unique_qptr<Ui::PopupMenu>;
@@ -224,12 +305,12 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 
 		(*menu) = base::make_unique_q<Ui::PopupMenu>(
 			button,
-			st::defaultPopupMenu);
+			st::popupMenuWithIcons);
 		(*menu)->addAction(
 			(chats ? tr::lng_menu_my_groups : tr::lng_menu_my_channels)(
 				tr::now),
 			[=] { controller->uiShow()->showBox(Box(myChannelsBox)); },
-			nullptr);
+			chats ? &st::menuIconGroups : &st::menuIconChannel);
 		(*menu)->popup(QCursor::pos());
 	});
 

From c5febce548f814e4526849f15ae79ac9aed4bcdb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 8 Apr 2024 17:34:58 +0300
Subject: [PATCH 258/596] Moved out some functions for main menu to separated
 files.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../SourceFiles/window/window_main_menu.cpp   | 417 ++----------------
 .../window/window_main_menu_helpers.cpp       | 368 ++++++++++++++++
 .../window/window_main_menu_helpers.h         |  33 ++
 4 files changed, 446 insertions(+), 374 deletions(-)
 create mode 100644 Telegram/SourceFiles/window/window_main_menu_helpers.cpp
 create mode 100644 Telegram/SourceFiles/window/window_main_menu_helpers.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 4988f34b3..2e26bf4d6 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1503,6 +1503,8 @@ PRIVATE
     window/window_lock_widgets.h
     window/window_main_menu.cpp
     window/window_main_menu.h
+    window/window_main_menu_helpers.cpp
+    window/window_main_menu_helpers.h
     window/window_media_preview.cpp
     window/window_media_preview.h
     window/window_peer_menu.cpp
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 1f833a4d6..bf1b21962 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -8,70 +8,60 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_main_menu.h"
 
 #include "apiwrap.h"
-#include "window/themes/window_theme.h"
-#include "window/window_peer_menu.h"
-#include "window/window_session_controller.h"
-#include "window/window_controller.h"
+#include "base/qt_signal_producer.h"
+#include "boxes/about_box.h"
+#include "boxes/peer_list_controllers.h"
+#include "boxes/premium_preview_box.h"
+#include "calls/calls_box_controller.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "data/data_changes.h"
+#include "data/data_document_media.h"
+#include "data/data_folder.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "data/data_user.h"
+#include "info/info_memento.h"
+#include "info/profile/info_profile_badge.h"
+#include "info/profile/info_profile_emoji_status_panel.h"
+#include "info/stories/info_stories_widget.h"
+#include "lang/lang_keys.h"
+#include "main/main_account.h"
+#include "main/main_domain.h"
+#include "main/main_session.h"
+#include "main/main_session_settings.h"
+#include "mtproto/mtproto_config.h"
+#include "settings/settings_advanced.h"
+#include "settings/settings_calls.h"
+#include "settings/settings_information.h"
+#include "storage/localstorage.h"
+#include "storage/storage_account.h"
+#include "support/support_templates.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/snowflakes.h"
 #include "ui/effects/toggle_arrow.h"
+#include "ui/painter.h"
+#include "ui/text/text_options.h"
+#include "ui/text/text_utilities.h"
+#include "ui/unread_badge_paint.h"
+#include "ui/vertical_list.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
-#include "ui/widgets/tooltip.h"
 #include "ui/wrap/slide_wrap.h"
-#include "ui/text/text_utilities.h"
-#include "ui/text/text_options.h"
-#include "ui/new_badges.h"
-#include "ui/painter.h"
-#include "ui/rect.h"
-#include "ui/vertical_list.h"
-#include "ui/unread_badge_paint.h"
-#include "inline_bots/bot_attach_web_view.h"
-#include "storage/localstorage.h"
-#include "storage/storage_account.h"
-#include "support/support_templates.h"
-#include "settings/settings_advanced.h"
-#include "settings/settings_calls.h"
-#include "settings/settings_information.h"
-#include "info/profile/info_profile_badge.h"
-#include "info/profile/info_profile_emoji_status_panel.h"
-#include "info/stories/info_stories_widget.h"
-#include "info/info_memento.h"
-#include "base/platform/base_platform_info.h"
-#include "base/qt_signal_producer.h"
-#include "boxes/about_box.h"
-#include "ui/boxes/confirm_box.h"
-#include "boxes/peer_list_controllers.h"
-#include "boxes/premium_preview_box.h"
-#include "calls/calls_box_controller.h"
-#include "lang/lang_keys.h"
-#include "lottie/lottie_icon.h"
-#include "core/click_handler_types.h"
-#include "core/application.h"
-#include "main/main_session.h"
-#include "main/main_session_settings.h"
-#include "main/main_account.h"
-#include "main/main_domain.h"
-#include "mtproto/mtproto_config.h"
-#include "data/data_chat.h"
-#include "data/data_document_media.h"
-#include "data/data_folder.h"
-#include "data/data_session.h"
-#include "data/data_document.h"
-#include "data/data_file_origin.h"
-#include "data/data_user.h"
-#include "data/data_changes.h"
-#include "data/data_channel.h"
-#include "data/data_stories.h"
-#include "mainwidget.h"
+#include "window/themes/window_theme.h"
+#include "window/window_controller.h"
+#include "window/window_main_menu_helpers.h"
+#include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
 #include "styles/style_chat.h" // popupMenuExpandedSeparator
-#include "styles/style_window.h"
-#include "styles/style_settings.h"
 #include "styles/style_info.h" // infoTopBarMenu
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+#include "styles/style_window.h"
 
 #include <QtGui/QWindow>
 #include <QtGui/QScreen>
@@ -84,239 +74,6 @@ namespace {
 
 constexpr auto kPlayStatusLimit = 2;
 
-class VersionLabel final
-	: public Ui::FlatLabel
-	, public Ui::AbstractTooltipShower {
-public:
-	using Ui::FlatLabel::FlatLabel;
-
-	void clickHandlerActiveChanged(
-			const ClickHandlerPtr &action,
-			bool active) override {
-		update();
-		if (active && action && !action->dragText().isEmpty()) {
-			Ui::Tooltip::Show(1000, this);
-		} else {
-			Ui::Tooltip::Hide();
-		}
-	}
-
-	QString tooltipText() const override {
-		return u"Build date: %1."_q.arg(__DATE__);
-	}
-
-	QPoint tooltipPos() const override {
-		return QCursor::pos();
-	}
-
-	bool tooltipWindowActive() const override {
-		return Ui::AppInFocus() && Ui::InFocusChain(window());
-	}
-
-};
-
-not_null<Ui::SettingsButton*> AddMyChannelsBox(
-		not_null<Ui::SettingsButton*> button,
-		not_null<SessionController*> controller,
-		bool chats) {
-	button->setAcceptBoth(true);
-
-	const auto requestIcon = [=, session = &controller->session()](
-			not_null<Ui::GenericBox*> box,
-			Fn<void(not_null<DocumentData*>)> done) {
-		const auto api = box->lifetime().make_state<MTP::Sender>(
-			&session->mtp());
-		api->request(MTPmessages_GetStickerSet(
-			Data::InputStickerSet({
-				.shortName = u"tg_placeholders_android"_q,
-			}),
-			MTP_int(0)
-		)).done([=](const MTPmessages_StickerSet &result) {
-			result.match([&](const MTPDmessages_stickerSet &data) {
-				const auto &v = data.vdocuments().v;
-				if (v.size() > 1) {
-					done(session->data().processDocument(v[1]));
-				}
-			}, [](const MTPDmessages_stickerSetNotModified &) {
-			});
-		}).send();
-	};
-	const auto addIcon = [=](not_null<Ui::GenericBox*> box) {
-		const auto widget = box->addRow(object_ptr<Ui::RpWidget>(box));
-		widget->paintRequest(
-		) | rpl::start_with_next([=] {
-			auto p = QPainter(widget);
-			p.setFont(st::boxTextFont);
-			p.setPen(st::windowSubTextFg);
-			p.drawText(
-				widget->rect(),
-				tr::lng_contacts_loading(tr::now),
-				style::al_center);
-		}, widget->lifetime());
-		widget->resize(Size(st::maxStickerSize));
-		widget->show();
-		box->verticalLayout()->resizeToWidth(box->width());
-		requestIcon(box, [=](not_null<DocumentData*> document) {
-			const auto view = document->createMediaView();
-			const auto origin = document->stickerSetOrigin();
-			controller->session().downloaderTaskFinished(
-			) | rpl::take_while([=] {
-				if (view->bytes().isEmpty()) {
-					return true;
-				}
-				auto owned = Lottie::MakeIcon({
-					.json = Images::UnpackGzip(view->bytes()),
-					.sizeOverride = Size(st::maxStickerSize),
-				});
-				const auto icon = owned.get();
-				widget->lifetime().add([kept = std::move(owned)]{});
-				widget->paintRequest(
-				) | rpl::start_with_next([=] {
-					auto p = QPainter(widget);
-					icon->paint(p, (widget->width() - icon->width()) / 2, 0);
-				}, widget->lifetime());
-				icon->animate(
-					[=] { widget->update(); },
-					0,
-					icon->framesCount());
-				return false;
-			}) | rpl::start(widget->lifetime());
-			view->automaticLoad(origin, nullptr);
-			view->videoThumbnailWanted(origin);
-		});
-	};
-
-	const auto myChannelsBox = [=](not_null<Ui::GenericBox*> box) {
-		box->setTitle(chats
-			? tr::lng_notification_groups()
-			: tr::lng_notification_channels());
-		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
-
-		const auto st = box->lifetime().make_state<style::UserpicButton>(
-			st::defaultUserpicButton);
-		st->photoSize = st::defaultPeerListItem.photoSize;
-		st->size = QSize(st->photoSize, st->photoSize);
-
-		class Button final : public Ui::SettingsButton {
-		public:
-			using Ui::SettingsButton::SettingsButton;
-
-			void setPeer(not_null<PeerData*> p) {
-				const auto c = p->asChannel();
-				const auto g = p->asChat();
-				_text.setText(
-					st::defaultPeerListItem.nameStyle,
-					((c && c->isMegagroup()) ? u"[s] "_q : QString())
-						+ p->name());
-				const auto count = c ? c->membersCount() : g->count;
-				_status.setText(
-					st::defaultTextStyle,
-					!p->username().isEmpty()
-						? ('@' + p->username())
-						: (count > 0)
-						? ((c && !c->isMegagroup())
-							? tr::lng_chat_status_subscribers
-							: tr::lng_chat_status_members)(
-								tr::now,
-								lt_count,
-								count)
-						: QString());
-			}
-
-			int resizeGetHeight(int) override {
-				return st::defaultPeerListItem.height;
-			}
-
-			void paintEvent(QPaintEvent *e) override {
-				Ui::SettingsButton::paintEvent(e);
-				auto p = Painter(this);
-				const auto &st = st::defaultPeerListItem;
-				const auto availableWidth = width()
-					- st::boxRowPadding.right()
-					- st.namePosition.x();
-				p.setPen(st.nameFg);
-				auto context = Ui::Text::PaintContext{
-					.position = st.namePosition,
-					.outerWidth = availableWidth,
-					.availableWidth = availableWidth,
-					.elisionLines = 1,
-				};
-				_text.draw(p, context);
-				p.setPen(st.statusFg);
-				context.position = st.statusPosition;
-				_status.draw(p, context);
-			}
-
-		private:
-			Ui::Text::String _text;
-			Ui::Text::String _status;
-
-		};
-
-		const auto add = [&](not_null<PeerData*> peer) {
-			const auto row = box->addRow(
-				object_ptr<Button>(box, rpl::single(QString())),
-				{});
-			row->setPeer(peer);
-			row->setClickedCallback([=] {
-				controller->showPeerHistory(peer);
-			});
-			using Button = Ui::UserpicButton;
-			const auto userpic = Ui::CreateChild<Button>(row, peer, *st);
-			userpic->move(st::defaultPeerListItem.photoPosition);
-			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
-		};
-
-		const auto &data = controller->session().data();
-		auto ids = std::vector<PeerId>();
-		if (chats) {
-			data.enumerateGroups([&](not_null<PeerData*> peer) {
-				peer = peer->migrateToOrMe();
-				if (ranges::contains(ids, peer->id)) {
-					return;
-				}
-				const auto c = peer->asChannel();
-				const auto g = peer->asChat();
-				if ((c && c->amCreator()) || (g && g->amCreator())) {
-					ids.push_back(peer->id);
-					add(peer);
-				}
-			});
-		} else {
-			data.enumerateBroadcasts([&](not_null<ChannelData*> channel) {
-				if (channel->amCreator()
-					&& !ranges::contains(ids, channel->id)) {
-					ids.push_back(channel->id);
-					add(channel);
-				}
-			});
-		}
-		if (ids.empty()) {
-			addIcon(box);
-		}
-	};
-
-	using Menu = base::unique_qptr<Ui::PopupMenu>;
-	const auto menu = button->lifetime().make_state<Menu>();
-	button->addClickHandler([=](Qt::MouseButton which) {
-		if (which != Qt::RightButton) {
-			return;
-		}
-
-		(*menu) = base::make_unique_q<Ui::PopupMenu>(
-			button,
-			st::popupMenuWithIcons);
-		(*menu)->addAction(
-			(chats ? tr::lng_menu_my_groups : tr::lng_menu_my_channels)(
-				tr::now),
-			[=] { controller->uiShow()->showBox(Box(myChannelsBox)); },
-			chats ? &st::menuIconGroups : &st::menuIconChannel);
-		(*menu)->popup(QCursor::pos());
-	});
-
-	return button;
-}
-
 [[nodiscard]] bool CanCheckSpecialEvent() {
 	static const auto result = [] {
 		const auto now = QDate::currentDate();
@@ -430,88 +187,6 @@ void ShowCallsBox(not_null<Window::SessionController*> window) {
 	}) | rpl::flatten_latest();
 }
 
-void SetupMenuBots(
-		not_null<Ui::VerticalLayout*> container,
-		not_null<Window::SessionController*> controller) {
-	const auto wrap = container->add(
-		object_ptr<Ui::VerticalLayout>(container));
-	const auto bots = &controller->session().attachWebView();
-	const auto iconLoadLifetime = wrap->lifetime().make_state<
-		rpl::lifetime
-	>();
-
-	rpl::single(
-		rpl::empty
-	) | rpl::then(
-		bots->attachBotsUpdates()
-	) | rpl::start_with_next([=] {
-		const auto width = container->widthNoMargins();
-		wrap->clear();
-		for (const auto &bot : bots->attachBots()) {
-			const auto user = bot.user;
-			if (!bot.inMainMenu || !bot.media) {
-				continue;
-			} else if (const auto media = bot.media; !media->loaded()) {
-				if (!*iconLoadLifetime) {
-					auto &session = user->session();
-					*iconLoadLifetime = session.downloaderTaskFinished(
-					) | rpl::start_with_next([=] {
-						if (media->loaded()) {
-							iconLoadLifetime->destroy();
-							bots->notifyBotIconLoaded();
-						}
-					});
-				}
-				continue;
-			}
-			const auto button = wrap->add(object_ptr<Ui::SettingsButton>(
-				wrap,
-				rpl::single(bot.name),
-				st::mainMenuButton));
-			const auto menu = button->lifetime().make_state<
-				base::unique_qptr<Ui::PopupMenu>
-			>();
-			const auto icon = Ui::CreateChild<InlineBots::MenuBotIcon>(
-				button,
-				bot.media);
-			button->heightValue(
-			) | rpl::start_with_next([=](int height) {
-				icon->move(
-					st::mainMenuButton.iconLeft,
-					(height - icon->height()) / 2);
-			}, button->lifetime());
-			const auto weak = Ui::MakeWeak(container);
-			button->setAcceptBoth(true);
-			button->clicks(
-			) | rpl::start_with_next([=](Qt::MouseButton which) {
-				if (which == Qt::LeftButton) {
-					bots->requestSimple(controller, user, {
-						.fromMainMenu = true,
-					});
-					if (weak) {
-						controller->window().hideSettingsAndLayer();
-					}
-				} else {
-					(*menu) = nullptr;
-					(*menu) = base::make_unique_q<Ui::PopupMenu>(
-						button,
-						st::popupMenuWithIcons);
-					(*menu)->addAction(
-						tr::lng_bot_remove_from_menu(tr::now),
-						[=] { bots->removeFromMenu(user); },
-						&st::menuIconDelete);
-					(*menu)->popup(QCursor::pos());
-				}
-			}, button->lifetime());
-
-			if (bots->showMainMenuNewBadge(bot)) {
-				Ui::NewBadge::AddToRight(button);
-			}
-		}
-		wrap->resizeToWidth(width);
-	}, wrap->lifetime());
-}
-
 } // namespace
 
 class MainMenu::ToggleAccountsButton final : public Ui::AbstractButton {
@@ -731,13 +406,7 @@ MainMenu::MainMenu(
 , _footer(_inner->add(object_ptr<Ui::RpWidget>(_inner.get())))
 , _telegram(
 	Ui::CreateChild<Ui::FlatLabel>(_footer.get(), st::mainMenuTelegramLabel))
-, _version((Platform::IsMacStoreBuild() || Platform::IsWindowsStoreBuild())
-	? Ui::CreateChild<Ui::FlatLabel>(
-		_footer.get(),
-		st::mainMenuVersionLabel)
-	: Ui::CreateChild<VersionLabel>(
-		_footer.get(),
-		st::mainMenuVersionLabel)) {
+, _version(AddVersionLabel(_footer)) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
 	setupUserpicButton();
diff --git a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
new file mode 100644
index 000000000..88c0af421
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
@@ -0,0 +1,368 @@
+/*
+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 "window/window_main_menu_helpers.h"
+
+#include "apiwrap.h"
+#include "base/platform/base_platform_info.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_file_origin.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "inline_bots/bot_attach_web_view.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_session.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/layers/generic_box.h"
+#include "ui/new_badges.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/tooltip.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h" // popupMenuExpandedSeparator
+#include "styles/style_info.h" // infoTopBarMenu
+#include "styles/style_menu_icons.h"
+#include "styles/style_window.h"
+
+namespace Window {
+namespace {
+
+class VersionLabel final
+	: public Ui::FlatLabel
+	, public Ui::AbstractTooltipShower {
+public:
+	using Ui::FlatLabel::FlatLabel;
+
+	void clickHandlerActiveChanged(
+			const ClickHandlerPtr &action,
+			bool active) override {
+		update();
+		if (active && action && !action->dragText().isEmpty()) {
+			Ui::Tooltip::Show(1000, this);
+		} else {
+			Ui::Tooltip::Hide();
+		}
+	}
+
+	QString tooltipText() const override {
+		return u"Build date: %1."_q.arg(__DATE__);
+	}
+
+	QPoint tooltipPos() const override {
+		return QCursor::pos();
+	}
+
+	bool tooltipWindowActive() const override {
+		return Ui::AppInFocus() && Ui::InFocusChain(window());
+	}
+
+};
+
+} // namespace
+
+[[nodiscard]] not_null<Ui::FlatLabel*> AddVersionLabel(
+		not_null<Ui::RpWidget*> parent) {
+	return (Platform::IsMacStoreBuild() || Platform::IsWindowsStoreBuild())
+		? Ui::CreateChild<Ui::FlatLabel>(
+			parent.get(),
+			st::mainMenuVersionLabel)
+		: Ui::CreateChild<VersionLabel>(
+			parent.get(),
+			st::mainMenuVersionLabel);
+}
+
+not_null<Ui::SettingsButton*> AddMyChannelsBox(
+		not_null<Ui::SettingsButton*> button,
+		not_null<SessionController*> controller,
+		bool chats) {
+	button->setAcceptBoth(true);
+
+	const auto requestIcon = [=, session = &controller->session()](
+			not_null<Ui::GenericBox*> box,
+			Fn<void(not_null<DocumentData*>)> done) {
+		const auto api = box->lifetime().make_state<MTP::Sender>(
+			&session->mtp());
+		api->request(MTPmessages_GetStickerSet(
+			Data::InputStickerSet({
+				.shortName = u"tg_placeholders_android"_q,
+			}),
+			MTP_int(0)
+		)).done([=](const MTPmessages_StickerSet &result) {
+			result.match([&](const MTPDmessages_stickerSet &data) {
+				const auto &v = data.vdocuments().v;
+				if (v.size() > 1) {
+					done(session->data().processDocument(v[1]));
+				}
+			}, [](const MTPDmessages_stickerSetNotModified &) {
+			});
+		}).send();
+	};
+	const auto addIcon = [=](not_null<Ui::GenericBox*> box) {
+		const auto widget = box->addRow(object_ptr<Ui::RpWidget>(box));
+		widget->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = QPainter(widget);
+			p.setFont(st::boxTextFont);
+			p.setPen(st::windowSubTextFg);
+			p.drawText(
+				widget->rect(),
+				tr::lng_contacts_loading(tr::now),
+				style::al_center);
+		}, widget->lifetime());
+		widget->resize(Size(st::maxStickerSize));
+		widget->show();
+		box->verticalLayout()->resizeToWidth(box->width());
+		requestIcon(box, [=](not_null<DocumentData*> document) {
+			const auto view = document->createMediaView();
+			const auto origin = document->stickerSetOrigin();
+			controller->session().downloaderTaskFinished(
+			) | rpl::take_while([=] {
+				if (view->bytes().isEmpty()) {
+					return true;
+				}
+				auto owned = Lottie::MakeIcon({
+					.json = Images::UnpackGzip(view->bytes()),
+					.sizeOverride = Size(st::maxStickerSize),
+				});
+				const auto icon = owned.get();
+				widget->lifetime().add([kept = std::move(owned)]{});
+				widget->paintRequest(
+				) | rpl::start_with_next([=] {
+					auto p = QPainter(widget);
+					icon->paint(p, (widget->width() - icon->width()) / 2, 0);
+				}, widget->lifetime());
+				icon->animate(
+					[=] { widget->update(); },
+					0,
+					icon->framesCount());
+				return false;
+			}) | rpl::start(widget->lifetime());
+			view->automaticLoad(origin, nullptr);
+			view->videoThumbnailWanted(origin);
+		});
+	};
+
+	const auto myChannelsBox = [=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(chats
+			? tr::lng_notification_groups()
+			: tr::lng_notification_channels());
+		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
+
+		const auto st = box->lifetime().make_state<style::UserpicButton>(
+			st::defaultUserpicButton);
+		st->photoSize = st::defaultPeerListItem.photoSize;
+		st->size = QSize(st->photoSize, st->photoSize);
+
+		class Button final : public Ui::SettingsButton {
+		public:
+			using Ui::SettingsButton::SettingsButton;
+
+			void setPeer(not_null<PeerData*> p) {
+				const auto c = p->asChannel();
+				const auto g = p->asChat();
+				_text.setText(
+					st::defaultPeerListItem.nameStyle,
+					((c && c->isMegagroup()) ? u"[s] "_q : QString())
+						+ p->name());
+				const auto count = c ? c->membersCount() : g->count;
+				_status.setText(
+					st::defaultTextStyle,
+					!p->username().isEmpty()
+						? ('@' + p->username())
+						: (count > 0)
+						? ((c && !c->isMegagroup())
+							? tr::lng_chat_status_subscribers
+							: tr::lng_chat_status_members)(
+								tr::now,
+								lt_count,
+								count)
+						: QString());
+			}
+
+			int resizeGetHeight(int) override {
+				return st::defaultPeerListItem.height;
+			}
+
+			void paintEvent(QPaintEvent *e) override {
+				Ui::SettingsButton::paintEvent(e);
+				auto p = Painter(this);
+				const auto &st = st::defaultPeerListItem;
+				const auto availableWidth = width()
+					- st::boxRowPadding.right()
+					- st.namePosition.x();
+				p.setPen(st.nameFg);
+				auto context = Ui::Text::PaintContext{
+					.position = st.namePosition,
+					.outerWidth = availableWidth,
+					.availableWidth = availableWidth,
+					.elisionLines = 1,
+				};
+				_text.draw(p, context);
+				p.setPen(st.statusFg);
+				context.position = st.statusPosition;
+				_status.draw(p, context);
+			}
+
+		private:
+			Ui::Text::String _text;
+			Ui::Text::String _status;
+
+		};
+
+		const auto add = [&](not_null<PeerData*> peer) {
+			const auto row = box->addRow(
+				object_ptr<Button>(box, rpl::single(QString())),
+				{});
+			row->setPeer(peer);
+			row->setClickedCallback([=] {
+				controller->showPeerHistory(peer);
+			});
+			using Button = Ui::UserpicButton;
+			const auto userpic = Ui::CreateChild<Button>(row, peer, *st);
+			userpic->move(st::defaultPeerListItem.photoPosition);
+			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		};
+
+		const auto &data = controller->session().data();
+		auto ids = std::vector<PeerId>();
+		if (chats) {
+			data.enumerateGroups([&](not_null<PeerData*> peer) {
+				peer = peer->migrateToOrMe();
+				if (ranges::contains(ids, peer->id)) {
+					return;
+				}
+				const auto c = peer->asChannel();
+				const auto g = peer->asChat();
+				if ((c && c->amCreator()) || (g && g->amCreator())) {
+					ids.push_back(peer->id);
+					add(peer);
+				}
+			});
+		} else {
+			data.enumerateBroadcasts([&](not_null<ChannelData*> channel) {
+				if (channel->amCreator()
+					&& !ranges::contains(ids, channel->id)) {
+					ids.push_back(channel->id);
+					add(channel);
+				}
+			});
+		}
+		if (ids.empty()) {
+			addIcon(box);
+		}
+	};
+
+	using Menu = base::unique_qptr<Ui::PopupMenu>;
+	const auto menu = button->lifetime().make_state<Menu>();
+	button->addClickHandler([=](Qt::MouseButton which) {
+		if (which != Qt::RightButton) {
+			return;
+		}
+
+		(*menu) = base::make_unique_q<Ui::PopupMenu>(
+			button,
+			st::popupMenuWithIcons);
+		(*menu)->addAction(
+			(chats ? tr::lng_menu_my_groups : tr::lng_menu_my_channels)(
+				tr::now),
+			[=] { controller->uiShow()->showBox(Box(myChannelsBox)); },
+			chats ? &st::menuIconGroups : &st::menuIconChannel);
+		(*menu)->popup(QCursor::pos());
+	});
+
+	return button;
+}
+
+void SetupMenuBots(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> controller) {
+	const auto wrap = container->add(
+		object_ptr<Ui::VerticalLayout>(container));
+	const auto bots = &controller->session().attachWebView();
+	const auto iconLoadLifetime = wrap->lifetime().make_state<
+		rpl::lifetime
+	>();
+
+	rpl::single(
+		rpl::empty
+	) | rpl::then(
+		bots->attachBotsUpdates()
+	) | rpl::start_with_next([=] {
+		const auto width = container->widthNoMargins();
+		wrap->clear();
+		for (const auto &bot : bots->attachBots()) {
+			const auto user = bot.user;
+			if (!bot.inMainMenu || !bot.media) {
+				continue;
+			} else if (const auto media = bot.media; !media->loaded()) {
+				if (!*iconLoadLifetime) {
+					auto &session = user->session();
+					*iconLoadLifetime = session.downloaderTaskFinished(
+					) | rpl::start_with_next([=] {
+						if (media->loaded()) {
+							iconLoadLifetime->destroy();
+							bots->notifyBotIconLoaded();
+						}
+					});
+				}
+				continue;
+			}
+			const auto button = wrap->add(object_ptr<Ui::SettingsButton>(
+				wrap,
+				rpl::single(bot.name),
+				st::mainMenuButton));
+			const auto menu = button->lifetime().make_state<
+				base::unique_qptr<Ui::PopupMenu>
+			>();
+			const auto icon = Ui::CreateChild<InlineBots::MenuBotIcon>(
+				button,
+				bot.media);
+			button->heightValue(
+			) | rpl::start_with_next([=](int height) {
+				icon->move(
+					st::mainMenuButton.iconLeft,
+					(height - icon->height()) / 2);
+			}, button->lifetime());
+			const auto weak = Ui::MakeWeak(container);
+			button->setAcceptBoth(true);
+			button->clicks(
+			) | rpl::start_with_next([=](Qt::MouseButton which) {
+				if (which == Qt::LeftButton) {
+					bots->requestSimple(controller, user, {
+						.fromMainMenu = true,
+					});
+					if (weak) {
+						controller->window().hideSettingsAndLayer();
+					}
+				} else {
+					(*menu) = nullptr;
+					(*menu) = base::make_unique_q<Ui::PopupMenu>(
+						button,
+						st::popupMenuWithIcons);
+					(*menu)->addAction(
+						tr::lng_bot_remove_from_menu(tr::now),
+						[=] { bots->removeFromMenu(user); },
+						&st::menuIconDelete);
+					(*menu)->popup(QCursor::pos());
+				}
+			}, button->lifetime());
+
+			if (bots->showMainMenuNewBadge(bot)) {
+				Ui::NewBadge::AddToRight(button);
+			}
+		}
+		wrap->resizeToWidth(width);
+	}, wrap->lifetime());
+}
+
+} // namespace Window
diff --git a/Telegram/SourceFiles/window/window_main_menu_helpers.h b/Telegram/SourceFiles/window/window_main_menu_helpers.h
new file mode 100644
index 000000000..94da85e96
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_main_menu_helpers.h
@@ -0,0 +1,33 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+class FlatLabel;
+class RpWidget;
+class SettingsButton;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Window {
+
+class SessionController;
+
+[[nodiscard]] not_null<Ui::FlatLabel*> AddVersionLabel(
+	not_null<Ui::RpWidget*>);
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddMyChannelsBox(
+	not_null<Ui::SettingsButton*> button,
+	not_null<SessionController*> controller,
+	bool chats);
+
+void SetupMenuBots(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<SessionController*> controller);
+
+} // namespace Window

From 0152d2c48e1f01cfa72621e0c7f5cfeb5704a580 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Apr 2024 21:35:36 +0400
Subject: [PATCH 259/596] Fix possible temp auth key bind freeze.

---
 Telegram/SourceFiles/mtproto/mtp_instance.cpp    |  1 -
 Telegram/SourceFiles/mtproto/session_private.cpp | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
index 861d6cd44..76c5cb623 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
@@ -18,7 +18,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localstorage.h"
 #include "calls/calls_instance.h"
 #include "main/main_account.h" // Account::configUpdated.
-#include "apiwrap.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "lang/lang_instance.h"
diff --git a/Telegram/SourceFiles/mtproto/session_private.cpp b/Telegram/SourceFiles/mtproto/session_private.cpp
index bdd2b9a83..96a0c8268 100644
--- a/Telegram/SourceFiles/mtproto/session_private.cpp
+++ b/Telegram/SourceFiles/mtproto/session_private.cpp
@@ -869,6 +869,7 @@ void SessionPrivate::tryToSend() {
 					false,
 					bindDcKeyRequest);
 				_bindMessageSent = crl::now();
+				sentIdsWrap.messages.push_back(_bindMsgId);
 				needAnyResponse = true;
 			}
 			if (pingRequest) {
@@ -877,6 +878,7 @@ void SessionPrivate::tryToSend() {
 					bigMsgId,
 					forceNewMsgId,
 					pingRequest);
+				sentIdsWrap.messages.push_back(_pingMsgId);
 				needAnyResponse = true;
 			}
 
@@ -1600,13 +1602,22 @@ SessionPrivate::HandleResult SessionPrivate::handleOneReceived(
 					correctUnixtimeWithBadLocal(info.serverTime);
 					info.badTime = false;
 				}
+				if (_bindMsgId) {
+					LOG(("Message Info: bad message notification received"
+						" while binding temp key, restarting."));
+					return HandleResult::RestartConnection;
+				}
 				LOG(("Message Info: bad message notification received, msgId %1, error_code %2").arg(data.vbad_msg_id().v).arg(errorCode));
 				return HandleResult::ResetSession;
 			}
 		} else { // fatal (except 48, but it must not get here)
 			const auto badMsgId = mtpMsgId(data.vbad_msg_id().v);
 			const auto requestId = wasSent(resendId);
-			if (requestId) {
+			if (_bindMsgId) {
+				LOG(("Message Error: fatal bad message notification received"
+					" while binding temp key, restarting."));
+				return HandleResult::RestartConnection;
+			} else if (requestId) {
 				LOG(("Message Error: "
 					"fatal bad message notification received, "
 					"msgId %1, error_code %2, requestId: %3"

From 7c44cda76eed347928fe2cee552f1e24aca45c30 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Apr 2024 21:56:08 +0400
Subject: [PATCH 260/596] Fix premium users deselection in multi-select field.

---
 Telegram/SourceFiles/boxes/edit_privacy_box.cpp | 5 +++--
 Telegram/SourceFiles/boxes/peer_list_box.cpp    | 8 +++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 9fcb6b032..5fbb5383b 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -159,8 +159,6 @@ public:
 		-> rpl::producer<RowSelectionChange>;
 
 private:
-	[[nodiscard]] std::unique_ptr<PeerListRow> createRow() const;
-
 	const not_null<Main::Session*> _session;
 	bool _premiums = false;
 
@@ -331,6 +329,9 @@ auto PrivacyExceptionsBoxController::preparePremiumsRowList()
 
 	_deselectOption = [=](PeerListRowId itemId) {
 		if (const auto row = _typesDelegate->peerListFindRow(itemId)) {
+			if (itemId == kPremiumsRowId) {
+				_selected.premiums = false;
+			}
 			_typesDelegate->peerListSetRowChecked(row, false);
 		}
 	};
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 149171e5b..bda06d535 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1039,11 +1039,9 @@ void PeerListContent::changeCheckState(
 		not_null<PeerListRow*> row,
 		bool checked,
 		anim::type animated) {
-	row->setChecked(
-		checked,
-		_st.item.checkbox,
-		animated,
-		[=] { updateRow(row); });
+	row->setChecked(checked, _st.item.checkbox, animated, [=] {
+		updateRow(row);
+	});
 }
 
 void PeerListContent::setRowHidden(not_null<PeerListRow*> row, bool hidden) {

From 10272ee0cf266f5d6c25259e4ac2e8341c952688 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 8 Apr 2024 16:53:25 +0400
Subject: [PATCH 261/596] Revert "Replace jemalloc with scudo"

This reverts commit 960761ef37fb7db57c40df6211164ae002f1063a.
---
 .gitmodules                                   |    3 +
 Telegram/ThirdParty/jemalloc                  |    1 +
 Telegram/ThirdParty/scudo/CMakeLists.txt      |  253 ---
 Telegram/ThirdParty/scudo/allocator_common.h  |   85 -
 Telegram/ThirdParty/scudo/allocator_config.h  |  280 ---
 Telegram/ThirdParty/scudo/atomic_helpers.h    |  145 --
 .../scudo/benchmarks/CMakeLists.txt           |   33 -
 .../scudo/benchmarks/malloc_benchmark.cpp     |  105 -
 Telegram/ThirdParty/scudo/bytemap.h           |   43 -
 Telegram/ThirdParty/scudo/checksum.cpp        |   83 -
 Telegram/ThirdParty/scudo/checksum.h          |   59 -
 Telegram/ThirdParty/scudo/chunk.h             |  143 --
 Telegram/ThirdParty/scudo/combined.h          | 1538 ---------------
 Telegram/ThirdParty/scudo/common.cpp          |   24 -
 Telegram/ThirdParty/scudo/common.h            |  232 ---
 .../ThirdParty/scudo/condition_variable.h     |   60 -
 .../scudo/condition_variable_base.h           |   56 -
 .../scudo/condition_variable_linux.cpp        |   52 -
 .../scudo/condition_variable_linux.h          |   38 -
 Telegram/ThirdParty/scudo/crc32_hw.cpp        |   20 -
 Telegram/ThirdParty/scudo/flags.cpp           |   76 -
 Telegram/ThirdParty/scudo/flags.h             |   38 -
 Telegram/ThirdParty/scudo/flags.inc           |   51 -
 Telegram/ThirdParty/scudo/flags_parser.cpp    |  178 --
 Telegram/ThirdParty/scudo/flags_parser.h      |   56 -
 Telegram/ThirdParty/scudo/fuchsia.cpp         |  237 ---
 Telegram/ThirdParty/scudo/fuchsia.h           |   32 -
 Telegram/ThirdParty/scudo/fuzz/CMakeLists.txt |   12 -
 .../scudo/fuzz/get_error_info_fuzzer.cpp      |   56 -
 .../scudo/include/scudo/interface.h           |  182 --
 Telegram/ThirdParty/scudo/internal_defs.h     |  166 --
 Telegram/ThirdParty/scudo/linux.cpp           |  242 ---
 Telegram/ThirdParty/scudo/linux.h             |   25 -
 Telegram/ThirdParty/scudo/list.h              |  240 ---
 Telegram/ThirdParty/scudo/local_cache.h       |  189 --
 Telegram/ThirdParty/scudo/mem_map.cpp         |   84 -
 Telegram/ThirdParty/scudo/mem_map.h           |   92 -
 Telegram/ThirdParty/scudo/mem_map_base.h      |  129 --
 Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp |  252 ---
 Telegram/ThirdParty/scudo/mem_map_fuchsia.h   |   75 -
 Telegram/ThirdParty/scudo/mem_map_linux.cpp   |  153 --
 Telegram/ThirdParty/scudo/mem_map_linux.h     |   67 -
 Telegram/ThirdParty/scudo/memtag.h            |  335 ----
 Telegram/ThirdParty/scudo/mutex.h             |   97 -
 Telegram/ThirdParty/scudo/options.h           |   74 -
 Telegram/ThirdParty/scudo/platform.h          |  104 -
 Telegram/ThirdParty/scudo/primary32.h         | 1170 ------------
 Telegram/ThirdParty/scudo/primary64.h         | 1688 -----------------
 Telegram/ThirdParty/scudo/quarantine.h        |  309 ---
 Telegram/ThirdParty/scudo/release.cpp         |   17 -
 Telegram/ThirdParty/scudo/release.h           |  701 -------
 Telegram/ThirdParty/scudo/report.cpp          |  192 --
 Telegram/ThirdParty/scudo/report.h            |   60 -
 Telegram/ThirdParty/scudo/report_linux.cpp    |   58 -
 Telegram/ThirdParty/scudo/report_linux.h      |   34 -
 Telegram/ThirdParty/scudo/secondary.h         |  708 -------
 Telegram/ThirdParty/scudo/size_class_map.h    |  353 ----
 Telegram/ThirdParty/scudo/stack_depot.h       |  143 --
 Telegram/ThirdParty/scudo/stats.h             |  102 -
 Telegram/ThirdParty/scudo/string_utils.cpp    |  277 ---
 Telegram/ThirdParty/scudo/string_utils.h      |   43 -
 .../ThirdParty/scudo/tests/CMakeLists.txt     |  144 --
 .../ThirdParty/scudo/tests/atomic_test.cpp    |  101 -
 .../ThirdParty/scudo/tests/bytemap_test.cpp   |   33 -
 .../ThirdParty/scudo/tests/checksum_test.cpp  |   58 -
 .../ThirdParty/scudo/tests/chunk_test.cpp     |   57 -
 .../ThirdParty/scudo/tests/combined_test.cpp  |  903 ---------
 .../ThirdParty/scudo/tests/common_test.cpp    |   75 -
 .../scudo/tests/condition_variable_test.cpp   |   59 -
 .../ThirdParty/scudo/tests/flags_test.cpp     |  134 --
 Telegram/ThirdParty/scudo/tests/list_test.cpp |  216 ---
 Telegram/ThirdParty/scudo/tests/map_test.cpp  |   91 -
 .../ThirdParty/scudo/tests/memtag_test.cpp    |  213 ---
 .../ThirdParty/scudo/tests/mutex_test.cpp     |  108 --
 .../ThirdParty/scudo/tests/primary_test.cpp   |  441 -----
 .../scudo/tests/quarantine_test.cpp           |  255 ---
 .../ThirdParty/scudo/tests/release_test.cpp   |  654 -------
 .../ThirdParty/scudo/tests/report_test.cpp    |   55 -
 .../ThirdParty/scudo/tests/scudo_unit_test.h  |   54 -
 .../scudo/tests/scudo_unit_test_main.cpp      |   54 -
 .../ThirdParty/scudo/tests/secondary_test.cpp |  253 ---
 .../scudo/tests/size_class_map_test.cpp       |   55 -
 .../ThirdParty/scudo/tests/stats_test.cpp     |   46 -
 .../ThirdParty/scudo/tests/strings_test.cpp   |  125 --
 .../ThirdParty/scudo/tests/timing_test.cpp    |   86 -
 Telegram/ThirdParty/scudo/tests/tsd_test.cpp  |  256 ---
 .../ThirdParty/scudo/tests/vector_test.cpp    |   43 -
 .../scudo/tests/wrappers_c_test.cpp           |  663 -------
 .../scudo/tests/wrappers_cpp_test.cpp         |  273 ---
 .../ThirdParty/scudo/thread_annotations.h     |   70 -
 Telegram/ThirdParty/scudo/timing.cpp          |   29 -
 Telegram/ThirdParty/scudo/timing.h            |  221 ---
 .../scudo/tools/compute_size_class_config.cpp |  162 --
 Telegram/ThirdParty/scudo/trusty.cpp          |  118 --
 Telegram/ThirdParty/scudo/trusty.h            |   24 -
 Telegram/ThirdParty/scudo/tsd.h               |   90 -
 Telegram/ThirdParty/scudo/tsd_exclusive.h     |  178 --
 Telegram/ThirdParty/scudo/tsd_shared.h        |  252 ---
 Telegram/ThirdParty/scudo/vector.h            |  131 --
 Telegram/ThirdParty/scudo/wrappers_c.cpp      |   40 -
 Telegram/ThirdParty/scudo/wrappers_c.h        |   62 -
 Telegram/ThirdParty/scudo/wrappers_c.inc      |  374 ----
 .../ThirdParty/scudo/wrappers_c_bionic.cpp    |   76 -
 Telegram/ThirdParty/scudo/wrappers_c_checks.h |   72 -
 Telegram/ThirdParty/scudo/wrappers_cpp.cpp    |  150 --
 cmake                                         |    2 +-
 106 files changed, 5 insertions(+), 19901 deletions(-)
 create mode 160000 Telegram/ThirdParty/jemalloc
 delete mode 100644 Telegram/ThirdParty/scudo/CMakeLists.txt
 delete mode 100644 Telegram/ThirdParty/scudo/allocator_common.h
 delete mode 100644 Telegram/ThirdParty/scudo/allocator_config.h
 delete mode 100644 Telegram/ThirdParty/scudo/atomic_helpers.h
 delete mode 100644 Telegram/ThirdParty/scudo/benchmarks/CMakeLists.txt
 delete mode 100644 Telegram/ThirdParty/scudo/benchmarks/malloc_benchmark.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/bytemap.h
 delete mode 100644 Telegram/ThirdParty/scudo/checksum.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/checksum.h
 delete mode 100644 Telegram/ThirdParty/scudo/chunk.h
 delete mode 100644 Telegram/ThirdParty/scudo/combined.h
 delete mode 100644 Telegram/ThirdParty/scudo/common.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/common.h
 delete mode 100644 Telegram/ThirdParty/scudo/condition_variable.h
 delete mode 100644 Telegram/ThirdParty/scudo/condition_variable_base.h
 delete mode 100644 Telegram/ThirdParty/scudo/condition_variable_linux.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/condition_variable_linux.h
 delete mode 100644 Telegram/ThirdParty/scudo/crc32_hw.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/flags.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/flags.h
 delete mode 100644 Telegram/ThirdParty/scudo/flags.inc
 delete mode 100644 Telegram/ThirdParty/scudo/flags_parser.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/flags_parser.h
 delete mode 100644 Telegram/ThirdParty/scudo/fuchsia.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/fuchsia.h
 delete mode 100644 Telegram/ThirdParty/scudo/fuzz/CMakeLists.txt
 delete mode 100644 Telegram/ThirdParty/scudo/fuzz/get_error_info_fuzzer.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/include/scudo/interface.h
 delete mode 100644 Telegram/ThirdParty/scudo/internal_defs.h
 delete mode 100644 Telegram/ThirdParty/scudo/linux.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/linux.h
 delete mode 100644 Telegram/ThirdParty/scudo/list.h
 delete mode 100644 Telegram/ThirdParty/scudo/local_cache.h
 delete mode 100644 Telegram/ThirdParty/scudo/mem_map.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/mem_map.h
 delete mode 100644 Telegram/ThirdParty/scudo/mem_map_base.h
 delete mode 100644 Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/mem_map_fuchsia.h
 delete mode 100644 Telegram/ThirdParty/scudo/mem_map_linux.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/mem_map_linux.h
 delete mode 100644 Telegram/ThirdParty/scudo/memtag.h
 delete mode 100644 Telegram/ThirdParty/scudo/mutex.h
 delete mode 100644 Telegram/ThirdParty/scudo/options.h
 delete mode 100644 Telegram/ThirdParty/scudo/platform.h
 delete mode 100644 Telegram/ThirdParty/scudo/primary32.h
 delete mode 100644 Telegram/ThirdParty/scudo/primary64.h
 delete mode 100644 Telegram/ThirdParty/scudo/quarantine.h
 delete mode 100644 Telegram/ThirdParty/scudo/release.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/release.h
 delete mode 100644 Telegram/ThirdParty/scudo/report.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/report.h
 delete mode 100644 Telegram/ThirdParty/scudo/report_linux.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/report_linux.h
 delete mode 100644 Telegram/ThirdParty/scudo/secondary.h
 delete mode 100644 Telegram/ThirdParty/scudo/size_class_map.h
 delete mode 100644 Telegram/ThirdParty/scudo/stack_depot.h
 delete mode 100644 Telegram/ThirdParty/scudo/stats.h
 delete mode 100644 Telegram/ThirdParty/scudo/string_utils.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/string_utils.h
 delete mode 100644 Telegram/ThirdParty/scudo/tests/CMakeLists.txt
 delete mode 100644 Telegram/ThirdParty/scudo/tests/atomic_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/bytemap_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/checksum_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/chunk_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/combined_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/common_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/condition_variable_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/flags_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/list_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/map_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/memtag_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/mutex_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/primary_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/quarantine_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/release_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/report_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/scudo_unit_test.h
 delete mode 100644 Telegram/ThirdParty/scudo/tests/scudo_unit_test_main.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/secondary_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/size_class_map_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/stats_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/strings_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/timing_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/tsd_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/vector_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/wrappers_c_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/tests/wrappers_cpp_test.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/thread_annotations.h
 delete mode 100644 Telegram/ThirdParty/scudo/timing.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/timing.h
 delete mode 100644 Telegram/ThirdParty/scudo/tools/compute_size_class_config.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/trusty.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/trusty.h
 delete mode 100644 Telegram/ThirdParty/scudo/tsd.h
 delete mode 100644 Telegram/ThirdParty/scudo/tsd_exclusive.h
 delete mode 100644 Telegram/ThirdParty/scudo/tsd_shared.h
 delete mode 100644 Telegram/ThirdParty/scudo/vector.h
 delete mode 100644 Telegram/ThirdParty/scudo/wrappers_c.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/wrappers_c.h
 delete mode 100644 Telegram/ThirdParty/scudo/wrappers_c.inc
 delete mode 100644 Telegram/ThirdParty/scudo/wrappers_c_bionic.cpp
 delete mode 100644 Telegram/ThirdParty/scudo/wrappers_c_checks.h
 delete mode 100644 Telegram/ThirdParty/scudo/wrappers_cpp.cpp

diff --git a/.gitmodules b/.gitmodules
index bf3c35f42..f611a0acc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,6 +76,9 @@
 [submodule "Telegram/lib_webview"]
 	path = Telegram/lib_webview
 	url = https://github.com/desktop-app/lib_webview.git
+[submodule "Telegram/ThirdParty/jemalloc"]
+	path = Telegram/ThirdParty/jemalloc
+	url = https://github.com/jemalloc/jemalloc
 [submodule "Telegram/ThirdParty/dispatch"]
 	path = Telegram/ThirdParty/dispatch
 	url = https://github.com/apple/swift-corelibs-libdispatch
diff --git a/Telegram/ThirdParty/jemalloc b/Telegram/ThirdParty/jemalloc
new file mode 160000
index 000000000..54eaed1d8
--- /dev/null
+++ b/Telegram/ThirdParty/jemalloc
@@ -0,0 +1 @@
+Subproject commit 54eaed1d8b56b1aa528be3bdd1877e59c56fa90c
diff --git a/Telegram/ThirdParty/scudo/CMakeLists.txt b/Telegram/ThirdParty/scudo/CMakeLists.txt
deleted file mode 100644
index 60092005c..000000000
--- a/Telegram/ThirdParty/scudo/CMakeLists.txt
+++ /dev/null
@@ -1,253 +0,0 @@
-add_compiler_rt_component(scudo_standalone)
-
-include_directories(../.. include)
-
-set(SCUDO_CFLAGS)
-
-list(APPEND SCUDO_CFLAGS
-  -Werror=conversion
-  -Wall
-  -Wextra
-  -pedantic
-  -g
-  -nostdinc++)
-
-# Remove -stdlib= which is unused when passing -nostdinc++.
-string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-
-append_list_if(COMPILER_RT_HAS_FVISIBILITY_HIDDEN_FLAG -fvisibility=hidden SCUDO_CFLAGS)
-
-append_list_if(COMPILER_RT_HAS_FNO_EXCEPTIONS_FLAG -fno-exceptions SCUDO_CFLAGS)
-
-append_list_if(COMPILER_RT_HAS_WNO_PEDANTIC -Wno-pedantic SCUDO_CFLAGS)
-
-# FIXME: find cleaner way to agree with GWPAsan flags
-append_list_if(COMPILER_RT_HAS_FNO_LTO_FLAG -fno-lto SCUDO_CFLAGS)
-
-if(COMPILER_RT_DEBUG)
-  list(APPEND SCUDO_CFLAGS -O0 -DSCUDO_DEBUG=1 -DSCUDO_ENABLE_HOOKS=1)
-else()
-  list(APPEND SCUDO_CFLAGS -O3)
-endif()
-
-append_list_if(COMPILER_RT_HAS_WTHREAD_SAFETY_FLAG -Werror=thread-safety
-  SCUDO_CFLAGS)
-
-set(SCUDO_LINK_FLAGS)
-
-list(APPEND SCUDO_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro)
-
-list(APPEND SCUDO_LINK_FLAGS -ffunction-sections -fdata-sections -Wl,--gc-sections)
-
-# We don't use the C++ standard library, so avoid including it by mistake.
-append_list_if(COMPILER_RT_HAS_NOSTDLIBXX_FLAG -nostdlib++ SCUDO_LINK_FLAGS)
-append_list_if(CXX_SUPPORTS_UNWINDLIB_NONE_FLAG --unwindlib=none SCUDO_LINK_FLAGS)
-
-if(COMPILER_RT_SCUDO_STANDALONE_SYSROOT_PATH)
-  list(APPEND SCUDO_CFLAGS "--sysroot=${COMPILER_RT_SCUDO_STANDALONE_SYSROOT_PATH}")
-endif()
-
-if(ANDROID)
-  list(APPEND SCUDO_CFLAGS -fno-emulated-tls)
-
-# Put the shared library in the global group. For more details, see
-# android-changes-for-ndk-developers.md#changes-to-library-search-order
-  append_list_if(COMPILER_RT_HAS_Z_GLOBAL -Wl,-z,global SCUDO_LINK_FLAGS)
-endif()
-
-set(SCUDO_HEADERS
-  allocator_common.h
-  allocator_config.h
-  atomic_helpers.h
-  bytemap.h
-  checksum.h
-  chunk.h
-  condition_variable.h
-  condition_variable_base.h
-  condition_variable_linux.h
-  combined.h
-  common.h
-  flags_parser.h
-  flags.h
-  fuchsia.h
-  internal_defs.h
-  linux.h
-  list.h
-  local_cache.h
-  memtag.h
-  mem_map.h
-  mem_map_base.h
-  mem_map_fuchsia.h
-  mem_map_linux.h
-  mutex.h
-  options.h
-  platform.h
-  primary32.h
-  primary64.h
-  quarantine.h
-  release.h
-  report.h
-  report_linux.h
-  secondary.h
-  size_class_map.h
-  stack_depot.h
-  stats.h
-  string_utils.h
-  timing.h
-  tsd_exclusive.h
-  tsd_shared.h
-  tsd.h
-  vector.h
-  wrappers_c_checks.h
-  wrappers_c.h
-
-  include/scudo/interface.h
-  )
-
-set(SCUDO_SOURCES
-  checksum.cpp
-  common.cpp
-  condition_variable_linux.cpp
-  crc32_hw.cpp
-  flags_parser.cpp
-  flags.cpp
-  fuchsia.cpp
-  linux.cpp
-  mem_map.cpp
-  mem_map_fuchsia.cpp
-  mem_map_linux.cpp
-  release.cpp
-  report.cpp
-  report_linux.cpp
-  string_utils.cpp
-  timing.cpp
-  )
-
-# Temporary hack until LLVM libc supports inttypes.h print format macros
-# See: https://github.com/llvm/llvm-project/issues/63317#issuecomment-1591906241
-if(LLVM_LIBC_INCLUDE_SCUDO)
-  list(REMOVE_ITEM SCUDO_HEADERS timing.h)
-  list(REMOVE_ITEM SCUDO_SOURCES timing.cpp)
-endif()
-
-# Enable the necessary instruction set for scudo_crc32.cpp, if available.
-# Newer compiler versions use -mcrc32 rather than -msse4.2.
-if (COMPILER_RT_HAS_MCRC32_FLAG)
-  set_source_files_properties(crc32_hw.cpp PROPERTIES COMPILE_FLAGS -mcrc32)
-elseif (COMPILER_RT_HAS_MSSE4_2_FLAG)
-  set_source_files_properties(crc32_hw.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
-endif()
-
-# Enable the AArch64 CRC32 feature for crc32_hw.cpp, if available.
-# Note that it is enabled by default starting with armv8.1-a.
-if (COMPILER_RT_HAS_MCRC_FLAG)
-  set_source_files_properties(crc32_hw.cpp PROPERTIES COMPILE_FLAGS -mcrc)
-endif()
-
-set(SCUDO_SOURCES_C_WRAPPERS
-  wrappers_c.cpp
-  )
-
-set(SCUDO_SOURCES_CXX_WRAPPERS
-  wrappers_cpp.cpp
-  )
-
-set(SCUDO_OBJECT_LIBS)
-set(SCUDO_LINK_LIBS)
-
-if (COMPILER_RT_HAS_GWP_ASAN)
-  if(COMPILER_RT_USE_LLVM_UNWINDER)
-    list(APPEND SCUDO_LINK_LIBS ${COMPILER_RT_UNWINDER_LINK_LIBS} dl)
-  elseif (COMPILER_RT_HAS_GCC_S_LIB)
-    list(APPEND SCUDO_LINK_LIBS gcc_s)
-  elseif (COMPILER_RT_HAS_GCC_LIB)
-    list(APPEND SCUDO_LINK_LIBS gcc)
-  elseif (NOT COMPILER_RT_USE_BUILTINS_LIBRARY)
-    message(FATAL_ERROR "No suitable unwinder library")
-  endif()
-
-  add_dependencies(scudo_standalone gwp_asan)
-  list(APPEND SCUDO_OBJECT_LIBS
-       RTGwpAsan RTGwpAsanBacktraceLibc RTGwpAsanSegvHandler
-       RTGwpAsanOptionsParser)
-
-  append_list_if(COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG -fno-omit-frame-pointer
-                                                         -mno-omit-leaf-frame-pointer
-                 SCUDO_CFLAGS)
-  list(APPEND SCUDO_CFLAGS -DGWP_ASAN_HOOKS)
-
-endif()
-
-if(COMPILER_RT_BUILD_SCUDO_STANDALONE_WITH_LLVM_LIBC)
-  include_directories(${COMPILER_RT_BINARY_DIR}/../libc/include/)
-
-  set(SCUDO_DEPS libc-headers)
-
-  list(APPEND SCUDO_CFLAGS "-ffreestanding")
-endif()
-
-append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread SCUDO_LINK_FLAGS)
-
-append_list_if(FUCHSIA zircon SCUDO_LINK_LIBS)
-
-if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCHES "mips|mips64|mipsel|mips64el")
-  list(APPEND SCUDO_LINK_LIBS atomic)
-endif()
-
-if(COMPILER_RT_HAS_SCUDO_STANDALONE)
-  add_compiler_rt_object_libraries(RTScudoStandalone
-    ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
-    SOURCES ${SCUDO_SOURCES}
-    ADDITIONAL_HEADERS ${SCUDO_HEADERS}
-    CFLAGS ${SCUDO_CFLAGS}
-    DEPS ${SCUDO_DEPS})
-  add_compiler_rt_object_libraries(RTScudoStandaloneCWrappers
-    ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
-    SOURCES ${SCUDO_SOURCES_C_WRAPPERS}
-    ADDITIONAL_HEADERS ${SCUDO_HEADERS}
-    CFLAGS ${SCUDO_CFLAGS}
-    DEPS ${SCUDO_DEPS})
-  add_compiler_rt_object_libraries(RTScudoStandaloneCxxWrappers
-    ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
-    SOURCES ${SCUDO_SOURCES_CXX_WRAPPERS}
-    ADDITIONAL_HEADERS ${SCUDO_HEADERS}
-    CFLAGS ${SCUDO_CFLAGS}
-    DEPS ${SCUDO_DEPS})
-
-  add_compiler_rt_runtime(clang_rt.scudo_standalone
-    STATIC
-    ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
-    SOURCES ${SCUDO_SOURCES} ${SCUDO_SOURCES_C_WRAPPERS}
-    ADDITIONAL_HEADERS ${SCUDO_HEADERS}
-    CFLAGS ${SCUDO_CFLAGS}
-    DEPS ${SCUDO_DEPS}
-    OBJECT_LIBS ${SCUDO_OBJECT_LIBS}
-    PARENT_TARGET scudo_standalone)
-  add_compiler_rt_runtime(clang_rt.scudo_standalone_cxx
-    STATIC
-    ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
-    SOURCES ${SCUDO_SOURCES_CXX_WRAPPERS}
-    ADDITIONAL_HEADERS ${SCUDO_HEADERS}
-    CFLAGS ${SCUDO_CFLAGS}
-    DEPS ${SCUDO_DEPS}
-    PARENT_TARGET scudo_standalone)
-
-  if(COMPILER_RT_SCUDO_STANDALONE_BUILD_SHARED)
-    add_compiler_rt_runtime(clang_rt.scudo_standalone
-      SHARED
-      ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
-      SOURCES ${SCUDO_SOURCES} ${SCUDO_SOURCES_C_WRAPPERS} ${SCUDO_SOURCES_CXX_WRAPPERS}
-      ADDITIONAL_HEADERS ${SCUDO_HEADERS}
-      CFLAGS ${SCUDO_CFLAGS}
-      DEPS ${SCUDO_DEPS}
-      OBJECT_LIBS ${SCUDO_OBJECT_LIBS}
-      LINK_FLAGS ${SCUDO_LINK_FLAGS}
-      LINK_LIBS ${SCUDO_LINK_LIBS}
-      PARENT_TARGET scudo_standalone)
-  endif()
-
-  add_subdirectory(benchmarks)
-  if(COMPILER_RT_INCLUDE_TESTS)
-    add_subdirectory(tests)
-  endif()
-endif()
diff --git a/Telegram/ThirdParty/scudo/allocator_common.h b/Telegram/ThirdParty/scudo/allocator_common.h
deleted file mode 100644
index 95f4776ac..000000000
--- a/Telegram/ThirdParty/scudo/allocator_common.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//===-- allocator_common.h --------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_ALLOCATOR_COMMON_H_
-#define SCUDO_ALLOCATOR_COMMON_H_
-
-#include "common.h"
-#include "list.h"
-
-namespace scudo {
-
-template <class SizeClassAllocator> struct TransferBatch {
-  typedef typename SizeClassAllocator::SizeClassMap SizeClassMap;
-  typedef typename SizeClassAllocator::CompactPtrT CompactPtrT;
-
-  static const u16 MaxNumCached = SizeClassMap::MaxNumCachedHint;
-  void setFromArray(CompactPtrT *Array, u16 N) {
-    DCHECK_LE(N, MaxNumCached);
-    Count = N;
-    memcpy(Batch, Array, sizeof(Batch[0]) * Count);
-  }
-  void appendFromArray(CompactPtrT *Array, u16 N) {
-    DCHECK_LE(N, MaxNumCached - Count);
-    memcpy(Batch + Count, Array, sizeof(Batch[0]) * N);
-    // u16 will be promoted to int by arithmetic type conversion.
-    Count = static_cast<u16>(Count + N);
-  }
-  void appendFromTransferBatch(TransferBatch *B, u16 N) {
-    DCHECK_LE(N, MaxNumCached - Count);
-    DCHECK_GE(B->Count, N);
-    // Append from the back of `B`.
-    memcpy(Batch + Count, B->Batch + (B->Count - N), sizeof(Batch[0]) * N);
-    // u16 will be promoted to int by arithmetic type conversion.
-    Count = static_cast<u16>(Count + N);
-    B->Count = static_cast<u16>(B->Count - N);
-  }
-  void clear() { Count = 0; }
-  void add(CompactPtrT P) {
-    DCHECK_LT(Count, MaxNumCached);
-    Batch[Count++] = P;
-  }
-  void moveToArray(CompactPtrT *Array) {
-    memcpy(Array, Batch, sizeof(Batch[0]) * Count);
-    clear();
-  }
-  u16 getCount() const { return Count; }
-  bool isEmpty() const { return Count == 0U; }
-  CompactPtrT get(u16 I) const {
-    DCHECK_LE(I, Count);
-    return Batch[I];
-  }
-  TransferBatch *Next;
-
-private:
-  CompactPtrT Batch[MaxNumCached];
-  u16 Count;
-};
-
-// A BatchGroup is used to collect blocks. Each group has a group id to
-// identify the group kind of contained blocks.
-template <class SizeClassAllocator> struct BatchGroup {
-  // `Next` is used by IntrusiveList.
-  BatchGroup *Next;
-  // The compact base address of each group
-  uptr CompactPtrGroupBase;
-  // Cache value of SizeClassAllocatorLocalCache::getMaxCached()
-  u16 MaxCachedPerBatch;
-  // Number of blocks pushed into this group. This is an increment-only
-  // counter.
-  uptr PushedBlocks;
-  // This is used to track how many bytes are not in-use since last time we
-  // tried to release pages.
-  uptr BytesInBGAtLastCheckpoint;
-  // Blocks are managed by TransferBatch in a list.
-  SinglyLinkedList<TransferBatch<SizeClassAllocator>> Batches;
-};
-
-} // namespace scudo
-
-#endif // SCUDO_ALLOCATOR_COMMON_H_
diff --git a/Telegram/ThirdParty/scudo/allocator_config.h b/Telegram/ThirdParty/scudo/allocator_config.h
deleted file mode 100644
index 3c6aa3acb..000000000
--- a/Telegram/ThirdParty/scudo/allocator_config.h
+++ /dev/null
@@ -1,280 +0,0 @@
-//===-- allocator_config.h --------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_ALLOCATOR_CONFIG_H_
-#define SCUDO_ALLOCATOR_CONFIG_H_
-
-#include "combined.h"
-#include "common.h"
-#include "condition_variable.h"
-#include "flags.h"
-#include "primary32.h"
-#include "primary64.h"
-#include "secondary.h"
-#include "size_class_map.h"
-#include "tsd_exclusive.h"
-#include "tsd_shared.h"
-
-// To import a custom configuration, define `SCUDO_USE_CUSTOM_CONFIG` and
-// aliasing the `Config` like:
-//
-// namespace scudo {
-//   // The instance of Scudo will be initiated with `Config`.
-//   typedef CustomConfig Config;
-//   // Aliasing as default configuration to run the tests with this config.
-//   typedef CustomConfig DefaultConfig;
-// } // namespace scudo
-//
-// Put them in the header `custom_scudo_config.h` then you will be using the
-// custom configuration and able to run all the tests as well.
-#ifdef SCUDO_USE_CUSTOM_CONFIG
-#include "custom_scudo_config.h"
-#endif
-
-namespace scudo {
-
-// The combined allocator uses a structure as a template argument that
-// specifies the configuration options for the various subcomponents of the
-// allocator.
-//
-// struct ExampleConfig {
-//   // Indicates possible support for Memory Tagging.
-//   static const bool MaySupportMemoryTagging = false;
-//
-//   // Thread-Specific Data Registry used, shared or exclusive.
-//   template <class A> using TSDRegistryT = TSDRegistrySharedT<A, 8U, 4U>;
-//
-//   struct Primary {
-//     // SizeClassMap to use with the Primary.
-//     using SizeClassMap = DefaultSizeClassMap;
-//
-//     // Log2 of the size of a size class region, as used by the Primary.
-//     static const uptr RegionSizeLog = 30U;
-//
-//     // Log2 of the size of block group, as used by the Primary. Each group
-//     // contains a range of memory addresses, blocks in the range will belong
-//     // to the same group. In general, single region may have 1 or 2MB group
-//     // size. Multiple regions will have the group size equal to the region
-//     // size because the region size is usually smaller than 1 MB.
-//     // Smaller value gives fine-grained control of memory usage but the
-//     // trade-off is that it may take longer time of deallocation.
-//     static const uptr GroupSizeLog = 20U;
-//
-//     // Defines the type and scale of a compact pointer. A compact pointer can
-//     // be understood as the offset of a pointer within the region it belongs
-//     // to, in increments of a power-of-2 scale.
-//     // eg: Ptr = Base + (CompactPtr << Scale).
-//     typedef u32 CompactPtrT;
-//     static const uptr CompactPtrScale = SCUDO_MIN_ALIGNMENT_LOG;
-//
-//     // Indicates support for offsetting the start of a region by
-//     // a random number of pages. Only used with primary64.
-//     static const bool EnableRandomOffset = true;
-//
-//     // Call map for user memory with at least this size. Only used with
-//     // primary64.
-//     static const uptr MapSizeIncrement = 1UL << 18;
-//
-//     // Defines the minimal & maximal release interval that can be set.
-//     static const s32 MinReleaseToOsIntervalMs = INT32_MIN;
-//     static const s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-//
-//     // Use condition variable to shorten the waiting time of refillment of
-//     // freelist. Note that this depends on the implementation of condition
-//     // variable on each platform and the performance may vary so that it
-//     // doesn't guarantee a performance benefit.
-//     // Note that both variables have to be defined to enable it.
-//     static const bool UseConditionVariable = true;
-//     using ConditionVariableT = ConditionVariableLinux;
-//   };
-//   // Defines the type of Primary allocator to use.
-//   template <typename Config> using PrimaryT = SizeClassAllocator64<Config>;
-//
-//   // Defines the type of cache used by the Secondary. Some additional
-//   // configuration entries can be necessary depending on the Cache.
-//   struct Secondary {
-//     struct Cache {
-//       static const u32 EntriesArraySize = 32U;
-//       static const u32 QuarantineSize = 0U;
-//       static const u32 DefaultMaxEntriesCount = 32U;
-//       static const uptr DefaultMaxEntrySize = 1UL << 19;
-//       static const s32 MinReleaseToOsIntervalMs = INT32_MIN;
-//       static const s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-//     };
-//     // Defines the type of Secondary Cache to use.
-//     template <typename Config> using CacheT = MapAllocatorCache<Config>;
-//   };
-//   // Defines the type of Secondary allocator to use.
-//   template <typename Config> using SecondaryT = MapAllocator<Config>;
-// };
-
-#ifndef SCUDO_USE_CUSTOM_CONFIG
-
-// Default configurations for various platforms. Note this is only enabled when
-// there's no custom configuration in the build system.
-struct DefaultConfig {
-  static const bool MaySupportMemoryTagging = true;
-  template <class A> using TSDRegistryT = TSDRegistryExT<A>; // Exclusive
-
-  struct Primary {
-    using SizeClassMap = DefaultSizeClassMap;
-#if SCUDO_CAN_USE_PRIMARY64
-    static const uptr RegionSizeLog = 32U;
-    static const uptr GroupSizeLog = 21U;
-    typedef uptr CompactPtrT;
-    static const uptr CompactPtrScale = 0;
-    static const bool EnableRandomOffset = true;
-    static const uptr MapSizeIncrement = 1UL << 18;
-#else
-    static const uptr RegionSizeLog = 19U;
-    static const uptr GroupSizeLog = 19U;
-    typedef uptr CompactPtrT;
-#endif
-    static const s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-  };
-#if SCUDO_CAN_USE_PRIMARY64
-  template <typename Config> using PrimaryT = SizeClassAllocator64<Config>;
-#else
-  template <typename Config> using PrimaryT = SizeClassAllocator32<Config>;
-#endif
-
-  struct Secondary {
-    struct Cache {
-      static const u32 EntriesArraySize = 32U;
-      static const u32 QuarantineSize = 0U;
-      static const u32 DefaultMaxEntriesCount = 32U;
-      static const uptr DefaultMaxEntrySize = 1UL << 19;
-      static const s32 MinReleaseToOsIntervalMs = INT32_MIN;
-      static const s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-    };
-    template <typename Config> using CacheT = MapAllocatorCache<Config>;
-  };
-
-  template <typename Config> using SecondaryT = MapAllocator<Config>;
-};
-
-#endif // SCUDO_USE_CUSTOM_CONFIG
-
-struct AndroidConfig {
-  static const bool MaySupportMemoryTagging = true;
-  template <class A>
-  using TSDRegistryT = TSDRegistrySharedT<A, 8U, 2U>; // Shared, max 8 TSDs.
-
-  struct Primary {
-    using SizeClassMap = AndroidSizeClassMap;
-#if SCUDO_CAN_USE_PRIMARY64
-    static const uptr RegionSizeLog = 28U;
-    typedef u32 CompactPtrT;
-    static const uptr CompactPtrScale = SCUDO_MIN_ALIGNMENT_LOG;
-    static const uptr GroupSizeLog = 20U;
-    static const bool EnableRandomOffset = true;
-    static const uptr MapSizeIncrement = 1UL << 18;
-#else
-    static const uptr RegionSizeLog = 18U;
-    static const uptr GroupSizeLog = 18U;
-    typedef uptr CompactPtrT;
-#endif
-    static const s32 MinReleaseToOsIntervalMs = 1000;
-    static const s32 MaxReleaseToOsIntervalMs = 1000;
-  };
-#if SCUDO_CAN_USE_PRIMARY64
-  template <typename Config> using PrimaryT = SizeClassAllocator64<Config>;
-#else
-  template <typename Config> using PrimaryT = SizeClassAllocator32<Config>;
-#endif
-
-  struct Secondary {
-    struct Cache {
-      static const u32 EntriesArraySize = 256U;
-      static const u32 QuarantineSize = 32U;
-      static const u32 DefaultMaxEntriesCount = 32U;
-      static const uptr DefaultMaxEntrySize = 2UL << 20;
-      static const s32 MinReleaseToOsIntervalMs = 0;
-      static const s32 MaxReleaseToOsIntervalMs = 1000;
-    };
-    template <typename Config> using CacheT = MapAllocatorCache<Config>;
-  };
-
-  template <typename Config> using SecondaryT = MapAllocator<Config>;
-};
-
-#if SCUDO_CAN_USE_PRIMARY64
-struct FuchsiaConfig {
-  static const bool MaySupportMemoryTagging = false;
-  template <class A>
-  using TSDRegistryT = TSDRegistrySharedT<A, 8U, 4U>; // Shared, max 8 TSDs.
-
-  struct Primary {
-    using SizeClassMap = FuchsiaSizeClassMap;
-#if SCUDO_RISCV64
-    // Support 39-bit VMA for riscv-64
-    static const uptr RegionSizeLog = 28U;
-    static const uptr GroupSizeLog = 19U;
-#else
-    static const uptr RegionSizeLog = 30U;
-    static const uptr GroupSizeLog = 21U;
-#endif
-    typedef u32 CompactPtrT;
-    static const bool EnableRandomOffset = true;
-    static const uptr MapSizeIncrement = 1UL << 18;
-    static const uptr CompactPtrScale = SCUDO_MIN_ALIGNMENT_LOG;
-    static const s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-  };
-  template <typename Config> using PrimaryT = SizeClassAllocator64<Config>;
-
-  struct Secondary {
-    template <typename Config> using CacheT = MapAllocatorNoCache<Config>;
-  };
-  template <typename Config> using SecondaryT = MapAllocator<Config>;
-};
-
-struct TrustyConfig {
-  static const bool MaySupportMemoryTagging = true;
-  template <class A>
-  using TSDRegistryT = TSDRegistrySharedT<A, 1U, 1U>; // Shared, max 1 TSD.
-
-  struct Primary {
-    using SizeClassMap = TrustySizeClassMap;
-    static const uptr RegionSizeLog = 28U;
-    static const uptr GroupSizeLog = 20U;
-    typedef u32 CompactPtrT;
-    static const bool EnableRandomOffset = false;
-    static const uptr MapSizeIncrement = 1UL << 12;
-    static const uptr CompactPtrScale = SCUDO_MIN_ALIGNMENT_LOG;
-    static const s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-  };
-  template <typename Config> using PrimaryT = SizeClassAllocator64<Config>;
-
-  struct Secondary {
-    template <typename Config> using CacheT = MapAllocatorNoCache<Config>;
-  };
-
-  template <typename Config> using SecondaryT = MapAllocator<Config>;
-};
-#endif
-
-#ifndef SCUDO_USE_CUSTOM_CONFIG
-
-#if SCUDO_ANDROID
-typedef AndroidConfig Config;
-#elif SCUDO_FUCHSIA
-typedef FuchsiaConfig Config;
-#elif SCUDO_TRUSTY
-typedef TrustyConfig Config;
-#else
-typedef DefaultConfig Config;
-#endif
-
-#endif // SCUDO_USE_CUSTOM_CONFIG
-
-} // namespace scudo
-
-#endif // SCUDO_ALLOCATOR_CONFIG_H_
diff --git a/Telegram/ThirdParty/scudo/atomic_helpers.h b/Telegram/ThirdParty/scudo/atomic_helpers.h
deleted file mode 100644
index a68ffd162..000000000
--- a/Telegram/ThirdParty/scudo/atomic_helpers.h
+++ /dev/null
@@ -1,145 +0,0 @@
-//===-- atomic_helpers.h ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_ATOMIC_H_
-#define SCUDO_ATOMIC_H_
-
-#include "internal_defs.h"
-
-namespace scudo {
-
-enum memory_order {
-  memory_order_relaxed = 0,
-  memory_order_consume = 1,
-  memory_order_acquire = 2,
-  memory_order_release = 3,
-  memory_order_acq_rel = 4,
-  memory_order_seq_cst = 5
-};
-static_assert(memory_order_relaxed == __ATOMIC_RELAXED, "");
-static_assert(memory_order_consume == __ATOMIC_CONSUME, "");
-static_assert(memory_order_acquire == __ATOMIC_ACQUIRE, "");
-static_assert(memory_order_release == __ATOMIC_RELEASE, "");
-static_assert(memory_order_acq_rel == __ATOMIC_ACQ_REL, "");
-static_assert(memory_order_seq_cst == __ATOMIC_SEQ_CST, "");
-
-struct atomic_u8 {
-  typedef u8 Type;
-  volatile Type ValDoNotUse;
-};
-
-struct atomic_u16 {
-  typedef u16 Type;
-  volatile Type ValDoNotUse;
-};
-
-struct atomic_s32 {
-  typedef s32 Type;
-  volatile Type ValDoNotUse;
-};
-
-struct atomic_u32 {
-  typedef u32 Type;
-  volatile Type ValDoNotUse;
-};
-
-struct atomic_u64 {
-  typedef u64 Type;
-  // On 32-bit platforms u64 is not necessarily aligned on 8 bytes.
-  alignas(8) volatile Type ValDoNotUse;
-};
-
-struct atomic_uptr {
-  typedef uptr Type;
-  volatile Type ValDoNotUse;
-};
-
-template <typename T>
-inline typename T::Type atomic_load(const volatile T *A, memory_order MO) {
-  DCHECK(!(reinterpret_cast<uptr>(A) % sizeof(*A)));
-  typename T::Type V;
-  __atomic_load(&A->ValDoNotUse, &V, MO);
-  return V;
-}
-
-template <typename T>
-inline void atomic_store(volatile T *A, typename T::Type V, memory_order MO) {
-  DCHECK(!(reinterpret_cast<uptr>(A) % sizeof(*A)));
-  __atomic_store(&A->ValDoNotUse, &V, MO);
-}
-
-inline void atomic_thread_fence(memory_order) { __sync_synchronize(); }
-
-template <typename T>
-inline typename T::Type atomic_fetch_add(volatile T *A, typename T::Type V,
-                                         memory_order MO) {
-  DCHECK(!(reinterpret_cast<uptr>(A) % sizeof(*A)));
-  return __atomic_fetch_add(&A->ValDoNotUse, V, MO);
-}
-
-template <typename T>
-inline typename T::Type atomic_fetch_sub(volatile T *A, typename T::Type V,
-                                         memory_order MO) {
-  DCHECK(!(reinterpret_cast<uptr>(A) % sizeof(*A)));
-  return __atomic_fetch_sub(&A->ValDoNotUse, V, MO);
-}
-
-template <typename T>
-inline typename T::Type atomic_fetch_and(volatile T *A, typename T::Type V,
-                                         memory_order MO) {
-  DCHECK(!(reinterpret_cast<uptr>(A) % sizeof(*A)));
-  return __atomic_fetch_and(&A->ValDoNotUse, V, MO);
-}
-
-template <typename T>
-inline typename T::Type atomic_fetch_or(volatile T *A, typename T::Type V,
-                                        memory_order MO) {
-  DCHECK(!(reinterpret_cast<uptr>(A) % sizeof(*A)));
-  return __atomic_fetch_or(&A->ValDoNotUse, V, MO);
-}
-
-template <typename T>
-inline typename T::Type atomic_exchange(volatile T *A, typename T::Type V,
-                                        memory_order MO) {
-  DCHECK(!(reinterpret_cast<uptr>(A) % sizeof(*A)));
-  typename T::Type R;
-  __atomic_exchange(&A->ValDoNotUse, &V, &R, MO);
-  return R;
-}
-
-template <typename T>
-inline bool atomic_compare_exchange_strong(volatile T *A, typename T::Type *Cmp,
-                                           typename T::Type Xchg,
-                                           memory_order MO) {
-  return __atomic_compare_exchange(&A->ValDoNotUse, Cmp, &Xchg, false, MO,
-                                   __ATOMIC_RELAXED);
-}
-
-// Clutter-reducing helpers.
-
-template <typename T>
-inline typename T::Type atomic_load_relaxed(const volatile T *A) {
-  return atomic_load(A, memory_order_relaxed);
-}
-
-template <typename T>
-inline void atomic_store_relaxed(volatile T *A, typename T::Type V) {
-  atomic_store(A, V, memory_order_relaxed);
-}
-
-template <typename T>
-inline typename T::Type
-atomic_compare_exchange_strong(volatile T *A, typename T::Type Cmp,
-                               typename T::Type Xchg, memory_order MO) {
-  atomic_compare_exchange_strong(A, &Cmp, Xchg, MO);
-  return Cmp;
-}
-
-} // namespace scudo
-
-#endif // SCUDO_ATOMIC_H_
diff --git a/Telegram/ThirdParty/scudo/benchmarks/CMakeLists.txt b/Telegram/ThirdParty/scudo/benchmarks/CMakeLists.txt
deleted file mode 100644
index 26d023c79..000000000
--- a/Telegram/ThirdParty/scudo/benchmarks/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-# To build these benchmarks, build the target "ScudoBenchmarks.$ARCH", where
-# $ARCH is the name of the target architecture. For example,
-# ScudoBenchmarks.x86_64 for 64-bit x86. The benchmark executable is then
-# available under projects/compiler-rt/lib/scudo/standalone/benchmarks/ in the
-# build directory.
-
-include(AddLLVM)
-
-set(SCUDO_BENCHMARK_CFLAGS -I${COMPILER_RT_SOURCE_DIR}/lib/scudo/standalone)
-if(ANDROID)
-  list(APPEND SCUDO_BENCHMARK_CFLAGS -fno-emulated-tls)
-endif()
-string(REPLACE ";" " " SCUDO_BENCHMARK_CFLAGS " ${SCUDO_BENCHMARK_CFLAGS}")
-
-foreach(arch ${SCUDO_STANDALONE_SUPPORTED_ARCH})
-  add_benchmark(ScudoBenchmarks.${arch}
-                malloc_benchmark.cpp
-                $<TARGET_OBJECTS:RTScudoStandalone.${arch}>)
-  set_property(TARGET ScudoBenchmarks.${arch} APPEND_STRING PROPERTY
-               COMPILE_FLAGS "${SCUDO_BENCHMARK_CFLAGS}")
-
-  if (COMPILER_RT_HAS_GWP_ASAN)
-    add_benchmark(
-      ScudoBenchmarksWithGwpAsan.${arch} malloc_benchmark.cpp
-      $<TARGET_OBJECTS:RTScudoStandalone.${arch}>
-      $<TARGET_OBJECTS:RTGwpAsan.${arch}>
-      $<TARGET_OBJECTS:RTGwpAsanBacktraceLibc.${arch}>
-      $<TARGET_OBJECTS:RTGwpAsanSegvHandler.${arch}>)
-    set_property(
-      TARGET ScudoBenchmarksWithGwpAsan.${arch} APPEND_STRING PROPERTY
-      COMPILE_FLAGS "${SCUDO_BENCHMARK_CFLAGS} -DGWP_ASAN_HOOKS")
-  endif()
-endforeach()
diff --git a/Telegram/ThirdParty/scudo/benchmarks/malloc_benchmark.cpp b/Telegram/ThirdParty/scudo/benchmarks/malloc_benchmark.cpp
deleted file mode 100644
index 4fb05b761..000000000
--- a/Telegram/ThirdParty/scudo/benchmarks/malloc_benchmark.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-//===-- malloc_benchmark.cpp ------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "allocator_config.h"
-#include "combined.h"
-#include "common.h"
-
-#include "benchmark/benchmark.h"
-
-#include <memory>
-#include <vector>
-
-void *CurrentAllocator;
-template <typename Config> void PostInitCallback() {
-  reinterpret_cast<scudo::Allocator<Config> *>(CurrentAllocator)->initGwpAsan();
-}
-
-template <typename Config> static void BM_malloc_free(benchmark::State &State) {
-  using AllocatorT = scudo::Allocator<Config, PostInitCallback<Config>>;
-  auto Deleter = [](AllocatorT *A) {
-    A->unmapTestOnly();
-    delete A;
-  };
-  std::unique_ptr<AllocatorT, decltype(Deleter)> Allocator(new AllocatorT,
-                                                           Deleter);
-  CurrentAllocator = Allocator.get();
-
-  const size_t NBytes = State.range(0);
-  size_t PageSize = scudo::getPageSizeCached();
-
-  for (auto _ : State) {
-    void *Ptr = Allocator->allocate(NBytes, scudo::Chunk::Origin::Malloc);
-    auto *Data = reinterpret_cast<uint8_t *>(Ptr);
-    for (size_t I = 0; I < NBytes; I += PageSize)
-      Data[I] = 1;
-    benchmark::DoNotOptimize(Ptr);
-    Allocator->deallocate(Ptr, scudo::Chunk::Origin::Malloc);
-  }
-
-  State.SetBytesProcessed(uint64_t(State.iterations()) * uint64_t(NBytes));
-}
-
-static const size_t MinSize = 8;
-static const size_t MaxSize = 128 * 1024;
-
-// FIXME: Add DefaultConfig here once we can tear down the exclusive TSD
-// cleanly.
-BENCHMARK_TEMPLATE(BM_malloc_free, scudo::AndroidConfig)
-    ->Range(MinSize, MaxSize);
-#if SCUDO_CAN_USE_PRIMARY64
-BENCHMARK_TEMPLATE(BM_malloc_free, scudo::FuchsiaConfig)
-    ->Range(MinSize, MaxSize);
-#endif
-
-template <typename Config>
-static void BM_malloc_free_loop(benchmark::State &State) {
-  using AllocatorT = scudo::Allocator<Config, PostInitCallback<Config>>;
-  auto Deleter = [](AllocatorT *A) {
-    A->unmapTestOnly();
-    delete A;
-  };
-  std::unique_ptr<AllocatorT, decltype(Deleter)> Allocator(new AllocatorT,
-                                                           Deleter);
-  CurrentAllocator = Allocator.get();
-
-  const size_t NumIters = State.range(0);
-  size_t PageSize = scudo::getPageSizeCached();
-  std::vector<void *> Ptrs(NumIters);
-
-  for (auto _ : State) {
-    size_t SizeLog2 = 0;
-    for (void *&Ptr : Ptrs) {
-      Ptr = Allocator->allocate(1 << SizeLog2, scudo::Chunk::Origin::Malloc);
-      auto *Data = reinterpret_cast<uint8_t *>(Ptr);
-      for (size_t I = 0; I < 1 << SizeLog2; I += PageSize)
-        Data[I] = 1;
-      benchmark::DoNotOptimize(Ptr);
-      SizeLog2 = (SizeLog2 + 1) % 16;
-    }
-    for (void *&Ptr : Ptrs)
-      Allocator->deallocate(Ptr, scudo::Chunk::Origin::Malloc);
-  }
-
-  State.SetBytesProcessed(uint64_t(State.iterations()) * uint64_t(NumIters) *
-                          8192);
-}
-
-static const size_t MinIters = 8;
-static const size_t MaxIters = 32 * 1024;
-
-// FIXME: Add DefaultConfig here once we can tear down the exclusive TSD
-// cleanly.
-BENCHMARK_TEMPLATE(BM_malloc_free_loop, scudo::AndroidConfig)
-    ->Range(MinIters, MaxIters);
-#if SCUDO_CAN_USE_PRIMARY64
-BENCHMARK_TEMPLATE(BM_malloc_free_loop, scudo::FuchsiaConfig)
-    ->Range(MinIters, MaxIters);
-#endif
-
-BENCHMARK_MAIN();
diff --git a/Telegram/ThirdParty/scudo/bytemap.h b/Telegram/ThirdParty/scudo/bytemap.h
deleted file mode 100644
index 248e096d0..000000000
--- a/Telegram/ThirdParty/scudo/bytemap.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//===-- bytemap.h -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_BYTEMAP_H_
-#define SCUDO_BYTEMAP_H_
-
-#include "atomic_helpers.h"
-#include "common.h"
-#include "mutex.h"
-
-namespace scudo {
-
-template <uptr Size> class FlatByteMap {
-public:
-  void init() { DCHECK(Size == 0 || Map[0] == 0); }
-
-  void unmapTestOnly() { memset(Map, 0, Size); }
-
-  void set(uptr Index, u8 Value) {
-    DCHECK_LT(Index, Size);
-    DCHECK_EQ(0U, Map[Index]);
-    Map[Index] = Value;
-  }
-  u8 operator[](uptr Index) {
-    DCHECK_LT(Index, Size);
-    return Map[Index];
-  }
-
-  void disable() {}
-  void enable() {}
-
-private:
-  u8 Map[Size] = {};
-};
-
-} // namespace scudo
-
-#endif // SCUDO_BYTEMAP_H_
diff --git a/Telegram/ThirdParty/scudo/checksum.cpp b/Telegram/ThirdParty/scudo/checksum.cpp
deleted file mode 100644
index 2c277391a..000000000
--- a/Telegram/ThirdParty/scudo/checksum.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-//===-- checksum.cpp --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "checksum.h"
-#include "atomic_helpers.h"
-#include "chunk.h"
-
-#if defined(__x86_64__) || defined(__i386__)
-#include <cpuid.h>
-#elif defined(__arm__) || defined(__aarch64__)
-#if SCUDO_FUCHSIA
-#include <zircon/features.h>
-#include <zircon/syscalls.h>
-#else
-#include <sys/auxv.h>
-#endif
-#endif
-
-namespace scudo {
-
-Checksum HashAlgorithm = {Checksum::BSD};
-
-#if defined(__x86_64__) || defined(__i386__)
-// i386 and x86_64 specific code to detect CRC32 hardware support via CPUID.
-// CRC32 requires the SSE 4.2 instruction set.
-#ifndef bit_SSE4_2
-#define bit_SSE4_2 bit_SSE42 // clang and gcc have different defines.
-#endif
-
-#ifndef signature_HYGON_ebx // They are not defined in gcc.
-// HYGON: "HygonGenuine".
-#define signature_HYGON_ebx 0x6f677948
-#define signature_HYGON_edx 0x6e65476e
-#define signature_HYGON_ecx 0x656e6975
-#endif
-
-bool hasHardwareCRC32() {
-  u32 Eax, Ebx = 0, Ecx = 0, Edx = 0;
-  __get_cpuid(0, &Eax, &Ebx, &Ecx, &Edx);
-  const bool IsIntel = (Ebx == signature_INTEL_ebx) &&
-                       (Edx == signature_INTEL_edx) &&
-                       (Ecx == signature_INTEL_ecx);
-  const bool IsAMD = (Ebx == signature_AMD_ebx) && (Edx == signature_AMD_edx) &&
-                     (Ecx == signature_AMD_ecx);
-  const bool IsHygon = (Ebx == signature_HYGON_ebx) &&
-                       (Edx == signature_HYGON_edx) &&
-                       (Ecx == signature_HYGON_ecx);
-  if (!IsIntel && !IsAMD && !IsHygon)
-    return false;
-  __get_cpuid(1, &Eax, &Ebx, &Ecx, &Edx);
-  return !!(Ecx & bit_SSE4_2);
-}
-#elif defined(__arm__) || defined(__aarch64__)
-#ifndef AT_HWCAP
-#define AT_HWCAP 16
-#endif
-#ifndef HWCAP_CRC32
-#define HWCAP_CRC32 (1U << 7) // HWCAP_CRC32 is missing on older platforms.
-#endif
-
-bool hasHardwareCRC32() {
-#if SCUDO_FUCHSIA
-  u32 HWCap;
-  const zx_status_t Status =
-      zx_system_get_features(ZX_FEATURE_KIND_CPU, &HWCap);
-  if (Status != ZX_OK)
-    return false;
-  return !!(HWCap & ZX_ARM64_FEATURE_ISA_CRC32);
-#else
-  return !!(getauxval(AT_HWCAP) & HWCAP_CRC32);
-#endif // SCUDO_FUCHSIA
-}
-#else
-// No hardware CRC32 implemented in Scudo for other architectures.
-bool hasHardwareCRC32() { return false; }
-#endif // defined(__x86_64__) || defined(__i386__)
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/checksum.h b/Telegram/ThirdParty/scudo/checksum.h
deleted file mode 100644
index f8eda81fd..000000000
--- a/Telegram/ThirdParty/scudo/checksum.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//===-- checksum.h ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_CHECKSUM_H_
-#define SCUDO_CHECKSUM_H_
-
-#include "internal_defs.h"
-
-// Hardware CRC32 is supported at compilation via the following:
-// - for i386 & x86_64: -mcrc32 (earlier: -msse4.2)
-// - for ARM & AArch64: -march=armv8-a+crc or -mcrc
-// An additional check must be performed at runtime as well to make sure the
-// emitted instructions are valid on the target host.
-
-#if defined(__CRC32__)
-// NB: clang has <crc32intrin.h> but GCC does not
-#include <smmintrin.h>
-#define CRC32_INTRINSIC                                                        \
-  FIRST_32_SECOND_64(__builtin_ia32_crc32si, __builtin_ia32_crc32di)
-#elif defined(__SSE4_2__)
-#include <smmintrin.h>
-#define CRC32_INTRINSIC FIRST_32_SECOND_64(_mm_crc32_u32, _mm_crc32_u64)
-#endif
-#ifdef __ARM_FEATURE_CRC32
-#include <arm_acle.h>
-#define CRC32_INTRINSIC FIRST_32_SECOND_64(__crc32cw, __crc32cd)
-#endif
-
-namespace scudo {
-
-enum class Checksum : u8 {
-  BSD = 0,
-  HardwareCRC32 = 1,
-};
-
-// BSD checksum, unlike a software CRC32, doesn't use any array lookup. We save
-// significantly on memory accesses, as well as 1K of CRC32 table, on platforms
-// that do no support hardware CRC32. The checksum itself is 16-bit, which is at
-// odds with CRC32, but enough for our needs.
-inline u16 computeBSDChecksum(u16 Sum, uptr Data) {
-  for (u8 I = 0; I < sizeof(Data); I++) {
-    Sum = static_cast<u16>((Sum >> 1) | ((Sum & 1) << 15));
-    Sum = static_cast<u16>(Sum + (Data & 0xff));
-    Data >>= 8;
-  }
-  return Sum;
-}
-
-bool hasHardwareCRC32();
-WEAK u32 computeHardwareCRC32(u32 Crc, uptr Data);
-
-} // namespace scudo
-
-#endif // SCUDO_CHECKSUM_H_
diff --git a/Telegram/ThirdParty/scudo/chunk.h b/Telegram/ThirdParty/scudo/chunk.h
deleted file mode 100644
index 9228df047..000000000
--- a/Telegram/ThirdParty/scudo/chunk.h
+++ /dev/null
@@ -1,143 +0,0 @@
-//===-- chunk.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_CHUNK_H_
-#define SCUDO_CHUNK_H_
-
-#include "platform.h"
-
-#include "atomic_helpers.h"
-#include "checksum.h"
-#include "common.h"
-#include "report.h"
-
-namespace scudo {
-
-extern Checksum HashAlgorithm;
-
-inline u16 computeChecksum(u32 Seed, uptr Value, uptr *Array, uptr ArraySize) {
-  // If the hardware CRC32 feature is defined here, it was enabled everywhere,
-  // as opposed to only for crc32_hw.cpp. This means that other hardware
-  // specific instructions were likely emitted at other places, and as a result
-  // there is no reason to not use it here.
-#if defined(__CRC32__) || defined(__SSE4_2__) || defined(__ARM_FEATURE_CRC32)
-  u32 Crc = static_cast<u32>(CRC32_INTRINSIC(Seed, Value));
-  for (uptr I = 0; I < ArraySize; I++)
-    Crc = static_cast<u32>(CRC32_INTRINSIC(Crc, Array[I]));
-  return static_cast<u16>(Crc ^ (Crc >> 16));
-#else
-  if (HashAlgorithm == Checksum::HardwareCRC32) {
-    u32 Crc = computeHardwareCRC32(Seed, Value);
-    for (uptr I = 0; I < ArraySize; I++)
-      Crc = computeHardwareCRC32(Crc, Array[I]);
-    return static_cast<u16>(Crc ^ (Crc >> 16));
-  } else {
-    u16 Checksum = computeBSDChecksum(static_cast<u16>(Seed), Value);
-    for (uptr I = 0; I < ArraySize; I++)
-      Checksum = computeBSDChecksum(Checksum, Array[I]);
-    return Checksum;
-  }
-#endif // defined(__CRC32__) || defined(__SSE4_2__) ||
-       // defined(__ARM_FEATURE_CRC32)
-}
-
-namespace Chunk {
-
-// Note that in an ideal world, `State` and `Origin` should be `enum class`, and
-// the associated `UnpackedHeader` fields of their respective enum class type
-// but https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414 prevents it from
-// happening, as it will error, complaining the number of bits is not enough.
-enum Origin : u8 {
-  Malloc = 0,
-  New = 1,
-  NewArray = 2,
-  Memalign = 3,
-};
-
-enum State : u8 { Available = 0, Allocated = 1, Quarantined = 2 };
-
-typedef u64 PackedHeader;
-// Update the 'Mask' constants to reflect changes in this structure.
-struct UnpackedHeader {
-  uptr ClassId : 8;
-  u8 State : 2;
-  // Origin if State == Allocated, or WasZeroed otherwise.
-  u8 OriginOrWasZeroed : 2;
-  uptr SizeOrUnusedBytes : 20;
-  uptr Offset : 16;
-  uptr Checksum : 16;
-};
-typedef atomic_u64 AtomicPackedHeader;
-static_assert(sizeof(UnpackedHeader) == sizeof(PackedHeader), "");
-
-// Those constants are required to silence some -Werror=conversion errors when
-// assigning values to the related bitfield variables.
-constexpr uptr ClassIdMask = (1UL << 8) - 1;
-constexpr u8 StateMask = (1U << 2) - 1;
-constexpr u8 OriginMask = (1U << 2) - 1;
-constexpr uptr SizeOrUnusedBytesMask = (1UL << 20) - 1;
-constexpr uptr OffsetMask = (1UL << 16) - 1;
-constexpr uptr ChecksumMask = (1UL << 16) - 1;
-
-constexpr uptr getHeaderSize() {
-  return roundUp(sizeof(PackedHeader), 1U << SCUDO_MIN_ALIGNMENT_LOG);
-}
-
-inline AtomicPackedHeader *getAtomicHeader(void *Ptr) {
-  return reinterpret_cast<AtomicPackedHeader *>(reinterpret_cast<uptr>(Ptr) -
-                                                getHeaderSize());
-}
-
-inline const AtomicPackedHeader *getConstAtomicHeader(const void *Ptr) {
-  return reinterpret_cast<const AtomicPackedHeader *>(
-      reinterpret_cast<uptr>(Ptr) - getHeaderSize());
-}
-
-// We do not need a cryptographically strong hash for the checksum, but a CRC
-// type function that can alert us in the event a header is invalid or
-// corrupted. Ideally slightly better than a simple xor of all fields.
-static inline u16 computeHeaderChecksum(u32 Cookie, const void *Ptr,
-                                        UnpackedHeader *Header) {
-  UnpackedHeader ZeroChecksumHeader = *Header;
-  ZeroChecksumHeader.Checksum = 0;
-  uptr HeaderHolder[sizeof(UnpackedHeader) / sizeof(uptr)];
-  memcpy(&HeaderHolder, &ZeroChecksumHeader, sizeof(HeaderHolder));
-  return computeChecksum(Cookie, reinterpret_cast<uptr>(Ptr), HeaderHolder,
-                         ARRAY_SIZE(HeaderHolder));
-}
-
-inline void storeHeader(u32 Cookie, void *Ptr,
-                        UnpackedHeader *NewUnpackedHeader) {
-  NewUnpackedHeader->Checksum =
-      computeHeaderChecksum(Cookie, Ptr, NewUnpackedHeader);
-  PackedHeader NewPackedHeader = bit_cast<PackedHeader>(*NewUnpackedHeader);
-  atomic_store_relaxed(getAtomicHeader(Ptr), NewPackedHeader);
-}
-
-inline void loadHeader(u32 Cookie, const void *Ptr,
-                       UnpackedHeader *NewUnpackedHeader) {
-  PackedHeader NewPackedHeader = atomic_load_relaxed(getConstAtomicHeader(Ptr));
-  *NewUnpackedHeader = bit_cast<UnpackedHeader>(NewPackedHeader);
-  if (UNLIKELY(NewUnpackedHeader->Checksum !=
-               computeHeaderChecksum(Cookie, Ptr, NewUnpackedHeader)))
-    reportHeaderCorruption(const_cast<void *>(Ptr));
-}
-
-inline bool isValid(u32 Cookie, const void *Ptr,
-                    UnpackedHeader *NewUnpackedHeader) {
-  PackedHeader NewPackedHeader = atomic_load_relaxed(getConstAtomicHeader(Ptr));
-  *NewUnpackedHeader = bit_cast<UnpackedHeader>(NewPackedHeader);
-  return NewUnpackedHeader->Checksum ==
-         computeHeaderChecksum(Cookie, Ptr, NewUnpackedHeader);
-}
-
-} // namespace Chunk
-
-} // namespace scudo
-
-#endif // SCUDO_CHUNK_H_
diff --git a/Telegram/ThirdParty/scudo/combined.h b/Telegram/ThirdParty/scudo/combined.h
deleted file mode 100644
index 4624f83d1..000000000
--- a/Telegram/ThirdParty/scudo/combined.h
+++ /dev/null
@@ -1,1538 +0,0 @@
-//===-- combined.h ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_COMBINED_H_
-#define SCUDO_COMBINED_H_
-
-#include "chunk.h"
-#include "common.h"
-#include "flags.h"
-#include "flags_parser.h"
-#include "local_cache.h"
-#include "mem_map.h"
-#include "memtag.h"
-#include "options.h"
-#include "quarantine.h"
-#include "report.h"
-#include "secondary.h"
-#include "stack_depot.h"
-#include "string_utils.h"
-#include "tsd.h"
-
-#include "scudo/interface.h"
-
-#ifdef GWP_ASAN_HOOKS
-#include "gwp_asan/guarded_pool_allocator.h"
-#include "gwp_asan/optional/backtrace.h"
-#include "gwp_asan/optional/segv_handler.h"
-#endif // GWP_ASAN_HOOKS
-
-extern "C" inline void EmptyCallback() {}
-
-#ifdef HAVE_ANDROID_UNSAFE_FRAME_POINTER_CHASE
-// This function is not part of the NDK so it does not appear in any public
-// header files. We only declare/use it when targeting the platform.
-extern "C" size_t android_unsafe_frame_pointer_chase(scudo::uptr *buf,
-                                                     size_t num_entries);
-#endif
-
-namespace scudo {
-
-template <class Config, void (*PostInitCallback)(void) = EmptyCallback>
-class Allocator {
-public:
-  using PrimaryT = typename Config::template PrimaryT<Config>;
-  using SecondaryT = typename Config::template SecondaryT<Config>;
-  using CacheT = typename PrimaryT::CacheT;
-  typedef Allocator<Config, PostInitCallback> ThisT;
-  typedef typename Config::template TSDRegistryT<ThisT> TSDRegistryT;
-
-  void callPostInitCallback() {
-    pthread_once(&PostInitNonce, PostInitCallback);
-  }
-
-  struct QuarantineCallback {
-    explicit QuarantineCallback(ThisT &Instance, CacheT &LocalCache)
-        : Allocator(Instance), Cache(LocalCache) {}
-
-    // Chunk recycling function, returns a quarantined chunk to the backend,
-    // first making sure it hasn't been tampered with.
-    void recycle(void *Ptr) {
-      Chunk::UnpackedHeader Header;
-      Chunk::loadHeader(Allocator.Cookie, Ptr, &Header);
-      if (UNLIKELY(Header.State != Chunk::State::Quarantined))
-        reportInvalidChunkState(AllocatorAction::Recycling, Ptr);
-
-      Header.State = Chunk::State::Available;
-      Chunk::storeHeader(Allocator.Cookie, Ptr, &Header);
-
-      if (allocatorSupportsMemoryTagging<Config>())
-        Ptr = untagPointer(Ptr);
-      void *BlockBegin = Allocator::getBlockBegin(Ptr, &Header);
-      Cache.deallocate(Header.ClassId, BlockBegin);
-    }
-
-    // We take a shortcut when allocating a quarantine batch by working with the
-    // appropriate class ID instead of using Size. The compiler should optimize
-    // the class ID computation and work with the associated cache directly.
-    void *allocate(UNUSED uptr Size) {
-      const uptr QuarantineClassId = SizeClassMap::getClassIdBySize(
-          sizeof(QuarantineBatch) + Chunk::getHeaderSize());
-      void *Ptr = Cache.allocate(QuarantineClassId);
-      // Quarantine batch allocation failure is fatal.
-      if (UNLIKELY(!Ptr))
-        reportOutOfMemory(SizeClassMap::getSizeByClassId(QuarantineClassId));
-
-      Ptr = reinterpret_cast<void *>(reinterpret_cast<uptr>(Ptr) +
-                                     Chunk::getHeaderSize());
-      Chunk::UnpackedHeader Header = {};
-      Header.ClassId = QuarantineClassId & Chunk::ClassIdMask;
-      Header.SizeOrUnusedBytes = sizeof(QuarantineBatch);
-      Header.State = Chunk::State::Allocated;
-      Chunk::storeHeader(Allocator.Cookie, Ptr, &Header);
-
-      // Reset tag to 0 as this chunk may have been previously used for a tagged
-      // user allocation.
-      if (UNLIKELY(useMemoryTagging<Config>(Allocator.Primary.Options.load())))
-        storeTags(reinterpret_cast<uptr>(Ptr),
-                  reinterpret_cast<uptr>(Ptr) + sizeof(QuarantineBatch));
-
-      return Ptr;
-    }
-
-    void deallocate(void *Ptr) {
-      const uptr QuarantineClassId = SizeClassMap::getClassIdBySize(
-          sizeof(QuarantineBatch) + Chunk::getHeaderSize());
-      Chunk::UnpackedHeader Header;
-      Chunk::loadHeader(Allocator.Cookie, Ptr, &Header);
-
-      if (UNLIKELY(Header.State != Chunk::State::Allocated))
-        reportInvalidChunkState(AllocatorAction::Deallocating, Ptr);
-      DCHECK_EQ(Header.ClassId, QuarantineClassId);
-      DCHECK_EQ(Header.Offset, 0);
-      DCHECK_EQ(Header.SizeOrUnusedBytes, sizeof(QuarantineBatch));
-
-      Header.State = Chunk::State::Available;
-      Chunk::storeHeader(Allocator.Cookie, Ptr, &Header);
-      Cache.deallocate(QuarantineClassId,
-                       reinterpret_cast<void *>(reinterpret_cast<uptr>(Ptr) -
-                                                Chunk::getHeaderSize()));
-    }
-
-  private:
-    ThisT &Allocator;
-    CacheT &Cache;
-  };
-
-  typedef GlobalQuarantine<QuarantineCallback, void> QuarantineT;
-  typedef typename QuarantineT::CacheT QuarantineCacheT;
-
-  void init() {
-    performSanityChecks();
-
-    // Check if hardware CRC32 is supported in the binary and by the platform,
-    // if so, opt for the CRC32 hardware version of the checksum.
-    if (&computeHardwareCRC32 && hasHardwareCRC32())
-      HashAlgorithm = Checksum::HardwareCRC32;
-
-    if (UNLIKELY(!getRandom(&Cookie, sizeof(Cookie))))
-      Cookie = static_cast<u32>(getMonotonicTime() ^
-                                (reinterpret_cast<uptr>(this) >> 4));
-
-    initFlags();
-    reportUnrecognizedFlags();
-
-    // Store some flags locally.
-    if (getFlags()->may_return_null)
-      Primary.Options.set(OptionBit::MayReturnNull);
-    if (getFlags()->zero_contents)
-      Primary.Options.setFillContentsMode(ZeroFill);
-    else if (getFlags()->pattern_fill_contents)
-      Primary.Options.setFillContentsMode(PatternOrZeroFill);
-    if (getFlags()->dealloc_type_mismatch)
-      Primary.Options.set(OptionBit::DeallocTypeMismatch);
-    if (getFlags()->delete_size_mismatch)
-      Primary.Options.set(OptionBit::DeleteSizeMismatch);
-    if (allocatorSupportsMemoryTagging<Config>() &&
-        systemSupportsMemoryTagging())
-      Primary.Options.set(OptionBit::UseMemoryTagging);
-
-    QuarantineMaxChunkSize =
-        static_cast<u32>(getFlags()->quarantine_max_chunk_size);
-
-    Stats.init();
-    const s32 ReleaseToOsIntervalMs = getFlags()->release_to_os_interval_ms;
-    Primary.init(ReleaseToOsIntervalMs);
-    Secondary.init(&Stats, ReleaseToOsIntervalMs);
-    Quarantine.init(
-        static_cast<uptr>(getFlags()->quarantine_size_kb << 10),
-        static_cast<uptr>(getFlags()->thread_local_quarantine_size_kb << 10));
-
-    mapAndInitializeRingBuffer();
-  }
-
-  // Initialize the embedded GWP-ASan instance. Requires the main allocator to
-  // be functional, best called from PostInitCallback.
-  void initGwpAsan() {
-#ifdef GWP_ASAN_HOOKS
-    gwp_asan::options::Options Opt;
-    Opt.Enabled = getFlags()->GWP_ASAN_Enabled;
-    Opt.MaxSimultaneousAllocations =
-        getFlags()->GWP_ASAN_MaxSimultaneousAllocations;
-    Opt.SampleRate = getFlags()->GWP_ASAN_SampleRate;
-    Opt.InstallSignalHandlers = getFlags()->GWP_ASAN_InstallSignalHandlers;
-    Opt.Recoverable = getFlags()->GWP_ASAN_Recoverable;
-    // Embedded GWP-ASan is locked through the Scudo atfork handler (via
-    // Allocator::disable calling GWPASan.disable). Disable GWP-ASan's atfork
-    // handler.
-    Opt.InstallForkHandlers = false;
-    Opt.Backtrace = gwp_asan::backtrace::getBacktraceFunction();
-    GuardedAlloc.init(Opt);
-
-    if (Opt.InstallSignalHandlers)
-      gwp_asan::segv_handler::installSignalHandlers(
-          &GuardedAlloc, Printf,
-          gwp_asan::backtrace::getPrintBacktraceFunction(),
-          gwp_asan::backtrace::getSegvBacktraceFunction(),
-          Opt.Recoverable);
-
-    GuardedAllocSlotSize =
-        GuardedAlloc.getAllocatorState()->maximumAllocationSize();
-    Stats.add(StatFree, static_cast<uptr>(Opt.MaxSimultaneousAllocations) *
-                            GuardedAllocSlotSize);
-#endif // GWP_ASAN_HOOKS
-  }
-
-#ifdef GWP_ASAN_HOOKS
-  const gwp_asan::AllocationMetadata *getGwpAsanAllocationMetadata() {
-    return GuardedAlloc.getMetadataRegion();
-  }
-
-  const gwp_asan::AllocatorState *getGwpAsanAllocatorState() {
-    return GuardedAlloc.getAllocatorState();
-  }
-#endif // GWP_ASAN_HOOKS
-
-  ALWAYS_INLINE void initThreadMaybe(bool MinimalInit = false) {
-    TSDRegistry.initThreadMaybe(this, MinimalInit);
-  }
-
-  void unmapTestOnly() {
-    unmapRingBuffer();
-    TSDRegistry.unmapTestOnly(this);
-    Primary.unmapTestOnly();
-    Secondary.unmapTestOnly();
-#ifdef GWP_ASAN_HOOKS
-    if (getFlags()->GWP_ASAN_InstallSignalHandlers)
-      gwp_asan::segv_handler::uninstallSignalHandlers();
-    GuardedAlloc.uninitTestOnly();
-#endif // GWP_ASAN_HOOKS
-  }
-
-  TSDRegistryT *getTSDRegistry() { return &TSDRegistry; }
-  QuarantineT *getQuarantine() { return &Quarantine; }
-
-  // The Cache must be provided zero-initialized.
-  void initCache(CacheT *Cache) { Cache->init(&Stats, &Primary); }
-
-  // Release the resources used by a TSD, which involves:
-  // - draining the local quarantine cache to the global quarantine;
-  // - releasing the cached pointers back to the Primary;
-  // - unlinking the local stats from the global ones (destroying the cache does
-  //   the last two items).
-  void commitBack(TSD<ThisT> *TSD) {
-    TSD->assertLocked(/*BypassCheck=*/true);
-    Quarantine.drain(&TSD->getQuarantineCache(),
-                     QuarantineCallback(*this, TSD->getCache()));
-    TSD->getCache().destroy(&Stats);
-  }
-
-  void drainCache(TSD<ThisT> *TSD) {
-    TSD->assertLocked(/*BypassCheck=*/true);
-    Quarantine.drainAndRecycle(&TSD->getQuarantineCache(),
-                               QuarantineCallback(*this, TSD->getCache()));
-    TSD->getCache().drain();
-  }
-  void drainCaches() { TSDRegistry.drainCaches(this); }
-
-  ALWAYS_INLINE void *getHeaderTaggedPointer(void *Ptr) {
-    if (!allocatorSupportsMemoryTagging<Config>())
-      return Ptr;
-    auto UntaggedPtr = untagPointer(Ptr);
-    if (UntaggedPtr != Ptr)
-      return UntaggedPtr;
-    // Secondary, or pointer allocated while memory tagging is unsupported or
-    // disabled. The tag mismatch is okay in the latter case because tags will
-    // not be checked.
-    return addHeaderTag(Ptr);
-  }
-
-  ALWAYS_INLINE uptr addHeaderTag(uptr Ptr) {
-    if (!allocatorSupportsMemoryTagging<Config>())
-      return Ptr;
-    return addFixedTag(Ptr, 2);
-  }
-
-  ALWAYS_INLINE void *addHeaderTag(void *Ptr) {
-    return reinterpret_cast<void *>(addHeaderTag(reinterpret_cast<uptr>(Ptr)));
-  }
-
-  NOINLINE u32 collectStackTrace() {
-#ifdef HAVE_ANDROID_UNSAFE_FRAME_POINTER_CHASE
-    // Discard collectStackTrace() frame and allocator function frame.
-    constexpr uptr DiscardFrames = 2;
-    uptr Stack[MaxTraceSize + DiscardFrames];
-    uptr Size =
-        android_unsafe_frame_pointer_chase(Stack, MaxTraceSize + DiscardFrames);
-    Size = Min<uptr>(Size, MaxTraceSize + DiscardFrames);
-    return Depot.insert(Stack + Min<uptr>(DiscardFrames, Size), Stack + Size);
-#else
-    return 0;
-#endif
-  }
-
-  uptr computeOddEvenMaskForPointerMaybe(const Options &Options, uptr Ptr,
-                                         uptr ClassId) {
-    if (!Options.get(OptionBit::UseOddEvenTags))
-      return 0;
-
-    // If a chunk's tag is odd, we want the tags of the surrounding blocks to be
-    // even, and vice versa. Blocks are laid out Size bytes apart, and adding
-    // Size to Ptr will flip the least significant set bit of Size in Ptr, so
-    // that bit will have the pattern 010101... for consecutive blocks, which we
-    // can use to determine which tag mask to use.
-    return 0x5555U << ((Ptr >> SizeClassMap::getSizeLSBByClassId(ClassId)) & 1);
-  }
-
-  NOINLINE void *allocate(uptr Size, Chunk::Origin Origin,
-                          uptr Alignment = MinAlignment,
-                          bool ZeroContents = false) NO_THREAD_SAFETY_ANALYSIS {
-    initThreadMaybe();
-
-    const Options Options = Primary.Options.load();
-    if (UNLIKELY(Alignment > MaxAlignment)) {
-      if (Options.get(OptionBit::MayReturnNull))
-        return nullptr;
-      reportAlignmentTooBig(Alignment, MaxAlignment);
-    }
-    if (Alignment < MinAlignment)
-      Alignment = MinAlignment;
-
-#ifdef GWP_ASAN_HOOKS
-    if (UNLIKELY(GuardedAlloc.shouldSample())) {
-      if (void *Ptr = GuardedAlloc.allocate(Size, Alignment)) {
-        Stats.lock();
-        Stats.add(StatAllocated, GuardedAllocSlotSize);
-        Stats.sub(StatFree, GuardedAllocSlotSize);
-        Stats.unlock();
-        return Ptr;
-      }
-    }
-#endif // GWP_ASAN_HOOKS
-
-    const FillContentsMode FillContents = ZeroContents ? ZeroFill
-                                          : TSDRegistry.getDisableMemInit()
-                                              ? NoFill
-                                              : Options.getFillContentsMode();
-
-    // If the requested size happens to be 0 (more common than you might think),
-    // allocate MinAlignment bytes on top of the header. Then add the extra
-    // bytes required to fulfill the alignment requirements: we allocate enough
-    // to be sure that there will be an address in the block that will satisfy
-    // the alignment.
-    const uptr NeededSize =
-        roundUp(Size, MinAlignment) +
-        ((Alignment > MinAlignment) ? Alignment : Chunk::getHeaderSize());
-
-    // Takes care of extravagantly large sizes as well as integer overflows.
-    static_assert(MaxAllowedMallocSize < UINTPTR_MAX - MaxAlignment, "");
-    if (UNLIKELY(Size >= MaxAllowedMallocSize)) {
-      if (Options.get(OptionBit::MayReturnNull))
-        return nullptr;
-      reportAllocationSizeTooBig(Size, NeededSize, MaxAllowedMallocSize);
-    }
-    DCHECK_LE(Size, NeededSize);
-
-    void *Block = nullptr;
-    uptr ClassId = 0;
-    uptr SecondaryBlockEnd = 0;
-    if (LIKELY(PrimaryT::canAllocate(NeededSize))) {
-      ClassId = SizeClassMap::getClassIdBySize(NeededSize);
-      DCHECK_NE(ClassId, 0U);
-      bool UnlockRequired;
-      auto *TSD = TSDRegistry.getTSDAndLock(&UnlockRequired);
-      TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-      Block = TSD->getCache().allocate(ClassId);
-      // If the allocation failed, retry in each successively larger class until
-      // it fits. If it fails to fit in the largest class, fallback to the
-      // Secondary.
-      if (UNLIKELY(!Block)) {
-        while (ClassId < SizeClassMap::LargestClassId && !Block)
-          Block = TSD->getCache().allocate(++ClassId);
-        if (!Block)
-          ClassId = 0;
-      }
-      if (UnlockRequired)
-        TSD->unlock();
-    }
-    if (UNLIKELY(ClassId == 0)) {
-      Block = Secondary.allocate(Options, Size, Alignment, &SecondaryBlockEnd,
-                                 FillContents);
-    }
-
-    if (UNLIKELY(!Block)) {
-      if (Options.get(OptionBit::MayReturnNull))
-        return nullptr;
-      printStats();
-      reportOutOfMemory(NeededSize);
-    }
-
-    const uptr BlockUptr = reinterpret_cast<uptr>(Block);
-    const uptr UnalignedUserPtr = BlockUptr + Chunk::getHeaderSize();
-    const uptr UserPtr = roundUp(UnalignedUserPtr, Alignment);
-
-    void *Ptr = reinterpret_cast<void *>(UserPtr);
-    void *TaggedPtr = Ptr;
-    if (LIKELY(ClassId)) {
-      // We only need to zero or tag the contents for Primary backed
-      // allocations. We only set tags for primary allocations in order to avoid
-      // faulting potentially large numbers of pages for large secondary
-      // allocations. We assume that guard pages are enough to protect these
-      // allocations.
-      //
-      // FIXME: When the kernel provides a way to set the background tag of a
-      // mapping, we should be able to tag secondary allocations as well.
-      //
-      // When memory tagging is enabled, zeroing the contents is done as part of
-      // setting the tag.
-      if (UNLIKELY(useMemoryTagging<Config>(Options))) {
-        uptr PrevUserPtr;
-        Chunk::UnpackedHeader Header;
-        const uptr BlockSize = PrimaryT::getSizeByClassId(ClassId);
-        const uptr BlockEnd = BlockUptr + BlockSize;
-        // If possible, try to reuse the UAF tag that was set by deallocate().
-        // For simplicity, only reuse tags if we have the same start address as
-        // the previous allocation. This handles the majority of cases since
-        // most allocations will not be more aligned than the minimum alignment.
-        //
-        // We need to handle situations involving reclaimed chunks, and retag
-        // the reclaimed portions if necessary. In the case where the chunk is
-        // fully reclaimed, the chunk's header will be zero, which will trigger
-        // the code path for new mappings and invalid chunks that prepares the
-        // chunk from scratch. There are three possibilities for partial
-        // reclaiming:
-        //
-        // (1) Header was reclaimed, data was partially reclaimed.
-        // (2) Header was not reclaimed, all data was reclaimed (e.g. because
-        //     data started on a page boundary).
-        // (3) Header was not reclaimed, data was partially reclaimed.
-        //
-        // Case (1) will be handled in the same way as for full reclaiming,
-        // since the header will be zero.
-        //
-        // We can detect case (2) by loading the tag from the start
-        // of the chunk. If it is zero, it means that either all data was
-        // reclaimed (since we never use zero as the chunk tag), or that the
-        // previous allocation was of size zero. Either way, we need to prepare
-        // a new chunk from scratch.
-        //
-        // We can detect case (3) by moving to the next page (if covered by the
-        // chunk) and loading the tag of its first granule. If it is zero, it
-        // means that all following pages may need to be retagged. On the other
-        // hand, if it is nonzero, we can assume that all following pages are
-        // still tagged, according to the logic that if any of the pages
-        // following the next page were reclaimed, the next page would have been
-        // reclaimed as well.
-        uptr TaggedUserPtr;
-        if (getChunkFromBlock(BlockUptr, &PrevUserPtr, &Header) &&
-            PrevUserPtr == UserPtr &&
-            (TaggedUserPtr = loadTag(UserPtr)) != UserPtr) {
-          uptr PrevEnd = TaggedUserPtr + Header.SizeOrUnusedBytes;
-          const uptr NextPage = roundUp(TaggedUserPtr, getPageSizeCached());
-          if (NextPage < PrevEnd && loadTag(NextPage) != NextPage)
-            PrevEnd = NextPage;
-          TaggedPtr = reinterpret_cast<void *>(TaggedUserPtr);
-          resizeTaggedChunk(PrevEnd, TaggedUserPtr + Size, Size, BlockEnd);
-          if (UNLIKELY(FillContents != NoFill && !Header.OriginOrWasZeroed)) {
-            // If an allocation needs to be zeroed (i.e. calloc) we can normally
-            // avoid zeroing the memory now since we can rely on memory having
-            // been zeroed on free, as this is normally done while setting the
-            // UAF tag. But if tagging was disabled per-thread when the memory
-            // was freed, it would not have been retagged and thus zeroed, and
-            // therefore it needs to be zeroed now.
-            memset(TaggedPtr, 0,
-                   Min(Size, roundUp(PrevEnd - TaggedUserPtr,
-                                     archMemoryTagGranuleSize())));
-          } else if (Size) {
-            // Clear any stack metadata that may have previously been stored in
-            // the chunk data.
-            memset(TaggedPtr, 0, archMemoryTagGranuleSize());
-          }
-        } else {
-          const uptr OddEvenMask =
-              computeOddEvenMaskForPointerMaybe(Options, BlockUptr, ClassId);
-          TaggedPtr = prepareTaggedChunk(Ptr, Size, OddEvenMask, BlockEnd);
-        }
-        storePrimaryAllocationStackMaybe(Options, Ptr);
-      } else {
-        Block = addHeaderTag(Block);
-        Ptr = addHeaderTag(Ptr);
-        if (UNLIKELY(FillContents != NoFill)) {
-          // This condition is not necessarily unlikely, but since memset is
-          // costly, we might as well mark it as such.
-          memset(Block, FillContents == ZeroFill ? 0 : PatternFillByte,
-                 PrimaryT::getSizeByClassId(ClassId));
-        }
-      }
-    } else {
-      Block = addHeaderTag(Block);
-      Ptr = addHeaderTag(Ptr);
-      if (UNLIKELY(useMemoryTagging<Config>(Options))) {
-        storeTags(reinterpret_cast<uptr>(Block), reinterpret_cast<uptr>(Ptr));
-        storeSecondaryAllocationStackMaybe(Options, Ptr, Size);
-      }
-    }
-
-    Chunk::UnpackedHeader Header = {};
-    if (UNLIKELY(UnalignedUserPtr != UserPtr)) {
-      const uptr Offset = UserPtr - UnalignedUserPtr;
-      DCHECK_GE(Offset, 2 * sizeof(u32));
-      // The BlockMarker has no security purpose, but is specifically meant for
-      // the chunk iteration function that can be used in debugging situations.
-      // It is the only situation where we have to locate the start of a chunk
-      // based on its block address.
-      reinterpret_cast<u32 *>(Block)[0] = BlockMarker;
-      reinterpret_cast<u32 *>(Block)[1] = static_cast<u32>(Offset);
-      Header.Offset = (Offset >> MinAlignmentLog) & Chunk::OffsetMask;
-    }
-    Header.ClassId = ClassId & Chunk::ClassIdMask;
-    Header.State = Chunk::State::Allocated;
-    Header.OriginOrWasZeroed = Origin & Chunk::OriginMask;
-    Header.SizeOrUnusedBytes =
-        (ClassId ? Size : SecondaryBlockEnd - (UserPtr + Size)) &
-        Chunk::SizeOrUnusedBytesMask;
-    Chunk::storeHeader(Cookie, Ptr, &Header);
-
-    return TaggedPtr;
-  }
-
-  NOINLINE void deallocate(void *Ptr, Chunk::Origin Origin, uptr DeleteSize = 0,
-                           UNUSED uptr Alignment = MinAlignment) {
-    if (UNLIKELY(!Ptr))
-      return;
-
-    // For a deallocation, we only ensure minimal initialization, meaning thread
-    // local data will be left uninitialized for now (when using ELF TLS). The
-    // fallback cache will be used instead. This is a workaround for a situation
-    // where the only heap operation performed in a thread would be a free past
-    // the TLS destructors, ending up in initialized thread specific data never
-    // being destroyed properly. Any other heap operation will do a full init.
-    initThreadMaybe(/*MinimalInit=*/true);
-
-#ifdef GWP_ASAN_HOOKS
-    if (UNLIKELY(GuardedAlloc.pointerIsMine(Ptr))) {
-      GuardedAlloc.deallocate(Ptr);
-      Stats.lock();
-      Stats.add(StatFree, GuardedAllocSlotSize);
-      Stats.sub(StatAllocated, GuardedAllocSlotSize);
-      Stats.unlock();
-      return;
-    }
-#endif // GWP_ASAN_HOOKS
-
-    if (UNLIKELY(!isAligned(reinterpret_cast<uptr>(Ptr), MinAlignment)))
-      reportMisalignedPointer(AllocatorAction::Deallocating, Ptr);
-
-    void *TaggedPtr = Ptr;
-    Ptr = getHeaderTaggedPointer(Ptr);
-
-    Chunk::UnpackedHeader Header;
-    Chunk::loadHeader(Cookie, Ptr, &Header);
-
-    if (UNLIKELY(Header.State != Chunk::State::Allocated))
-      reportInvalidChunkState(AllocatorAction::Deallocating, Ptr);
-
-    const Options Options = Primary.Options.load();
-    if (Options.get(OptionBit::DeallocTypeMismatch)) {
-      if (UNLIKELY(Header.OriginOrWasZeroed != Origin)) {
-        // With the exception of memalign'd chunks, that can be still be free'd.
-        if (Header.OriginOrWasZeroed != Chunk::Origin::Memalign ||
-            Origin != Chunk::Origin::Malloc)
-          reportDeallocTypeMismatch(AllocatorAction::Deallocating, Ptr,
-                                    Header.OriginOrWasZeroed, Origin);
-      }
-    }
-
-    const uptr Size = getSize(Ptr, &Header);
-    if (DeleteSize && Options.get(OptionBit::DeleteSizeMismatch)) {
-      if (UNLIKELY(DeleteSize != Size))
-        reportDeleteSizeMismatch(Ptr, DeleteSize, Size);
-    }
-
-    quarantineOrDeallocateChunk(Options, TaggedPtr, &Header, Size);
-  }
-
-  void *reallocate(void *OldPtr, uptr NewSize, uptr Alignment = MinAlignment) {
-    initThreadMaybe();
-
-    const Options Options = Primary.Options.load();
-    if (UNLIKELY(NewSize >= MaxAllowedMallocSize)) {
-      if (Options.get(OptionBit::MayReturnNull))
-        return nullptr;
-      reportAllocationSizeTooBig(NewSize, 0, MaxAllowedMallocSize);
-    }
-
-    // The following cases are handled by the C wrappers.
-    DCHECK_NE(OldPtr, nullptr);
-    DCHECK_NE(NewSize, 0);
-
-#ifdef GWP_ASAN_HOOKS
-    if (UNLIKELY(GuardedAlloc.pointerIsMine(OldPtr))) {
-      uptr OldSize = GuardedAlloc.getSize(OldPtr);
-      void *NewPtr = allocate(NewSize, Chunk::Origin::Malloc, Alignment);
-      if (NewPtr)
-        memcpy(NewPtr, OldPtr, (NewSize < OldSize) ? NewSize : OldSize);
-      GuardedAlloc.deallocate(OldPtr);
-      Stats.lock();
-      Stats.add(StatFree, GuardedAllocSlotSize);
-      Stats.sub(StatAllocated, GuardedAllocSlotSize);
-      Stats.unlock();
-      return NewPtr;
-    }
-#endif // GWP_ASAN_HOOKS
-
-    void *OldTaggedPtr = OldPtr;
-    OldPtr = getHeaderTaggedPointer(OldPtr);
-
-    if (UNLIKELY(!isAligned(reinterpret_cast<uptr>(OldPtr), MinAlignment)))
-      reportMisalignedPointer(AllocatorAction::Reallocating, OldPtr);
-
-    Chunk::UnpackedHeader Header;
-    Chunk::loadHeader(Cookie, OldPtr, &Header);
-
-    if (UNLIKELY(Header.State != Chunk::State::Allocated))
-      reportInvalidChunkState(AllocatorAction::Reallocating, OldPtr);
-
-    // Pointer has to be allocated with a malloc-type function. Some
-    // applications think that it is OK to realloc a memalign'ed pointer, which
-    // will trigger this check. It really isn't.
-    if (Options.get(OptionBit::DeallocTypeMismatch)) {
-      if (UNLIKELY(Header.OriginOrWasZeroed != Chunk::Origin::Malloc))
-        reportDeallocTypeMismatch(AllocatorAction::Reallocating, OldPtr,
-                                  Header.OriginOrWasZeroed,
-                                  Chunk::Origin::Malloc);
-    }
-
-    void *BlockBegin = getBlockBegin(OldTaggedPtr, &Header);
-    uptr BlockEnd;
-    uptr OldSize;
-    const uptr ClassId = Header.ClassId;
-    if (LIKELY(ClassId)) {
-      BlockEnd = reinterpret_cast<uptr>(BlockBegin) +
-                 SizeClassMap::getSizeByClassId(ClassId);
-      OldSize = Header.SizeOrUnusedBytes;
-    } else {
-      BlockEnd = SecondaryT::getBlockEnd(BlockBegin);
-      OldSize = BlockEnd - (reinterpret_cast<uptr>(OldTaggedPtr) +
-                            Header.SizeOrUnusedBytes);
-    }
-    // If the new chunk still fits in the previously allocated block (with a
-    // reasonable delta), we just keep the old block, and update the chunk
-    // header to reflect the size change.
-    if (reinterpret_cast<uptr>(OldTaggedPtr) + NewSize <= BlockEnd) {
-      if (NewSize > OldSize || (OldSize - NewSize) < getPageSizeCached()) {
-        Header.SizeOrUnusedBytes =
-            (ClassId ? NewSize
-                     : BlockEnd -
-                           (reinterpret_cast<uptr>(OldTaggedPtr) + NewSize)) &
-            Chunk::SizeOrUnusedBytesMask;
-        Chunk::storeHeader(Cookie, OldPtr, &Header);
-        if (UNLIKELY(useMemoryTagging<Config>(Options))) {
-          if (ClassId) {
-            resizeTaggedChunk(reinterpret_cast<uptr>(OldTaggedPtr) + OldSize,
-                              reinterpret_cast<uptr>(OldTaggedPtr) + NewSize,
-                              NewSize, untagPointer(BlockEnd));
-            storePrimaryAllocationStackMaybe(Options, OldPtr);
-          } else {
-            storeSecondaryAllocationStackMaybe(Options, OldPtr, NewSize);
-          }
-        }
-        return OldTaggedPtr;
-      }
-    }
-
-    // Otherwise we allocate a new one, and deallocate the old one. Some
-    // allocators will allocate an even larger chunk (by a fixed factor) to
-    // allow for potential further in-place realloc. The gains of such a trick
-    // are currently unclear.
-    void *NewPtr = allocate(NewSize, Chunk::Origin::Malloc, Alignment);
-    if (LIKELY(NewPtr)) {
-      memcpy(NewPtr, OldTaggedPtr, Min(NewSize, OldSize));
-      quarantineOrDeallocateChunk(Options, OldTaggedPtr, &Header, OldSize);
-    }
-    return NewPtr;
-  }
-
-  // TODO(kostyak): disable() is currently best-effort. There are some small
-  //                windows of time when an allocation could still succeed after
-  //                this function finishes. We will revisit that later.
-  void disable() NO_THREAD_SAFETY_ANALYSIS {
-    initThreadMaybe();
-#ifdef GWP_ASAN_HOOKS
-    GuardedAlloc.disable();
-#endif
-    TSDRegistry.disable();
-    Stats.disable();
-    Quarantine.disable();
-    Primary.disable();
-    Secondary.disable();
-  }
-
-  void enable() NO_THREAD_SAFETY_ANALYSIS {
-    initThreadMaybe();
-    Secondary.enable();
-    Primary.enable();
-    Quarantine.enable();
-    Stats.enable();
-    TSDRegistry.enable();
-#ifdef GWP_ASAN_HOOKS
-    GuardedAlloc.enable();
-#endif
-  }
-
-  // The function returns the amount of bytes required to store the statistics,
-  // which might be larger than the amount of bytes provided. Note that the
-  // statistics buffer is not necessarily constant between calls to this
-  // function. This can be called with a null buffer or zero size for buffer
-  // sizing purposes.
-  uptr getStats(char *Buffer, uptr Size) {
-    ScopedString Str;
-    const uptr Length = getStats(&Str) + 1;
-    if (Length < Size)
-      Size = Length;
-    if (Buffer && Size) {
-      memcpy(Buffer, Str.data(), Size);
-      Buffer[Size - 1] = '\0';
-    }
-    return Length;
-  }
-
-  void printStats() {
-    ScopedString Str;
-    getStats(&Str);
-    Str.output();
-  }
-
-  void printFragmentationInfo() {
-    ScopedString Str;
-    Primary.getFragmentationInfo(&Str);
-    // Secondary allocator dumps the fragmentation data in getStats().
-    Str.output();
-  }
-
-  void releaseToOS(ReleaseToOS ReleaseType) {
-    initThreadMaybe();
-    if (ReleaseType == ReleaseToOS::ForceAll)
-      drainCaches();
-    Primary.releaseToOS(ReleaseType);
-    Secondary.releaseToOS();
-  }
-
-  // Iterate over all chunks and call a callback for all busy chunks located
-  // within the provided memory range. Said callback must not use this allocator
-  // or a deadlock can ensue. This fits Android's malloc_iterate() needs.
-  void iterateOverChunks(uptr Base, uptr Size, iterate_callback Callback,
-                         void *Arg) {
-    initThreadMaybe();
-    if (archSupportsMemoryTagging())
-      Base = untagPointer(Base);
-    const uptr From = Base;
-    const uptr To = Base + Size;
-    bool MayHaveTaggedPrimary = allocatorSupportsMemoryTagging<Config>() &&
-                                systemSupportsMemoryTagging();
-    auto Lambda = [this, From, To, MayHaveTaggedPrimary, Callback,
-                   Arg](uptr Block) {
-      if (Block < From || Block >= To)
-        return;
-      uptr Chunk;
-      Chunk::UnpackedHeader Header;
-      if (MayHaveTaggedPrimary) {
-        // A chunk header can either have a zero tag (tagged primary) or the
-        // header tag (secondary, or untagged primary). We don't know which so
-        // try both.
-        ScopedDisableMemoryTagChecks x;
-        if (!getChunkFromBlock(Block, &Chunk, &Header) &&
-            !getChunkFromBlock(addHeaderTag(Block), &Chunk, &Header))
-          return;
-      } else {
-        if (!getChunkFromBlock(addHeaderTag(Block), &Chunk, &Header))
-          return;
-      }
-      if (Header.State == Chunk::State::Allocated) {
-        uptr TaggedChunk = Chunk;
-        if (allocatorSupportsMemoryTagging<Config>())
-          TaggedChunk = untagPointer(TaggedChunk);
-        if (useMemoryTagging<Config>(Primary.Options.load()))
-          TaggedChunk = loadTag(Chunk);
-        Callback(TaggedChunk, getSize(reinterpret_cast<void *>(Chunk), &Header),
-                 Arg);
-      }
-    };
-    Primary.iterateOverBlocks(Lambda);
-    Secondary.iterateOverBlocks(Lambda);
-#ifdef GWP_ASAN_HOOKS
-    GuardedAlloc.iterate(reinterpret_cast<void *>(Base), Size, Callback, Arg);
-#endif
-  }
-
-  bool canReturnNull() {
-    initThreadMaybe();
-    return Primary.Options.load().get(OptionBit::MayReturnNull);
-  }
-
-  bool setOption(Option O, sptr Value) {
-    initThreadMaybe();
-    if (O == Option::MemtagTuning) {
-      // Enabling odd/even tags involves a tradeoff between use-after-free
-      // detection and buffer overflow detection. Odd/even tags make it more
-      // likely for buffer overflows to be detected by increasing the size of
-      // the guaranteed "red zone" around the allocation, but on the other hand
-      // use-after-free is less likely to be detected because the tag space for
-      // any particular chunk is cut in half. Therefore we use this tuning
-      // setting to control whether odd/even tags are enabled.
-      if (Value == M_MEMTAG_TUNING_BUFFER_OVERFLOW)
-        Primary.Options.set(OptionBit::UseOddEvenTags);
-      else if (Value == M_MEMTAG_TUNING_UAF)
-        Primary.Options.clear(OptionBit::UseOddEvenTags);
-      return true;
-    } else {
-      // We leave it to the various sub-components to decide whether or not they
-      // want to handle the option, but we do not want to short-circuit
-      // execution if one of the setOption was to return false.
-      const bool PrimaryResult = Primary.setOption(O, Value);
-      const bool SecondaryResult = Secondary.setOption(O, Value);
-      const bool RegistryResult = TSDRegistry.setOption(O, Value);
-      return PrimaryResult && SecondaryResult && RegistryResult;
-    }
-    return false;
-  }
-
-  // Return the usable size for a given chunk. Technically we lie, as we just
-  // report the actual size of a chunk. This is done to counteract code actively
-  // writing past the end of a chunk (like sqlite3) when the usable size allows
-  // for it, which then forces realloc to copy the usable size of a chunk as
-  // opposed to its actual size.
-  uptr getUsableSize(const void *Ptr) {
-    if (UNLIKELY(!Ptr))
-      return 0;
-
-    return getAllocSize(Ptr);
-  }
-
-  uptr getAllocSize(const void *Ptr) {
-    initThreadMaybe();
-
-#ifdef GWP_ASAN_HOOKS
-    if (UNLIKELY(GuardedAlloc.pointerIsMine(Ptr)))
-      return GuardedAlloc.getSize(Ptr);
-#endif // GWP_ASAN_HOOKS
-
-    Ptr = getHeaderTaggedPointer(const_cast<void *>(Ptr));
-    Chunk::UnpackedHeader Header;
-    Chunk::loadHeader(Cookie, Ptr, &Header);
-
-    // Getting the alloc size of a chunk only makes sense if it's allocated.
-    if (UNLIKELY(Header.State != Chunk::State::Allocated))
-      reportInvalidChunkState(AllocatorAction::Sizing, const_cast<void *>(Ptr));
-
-    return getSize(Ptr, &Header);
-  }
-
-  void getStats(StatCounters S) {
-    initThreadMaybe();
-    Stats.get(S);
-  }
-
-  // Returns true if the pointer provided was allocated by the current
-  // allocator instance, which is compliant with tcmalloc's ownership concept.
-  // A corrupted chunk will not be reported as owned, which is WAI.
-  bool isOwned(const void *Ptr) {
-    initThreadMaybe();
-#ifdef GWP_ASAN_HOOKS
-    if (GuardedAlloc.pointerIsMine(Ptr))
-      return true;
-#endif // GWP_ASAN_HOOKS
-    if (!Ptr || !isAligned(reinterpret_cast<uptr>(Ptr), MinAlignment))
-      return false;
-    Ptr = getHeaderTaggedPointer(const_cast<void *>(Ptr));
-    Chunk::UnpackedHeader Header;
-    return Chunk::isValid(Cookie, Ptr, &Header) &&
-           Header.State == Chunk::State::Allocated;
-  }
-
-  bool useMemoryTaggingTestOnly() const {
-    return useMemoryTagging<Config>(Primary.Options.load());
-  }
-  void disableMemoryTagging() {
-    // If we haven't been initialized yet, we need to initialize now in order to
-    // prevent a future call to initThreadMaybe() from enabling memory tagging
-    // based on feature detection. But don't call initThreadMaybe() because it
-    // may end up calling the allocator (via pthread_atfork, via the post-init
-    // callback), which may cause mappings to be created with memory tagging
-    // enabled.
-    TSDRegistry.initOnceMaybe(this);
-    if (allocatorSupportsMemoryTagging<Config>()) {
-      Secondary.disableMemoryTagging();
-      Primary.Options.clear(OptionBit::UseMemoryTagging);
-    }
-  }
-
-  void setTrackAllocationStacks(bool Track) {
-    initThreadMaybe();
-    if (getFlags()->allocation_ring_buffer_size <= 0) {
-      DCHECK(!Primary.Options.load().get(OptionBit::TrackAllocationStacks));
-      return;
-    }
-    if (Track)
-      Primary.Options.set(OptionBit::TrackAllocationStacks);
-    else
-      Primary.Options.clear(OptionBit::TrackAllocationStacks);
-  }
-
-  void setFillContents(FillContentsMode FillContents) {
-    initThreadMaybe();
-    Primary.Options.setFillContentsMode(FillContents);
-  }
-
-  void setAddLargeAllocationSlack(bool AddSlack) {
-    initThreadMaybe();
-    if (AddSlack)
-      Primary.Options.set(OptionBit::AddLargeAllocationSlack);
-    else
-      Primary.Options.clear(OptionBit::AddLargeAllocationSlack);
-  }
-
-  const char *getStackDepotAddress() const {
-    return reinterpret_cast<const char *>(&Depot);
-  }
-
-  const char *getRegionInfoArrayAddress() const {
-    return Primary.getRegionInfoArrayAddress();
-  }
-
-  static uptr getRegionInfoArraySize() {
-    return PrimaryT::getRegionInfoArraySize();
-  }
-
-  const char *getRingBufferAddress() {
-    initThreadMaybe();
-    return RawRingBuffer;
-  }
-
-  uptr getRingBufferSize() {
-    initThreadMaybe();
-    return RingBufferElements ? ringBufferSizeInBytes(RingBufferElements) : 0;
-  }
-
-  static const uptr MaxTraceSize = 64;
-
-  static void collectTraceMaybe(const StackDepot *Depot,
-                                uintptr_t (&Trace)[MaxTraceSize], u32 Hash) {
-    uptr RingPos, Size;
-    if (!Depot->find(Hash, &RingPos, &Size))
-      return;
-    for (unsigned I = 0; I != Size && I != MaxTraceSize; ++I)
-      Trace[I] = static_cast<uintptr_t>((*Depot)[RingPos + I]);
-  }
-
-  static void getErrorInfo(struct scudo_error_info *ErrorInfo,
-                           uintptr_t FaultAddr, const char *DepotPtr,
-                           const char *RegionInfoPtr, const char *RingBufferPtr,
-                           size_t RingBufferSize, const char *Memory,
-                           const char *MemoryTags, uintptr_t MemoryAddr,
-                           size_t MemorySize) {
-    *ErrorInfo = {};
-    if (!allocatorSupportsMemoryTagging<Config>() ||
-        MemoryAddr + MemorySize < MemoryAddr)
-      return;
-
-    auto *Depot = reinterpret_cast<const StackDepot *>(DepotPtr);
-    size_t NextErrorReport = 0;
-
-    // Check for OOB in the current block and the two surrounding blocks. Beyond
-    // that, UAF is more likely.
-    if (extractTag(FaultAddr) != 0)
-      getInlineErrorInfo(ErrorInfo, NextErrorReport, FaultAddr, Depot,
-                         RegionInfoPtr, Memory, MemoryTags, MemoryAddr,
-                         MemorySize, 0, 2);
-
-    // Check the ring buffer. For primary allocations this will only find UAF;
-    // for secondary allocations we can find either UAF or OOB.
-    getRingBufferErrorInfo(ErrorInfo, NextErrorReport, FaultAddr, Depot,
-                           RingBufferPtr, RingBufferSize);
-
-    // Check for OOB in the 28 blocks surrounding the 3 we checked earlier.
-    // Beyond that we are likely to hit false positives.
-    if (extractTag(FaultAddr) != 0)
-      getInlineErrorInfo(ErrorInfo, NextErrorReport, FaultAddr, Depot,
-                         RegionInfoPtr, Memory, MemoryTags, MemoryAddr,
-                         MemorySize, 2, 16);
-  }
-
-private:
-  typedef typename PrimaryT::SizeClassMap SizeClassMap;
-
-  static const uptr MinAlignmentLog = SCUDO_MIN_ALIGNMENT_LOG;
-  static const uptr MaxAlignmentLog = 24U; // 16 MB seems reasonable.
-  static const uptr MinAlignment = 1UL << MinAlignmentLog;
-  static const uptr MaxAlignment = 1UL << MaxAlignmentLog;
-  static const uptr MaxAllowedMallocSize =
-      FIRST_32_SECOND_64(1UL << 31, 1ULL << 40);
-
-  static_assert(MinAlignment >= sizeof(Chunk::PackedHeader),
-                "Minimal alignment must at least cover a chunk header.");
-  static_assert(!allocatorSupportsMemoryTagging<Config>() ||
-                    MinAlignment >= archMemoryTagGranuleSize(),
-                "");
-
-  static const u32 BlockMarker = 0x44554353U;
-
-  // These are indexes into an "array" of 32-bit values that store information
-  // inline with a chunk that is relevant to diagnosing memory tag faults, where
-  // 0 corresponds to the address of the user memory. This means that only
-  // negative indexes may be used. The smallest index that may be used is -2,
-  // which corresponds to 8 bytes before the user memory, because the chunk
-  // header size is 8 bytes and in allocators that support memory tagging the
-  // minimum alignment is at least the tag granule size (16 on aarch64).
-  static const sptr MemTagAllocationTraceIndex = -2;
-  static const sptr MemTagAllocationTidIndex = -1;
-
-  u32 Cookie = 0;
-  u32 QuarantineMaxChunkSize = 0;
-
-  GlobalStats Stats;
-  PrimaryT Primary;
-  SecondaryT Secondary;
-  QuarantineT Quarantine;
-  TSDRegistryT TSDRegistry;
-  pthread_once_t PostInitNonce = PTHREAD_ONCE_INIT;
-
-#ifdef GWP_ASAN_HOOKS
-  gwp_asan::GuardedPoolAllocator GuardedAlloc;
-  uptr GuardedAllocSlotSize = 0;
-#endif // GWP_ASAN_HOOKS
-
-  StackDepot Depot;
-
-  struct AllocationRingBuffer {
-    struct Entry {
-      atomic_uptr Ptr;
-      atomic_uptr AllocationSize;
-      atomic_u32 AllocationTrace;
-      atomic_u32 AllocationTid;
-      atomic_u32 DeallocationTrace;
-      atomic_u32 DeallocationTid;
-    };
-
-    atomic_uptr Pos;
-    // An array of Size (at least one) elements of type Entry is immediately
-    // following to this struct.
-  };
-  // Pointer to memory mapped area starting with AllocationRingBuffer struct,
-  // and immediately followed by Size elements of type Entry.
-  char *RawRingBuffer = {};
-  u32 RingBufferElements = 0;
-  MemMapT RawRingBufferMap;
-
-  // The following might get optimized out by the compiler.
-  NOINLINE void performSanityChecks() {
-    // Verify that the header offset field can hold the maximum offset. In the
-    // case of the Secondary allocator, it takes care of alignment and the
-    // offset will always be small. In the case of the Primary, the worst case
-    // scenario happens in the last size class, when the backend allocation
-    // would already be aligned on the requested alignment, which would happen
-    // to be the maximum alignment that would fit in that size class. As a
-    // result, the maximum offset will be at most the maximum alignment for the
-    // last size class minus the header size, in multiples of MinAlignment.
-    Chunk::UnpackedHeader Header = {};
-    const uptr MaxPrimaryAlignment = 1UL << getMostSignificantSetBitIndex(
-                                         SizeClassMap::MaxSize - MinAlignment);
-    const uptr MaxOffset =
-        (MaxPrimaryAlignment - Chunk::getHeaderSize()) >> MinAlignmentLog;
-    Header.Offset = MaxOffset & Chunk::OffsetMask;
-    if (UNLIKELY(Header.Offset != MaxOffset))
-      reportSanityCheckError("offset");
-
-    // Verify that we can fit the maximum size or amount of unused bytes in the
-    // header. Given that the Secondary fits the allocation to a page, the worst
-    // case scenario happens in the Primary. It will depend on the second to
-    // last and last class sizes, as well as the dynamic base for the Primary.
-    // The following is an over-approximation that works for our needs.
-    const uptr MaxSizeOrUnusedBytes = SizeClassMap::MaxSize - 1;
-    Header.SizeOrUnusedBytes = MaxSizeOrUnusedBytes;
-    if (UNLIKELY(Header.SizeOrUnusedBytes != MaxSizeOrUnusedBytes))
-      reportSanityCheckError("size (or unused bytes)");
-
-    const uptr LargestClassId = SizeClassMap::LargestClassId;
-    Header.ClassId = LargestClassId;
-    if (UNLIKELY(Header.ClassId != LargestClassId))
-      reportSanityCheckError("class ID");
-  }
-
-  static inline void *getBlockBegin(const void *Ptr,
-                                    Chunk::UnpackedHeader *Header) {
-    return reinterpret_cast<void *>(
-        reinterpret_cast<uptr>(Ptr) - Chunk::getHeaderSize() -
-        (static_cast<uptr>(Header->Offset) << MinAlignmentLog));
-  }
-
-  // Return the size of a chunk as requested during its allocation.
-  inline uptr getSize(const void *Ptr, Chunk::UnpackedHeader *Header) {
-    const uptr SizeOrUnusedBytes = Header->SizeOrUnusedBytes;
-    if (LIKELY(Header->ClassId))
-      return SizeOrUnusedBytes;
-    if (allocatorSupportsMemoryTagging<Config>())
-      Ptr = untagPointer(const_cast<void *>(Ptr));
-    return SecondaryT::getBlockEnd(getBlockBegin(Ptr, Header)) -
-           reinterpret_cast<uptr>(Ptr) - SizeOrUnusedBytes;
-  }
-
-  void quarantineOrDeallocateChunk(const Options &Options, void *TaggedPtr,
-                                   Chunk::UnpackedHeader *Header,
-                                   uptr Size) NO_THREAD_SAFETY_ANALYSIS {
-    void *Ptr = getHeaderTaggedPointer(TaggedPtr);
-    // If the quarantine is disabled, the actual size of a chunk is 0 or larger
-    // than the maximum allowed, we return a chunk directly to the backend.
-    // This purposefully underflows for Size == 0.
-    const bool BypassQuarantine = !Quarantine.getCacheSize() ||
-                                  ((Size - 1) >= QuarantineMaxChunkSize) ||
-                                  !Header->ClassId;
-    if (BypassQuarantine)
-      Header->State = Chunk::State::Available;
-    else
-      Header->State = Chunk::State::Quarantined;
-    Header->OriginOrWasZeroed = useMemoryTagging<Config>(Options) &&
-                                Header->ClassId &&
-                                !TSDRegistry.getDisableMemInit();
-    Chunk::storeHeader(Cookie, Ptr, Header);
-
-    if (UNLIKELY(useMemoryTagging<Config>(Options))) {
-      u8 PrevTag = extractTag(reinterpret_cast<uptr>(TaggedPtr));
-      storeDeallocationStackMaybe(Options, Ptr, PrevTag, Size);
-      if (Header->ClassId) {
-        if (!TSDRegistry.getDisableMemInit()) {
-          uptr TaggedBegin, TaggedEnd;
-          const uptr OddEvenMask = computeOddEvenMaskForPointerMaybe(
-              Options, reinterpret_cast<uptr>(getBlockBegin(Ptr, Header)),
-              Header->ClassId);
-          // Exclude the previous tag so that immediate use after free is
-          // detected 100% of the time.
-          setRandomTag(Ptr, Size, OddEvenMask | (1UL << PrevTag), &TaggedBegin,
-                       &TaggedEnd);
-        }
-      }
-    }
-    if (BypassQuarantine) {
-      if (allocatorSupportsMemoryTagging<Config>())
-        Ptr = untagPointer(Ptr);
-      void *BlockBegin = getBlockBegin(Ptr, Header);
-      const uptr ClassId = Header->ClassId;
-      if (LIKELY(ClassId)) {
-        bool UnlockRequired;
-        auto *TSD = TSDRegistry.getTSDAndLock(&UnlockRequired);
-        TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-        const bool CacheDrained =
-            TSD->getCache().deallocate(ClassId, BlockBegin);
-        if (UnlockRequired)
-          TSD->unlock();
-        // When we have drained some blocks back to the Primary from TSD, that
-        // implies that we may have the chance to release some pages as well.
-        // Note that in order not to block other thread's accessing the TSD,
-        // release the TSD first then try the page release.
-        if (CacheDrained)
-          Primary.tryReleaseToOS(ClassId, ReleaseToOS::Normal);
-      } else {
-        if (UNLIKELY(useMemoryTagging<Config>(Options)))
-          storeTags(reinterpret_cast<uptr>(BlockBegin),
-                    reinterpret_cast<uptr>(Ptr));
-        Secondary.deallocate(Options, BlockBegin);
-      }
-    } else {
-      bool UnlockRequired;
-      auto *TSD = TSDRegistry.getTSDAndLock(&UnlockRequired);
-      TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-      Quarantine.put(&TSD->getQuarantineCache(),
-                     QuarantineCallback(*this, TSD->getCache()), Ptr, Size);
-      if (UnlockRequired)
-        TSD->unlock();
-    }
-  }
-
-  bool getChunkFromBlock(uptr Block, uptr *Chunk,
-                         Chunk::UnpackedHeader *Header) {
-    *Chunk =
-        Block + getChunkOffsetFromBlock(reinterpret_cast<const char *>(Block));
-    return Chunk::isValid(Cookie, reinterpret_cast<void *>(*Chunk), Header);
-  }
-
-  static uptr getChunkOffsetFromBlock(const char *Block) {
-    u32 Offset = 0;
-    if (reinterpret_cast<const u32 *>(Block)[0] == BlockMarker)
-      Offset = reinterpret_cast<const u32 *>(Block)[1];
-    return Offset + Chunk::getHeaderSize();
-  }
-
-  // Set the tag of the granule past the end of the allocation to 0, to catch
-  // linear overflows even if a previous larger allocation used the same block
-  // and tag. Only do this if the granule past the end is in our block, because
-  // this would otherwise lead to a SEGV if the allocation covers the entire
-  // block and our block is at the end of a mapping. The tag of the next block's
-  // header granule will be set to 0, so it will serve the purpose of catching
-  // linear overflows in this case.
-  //
-  // For allocations of size 0 we do not end up storing the address tag to the
-  // memory tag space, which getInlineErrorInfo() normally relies on to match
-  // address tags against chunks. To allow matching in this case we store the
-  // address tag in the first byte of the chunk.
-  void storeEndMarker(uptr End, uptr Size, uptr BlockEnd) {
-    DCHECK_EQ(BlockEnd, untagPointer(BlockEnd));
-    uptr UntaggedEnd = untagPointer(End);
-    if (UntaggedEnd != BlockEnd) {
-      storeTag(UntaggedEnd);
-      if (Size == 0)
-        *reinterpret_cast<u8 *>(UntaggedEnd) = extractTag(End);
-    }
-  }
-
-  void *prepareTaggedChunk(void *Ptr, uptr Size, uptr ExcludeMask,
-                           uptr BlockEnd) {
-    // Prepare the granule before the chunk to store the chunk header by setting
-    // its tag to 0. Normally its tag will already be 0, but in the case where a
-    // chunk holding a low alignment allocation is reused for a higher alignment
-    // allocation, the chunk may already have a non-zero tag from the previous
-    // allocation.
-    storeTag(reinterpret_cast<uptr>(Ptr) - archMemoryTagGranuleSize());
-
-    uptr TaggedBegin, TaggedEnd;
-    setRandomTag(Ptr, Size, ExcludeMask, &TaggedBegin, &TaggedEnd);
-
-    storeEndMarker(TaggedEnd, Size, BlockEnd);
-    return reinterpret_cast<void *>(TaggedBegin);
-  }
-
-  void resizeTaggedChunk(uptr OldPtr, uptr NewPtr, uptr NewSize,
-                         uptr BlockEnd) {
-    uptr RoundOldPtr = roundUp(OldPtr, archMemoryTagGranuleSize());
-    uptr RoundNewPtr;
-    if (RoundOldPtr >= NewPtr) {
-      // If the allocation is shrinking we just need to set the tag past the end
-      // of the allocation to 0. See explanation in storeEndMarker() above.
-      RoundNewPtr = roundUp(NewPtr, archMemoryTagGranuleSize());
-    } else {
-      // Set the memory tag of the region
-      // [RoundOldPtr, roundUp(NewPtr, archMemoryTagGranuleSize()))
-      // to the pointer tag stored in OldPtr.
-      RoundNewPtr = storeTags(RoundOldPtr, NewPtr);
-    }
-    storeEndMarker(RoundNewPtr, NewSize, BlockEnd);
-  }
-
-  void storePrimaryAllocationStackMaybe(const Options &Options, void *Ptr) {
-    if (!UNLIKELY(Options.get(OptionBit::TrackAllocationStacks)))
-      return;
-    auto *Ptr32 = reinterpret_cast<u32 *>(Ptr);
-    Ptr32[MemTagAllocationTraceIndex] = collectStackTrace();
-    Ptr32[MemTagAllocationTidIndex] = getThreadID();
-  }
-
-  void storeRingBufferEntry(void *Ptr, u32 AllocationTrace, u32 AllocationTid,
-                            uptr AllocationSize, u32 DeallocationTrace,
-                            u32 DeallocationTid) {
-    uptr Pos = atomic_fetch_add(&getRingBuffer()->Pos, 1, memory_order_relaxed);
-    typename AllocationRingBuffer::Entry *Entry =
-        getRingBufferEntry(RawRingBuffer, Pos % RingBufferElements);
-
-    // First invalidate our entry so that we don't attempt to interpret a
-    // partially written state in getSecondaryErrorInfo(). The fences below
-    // ensure that the compiler does not move the stores to Ptr in between the
-    // stores to the other fields.
-    atomic_store_relaxed(&Entry->Ptr, 0);
-
-    __atomic_signal_fence(__ATOMIC_SEQ_CST);
-    atomic_store_relaxed(&Entry->AllocationTrace, AllocationTrace);
-    atomic_store_relaxed(&Entry->AllocationTid, AllocationTid);
-    atomic_store_relaxed(&Entry->AllocationSize, AllocationSize);
-    atomic_store_relaxed(&Entry->DeallocationTrace, DeallocationTrace);
-    atomic_store_relaxed(&Entry->DeallocationTid, DeallocationTid);
-    __atomic_signal_fence(__ATOMIC_SEQ_CST);
-
-    atomic_store_relaxed(&Entry->Ptr, reinterpret_cast<uptr>(Ptr));
-  }
-
-  void storeSecondaryAllocationStackMaybe(const Options &Options, void *Ptr,
-                                          uptr Size) {
-    if (!UNLIKELY(Options.get(OptionBit::TrackAllocationStacks)))
-      return;
-
-    u32 Trace = collectStackTrace();
-    u32 Tid = getThreadID();
-
-    auto *Ptr32 = reinterpret_cast<u32 *>(Ptr);
-    Ptr32[MemTagAllocationTraceIndex] = Trace;
-    Ptr32[MemTagAllocationTidIndex] = Tid;
-
-    storeRingBufferEntry(untagPointer(Ptr), Trace, Tid, Size, 0, 0);
-  }
-
-  void storeDeallocationStackMaybe(const Options &Options, void *Ptr,
-                                   u8 PrevTag, uptr Size) {
-    if (!UNLIKELY(Options.get(OptionBit::TrackAllocationStacks)))
-      return;
-
-    auto *Ptr32 = reinterpret_cast<u32 *>(Ptr);
-    u32 AllocationTrace = Ptr32[MemTagAllocationTraceIndex];
-    u32 AllocationTid = Ptr32[MemTagAllocationTidIndex];
-
-    u32 DeallocationTrace = collectStackTrace();
-    u32 DeallocationTid = getThreadID();
-
-    storeRingBufferEntry(addFixedTag(untagPointer(Ptr), PrevTag),
-                         AllocationTrace, AllocationTid, Size,
-                         DeallocationTrace, DeallocationTid);
-  }
-
-  static const size_t NumErrorReports =
-      sizeof(((scudo_error_info *)nullptr)->reports) /
-      sizeof(((scudo_error_info *)nullptr)->reports[0]);
-
-  static void getInlineErrorInfo(struct scudo_error_info *ErrorInfo,
-                                 size_t &NextErrorReport, uintptr_t FaultAddr,
-                                 const StackDepot *Depot,
-                                 const char *RegionInfoPtr, const char *Memory,
-                                 const char *MemoryTags, uintptr_t MemoryAddr,
-                                 size_t MemorySize, size_t MinDistance,
-                                 size_t MaxDistance) {
-    uptr UntaggedFaultAddr = untagPointer(FaultAddr);
-    u8 FaultAddrTag = extractTag(FaultAddr);
-    BlockInfo Info =
-        PrimaryT::findNearestBlock(RegionInfoPtr, UntaggedFaultAddr);
-
-    auto GetGranule = [&](uptr Addr, const char **Data, uint8_t *Tag) -> bool {
-      if (Addr < MemoryAddr || Addr + archMemoryTagGranuleSize() < Addr ||
-          Addr + archMemoryTagGranuleSize() > MemoryAddr + MemorySize)
-        return false;
-      *Data = &Memory[Addr - MemoryAddr];
-      *Tag = static_cast<u8>(
-          MemoryTags[(Addr - MemoryAddr) / archMemoryTagGranuleSize()]);
-      return true;
-    };
-
-    auto ReadBlock = [&](uptr Addr, uptr *ChunkAddr,
-                         Chunk::UnpackedHeader *Header, const u32 **Data,
-                         u8 *Tag) {
-      const char *BlockBegin;
-      u8 BlockBeginTag;
-      if (!GetGranule(Addr, &BlockBegin, &BlockBeginTag))
-        return false;
-      uptr ChunkOffset = getChunkOffsetFromBlock(BlockBegin);
-      *ChunkAddr = Addr + ChunkOffset;
-
-      const char *ChunkBegin;
-      if (!GetGranule(*ChunkAddr, &ChunkBegin, Tag))
-        return false;
-      *Header = *reinterpret_cast<const Chunk::UnpackedHeader *>(
-          ChunkBegin - Chunk::getHeaderSize());
-      *Data = reinterpret_cast<const u32 *>(ChunkBegin);
-
-      // Allocations of size 0 will have stashed the tag in the first byte of
-      // the chunk, see storeEndMarker().
-      if (Header->SizeOrUnusedBytes == 0)
-        *Tag = static_cast<u8>(*ChunkBegin);
-
-      return true;
-    };
-
-    if (NextErrorReport == NumErrorReports)
-      return;
-
-    auto CheckOOB = [&](uptr BlockAddr) {
-      if (BlockAddr < Info.RegionBegin || BlockAddr >= Info.RegionEnd)
-        return false;
-
-      uptr ChunkAddr;
-      Chunk::UnpackedHeader Header;
-      const u32 *Data;
-      uint8_t Tag;
-      if (!ReadBlock(BlockAddr, &ChunkAddr, &Header, &Data, &Tag) ||
-          Header.State != Chunk::State::Allocated || Tag != FaultAddrTag)
-        return false;
-
-      auto *R = &ErrorInfo->reports[NextErrorReport++];
-      R->error_type =
-          UntaggedFaultAddr < ChunkAddr ? BUFFER_UNDERFLOW : BUFFER_OVERFLOW;
-      R->allocation_address = ChunkAddr;
-      R->allocation_size = Header.SizeOrUnusedBytes;
-      collectTraceMaybe(Depot, R->allocation_trace,
-                        Data[MemTagAllocationTraceIndex]);
-      R->allocation_tid = Data[MemTagAllocationTidIndex];
-      return NextErrorReport == NumErrorReports;
-    };
-
-    if (MinDistance == 0 && CheckOOB(Info.BlockBegin))
-      return;
-
-    for (size_t I = Max<size_t>(MinDistance, 1); I != MaxDistance; ++I)
-      if (CheckOOB(Info.BlockBegin + I * Info.BlockSize) ||
-          CheckOOB(Info.BlockBegin - I * Info.BlockSize))
-        return;
-  }
-
-  static void getRingBufferErrorInfo(struct scudo_error_info *ErrorInfo,
-                                     size_t &NextErrorReport,
-                                     uintptr_t FaultAddr,
-                                     const StackDepot *Depot,
-                                     const char *RingBufferPtr,
-                                     size_t RingBufferSize) {
-    auto *RingBuffer =
-        reinterpret_cast<const AllocationRingBuffer *>(RingBufferPtr);
-    size_t RingBufferElements = ringBufferElementsFromBytes(RingBufferSize);
-    if (!RingBuffer || RingBufferElements == 0)
-      return;
-    uptr Pos = atomic_load_relaxed(&RingBuffer->Pos);
-
-    for (uptr I = Pos - 1; I != Pos - 1 - RingBufferElements &&
-                           NextErrorReport != NumErrorReports;
-         --I) {
-      auto *Entry = getRingBufferEntry(RingBufferPtr, I % RingBufferElements);
-      uptr EntryPtr = atomic_load_relaxed(&Entry->Ptr);
-      if (!EntryPtr)
-        continue;
-
-      uptr UntaggedEntryPtr = untagPointer(EntryPtr);
-      uptr EntrySize = atomic_load_relaxed(&Entry->AllocationSize);
-      u32 AllocationTrace = atomic_load_relaxed(&Entry->AllocationTrace);
-      u32 AllocationTid = atomic_load_relaxed(&Entry->AllocationTid);
-      u32 DeallocationTrace = atomic_load_relaxed(&Entry->DeallocationTrace);
-      u32 DeallocationTid = atomic_load_relaxed(&Entry->DeallocationTid);
-
-      if (DeallocationTid) {
-        // For UAF we only consider in-bounds fault addresses because
-        // out-of-bounds UAF is rare and attempting to detect it is very likely
-        // to result in false positives.
-        if (FaultAddr < EntryPtr || FaultAddr >= EntryPtr + EntrySize)
-          continue;
-      } else {
-        // Ring buffer OOB is only possible with secondary allocations. In this
-        // case we are guaranteed a guard region of at least a page on either
-        // side of the allocation (guard page on the right, guard page + tagged
-        // region on the left), so ignore any faults outside of that range.
-        if (FaultAddr < EntryPtr - getPageSizeCached() ||
-            FaultAddr >= EntryPtr + EntrySize + getPageSizeCached())
-          continue;
-
-        // For UAF the ring buffer will contain two entries, one for the
-        // allocation and another for the deallocation. Don't report buffer
-        // overflow/underflow using the allocation entry if we have already
-        // collected a report from the deallocation entry.
-        bool Found = false;
-        for (uptr J = 0; J != NextErrorReport; ++J) {
-          if (ErrorInfo->reports[J].allocation_address == UntaggedEntryPtr) {
-            Found = true;
-            break;
-          }
-        }
-        if (Found)
-          continue;
-      }
-
-      auto *R = &ErrorInfo->reports[NextErrorReport++];
-      if (DeallocationTid)
-        R->error_type = USE_AFTER_FREE;
-      else if (FaultAddr < EntryPtr)
-        R->error_type = BUFFER_UNDERFLOW;
-      else
-        R->error_type = BUFFER_OVERFLOW;
-
-      R->allocation_address = UntaggedEntryPtr;
-      R->allocation_size = EntrySize;
-      collectTraceMaybe(Depot, R->allocation_trace, AllocationTrace);
-      R->allocation_tid = AllocationTid;
-      collectTraceMaybe(Depot, R->deallocation_trace, DeallocationTrace);
-      R->deallocation_tid = DeallocationTid;
-    }
-  }
-
-  uptr getStats(ScopedString *Str) {
-    Primary.getStats(Str);
-    Secondary.getStats(Str);
-    Quarantine.getStats(Str);
-    TSDRegistry.getStats(Str);
-    return Str->length();
-  }
-
-  static typename AllocationRingBuffer::Entry *
-  getRingBufferEntry(char *RawRingBuffer, uptr N) {
-    return &reinterpret_cast<typename AllocationRingBuffer::Entry *>(
-        &RawRingBuffer[sizeof(AllocationRingBuffer)])[N];
-  }
-  static const typename AllocationRingBuffer::Entry *
-  getRingBufferEntry(const char *RawRingBuffer, uptr N) {
-    return &reinterpret_cast<const typename AllocationRingBuffer::Entry *>(
-        &RawRingBuffer[sizeof(AllocationRingBuffer)])[N];
-  }
-
-  void mapAndInitializeRingBuffer() {
-    if (getFlags()->allocation_ring_buffer_size <= 0)
-      return;
-    u32 AllocationRingBufferSize =
-        static_cast<u32>(getFlags()->allocation_ring_buffer_size);
-    MemMapT MemMap;
-    MemMap.map(
-        /*Addr=*/0U,
-        roundUp(ringBufferSizeInBytes(AllocationRingBufferSize),
-                getPageSizeCached()),
-        "scudo:ring_buffer");
-    RawRingBuffer = reinterpret_cast<char *>(MemMap.getBase());
-    RawRingBufferMap = MemMap;
-    RingBufferElements = AllocationRingBufferSize;
-    static_assert(sizeof(AllocationRingBuffer) %
-                          alignof(typename AllocationRingBuffer::Entry) ==
-                      0,
-                  "invalid alignment");
-  }
-
-  void unmapRingBuffer() {
-    auto *RingBuffer = getRingBuffer();
-    if (RingBuffer != nullptr) {
-      RawRingBufferMap.unmap(RawRingBufferMap.getBase(),
-                             RawRingBufferMap.getCapacity());
-    }
-    RawRingBuffer = nullptr;
-  }
-
-  static constexpr size_t ringBufferSizeInBytes(u32 RingBufferElements) {
-    return sizeof(AllocationRingBuffer) +
-           RingBufferElements * sizeof(typename AllocationRingBuffer::Entry);
-  }
-
-  static constexpr size_t ringBufferElementsFromBytes(size_t Bytes) {
-    if (Bytes < sizeof(AllocationRingBuffer)) {
-      return 0;
-    }
-    return (Bytes - sizeof(AllocationRingBuffer)) /
-           sizeof(typename AllocationRingBuffer::Entry);
-  }
-
-  inline AllocationRingBuffer *getRingBuffer() {
-    return reinterpret_cast<AllocationRingBuffer *>(RawRingBuffer);
-  }
-};
-
-} // namespace scudo
-
-#endif // SCUDO_COMBINED_H_
diff --git a/Telegram/ThirdParty/scudo/common.cpp b/Telegram/ThirdParty/scudo/common.cpp
deleted file mode 100644
index 06e930638..000000000
--- a/Telegram/ThirdParty/scudo/common.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//===-- common.cpp ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "common.h"
-#include "atomic_helpers.h"
-#include "string_utils.h"
-
-namespace scudo {
-
-uptr PageSizeCached;
-uptr getPageSize();
-
-uptr getPageSizeSlow() {
-  PageSizeCached = getPageSize();
-  CHECK_NE(PageSizeCached, 0);
-  return PageSizeCached;
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/common.h b/Telegram/ThirdParty/scudo/common.h
deleted file mode 100644
index ae45683f1..000000000
--- a/Telegram/ThirdParty/scudo/common.h
+++ /dev/null
@@ -1,232 +0,0 @@
-//===-- common.h ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_COMMON_H_
-#define SCUDO_COMMON_H_
-
-#include "internal_defs.h"
-
-#include "fuchsia.h"
-#include "linux.h"
-#include "trusty.h"
-
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-
-namespace scudo {
-
-template <class Dest, class Source> inline Dest bit_cast(const Source &S) {
-  static_assert(sizeof(Dest) == sizeof(Source), "");
-  Dest D;
-  memcpy(&D, &S, sizeof(D));
-  return D;
-}
-
-inline constexpr bool isPowerOfTwo(uptr X) { return (X & (X - 1)) == 0; }
-
-inline constexpr uptr roundUp(uptr X, uptr Boundary) {
-  DCHECK(isPowerOfTwo(Boundary));
-  return (X + Boundary - 1) & ~(Boundary - 1);
-}
-inline constexpr uptr roundUpSlow(uptr X, uptr Boundary) {
-  return ((X + Boundary - 1) / Boundary) * Boundary;
-}
-
-inline constexpr uptr roundDown(uptr X, uptr Boundary) {
-  DCHECK(isPowerOfTwo(Boundary));
-  return X & ~(Boundary - 1);
-}
-inline constexpr uptr roundDownSlow(uptr X, uptr Boundary) {
-  return (X / Boundary) * Boundary;
-}
-
-inline constexpr bool isAligned(uptr X, uptr Alignment) {
-  DCHECK(isPowerOfTwo(Alignment));
-  return (X & (Alignment - 1)) == 0;
-}
-inline constexpr bool isAlignedSlow(uptr X, uptr Alignment) {
-  return X % Alignment == 0;
-}
-
-template <class T> constexpr T Min(T A, T B) { return A < B ? A : B; }
-
-template <class T> constexpr T Max(T A, T B) { return A > B ? A : B; }
-
-template <class T> void Swap(T &A, T &B) {
-  T Tmp = A;
-  A = B;
-  B = Tmp;
-}
-
-inline uptr getMostSignificantSetBitIndex(uptr X) {
-  DCHECK_NE(X, 0U);
-  return SCUDO_WORDSIZE - 1U - static_cast<uptr>(__builtin_clzl(X));
-}
-
-inline uptr roundUpPowerOfTwo(uptr Size) {
-  DCHECK(Size);
-  if (isPowerOfTwo(Size))
-    return Size;
-  const uptr Up = getMostSignificantSetBitIndex(Size);
-  DCHECK_LT(Size, (1UL << (Up + 1)));
-  DCHECK_GT(Size, (1UL << Up));
-  return 1UL << (Up + 1);
-}
-
-inline uptr getLeastSignificantSetBitIndex(uptr X) {
-  DCHECK_NE(X, 0U);
-  return static_cast<uptr>(__builtin_ctzl(X));
-}
-
-inline uptr getLog2(uptr X) {
-  DCHECK(isPowerOfTwo(X));
-  return getLeastSignificantSetBitIndex(X);
-}
-
-inline u32 getRandomU32(u32 *State) {
-  // ANSI C linear congruential PRNG (16-bit output).
-  // return (*State = *State * 1103515245 + 12345) >> 16;
-  // XorShift (32-bit output).
-  *State ^= *State << 13;
-  *State ^= *State >> 17;
-  *State ^= *State << 5;
-  return *State;
-}
-
-inline u32 getRandomModN(u32 *State, u32 N) {
-  return getRandomU32(State) % N; // [0, N)
-}
-
-template <typename T> inline void shuffle(T *A, u32 N, u32 *RandState) {
-  if (N <= 1)
-    return;
-  u32 State = *RandState;
-  for (u32 I = N - 1; I > 0; I--)
-    Swap(A[I], A[getRandomModN(&State, I + 1)]);
-  *RandState = State;
-}
-
-inline void computePercentage(uptr Numerator, uptr Denominator, uptr *Integral,
-                              uptr *Fractional) {
-  constexpr uptr Digits = 100;
-  if (Denominator == 0) {
-    *Integral = 100;
-    *Fractional = 0;
-    return;
-  }
-
-  *Integral = Numerator * Digits / Denominator;
-  *Fractional =
-      (((Numerator * Digits) % Denominator) * Digits + Denominator / 2) /
-      Denominator;
-}
-
-// Platform specific functions.
-
-extern uptr PageSizeCached;
-uptr getPageSizeSlow();
-inline uptr getPageSizeCached() {
-#if SCUDO_ANDROID && defined(PAGE_SIZE)
-  // Most Android builds have a build-time constant page size.
-  return PAGE_SIZE;
-#endif
-  if (LIKELY(PageSizeCached))
-    return PageSizeCached;
-  return getPageSizeSlow();
-}
-
-// Returns 0 if the number of CPUs could not be determined.
-u32 getNumberOfCPUs();
-
-const char *getEnv(const char *Name);
-
-u64 getMonotonicTime();
-// Gets the time faster but with less accuracy. Can call getMonotonicTime
-// if no fast version is available.
-u64 getMonotonicTimeFast();
-
-u32 getThreadID();
-
-// Our randomness gathering function is limited to 256 bytes to ensure we get
-// as many bytes as requested, and avoid interruptions (on Linux).
-constexpr uptr MaxRandomLength = 256U;
-bool getRandom(void *Buffer, uptr Length, bool Blocking = false);
-
-// Platform memory mapping functions.
-
-#define MAP_ALLOWNOMEM (1U << 0)
-#define MAP_NOACCESS (1U << 1)
-#define MAP_RESIZABLE (1U << 2)
-#define MAP_MEMTAG (1U << 3)
-#define MAP_PRECOMMIT (1U << 4)
-
-// Our platform memory mapping use is restricted to 3 scenarios:
-// - reserve memory at a random address (MAP_NOACCESS);
-// - commit memory in a previously reserved space;
-// - commit memory at a random address.
-// As such, only a subset of parameters combinations is valid, which is checked
-// by the function implementation. The Data parameter allows to pass opaque
-// platform specific data to the function.
-// Returns nullptr on error or dies if MAP_ALLOWNOMEM is not specified.
-void *map(void *Addr, uptr Size, const char *Name, uptr Flags = 0,
-          MapPlatformData *Data = nullptr);
-
-// Indicates that we are getting rid of the whole mapping, which might have
-// further consequences on Data, depending on the platform.
-#define UNMAP_ALL (1U << 0)
-
-void unmap(void *Addr, uptr Size, uptr Flags = 0,
-           MapPlatformData *Data = nullptr);
-
-void setMemoryPermission(uptr Addr, uptr Size, uptr Flags,
-                         MapPlatformData *Data = nullptr);
-
-void releasePagesToOS(uptr BaseAddress, uptr Offset, uptr Size,
-                      MapPlatformData *Data = nullptr);
-
-// Logging related functions.
-
-void setAbortMessage(const char *Message);
-
-struct BlockInfo {
-  uptr BlockBegin;
-  uptr BlockSize;
-  uptr RegionBegin;
-  uptr RegionEnd;
-};
-
-enum class Option : u8 {
-  ReleaseInterval,      // Release to OS interval in milliseconds.
-  MemtagTuning,         // Whether to tune tagging for UAF or overflow.
-  ThreadDisableMemInit, // Whether to disable automatic heap initialization and,
-                        // where possible, memory tagging, on this thread.
-  MaxCacheEntriesCount, // Maximum number of blocks that can be cached.
-  MaxCacheEntrySize,    // Maximum size of a block that can be cached.
-  MaxTSDsCount,         // Number of usable TSDs for the shared registry.
-};
-
-enum class ReleaseToOS : u8 {
-  Normal, // Follow the normal rules for releasing pages to the OS
-  Force,  // Force release pages to the OS, but avoid cases that take too long.
-  ForceAll, // Force release every page possible regardless of how long it will
-            // take.
-};
-
-constexpr unsigned char PatternFillByte = 0xAB;
-
-enum FillContentsMode {
-  NoFill = 0,
-  ZeroFill = 1,
-  PatternOrZeroFill = 2 // Pattern fill unless the memory is known to be
-                        // zero-initialized already.
-};
-
-} // namespace scudo
-
-#endif // SCUDO_COMMON_H_
diff --git a/Telegram/ThirdParty/scudo/condition_variable.h b/Telegram/ThirdParty/scudo/condition_variable.h
deleted file mode 100644
index 4afebdc9d..000000000
--- a/Telegram/ThirdParty/scudo/condition_variable.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//===-- condition_variable.h ------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_CONDITION_VARIABLE_H_
-#define SCUDO_CONDITION_VARIABLE_H_
-
-#include "condition_variable_base.h"
-
-#include "common.h"
-#include "platform.h"
-
-#include "condition_variable_linux.h"
-
-namespace scudo {
-
-// A default implementation of default condition variable. It doesn't do a real
-// `wait`, instead it spins a short amount of time only.
-class ConditionVariableDummy
-    : public ConditionVariableBase<ConditionVariableDummy> {
-public:
-  void notifyAllImpl(UNUSED HybridMutex &M) REQUIRES(M) {}
-
-  void waitImpl(UNUSED HybridMutex &M) REQUIRES(M) {
-    M.unlock();
-
-    constexpr u32 SpinTimes = 64;
-    volatile u32 V = 0;
-    for (u32 I = 0; I < SpinTimes; ++I) {
-      u32 Tmp = V + 1;
-      V = Tmp;
-    }
-
-    M.lock();
-  }
-};
-
-template <typename Config, typename = const bool>
-struct ConditionVariableState {
-  static constexpr bool enabled() { return false; }
-  // This is only used for compilation purpose so that we won't end up having
-  // many conditional compilations. If you want to use `ConditionVariableDummy`,
-  // define `ConditionVariableT` in your allocator configuration. See
-  // allocator_config.h for more details.
-  using ConditionVariableT = ConditionVariableDummy;
-};
-
-template <typename Config>
-struct ConditionVariableState<Config, decltype(Config::UseConditionVariable)> {
-  static constexpr bool enabled() { return Config::UseConditionVariable; }
-  using ConditionVariableT = typename Config::ConditionVariableT;
-};
-
-} // namespace scudo
-
-#endif // SCUDO_CONDITION_VARIABLE_H_
diff --git a/Telegram/ThirdParty/scudo/condition_variable_base.h b/Telegram/ThirdParty/scudo/condition_variable_base.h
deleted file mode 100644
index 416c327fe..000000000
--- a/Telegram/ThirdParty/scudo/condition_variable_base.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//===-- condition_variable_base.h -------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_CONDITION_VARIABLE_BASE_H_
-#define SCUDO_CONDITION_VARIABLE_BASE_H_
-
-#include "mutex.h"
-#include "thread_annotations.h"
-
-namespace scudo {
-
-template <typename Derived> class ConditionVariableBase {
-public:
-  constexpr ConditionVariableBase() = default;
-
-  void bindTestOnly(HybridMutex &Mutex) {
-#if SCUDO_DEBUG
-    boundMutex = &Mutex;
-#else
-    (void)Mutex;
-#endif
-  }
-
-  void notifyAll(HybridMutex &M) REQUIRES(M) {
-#if SCUDO_DEBUG
-    CHECK_EQ(&M, boundMutex);
-#endif
-    getDerived()->notifyAllImpl(M);
-  }
-
-  void wait(HybridMutex &M) REQUIRES(M) {
-#if SCUDO_DEBUG
-    CHECK_EQ(&M, boundMutex);
-#endif
-    getDerived()->waitImpl(M);
-  }
-
-protected:
-  Derived *getDerived() { return static_cast<Derived *>(this); }
-
-#if SCUDO_DEBUG
-  // Because thread-safety analysis doesn't support pointer aliasing, we are not
-  // able to mark the proper annotations without false positive. Instead, we
-  // pass the lock and do the same-lock check separately.
-  HybridMutex *boundMutex = nullptr;
-#endif
-};
-
-} // namespace scudo
-
-#endif // SCUDO_CONDITION_VARIABLE_BASE_H_
diff --git a/Telegram/ThirdParty/scudo/condition_variable_linux.cpp b/Telegram/ThirdParty/scudo/condition_variable_linux.cpp
deleted file mode 100644
index e6d9bd177..000000000
--- a/Telegram/ThirdParty/scudo/condition_variable_linux.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//===-- condition_variable_linux.cpp ----------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-#if SCUDO_LINUX
-
-#include "condition_variable_linux.h"
-
-#include "atomic_helpers.h"
-
-#include <limits.h>
-#include <linux/futex.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-namespace scudo {
-
-void ConditionVariableLinux::notifyAllImpl(UNUSED HybridMutex &M) {
-  const u32 V = atomic_load_relaxed(&Counter);
-  atomic_store_relaxed(&Counter, V + 1);
-
-  // TODO(chiahungduan): Move the waiters from the futex waiting queue
-  // `Counter` to futex waiting queue `M` so that the awoken threads won't be
-  // blocked again due to locked `M` by current thread.
-  if (LastNotifyAll != V) {
-    syscall(SYS_futex, reinterpret_cast<uptr>(&Counter), FUTEX_WAKE_PRIVATE,
-            INT_MAX, nullptr, nullptr, 0);
-  }
-
-  LastNotifyAll = V + 1;
-}
-
-void ConditionVariableLinux::waitImpl(HybridMutex &M) {
-  const u32 V = atomic_load_relaxed(&Counter) + 1;
-  atomic_store_relaxed(&Counter, V);
-
-  // TODO: Use ScopedUnlock when it's supported.
-  M.unlock();
-  syscall(SYS_futex, reinterpret_cast<uptr>(&Counter), FUTEX_WAIT_PRIVATE, V,
-          nullptr, nullptr, 0);
-  M.lock();
-}
-
-} // namespace scudo
-
-#endif // SCUDO_LINUX
diff --git a/Telegram/ThirdParty/scudo/condition_variable_linux.h b/Telegram/ThirdParty/scudo/condition_variable_linux.h
deleted file mode 100644
index cd0732873..000000000
--- a/Telegram/ThirdParty/scudo/condition_variable_linux.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//===-- condition_variable_linux.h ------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_CONDITION_VARIABLE_LINUX_H_
-#define SCUDO_CONDITION_VARIABLE_LINUX_H_
-
-#include "platform.h"
-
-#if SCUDO_LINUX
-
-#include "atomic_helpers.h"
-#include "condition_variable_base.h"
-#include "thread_annotations.h"
-
-namespace scudo {
-
-class ConditionVariableLinux
-    : public ConditionVariableBase<ConditionVariableLinux> {
-public:
-  void notifyAllImpl(HybridMutex &M) REQUIRES(M);
-
-  void waitImpl(HybridMutex &M) REQUIRES(M);
-
-private:
-  u32 LastNotifyAll = 0;
-  atomic_u32 Counter = {};
-};
-
-} // namespace scudo
-
-#endif // SCUDO_LINUX
-
-#endif // SCUDO_CONDITION_VARIABLE_LINUX_H_
diff --git a/Telegram/ThirdParty/scudo/crc32_hw.cpp b/Telegram/ThirdParty/scudo/crc32_hw.cpp
deleted file mode 100644
index 73f2ae000..000000000
--- a/Telegram/ThirdParty/scudo/crc32_hw.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===-- crc32_hw.cpp --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "checksum.h"
-
-namespace scudo {
-
-#if defined(__CRC32__) || defined(__SSE4_2__) || defined(__ARM_FEATURE_CRC32)
-u32 computeHardwareCRC32(u32 Crc, uptr Data) {
-  return static_cast<u32>(CRC32_INTRINSIC(Crc, Data));
-}
-#endif // defined(__CRC32__) || defined(__SSE4_2__) ||
-       // defined(__ARM_FEATURE_CRC32)
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/flags.cpp b/Telegram/ThirdParty/scudo/flags.cpp
deleted file mode 100644
index f498edfbd..000000000
--- a/Telegram/ThirdParty/scudo/flags.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//===-- flags.cpp -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "flags.h"
-#include "common.h"
-#include "flags_parser.h"
-
-#include "scudo/interface.h"
-
-namespace scudo {
-
-Flags *getFlags() {
-  static Flags F;
-  return &F;
-}
-
-void Flags::setDefaults() {
-#define SCUDO_FLAG(Type, Name, DefaultValue, Description) Name = DefaultValue;
-#include "flags.inc"
-#undef SCUDO_FLAG
-
-#ifdef GWP_ASAN_HOOKS
-#define GWP_ASAN_OPTION(Type, Name, DefaultValue, Description)                 \
-  GWP_ASAN_##Name = DefaultValue;
-#include "gwp_asan/options.inc"
-#undef GWP_ASAN_OPTION
-#endif // GWP_ASAN_HOOKS
-}
-
-void registerFlags(FlagParser *Parser, Flags *F) {
-#define SCUDO_FLAG(Type, Name, DefaultValue, Description)                      \
-  Parser->registerFlag(#Name, Description, FlagType::FT_##Type,                \
-                       reinterpret_cast<void *>(&F->Name));
-#include "flags.inc"
-#undef SCUDO_FLAG
-
-#ifdef GWP_ASAN_HOOKS
-#define GWP_ASAN_OPTION(Type, Name, DefaultValue, Description)                 \
-  Parser->registerFlag("GWP_ASAN_" #Name, Description, FlagType::FT_##Type,    \
-                       reinterpret_cast<void *>(&F->GWP_ASAN_##Name));
-#include "gwp_asan/options.inc"
-#undef GWP_ASAN_OPTION
-#endif // GWP_ASAN_HOOKS
-}
-
-static const char *getCompileDefinitionScudoDefaultOptions() {
-#ifdef SCUDO_DEFAULT_OPTIONS
-  return STRINGIFY(SCUDO_DEFAULT_OPTIONS);
-#else
-  return "";
-#endif
-}
-
-static const char *getScudoDefaultOptions() {
-  return (&__scudo_default_options) ? __scudo_default_options() : "";
-}
-
-void initFlags() {
-  Flags *F = getFlags();
-  F->setDefaults();
-  FlagParser Parser;
-  registerFlags(&Parser, F);
-  Parser.parseString(getCompileDefinitionScudoDefaultOptions());
-  Parser.parseString(getScudoDefaultOptions());
-  Parser.parseString(getEnv("SCUDO_OPTIONS"));
-  if (const char *V = getEnv("SCUDO_ALLOCATION_RING_BUFFER_SIZE")) {
-    Parser.parseStringPair("allocation_ring_buffer_size", V);
-  }
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/flags.h b/Telegram/ThirdParty/scudo/flags.h
deleted file mode 100644
index 2cd0a5b13..000000000
--- a/Telegram/ThirdParty/scudo/flags.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//===-- flags.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_FLAGS_H_
-#define SCUDO_FLAGS_H_
-
-#include "internal_defs.h"
-
-namespace scudo {
-
-struct Flags {
-#define SCUDO_FLAG(Type, Name, DefaultValue, Description) Type Name;
-#include "flags.inc"
-#undef SCUDO_FLAG
-
-#ifdef GWP_ASAN_HOOKS
-#define GWP_ASAN_OPTION(Type, Name, DefaultValue, Description)                 \
-  Type GWP_ASAN_##Name;
-#include "gwp_asan/options.inc"
-#undef GWP_ASAN_OPTION
-#endif // GWP_ASAN_HOOKS
-
-  void setDefaults();
-};
-
-Flags *getFlags();
-void initFlags();
-class FlagParser;
-void registerFlags(FlagParser *Parser, Flags *F);
-
-} // namespace scudo
-
-#endif // SCUDO_FLAGS_H_
diff --git a/Telegram/ThirdParty/scudo/flags.inc b/Telegram/ThirdParty/scudo/flags.inc
deleted file mode 100644
index f5a2bab50..000000000
--- a/Telegram/ThirdParty/scudo/flags.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-//===-- flags.inc -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_FLAG
-#error "Define SCUDO_FLAG prior to including this file!"
-#endif
-
-SCUDO_FLAG(int, quarantine_size_kb, 0,
-           "Size (in kilobytes) of quarantine used to delay the actual "
-           "deallocation of chunks. Lower value may reduce memory usage but "
-           "decrease the effectiveness of the mitigation.")
-
-SCUDO_FLAG(int, thread_local_quarantine_size_kb, 0,
-           "Size (in kilobytes) of per-thread cache used to offload the global "
-           "quarantine. Lower value may reduce memory usage but might increase "
-           "the contention on the global quarantine.")
-
-SCUDO_FLAG(int, quarantine_max_chunk_size, 0,
-           "Size (in bytes) up to which chunks will be quarantined (if lower "
-           "than or equal to).")
-
-SCUDO_FLAG(bool, dealloc_type_mismatch, false,
-           "Terminate on a type mismatch in allocation-deallocation functions, "
-           "eg: malloc/delete, new/free, new/delete[], etc.")
-
-SCUDO_FLAG(bool, delete_size_mismatch, true,
-           "Terminate on a size mismatch between a sized-delete and the actual "
-           "size of a chunk (as provided to new/new[]).")
-
-SCUDO_FLAG(bool, zero_contents, false, "Zero chunk contents on allocation.")
-
-SCUDO_FLAG(bool, pattern_fill_contents, false,
-           "Pattern fill chunk contents on allocation.")
-
-SCUDO_FLAG(bool, may_return_null, true,
-           "Indicate whether the allocator should terminate instead of "
-           "returning NULL in otherwise non-fatal error scenarios, eg: OOM, "
-           "invalid allocation alignments, etc.")
-
-SCUDO_FLAG(int, release_to_os_interval_ms, SCUDO_ANDROID ? INT32_MIN : 5000,
-           "Interval (in milliseconds) at which to attempt release of unused "
-           "memory to the OS. Negative values disable the feature.")
-
-SCUDO_FLAG(int, allocation_ring_buffer_size, 32768,
-           "Entries to keep in the allocation ring buffer for scudo. "
-           "Values less or equal to zero disable the buffer.")
diff --git a/Telegram/ThirdParty/scudo/flags_parser.cpp b/Telegram/ThirdParty/scudo/flags_parser.cpp
deleted file mode 100644
index 3d8c6f378..000000000
--- a/Telegram/ThirdParty/scudo/flags_parser.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-//===-- flags_parser.cpp ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "flags_parser.h"
-#include "common.h"
-#include "report.h"
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-namespace scudo {
-
-class UnknownFlagsRegistry {
-  static const u32 MaxUnknownFlags = 16;
-  const char *UnknownFlagsNames[MaxUnknownFlags];
-  u32 NumberOfUnknownFlags;
-
-public:
-  void add(const char *Name) {
-    CHECK_LT(NumberOfUnknownFlags, MaxUnknownFlags);
-    UnknownFlagsNames[NumberOfUnknownFlags++] = Name;
-  }
-
-  void report() {
-    if (!NumberOfUnknownFlags)
-      return;
-    Printf("Scudo WARNING: found %d unrecognized flag(s):\n",
-           NumberOfUnknownFlags);
-    for (u32 I = 0; I < NumberOfUnknownFlags; ++I)
-      Printf("    %s\n", UnknownFlagsNames[I]);
-    NumberOfUnknownFlags = 0;
-  }
-};
-static UnknownFlagsRegistry UnknownFlags;
-
-void reportUnrecognizedFlags() { UnknownFlags.report(); }
-
-void FlagParser::printFlagDescriptions() {
-  Printf("Available flags for Scudo:\n");
-  for (u32 I = 0; I < NumberOfFlags; ++I)
-    Printf("\t%s\n\t\t- %s\n", Flags[I].Name, Flags[I].Desc);
-}
-
-static bool isSeparator(char C) {
-  return C == ' ' || C == ',' || C == ':' || C == '\n' || C == '\t' ||
-         C == '\r';
-}
-
-static bool isSeparatorOrNull(char C) { return !C || isSeparator(C); }
-
-void FlagParser::skipWhitespace() {
-  while (isSeparator(Buffer[Pos]))
-    ++Pos;
-}
-
-void FlagParser::parseFlag() {
-  const uptr NameStart = Pos;
-  while (Buffer[Pos] != '=' && !isSeparatorOrNull(Buffer[Pos]))
-    ++Pos;
-  if (Buffer[Pos] != '=')
-    reportError("expected '='");
-  const char *Name = Buffer + NameStart;
-  const uptr ValueStart = ++Pos;
-  const char *Value;
-  if (Buffer[Pos] == '\'' || Buffer[Pos] == '"') {
-    const char Quote = Buffer[Pos++];
-    while (Buffer[Pos] != 0 && Buffer[Pos] != Quote)
-      ++Pos;
-    if (Buffer[Pos] == 0)
-      reportError("unterminated string");
-    Value = Buffer + ValueStart + 1;
-    ++Pos; // consume the closing quote
-  } else {
-    while (!isSeparatorOrNull(Buffer[Pos]))
-      ++Pos;
-    Value = Buffer + ValueStart;
-  }
-  if (!runHandler(Name, Value, '='))
-    reportError("flag parsing failed.");
-}
-
-void FlagParser::parseFlags() {
-  while (true) {
-    skipWhitespace();
-    if (Buffer[Pos] == 0)
-      break;
-    parseFlag();
-  }
-}
-
-void FlagParser::parseString(const char *S) {
-  if (!S)
-    return;
-  // Backup current parser state to allow nested parseString() calls.
-  const char *OldBuffer = Buffer;
-  const uptr OldPos = Pos;
-  Buffer = S;
-  Pos = 0;
-
-  parseFlags();
-
-  Buffer = OldBuffer;
-  Pos = OldPos;
-}
-
-inline bool parseBool(const char *Value, bool *b) {
-  if (strncmp(Value, "0", 1) == 0 || strncmp(Value, "no", 2) == 0 ||
-      strncmp(Value, "false", 5) == 0) {
-    *b = false;
-    return true;
-  }
-  if (strncmp(Value, "1", 1) == 0 || strncmp(Value, "yes", 3) == 0 ||
-      strncmp(Value, "true", 4) == 0) {
-    *b = true;
-    return true;
-  }
-  return false;
-}
-
-void FlagParser::parseStringPair(const char *Name, const char *Value) {
-  if (!runHandler(Name, Value, '\0'))
-    reportError("flag parsing failed.");
-}
-
-bool FlagParser::runHandler(const char *Name, const char *Value,
-                            const char Sep) {
-  for (u32 I = 0; I < NumberOfFlags; ++I) {
-    const uptr Len = strlen(Flags[I].Name);
-    if (strncmp(Name, Flags[I].Name, Len) != 0 || Name[Len] != Sep)
-      continue;
-    bool Ok = false;
-    switch (Flags[I].Type) {
-    case FlagType::FT_bool:
-      Ok = parseBool(Value, reinterpret_cast<bool *>(Flags[I].Var));
-      if (!Ok)
-        reportInvalidFlag("bool", Value);
-      break;
-    case FlagType::FT_int:
-      char *ValueEnd;
-      errno = 0;
-      long V = strtol(Value, &ValueEnd, 10);
-      if (errno != 0 ||                 // strtol failed (over or underflow)
-          V > INT_MAX || V < INT_MIN || // overflows integer
-          // contains unexpected characters
-          (*ValueEnd != '"' && *ValueEnd != '\'' &&
-           !isSeparatorOrNull(*ValueEnd))) {
-        reportInvalidFlag("int", Value);
-        break;
-      }
-      *reinterpret_cast<int *>(Flags[I].Var) = static_cast<int>(V);
-      Ok = true;
-      break;
-    }
-    return Ok;
-  }
-  // Unrecognized flag. This is not a fatal error, we may print a warning later.
-  UnknownFlags.add(Name);
-  return true;
-}
-
-void FlagParser::registerFlag(const char *Name, const char *Desc, FlagType Type,
-                              void *Var) {
-  CHECK_LT(NumberOfFlags, MaxFlags);
-  Flags[NumberOfFlags].Name = Name;
-  Flags[NumberOfFlags].Desc = Desc;
-  Flags[NumberOfFlags].Type = Type;
-  Flags[NumberOfFlags].Var = Var;
-  ++NumberOfFlags;
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/flags_parser.h b/Telegram/ThirdParty/scudo/flags_parser.h
deleted file mode 100644
index ded496fda..000000000
--- a/Telegram/ThirdParty/scudo/flags_parser.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//===-- flags_parser.h ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_FLAGS_PARSER_H_
-#define SCUDO_FLAGS_PARSER_H_
-
-#include "report.h"
-#include "string_utils.h"
-
-#include <stddef.h>
-
-namespace scudo {
-
-enum class FlagType : u8 {
-  FT_bool,
-  FT_int,
-};
-
-class FlagParser {
-public:
-  void registerFlag(const char *Name, const char *Desc, FlagType Type,
-                    void *Var);
-  void parseString(const char *S);
-  void printFlagDescriptions();
-  void parseStringPair(const char *Name, const char *Value);
-
-private:
-  static const u32 MaxFlags = 20;
-  struct Flag {
-    const char *Name;
-    const char *Desc;
-    FlagType Type;
-    void *Var;
-  } Flags[MaxFlags];
-
-  u32 NumberOfFlags = 0;
-  const char *Buffer = nullptr;
-  uptr Pos = 0;
-
-  void reportFatalError(const char *Error);
-  void skipWhitespace();
-  void parseFlags();
-  void parseFlag();
-  bool runHandler(const char *Name, const char *Value, char Sep);
-};
-
-void reportUnrecognizedFlags();
-
-} // namespace scudo
-
-#endif // SCUDO_FLAGS_PARSER_H_
diff --git a/Telegram/ThirdParty/scudo/fuchsia.cpp b/Telegram/ThirdParty/scudo/fuchsia.cpp
deleted file mode 100644
index 0788c4198..000000000
--- a/Telegram/ThirdParty/scudo/fuchsia.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-//===-- fuchsia.cpp ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-#if SCUDO_FUCHSIA
-
-#include "common.h"
-#include "mutex.h"
-#include "string_utils.h"
-
-#include <lib/sync/mutex.h> // for sync_mutex_t
-#include <stdlib.h>         // for getenv()
-#include <zircon/compiler.h>
-#include <zircon/process.h>
-#include <zircon/sanitizer.h>
-#include <zircon/status.h>
-#include <zircon/syscalls.h>
-
-namespace scudo {
-
-uptr getPageSize() { return _zx_system_get_page_size(); }
-
-void NORETURN die() { __builtin_trap(); }
-
-// We zero-initialize the Extra parameter of map(), make sure this is consistent
-// with ZX_HANDLE_INVALID.
-static_assert(ZX_HANDLE_INVALID == 0, "");
-
-static void NORETURN dieOnError(zx_status_t Status, const char *FnName,
-                                uptr Size) {
-  char Error[128];
-  formatString(Error, sizeof(Error),
-               "SCUDO ERROR: %s failed with size %zuKB (%s)", FnName,
-               Size >> 10, zx_status_get_string(Status));
-  outputRaw(Error);
-  die();
-}
-
-static void *allocateVmar(uptr Size, MapPlatformData *Data, bool AllowNoMem) {
-  // Only scenario so far.
-  DCHECK(Data);
-  DCHECK_EQ(Data->Vmar, ZX_HANDLE_INVALID);
-
-  const zx_status_t Status = _zx_vmar_allocate(
-      _zx_vmar_root_self(),
-      ZX_VM_CAN_MAP_READ | ZX_VM_CAN_MAP_WRITE | ZX_VM_CAN_MAP_SPECIFIC, 0,
-      Size, &Data->Vmar, &Data->VmarBase);
-  if (UNLIKELY(Status != ZX_OK)) {
-    if (Status != ZX_ERR_NO_MEMORY || !AllowNoMem)
-      dieOnError(Status, "zx_vmar_allocate", Size);
-    return nullptr;
-  }
-  return reinterpret_cast<void *>(Data->VmarBase);
-}
-
-void *map(void *Addr, uptr Size, const char *Name, uptr Flags,
-          MapPlatformData *Data) {
-  DCHECK_EQ(Size % getPageSizeCached(), 0);
-  const bool AllowNoMem = !!(Flags & MAP_ALLOWNOMEM);
-
-  // For MAP_NOACCESS, just allocate a Vmar and return.
-  if (Flags & MAP_NOACCESS)
-    return allocateVmar(Size, Data, AllowNoMem);
-
-  const zx_handle_t Vmar = (Data && Data->Vmar != ZX_HANDLE_INVALID)
-                               ? Data->Vmar
-                               : _zx_vmar_root_self();
-
-  zx_status_t Status;
-  zx_handle_t Vmo;
-  uint64_t VmoSize = 0;
-  if (Data && Data->Vmo != ZX_HANDLE_INVALID) {
-    // If a Vmo was specified, it's a resize operation.
-    CHECK(Addr);
-    DCHECK(Flags & MAP_RESIZABLE);
-    Vmo = Data->Vmo;
-    VmoSize = Data->VmoSize;
-    Status = _zx_vmo_set_size(Vmo, VmoSize + Size);
-    if (Status != ZX_OK) {
-      if (Status != ZX_ERR_NO_MEMORY || !AllowNoMem)
-        dieOnError(Status, "zx_vmo_set_size", VmoSize + Size);
-      return nullptr;
-    }
-  } else {
-    // Otherwise, create a Vmo and set its name.
-    Status = _zx_vmo_create(Size, ZX_VMO_RESIZABLE, &Vmo);
-    if (UNLIKELY(Status != ZX_OK)) {
-      if (Status != ZX_ERR_NO_MEMORY || !AllowNoMem)
-        dieOnError(Status, "zx_vmo_create", Size);
-      return nullptr;
-    }
-    _zx_object_set_property(Vmo, ZX_PROP_NAME, Name, strlen(Name));
-  }
-
-  uintptr_t P;
-  zx_vm_option_t MapFlags =
-      ZX_VM_PERM_READ | ZX_VM_PERM_WRITE | ZX_VM_ALLOW_FAULTS;
-  if (Addr)
-    DCHECK(Data);
-  const uint64_t Offset =
-      Addr ? reinterpret_cast<uintptr_t>(Addr) - Data->VmarBase : 0;
-  if (Offset)
-    MapFlags |= ZX_VM_SPECIFIC;
-  Status = _zx_vmar_map(Vmar, MapFlags, Offset, Vmo, VmoSize, Size, &P);
-  if (UNLIKELY(Status != ZX_OK)) {
-    if (Status != ZX_ERR_NO_MEMORY || !AllowNoMem)
-      dieOnError(Status, "zx_vmar_map", Size);
-    return nullptr;
-  }
-
-  if (Flags & MAP_PRECOMMIT) {
-    Status = _zx_vmar_op_range(Vmar, ZX_VMAR_OP_COMMIT, P, Size,
-                               /*buffer=*/nullptr, /*buffer_size=*/0);
-  }
-
-  // No need to track the Vmo if we don't intend on resizing it. Close it.
-  if (Flags & MAP_RESIZABLE) {
-    DCHECK(Data);
-    if (Data->Vmo == ZX_HANDLE_INVALID)
-      Data->Vmo = Vmo;
-    else
-      DCHECK_EQ(Data->Vmo, Vmo);
-  } else {
-    CHECK_EQ(_zx_handle_close(Vmo), ZX_OK);
-  }
-  if (UNLIKELY(Status != ZX_OK)) {
-    if (Status != ZX_ERR_NO_MEMORY || !AllowNoMem)
-      dieOnError(Status, "zx_vmar_op_range", Size);
-    return nullptr;
-  }
-
-  if (Data)
-    Data->VmoSize += Size;
-
-  return reinterpret_cast<void *>(P);
-}
-
-void unmap(void *Addr, uptr Size, uptr Flags, MapPlatformData *Data) {
-  if (Flags & UNMAP_ALL) {
-    DCHECK_NE(Data, nullptr);
-    const zx_handle_t Vmar = Data->Vmar;
-    DCHECK_NE(Vmar, _zx_vmar_root_self());
-    // Destroying the vmar effectively unmaps the whole mapping.
-    CHECK_EQ(_zx_vmar_destroy(Vmar), ZX_OK);
-    CHECK_EQ(_zx_handle_close(Vmar), ZX_OK);
-  } else {
-    const zx_handle_t Vmar = (Data && Data->Vmar != ZX_HANDLE_INVALID)
-                                 ? Data->Vmar
-                                 : _zx_vmar_root_self();
-    const zx_status_t Status =
-        _zx_vmar_unmap(Vmar, reinterpret_cast<uintptr_t>(Addr), Size);
-    if (UNLIKELY(Status != ZX_OK))
-      dieOnError(Status, "zx_vmar_unmap", Size);
-  }
-  if (Data) {
-    if (Data->Vmo != ZX_HANDLE_INVALID)
-      CHECK_EQ(_zx_handle_close(Data->Vmo), ZX_OK);
-    memset(Data, 0, sizeof(*Data));
-  }
-}
-
-void setMemoryPermission(UNUSED uptr Addr, UNUSED uptr Size, UNUSED uptr Flags,
-                         UNUSED MapPlatformData *Data) {
-  const zx_vm_option_t Prot =
-      (Flags & MAP_NOACCESS) ? 0 : (ZX_VM_PERM_READ | ZX_VM_PERM_WRITE);
-  DCHECK(Data);
-  DCHECK_NE(Data->Vmar, ZX_HANDLE_INVALID);
-  const zx_status_t Status = _zx_vmar_protect(Data->Vmar, Prot, Addr, Size);
-  if (Status != ZX_OK)
-    dieOnError(Status, "zx_vmar_protect", Size);
-}
-
-void releasePagesToOS(UNUSED uptr BaseAddress, uptr Offset, uptr Size,
-                      MapPlatformData *Data) {
-  // TODO: DCHECK the BaseAddress is consistent with the data in
-  // MapPlatformData.
-  DCHECK(Data);
-  DCHECK_NE(Data->Vmar, ZX_HANDLE_INVALID);
-  DCHECK_NE(Data->Vmo, ZX_HANDLE_INVALID);
-  const zx_status_t Status =
-      _zx_vmo_op_range(Data->Vmo, ZX_VMO_OP_DECOMMIT, Offset, Size, NULL, 0);
-  CHECK_EQ(Status, ZX_OK);
-}
-
-const char *getEnv(const char *Name) { return getenv(Name); }
-
-// Note: we need to flag these methods with __TA_NO_THREAD_SAFETY_ANALYSIS
-// because the Fuchsia implementation of sync_mutex_t has clang thread safety
-// annotations. Were we to apply proper capability annotations to the top level
-// HybridMutex class itself, they would not be needed. As it stands, the
-// thread analysis thinks that we are locking the mutex and accidentally leaving
-// it locked on the way out.
-bool HybridMutex::tryLock() __TA_NO_THREAD_SAFETY_ANALYSIS {
-  // Size and alignment must be compatible between both types.
-  return sync_mutex_trylock(&M) == ZX_OK;
-}
-
-void HybridMutex::lockSlow() __TA_NO_THREAD_SAFETY_ANALYSIS {
-  sync_mutex_lock(&M);
-}
-
-void HybridMutex::unlock() __TA_NO_THREAD_SAFETY_ANALYSIS {
-  sync_mutex_unlock(&M);
-}
-
-void HybridMutex::assertHeldImpl() __TA_NO_THREAD_SAFETY_ANALYSIS {}
-
-u64 getMonotonicTime() { return _zx_clock_get_monotonic(); }
-u64 getMonotonicTimeFast() { return _zx_clock_get_monotonic(); }
-
-u32 getNumberOfCPUs() { return _zx_system_get_num_cpus(); }
-
-u32 getThreadID() { return 0; }
-
-bool getRandom(void *Buffer, uptr Length, UNUSED bool Blocking) {
-  static_assert(MaxRandomLength <= ZX_CPRNG_DRAW_MAX_LEN, "");
-  if (UNLIKELY(!Buffer || !Length || Length > MaxRandomLength))
-    return false;
-  _zx_cprng_draw(Buffer, Length);
-  return true;
-}
-
-void outputRaw(const char *Buffer) {
-  __sanitizer_log_write(Buffer, strlen(Buffer));
-}
-
-void setAbortMessage(const char *Message) {}
-
-} // namespace scudo
-
-#endif // SCUDO_FUCHSIA
diff --git a/Telegram/ThirdParty/scudo/fuchsia.h b/Telegram/ThirdParty/scudo/fuchsia.h
deleted file mode 100644
index c1dfd7638..000000000
--- a/Telegram/ThirdParty/scudo/fuchsia.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//===-- fuchsia.h -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_FUCHSIA_H_
-#define SCUDO_FUCHSIA_H_
-
-#include "platform.h"
-
-#if SCUDO_FUCHSIA
-
-#include <stdint.h>
-#include <zircon/types.h>
-
-namespace scudo {
-
-struct MapPlatformData {
-  zx_handle_t Vmar;
-  zx_handle_t Vmo;
-  uintptr_t VmarBase;
-  uint64_t VmoSize;
-};
-
-} // namespace scudo
-
-#endif // SCUDO_FUCHSIA
-
-#endif // SCUDO_FUCHSIA_H_
diff --git a/Telegram/ThirdParty/scudo/fuzz/CMakeLists.txt b/Telegram/ThirdParty/scudo/fuzz/CMakeLists.txt
deleted file mode 100644
index d29c2f2fe..000000000
--- a/Telegram/ThirdParty/scudo/fuzz/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-if (LLVM_USE_SANITIZE_COVERAGE)
-  add_executable(get_error_info_fuzzer
-      get_error_info_fuzzer.cpp)
-  set_target_properties(
-      get_error_info_fuzzer PROPERTIES FOLDER "Fuzzers")
-  target_compile_options(
-      get_error_info_fuzzer PRIVATE -fsanitize=fuzzer)
-  set_target_properties(
-      get_error_info_fuzzer PROPERTIES LINK_FLAGS -fsanitize=fuzzer)
-  target_include_directories(
-      get_error_info_fuzzer PRIVATE .. ../include)
-endif()
diff --git a/Telegram/ThirdParty/scudo/fuzz/get_error_info_fuzzer.cpp b/Telegram/ThirdParty/scudo/fuzz/get_error_info_fuzzer.cpp
deleted file mode 100644
index 5b01ebe11..000000000
--- a/Telegram/ThirdParty/scudo/fuzz/get_error_info_fuzzer.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-//===-- get_error_info_fuzzer.cpp -----------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#define SCUDO_FUZZ
-#include "allocator_config.h"
-#include "combined.h"
-
-#include <fuzzer/FuzzedDataProvider.h>
-
-#include <string>
-#include <vector>
-
-extern "C" int LLVMFuzzerTestOneInput(uint8_t *Data, size_t Size) {
-  using AllocatorT = scudo::Allocator<scudo::AndroidConfig>;
-  FuzzedDataProvider FDP(Data, Size);
-
-  uintptr_t FaultAddr = FDP.ConsumeIntegral<uintptr_t>();
-  uintptr_t MemoryAddr = FDP.ConsumeIntegral<uintptr_t>();
-
-  std::string MemoryAndTags =
-      FDP.ConsumeRandomLengthString(FDP.remaining_bytes());
-  const char *Memory = MemoryAndTags.c_str();
-  // Assume 16-byte alignment.
-  size_t MemorySize = (MemoryAndTags.length() / 17) * 16;
-  const char *MemoryTags = Memory + MemorySize;
-
-  std::string StackDepotBytes =
-      FDP.ConsumeRandomLengthString(FDP.remaining_bytes());
-  std::vector<char> StackDepot(sizeof(scudo::StackDepot), 0);
-  for (size_t i = 0; i < StackDepotBytes.length() && i < StackDepot.size();
-       ++i) {
-    StackDepot[i] = StackDepotBytes[i];
-  }
-
-  std::string RegionInfoBytes =
-      FDP.ConsumeRandomLengthString(FDP.remaining_bytes());
-  std::vector<char> RegionInfo(AllocatorT::getRegionInfoArraySize(), 0);
-  for (size_t i = 0; i < RegionInfoBytes.length() && i < RegionInfo.size();
-       ++i) {
-    RegionInfo[i] = RegionInfoBytes[i];
-  }
-
-  std::string RingBufferBytes = FDP.ConsumeRemainingBytesAsString();
-
-  scudo_error_info ErrorInfo;
-  AllocatorT::getErrorInfo(&ErrorInfo, FaultAddr, StackDepot.data(),
-                           RegionInfo.data(), RingBufferBytes.data(),
-                           RingBufferBytes.size(), Memory, MemoryTags,
-                           MemoryAddr, MemorySize);
-  return 0;
-}
diff --git a/Telegram/ThirdParty/scudo/include/scudo/interface.h b/Telegram/ThirdParty/scudo/include/scudo/interface.h
deleted file mode 100644
index a2dedea91..000000000
--- a/Telegram/ThirdParty/scudo/include/scudo/interface.h
+++ /dev/null
@@ -1,182 +0,0 @@
-//===-- scudo/interface.h ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_INTERFACE_H_
-#define SCUDO_INTERFACE_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-extern "C" {
-
-__attribute__((weak)) const char *__scudo_default_options(void);
-
-// Post-allocation & pre-deallocation hooks.
-__attribute__((weak)) void __scudo_allocate_hook(void *ptr, size_t size);
-__attribute__((weak)) void __scudo_deallocate_hook(void *ptr);
-
-// `realloc` involves both deallocation and allocation but they are not reported
-// atomically. In one specific case which may keep taking a snapshot right in
-// the middle of `realloc` reporting the deallocation and allocation, it may
-// confuse the user by missing memory from `realloc`. To alleviate that case,
-// define the two `realloc` hooks to get the knowledge of the bundled hook
-// calls. These hooks are optional and should only be used when a hooks user
-// wants to track reallocs more closely.
-//
-// See more details in the comment of `realloc` in wrapper_c.inc.
-__attribute__((weak)) void
-__scudo_realloc_allocate_hook(void *old_ptr, void *new_ptr, size_t size);
-__attribute__((weak)) void __scudo_realloc_deallocate_hook(void *old_ptr);
-
-void __scudo_print_stats(void);
-
-typedef void (*iterate_callback)(uintptr_t base, size_t size, void *arg);
-
-// Determine the likely cause of a tag check fault or other memory protection
-// error on a system with memory tagging support. The results are returned via
-// the error_info data structure. Up to three possible causes are returned in
-// the reports array, in decreasing order of probability. The remaining elements
-// of reports are zero-initialized.
-//
-// This function may be called from a different process from the one that
-// crashed. In this case, various data structures must be copied from the
-// crashing process to the process that analyzes the crash.
-//
-// This interface is not guaranteed to be stable and may change at any time.
-// Furthermore, the version of scudo in the crashing process must be the same as
-// the version in the process that analyzes the crash.
-//
-// fault_addr is the fault address. On aarch64 this is available in the system
-// register FAR_ELx, or siginfo.si_addr in Linux 5.11 or above. This address
-// must include the pointer tag; this is available if SA_EXPOSE_TAGBITS was set
-// in sigaction.sa_flags when the signal handler was registered. Note that the
-// kernel strips the tag from the field sigcontext.fault_address, so this
-// address is not suitable to be passed as fault_addr.
-//
-// stack_depot is a pointer to the stack depot data structure, which may be
-// obtained by calling the function __scudo_get_stack_depot_addr() in the
-// crashing process. The size of the stack depot is available by calling the
-// function __scudo_get_stack_depot_size().
-//
-// region_info is a pointer to the region info data structure, which may be
-// obtained by calling the function __scudo_get_region_info_addr() in the
-// crashing process. The size of the region info is available by calling the
-// function __scudo_get_region_info_size().
-//
-// memory is a pointer to a region of memory surrounding the fault address.
-// The more memory available via this pointer, the more likely it is that the
-// function will be able to analyze a crash correctly. It is recommended to
-// provide an amount of memory equal to 16 * the primary allocator's largest
-// size class either side of the fault address.
-//
-// memory_tags is a pointer to an array of memory tags for the memory accessed
-// via memory. Each byte of this array corresponds to a region of memory of size
-// equal to the architecturally defined memory tag granule size (16 on aarch64).
-//
-// memory_addr is the start address of memory in the crashing process's address
-// space.
-//
-// memory_size is the size of the memory region referred to by the memory
-// pointer.
-void __scudo_get_error_info(struct scudo_error_info *error_info,
-                            uintptr_t fault_addr, const char *stack_depot,
-                            size_t stack_depot_size, const char *region_info,
-                            const char *ring_buffer, size_t ring_buffer_size,
-                            const char *memory, const char *memory_tags,
-                            uintptr_t memory_addr, size_t memory_size);
-
-enum scudo_error_type {
-  UNKNOWN,
-  USE_AFTER_FREE,
-  BUFFER_OVERFLOW,
-  BUFFER_UNDERFLOW,
-};
-
-struct scudo_error_report {
-  enum scudo_error_type error_type;
-
-  uintptr_t allocation_address;
-  uintptr_t allocation_size;
-
-  uint32_t allocation_tid;
-  uintptr_t allocation_trace[64];
-
-  uint32_t deallocation_tid;
-  uintptr_t deallocation_trace[64];
-};
-
-struct scudo_error_info {
-  struct scudo_error_report reports[3];
-};
-
-const char *__scudo_get_stack_depot_addr(void);
-size_t __scudo_get_stack_depot_size(void);
-
-const char *__scudo_get_region_info_addr(void);
-size_t __scudo_get_region_info_size(void);
-
-const char *__scudo_get_ring_buffer_addr(void);
-size_t __scudo_get_ring_buffer_size(void);
-
-#ifndef M_DECAY_TIME
-#define M_DECAY_TIME -100
-#endif
-
-#ifndef M_PURGE
-#define M_PURGE -101
-#endif
-
-#ifndef M_PURGE_ALL
-#define M_PURGE_ALL -104
-#endif
-
-// Tune the allocator's choice of memory tags to make it more likely that
-// a certain class of memory errors will be detected. The value argument should
-// be one of the M_MEMTAG_TUNING_* constants below.
-#ifndef M_MEMTAG_TUNING
-#define M_MEMTAG_TUNING -102
-#endif
-
-// Per-thread memory initialization tuning. The value argument should be one of:
-// 1: Disable automatic heap initialization and, where possible, memory tagging,
-//    on this thread.
-// 0: Normal behavior.
-#ifndef M_THREAD_DISABLE_MEM_INIT
-#define M_THREAD_DISABLE_MEM_INIT -103
-#endif
-
-#ifndef M_CACHE_COUNT_MAX
-#define M_CACHE_COUNT_MAX -200
-#endif
-
-#ifndef M_CACHE_SIZE_MAX
-#define M_CACHE_SIZE_MAX -201
-#endif
-
-#ifndef M_TSDS_COUNT_MAX
-#define M_TSDS_COUNT_MAX -202
-#endif
-
-// Tune for buffer overflows.
-#ifndef M_MEMTAG_TUNING_BUFFER_OVERFLOW
-#define M_MEMTAG_TUNING_BUFFER_OVERFLOW 0
-#endif
-
-// Tune for use-after-free.
-#ifndef M_MEMTAG_TUNING_UAF
-#define M_MEMTAG_TUNING_UAF 1
-#endif
-
-// Print internal stats to the log.
-#ifndef M_LOG_STATS
-#define M_LOG_STATS -205
-#endif
-
-} // extern "C"
-
-#endif // SCUDO_INTERFACE_H_
diff --git a/Telegram/ThirdParty/scudo/internal_defs.h b/Telegram/ThirdParty/scudo/internal_defs.h
deleted file mode 100644
index 27c6b451f..000000000
--- a/Telegram/ThirdParty/scudo/internal_defs.h
+++ /dev/null
@@ -1,166 +0,0 @@
-//===-- internal_defs.h -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_INTERNAL_DEFS_H_
-#define SCUDO_INTERNAL_DEFS_H_
-
-#include "platform.h"
-
-#include <stdint.h>
-
-#ifndef SCUDO_DEBUG
-#define SCUDO_DEBUG 0
-#endif
-
-#define ARRAY_SIZE(A) (sizeof(A) / sizeof((A)[0]))
-
-// String related macros.
-
-#define STRINGIFY_(S) #S
-#define STRINGIFY(S) STRINGIFY_(S)
-#define CONCATENATE_(S, C) S##C
-#define CONCATENATE(S, C) CONCATENATE_(S, C)
-
-// Attributes & builtins related macros.
-
-#define INTERFACE __attribute__((visibility("default")))
-#define HIDDEN __attribute__((visibility("hidden")))
-#define WEAK __attribute__((weak))
-#define ALWAYS_INLINE inline __attribute__((always_inline))
-#define ALIAS(X) __attribute__((alias(X)))
-#define FORMAT(F, A) __attribute__((format(printf, F, A)))
-#define NOINLINE __attribute__((noinline))
-#define NORETURN __attribute__((noreturn))
-#define LIKELY(X) __builtin_expect(!!(X), 1)
-#define UNLIKELY(X) __builtin_expect(!!(X), 0)
-#if defined(__i386__) || defined(__x86_64__)
-// __builtin_prefetch(X) generates prefetchnt0 on x86
-#define PREFETCH(X) __asm__("prefetchnta (%0)" : : "r"(X))
-#else
-#define PREFETCH(X) __builtin_prefetch(X)
-#endif
-#define UNUSED __attribute__((unused))
-#define USED __attribute__((used))
-#define NOEXCEPT noexcept
-
-// This check is only available on Clang. This is essentially an alias of
-// C++20's 'constinit' specifier which will take care of this when (if?) we can
-// ask all libc's that use Scudo to compile us with C++20. Dynamic
-// initialization is bad; Scudo is designed to be lazy-initializated on the
-// first call to malloc/free (and friends), and this generally happens in the
-// loader somewhere in libdl's init. After the loader is done, control is
-// transferred to libc's initialization, and the dynamic initializers are run.
-// If there's a dynamic initializer for Scudo, then it will clobber the
-// already-initialized Scudo, and re-initialize all its members back to default
-// values, causing various explosions. Unfortunately, marking
-// scudo::Allocator<>'s constructor as 'constexpr' isn't sufficient to prevent
-// dynamic initialization, as default initialization is fine under 'constexpr'
-// (but not 'constinit'). Clang at -O0, and gcc at all opt levels will emit a
-// dynamic initializer for any constant-initialized variables if there is a mix
-// of default-initialized and constant-initialized variables.
-//
-// If you're looking at this because your build failed, you probably introduced
-// a new member to scudo::Allocator<> (possibly transiently) that didn't have an
-// initializer. The fix is easy - just add one.
-#if defined(__has_attribute)
-#if __has_attribute(require_constant_initialization)
-#define SCUDO_REQUIRE_CONSTANT_INITIALIZATION                                  \
-  __attribute__((__require_constant_initialization__))
-#else
-#define SCUDO_REQUIRE_CONSTANT_INITIALIZATION
-#endif
-#endif
-
-namespace scudo {
-
-typedef uintptr_t uptr;
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-typedef intptr_t sptr;
-typedef int8_t s8;
-typedef int16_t s16;
-typedef int32_t s32;
-typedef int64_t s64;
-
-// The following two functions have platform specific implementations.
-void outputRaw(const char *Buffer);
-void NORETURN die();
-
-#define RAW_CHECK_MSG(Expr, Msg)                                               \
-  do {                                                                         \
-    if (UNLIKELY(!(Expr))) {                                                   \
-      outputRaw(Msg);                                                          \
-      die();                                                                   \
-    }                                                                          \
-  } while (false)
-
-#define RAW_CHECK(Expr) RAW_CHECK_MSG(Expr, #Expr)
-
-void NORETURN reportCheckFailed(const char *File, int Line,
-                                const char *Condition, u64 Value1, u64 Value2);
-#define CHECK_IMPL(C1, Op, C2)                                                 \
-  do {                                                                         \
-    if (UNLIKELY(!(C1 Op C2))) {                                               \
-      scudo::reportCheckFailed(__FILE__, __LINE__, #C1 " " #Op " " #C2,        \
-                               (scudo::u64)C1, (scudo::u64)C2);                \
-      scudo::die();                                                            \
-    }                                                                          \
-  } while (false)
-
-#define CHECK(A) CHECK_IMPL((A), !=, 0)
-#define CHECK_EQ(A, B) CHECK_IMPL((A), ==, (B))
-#define CHECK_NE(A, B) CHECK_IMPL((A), !=, (B))
-#define CHECK_LT(A, B) CHECK_IMPL((A), <, (B))
-#define CHECK_LE(A, B) CHECK_IMPL((A), <=, (B))
-#define CHECK_GT(A, B) CHECK_IMPL((A), >, (B))
-#define CHECK_GE(A, B) CHECK_IMPL((A), >=, (B))
-
-#if SCUDO_DEBUG
-#define DCHECK(A) CHECK(A)
-#define DCHECK_EQ(A, B) CHECK_EQ(A, B)
-#define DCHECK_NE(A, B) CHECK_NE(A, B)
-#define DCHECK_LT(A, B) CHECK_LT(A, B)
-#define DCHECK_LE(A, B) CHECK_LE(A, B)
-#define DCHECK_GT(A, B) CHECK_GT(A, B)
-#define DCHECK_GE(A, B) CHECK_GE(A, B)
-#else
-#define DCHECK(A)                                                              \
-  do {                                                                         \
-  } while (false && (A))
-#define DCHECK_EQ(A, B)                                                        \
-  do {                                                                         \
-  } while (false && (A) == (B))
-#define DCHECK_NE(A, B)                                                        \
-  do {                                                                         \
-  } while (false && (A) != (B))
-#define DCHECK_LT(A, B)                                                        \
-  do {                                                                         \
-  } while (false && (A) < (B))
-#define DCHECK_LE(A, B)                                                        \
-  do {                                                                         \
-  } while (false && (A) <= (B))
-#define DCHECK_GT(A, B)                                                        \
-  do {                                                                         \
-  } while (false && (A) > (B))
-#define DCHECK_GE(A, B)                                                        \
-  do {                                                                         \
-  } while (false && (A) >= (B))
-#endif
-
-// The superfluous die() call effectively makes this macro NORETURN.
-#define UNREACHABLE(Msg)                                                       \
-  do {                                                                         \
-    CHECK(0 && Msg);                                                           \
-    die();                                                                     \
-  } while (0)
-
-} // namespace scudo
-
-#endif // SCUDO_INTERNAL_DEFS_H_
diff --git a/Telegram/ThirdParty/scudo/linux.cpp b/Telegram/ThirdParty/scudo/linux.cpp
deleted file mode 100644
index 274695108..000000000
--- a/Telegram/ThirdParty/scudo/linux.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-//===-- linux.cpp -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-#if SCUDO_LINUX
-
-#include "common.h"
-#include "internal_defs.h"
-#include "linux.h"
-#include "mutex.h"
-#include "report_linux.h"
-#include "string_utils.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <linux/futex.h>
-#include <sched.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-
-#if SCUDO_ANDROID
-#include <sys/prctl.h>
-// Definitions of prctl arguments to set a vma name in Android kernels.
-#define ANDROID_PR_SET_VMA 0x53564d41
-#define ANDROID_PR_SET_VMA_ANON_NAME 0
-#endif
-
-namespace scudo {
-
-uptr getPageSize() { return static_cast<uptr>(sysconf(_SC_PAGESIZE)); }
-
-void NORETURN die() { abort(); }
-
-// TODO: Will be deprecated. Use the interfaces in MemMapLinux instead.
-void *map(void *Addr, uptr Size, UNUSED const char *Name, uptr Flags,
-          UNUSED MapPlatformData *Data) {
-  int MmapFlags = MAP_PRIVATE | MAP_ANONYMOUS;
-  int MmapProt;
-  if (Flags & MAP_NOACCESS) {
-    MmapFlags |= MAP_NORESERVE;
-    MmapProt = PROT_NONE;
-  } else {
-    MmapProt = PROT_READ | PROT_WRITE;
-  }
-#if defined(__aarch64__)
-#ifndef PROT_MTE
-#define PROT_MTE 0x20
-#endif
-  if (Flags & MAP_MEMTAG)
-    MmapProt |= PROT_MTE;
-#endif
-  if (Addr)
-    MmapFlags |= MAP_FIXED;
-  void *P = mmap(Addr, Size, MmapProt, MmapFlags, -1, 0);
-  if (P == MAP_FAILED) {
-    if (!(Flags & MAP_ALLOWNOMEM) || errno != ENOMEM)
-      reportMapError(errno == ENOMEM ? Size : 0);
-    return nullptr;
-  }
-#if SCUDO_ANDROID
-  if (Name)
-    prctl(ANDROID_PR_SET_VMA, ANDROID_PR_SET_VMA_ANON_NAME, P, Size, Name);
-#endif
-  return P;
-}
-
-// TODO: Will be deprecated. Use the interfaces in MemMapLinux instead.
-void unmap(void *Addr, uptr Size, UNUSED uptr Flags,
-           UNUSED MapPlatformData *Data) {
-  if (munmap(Addr, Size) != 0)
-    reportUnmapError(reinterpret_cast<uptr>(Addr), Size);
-}
-
-// TODO: Will be deprecated. Use the interfaces in MemMapLinux instead.
-void setMemoryPermission(uptr Addr, uptr Size, uptr Flags,
-                         UNUSED MapPlatformData *Data) {
-  int Prot = (Flags & MAP_NOACCESS) ? PROT_NONE : (PROT_READ | PROT_WRITE);
-  if (mprotect(reinterpret_cast<void *>(Addr), Size, Prot) != 0)
-    reportProtectError(Addr, Size, Prot);
-}
-
-// TODO: Will be deprecated. Use the interfaces in MemMapLinux instead.
-void releasePagesToOS(uptr BaseAddress, uptr Offset, uptr Size,
-                      UNUSED MapPlatformData *Data) {
-  void *Addr = reinterpret_cast<void *>(BaseAddress + Offset);
-
-  while (madvise(Addr, Size, MADV_DONTNEED) == -1 && errno == EAGAIN) {
-  }
-}
-
-// Calling getenv should be fine (c)(tm) at any time.
-const char *getEnv(const char *Name) { return getenv(Name); }
-
-namespace {
-enum State : u32 { Unlocked = 0, Locked = 1, Sleeping = 2 };
-}
-
-bool HybridMutex::tryLock() {
-  return atomic_compare_exchange_strong(&M, Unlocked, Locked,
-                                        memory_order_acquire) == Unlocked;
-}
-
-// The following is based on https://akkadia.org/drepper/futex.pdf.
-void HybridMutex::lockSlow() {
-  u32 V = atomic_compare_exchange_strong(&M, Unlocked, Locked,
-                                         memory_order_acquire);
-  if (V == Unlocked)
-    return;
-  if (V != Sleeping)
-    V = atomic_exchange(&M, Sleeping, memory_order_acquire);
-  while (V != Unlocked) {
-    syscall(SYS_futex, reinterpret_cast<uptr>(&M), FUTEX_WAIT_PRIVATE, Sleeping,
-            nullptr, nullptr, 0);
-    V = atomic_exchange(&M, Sleeping, memory_order_acquire);
-  }
-}
-
-void HybridMutex::unlock() {
-  if (atomic_fetch_sub(&M, 1U, memory_order_release) != Locked) {
-    atomic_store(&M, Unlocked, memory_order_release);
-    syscall(SYS_futex, reinterpret_cast<uptr>(&M), FUTEX_WAKE_PRIVATE, 1,
-            nullptr, nullptr, 0);
-  }
-}
-
-void HybridMutex::assertHeldImpl() {
-  CHECK(atomic_load(&M, memory_order_acquire) != Unlocked);
-}
-
-u64 getMonotonicTime() {
-  timespec TS;
-  clock_gettime(CLOCK_MONOTONIC, &TS);
-  return static_cast<u64>(TS.tv_sec) * (1000ULL * 1000 * 1000) +
-         static_cast<u64>(TS.tv_nsec);
-}
-
-u64 getMonotonicTimeFast() {
-#if defined(CLOCK_MONOTONIC_COARSE)
-  timespec TS;
-  clock_gettime(CLOCK_MONOTONIC_COARSE, &TS);
-  return static_cast<u64>(TS.tv_sec) * (1000ULL * 1000 * 1000) +
-         static_cast<u64>(TS.tv_nsec);
-#else
-  return getMonotonicTime();
-#endif
-}
-
-u32 getNumberOfCPUs() {
-  cpu_set_t CPUs;
-  // sched_getaffinity can fail for a variety of legitimate reasons (lack of
-  // CAP_SYS_NICE, syscall filtering, etc), in which case we shall return 0.
-  if (sched_getaffinity(0, sizeof(cpu_set_t), &CPUs) != 0)
-    return 0;
-  return static_cast<u32>(CPU_COUNT(&CPUs));
-}
-
-u32 getThreadID() {
-#if SCUDO_ANDROID
-  return static_cast<u32>(gettid());
-#else
-  return static_cast<u32>(syscall(SYS_gettid));
-#endif
-}
-
-// Blocking is possibly unused if the getrandom block is not compiled in.
-bool getRandom(void *Buffer, uptr Length, UNUSED bool Blocking) {
-  if (!Buffer || !Length || Length > MaxRandomLength)
-    return false;
-  ssize_t ReadBytes;
-#if defined(SYS_getrandom)
-#if !defined(GRND_NONBLOCK)
-#define GRND_NONBLOCK 1
-#endif
-  // Up to 256 bytes, getrandom will not be interrupted.
-  ReadBytes =
-      syscall(SYS_getrandom, Buffer, Length, Blocking ? 0 : GRND_NONBLOCK);
-  if (ReadBytes == static_cast<ssize_t>(Length))
-    return true;
-#endif // defined(SYS_getrandom)
-  // Up to 256 bytes, a read off /dev/urandom will not be interrupted.
-  // Blocking is moot here, O_NONBLOCK has no effect when opening /dev/urandom.
-  const int FileDesc = open("/dev/urandom", O_RDONLY);
-  if (FileDesc == -1)
-    return false;
-  ReadBytes = read(FileDesc, Buffer, Length);
-  close(FileDesc);
-  return (ReadBytes == static_cast<ssize_t>(Length));
-}
-
-// Allocation free syslog-like API.
-extern "C" WEAK int async_safe_write_log(int pri, const char *tag,
-                                         const char *msg);
-
-void outputRaw(const char *Buffer) {
-  if (&async_safe_write_log) {
-    constexpr s32 AndroidLogInfo = 4;
-    constexpr uptr MaxLength = 1024U;
-    char LocalBuffer[MaxLength];
-    while (strlen(Buffer) > MaxLength) {
-      uptr P;
-      for (P = MaxLength - 1; P > 0; P--) {
-        if (Buffer[P] == '\n') {
-          memcpy(LocalBuffer, Buffer, P);
-          LocalBuffer[P] = '\0';
-          async_safe_write_log(AndroidLogInfo, "scudo", LocalBuffer);
-          Buffer = &Buffer[P + 1];
-          break;
-        }
-      }
-      // If no newline was found, just log the buffer.
-      if (P == 0)
-        break;
-    }
-    async_safe_write_log(AndroidLogInfo, "scudo", Buffer);
-  } else {
-    (void)write(2, Buffer, strlen(Buffer));
-  }
-}
-
-extern "C" WEAK void android_set_abort_message(const char *);
-
-void setAbortMessage(const char *Message) {
-  if (&android_set_abort_message)
-    android_set_abort_message(Message);
-}
-
-} // namespace scudo
-
-#endif // SCUDO_LINUX
diff --git a/Telegram/ThirdParty/scudo/linux.h b/Telegram/ThirdParty/scudo/linux.h
deleted file mode 100644
index 72acb6da8..000000000
--- a/Telegram/ThirdParty/scudo/linux.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//===-- linux.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_LINUX_H_
-#define SCUDO_LINUX_H_
-
-#include "platform.h"
-
-#if SCUDO_LINUX
-
-namespace scudo {
-
-// MapPlatformData is unused on Linux, define it as a minimally sized structure.
-struct MapPlatformData {};
-
-} // namespace scudo
-
-#endif // SCUDO_LINUX
-
-#endif // SCUDO_LINUX_H_
diff --git a/Telegram/ThirdParty/scudo/list.h b/Telegram/ThirdParty/scudo/list.h
deleted file mode 100644
index 0137667d1..000000000
--- a/Telegram/ThirdParty/scudo/list.h
+++ /dev/null
@@ -1,240 +0,0 @@
-//===-- list.h --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_LIST_H_
-#define SCUDO_LIST_H_
-
-#include "internal_defs.h"
-
-namespace scudo {
-
-// Intrusive POD singly and doubly linked list.
-// An object with all zero fields should represent a valid empty list. clear()
-// should be called on all non-zero-initialized objects before using.
-
-template <class T> class IteratorBase {
-public:
-  explicit IteratorBase(T *CurrentT) : Current(CurrentT) {}
-  IteratorBase &operator++() {
-    Current = Current->Next;
-    return *this;
-  }
-  bool operator!=(IteratorBase Other) const { return Current != Other.Current; }
-  T &operator*() { return *Current; }
-
-private:
-  T *Current;
-};
-
-template <class T> struct IntrusiveList {
-  bool empty() const { return Size == 0; }
-  uptr size() const { return Size; }
-
-  T *front() { return First; }
-  const T *front() const { return First; }
-  T *back() { return Last; }
-  const T *back() const { return Last; }
-
-  void clear() {
-    First = Last = nullptr;
-    Size = 0;
-  }
-
-  typedef IteratorBase<T> Iterator;
-  typedef IteratorBase<const T> ConstIterator;
-
-  Iterator begin() { return Iterator(First); }
-  Iterator end() { return Iterator(nullptr); }
-
-  ConstIterator begin() const { return ConstIterator(First); }
-  ConstIterator end() const { return ConstIterator(nullptr); }
-
-  void checkConsistency() const;
-
-protected:
-  uptr Size = 0;
-  T *First = nullptr;
-  T *Last = nullptr;
-};
-
-template <class T> void IntrusiveList<T>::checkConsistency() const {
-  if (Size == 0) {
-    CHECK_EQ(First, nullptr);
-    CHECK_EQ(Last, nullptr);
-  } else {
-    uptr Count = 0;
-    for (T *I = First;; I = I->Next) {
-      Count++;
-      if (I == Last)
-        break;
-    }
-    CHECK_EQ(this->size(), Count);
-    CHECK_EQ(Last->Next, nullptr);
-  }
-}
-
-template <class T> struct SinglyLinkedList : public IntrusiveList<T> {
-  using IntrusiveList<T>::First;
-  using IntrusiveList<T>::Last;
-  using IntrusiveList<T>::Size;
-  using IntrusiveList<T>::empty;
-
-  void push_back(T *X) {
-    X->Next = nullptr;
-    if (empty())
-      First = X;
-    else
-      Last->Next = X;
-    Last = X;
-    Size++;
-  }
-
-  void push_front(T *X) {
-    if (empty())
-      Last = X;
-    X->Next = First;
-    First = X;
-    Size++;
-  }
-
-  void pop_front() {
-    DCHECK(!empty());
-    First = First->Next;
-    if (!First)
-      Last = nullptr;
-    Size--;
-  }
-
-  // Insert X next to Prev
-  void insert(T *Prev, T *X) {
-    DCHECK(!empty());
-    DCHECK_NE(Prev, nullptr);
-    DCHECK_NE(X, nullptr);
-    X->Next = Prev->Next;
-    Prev->Next = X;
-    if (Last == Prev)
-      Last = X;
-    ++Size;
-  }
-
-  void extract(T *Prev, T *X) {
-    DCHECK(!empty());
-    DCHECK_NE(Prev, nullptr);
-    DCHECK_NE(X, nullptr);
-    DCHECK_EQ(Prev->Next, X);
-    Prev->Next = X->Next;
-    if (Last == X)
-      Last = Prev;
-    Size--;
-  }
-
-  void append_back(SinglyLinkedList<T> *L) {
-    DCHECK_NE(this, L);
-    if (L->empty())
-      return;
-    if (empty()) {
-      *this = *L;
-    } else {
-      Last->Next = L->First;
-      Last = L->Last;
-      Size += L->size();
-    }
-    L->clear();
-  }
-};
-
-template <class T> struct DoublyLinkedList : IntrusiveList<T> {
-  using IntrusiveList<T>::First;
-  using IntrusiveList<T>::Last;
-  using IntrusiveList<T>::Size;
-  using IntrusiveList<T>::empty;
-
-  void push_front(T *X) {
-    X->Prev = nullptr;
-    if (empty()) {
-      Last = X;
-    } else {
-      DCHECK_EQ(First->Prev, nullptr);
-      First->Prev = X;
-    }
-    X->Next = First;
-    First = X;
-    Size++;
-  }
-
-  // Inserts X before Y.
-  void insert(T *X, T *Y) {
-    if (Y == First)
-      return push_front(X);
-    T *Prev = Y->Prev;
-    // This is a hard CHECK to ensure consistency in the event of an intentional
-    // corruption of Y->Prev, to prevent a potential write-{4,8}.
-    CHECK_EQ(Prev->Next, Y);
-    Prev->Next = X;
-    X->Prev = Prev;
-    X->Next = Y;
-    Y->Prev = X;
-    Size++;
-  }
-
-  void push_back(T *X) {
-    X->Next = nullptr;
-    if (empty()) {
-      First = X;
-    } else {
-      DCHECK_EQ(Last->Next, nullptr);
-      Last->Next = X;
-    }
-    X->Prev = Last;
-    Last = X;
-    Size++;
-  }
-
-  void pop_front() {
-    DCHECK(!empty());
-    First = First->Next;
-    if (!First)
-      Last = nullptr;
-    else
-      First->Prev = nullptr;
-    Size--;
-  }
-
-  // The consistency of the adjacent links is aggressively checked in order to
-  // catch potential corruption attempts, that could yield a mirrored
-  // write-{4,8} primitive. nullptr checks are deemed less vital.
-  void remove(T *X) {
-    T *Prev = X->Prev;
-    T *Next = X->Next;
-    if (Prev) {
-      CHECK_EQ(Prev->Next, X);
-      Prev->Next = Next;
-    }
-    if (Next) {
-      CHECK_EQ(Next->Prev, X);
-      Next->Prev = Prev;
-    }
-    if (First == X) {
-      DCHECK_EQ(Prev, nullptr);
-      First = Next;
-    } else {
-      DCHECK_NE(Prev, nullptr);
-    }
-    if (Last == X) {
-      DCHECK_EQ(Next, nullptr);
-      Last = Prev;
-    } else {
-      DCHECK_NE(Next, nullptr);
-    }
-    Size--;
-  }
-};
-
-} // namespace scudo
-
-#endif // SCUDO_LIST_H_
diff --git a/Telegram/ThirdParty/scudo/local_cache.h b/Telegram/ThirdParty/scudo/local_cache.h
deleted file mode 100644
index 46d6affdc..000000000
--- a/Telegram/ThirdParty/scudo/local_cache.h
+++ /dev/null
@@ -1,189 +0,0 @@
-//===-- local_cache.h -------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_LOCAL_CACHE_H_
-#define SCUDO_LOCAL_CACHE_H_
-
-#include "internal_defs.h"
-#include "list.h"
-#include "platform.h"
-#include "report.h"
-#include "stats.h"
-#include "string_utils.h"
-
-namespace scudo {
-
-template <class SizeClassAllocator> struct SizeClassAllocatorLocalCache {
-  typedef typename SizeClassAllocator::SizeClassMap SizeClassMap;
-  typedef typename SizeClassAllocator::CompactPtrT CompactPtrT;
-
-  void init(GlobalStats *S, SizeClassAllocator *A) {
-    DCHECK(isEmpty());
-    Stats.init();
-    if (LIKELY(S))
-      S->link(&Stats);
-    Allocator = A;
-    initCache();
-  }
-
-  void destroy(GlobalStats *S) {
-    drain();
-    if (LIKELY(S))
-      S->unlink(&Stats);
-  }
-
-  void *allocate(uptr ClassId) {
-    DCHECK_LT(ClassId, NumClasses);
-    PerClass *C = &PerClassArray[ClassId];
-    if (C->Count == 0) {
-      // Refill half of the number of max cached.
-      DCHECK_GT(C->MaxCount / 2, 0U);
-      if (UNLIKELY(!refill(C, ClassId, C->MaxCount / 2)))
-        return nullptr;
-      DCHECK_GT(C->Count, 0);
-    }
-    // We read ClassSize first before accessing Chunks because it's adjacent to
-    // Count, while Chunks might be further off (depending on Count). That keeps
-    // the memory accesses in close quarters.
-    const uptr ClassSize = C->ClassSize;
-    CompactPtrT CompactP = C->Chunks[--C->Count];
-    Stats.add(StatAllocated, ClassSize);
-    Stats.sub(StatFree, ClassSize);
-    return Allocator->decompactPtr(ClassId, CompactP);
-  }
-
-  bool deallocate(uptr ClassId, void *P) {
-    CHECK_LT(ClassId, NumClasses);
-    PerClass *C = &PerClassArray[ClassId];
-
-    // If the cache is full, drain half of blocks back to the main allocator.
-    const bool NeedToDrainCache = C->Count == C->MaxCount;
-    if (NeedToDrainCache)
-      drain(C, ClassId);
-    // See comment in allocate() about memory accesses.
-    const uptr ClassSize = C->ClassSize;
-    C->Chunks[C->Count++] =
-        Allocator->compactPtr(ClassId, reinterpret_cast<uptr>(P));
-    Stats.sub(StatAllocated, ClassSize);
-    Stats.add(StatFree, ClassSize);
-
-    return NeedToDrainCache;
-  }
-
-  bool isEmpty() const {
-    for (uptr I = 0; I < NumClasses; ++I)
-      if (PerClassArray[I].Count)
-        return false;
-    return true;
-  }
-
-  void drain() {
-    // Drain BatchClassId last as it may be needed while draining normal blocks.
-    for (uptr I = 0; I < NumClasses; ++I) {
-      if (I == BatchClassId)
-        continue;
-      while (PerClassArray[I].Count > 0)
-        drain(&PerClassArray[I], I);
-    }
-    while (PerClassArray[BatchClassId].Count > 0)
-      drain(&PerClassArray[BatchClassId], BatchClassId);
-    DCHECK(isEmpty());
-  }
-
-  void *getBatchClassBlock() {
-    void *B = allocate(BatchClassId);
-    if (UNLIKELY(!B))
-      reportOutOfMemory(SizeClassAllocator::getSizeByClassId(BatchClassId));
-    return B;
-  }
-
-  LocalStats &getStats() { return Stats; }
-
-  void getStats(ScopedString *Str) {
-    bool EmptyCache = true;
-    for (uptr I = 0; I < NumClasses; ++I) {
-      if (PerClassArray[I].Count == 0)
-        continue;
-
-      EmptyCache = false;
-      // The size of BatchClass is set to 0 intentionally. See the comment in
-      // initCache() for more details.
-      const uptr ClassSize = I == BatchClassId
-                                 ? SizeClassAllocator::getSizeByClassId(I)
-                                 : PerClassArray[I].ClassSize;
-      // Note that the string utils don't support printing u16 thus we cast it
-      // to a common use type uptr.
-      Str->append("    %02zu (%6zu): cached: %4zu max: %4zu\n", I, ClassSize,
-                  static_cast<uptr>(PerClassArray[I].Count),
-                  static_cast<uptr>(PerClassArray[I].MaxCount));
-    }
-
-    if (EmptyCache)
-      Str->append("    No block is cached.\n");
-  }
-
-  static u16 getMaxCached(uptr Size) {
-    return Min(SizeClassMap::MaxNumCachedHint,
-               SizeClassMap::getMaxCachedHint(Size));
-  }
-
-private:
-  static const uptr NumClasses = SizeClassMap::NumClasses;
-  static const uptr BatchClassId = SizeClassMap::BatchClassId;
-  struct alignas(SCUDO_CACHE_LINE_SIZE) PerClass {
-    u16 Count;
-    u16 MaxCount;
-    // Note: ClassSize is zero for the transfer batch.
-    uptr ClassSize;
-    CompactPtrT Chunks[2 * SizeClassMap::MaxNumCachedHint];
-  };
-  PerClass PerClassArray[NumClasses] = {};
-  LocalStats Stats;
-  SizeClassAllocator *Allocator = nullptr;
-
-  NOINLINE void initCache() {
-    for (uptr I = 0; I < NumClasses; I++) {
-      PerClass *P = &PerClassArray[I];
-      const uptr Size = SizeClassAllocator::getSizeByClassId(I);
-      P->MaxCount = static_cast<u16>(2 * getMaxCached(Size));
-      if (I != BatchClassId) {
-        P->ClassSize = Size;
-      } else {
-        // ClassSize in this struct is only used for malloc/free stats, which
-        // should only track user allocations, not internal movements.
-        P->ClassSize = 0;
-      }
-    }
-  }
-
-  void destroyBatch(uptr ClassId, void *B) {
-    if (ClassId != BatchClassId)
-      deallocate(BatchClassId, B);
-  }
-
-  NOINLINE bool refill(PerClass *C, uptr ClassId, u16 MaxRefill) {
-    const u16 NumBlocksRefilled =
-        Allocator->popBlocks(this, ClassId, C->Chunks, MaxRefill);
-    DCHECK_LE(NumBlocksRefilled, MaxRefill);
-    C->Count = static_cast<u16>(C->Count + NumBlocksRefilled);
-    return NumBlocksRefilled != 0;
-  }
-
-  NOINLINE void drain(PerClass *C, uptr ClassId) {
-    const u16 Count = Min(static_cast<u16>(C->MaxCount / 2), C->Count);
-    Allocator->pushBlocks(this, ClassId, &C->Chunks[0], Count);
-    // u16 will be promoted to int by arithmetic type conversion.
-    C->Count = static_cast<u16>(C->Count - Count);
-    for (u16 I = 0; I < C->Count; I++)
-      C->Chunks[I] = C->Chunks[I + Count];
-  }
-};
-
-} // namespace scudo
-
-#endif // SCUDO_LOCAL_CACHE_H_
diff --git a/Telegram/ThirdParty/scudo/mem_map.cpp b/Telegram/ThirdParty/scudo/mem_map.cpp
deleted file mode 100644
index 115cc34e7..000000000
--- a/Telegram/ThirdParty/scudo/mem_map.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//===-- mem_map.cpp ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "mem_map.h"
-
-#include "common.h"
-
-namespace scudo {
-
-bool MemMapDefault::mapImpl(uptr Addr, uptr Size, const char *Name,
-                            uptr Flags) {
-  void *MappedAddr =
-      ::scudo::map(reinterpret_cast<void *>(Addr), Size, Name, Flags, &Data);
-  if (MappedAddr == nullptr)
-    return false;
-  Base = reinterpret_cast<uptr>(MappedAddr);
-  MappedBase = Base;
-  Capacity = Size;
-  return true;
-}
-
-void MemMapDefault::unmapImpl(uptr Addr, uptr Size) {
-  if (Size == Capacity) {
-    Base = MappedBase = Capacity = 0;
-  } else {
-    if (Base == Addr) {
-      Base = Addr + Size;
-      MappedBase = MappedBase == 0 ? Base : Max(MappedBase, Base);
-    }
-    Capacity -= Size;
-  }
-
-  ::scudo::unmap(reinterpret_cast<void *>(Addr), Size, UNMAP_ALL, &Data);
-}
-
-bool MemMapDefault::remapImpl(uptr Addr, uptr Size, const char *Name,
-                              uptr Flags) {
-  void *RemappedPtr =
-      ::scudo::map(reinterpret_cast<void *>(Addr), Size, Name, Flags, &Data);
-  const uptr RemappedAddr = reinterpret_cast<uptr>(RemappedPtr);
-  MappedBase = MappedBase == 0 ? RemappedAddr : Min(MappedBase, RemappedAddr);
-  return RemappedAddr == Addr;
-}
-
-void MemMapDefault::releaseAndZeroPagesToOSImpl(uptr From, uptr Size) {
-  DCHECK_NE(MappedBase, 0U);
-  DCHECK_GE(From, MappedBase);
-  return ::scudo::releasePagesToOS(MappedBase, From - MappedBase, Size, &Data);
-}
-
-void MemMapDefault::setMemoryPermissionImpl(uptr Addr, uptr Size, uptr Flags) {
-  return ::scudo::setMemoryPermission(Addr, Size, Flags);
-}
-
-void ReservedMemoryDefault::releaseImpl() {
-  ::scudo::unmap(reinterpret_cast<void *>(Base), Capacity, UNMAP_ALL, &Data);
-}
-
-bool ReservedMemoryDefault::createImpl(uptr Addr, uptr Size, const char *Name,
-                                       uptr Flags) {
-  void *Reserved = ::scudo::map(reinterpret_cast<void *>(Addr), Size, Name,
-                                Flags | MAP_NOACCESS, &Data);
-  if (Reserved == nullptr)
-    return false;
-
-  Base = reinterpret_cast<uptr>(Reserved);
-  Capacity = Size;
-
-  return true;
-}
-
-ReservedMemoryDefault::MemMapT ReservedMemoryDefault::dispatchImpl(uptr Addr,
-                                                                   uptr Size) {
-  ReservedMemoryDefault::MemMapT NewMap(Addr, Size);
-  NewMap.setMapPlatformData(Data);
-  return NewMap;
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/mem_map.h b/Telegram/ThirdParty/scudo/mem_map.h
deleted file mode 100644
index b92216cf2..000000000
--- a/Telegram/ThirdParty/scudo/mem_map.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//===-- mem_map.h -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_MEM_MAP_H_
-#define SCUDO_MEM_MAP_H_
-
-#include "mem_map_base.h"
-
-#include "common.h"
-#include "internal_defs.h"
-
-// TODO: This is only used for `MapPlatformData`. Remove these includes when we
-// have all three platform specific `MemMap` and `ReservedMemory`
-// implementations.
-#include "fuchsia.h"
-#include "linux.h"
-#include "trusty.h"
-
-#include "mem_map_fuchsia.h"
-#include "mem_map_linux.h"
-
-namespace scudo {
-
-// This will be deprecated when every allocator has been supported by each
-// platform's `MemMap` implementation.
-class MemMapDefault final : public MemMapBase<MemMapDefault> {
-public:
-  constexpr MemMapDefault() = default;
-  MemMapDefault(uptr Base, uptr Capacity) : Base(Base), Capacity(Capacity) {}
-
-  // Impls for base functions.
-  bool mapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags);
-  void unmapImpl(uptr Addr, uptr Size);
-  bool remapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags);
-  void setMemoryPermissionImpl(uptr Addr, uptr Size, uptr Flags);
-  void releasePagesToOSImpl(uptr From, uptr Size) {
-    return releaseAndZeroPagesToOSImpl(From, Size);
-  }
-  void releaseAndZeroPagesToOSImpl(uptr From, uptr Size);
-  uptr getBaseImpl() { return Base; }
-  uptr getCapacityImpl() { return Capacity; }
-
-  void setMapPlatformData(MapPlatformData &NewData) { Data = NewData; }
-
-private:
-  uptr Base = 0;
-  uptr Capacity = 0;
-  uptr MappedBase = 0;
-  MapPlatformData Data = {};
-};
-
-// This will be deprecated when every allocator has been supported by each
-// platform's `MemMap` implementation.
-class ReservedMemoryDefault final
-    : public ReservedMemory<ReservedMemoryDefault, MemMapDefault> {
-public:
-  constexpr ReservedMemoryDefault() = default;
-
-  bool createImpl(uptr Addr, uptr Size, const char *Name, uptr Flags);
-  void releaseImpl();
-  MemMapT dispatchImpl(uptr Addr, uptr Size);
-  uptr getBaseImpl() { return Base; }
-  uptr getCapacityImpl() { return Capacity; }
-
-private:
-  uptr Base = 0;
-  uptr Capacity = 0;
-  MapPlatformData Data = {};
-};
-
-#if SCUDO_LINUX
-using ReservedMemoryT = ReservedMemoryLinux;
-using MemMapT = ReservedMemoryT::MemMapT;
-#elif SCUDO_FUCHSIA
-using ReservedMemoryT = ReservedMemoryFuchsia;
-using MemMapT = ReservedMemoryT::MemMapT;
-#elif SCUDO_TRUSTY
-using ReservedMemoryT = ReservedMemoryDefault;
-using MemMapT = ReservedMemoryT::MemMapT;
-#else
-#error                                                                         \
-    "Unsupported platform, please implement the ReservedMemory for your platform!"
-#endif
-
-} // namespace scudo
-
-#endif // SCUDO_MEM_MAP_H_
diff --git a/Telegram/ThirdParty/scudo/mem_map_base.h b/Telegram/ThirdParty/scudo/mem_map_base.h
deleted file mode 100644
index 99ab0cba6..000000000
--- a/Telegram/ThirdParty/scudo/mem_map_base.h
+++ /dev/null
@@ -1,129 +0,0 @@
-//===-- mem_map_base.h ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_MEM_MAP_BASE_H_
-#define SCUDO_MEM_MAP_BASE_H_
-
-#include "common.h"
-
-namespace scudo {
-
-// In Scudo, every memory operation will be fulfilled through a
-// platform-specific `MemMap` instance. The essential APIs are listed in the
-// `MemMapBase` below. This is implemented in CRTP, so for each implementation,
-// it has to implement all of the 'Impl' named functions.
-template <class Derived> class MemMapBase {
-public:
-  constexpr MemMapBase() = default;
-
-  // This is used to map a new set of contiguous pages. Note that the `Addr` is
-  // only a suggestion to the system.
-  bool map(uptr Addr, uptr Size, const char *Name, uptr Flags = 0) {
-    DCHECK(!isAllocated());
-    return invokeImpl(&Derived::mapImpl, Addr, Size, Name, Flags);
-  }
-
-  // This is used to unmap partial/full pages from the beginning or the end.
-  // I.e., the result pages are expected to be still contiguous.
-  void unmap(uptr Addr, uptr Size) {
-    DCHECK(isAllocated());
-    DCHECK((Addr == getBase()) || (Addr + Size == getBase() + getCapacity()));
-    invokeImpl(&Derived::unmapImpl, Addr, Size);
-  }
-
-  // This is used to remap a mapped range (either from map() or dispatched from
-  // ReservedMemory). For example, we have reserved several pages and then we
-  // want to remap them with different accessibility.
-  bool remap(uptr Addr, uptr Size, const char *Name, uptr Flags = 0) {
-    DCHECK(isAllocated());
-    DCHECK((Addr >= getBase()) && (Addr + Size <= getBase() + getCapacity()));
-    return invokeImpl(&Derived::remapImpl, Addr, Size, Name, Flags);
-  }
-
-  // This is used to update the pages' access permission. For example, mark
-  // pages as no read/write permission.
-  void setMemoryPermission(uptr Addr, uptr Size, uptr Flags) {
-    DCHECK(isAllocated());
-    DCHECK((Addr >= getBase()) && (Addr + Size <= getBase() + getCapacity()));
-    return invokeImpl(&Derived::setMemoryPermissionImpl, Addr, Size, Flags);
-  }
-
-  // Suggest releasing a set of contiguous physical pages back to the OS. Note
-  // that only physical pages are supposed to be released. Any release of
-  // virtual pages may lead to undefined behavior.
-  void releasePagesToOS(uptr From, uptr Size) {
-    DCHECK(isAllocated());
-    DCHECK((From >= getBase()) && (From + Size <= getBase() + getCapacity()));
-    invokeImpl(&Derived::releasePagesToOSImpl, From, Size);
-  }
-  // This is similar to the above one except that any subsequent access to the
-  // released pages will return with zero-filled pages.
-  void releaseAndZeroPagesToOS(uptr From, uptr Size) {
-    DCHECK(isAllocated());
-    DCHECK((From >= getBase()) && (From + Size <= getBase() + getCapacity()));
-    invokeImpl(&Derived::releaseAndZeroPagesToOSImpl, From, Size);
-  }
-
-  uptr getBase() { return invokeImpl(&Derived::getBaseImpl); }
-  uptr getCapacity() { return invokeImpl(&Derived::getCapacityImpl); }
-
-  bool isAllocated() { return getBase() != 0U; }
-
-protected:
-  template <typename R, typename... Args>
-  R invokeImpl(R (Derived::*MemFn)(Args...), Args... args) {
-    return (static_cast<Derived *>(this)->*MemFn)(args...);
-  }
-};
-
-// `ReservedMemory` is a special memory handle which can be viewed as a page
-// allocator. `ReservedMemory` will reserve a contiguous pages and the later
-// page request can be fulfilled at the designated address. This is used when
-// we want to ensure the virtual address of the MemMap will be in a known range.
-// This is implemented in CRTP, so for each
-// implementation, it has to implement all of the 'Impl' named functions.
-template <class Derived, typename MemMapTy> class ReservedMemory {
-public:
-  using MemMapT = MemMapTy;
-  constexpr ReservedMemory() = default;
-
-  // Reserve a chunk of memory at a suggested address.
-  bool create(uptr Addr, uptr Size, const char *Name, uptr Flags = 0) {
-    DCHECK(!isCreated());
-    return invokeImpl(&Derived::createImpl, Addr, Size, Name, Flags);
-  }
-
-  // Release the entire reserved memory.
-  void release() {
-    DCHECK(isCreated());
-    invokeImpl(&Derived::releaseImpl);
-  }
-
-  // Dispatch a sub-range of reserved memory. Note that any fragmentation of
-  // the reserved pages is managed by each implementation.
-  MemMapT dispatch(uptr Addr, uptr Size) {
-    DCHECK(isCreated());
-    DCHECK((Addr >= getBase()) && (Addr + Size <= getBase() + getCapacity()));
-    return invokeImpl(&Derived::dispatchImpl, Addr, Size);
-  }
-
-  uptr getBase() { return invokeImpl(&Derived::getBaseImpl); }
-  uptr getCapacity() { return invokeImpl(&Derived::getCapacityImpl); }
-
-  bool isCreated() { return getBase() != 0U; }
-
-protected:
-  template <typename R, typename... Args>
-  R invokeImpl(R (Derived::*MemFn)(Args...), Args... args) {
-    return (static_cast<Derived *>(this)->*MemFn)(args...);
-  }
-};
-
-} // namespace scudo
-
-#endif // SCUDO_MEM_MAP_BASE_H_
diff --git a/Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp b/Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp
deleted file mode 100644
index 0566ab065..000000000
--- a/Telegram/ThirdParty/scudo/mem_map_fuchsia.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-//===-- mem_map_fuchsia.cpp -------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "mem_map_fuchsia.h"
-
-#include "atomic_helpers.h"
-#include "common.h"
-#include "string_utils.h"
-
-#if SCUDO_FUCHSIA
-
-#include <zircon/process.h>
-#include <zircon/status.h>
-#include <zircon/syscalls.h>
-
-namespace scudo {
-
-static void NORETURN dieOnError(zx_status_t Status, const char *FnName,
-                                uptr Size) {
-  char Error[128];
-  formatString(Error, sizeof(Error),
-               "SCUDO ERROR: %s failed with size %zuKB (%s)", FnName,
-               Size >> 10, _zx_status_get_string(Status));
-  outputRaw(Error);
-  die();
-}
-
-static void setVmoName(zx_handle_t Vmo, const char *Name) {
-  size_t Len = strlen(Name);
-  DCHECK_LT(Len, ZX_MAX_NAME_LEN);
-  zx_status_t Status = _zx_object_set_property(Vmo, ZX_PROP_NAME, Name, Len);
-  CHECK_EQ(Status, ZX_OK);
-}
-
-// Returns the (cached) base address of the root VMAR.
-static uptr getRootVmarBase() {
-  static atomic_uptr CachedResult = {0};
-
-  uptr Result = atomic_load(&CachedResult, memory_order_acquire);
-  if (UNLIKELY(!Result)) {
-    zx_info_vmar_t VmarInfo;
-    zx_status_t Status =
-        _zx_object_get_info(_zx_vmar_root_self(), ZX_INFO_VMAR, &VmarInfo,
-                            sizeof(VmarInfo), nullptr, nullptr);
-    CHECK_EQ(Status, ZX_OK);
-    CHECK_NE(VmarInfo.base, 0);
-
-    atomic_store(&CachedResult, VmarInfo.base, memory_order_release);
-    Result = VmarInfo.base;
-  }
-
-  return Result;
-}
-
-// Lazily creates and then always returns the same zero-sized VMO.
-static zx_handle_t getPlaceholderVmo() {
-  static atomic_u32 StoredVmo = {ZX_HANDLE_INVALID};
-
-  zx_handle_t Vmo = atomic_load(&StoredVmo, memory_order_acquire);
-  if (UNLIKELY(Vmo == ZX_HANDLE_INVALID)) {
-    // Create a zero-sized placeholder VMO.
-    zx_status_t Status = _zx_vmo_create(0, 0, &Vmo);
-    if (UNLIKELY(Status != ZX_OK))
-      dieOnError(Status, "zx_vmo_create", 0);
-
-    setVmoName(Vmo, "scudo:reserved");
-
-    // Atomically store its handle. If some other thread wins the race, use its
-    // handle and discard ours.
-    zx_handle_t OldValue = atomic_compare_exchange_strong(
-        &StoredVmo, ZX_HANDLE_INVALID, Vmo, memory_order_acq_rel);
-    if (UNLIKELY(OldValue != ZX_HANDLE_INVALID)) {
-      Status = _zx_handle_close(Vmo);
-      CHECK_EQ(Status, ZX_OK);
-
-      Vmo = OldValue;
-    }
-  }
-
-  return Vmo;
-}
-
-MemMapFuchsia::MemMapFuchsia(uptr Base, uptr Capacity)
-    : MapAddr(Base), WindowBase(Base), WindowSize(Capacity) {
-  // Create the VMO.
-  zx_status_t Status = _zx_vmo_create(Capacity, 0, &Vmo);
-  if (UNLIKELY(Status != ZX_OK))
-    dieOnError(Status, "zx_vmo_create", Capacity);
-}
-
-bool MemMapFuchsia::mapImpl(UNUSED uptr Addr, uptr Size, const char *Name,
-                            uptr Flags) {
-  const bool AllowNoMem = !!(Flags & MAP_ALLOWNOMEM);
-  const bool PreCommit = !!(Flags & MAP_PRECOMMIT);
-  const bool NoAccess = !!(Flags & MAP_NOACCESS);
-
-  // Create the VMO.
-  zx_status_t Status = _zx_vmo_create(Size, 0, &Vmo);
-  if (UNLIKELY(Status != ZX_OK)) {
-    if (Status != ZX_ERR_NO_MEMORY || !AllowNoMem)
-      dieOnError(Status, "zx_vmo_create", Size);
-    return false;
-  }
-
-  if (Name != nullptr)
-    setVmoName(Vmo, Name);
-
-  // Map it.
-  zx_vm_option_t MapFlags = ZX_VM_ALLOW_FAULTS;
-  if (!NoAccess)
-    MapFlags |= ZX_VM_PERM_READ | ZX_VM_PERM_WRITE;
-  Status =
-      _zx_vmar_map(_zx_vmar_root_self(), MapFlags, 0, Vmo, 0, Size, &MapAddr);
-  if (UNLIKELY(Status != ZX_OK)) {
-    if (Status != ZX_ERR_NO_MEMORY || !AllowNoMem)
-      dieOnError(Status, "zx_vmar_map", Size);
-
-    Status = _zx_handle_close(Vmo);
-    CHECK_EQ(Status, ZX_OK);
-
-    MapAddr = 0;
-    Vmo = ZX_HANDLE_INVALID;
-    return false;
-  }
-
-  if (PreCommit) {
-    Status = _zx_vmar_op_range(_zx_vmar_root_self(), ZX_VMAR_OP_COMMIT, MapAddr,
-                               Size, nullptr, 0);
-    CHECK_EQ(Status, ZX_OK);
-  }
-
-  WindowBase = MapAddr;
-  WindowSize = Size;
-  return true;
-}
-
-void MemMapFuchsia::unmapImpl(uptr Addr, uptr Size) {
-  zx_status_t Status;
-
-  if (Size == WindowSize) {
-    // NOTE: Closing first and then unmapping seems slightly faster than doing
-    // the same operations in the opposite order.
-    Status = _zx_handle_close(Vmo);
-    CHECK_EQ(Status, ZX_OK);
-    Status = _zx_vmar_unmap(_zx_vmar_root_self(), Addr, Size);
-    CHECK_EQ(Status, ZX_OK);
-
-    MapAddr = WindowBase = WindowSize = 0;
-    Vmo = ZX_HANDLE_INVALID;
-  } else {
-    // Unmap the subrange.
-    Status = _zx_vmar_unmap(_zx_vmar_root_self(), Addr, Size);
-    CHECK_EQ(Status, ZX_OK);
-
-    // Decommit the pages that we just unmapped.
-    Status = _zx_vmo_op_range(Vmo, ZX_VMO_OP_DECOMMIT, Addr - MapAddr, Size,
-                              nullptr, 0);
-    CHECK_EQ(Status, ZX_OK);
-
-    if (Addr == WindowBase)
-      WindowBase += Size;
-    WindowSize -= Size;
-  }
-}
-
-bool MemMapFuchsia::remapImpl(uptr Addr, uptr Size, const char *Name,
-                              uptr Flags) {
-  const bool AllowNoMem = !!(Flags & MAP_ALLOWNOMEM);
-  const bool PreCommit = !!(Flags & MAP_PRECOMMIT);
-  const bool NoAccess = !!(Flags & MAP_NOACCESS);
-
-  // NOTE: This will rename the *whole* VMO, not only the requested portion of
-  // it. But we cannot do better than this given the MemMap API. In practice,
-  // the upper layers of Scudo always pass the same Name for a given MemMap.
-  if (Name != nullptr)
-    setVmoName(Vmo, Name);
-
-  uptr MappedAddr;
-  zx_vm_option_t MapFlags = ZX_VM_ALLOW_FAULTS | ZX_VM_SPECIFIC_OVERWRITE;
-  if (!NoAccess)
-    MapFlags |= ZX_VM_PERM_READ | ZX_VM_PERM_WRITE;
-  zx_status_t Status =
-      _zx_vmar_map(_zx_vmar_root_self(), MapFlags, Addr - getRootVmarBase(),
-                   Vmo, Addr - MapAddr, Size, &MappedAddr);
-  if (UNLIKELY(Status != ZX_OK)) {
-    if (Status != ZX_ERR_NO_MEMORY || !AllowNoMem)
-      dieOnError(Status, "zx_vmar_map", Size);
-    return false;
-  }
-  DCHECK_EQ(Addr, MappedAddr);
-
-  if (PreCommit) {
-    Status = _zx_vmar_op_range(_zx_vmar_root_self(), ZX_VMAR_OP_COMMIT, MapAddr,
-                               Size, nullptr, 0);
-    CHECK_EQ(Status, ZX_OK);
-  }
-
-  return true;
-}
-
-void MemMapFuchsia::releaseAndZeroPagesToOSImpl(uptr From, uptr Size) {
-  zx_status_t Status = _zx_vmo_op_range(Vmo, ZX_VMO_OP_DECOMMIT, From - MapAddr,
-                                        Size, nullptr, 0);
-  CHECK_EQ(Status, ZX_OK);
-}
-
-void MemMapFuchsia::setMemoryPermissionImpl(uptr Addr, uptr Size, uptr Flags) {
-  const bool NoAccess = !!(Flags & MAP_NOACCESS);
-
-  zx_vm_option_t MapFlags = 0;
-  if (!NoAccess)
-    MapFlags |= ZX_VM_PERM_READ | ZX_VM_PERM_WRITE;
-  zx_status_t Status =
-      _zx_vmar_protect(_zx_vmar_root_self(), MapFlags, Addr, Size);
-  CHECK_EQ(Status, ZX_OK);
-}
-
-bool ReservedMemoryFuchsia::createImpl(UNUSED uptr Addr, uptr Size,
-                                       UNUSED const char *Name, uptr Flags) {
-  const bool AllowNoMem = !!(Flags & MAP_ALLOWNOMEM);
-
-  // Reserve memory by mapping the placeholder VMO without any permission.
-  zx_status_t Status = _zx_vmar_map(_zx_vmar_root_self(), ZX_VM_ALLOW_FAULTS, 0,
-                                    getPlaceholderVmo(), 0, Size, &Base);
-  if (UNLIKELY(Status != ZX_OK)) {
-    if (Status != ZX_ERR_NO_MEMORY || !AllowNoMem)
-      dieOnError(Status, "zx_vmar_map", Size);
-    return false;
-  }
-
-  Capacity = Size;
-  return true;
-}
-
-void ReservedMemoryFuchsia::releaseImpl() {
-  zx_status_t Status = _zx_vmar_unmap(_zx_vmar_root_self(), Base, Capacity);
-  CHECK_EQ(Status, ZX_OK);
-}
-
-ReservedMemoryFuchsia::MemMapT ReservedMemoryFuchsia::dispatchImpl(uptr Addr,
-                                                                   uptr Size) {
-  return ReservedMemoryFuchsia::MemMapT(Addr, Size);
-}
-
-} // namespace scudo
-
-#endif // SCUDO_FUCHSIA
diff --git a/Telegram/ThirdParty/scudo/mem_map_fuchsia.h b/Telegram/ThirdParty/scudo/mem_map_fuchsia.h
deleted file mode 100644
index 2e66f89cf..000000000
--- a/Telegram/ThirdParty/scudo/mem_map_fuchsia.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//===-- mem_map_fuchsia.h ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_MEM_MAP_FUCHSIA_H_
-#define SCUDO_MEM_MAP_FUCHSIA_H_
-
-#include "mem_map_base.h"
-
-#if SCUDO_FUCHSIA
-
-#include <stdint.h>
-#include <zircon/types.h>
-
-namespace scudo {
-
-class MemMapFuchsia final : public MemMapBase<MemMapFuchsia> {
-public:
-  constexpr MemMapFuchsia() = default;
-
-  // Impls for base functions.
-  bool mapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags);
-  void unmapImpl(uptr Addr, uptr Size);
-  bool remapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags);
-  void setMemoryPermissionImpl(uptr Addr, uptr Size, uptr Flags);
-  void releasePagesToOSImpl(uptr From, uptr Size) {
-    return releaseAndZeroPagesToOSImpl(From, Size);
-  }
-  void releaseAndZeroPagesToOSImpl(uptr From, uptr Size);
-  uptr getBaseImpl() { return WindowBase; }
-  uptr getCapacityImpl() { return WindowSize; }
-
-private:
-  friend class ReservedMemoryFuchsia;
-
-  // Used by ReservedMemoryFuchsia::dispatch.
-  MemMapFuchsia(uptr Base, uptr Capacity);
-
-  // Virtual memory address corresponding to VMO offset 0.
-  uptr MapAddr = 0;
-
-  // Virtual memory base address and size of the VMO subrange that is still in
-  // use. unmapImpl() can shrink this range, either at the beginning or at the
-  // end.
-  uptr WindowBase = 0;
-  uptr WindowSize = 0;
-
-  zx_handle_t Vmo = ZX_HANDLE_INVALID;
-};
-
-class ReservedMemoryFuchsia final
-    : public ReservedMemory<ReservedMemoryFuchsia, MemMapFuchsia> {
-public:
-  constexpr ReservedMemoryFuchsia() = default;
-
-  bool createImpl(uptr Addr, uptr Size, const char *Name, uptr Flags);
-  void releaseImpl();
-  MemMapT dispatchImpl(uptr Addr, uptr Size);
-  uptr getBaseImpl() { return Base; }
-  uptr getCapacityImpl() { return Capacity; }
-
-private:
-  uptr Base = 0;
-  uptr Capacity = 0;
-};
-
-} // namespace scudo
-
-#endif // SCUDO_FUCHSIA
-
-#endif // SCUDO_MEM_MAP_FUCHSIA_H_
diff --git a/Telegram/ThirdParty/scudo/mem_map_linux.cpp b/Telegram/ThirdParty/scudo/mem_map_linux.cpp
deleted file mode 100644
index 783c4f0d9..000000000
--- a/Telegram/ThirdParty/scudo/mem_map_linux.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//===-- mem_map_linux.cpp ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-#if SCUDO_LINUX
-
-#include "mem_map_linux.h"
-
-#include "common.h"
-#include "internal_defs.h"
-#include "linux.h"
-#include "mutex.h"
-#include "report_linux.h"
-#include "string_utils.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <linux/futex.h>
-#include <sched.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-
-#if SCUDO_ANDROID
-// TODO(chiahungduan): Review if we still need the followings macros.
-#include <sys/prctl.h>
-// Definitions of prctl arguments to set a vma name in Android kernels.
-#define ANDROID_PR_SET_VMA 0x53564d41
-#define ANDROID_PR_SET_VMA_ANON_NAME 0
-#endif
-
-namespace scudo {
-
-static void *mmapWrapper(uptr Addr, uptr Size, const char *Name, uptr Flags) {
-  int MmapFlags = MAP_PRIVATE | MAP_ANONYMOUS;
-  int MmapProt;
-  if (Flags & MAP_NOACCESS) {
-    MmapFlags |= MAP_NORESERVE;
-    MmapProt = PROT_NONE;
-  } else {
-    MmapProt = PROT_READ | PROT_WRITE;
-  }
-#if defined(__aarch64__)
-#ifndef PROT_MTE
-#define PROT_MTE 0x20
-#endif
-  if (Flags & MAP_MEMTAG)
-    MmapProt |= PROT_MTE;
-#endif
-  if (Addr)
-    MmapFlags |= MAP_FIXED;
-  void *P =
-      mmap(reinterpret_cast<void *>(Addr), Size, MmapProt, MmapFlags, -1, 0);
-  if (P == MAP_FAILED) {
-    if (!(Flags & MAP_ALLOWNOMEM) || errno != ENOMEM)
-      reportMapError(errno == ENOMEM ? Size : 0);
-    return nullptr;
-  }
-#if SCUDO_ANDROID
-  if (Name)
-    prctl(ANDROID_PR_SET_VMA, ANDROID_PR_SET_VMA_ANON_NAME, P, Size, Name);
-#else
-  (void)Name;
-#endif
-
-  return P;
-}
-
-bool MemMapLinux::mapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags) {
-  void *P = mmapWrapper(Addr, Size, Name, Flags);
-  if (P == nullptr)
-    return false;
-
-  MapBase = reinterpret_cast<uptr>(P);
-  MapCapacity = Size;
-  return true;
-}
-
-void MemMapLinux::unmapImpl(uptr Addr, uptr Size) {
-  // If we unmap all the pages, also mark `MapBase` to 0 to indicate invalid
-  // status.
-  if (Size == MapCapacity) {
-    MapBase = MapCapacity = 0;
-  } else {
-    // This is partial unmap and is unmapping the pages from the beginning,
-    // shift `MapBase` to the new base.
-    if (MapBase == Addr)
-      MapBase = Addr + Size;
-    MapCapacity -= Size;
-  }
-
-  if (munmap(reinterpret_cast<void *>(Addr), Size) != 0)
-    reportUnmapError(Addr, Size);
-}
-
-bool MemMapLinux::remapImpl(uptr Addr, uptr Size, const char *Name,
-                            uptr Flags) {
-  void *P = mmapWrapper(Addr, Size, Name, Flags);
-  if (reinterpret_cast<uptr>(P) != Addr)
-    reportMapError();
-  return true;
-}
-
-void MemMapLinux::setMemoryPermissionImpl(uptr Addr, uptr Size, uptr Flags) {
-  int Prot = (Flags & MAP_NOACCESS) ? PROT_NONE : (PROT_READ | PROT_WRITE);
-  if (mprotect(reinterpret_cast<void *>(Addr), Size, Prot) != 0)
-    reportProtectError(Addr, Size, Prot);
-}
-
-void MemMapLinux::releaseAndZeroPagesToOSImpl(uptr From, uptr Size) {
-  void *Addr = reinterpret_cast<void *>(From);
-
-  while (madvise(Addr, Size, MADV_DONTNEED) == -1 && errno == EAGAIN) {
-  }
-}
-
-bool ReservedMemoryLinux::createImpl(uptr Addr, uptr Size, const char *Name,
-                                     uptr Flags) {
-  ReservedMemoryLinux::MemMapT MemMap;
-  if (!MemMap.map(Addr, Size, Name, Flags | MAP_NOACCESS))
-    return false;
-
-  MapBase = MemMap.getBase();
-  MapCapacity = MemMap.getCapacity();
-
-  return true;
-}
-
-void ReservedMemoryLinux::releaseImpl() {
-  if (munmap(reinterpret_cast<void *>(getBase()), getCapacity()) != 0)
-    reportUnmapError(getBase(), getCapacity());
-}
-
-ReservedMemoryLinux::MemMapT ReservedMemoryLinux::dispatchImpl(uptr Addr,
-                                                               uptr Size) {
-  return ReservedMemoryLinux::MemMapT(Addr, Size);
-}
-
-} // namespace scudo
-
-#endif // SCUDO_LINUX
diff --git a/Telegram/ThirdParty/scudo/mem_map_linux.h b/Telegram/ThirdParty/scudo/mem_map_linux.h
deleted file mode 100644
index 7a89b3bff..000000000
--- a/Telegram/ThirdParty/scudo/mem_map_linux.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//===-- mem_map_linux.h -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_MEM_MAP_LINUX_H_
-#define SCUDO_MEM_MAP_LINUX_H_
-
-#include "platform.h"
-
-#if SCUDO_LINUX
-
-#include "common.h"
-#include "mem_map_base.h"
-
-namespace scudo {
-
-class MemMapLinux final : public MemMapBase<MemMapLinux> {
-public:
-  constexpr MemMapLinux() = default;
-  MemMapLinux(uptr Base, uptr Capacity)
-      : MapBase(Base), MapCapacity(Capacity) {}
-
-  // Impls for base functions.
-  bool mapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags = 0);
-  void unmapImpl(uptr Addr, uptr Size);
-  bool remapImpl(uptr Addr, uptr Size, const char *Name, uptr Flags = 0);
-  void setMemoryPermissionImpl(uptr Addr, uptr Size, uptr Flags);
-  void releasePagesToOSImpl(uptr From, uptr Size) {
-    return releaseAndZeroPagesToOSImpl(From, Size);
-  }
-  void releaseAndZeroPagesToOSImpl(uptr From, uptr Size);
-  uptr getBaseImpl() { return MapBase; }
-  uptr getCapacityImpl() { return MapCapacity; }
-
-private:
-  uptr MapBase = 0;
-  uptr MapCapacity = 0;
-};
-
-// This will be deprecated when every allocator has been supported by each
-// platform's `MemMap` implementation.
-class ReservedMemoryLinux final
-    : public ReservedMemory<ReservedMemoryLinux, MemMapLinux> {
-public:
-  // The following two are the Impls for function in `MemMapBase`.
-  uptr getBaseImpl() { return MapBase; }
-  uptr getCapacityImpl() { return MapCapacity; }
-
-  // These threes are specific to `ReservedMemory`.
-  bool createImpl(uptr Addr, uptr Size, const char *Name, uptr Flags);
-  void releaseImpl();
-  MemMapT dispatchImpl(uptr Addr, uptr Size);
-
-private:
-  uptr MapBase = 0;
-  uptr MapCapacity = 0;
-};
-
-} // namespace scudo
-
-#endif // SCUDO_LINUX
-
-#endif // SCUDO_MEM_MAP_LINUX_H_
diff --git a/Telegram/ThirdParty/scudo/memtag.h b/Telegram/ThirdParty/scudo/memtag.h
deleted file mode 100644
index aaed2192a..000000000
--- a/Telegram/ThirdParty/scudo/memtag.h
+++ /dev/null
@@ -1,335 +0,0 @@
-//===-- memtag.h ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_MEMTAG_H_
-#define SCUDO_MEMTAG_H_
-
-#include "internal_defs.h"
-
-#if SCUDO_CAN_USE_MTE
-#include <sys/auxv.h>
-#include <sys/prctl.h>
-#endif
-
-namespace scudo {
-
-#if (__clang_major__ >= 12 && defined(__aarch64__) && !defined(__ILP32__)) ||  \
-    defined(SCUDO_FUZZ)
-
-// We assume that Top-Byte Ignore is enabled if the architecture supports memory
-// tagging. Not all operating systems enable TBI, so we only claim architectural
-// support for memory tagging if the operating system enables TBI.
-// HWASan uses the top byte for its own purpose and Scudo should not touch it.
-#if SCUDO_CAN_USE_MTE && !defined(SCUDO_DISABLE_TBI) &&                        \
-    !__has_feature(hwaddress_sanitizer)
-inline constexpr bool archSupportsMemoryTagging() { return true; }
-#else
-inline constexpr bool archSupportsMemoryTagging() { return false; }
-#endif
-
-inline constexpr uptr archMemoryTagGranuleSize() { return 16; }
-
-inline uptr untagPointer(uptr Ptr) { return Ptr & ((1ULL << 56) - 1); }
-
-inline uint8_t extractTag(uptr Ptr) { return (Ptr >> 56) & 0xf; }
-
-#else
-
-inline constexpr bool archSupportsMemoryTagging() { return false; }
-
-inline NORETURN uptr archMemoryTagGranuleSize() {
-  UNREACHABLE("memory tagging not supported");
-}
-
-inline NORETURN uptr untagPointer(uptr Ptr) {
-  (void)Ptr;
-  UNREACHABLE("memory tagging not supported");
-}
-
-inline NORETURN uint8_t extractTag(uptr Ptr) {
-  (void)Ptr;
-  UNREACHABLE("memory tagging not supported");
-}
-
-#endif
-
-#if __clang_major__ >= 12 && defined(__aarch64__) && !defined(__ILP32__)
-
-#if SCUDO_CAN_USE_MTE
-
-inline bool systemSupportsMemoryTagging() {
-#ifndef HWCAP2_MTE
-#define HWCAP2_MTE (1 << 18)
-#endif
-  return getauxval(AT_HWCAP2) & HWCAP2_MTE;
-}
-
-inline bool systemDetectsMemoryTagFaultsTestOnly() {
-#ifndef PR_SET_TAGGED_ADDR_CTRL
-#define PR_SET_TAGGED_ADDR_CTRL 54
-#endif
-#ifndef PR_GET_TAGGED_ADDR_CTRL
-#define PR_GET_TAGGED_ADDR_CTRL 56
-#endif
-#ifndef PR_TAGGED_ADDR_ENABLE
-#define PR_TAGGED_ADDR_ENABLE (1UL << 0)
-#endif
-#ifndef PR_MTE_TCF_SHIFT
-#define PR_MTE_TCF_SHIFT 1
-#endif
-#ifndef PR_MTE_TAG_SHIFT
-#define PR_MTE_TAG_SHIFT 3
-#endif
-#ifndef PR_MTE_TCF_NONE
-#define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
-#endif
-#ifndef PR_MTE_TCF_SYNC
-#define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
-#endif
-#ifndef PR_MTE_TCF_MASK
-#define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
-#endif
-  int res = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0);
-  if (res == -1)
-    return false;
-  return (static_cast<unsigned long>(res) & PR_MTE_TCF_MASK) != PR_MTE_TCF_NONE;
-}
-
-inline void enableSystemMemoryTaggingTestOnly() {
-  prctl(PR_SET_TAGGED_ADDR_CTRL,
-        PR_TAGGED_ADDR_ENABLE | PR_MTE_TCF_SYNC | (0xfffe << PR_MTE_TAG_SHIFT),
-        0, 0, 0);
-}
-
-#else // !SCUDO_CAN_USE_MTE
-
-inline bool systemSupportsMemoryTagging() { return false; }
-
-inline NORETURN bool systemDetectsMemoryTagFaultsTestOnly() {
-  UNREACHABLE("memory tagging not supported");
-}
-
-inline NORETURN void enableSystemMemoryTaggingTestOnly() {
-  UNREACHABLE("memory tagging not supported");
-}
-
-#endif // SCUDO_CAN_USE_MTE
-
-class ScopedDisableMemoryTagChecks {
-  uptr PrevTCO;
-
-public:
-  ScopedDisableMemoryTagChecks() {
-    __asm__ __volatile__(
-        R"(
-        .arch_extension memtag
-        mrs %0, tco
-        msr tco, #1
-        )"
-        : "=r"(PrevTCO));
-  }
-
-  ~ScopedDisableMemoryTagChecks() {
-    __asm__ __volatile__(
-        R"(
-        .arch_extension memtag
-        msr tco, %0
-        )"
-        :
-        : "r"(PrevTCO));
-  }
-};
-
-inline uptr selectRandomTag(uptr Ptr, uptr ExcludeMask) {
-  ExcludeMask |= 1; // Always exclude Tag 0.
-  uptr TaggedPtr;
-  __asm__ __volatile__(
-      R"(
-      .arch_extension memtag
-      irg %[TaggedPtr], %[Ptr], %[ExcludeMask]
-      )"
-      : [TaggedPtr] "=r"(TaggedPtr)
-      : [Ptr] "r"(Ptr), [ExcludeMask] "r"(ExcludeMask));
-  return TaggedPtr;
-}
-
-inline uptr addFixedTag(uptr Ptr, uptr Tag) {
-  DCHECK_LT(Tag, 16);
-  DCHECK_EQ(untagPointer(Ptr), Ptr);
-  return Ptr | (Tag << 56);
-}
-
-inline uptr storeTags(uptr Begin, uptr End) {
-  DCHECK_EQ(0, Begin % 16);
-  uptr LineSize, Next, Tmp;
-  __asm__ __volatile__(
-      R"(
-    .arch_extension memtag
-
-    // Compute the cache line size in bytes (DCZID_EL0 stores it as the log2
-    // of the number of 4-byte words) and bail out to the slow path if DCZID_EL0
-    // indicates that the DC instructions are unavailable.
-    DCZID .req %[Tmp]
-    mrs DCZID, dczid_el0
-    tbnz DCZID, #4, 3f
-    and DCZID, DCZID, #15
-    mov %[LineSize], #4
-    lsl %[LineSize], %[LineSize], DCZID
-    .unreq DCZID
-
-    // Our main loop doesn't handle the case where we don't need to perform any
-    // DC GZVA operations. If the size of our tagged region is less than
-    // twice the cache line size, bail out to the slow path since it's not
-    // guaranteed that we'll be able to do a DC GZVA.
-    Size .req %[Tmp]
-    sub Size, %[End], %[Cur]
-    cmp Size, %[LineSize], lsl #1
-    b.lt 3f
-    .unreq Size
-
-    LineMask .req %[Tmp]
-    sub LineMask, %[LineSize], #1
-
-    // STZG until the start of the next cache line.
-    orr %[Next], %[Cur], LineMask
-  1:
-    stzg %[Cur], [%[Cur]], #16
-    cmp %[Cur], %[Next]
-    b.lt 1b
-
-    // DC GZVA cache lines until we have no more full cache lines.
-    bic %[Next], %[End], LineMask
-    .unreq LineMask
-  2:
-    dc gzva, %[Cur]
-    add %[Cur], %[Cur], %[LineSize]
-    cmp %[Cur], %[Next]
-    b.lt 2b
-
-    // STZG until the end of the tagged region. This loop is also used to handle
-    // slow path cases.
-  3:
-    cmp %[Cur], %[End]
-    b.ge 4f
-    stzg %[Cur], [%[Cur]], #16
-    b 3b
-
-  4:
-  )"
-      : [Cur] "+&r"(Begin), [LineSize] "=&r"(LineSize), [Next] "=&r"(Next),
-        [Tmp] "=&r"(Tmp)
-      : [End] "r"(End)
-      : "memory");
-  DCHECK_EQ(0, Begin % 16);
-  return Begin;
-}
-
-inline void storeTag(uptr Ptr) {
-  DCHECK_EQ(0, Ptr % 16);
-  __asm__ __volatile__(R"(
-    .arch_extension memtag
-    stg %0, [%0]
-  )"
-                       :
-                       : "r"(Ptr)
-                       : "memory");
-}
-
-inline uptr loadTag(uptr Ptr) {
-  DCHECK_EQ(0, Ptr % 16);
-  uptr TaggedPtr = Ptr;
-  __asm__ __volatile__(
-      R"(
-      .arch_extension memtag
-      ldg %0, [%0]
-      )"
-      : "+r"(TaggedPtr)
-      :
-      : "memory");
-  return TaggedPtr;
-}
-
-#else
-
-inline NORETURN bool systemSupportsMemoryTagging() {
-  UNREACHABLE("memory tagging not supported");
-}
-
-inline NORETURN bool systemDetectsMemoryTagFaultsTestOnly() {
-  UNREACHABLE("memory tagging not supported");
-}
-
-inline NORETURN void enableSystemMemoryTaggingTestOnly() {
-  UNREACHABLE("memory tagging not supported");
-}
-
-struct ScopedDisableMemoryTagChecks {
-  ScopedDisableMemoryTagChecks() {}
-};
-
-inline NORETURN uptr selectRandomTag(uptr Ptr, uptr ExcludeMask) {
-  (void)Ptr;
-  (void)ExcludeMask;
-  UNREACHABLE("memory tagging not supported");
-}
-
-inline NORETURN uptr addFixedTag(uptr Ptr, uptr Tag) {
-  (void)Ptr;
-  (void)Tag;
-  UNREACHABLE("memory tagging not supported");
-}
-
-inline NORETURN uptr storeTags(uptr Begin, uptr End) {
-  (void)Begin;
-  (void)End;
-  UNREACHABLE("memory tagging not supported");
-}
-
-inline NORETURN void storeTag(uptr Ptr) {
-  (void)Ptr;
-  UNREACHABLE("memory tagging not supported");
-}
-
-inline NORETURN uptr loadTag(uptr Ptr) {
-  (void)Ptr;
-  UNREACHABLE("memory tagging not supported");
-}
-
-#endif
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-noreturn"
-inline void setRandomTag(void *Ptr, uptr Size, uptr ExcludeMask,
-                         uptr *TaggedBegin, uptr *TaggedEnd) {
-  *TaggedBegin = selectRandomTag(reinterpret_cast<uptr>(Ptr), ExcludeMask);
-  *TaggedEnd = storeTags(*TaggedBegin, *TaggedBegin + Size);
-}
-#pragma GCC diagnostic pop
-
-inline void *untagPointer(void *Ptr) {
-  return reinterpret_cast<void *>(untagPointer(reinterpret_cast<uptr>(Ptr)));
-}
-
-inline void *loadTag(void *Ptr) {
-  return reinterpret_cast<void *>(loadTag(reinterpret_cast<uptr>(Ptr)));
-}
-
-inline void *addFixedTag(void *Ptr, uptr Tag) {
-  return reinterpret_cast<void *>(
-      addFixedTag(reinterpret_cast<uptr>(Ptr), Tag));
-}
-
-template <typename Config>
-inline constexpr bool allocatorSupportsMemoryTagging() {
-  return archSupportsMemoryTagging() && Config::MaySupportMemoryTagging &&
-         (1 << SCUDO_MIN_ALIGNMENT_LOG) >= archMemoryTagGranuleSize();
-}
-
-} // namespace scudo
-
-#endif
diff --git a/Telegram/ThirdParty/scudo/mutex.h b/Telegram/ThirdParty/scudo/mutex.h
deleted file mode 100644
index 4caa94521..000000000
--- a/Telegram/ThirdParty/scudo/mutex.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//===-- mutex.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_MUTEX_H_
-#define SCUDO_MUTEX_H_
-
-#include "atomic_helpers.h"
-#include "common.h"
-#include "thread_annotations.h"
-
-#include <string.h>
-
-#if SCUDO_FUCHSIA
-#include <lib/sync/mutex.h> // for sync_mutex_t
-#endif
-
-namespace scudo {
-
-class CAPABILITY("mutex") HybridMutex {
-public:
-  bool tryLock() TRY_ACQUIRE(true);
-  NOINLINE void lock() ACQUIRE() {
-    if (LIKELY(tryLock()))
-      return;
-      // The compiler may try to fully unroll the loop, ending up in a
-      // NumberOfTries*NumberOfYields block of pauses mixed with tryLocks. This
-      // is large, ugly and unneeded, a compact loop is better for our purpose
-      // here. Use a pragma to tell the compiler not to unroll the loop.
-#ifdef __clang__
-#pragma nounroll
-#endif
-    for (u8 I = 0U; I < NumberOfTries; I++) {
-      delayLoop();
-      if (tryLock())
-        return;
-    }
-    lockSlow();
-  }
-  void unlock() RELEASE();
-
-  // TODO(chiahungduan): In general, we may want to assert the owner of lock as
-  // well. Given the current uses of HybridMutex, it's acceptable without
-  // asserting the owner. Re-evaluate this when we have certain scenarios which
-  // requires a more fine-grained lock granularity.
-  ALWAYS_INLINE void assertHeld() ASSERT_CAPABILITY(this) {
-    if (SCUDO_DEBUG)
-      assertHeldImpl();
-  }
-
-private:
-  void delayLoop() {
-    // The value comes from the average time spent in accessing caches (which
-    // are the fastest operations) so that we are unlikely to wait too long for
-    // fast operations.
-    constexpr u32 SpinTimes = 16;
-    volatile u32 V = 0;
-    for (u32 I = 0; I < SpinTimes; ++I) {
-      u32 Tmp = V + 1;
-      V = Tmp;
-    }
-  }
-
-  void assertHeldImpl();
-
-  // TODO(chiahungduan): Adapt this value based on scenarios. E.g., primary and
-  // secondary allocator have different allocation times.
-  static constexpr u8 NumberOfTries = 32U;
-
-#if SCUDO_LINUX
-  atomic_u32 M = {};
-#elif SCUDO_FUCHSIA
-  sync_mutex_t M = {};
-#endif
-
-  void lockSlow() ACQUIRE();
-};
-
-class SCOPED_CAPABILITY ScopedLock {
-public:
-  explicit ScopedLock(HybridMutex &M) ACQUIRE(M) : Mutex(M) { Mutex.lock(); }
-  ~ScopedLock() RELEASE() { Mutex.unlock(); }
-
-private:
-  HybridMutex &Mutex;
-
-  ScopedLock(const ScopedLock &) = delete;
-  void operator=(const ScopedLock &) = delete;
-};
-
-} // namespace scudo
-
-#endif // SCUDO_MUTEX_H_
diff --git a/Telegram/ThirdParty/scudo/options.h b/Telegram/ThirdParty/scudo/options.h
deleted file mode 100644
index b20142a41..000000000
--- a/Telegram/ThirdParty/scudo/options.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//===-- options.h -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_OPTIONS_H_
-#define SCUDO_OPTIONS_H_
-
-#include "atomic_helpers.h"
-#include "common.h"
-#include "memtag.h"
-
-namespace scudo {
-
-enum class OptionBit {
-  MayReturnNull,
-  FillContents0of2,
-  FillContents1of2,
-  DeallocTypeMismatch,
-  DeleteSizeMismatch,
-  TrackAllocationStacks,
-  UseOddEvenTags,
-  UseMemoryTagging,
-  AddLargeAllocationSlack,
-};
-
-struct Options {
-  u32 Val;
-
-  bool get(OptionBit Opt) const { return Val & (1U << static_cast<u32>(Opt)); }
-
-  FillContentsMode getFillContentsMode() const {
-    return static_cast<FillContentsMode>(
-        (Val >> static_cast<u32>(OptionBit::FillContents0of2)) & 3);
-  }
-};
-
-template <typename Config> bool useMemoryTagging(const Options &Options) {
-  return allocatorSupportsMemoryTagging<Config>() &&
-         Options.get(OptionBit::UseMemoryTagging);
-}
-
-struct AtomicOptions {
-  atomic_u32 Val = {};
-
-  Options load() const { return Options{atomic_load_relaxed(&Val)}; }
-
-  void clear(OptionBit Opt) {
-    atomic_fetch_and(&Val, ~(1U << static_cast<u32>(Opt)),
-                     memory_order_relaxed);
-  }
-
-  void set(OptionBit Opt) {
-    atomic_fetch_or(&Val, 1U << static_cast<u32>(Opt), memory_order_relaxed);
-  }
-
-  void setFillContentsMode(FillContentsMode FillContents) {
-    u32 Opts = atomic_load_relaxed(&Val), NewOpts;
-    do {
-      NewOpts = Opts;
-      NewOpts &= ~(3U << static_cast<u32>(OptionBit::FillContents0of2));
-      NewOpts |= static_cast<u32>(FillContents)
-                 << static_cast<u32>(OptionBit::FillContents0of2);
-    } while (!atomic_compare_exchange_strong(&Val, &Opts, NewOpts,
-                                             memory_order_relaxed));
-  }
-};
-
-} // namespace scudo
-
-#endif // SCUDO_OPTIONS_H_
diff --git a/Telegram/ThirdParty/scudo/platform.h b/Telegram/ThirdParty/scudo/platform.h
deleted file mode 100644
index b71a86be7..000000000
--- a/Telegram/ThirdParty/scudo/platform.h
+++ /dev/null
@@ -1,104 +0,0 @@
-//===-- platform.h ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_PLATFORM_H_
-#define SCUDO_PLATFORM_H_
-
-// Transitive includes of stdint.h specify some of the defines checked below.
-#include <stdint.h>
-
-#if defined(__linux__) && !defined(__TRUSTY__)
-#define SCUDO_LINUX 1
-#else
-#define SCUDO_LINUX 0
-#endif
-
-// See https://android.googlesource.com/platform/bionic/+/master/docs/defines.md
-#if defined(__BIONIC__)
-#define SCUDO_ANDROID 1
-#else
-#define SCUDO_ANDROID 0
-#endif
-
-#if defined(__Fuchsia__)
-#define SCUDO_FUCHSIA 1
-#else
-#define SCUDO_FUCHSIA 0
-#endif
-
-#if defined(__TRUSTY__)
-#define SCUDO_TRUSTY 1
-#else
-#define SCUDO_TRUSTY 0
-#endif
-
-#if defined(__riscv) && (__riscv_xlen == 64)
-#define SCUDO_RISCV64 1
-#else
-#define SCUDO_RISCV64 0
-#endif
-
-#if defined(__LP64__)
-#define SCUDO_WORDSIZE 64U
-#else
-#define SCUDO_WORDSIZE 32U
-#endif
-
-#if SCUDO_WORDSIZE == 64U
-#define FIRST_32_SECOND_64(a, b) (b)
-#else
-#define FIRST_32_SECOND_64(a, b) (a)
-#endif
-
-#ifndef SCUDO_CAN_USE_PRIMARY64
-#define SCUDO_CAN_USE_PRIMARY64 (SCUDO_WORDSIZE == 64U)
-#endif
-
-#ifndef SCUDO_CAN_USE_MTE
-#define SCUDO_CAN_USE_MTE (SCUDO_LINUX || SCUDO_TRUSTY)
-#endif
-
-// Use smaller table sizes for fuzzing in order to reduce input size.
-// Trusty just has less available memory.
-#ifndef SCUDO_SMALL_STACK_DEPOT
-#if defined(SCUDO_FUZZ) || SCUDO_TRUSTY
-#define SCUDO_SMALL_STACK_DEPOT 1
-#else
-#define SCUDO_SMALL_STACK_DEPOT 0
-#endif
-#endif
-
-#ifndef SCUDO_ENABLE_HOOKS
-#define SCUDO_ENABLE_HOOKS 0
-#endif
-
-#ifndef SCUDO_MIN_ALIGNMENT_LOG
-// We force malloc-type functions to be aligned to std::max_align_t, but there
-// is no reason why the minimum alignment for all other functions can't be 8
-// bytes. Except obviously for applications making incorrect assumptions.
-// TODO(kostyak): define SCUDO_MIN_ALIGNMENT_LOG 3
-#define SCUDO_MIN_ALIGNMENT_LOG FIRST_32_SECOND_64(3, 4)
-#endif
-
-#if defined(__aarch64__)
-#define SCUDO_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 48)
-#else
-#define SCUDO_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 47)
-#endif
-
-// Older gcc have issues aligning to a constexpr, and require an integer.
-// See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56859 among others.
-#if defined(__powerpc__) || defined(__powerpc64__)
-#define SCUDO_CACHE_LINE_SIZE 128
-#else
-#define SCUDO_CACHE_LINE_SIZE 64
-#endif
-
-#define SCUDO_POINTER_FORMAT_LENGTH FIRST_32_SECOND_64(8, 12)
-
-#endif // SCUDO_PLATFORM_H_
diff --git a/Telegram/ThirdParty/scudo/primary32.h b/Telegram/ThirdParty/scudo/primary32.h
deleted file mode 100644
index 4d03b282d..000000000
--- a/Telegram/ThirdParty/scudo/primary32.h
+++ /dev/null
@@ -1,1170 +0,0 @@
-//===-- primary32.h ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_PRIMARY32_H_
-#define SCUDO_PRIMARY32_H_
-
-#include "allocator_common.h"
-#include "bytemap.h"
-#include "common.h"
-#include "list.h"
-#include "local_cache.h"
-#include "options.h"
-#include "release.h"
-#include "report.h"
-#include "stats.h"
-#include "string_utils.h"
-#include "thread_annotations.h"
-
-namespace scudo {
-
-// SizeClassAllocator32 is an allocator for 32 or 64-bit address space.
-//
-// It maps Regions of 2^RegionSizeLog bytes aligned on a 2^RegionSizeLog bytes
-// boundary, and keeps a bytemap of the mappable address space to track the size
-// class they are associated with.
-//
-// Mapped regions are split into equally sized Blocks according to the size
-// class they belong to, and the associated pointers are shuffled to prevent any
-// predictable address pattern (the predictability increases with the block
-// size).
-//
-// Regions for size class 0 are special and used to hold TransferBatches, which
-// allow to transfer arrays of pointers from the global size class freelist to
-// the thread specific freelist for said class, and back.
-//
-// Memory used by this allocator is never unmapped but can be partially
-// reclaimed if the platform allows for it.
-
-template <typename Config> class SizeClassAllocator32 {
-public:
-  typedef typename Config::Primary::CompactPtrT CompactPtrT;
-  typedef typename Config::Primary::SizeClassMap SizeClassMap;
-  static const uptr GroupSizeLog = Config::Primary::GroupSizeLog;
-  // The bytemap can only track UINT8_MAX - 1 classes.
-  static_assert(SizeClassMap::LargestClassId <= (UINT8_MAX - 1), "");
-  // Regions should be large enough to hold the largest Block.
-  static_assert((1UL << Config::Primary::RegionSizeLog) >=
-                    SizeClassMap::MaxSize,
-                "");
-  typedef SizeClassAllocator32<Config> ThisT;
-  typedef SizeClassAllocatorLocalCache<ThisT> CacheT;
-  typedef TransferBatch<ThisT> TransferBatchT;
-  typedef BatchGroup<ThisT> BatchGroupT;
-
-  static_assert(sizeof(BatchGroupT) <= sizeof(TransferBatchT),
-                "BatchGroupT uses the same class size as TransferBatchT");
-
-  static uptr getSizeByClassId(uptr ClassId) {
-    return (ClassId == SizeClassMap::BatchClassId)
-               ? sizeof(TransferBatchT)
-               : SizeClassMap::getSizeByClassId(ClassId);
-  }
-
-  static bool canAllocate(uptr Size) { return Size <= SizeClassMap::MaxSize; }
-
-  void init(s32 ReleaseToOsInterval) NO_THREAD_SAFETY_ANALYSIS {
-    if (SCUDO_FUCHSIA)
-      reportError("SizeClassAllocator32 is not supported on Fuchsia");
-
-    if (SCUDO_TRUSTY)
-      reportError("SizeClassAllocator32 is not supported on Trusty");
-
-    DCHECK(isAligned(reinterpret_cast<uptr>(this), alignof(ThisT)));
-    PossibleRegions.init();
-    u32 Seed;
-    const u64 Time = getMonotonicTimeFast();
-    if (!getRandom(reinterpret_cast<void *>(&Seed), sizeof(Seed)))
-      Seed = static_cast<u32>(
-          Time ^ (reinterpret_cast<uptr>(SizeClassInfoArray) >> 6));
-    for (uptr I = 0; I < NumClasses; I++) {
-      SizeClassInfo *Sci = getSizeClassInfo(I);
-      Sci->RandState = getRandomU32(&Seed);
-      // Sci->MaxRegionIndex is already initialized to 0.
-      Sci->MinRegionIndex = NumRegions;
-      Sci->ReleaseInfo.LastReleaseAtNs = Time;
-    }
-    setOption(Option::ReleaseInterval, static_cast<sptr>(ReleaseToOsInterval));
-  }
-
-  void unmapTestOnly() {
-    {
-      ScopedLock L(RegionsStashMutex);
-      while (NumberOfStashedRegions > 0) {
-        unmap(reinterpret_cast<void *>(RegionsStash[--NumberOfStashedRegions]),
-              RegionSize);
-      }
-    }
-
-    uptr MinRegionIndex = NumRegions, MaxRegionIndex = 0;
-    for (uptr I = 0; I < NumClasses; I++) {
-      SizeClassInfo *Sci = getSizeClassInfo(I);
-      ScopedLock L(Sci->Mutex);
-      if (Sci->MinRegionIndex < MinRegionIndex)
-        MinRegionIndex = Sci->MinRegionIndex;
-      if (Sci->MaxRegionIndex > MaxRegionIndex)
-        MaxRegionIndex = Sci->MaxRegionIndex;
-      *Sci = {};
-    }
-
-    ScopedLock L(ByteMapMutex);
-    for (uptr I = MinRegionIndex; I <= MaxRegionIndex; I++)
-      if (PossibleRegions[I])
-        unmap(reinterpret_cast<void *>(I * RegionSize), RegionSize);
-    PossibleRegions.unmapTestOnly();
-  }
-
-  // When all blocks are freed, it has to be the same size as `AllocatedUser`.
-  void verifyAllBlocksAreReleasedTestOnly() {
-    // `BatchGroup` and `TransferBatch` also use the blocks from BatchClass.
-    uptr BatchClassUsedInFreeLists = 0;
-    for (uptr I = 0; I < NumClasses; I++) {
-      // We have to count BatchClassUsedInFreeLists in other regions first.
-      if (I == SizeClassMap::BatchClassId)
-        continue;
-      SizeClassInfo *Sci = getSizeClassInfo(I);
-      ScopedLock L1(Sci->Mutex);
-      uptr TotalBlocks = 0;
-      for (BatchGroupT &BG : Sci->FreeListInfo.BlockList) {
-        // `BG::Batches` are `TransferBatches`. +1 for `BatchGroup`.
-        BatchClassUsedInFreeLists += BG.Batches.size() + 1;
-        for (const auto &It : BG.Batches)
-          TotalBlocks += It.getCount();
-      }
-
-      const uptr BlockSize = getSizeByClassId(I);
-      DCHECK_EQ(TotalBlocks, Sci->AllocatedUser / BlockSize);
-      DCHECK_EQ(Sci->FreeListInfo.PushedBlocks, Sci->FreeListInfo.PoppedBlocks);
-    }
-
-    SizeClassInfo *Sci = getSizeClassInfo(SizeClassMap::BatchClassId);
-    ScopedLock L1(Sci->Mutex);
-    uptr TotalBlocks = 0;
-    for (BatchGroupT &BG : Sci->FreeListInfo.BlockList) {
-      if (LIKELY(!BG.Batches.empty())) {
-        for (const auto &It : BG.Batches)
-          TotalBlocks += It.getCount();
-      } else {
-        // `BatchGroup` with empty freelist doesn't have `TransferBatch` record
-        // itself.
-        ++TotalBlocks;
-      }
-    }
-
-    const uptr BlockSize = getSizeByClassId(SizeClassMap::BatchClassId);
-    DCHECK_EQ(TotalBlocks + BatchClassUsedInFreeLists,
-              Sci->AllocatedUser / BlockSize);
-    const uptr BlocksInUse =
-        Sci->FreeListInfo.PoppedBlocks - Sci->FreeListInfo.PushedBlocks;
-    DCHECK_EQ(BlocksInUse, BatchClassUsedInFreeLists);
-  }
-
-  CompactPtrT compactPtr(UNUSED uptr ClassId, uptr Ptr) const {
-    return static_cast<CompactPtrT>(Ptr);
-  }
-
-  void *decompactPtr(UNUSED uptr ClassId, CompactPtrT CompactPtr) const {
-    return reinterpret_cast<void *>(static_cast<uptr>(CompactPtr));
-  }
-
-  uptr compactPtrGroupBase(CompactPtrT CompactPtr) {
-    const uptr Mask = (static_cast<uptr>(1) << GroupSizeLog) - 1;
-    return CompactPtr & ~Mask;
-  }
-
-  uptr decompactGroupBase(uptr CompactPtrGroupBase) {
-    return CompactPtrGroupBase;
-  }
-
-  ALWAYS_INLINE static bool isSmallBlock(uptr BlockSize) {
-    const uptr PageSize = getPageSizeCached();
-    return BlockSize < PageSize / 16U;
-  }
-
-  ALWAYS_INLINE static bool isLargeBlock(uptr BlockSize) {
-    const uptr PageSize = getPageSizeCached();
-    return BlockSize > PageSize;
-  }
-
-  // Note that the `MaxBlockCount` will be used when we support arbitrary blocks
-  // count. Now it's the same as the number of blocks stored in the
-  // `TransferBatch`.
-  u16 popBlocks(CacheT *C, uptr ClassId, CompactPtrT *ToArray,
-                UNUSED const u16 MaxBlockCount) {
-    TransferBatchT *B = popBatch(C, ClassId);
-    if (!B)
-      return 0;
-
-    const u16 Count = B->getCount();
-    DCHECK_GT(Count, 0U);
-    B->moveToArray(ToArray);
-
-    if (ClassId != SizeClassMap::BatchClassId)
-      C->deallocate(SizeClassMap::BatchClassId, B);
-
-    return Count;
-  }
-
-  TransferBatchT *popBatch(CacheT *C, uptr ClassId) {
-    DCHECK_LT(ClassId, NumClasses);
-    SizeClassInfo *Sci = getSizeClassInfo(ClassId);
-    ScopedLock L(Sci->Mutex);
-    TransferBatchT *B = popBatchImpl(C, ClassId, Sci);
-    if (UNLIKELY(!B)) {
-      if (UNLIKELY(!populateFreeList(C, ClassId, Sci)))
-        return nullptr;
-      B = popBatchImpl(C, ClassId, Sci);
-      // if `populateFreeList` succeeded, we are supposed to get free blocks.
-      DCHECK_NE(B, nullptr);
-    }
-    return B;
-  }
-
-  // Push the array of free blocks to the designated batch group.
-  void pushBlocks(CacheT *C, uptr ClassId, CompactPtrT *Array, u32 Size) {
-    DCHECK_LT(ClassId, NumClasses);
-    DCHECK_GT(Size, 0);
-
-    SizeClassInfo *Sci = getSizeClassInfo(ClassId);
-    if (ClassId == SizeClassMap::BatchClassId) {
-      ScopedLock L(Sci->Mutex);
-      pushBatchClassBlocks(Sci, Array, Size);
-      return;
-    }
-
-    // TODO(chiahungduan): Consider not doing grouping if the group size is not
-    // greater than the block size with a certain scale.
-
-    // Sort the blocks so that blocks belonging to the same group can be pushed
-    // together.
-    bool SameGroup = true;
-    for (u32 I = 1; I < Size; ++I) {
-      if (compactPtrGroupBase(Array[I - 1]) != compactPtrGroupBase(Array[I]))
-        SameGroup = false;
-      CompactPtrT Cur = Array[I];
-      u32 J = I;
-      while (J > 0 &&
-             compactPtrGroupBase(Cur) < compactPtrGroupBase(Array[J - 1])) {
-        Array[J] = Array[J - 1];
-        --J;
-      }
-      Array[J] = Cur;
-    }
-
-    ScopedLock L(Sci->Mutex);
-    pushBlocksImpl(C, ClassId, Sci, Array, Size, SameGroup);
-  }
-
-  void disable() NO_THREAD_SAFETY_ANALYSIS {
-    // The BatchClassId must be locked last since other classes can use it.
-    for (sptr I = static_cast<sptr>(NumClasses) - 1; I >= 0; I--) {
-      if (static_cast<uptr>(I) == SizeClassMap::BatchClassId)
-        continue;
-      getSizeClassInfo(static_cast<uptr>(I))->Mutex.lock();
-    }
-    getSizeClassInfo(SizeClassMap::BatchClassId)->Mutex.lock();
-    RegionsStashMutex.lock();
-    ByteMapMutex.lock();
-  }
-
-  void enable() NO_THREAD_SAFETY_ANALYSIS {
-    ByteMapMutex.unlock();
-    RegionsStashMutex.unlock();
-    getSizeClassInfo(SizeClassMap::BatchClassId)->Mutex.unlock();
-    for (uptr I = 0; I < NumClasses; I++) {
-      if (I == SizeClassMap::BatchClassId)
-        continue;
-      getSizeClassInfo(I)->Mutex.unlock();
-    }
-  }
-
-  template <typename F> void iterateOverBlocks(F Callback) {
-    uptr MinRegionIndex = NumRegions, MaxRegionIndex = 0;
-    for (uptr I = 0; I < NumClasses; I++) {
-      SizeClassInfo *Sci = getSizeClassInfo(I);
-      // TODO: The call of `iterateOverBlocks` requires disabling
-      // SizeClassAllocator32. We may consider locking each region on demand
-      // only.
-      Sci->Mutex.assertHeld();
-      if (Sci->MinRegionIndex < MinRegionIndex)
-        MinRegionIndex = Sci->MinRegionIndex;
-      if (Sci->MaxRegionIndex > MaxRegionIndex)
-        MaxRegionIndex = Sci->MaxRegionIndex;
-    }
-
-    // SizeClassAllocator32 is disabled, i.e., ByteMapMutex is held.
-    ByteMapMutex.assertHeld();
-
-    for (uptr I = MinRegionIndex; I <= MaxRegionIndex; I++) {
-      if (PossibleRegions[I] &&
-          (PossibleRegions[I] - 1U) != SizeClassMap::BatchClassId) {
-        const uptr BlockSize = getSizeByClassId(PossibleRegions[I] - 1U);
-        const uptr From = I * RegionSize;
-        const uptr To = From + (RegionSize / BlockSize) * BlockSize;
-        for (uptr Block = From; Block < To; Block += BlockSize)
-          Callback(Block);
-      }
-    }
-  }
-
-  void getStats(ScopedString *Str) {
-    // TODO(kostyak): get the RSS per region.
-    uptr TotalMapped = 0;
-    uptr PoppedBlocks = 0;
-    uptr PushedBlocks = 0;
-    for (uptr I = 0; I < NumClasses; I++) {
-      SizeClassInfo *Sci = getSizeClassInfo(I);
-      ScopedLock L(Sci->Mutex);
-      TotalMapped += Sci->AllocatedUser;
-      PoppedBlocks += Sci->FreeListInfo.PoppedBlocks;
-      PushedBlocks += Sci->FreeListInfo.PushedBlocks;
-    }
-    Str->append("Stats: SizeClassAllocator32: %zuM mapped in %zu allocations; "
-                "remains %zu\n",
-                TotalMapped >> 20, PoppedBlocks, PoppedBlocks - PushedBlocks);
-    for (uptr I = 0; I < NumClasses; I++) {
-      SizeClassInfo *Sci = getSizeClassInfo(I);
-      ScopedLock L(Sci->Mutex);
-      getStats(Str, I, Sci);
-    }
-  }
-
-  void getFragmentationInfo(ScopedString *Str) {
-    Str->append(
-        "Fragmentation Stats: SizeClassAllocator32: page size = %zu bytes\n",
-        getPageSizeCached());
-
-    for (uptr I = 1; I < NumClasses; I++) {
-      SizeClassInfo *Sci = getSizeClassInfo(I);
-      ScopedLock L(Sci->Mutex);
-      getSizeClassFragmentationInfo(Sci, I, Str);
-    }
-  }
-
-  bool setOption(Option O, sptr Value) {
-    if (O == Option::ReleaseInterval) {
-      const s32 Interval = Max(Min(static_cast<s32>(Value),
-                                   Config::Primary::MaxReleaseToOsIntervalMs),
-                               Config::Primary::MinReleaseToOsIntervalMs);
-      atomic_store_relaxed(&ReleaseToOsIntervalMs, Interval);
-      return true;
-    }
-    // Not supported by the Primary, but not an error either.
-    return true;
-  }
-
-  uptr tryReleaseToOS(uptr ClassId, ReleaseToOS ReleaseType) {
-    SizeClassInfo *Sci = getSizeClassInfo(ClassId);
-    // TODO: Once we have separate locks like primary64, we may consider using
-    // tryLock() as well.
-    ScopedLock L(Sci->Mutex);
-    return releaseToOSMaybe(Sci, ClassId, ReleaseType);
-  }
-
-  uptr releaseToOS(ReleaseToOS ReleaseType) {
-    uptr TotalReleasedBytes = 0;
-    for (uptr I = 0; I < NumClasses; I++) {
-      if (I == SizeClassMap::BatchClassId)
-        continue;
-      SizeClassInfo *Sci = getSizeClassInfo(I);
-      ScopedLock L(Sci->Mutex);
-      TotalReleasedBytes += releaseToOSMaybe(Sci, I, ReleaseType);
-    }
-    return TotalReleasedBytes;
-  }
-
-  const char *getRegionInfoArrayAddress() const { return nullptr; }
-  static uptr getRegionInfoArraySize() { return 0; }
-
-  static BlockInfo findNearestBlock(UNUSED const char *RegionInfoData,
-                                    UNUSED uptr Ptr) {
-    return {};
-  }
-
-  AtomicOptions Options;
-
-private:
-  static const uptr NumClasses = SizeClassMap::NumClasses;
-  static const uptr RegionSize = 1UL << Config::Primary::RegionSizeLog;
-  static const uptr NumRegions =
-      SCUDO_MMAP_RANGE_SIZE >> Config::Primary::RegionSizeLog;
-  static const u32 MaxNumBatches = SCUDO_ANDROID ? 4U : 8U;
-  typedef FlatByteMap<NumRegions> ByteMap;
-
-  struct ReleaseToOsInfo {
-    uptr BytesInFreeListAtLastCheckpoint;
-    uptr RangesReleased;
-    uptr LastReleasedBytes;
-    u64 LastReleaseAtNs;
-  };
-
-  struct BlocksInfo {
-    SinglyLinkedList<BatchGroupT> BlockList = {};
-    uptr PoppedBlocks = 0;
-    uptr PushedBlocks = 0;
-  };
-
-  struct alignas(SCUDO_CACHE_LINE_SIZE) SizeClassInfo {
-    HybridMutex Mutex;
-    BlocksInfo FreeListInfo GUARDED_BY(Mutex);
-    uptr CurrentRegion GUARDED_BY(Mutex);
-    uptr CurrentRegionAllocated GUARDED_BY(Mutex);
-    u32 RandState;
-    uptr AllocatedUser GUARDED_BY(Mutex);
-    // Lowest & highest region index allocated for this size class, to avoid
-    // looping through the whole NumRegions.
-    uptr MinRegionIndex GUARDED_BY(Mutex);
-    uptr MaxRegionIndex GUARDED_BY(Mutex);
-    ReleaseToOsInfo ReleaseInfo GUARDED_BY(Mutex);
-  };
-  static_assert(sizeof(SizeClassInfo) % SCUDO_CACHE_LINE_SIZE == 0, "");
-
-  uptr computeRegionId(uptr Mem) {
-    const uptr Id = Mem >> Config::Primary::RegionSizeLog;
-    CHECK_LT(Id, NumRegions);
-    return Id;
-  }
-
-  uptr allocateRegionSlow() {
-    uptr MapSize = 2 * RegionSize;
-    const uptr MapBase = reinterpret_cast<uptr>(
-        map(nullptr, MapSize, "scudo:primary", MAP_ALLOWNOMEM));
-    if (!MapBase)
-      return 0;
-    const uptr MapEnd = MapBase + MapSize;
-    uptr Region = MapBase;
-    if (isAligned(Region, RegionSize)) {
-      ScopedLock L(RegionsStashMutex);
-      if (NumberOfStashedRegions < MaxStashedRegions)
-        RegionsStash[NumberOfStashedRegions++] = MapBase + RegionSize;
-      else
-        MapSize = RegionSize;
-    } else {
-      Region = roundUp(MapBase, RegionSize);
-      unmap(reinterpret_cast<void *>(MapBase), Region - MapBase);
-      MapSize = RegionSize;
-    }
-    const uptr End = Region + MapSize;
-    if (End != MapEnd)
-      unmap(reinterpret_cast<void *>(End), MapEnd - End);
-
-    DCHECK_EQ(Region % RegionSize, 0U);
-    static_assert(Config::Primary::RegionSizeLog == GroupSizeLog,
-                  "Memory group should be the same size as Region");
-
-    return Region;
-  }
-
-  uptr allocateRegion(SizeClassInfo *Sci, uptr ClassId) REQUIRES(Sci->Mutex) {
-    DCHECK_LT(ClassId, NumClasses);
-    uptr Region = 0;
-    {
-      ScopedLock L(RegionsStashMutex);
-      if (NumberOfStashedRegions > 0)
-        Region = RegionsStash[--NumberOfStashedRegions];
-    }
-    if (!Region)
-      Region = allocateRegionSlow();
-    if (LIKELY(Region)) {
-      // Sci->Mutex is held by the caller, updating the Min/Max is safe.
-      const uptr RegionIndex = computeRegionId(Region);
-      if (RegionIndex < Sci->MinRegionIndex)
-        Sci->MinRegionIndex = RegionIndex;
-      if (RegionIndex > Sci->MaxRegionIndex)
-        Sci->MaxRegionIndex = RegionIndex;
-      ScopedLock L(ByteMapMutex);
-      PossibleRegions.set(RegionIndex, static_cast<u8>(ClassId + 1U));
-    }
-    return Region;
-  }
-
-  SizeClassInfo *getSizeClassInfo(uptr ClassId) {
-    DCHECK_LT(ClassId, NumClasses);
-    return &SizeClassInfoArray[ClassId];
-  }
-
-  void pushBatchClassBlocks(SizeClassInfo *Sci, CompactPtrT *Array, u32 Size)
-      REQUIRES(Sci->Mutex) {
-    DCHECK_EQ(Sci, getSizeClassInfo(SizeClassMap::BatchClassId));
-
-    // Free blocks are recorded by TransferBatch in freelist for all
-    // size-classes. In addition, TransferBatch is allocated from BatchClassId.
-    // In order not to use additional block to record the free blocks in
-    // BatchClassId, they are self-contained. I.e., A TransferBatch records the
-    // block address of itself. See the figure below:
-    //
-    // TransferBatch at 0xABCD
-    // +----------------------------+
-    // | Free blocks' addr          |
-    // | +------+------+------+     |
-    // | |0xABCD|...   |...   |     |
-    // | +------+------+------+     |
-    // +----------------------------+
-    //
-    // When we allocate all the free blocks in the TransferBatch, the block used
-    // by TransferBatch is also free for use. We don't need to recycle the
-    // TransferBatch. Note that the correctness is maintained by the invariant,
-    //
-    //   The unit of each popBatch() request is entire TransferBatch. Return
-    //   part of the blocks in a TransferBatch is invalid.
-    //
-    // This ensures that TransferBatch won't leak the address itself while it's
-    // still holding other valid data.
-    //
-    // Besides, BatchGroup is also allocated from BatchClassId and has its
-    // address recorded in the TransferBatch too. To maintain the correctness,
-    //
-    //   The address of BatchGroup is always recorded in the last TransferBatch
-    //   in the freelist (also imply that the freelist should only be
-    //   updated with push_front). Once the last TransferBatch is popped,
-    //   the block used by BatchGroup is also free for use.
-    //
-    // With this approach, the blocks used by BatchGroup and TransferBatch are
-    // reusable and don't need additional space for them.
-
-    Sci->FreeListInfo.PushedBlocks += Size;
-    BatchGroupT *BG = Sci->FreeListInfo.BlockList.front();
-
-    if (BG == nullptr) {
-      // Construct `BatchGroup` on the last element.
-      BG = reinterpret_cast<BatchGroupT *>(
-          decompactPtr(SizeClassMap::BatchClassId, Array[Size - 1]));
-      --Size;
-      BG->Batches.clear();
-      // BatchClass hasn't enabled memory group. Use `0` to indicate there's no
-      // memory group here.
-      BG->CompactPtrGroupBase = 0;
-      // `BG` is also the block of BatchClassId. Note that this is different
-      // from `CreateGroup` in `pushBlocksImpl`
-      BG->PushedBlocks = 1;
-      BG->BytesInBGAtLastCheckpoint = 0;
-      BG->MaxCachedPerBatch =
-          CacheT::getMaxCached(getSizeByClassId(SizeClassMap::BatchClassId));
-
-      Sci->FreeListInfo.BlockList.push_front(BG);
-    }
-
-    if (UNLIKELY(Size == 0))
-      return;
-
-    // This happens under 2 cases.
-    //   1. just allocated a new `BatchGroup`.
-    //   2. Only 1 block is pushed when the freelist is empty.
-    if (BG->Batches.empty()) {
-      // Construct the `TransferBatch` on the last element.
-      TransferBatchT *TB = reinterpret_cast<TransferBatchT *>(
-          decompactPtr(SizeClassMap::BatchClassId, Array[Size - 1]));
-      TB->clear();
-      // As mentioned above, addresses of `TransferBatch` and `BatchGroup` are
-      // recorded in the TransferBatch.
-      TB->add(Array[Size - 1]);
-      TB->add(
-          compactPtr(SizeClassMap::BatchClassId, reinterpret_cast<uptr>(BG)));
-      --Size;
-      DCHECK_EQ(BG->PushedBlocks, 1U);
-      // `TB` is also the block of BatchClassId.
-      BG->PushedBlocks += 1;
-      BG->Batches.push_front(TB);
-    }
-
-    TransferBatchT *CurBatch = BG->Batches.front();
-    DCHECK_NE(CurBatch, nullptr);
-
-    for (u32 I = 0; I < Size;) {
-      u16 UnusedSlots =
-          static_cast<u16>(BG->MaxCachedPerBatch - CurBatch->getCount());
-      if (UnusedSlots == 0) {
-        CurBatch = reinterpret_cast<TransferBatchT *>(
-            decompactPtr(SizeClassMap::BatchClassId, Array[I]));
-        CurBatch->clear();
-        // Self-contained
-        CurBatch->add(Array[I]);
-        ++I;
-        // TODO(chiahungduan): Avoid the use of push_back() in `Batches` of
-        // BatchClassId.
-        BG->Batches.push_front(CurBatch);
-        UnusedSlots = static_cast<u16>(BG->MaxCachedPerBatch - 1);
-      }
-      // `UnusedSlots` is u16 so the result will be also fit in u16.
-      const u16 AppendSize = static_cast<u16>(Min<u32>(UnusedSlots, Size - I));
-      CurBatch->appendFromArray(&Array[I], AppendSize);
-      I += AppendSize;
-    }
-
-    BG->PushedBlocks += Size;
-  }
-  // Push the blocks to their batch group. The layout will be like,
-  //
-  // FreeListInfo.BlockList - > BG -> BG -> BG
-  //                            |     |     |
-  //                            v     v     v
-  //                            TB    TB    TB
-  //                            |
-  //                            v
-  //                            TB
-  //
-  // Each BlockGroup(BG) will associate with unique group id and the free blocks
-  // are managed by a list of TransferBatch(TB). To reduce the time of inserting
-  // blocks, BGs are sorted and the input `Array` are supposed to be sorted so
-  // that we can get better performance of maintaining sorted property.
-  // Use `SameGroup=true` to indicate that all blocks in the array are from the
-  // same group then we will skip checking the group id of each block.
-  //
-  // The region mutex needs to be held while calling this method.
-  void pushBlocksImpl(CacheT *C, uptr ClassId, SizeClassInfo *Sci,
-                      CompactPtrT *Array, u32 Size, bool SameGroup = false)
-      REQUIRES(Sci->Mutex) {
-    DCHECK_NE(ClassId, SizeClassMap::BatchClassId);
-    DCHECK_GT(Size, 0U);
-
-    auto CreateGroup = [&](uptr CompactPtrGroupBase) {
-      BatchGroupT *BG =
-          reinterpret_cast<BatchGroupT *>(C->getBatchClassBlock());
-      BG->Batches.clear();
-      TransferBatchT *TB =
-          reinterpret_cast<TransferBatchT *>(C->getBatchClassBlock());
-      TB->clear();
-
-      BG->CompactPtrGroupBase = CompactPtrGroupBase;
-      BG->Batches.push_front(TB);
-      BG->PushedBlocks = 0;
-      BG->BytesInBGAtLastCheckpoint = 0;
-      BG->MaxCachedPerBatch = CacheT::getMaxCached(getSizeByClassId(ClassId));
-
-      return BG;
-    };
-
-    auto InsertBlocks = [&](BatchGroupT *BG, CompactPtrT *Array, u32 Size) {
-      SinglyLinkedList<TransferBatchT> &Batches = BG->Batches;
-      TransferBatchT *CurBatch = Batches.front();
-      DCHECK_NE(CurBatch, nullptr);
-
-      for (u32 I = 0; I < Size;) {
-        DCHECK_GE(BG->MaxCachedPerBatch, CurBatch->getCount());
-        u16 UnusedSlots =
-            static_cast<u16>(BG->MaxCachedPerBatch - CurBatch->getCount());
-        if (UnusedSlots == 0) {
-          CurBatch =
-              reinterpret_cast<TransferBatchT *>(C->getBatchClassBlock());
-          CurBatch->clear();
-          Batches.push_front(CurBatch);
-          UnusedSlots = BG->MaxCachedPerBatch;
-        }
-        // `UnusedSlots` is u16 so the result will be also fit in u16.
-        u16 AppendSize = static_cast<u16>(Min<u32>(UnusedSlots, Size - I));
-        CurBatch->appendFromArray(&Array[I], AppendSize);
-        I += AppendSize;
-      }
-
-      BG->PushedBlocks += Size;
-    };
-
-    Sci->FreeListInfo.PushedBlocks += Size;
-    BatchGroupT *Cur = Sci->FreeListInfo.BlockList.front();
-
-    // In the following, `Cur` always points to the BatchGroup for blocks that
-    // will be pushed next. `Prev` is the element right before `Cur`.
-    BatchGroupT *Prev = nullptr;
-
-    while (Cur != nullptr &&
-           compactPtrGroupBase(Array[0]) > Cur->CompactPtrGroupBase) {
-      Prev = Cur;
-      Cur = Cur->Next;
-    }
-
-    if (Cur == nullptr ||
-        compactPtrGroupBase(Array[0]) != Cur->CompactPtrGroupBase) {
-      Cur = CreateGroup(compactPtrGroupBase(Array[0]));
-      if (Prev == nullptr)
-        Sci->FreeListInfo.BlockList.push_front(Cur);
-      else
-        Sci->FreeListInfo.BlockList.insert(Prev, Cur);
-    }
-
-    // All the blocks are from the same group, just push without checking group
-    // id.
-    if (SameGroup) {
-      for (u32 I = 0; I < Size; ++I)
-        DCHECK_EQ(compactPtrGroupBase(Array[I]), Cur->CompactPtrGroupBase);
-
-      InsertBlocks(Cur, Array, Size);
-      return;
-    }
-
-    // The blocks are sorted by group id. Determine the segment of group and
-    // push them to their group together.
-    u32 Count = 1;
-    for (u32 I = 1; I < Size; ++I) {
-      if (compactPtrGroupBase(Array[I - 1]) != compactPtrGroupBase(Array[I])) {
-        DCHECK_EQ(compactPtrGroupBase(Array[I - 1]), Cur->CompactPtrGroupBase);
-        InsertBlocks(Cur, Array + I - Count, Count);
-
-        while (Cur != nullptr &&
-               compactPtrGroupBase(Array[I]) > Cur->CompactPtrGroupBase) {
-          Prev = Cur;
-          Cur = Cur->Next;
-        }
-
-        if (Cur == nullptr ||
-            compactPtrGroupBase(Array[I]) != Cur->CompactPtrGroupBase) {
-          Cur = CreateGroup(compactPtrGroupBase(Array[I]));
-          DCHECK_NE(Prev, nullptr);
-          Sci->FreeListInfo.BlockList.insert(Prev, Cur);
-        }
-
-        Count = 1;
-      } else {
-        ++Count;
-      }
-    }
-
-    InsertBlocks(Cur, Array + Size - Count, Count);
-  }
-
-  // Pop one TransferBatch from a BatchGroup. The BatchGroup with the smallest
-  // group id will be considered first.
-  //
-  // The region mutex needs to be held while calling this method.
-  TransferBatchT *popBatchImpl(CacheT *C, uptr ClassId, SizeClassInfo *Sci)
-      REQUIRES(Sci->Mutex) {
-    if (Sci->FreeListInfo.BlockList.empty())
-      return nullptr;
-
-    SinglyLinkedList<TransferBatchT> &Batches =
-        Sci->FreeListInfo.BlockList.front()->Batches;
-
-    if (Batches.empty()) {
-      DCHECK_EQ(ClassId, SizeClassMap::BatchClassId);
-      BatchGroupT *BG = Sci->FreeListInfo.BlockList.front();
-      Sci->FreeListInfo.BlockList.pop_front();
-
-      // Block used by `BatchGroup` is from BatchClassId. Turn the block into
-      // `TransferBatch` with single block.
-      TransferBatchT *TB = reinterpret_cast<TransferBatchT *>(BG);
-      TB->clear();
-      TB->add(
-          compactPtr(SizeClassMap::BatchClassId, reinterpret_cast<uptr>(TB)));
-      Sci->FreeListInfo.PoppedBlocks += 1;
-      return TB;
-    }
-
-    TransferBatchT *B = Batches.front();
-    Batches.pop_front();
-    DCHECK_NE(B, nullptr);
-    DCHECK_GT(B->getCount(), 0U);
-
-    if (Batches.empty()) {
-      BatchGroupT *BG = Sci->FreeListInfo.BlockList.front();
-      Sci->FreeListInfo.BlockList.pop_front();
-
-      // We don't keep BatchGroup with zero blocks to avoid empty-checking while
-      // allocating. Note that block used by constructing BatchGroup is recorded
-      // as free blocks in the last element of BatchGroup::Batches. Which means,
-      // once we pop the last TransferBatch, the block is implicitly
-      // deallocated.
-      if (ClassId != SizeClassMap::BatchClassId)
-        C->deallocate(SizeClassMap::BatchClassId, BG);
-    }
-
-    Sci->FreeListInfo.PoppedBlocks += B->getCount();
-    return B;
-  }
-
-  NOINLINE bool populateFreeList(CacheT *C, uptr ClassId, SizeClassInfo *Sci)
-      REQUIRES(Sci->Mutex) {
-    uptr Region;
-    uptr Offset;
-    // If the size-class currently has a region associated to it, use it. The
-    // newly created blocks will be located after the currently allocated memory
-    // for that region (up to RegionSize). Otherwise, create a new region, where
-    // the new blocks will be carved from the beginning.
-    if (Sci->CurrentRegion) {
-      Region = Sci->CurrentRegion;
-      DCHECK_GT(Sci->CurrentRegionAllocated, 0U);
-      Offset = Sci->CurrentRegionAllocated;
-    } else {
-      DCHECK_EQ(Sci->CurrentRegionAllocated, 0U);
-      Region = allocateRegion(Sci, ClassId);
-      if (UNLIKELY(!Region))
-        return false;
-      C->getStats().add(StatMapped, RegionSize);
-      Sci->CurrentRegion = Region;
-      Offset = 0;
-    }
-
-    const uptr Size = getSizeByClassId(ClassId);
-    const u16 MaxCount = CacheT::getMaxCached(Size);
-    DCHECK_GT(MaxCount, 0U);
-    // The maximum number of blocks we should carve in the region is dictated
-    // by the maximum number of batches we want to fill, and the amount of
-    // memory left in the current region (we use the lowest of the two). This
-    // will not be 0 as we ensure that a region can at least hold one block (via
-    // static_assert and at the end of this function).
-    const u32 NumberOfBlocks =
-        Min(MaxNumBatches * MaxCount,
-            static_cast<u32>((RegionSize - Offset) / Size));
-    DCHECK_GT(NumberOfBlocks, 0U);
-
-    constexpr u32 ShuffleArraySize =
-        MaxNumBatches * TransferBatchT::MaxNumCached;
-    // Fill the transfer batches and put them in the size-class freelist. We
-    // need to randomize the blocks for security purposes, so we first fill a
-    // local array that we then shuffle before populating the batches.
-    CompactPtrT ShuffleArray[ShuffleArraySize];
-    DCHECK_LE(NumberOfBlocks, ShuffleArraySize);
-
-    uptr P = Region + Offset;
-    for (u32 I = 0; I < NumberOfBlocks; I++, P += Size)
-      ShuffleArray[I] = reinterpret_cast<CompactPtrT>(P);
-
-    if (ClassId != SizeClassMap::BatchClassId) {
-      u32 N = 1;
-      uptr CurGroup = compactPtrGroupBase(ShuffleArray[0]);
-      for (u32 I = 1; I < NumberOfBlocks; I++) {
-        if (UNLIKELY(compactPtrGroupBase(ShuffleArray[I]) != CurGroup)) {
-          shuffle(ShuffleArray + I - N, N, &Sci->RandState);
-          pushBlocksImpl(C, ClassId, Sci, ShuffleArray + I - N, N,
-                         /*SameGroup=*/true);
-          N = 1;
-          CurGroup = compactPtrGroupBase(ShuffleArray[I]);
-        } else {
-          ++N;
-        }
-      }
-
-      shuffle(ShuffleArray + NumberOfBlocks - N, N, &Sci->RandState);
-      pushBlocksImpl(C, ClassId, Sci, &ShuffleArray[NumberOfBlocks - N], N,
-                     /*SameGroup=*/true);
-    } else {
-      pushBatchClassBlocks(Sci, ShuffleArray, NumberOfBlocks);
-    }
-
-    // Note that `PushedBlocks` and `PoppedBlocks` are supposed to only record
-    // the requests from `PushBlocks` and `PopBatch` which are external
-    // interfaces. `populateFreeList` is the internal interface so we should set
-    // the values back to avoid incorrectly setting the stats.
-    Sci->FreeListInfo.PushedBlocks -= NumberOfBlocks;
-
-    const uptr AllocatedUser = Size * NumberOfBlocks;
-    C->getStats().add(StatFree, AllocatedUser);
-    DCHECK_LE(Sci->CurrentRegionAllocated + AllocatedUser, RegionSize);
-    // If there is not enough room in the region currently associated to fit
-    // more blocks, we deassociate the region by resetting CurrentRegion and
-    // CurrentRegionAllocated. Otherwise, update the allocated amount.
-    if (RegionSize - (Sci->CurrentRegionAllocated + AllocatedUser) < Size) {
-      Sci->CurrentRegion = 0;
-      Sci->CurrentRegionAllocated = 0;
-    } else {
-      Sci->CurrentRegionAllocated += AllocatedUser;
-    }
-    Sci->AllocatedUser += AllocatedUser;
-
-    return true;
-  }
-
-  void getStats(ScopedString *Str, uptr ClassId, SizeClassInfo *Sci)
-      REQUIRES(Sci->Mutex) {
-    if (Sci->AllocatedUser == 0)
-      return;
-    const uptr BlockSize = getSizeByClassId(ClassId);
-    const uptr InUse =
-        Sci->FreeListInfo.PoppedBlocks - Sci->FreeListInfo.PushedBlocks;
-    const uptr BytesInFreeList = Sci->AllocatedUser - InUse * BlockSize;
-    uptr PushedBytesDelta = 0;
-    if (BytesInFreeList >= Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint) {
-      PushedBytesDelta =
-          BytesInFreeList - Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint;
-    }
-    const uptr AvailableChunks = Sci->AllocatedUser / BlockSize;
-    Str->append("  %02zu (%6zu): mapped: %6zuK popped: %7zu pushed: %7zu "
-                "inuse: %6zu avail: %6zu releases: %6zu last released: %6zuK "
-                "latest pushed bytes: %6zuK\n",
-                ClassId, getSizeByClassId(ClassId), Sci->AllocatedUser >> 10,
-                Sci->FreeListInfo.PoppedBlocks, Sci->FreeListInfo.PushedBlocks,
-                InUse, AvailableChunks, Sci->ReleaseInfo.RangesReleased,
-                Sci->ReleaseInfo.LastReleasedBytes >> 10,
-                PushedBytesDelta >> 10);
-  }
-
-  void getSizeClassFragmentationInfo(SizeClassInfo *Sci, uptr ClassId,
-                                     ScopedString *Str) REQUIRES(Sci->Mutex) {
-    const uptr BlockSize = getSizeByClassId(ClassId);
-    const uptr First = Sci->MinRegionIndex;
-    const uptr Last = Sci->MaxRegionIndex;
-    const uptr Base = First * RegionSize;
-    const uptr NumberOfRegions = Last - First + 1U;
-    auto SkipRegion = [this, First, ClassId](uptr RegionIndex) {
-      ScopedLock L(ByteMapMutex);
-      return (PossibleRegions[First + RegionIndex] - 1U) != ClassId;
-    };
-
-    FragmentationRecorder Recorder;
-    if (!Sci->FreeListInfo.BlockList.empty()) {
-      PageReleaseContext Context =
-          markFreeBlocks(Sci, ClassId, BlockSize, Base, NumberOfRegions,
-                         ReleaseToOS::ForceAll);
-      releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
-    }
-
-    const uptr PageSize = getPageSizeCached();
-    const uptr TotalBlocks = Sci->AllocatedUser / BlockSize;
-    const uptr InUseBlocks =
-        Sci->FreeListInfo.PoppedBlocks - Sci->FreeListInfo.PushedBlocks;
-    uptr AllocatedPagesCount = 0;
-    if (TotalBlocks != 0U) {
-      for (uptr I = 0; I < NumberOfRegions; ++I) {
-        if (SkipRegion(I))
-          continue;
-        AllocatedPagesCount += RegionSize / PageSize;
-      }
-
-      DCHECK_NE(AllocatedPagesCount, 0U);
-    }
-
-    DCHECK_GE(AllocatedPagesCount, Recorder.getReleasedPagesCount());
-    const uptr InUsePages =
-        AllocatedPagesCount - Recorder.getReleasedPagesCount();
-    const uptr InUseBytes = InUsePages * PageSize;
-
-    uptr Integral;
-    uptr Fractional;
-    computePercentage(BlockSize * InUseBlocks, InUsePages * PageSize, &Integral,
-                      &Fractional);
-    Str->append("  %02zu (%6zu): inuse/total blocks: %6zu/%6zu inuse/total "
-                "pages: %6zu/%6zu inuse bytes: %6zuK util: %3zu.%02zu%%\n",
-                ClassId, BlockSize, InUseBlocks, TotalBlocks, InUsePages,
-                AllocatedPagesCount, InUseBytes >> 10, Integral, Fractional);
-  }
-
-  NOINLINE uptr releaseToOSMaybe(SizeClassInfo *Sci, uptr ClassId,
-                                 ReleaseToOS ReleaseType = ReleaseToOS::Normal)
-      REQUIRES(Sci->Mutex) {
-    const uptr BlockSize = getSizeByClassId(ClassId);
-
-    DCHECK_GE(Sci->FreeListInfo.PoppedBlocks, Sci->FreeListInfo.PushedBlocks);
-    const uptr BytesInFreeList =
-        Sci->AllocatedUser -
-        (Sci->FreeListInfo.PoppedBlocks - Sci->FreeListInfo.PushedBlocks) *
-            BlockSize;
-
-    if (UNLIKELY(BytesInFreeList == 0))
-      return 0;
-
-    // ====================================================================== //
-    // 1. Check if we have enough free blocks and if it's worth doing a page
-    // release.
-    // ====================================================================== //
-    if (ReleaseType != ReleaseToOS::ForceAll &&
-        !hasChanceToReleasePages(Sci, BlockSize, BytesInFreeList,
-                                 ReleaseType)) {
-      return 0;
-    }
-
-    const uptr First = Sci->MinRegionIndex;
-    const uptr Last = Sci->MaxRegionIndex;
-    DCHECK_NE(Last, 0U);
-    DCHECK_LE(First, Last);
-    uptr TotalReleasedBytes = 0;
-    const uptr Base = First * RegionSize;
-    const uptr NumberOfRegions = Last - First + 1U;
-
-    // ==================================================================== //
-    // 2. Mark the free blocks and we can tell which pages are in-use by
-    //    querying `PageReleaseContext`.
-    // ==================================================================== //
-    PageReleaseContext Context = markFreeBlocks(Sci, ClassId, BlockSize, Base,
-                                                NumberOfRegions, ReleaseType);
-    if (!Context.hasBlockMarked())
-      return 0;
-
-    // ==================================================================== //
-    // 3. Release the unused physical pages back to the OS.
-    // ==================================================================== //
-    ReleaseRecorder Recorder(Base);
-    auto SkipRegion = [this, First, ClassId](uptr RegionIndex) {
-      ScopedLock L(ByteMapMutex);
-      return (PossibleRegions[First + RegionIndex] - 1U) != ClassId;
-    };
-    releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
-
-    if (Recorder.getReleasedRangesCount() > 0) {
-      Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint = BytesInFreeList;
-      Sci->ReleaseInfo.RangesReleased += Recorder.getReleasedRangesCount();
-      Sci->ReleaseInfo.LastReleasedBytes = Recorder.getReleasedBytes();
-      TotalReleasedBytes += Sci->ReleaseInfo.LastReleasedBytes;
-    }
-    Sci->ReleaseInfo.LastReleaseAtNs = getMonotonicTimeFast();
-
-    return TotalReleasedBytes;
-  }
-
-  bool hasChanceToReleasePages(SizeClassInfo *Sci, uptr BlockSize,
-                               uptr BytesInFreeList, ReleaseToOS ReleaseType)
-      REQUIRES(Sci->Mutex) {
-    DCHECK_GE(Sci->FreeListInfo.PoppedBlocks, Sci->FreeListInfo.PushedBlocks);
-    const uptr PageSize = getPageSizeCached();
-
-    if (BytesInFreeList <= Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint)
-      Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint = BytesInFreeList;
-
-    // Always update `BytesInFreeListAtLastCheckpoint` with the smallest value
-    // so that we won't underestimate the releasable pages. For example, the
-    // following is the region usage,
-    //
-    //  BytesInFreeListAtLastCheckpoint   AllocatedUser
-    //                v                         v
-    //  |--------------------------------------->
-    //         ^                   ^
-    //  BytesInFreeList     ReleaseThreshold
-    //
-    // In general, if we have collected enough bytes and the amount of free
-    // bytes meets the ReleaseThreshold, we will try to do page release. If we
-    // don't update `BytesInFreeListAtLastCheckpoint` when the current
-    // `BytesInFreeList` is smaller, we may take longer time to wait for enough
-    // freed blocks because we miss the bytes between
-    // (BytesInFreeListAtLastCheckpoint - BytesInFreeList).
-    const uptr PushedBytesDelta =
-        BytesInFreeList - Sci->ReleaseInfo.BytesInFreeListAtLastCheckpoint;
-    if (PushedBytesDelta < PageSize)
-      return false;
-
-    // Releasing smaller blocks is expensive, so we want to make sure that a
-    // significant amount of bytes are free, and that there has been a good
-    // amount of batches pushed to the freelist before attempting to release.
-    if (isSmallBlock(BlockSize) && ReleaseType == ReleaseToOS::Normal)
-      if (PushedBytesDelta < Sci->AllocatedUser / 16U)
-        return false;
-
-    if (ReleaseType == ReleaseToOS::Normal) {
-      const s32 IntervalMs = atomic_load_relaxed(&ReleaseToOsIntervalMs);
-      if (IntervalMs < 0)
-        return false;
-
-      // The constant 8 here is selected from profiling some apps and the number
-      // of unreleased pages in the large size classes is around 16 pages or
-      // more. Choose half of it as a heuristic and which also avoids page
-      // release every time for every pushBlocks() attempt by large blocks.
-      const bool ByPassReleaseInterval =
-          isLargeBlock(BlockSize) && PushedBytesDelta > 8 * PageSize;
-      if (!ByPassReleaseInterval) {
-        if (Sci->ReleaseInfo.LastReleaseAtNs +
-                static_cast<u64>(IntervalMs) * 1000000 >
-            getMonotonicTimeFast()) {
-          // Memory was returned recently.
-          return false;
-        }
-      }
-    } // if (ReleaseType == ReleaseToOS::Normal)
-
-    return true;
-  }
-
-  PageReleaseContext markFreeBlocks(SizeClassInfo *Sci, const uptr ClassId,
-                                    const uptr BlockSize, const uptr Base,
-                                    const uptr NumberOfRegions,
-                                    ReleaseToOS ReleaseType)
-      REQUIRES(Sci->Mutex) {
-    const uptr PageSize = getPageSizeCached();
-    const uptr GroupSize = (1UL << GroupSizeLog);
-    const uptr CurGroupBase =
-        compactPtrGroupBase(compactPtr(ClassId, Sci->CurrentRegion));
-
-    PageReleaseContext Context(BlockSize, NumberOfRegions,
-                               /*ReleaseSize=*/RegionSize);
-
-    auto DecompactPtr = [](CompactPtrT CompactPtr) {
-      return reinterpret_cast<uptr>(CompactPtr);
-    };
-    for (BatchGroupT &BG : Sci->FreeListInfo.BlockList) {
-      const uptr GroupBase = decompactGroupBase(BG.CompactPtrGroupBase);
-      // The `GroupSize` may not be divided by `BlockSize`, which means there is
-      // an unused space at the end of Region. Exclude that space to avoid
-      // unused page map entry.
-      uptr AllocatedGroupSize = GroupBase == CurGroupBase
-                                    ? Sci->CurrentRegionAllocated
-                                    : roundDownSlow(GroupSize, BlockSize);
-      if (AllocatedGroupSize == 0)
-        continue;
-
-      // TransferBatches are pushed in front of BG.Batches. The first one may
-      // not have all caches used.
-      const uptr NumBlocks = (BG.Batches.size() - 1) * BG.MaxCachedPerBatch +
-                             BG.Batches.front()->getCount();
-      const uptr BytesInBG = NumBlocks * BlockSize;
-
-      if (ReleaseType != ReleaseToOS::ForceAll) {
-        if (BytesInBG <= BG.BytesInBGAtLastCheckpoint) {
-          BG.BytesInBGAtLastCheckpoint = BytesInBG;
-          continue;
-        }
-
-        const uptr PushedBytesDelta = BytesInBG - BG.BytesInBGAtLastCheckpoint;
-        if (PushedBytesDelta < PageSize)
-          continue;
-
-        // Given the randomness property, we try to release the pages only if
-        // the bytes used by free blocks exceed certain proportion of allocated
-        // spaces.
-        if (isSmallBlock(BlockSize) && (BytesInBG * 100U) / AllocatedGroupSize <
-                                           (100U - 1U - BlockSize / 16U)) {
-          continue;
-        }
-      }
-
-      // TODO: Consider updating this after page release if `ReleaseRecorder`
-      // can tell the released bytes in each group.
-      BG.BytesInBGAtLastCheckpoint = BytesInBG;
-
-      const uptr MaxContainedBlocks = AllocatedGroupSize / BlockSize;
-      const uptr RegionIndex = (GroupBase - Base) / RegionSize;
-
-      if (NumBlocks == MaxContainedBlocks) {
-        for (const auto &It : BG.Batches)
-          for (u16 I = 0; I < It.getCount(); ++I)
-            DCHECK_EQ(compactPtrGroupBase(It.get(I)), BG.CompactPtrGroupBase);
-
-        const uptr To = GroupBase + AllocatedGroupSize;
-        Context.markRangeAsAllCounted(GroupBase, To, GroupBase, RegionIndex,
-                                      AllocatedGroupSize);
-      } else {
-        DCHECK_LT(NumBlocks, MaxContainedBlocks);
-
-        // Note that we don't always visit blocks in each BatchGroup so that we
-        // may miss the chance of releasing certain pages that cross
-        // BatchGroups.
-        Context.markFreeBlocksInRegion(BG.Batches, DecompactPtr, GroupBase,
-                                       RegionIndex, AllocatedGroupSize,
-                                       /*MayContainLastBlockInRegion=*/true);
-      }
-
-      // We may not be able to do the page release In a rare case that we may
-      // fail on PageMap allocation.
-      if (UNLIKELY(!Context.hasBlockMarked()))
-        break;
-    }
-
-    return Context;
-  }
-
-  SizeClassInfo SizeClassInfoArray[NumClasses] = {};
-
-  HybridMutex ByteMapMutex;
-  // Track the regions in use, 0 is unused, otherwise store ClassId + 1.
-  ByteMap PossibleRegions GUARDED_BY(ByteMapMutex) = {};
-  atomic_s32 ReleaseToOsIntervalMs = {};
-  // Unless several threads request regions simultaneously from different size
-  // classes, the stash rarely contains more than 1 entry.
-  static constexpr uptr MaxStashedRegions = 4;
-  HybridMutex RegionsStashMutex;
-  uptr NumberOfStashedRegions GUARDED_BY(RegionsStashMutex) = 0;
-  uptr RegionsStash[MaxStashedRegions] GUARDED_BY(RegionsStashMutex) = {};
-};
-
-} // namespace scudo
-
-#endif // SCUDO_PRIMARY32_H_
diff --git a/Telegram/ThirdParty/scudo/primary64.h b/Telegram/ThirdParty/scudo/primary64.h
deleted file mode 100644
index 9a642d236..000000000
--- a/Telegram/ThirdParty/scudo/primary64.h
+++ /dev/null
@@ -1,1688 +0,0 @@
-//===-- primary64.h ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_PRIMARY64_H_
-#define SCUDO_PRIMARY64_H_
-
-#include "allocator_common.h"
-#include "bytemap.h"
-#include "common.h"
-#include "list.h"
-#include "local_cache.h"
-#include "mem_map.h"
-#include "memtag.h"
-#include "options.h"
-#include "release.h"
-#include "stats.h"
-#include "string_utils.h"
-#include "thread_annotations.h"
-
-#include "condition_variable.h"
-
-namespace scudo {
-
-// SizeClassAllocator64 is an allocator tuned for 64-bit address space.
-//
-// It starts by reserving NumClasses * 2^RegionSizeLog bytes, equally divided in
-// Regions, specific to each size class. Note that the base of that mapping is
-// random (based to the platform specific map() capabilities). If
-// PrimaryEnableRandomOffset is set, each Region actually starts at a random
-// offset from its base.
-//
-// Regions are mapped incrementally on demand to fulfill allocation requests,
-// those mappings being split into equally sized Blocks based on the size class
-// they belong to. The Blocks created are shuffled to prevent predictable
-// address patterns (the predictability increases with the size of the Blocks).
-//
-// The 1st Region (for size class 0) holds the TransferBatches. This is a
-// structure used to transfer arrays of available pointers from the class size
-// freelist to the thread specific freelist, and back.
-//
-// The memory used by this allocator is never unmapped, but can be partially
-// released if the platform allows for it.
-
-template <typename Config> class SizeClassAllocator64 {
-public:
-  typedef typename Config::Primary::CompactPtrT CompactPtrT;
-  typedef typename Config::Primary::SizeClassMap SizeClassMap;
-  typedef typename ConditionVariableState<
-      typename Config::Primary>::ConditionVariableT ConditionVariableT;
-  static const uptr CompactPtrScale = Config::Primary::CompactPtrScale;
-  static const uptr RegionSizeLog = Config::Primary::RegionSizeLog;
-  static const uptr GroupSizeLog = Config::Primary::GroupSizeLog;
-  static_assert(RegionSizeLog >= GroupSizeLog,
-                "Group size shouldn't be greater than the region size");
-  static const uptr GroupScale = GroupSizeLog - CompactPtrScale;
-  typedef SizeClassAllocator64<Config> ThisT;
-  typedef SizeClassAllocatorLocalCache<ThisT> CacheT;
-  typedef TransferBatch<ThisT> TransferBatchT;
-  typedef BatchGroup<ThisT> BatchGroupT;
-
-  static_assert(sizeof(BatchGroupT) <= sizeof(TransferBatchT),
-                "BatchGroupT uses the same class size as TransferBatchT");
-
-  static uptr getSizeByClassId(uptr ClassId) {
-    return (ClassId == SizeClassMap::BatchClassId)
-               ? roundUp(sizeof(TransferBatchT), 1U << CompactPtrScale)
-               : SizeClassMap::getSizeByClassId(ClassId);
-  }
-
-  static bool canAllocate(uptr Size) { return Size <= SizeClassMap::MaxSize; }
-
-  static bool conditionVariableEnabled() {
-    return ConditionVariableState<typename Config::Primary>::enabled();
-  }
-
-  void init(s32 ReleaseToOsInterval) NO_THREAD_SAFETY_ANALYSIS {
-    DCHECK(isAligned(reinterpret_cast<uptr>(this), alignof(ThisT)));
-
-    const uptr PageSize = getPageSizeCached();
-    const uptr GroupSize = (1UL << GroupSizeLog);
-    const uptr PagesInGroup = GroupSize / PageSize;
-    const uptr MinSizeClass = getSizeByClassId(1);
-    // When trying to release pages back to memory, visiting smaller size
-    // classes is expensive. Therefore, we only try to release smaller size
-    // classes when the amount of free blocks goes over a certain threshold (See
-    // the comment in releaseToOSMaybe() for more details). For example, for
-    // size class 32, we only do the release when the size of free blocks is
-    // greater than 97% of pages in a group. However, this may introduce another
-    // issue that if the number of free blocks is bouncing between 97% ~ 100%.
-    // Which means we may try many page releases but only release very few of
-    // them (less than 3% in a group). Even though we have
-    // `&ReleaseToOsIntervalMs` which slightly reduce the frequency of these
-    // calls but it will be better to have another guard to mitigate this issue.
-    //
-    // Here we add another constraint on the minimum size requirement. The
-    // constraint is determined by the size of in-use blocks in the minimal size
-    // class. Take size class 32 as an example,
-    //
-    //   +-     one memory group      -+
-    //   +----------------------+------+
-    //   |  97% of free blocks  |      |
-    //   +----------------------+------+
-    //                           \    /
-    //                      3% in-use blocks
-    //
-    //   * The release size threshold is 97%.
-    //
-    // The 3% size in a group is about 7 pages. For two consecutive
-    // releaseToOSMaybe(), we require the difference between `PushedBlocks`
-    // should be greater than 7 pages. This mitigates the page releasing
-    // thrashing which is caused by memory usage bouncing around the threshold.
-    // The smallest size class takes longest time to do the page release so we
-    // use its size of in-use blocks as a heuristic.
-    SmallerBlockReleasePageDelta =
-        PagesInGroup * (1 + MinSizeClass / 16U) / 100;
-
-    // Reserve the space required for the Primary.
-    CHECK(ReservedMemory.create(/*Addr=*/0U, PrimarySize,
-                                "scudo:primary_reserve"));
-    PrimaryBase = ReservedMemory.getBase();
-    DCHECK_NE(PrimaryBase, 0U);
-
-    u32 Seed;
-    const u64 Time = getMonotonicTimeFast();
-    if (!getRandom(reinterpret_cast<void *>(&Seed), sizeof(Seed)))
-      Seed = static_cast<u32>(Time ^ (PrimaryBase >> 12));
-
-    for (uptr I = 0; I < NumClasses; I++) {
-      RegionInfo *Region = getRegionInfo(I);
-
-      // The actual start of a region is offset by a random number of pages
-      // when PrimaryEnableRandomOffset is set.
-      Region->RegionBeg = (PrimaryBase + (I << RegionSizeLog)) +
-                          (Config::Primary::EnableRandomOffset
-                               ? ((getRandomModN(&Seed, 16) + 1) * PageSize)
-                               : 0);
-      Region->RandState = getRandomU32(&Seed);
-      // Releasing small blocks is expensive, set a higher threshold to avoid
-      // frequent page releases.
-      if (isSmallBlock(getSizeByClassId(I)))
-        Region->TryReleaseThreshold = PageSize * SmallerBlockReleasePageDelta;
-      else
-        Region->TryReleaseThreshold = PageSize;
-      Region->ReleaseInfo.LastReleaseAtNs = Time;
-
-      Region->MemMapInfo.MemMap = ReservedMemory.dispatch(
-          PrimaryBase + (I << RegionSizeLog), RegionSize);
-      CHECK(Region->MemMapInfo.MemMap.isAllocated());
-    }
-    shuffle(RegionInfoArray, NumClasses, &Seed);
-
-    // The binding should be done after region shuffling so that it won't bind
-    // the FLLock from the wrong region.
-    for (uptr I = 0; I < NumClasses; I++)
-      getRegionInfo(I)->FLLockCV.bindTestOnly(getRegionInfo(I)->FLLock);
-
-    setOption(Option::ReleaseInterval, static_cast<sptr>(ReleaseToOsInterval));
-  }
-
-  void unmapTestOnly() NO_THREAD_SAFETY_ANALYSIS {
-    for (uptr I = 0; I < NumClasses; I++) {
-      RegionInfo *Region = getRegionInfo(I);
-      *Region = {};
-    }
-    if (PrimaryBase)
-      ReservedMemory.release();
-    PrimaryBase = 0U;
-  }
-
-  // When all blocks are freed, it has to be the same size as `AllocatedUser`.
-  void verifyAllBlocksAreReleasedTestOnly() {
-    // `BatchGroup` and `TransferBatch` also use the blocks from BatchClass.
-    uptr BatchClassUsedInFreeLists = 0;
-    for (uptr I = 0; I < NumClasses; I++) {
-      // We have to count BatchClassUsedInFreeLists in other regions first.
-      if (I == SizeClassMap::BatchClassId)
-        continue;
-      RegionInfo *Region = getRegionInfo(I);
-      ScopedLock ML(Region->MMLock);
-      ScopedLock FL(Region->FLLock);
-      const uptr BlockSize = getSizeByClassId(I);
-      uptr TotalBlocks = 0;
-      for (BatchGroupT &BG : Region->FreeListInfo.BlockList) {
-        // `BG::Batches` are `TransferBatches`. +1 for `BatchGroup`.
-        BatchClassUsedInFreeLists += BG.Batches.size() + 1;
-        for (const auto &It : BG.Batches)
-          TotalBlocks += It.getCount();
-      }
-
-      DCHECK_EQ(TotalBlocks, Region->MemMapInfo.AllocatedUser / BlockSize);
-      DCHECK_EQ(Region->FreeListInfo.PushedBlocks,
-                Region->FreeListInfo.PoppedBlocks);
-    }
-
-    RegionInfo *Region = getRegionInfo(SizeClassMap::BatchClassId);
-    ScopedLock ML(Region->MMLock);
-    ScopedLock FL(Region->FLLock);
-    const uptr BlockSize = getSizeByClassId(SizeClassMap::BatchClassId);
-    uptr TotalBlocks = 0;
-    for (BatchGroupT &BG : Region->FreeListInfo.BlockList) {
-      if (LIKELY(!BG.Batches.empty())) {
-        for (const auto &It : BG.Batches)
-          TotalBlocks += It.getCount();
-      } else {
-        // `BatchGroup` with empty freelist doesn't have `TransferBatch` record
-        // itself.
-        ++TotalBlocks;
-      }
-    }
-    DCHECK_EQ(TotalBlocks + BatchClassUsedInFreeLists,
-              Region->MemMapInfo.AllocatedUser / BlockSize);
-    DCHECK_GE(Region->FreeListInfo.PoppedBlocks,
-              Region->FreeListInfo.PushedBlocks);
-    const uptr BlocksInUse =
-        Region->FreeListInfo.PoppedBlocks - Region->FreeListInfo.PushedBlocks;
-    DCHECK_EQ(BlocksInUse, BatchClassUsedInFreeLists);
-  }
-
-  // Note that the `MaxBlockCount` will be used when we support arbitrary blocks
-  // count. Now it's the same as the number of blocks stored in the
-  // `TransferBatch`.
-  u16 popBlocks(CacheT *C, uptr ClassId, CompactPtrT *ToArray,
-                UNUSED const u16 MaxBlockCount) {
-    TransferBatchT *B = popBatch(C, ClassId);
-    if (!B)
-      return 0;
-
-    const u16 Count = B->getCount();
-    DCHECK_GT(Count, 0U);
-    B->moveToArray(ToArray);
-
-    if (ClassId != SizeClassMap::BatchClassId)
-      C->deallocate(SizeClassMap::BatchClassId, B);
-
-    return Count;
-  }
-
-  TransferBatchT *popBatch(CacheT *C, uptr ClassId) {
-    DCHECK_LT(ClassId, NumClasses);
-    RegionInfo *Region = getRegionInfo(ClassId);
-
-    {
-      ScopedLock L(Region->FLLock);
-      TransferBatchT *B = popBatchImpl(C, ClassId, Region);
-      if (LIKELY(B))
-        return B;
-    }
-
-    bool ReportRegionExhausted = false;
-    TransferBatchT *B = nullptr;
-
-    if (conditionVariableEnabled()) {
-      B = popBatchWithCV(C, ClassId, Region, ReportRegionExhausted);
-    } else {
-      while (true) {
-        // When two threads compete for `Region->MMLock`, we only want one of
-        // them to call populateFreeListAndPopBatch(). To avoid both of them
-        // doing that, always check the freelist before mapping new pages.
-        ScopedLock ML(Region->MMLock);
-        {
-          ScopedLock FL(Region->FLLock);
-          if ((B = popBatchImpl(C, ClassId, Region)))
-            break;
-        }
-
-        const bool RegionIsExhausted = Region->Exhausted;
-        if (!RegionIsExhausted)
-          B = populateFreeListAndPopBatch(C, ClassId, Region);
-        ReportRegionExhausted = !RegionIsExhausted && Region->Exhausted;
-        break;
-      }
-    }
-
-    if (UNLIKELY(ReportRegionExhausted)) {
-      Printf("Can't populate more pages for size class %zu.\n",
-             getSizeByClassId(ClassId));
-
-      // Theoretically, BatchClass shouldn't be used up. Abort immediately  when
-      // it happens.
-      if (ClassId == SizeClassMap::BatchClassId)
-        reportOutOfBatchClass();
-    }
-
-    return B;
-  }
-
-  // Push the array of free blocks to the designated batch group.
-  void pushBlocks(CacheT *C, uptr ClassId, CompactPtrT *Array, u32 Size) {
-    DCHECK_LT(ClassId, NumClasses);
-    DCHECK_GT(Size, 0);
-
-    RegionInfo *Region = getRegionInfo(ClassId);
-    if (ClassId == SizeClassMap::BatchClassId) {
-      ScopedLock L(Region->FLLock);
-      pushBatchClassBlocks(Region, Array, Size);
-      if (conditionVariableEnabled())
-        Region->FLLockCV.notifyAll(Region->FLLock);
-      return;
-    }
-
-    // TODO(chiahungduan): Consider not doing grouping if the group size is not
-    // greater than the block size with a certain scale.
-
-    bool SameGroup = true;
-    if (GroupSizeLog < RegionSizeLog) {
-      // Sort the blocks so that blocks belonging to the same group can be
-      // pushed together.
-      for (u32 I = 1; I < Size; ++I) {
-        if (compactPtrGroup(Array[I - 1]) != compactPtrGroup(Array[I]))
-          SameGroup = false;
-        CompactPtrT Cur = Array[I];
-        u32 J = I;
-        while (J > 0 && compactPtrGroup(Cur) < compactPtrGroup(Array[J - 1])) {
-          Array[J] = Array[J - 1];
-          --J;
-        }
-        Array[J] = Cur;
-      }
-    }
-
-    {
-      ScopedLock L(Region->FLLock);
-      pushBlocksImpl(C, ClassId, Region, Array, Size, SameGroup);
-      if (conditionVariableEnabled())
-        Region->FLLockCV.notifyAll(Region->FLLock);
-    }
-  }
-
-  void disable() NO_THREAD_SAFETY_ANALYSIS {
-    // The BatchClassId must be locked last since other classes can use it.
-    for (sptr I = static_cast<sptr>(NumClasses) - 1; I >= 0; I--) {
-      if (static_cast<uptr>(I) == SizeClassMap::BatchClassId)
-        continue;
-      getRegionInfo(static_cast<uptr>(I))->MMLock.lock();
-      getRegionInfo(static_cast<uptr>(I))->FLLock.lock();
-    }
-    getRegionInfo(SizeClassMap::BatchClassId)->MMLock.lock();
-    getRegionInfo(SizeClassMap::BatchClassId)->FLLock.lock();
-  }
-
-  void enable() NO_THREAD_SAFETY_ANALYSIS {
-    getRegionInfo(SizeClassMap::BatchClassId)->FLLock.unlock();
-    getRegionInfo(SizeClassMap::BatchClassId)->MMLock.unlock();
-    for (uptr I = 0; I < NumClasses; I++) {
-      if (I == SizeClassMap::BatchClassId)
-        continue;
-      getRegionInfo(I)->FLLock.unlock();
-      getRegionInfo(I)->MMLock.unlock();
-    }
-  }
-
-  template <typename F> void iterateOverBlocks(F Callback) {
-    for (uptr I = 0; I < NumClasses; I++) {
-      if (I == SizeClassMap::BatchClassId)
-        continue;
-      RegionInfo *Region = getRegionInfo(I);
-      // TODO: The call of `iterateOverBlocks` requires disabling
-      // SizeClassAllocator64. We may consider locking each region on demand
-      // only.
-      Region->FLLock.assertHeld();
-      Region->MMLock.assertHeld();
-      const uptr BlockSize = getSizeByClassId(I);
-      const uptr From = Region->RegionBeg;
-      const uptr To = From + Region->MemMapInfo.AllocatedUser;
-      for (uptr Block = From; Block < To; Block += BlockSize)
-        Callback(Block);
-    }
-  }
-
-  void getStats(ScopedString *Str) {
-    // TODO(kostyak): get the RSS per region.
-    uptr TotalMapped = 0;
-    uptr PoppedBlocks = 0;
-    uptr PushedBlocks = 0;
-    for (uptr I = 0; I < NumClasses; I++) {
-      RegionInfo *Region = getRegionInfo(I);
-      {
-        ScopedLock L(Region->MMLock);
-        TotalMapped += Region->MemMapInfo.MappedUser;
-      }
-      {
-        ScopedLock L(Region->FLLock);
-        PoppedBlocks += Region->FreeListInfo.PoppedBlocks;
-        PushedBlocks += Region->FreeListInfo.PushedBlocks;
-      }
-    }
-    Str->append("Stats: SizeClassAllocator64: %zuM mapped (%uM rss) in %zu "
-                "allocations; remains %zu\n",
-                TotalMapped >> 20, 0U, PoppedBlocks,
-                PoppedBlocks - PushedBlocks);
-
-    for (uptr I = 0; I < NumClasses; I++) {
-      RegionInfo *Region = getRegionInfo(I);
-      ScopedLock L1(Region->MMLock);
-      ScopedLock L2(Region->FLLock);
-      getStats(Str, I, Region);
-    }
-  }
-
-  void getFragmentationInfo(ScopedString *Str) {
-    Str->append(
-        "Fragmentation Stats: SizeClassAllocator64: page size = %zu bytes\n",
-        getPageSizeCached());
-
-    for (uptr I = 1; I < NumClasses; I++) {
-      RegionInfo *Region = getRegionInfo(I);
-      ScopedLock L(Region->MMLock);
-      getRegionFragmentationInfo(Region, I, Str);
-    }
-  }
-
-  bool setOption(Option O, sptr Value) {
-    if (O == Option::ReleaseInterval) {
-      const s32 Interval = Max(Min(static_cast<s32>(Value),
-                                   Config::Primary::MaxReleaseToOsIntervalMs),
-                               Config::Primary::MinReleaseToOsIntervalMs);
-      atomic_store_relaxed(&ReleaseToOsIntervalMs, Interval);
-      return true;
-    }
-    // Not supported by the Primary, but not an error either.
-    return true;
-  }
-
-  uptr tryReleaseToOS(uptr ClassId, ReleaseToOS ReleaseType) {
-    RegionInfo *Region = getRegionInfo(ClassId);
-    // Note that the tryLock() may fail spuriously, given that it should rarely
-    // happen and page releasing is fine to skip, we don't take certain
-    // approaches to ensure one page release is done.
-    if (Region->MMLock.tryLock()) {
-      uptr BytesReleased = releaseToOSMaybe(Region, ClassId, ReleaseType);
-      Region->MMLock.unlock();
-      return BytesReleased;
-    }
-    return 0;
-  }
-
-  uptr releaseToOS(ReleaseToOS ReleaseType) {
-    uptr TotalReleasedBytes = 0;
-    for (uptr I = 0; I < NumClasses; I++) {
-      if (I == SizeClassMap::BatchClassId)
-        continue;
-      RegionInfo *Region = getRegionInfo(I);
-      ScopedLock L(Region->MMLock);
-      TotalReleasedBytes += releaseToOSMaybe(Region, I, ReleaseType);
-    }
-    return TotalReleasedBytes;
-  }
-
-  const char *getRegionInfoArrayAddress() const {
-    return reinterpret_cast<const char *>(RegionInfoArray);
-  }
-
-  static uptr getRegionInfoArraySize() { return sizeof(RegionInfoArray); }
-
-  uptr getCompactPtrBaseByClassId(uptr ClassId) {
-    return getRegionInfo(ClassId)->RegionBeg;
-  }
-
-  CompactPtrT compactPtr(uptr ClassId, uptr Ptr) {
-    DCHECK_LE(ClassId, SizeClassMap::LargestClassId);
-    return compactPtrInternal(getCompactPtrBaseByClassId(ClassId), Ptr);
-  }
-
-  void *decompactPtr(uptr ClassId, CompactPtrT CompactPtr) {
-    DCHECK_LE(ClassId, SizeClassMap::LargestClassId);
-    return reinterpret_cast<void *>(
-        decompactPtrInternal(getCompactPtrBaseByClassId(ClassId), CompactPtr));
-  }
-
-  static BlockInfo findNearestBlock(const char *RegionInfoData,
-                                    uptr Ptr) NO_THREAD_SAFETY_ANALYSIS {
-    const RegionInfo *RegionInfoArray =
-        reinterpret_cast<const RegionInfo *>(RegionInfoData);
-
-    uptr ClassId;
-    uptr MinDistance = -1UL;
-    for (uptr I = 0; I != NumClasses; ++I) {
-      if (I == SizeClassMap::BatchClassId)
-        continue;
-      uptr Begin = RegionInfoArray[I].RegionBeg;
-      // TODO(chiahungduan): In fact, We need to lock the RegionInfo::MMLock.
-      // However, the RegionInfoData is passed with const qualifier and lock the
-      // mutex requires modifying RegionInfoData, which means we need to remove
-      // the const qualifier. This may lead to another undefined behavior (The
-      // first one is accessing `AllocatedUser` without locking. It's better to
-      // pass `RegionInfoData` as `void *` then we can lock the mutex properly.
-      uptr End = Begin + RegionInfoArray[I].MemMapInfo.AllocatedUser;
-      if (Begin > End || End - Begin < SizeClassMap::getSizeByClassId(I))
-        continue;
-      uptr RegionDistance;
-      if (Begin <= Ptr) {
-        if (Ptr < End)
-          RegionDistance = 0;
-        else
-          RegionDistance = Ptr - End;
-      } else {
-        RegionDistance = Begin - Ptr;
-      }
-
-      if (RegionDistance < MinDistance) {
-        MinDistance = RegionDistance;
-        ClassId = I;
-      }
-    }
-
-    BlockInfo B = {};
-    if (MinDistance <= 8192) {
-      B.RegionBegin = RegionInfoArray[ClassId].RegionBeg;
-      B.RegionEnd =
-          B.RegionBegin + RegionInfoArray[ClassId].MemMapInfo.AllocatedUser;
-      B.BlockSize = SizeClassMap::getSizeByClassId(ClassId);
-      B.BlockBegin =
-          B.RegionBegin + uptr(sptr(Ptr - B.RegionBegin) / sptr(B.BlockSize) *
-                               sptr(B.BlockSize));
-      while (B.BlockBegin < B.RegionBegin)
-        B.BlockBegin += B.BlockSize;
-      while (B.RegionEnd < B.BlockBegin + B.BlockSize)
-        B.BlockBegin -= B.BlockSize;
-    }
-    return B;
-  }
-
-  AtomicOptions Options;
-
-private:
-  static const uptr RegionSize = 1UL << RegionSizeLog;
-  static const uptr NumClasses = SizeClassMap::NumClasses;
-  static const uptr PrimarySize = RegionSize * NumClasses;
-
-  static const uptr MapSizeIncrement = Config::Primary::MapSizeIncrement;
-  // Fill at most this number of batches from the newly map'd memory.
-  static const u32 MaxNumBatches = SCUDO_ANDROID ? 4U : 8U;
-
-  struct ReleaseToOsInfo {
-    uptr BytesInFreeListAtLastCheckpoint;
-    uptr RangesReleased;
-    uptr LastReleasedBytes;
-    u64 LastReleaseAtNs;
-  };
-
-  struct BlocksInfo {
-    SinglyLinkedList<BatchGroupT> BlockList = {};
-    uptr PoppedBlocks = 0;
-    uptr PushedBlocks = 0;
-  };
-
-  struct PagesInfo {
-    MemMapT MemMap = {};
-    // Bytes mapped for user memory.
-    uptr MappedUser = 0;
-    // Bytes allocated for user memory.
-    uptr AllocatedUser = 0;
-  };
-
-  struct UnpaddedRegionInfo {
-    // Mutex for operations on freelist
-    HybridMutex FLLock;
-    ConditionVariableT FLLockCV GUARDED_BY(FLLock);
-    // Mutex for memmap operations
-    HybridMutex MMLock ACQUIRED_BEFORE(FLLock);
-    // `RegionBeg` is initialized before thread creation and won't be changed.
-    uptr RegionBeg = 0;
-    u32 RandState GUARDED_BY(MMLock) = 0;
-    BlocksInfo FreeListInfo GUARDED_BY(FLLock);
-    PagesInfo MemMapInfo GUARDED_BY(MMLock);
-    // The minimum size of pushed blocks to trigger page release.
-    uptr TryReleaseThreshold GUARDED_BY(MMLock) = 0;
-    ReleaseToOsInfo ReleaseInfo GUARDED_BY(MMLock) = {};
-    bool Exhausted GUARDED_BY(MMLock) = false;
-    bool isPopulatingFreeList GUARDED_BY(FLLock) = false;
-  };
-  struct RegionInfo : UnpaddedRegionInfo {
-    char Padding[SCUDO_CACHE_LINE_SIZE -
-                 (sizeof(UnpaddedRegionInfo) % SCUDO_CACHE_LINE_SIZE)] = {};
-  };
-  static_assert(sizeof(RegionInfo) % SCUDO_CACHE_LINE_SIZE == 0, "");
-
-  RegionInfo *getRegionInfo(uptr ClassId) {
-    DCHECK_LT(ClassId, NumClasses);
-    return &RegionInfoArray[ClassId];
-  }
-
-  uptr getRegionBaseByClassId(uptr ClassId) {
-    return roundDown(getRegionInfo(ClassId)->RegionBeg - PrimaryBase,
-                     RegionSize) +
-           PrimaryBase;
-  }
-
-  static CompactPtrT compactPtrInternal(uptr Base, uptr Ptr) {
-    return static_cast<CompactPtrT>((Ptr - Base) >> CompactPtrScale);
-  }
-
-  static uptr decompactPtrInternal(uptr Base, CompactPtrT CompactPtr) {
-    return Base + (static_cast<uptr>(CompactPtr) << CompactPtrScale);
-  }
-
-  static uptr compactPtrGroup(CompactPtrT CompactPtr) {
-    const uptr Mask = (static_cast<uptr>(1) << GroupScale) - 1;
-    return static_cast<uptr>(CompactPtr) & ~Mask;
-  }
-  static uptr decompactGroupBase(uptr Base, uptr CompactPtrGroupBase) {
-    DCHECK_EQ(CompactPtrGroupBase % (static_cast<uptr>(1) << (GroupScale)), 0U);
-    return Base + (CompactPtrGroupBase << CompactPtrScale);
-  }
-
-  ALWAYS_INLINE static bool isSmallBlock(uptr BlockSize) {
-    const uptr PageSize = getPageSizeCached();
-    return BlockSize < PageSize / 16U;
-  }
-
-  ALWAYS_INLINE static bool isLargeBlock(uptr BlockSize) {
-    const uptr PageSize = getPageSizeCached();
-    return BlockSize > PageSize;
-  }
-
-  void pushBatchClassBlocks(RegionInfo *Region, CompactPtrT *Array, u32 Size)
-      REQUIRES(Region->FLLock) {
-    DCHECK_EQ(Region, getRegionInfo(SizeClassMap::BatchClassId));
-
-    // Free blocks are recorded by TransferBatch in freelist for all
-    // size-classes. In addition, TransferBatch is allocated from BatchClassId.
-    // In order not to use additional block to record the free blocks in
-    // BatchClassId, they are self-contained. I.e., A TransferBatch records the
-    // block address of itself. See the figure below:
-    //
-    // TransferBatch at 0xABCD
-    // +----------------------------+
-    // | Free blocks' addr          |
-    // | +------+------+------+     |
-    // | |0xABCD|...   |...   |     |
-    // | +------+------+------+     |
-    // +----------------------------+
-    //
-    // When we allocate all the free blocks in the TransferBatch, the block used
-    // by TransferBatch is also free for use. We don't need to recycle the
-    // TransferBatch. Note that the correctness is maintained by the invariant,
-    //
-    //   The unit of each popBatch() request is entire TransferBatch. Return
-    //   part of the blocks in a TransferBatch is invalid.
-    //
-    // This ensures that TransferBatch won't leak the address itself while it's
-    // still holding other valid data.
-    //
-    // Besides, BatchGroup is also allocated from BatchClassId and has its
-    // address recorded in the TransferBatch too. To maintain the correctness,
-    //
-    //   The address of BatchGroup is always recorded in the last TransferBatch
-    //   in the freelist (also imply that the freelist should only be
-    //   updated with push_front). Once the last TransferBatch is popped,
-    //   the block used by BatchGroup is also free for use.
-    //
-    // With this approach, the blocks used by BatchGroup and TransferBatch are
-    // reusable and don't need additional space for them.
-
-    Region->FreeListInfo.PushedBlocks += Size;
-    BatchGroupT *BG = Region->FreeListInfo.BlockList.front();
-
-    if (BG == nullptr) {
-      // Construct `BatchGroup` on the last element.
-      BG = reinterpret_cast<BatchGroupT *>(
-          decompactPtr(SizeClassMap::BatchClassId, Array[Size - 1]));
-      --Size;
-      BG->Batches.clear();
-      // BatchClass hasn't enabled memory group. Use `0` to indicate there's no
-      // memory group here.
-      BG->CompactPtrGroupBase = 0;
-      // `BG` is also the block of BatchClassId. Note that this is different
-      // from `CreateGroup` in `pushBlocksImpl`
-      BG->PushedBlocks = 1;
-      BG->BytesInBGAtLastCheckpoint = 0;
-      BG->MaxCachedPerBatch =
-          CacheT::getMaxCached(getSizeByClassId(SizeClassMap::BatchClassId));
-
-      Region->FreeListInfo.BlockList.push_front(BG);
-    }
-
-    if (UNLIKELY(Size == 0))
-      return;
-
-    // This happens under 2 cases.
-    //   1. just allocated a new `BatchGroup`.
-    //   2. Only 1 block is pushed when the freelist is empty.
-    if (BG->Batches.empty()) {
-      // Construct the `TransferBatch` on the last element.
-      TransferBatchT *TB = reinterpret_cast<TransferBatchT *>(
-          decompactPtr(SizeClassMap::BatchClassId, Array[Size - 1]));
-      TB->clear();
-      // As mentioned above, addresses of `TransferBatch` and `BatchGroup` are
-      // recorded in the TransferBatch.
-      TB->add(Array[Size - 1]);
-      TB->add(
-          compactPtr(SizeClassMap::BatchClassId, reinterpret_cast<uptr>(BG)));
-      --Size;
-      DCHECK_EQ(BG->PushedBlocks, 1U);
-      // `TB` is also the block of BatchClassId.
-      BG->PushedBlocks += 1;
-      BG->Batches.push_front(TB);
-    }
-
-    TransferBatchT *CurBatch = BG->Batches.front();
-    DCHECK_NE(CurBatch, nullptr);
-
-    for (u32 I = 0; I < Size;) {
-      u16 UnusedSlots =
-          static_cast<u16>(BG->MaxCachedPerBatch - CurBatch->getCount());
-      if (UnusedSlots == 0) {
-        CurBatch = reinterpret_cast<TransferBatchT *>(
-            decompactPtr(SizeClassMap::BatchClassId, Array[I]));
-        CurBatch->clear();
-        // Self-contained
-        CurBatch->add(Array[I]);
-        ++I;
-        // TODO(chiahungduan): Avoid the use of push_back() in `Batches` of
-        // BatchClassId.
-        BG->Batches.push_front(CurBatch);
-        UnusedSlots = static_cast<u16>(BG->MaxCachedPerBatch - 1);
-      }
-      // `UnusedSlots` is u16 so the result will be also fit in u16.
-      const u16 AppendSize = static_cast<u16>(Min<u32>(UnusedSlots, Size - I));
-      CurBatch->appendFromArray(&Array[I], AppendSize);
-      I += AppendSize;
-    }
-
-    BG->PushedBlocks += Size;
-  }
-
-  // Push the blocks to their batch group. The layout will be like,
-  //
-  // FreeListInfo.BlockList - > BG -> BG -> BG
-  //                            |     |     |
-  //                            v     v     v
-  //                            TB    TB    TB
-  //                            |
-  //                            v
-  //                            TB
-  //
-  // Each BlockGroup(BG) will associate with unique group id and the free blocks
-  // are managed by a list of TransferBatch(TB). To reduce the time of inserting
-  // blocks, BGs are sorted and the input `Array` are supposed to be sorted so
-  // that we can get better performance of maintaining sorted property.
-  // Use `SameGroup=true` to indicate that all blocks in the array are from the
-  // same group then we will skip checking the group id of each block.
-  void pushBlocksImpl(CacheT *C, uptr ClassId, RegionInfo *Region,
-                      CompactPtrT *Array, u32 Size, bool SameGroup = false)
-      REQUIRES(Region->FLLock) {
-    DCHECK_NE(ClassId, SizeClassMap::BatchClassId);
-    DCHECK_GT(Size, 0U);
-
-    auto CreateGroup = [&](uptr CompactPtrGroupBase) {
-      BatchGroupT *BG =
-          reinterpret_cast<BatchGroupT *>(C->getBatchClassBlock());
-      BG->Batches.clear();
-      TransferBatchT *TB =
-          reinterpret_cast<TransferBatchT *>(C->getBatchClassBlock());
-      TB->clear();
-
-      BG->CompactPtrGroupBase = CompactPtrGroupBase;
-      BG->Batches.push_front(TB);
-      BG->PushedBlocks = 0;
-      BG->BytesInBGAtLastCheckpoint = 0;
-      BG->MaxCachedPerBatch = CacheT::getMaxCached(getSizeByClassId(ClassId));
-
-      return BG;
-    };
-
-    auto InsertBlocks = [&](BatchGroupT *BG, CompactPtrT *Array, u32 Size) {
-      SinglyLinkedList<TransferBatchT> &Batches = BG->Batches;
-      TransferBatchT *CurBatch = Batches.front();
-      DCHECK_NE(CurBatch, nullptr);
-
-      for (u32 I = 0; I < Size;) {
-        DCHECK_GE(BG->MaxCachedPerBatch, CurBatch->getCount());
-        u16 UnusedSlots =
-            static_cast<u16>(BG->MaxCachedPerBatch - CurBatch->getCount());
-        if (UnusedSlots == 0) {
-          CurBatch =
-              reinterpret_cast<TransferBatchT *>(C->getBatchClassBlock());
-          CurBatch->clear();
-          Batches.push_front(CurBatch);
-          UnusedSlots = BG->MaxCachedPerBatch;
-        }
-        // `UnusedSlots` is u16 so the result will be also fit in u16.
-        u16 AppendSize = static_cast<u16>(Min<u32>(UnusedSlots, Size - I));
-        CurBatch->appendFromArray(&Array[I], AppendSize);
-        I += AppendSize;
-      }
-
-      BG->PushedBlocks += Size;
-    };
-
-    Region->FreeListInfo.PushedBlocks += Size;
-    BatchGroupT *Cur = Region->FreeListInfo.BlockList.front();
-
-    // In the following, `Cur` always points to the BatchGroup for blocks that
-    // will be pushed next. `Prev` is the element right before `Cur`.
-    BatchGroupT *Prev = nullptr;
-
-    while (Cur != nullptr &&
-           compactPtrGroup(Array[0]) > Cur->CompactPtrGroupBase) {
-      Prev = Cur;
-      Cur = Cur->Next;
-    }
-
-    if (Cur == nullptr ||
-        compactPtrGroup(Array[0]) != Cur->CompactPtrGroupBase) {
-      Cur = CreateGroup(compactPtrGroup(Array[0]));
-      if (Prev == nullptr)
-        Region->FreeListInfo.BlockList.push_front(Cur);
-      else
-        Region->FreeListInfo.BlockList.insert(Prev, Cur);
-    }
-
-    // All the blocks are from the same group, just push without checking group
-    // id.
-    if (SameGroup) {
-      for (u32 I = 0; I < Size; ++I)
-        DCHECK_EQ(compactPtrGroup(Array[I]), Cur->CompactPtrGroupBase);
-
-      InsertBlocks(Cur, Array, Size);
-      return;
-    }
-
-    // The blocks are sorted by group id. Determine the segment of group and
-    // push them to their group together.
-    u32 Count = 1;
-    for (u32 I = 1; I < Size; ++I) {
-      if (compactPtrGroup(Array[I - 1]) != compactPtrGroup(Array[I])) {
-        DCHECK_EQ(compactPtrGroup(Array[I - 1]), Cur->CompactPtrGroupBase);
-        InsertBlocks(Cur, Array + I - Count, Count);
-
-        while (Cur != nullptr &&
-               compactPtrGroup(Array[I]) > Cur->CompactPtrGroupBase) {
-          Prev = Cur;
-          Cur = Cur->Next;
-        }
-
-        if (Cur == nullptr ||
-            compactPtrGroup(Array[I]) != Cur->CompactPtrGroupBase) {
-          Cur = CreateGroup(compactPtrGroup(Array[I]));
-          DCHECK_NE(Prev, nullptr);
-          Region->FreeListInfo.BlockList.insert(Prev, Cur);
-        }
-
-        Count = 1;
-      } else {
-        ++Count;
-      }
-    }
-
-    InsertBlocks(Cur, Array + Size - Count, Count);
-  }
-
-  TransferBatchT *popBatchWithCV(CacheT *C, uptr ClassId, RegionInfo *Region,
-                                 bool &ReportRegionExhausted) {
-    TransferBatchT *B = nullptr;
-
-    while (true) {
-      // We only expect one thread doing the freelist refillment and other
-      // threads will be waiting for either the completion of the
-      // `populateFreeListAndPopBatch()` or `pushBlocks()` called by other
-      // threads.
-      bool PopulateFreeList = false;
-      {
-        ScopedLock FL(Region->FLLock);
-        if (!Region->isPopulatingFreeList) {
-          Region->isPopulatingFreeList = true;
-          PopulateFreeList = true;
-        }
-      }
-
-      if (PopulateFreeList) {
-        ScopedLock ML(Region->MMLock);
-
-        const bool RegionIsExhausted = Region->Exhausted;
-        if (!RegionIsExhausted)
-          B = populateFreeListAndPopBatch(C, ClassId, Region);
-        ReportRegionExhausted = !RegionIsExhausted && Region->Exhausted;
-
-        {
-          // Before reacquiring the `FLLock`, the freelist may be used up again
-          // and some threads are waiting for the freelist refillment by the
-          // current thread. It's important to set
-          // `Region->isPopulatingFreeList` to false so the threads about to
-          // sleep will notice the status change.
-          ScopedLock FL(Region->FLLock);
-          Region->isPopulatingFreeList = false;
-          Region->FLLockCV.notifyAll(Region->FLLock);
-        }
-
-        break;
-      }
-
-      // At here, there are two preconditions to be met before waiting,
-      //   1. The freelist is empty.
-      //   2. Region->isPopulatingFreeList == true, i.e, someone is still doing
-      //   `populateFreeListAndPopBatch()`.
-      //
-      // Note that it has the chance that freelist is empty but
-      // Region->isPopulatingFreeList == false because all the new populated
-      // blocks were used up right after the refillment. Therefore, we have to
-      // check if someone is still populating the freelist.
-      ScopedLock FL(Region->FLLock);
-      if (LIKELY(B = popBatchImpl(C, ClassId, Region)))
-        break;
-
-      if (!Region->isPopulatingFreeList)
-        continue;
-
-      // Now the freelist is empty and someone's doing the refillment. We will
-      // wait until anyone refills the freelist or someone finishes doing
-      // `populateFreeListAndPopBatch()`. The refillment can be done by
-      // `populateFreeListAndPopBatch()`, `pushBlocks()`,
-      // `pushBatchClassBlocks()` and `mergeGroupsToReleaseBack()`.
-      Region->FLLockCV.wait(Region->FLLock);
-
-      if (LIKELY(B = popBatchImpl(C, ClassId, Region)))
-        break;
-    }
-
-    return B;
-  }
-
-  // Pop one TransferBatch from a BatchGroup. The BatchGroup with the smallest
-  // group id will be considered first.
-  //
-  // The region mutex needs to be held while calling this method.
-  TransferBatchT *popBatchImpl(CacheT *C, uptr ClassId, RegionInfo *Region)
-      REQUIRES(Region->FLLock) {
-    if (Region->FreeListInfo.BlockList.empty())
-      return nullptr;
-
-    SinglyLinkedList<TransferBatchT> &Batches =
-        Region->FreeListInfo.BlockList.front()->Batches;
-
-    if (Batches.empty()) {
-      DCHECK_EQ(ClassId, SizeClassMap::BatchClassId);
-      BatchGroupT *BG = Region->FreeListInfo.BlockList.front();
-      Region->FreeListInfo.BlockList.pop_front();
-
-      // Block used by `BatchGroup` is from BatchClassId. Turn the block into
-      // `TransferBatch` with single block.
-      TransferBatchT *TB = reinterpret_cast<TransferBatchT *>(BG);
-      TB->clear();
-      TB->add(
-          compactPtr(SizeClassMap::BatchClassId, reinterpret_cast<uptr>(TB)));
-      Region->FreeListInfo.PoppedBlocks += 1;
-      return TB;
-    }
-
-    TransferBatchT *B = Batches.front();
-    Batches.pop_front();
-    DCHECK_NE(B, nullptr);
-    DCHECK_GT(B->getCount(), 0U);
-
-    if (Batches.empty()) {
-      BatchGroupT *BG = Region->FreeListInfo.BlockList.front();
-      Region->FreeListInfo.BlockList.pop_front();
-
-      // We don't keep BatchGroup with zero blocks to avoid empty-checking while
-      // allocating. Note that block used by constructing BatchGroup is recorded
-      // as free blocks in the last element of BatchGroup::Batches. Which means,
-      // once we pop the last TransferBatch, the block is implicitly
-      // deallocated.
-      if (ClassId != SizeClassMap::BatchClassId)
-        C->deallocate(SizeClassMap::BatchClassId, BG);
-    }
-
-    Region->FreeListInfo.PoppedBlocks += B->getCount();
-
-    return B;
-  }
-
-  // Refill the freelist and return one batch.
-  NOINLINE TransferBatchT *populateFreeListAndPopBatch(CacheT *C, uptr ClassId,
-                                                       RegionInfo *Region)
-      REQUIRES(Region->MMLock) EXCLUDES(Region->FLLock) {
-    const uptr Size = getSizeByClassId(ClassId);
-    const u16 MaxCount = CacheT::getMaxCached(Size);
-
-    const uptr RegionBeg = Region->RegionBeg;
-    const uptr MappedUser = Region->MemMapInfo.MappedUser;
-    const uptr TotalUserBytes =
-        Region->MemMapInfo.AllocatedUser + MaxCount * Size;
-    // Map more space for blocks, if necessary.
-    if (TotalUserBytes > MappedUser) {
-      // Do the mmap for the user memory.
-      const uptr MapSize =
-          roundUp(TotalUserBytes - MappedUser, MapSizeIncrement);
-      const uptr RegionBase = RegionBeg - getRegionBaseByClassId(ClassId);
-      if (UNLIKELY(RegionBase + MappedUser + MapSize > RegionSize)) {
-        Region->Exhausted = true;
-        return nullptr;
-      }
-
-      if (UNLIKELY(!Region->MemMapInfo.MemMap.remap(
-              RegionBeg + MappedUser, MapSize, "scudo:primary",
-              MAP_ALLOWNOMEM | MAP_RESIZABLE |
-                  (useMemoryTagging<Config>(Options.load()) ? MAP_MEMTAG
-                                                            : 0)))) {
-        return nullptr;
-      }
-      Region->MemMapInfo.MappedUser += MapSize;
-      C->getStats().add(StatMapped, MapSize);
-    }
-
-    const u32 NumberOfBlocks =
-        Min(MaxNumBatches * MaxCount,
-            static_cast<u32>((Region->MemMapInfo.MappedUser -
-                              Region->MemMapInfo.AllocatedUser) /
-                             Size));
-    DCHECK_GT(NumberOfBlocks, 0);
-
-    constexpr u32 ShuffleArraySize =
-        MaxNumBatches * TransferBatchT::MaxNumCached;
-    CompactPtrT ShuffleArray[ShuffleArraySize];
-    DCHECK_LE(NumberOfBlocks, ShuffleArraySize);
-
-    const uptr CompactPtrBase = getCompactPtrBaseByClassId(ClassId);
-    uptr P = RegionBeg + Region->MemMapInfo.AllocatedUser;
-    for (u32 I = 0; I < NumberOfBlocks; I++, P += Size)
-      ShuffleArray[I] = compactPtrInternal(CompactPtrBase, P);
-
-    ScopedLock L(Region->FLLock);
-
-    if (ClassId != SizeClassMap::BatchClassId) {
-      u32 N = 1;
-      uptr CurGroup = compactPtrGroup(ShuffleArray[0]);
-      for (u32 I = 1; I < NumberOfBlocks; I++) {
-        if (UNLIKELY(compactPtrGroup(ShuffleArray[I]) != CurGroup)) {
-          shuffle(ShuffleArray + I - N, N, &Region->RandState);
-          pushBlocksImpl(C, ClassId, Region, ShuffleArray + I - N, N,
-                         /*SameGroup=*/true);
-          N = 1;
-          CurGroup = compactPtrGroup(ShuffleArray[I]);
-        } else {
-          ++N;
-        }
-      }
-
-      shuffle(ShuffleArray + NumberOfBlocks - N, N, &Region->RandState);
-      pushBlocksImpl(C, ClassId, Region, &ShuffleArray[NumberOfBlocks - N], N,
-                     /*SameGroup=*/true);
-    } else {
-      pushBatchClassBlocks(Region, ShuffleArray, NumberOfBlocks);
-    }
-
-    TransferBatchT *B = popBatchImpl(C, ClassId, Region);
-    DCHECK_NE(B, nullptr);
-
-    // Note that `PushedBlocks` and `PoppedBlocks` are supposed to only record
-    // the requests from `PushBlocks` and `PopBatch` which are external
-    // interfaces. `populateFreeListAndPopBatch` is the internal interface so we
-    // should set the values back to avoid incorrectly setting the stats.
-    Region->FreeListInfo.PushedBlocks -= NumberOfBlocks;
-
-    const uptr AllocatedUser = Size * NumberOfBlocks;
-    C->getStats().add(StatFree, AllocatedUser);
-    Region->MemMapInfo.AllocatedUser += AllocatedUser;
-
-    return B;
-  }
-
-  void getStats(ScopedString *Str, uptr ClassId, RegionInfo *Region)
-      REQUIRES(Region->MMLock, Region->FLLock) {
-    if (Region->MemMapInfo.MappedUser == 0)
-      return;
-    const uptr BlockSize = getSizeByClassId(ClassId);
-    const uptr InUseBlocks =
-        Region->FreeListInfo.PoppedBlocks - Region->FreeListInfo.PushedBlocks;
-    const uptr BytesInFreeList =
-        Region->MemMapInfo.AllocatedUser - InUseBlocks * BlockSize;
-    uptr RegionPushedBytesDelta = 0;
-    if (BytesInFreeList >=
-        Region->ReleaseInfo.BytesInFreeListAtLastCheckpoint) {
-      RegionPushedBytesDelta =
-          BytesInFreeList - Region->ReleaseInfo.BytesInFreeListAtLastCheckpoint;
-    }
-    const uptr TotalChunks = Region->MemMapInfo.AllocatedUser / BlockSize;
-    Str->append(
-        "%s %02zu (%6zu): mapped: %6zuK popped: %7zu pushed: %7zu "
-        "inuse: %6zu total: %6zu releases: %6zu last "
-        "released: %6zuK latest pushed bytes: %6zuK region: 0x%zx (0x%zx)\n",
-        Region->Exhausted ? "E" : " ", ClassId, getSizeByClassId(ClassId),
-        Region->MemMapInfo.MappedUser >> 10, Region->FreeListInfo.PoppedBlocks,
-        Region->FreeListInfo.PushedBlocks, InUseBlocks, TotalChunks,
-        Region->ReleaseInfo.RangesReleased,
-        Region->ReleaseInfo.LastReleasedBytes >> 10,
-        RegionPushedBytesDelta >> 10, Region->RegionBeg,
-        getRegionBaseByClassId(ClassId));
-  }
-
-  void getRegionFragmentationInfo(RegionInfo *Region, uptr ClassId,
-                                  ScopedString *Str) REQUIRES(Region->MMLock) {
-    const uptr BlockSize = getSizeByClassId(ClassId);
-    const uptr AllocatedUserEnd =
-        Region->MemMapInfo.AllocatedUser + Region->RegionBeg;
-
-    SinglyLinkedList<BatchGroupT> GroupsToRelease;
-    {
-      ScopedLock L(Region->FLLock);
-      GroupsToRelease = Region->FreeListInfo.BlockList;
-      Region->FreeListInfo.BlockList.clear();
-    }
-
-    FragmentationRecorder Recorder;
-    if (!GroupsToRelease.empty()) {
-      PageReleaseContext Context =
-          markFreeBlocks(Region, BlockSize, AllocatedUserEnd,
-                         getCompactPtrBaseByClassId(ClassId), GroupsToRelease);
-      auto SkipRegion = [](UNUSED uptr RegionIndex) { return false; };
-      releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
-
-      mergeGroupsToReleaseBack(Region, GroupsToRelease);
-    }
-
-    ScopedLock L(Region->FLLock);
-    const uptr PageSize = getPageSizeCached();
-    const uptr TotalBlocks = Region->MemMapInfo.AllocatedUser / BlockSize;
-    const uptr InUseBlocks =
-        Region->FreeListInfo.PoppedBlocks - Region->FreeListInfo.PushedBlocks;
-    const uptr AllocatedPagesCount =
-        roundUp(Region->MemMapInfo.AllocatedUser, PageSize) / PageSize;
-    DCHECK_GE(AllocatedPagesCount, Recorder.getReleasedPagesCount());
-    const uptr InUsePages =
-        AllocatedPagesCount - Recorder.getReleasedPagesCount();
-    const uptr InUseBytes = InUsePages * PageSize;
-
-    uptr Integral;
-    uptr Fractional;
-    computePercentage(BlockSize * InUseBlocks, InUsePages * PageSize, &Integral,
-                      &Fractional);
-    Str->append("  %02zu (%6zu): inuse/total blocks: %6zu/%6zu inuse/total "
-                "pages: %6zu/%6zu inuse bytes: %6zuK util: %3zu.%02zu%%\n",
-                ClassId, BlockSize, InUseBlocks, TotalBlocks, InUsePages,
-                AllocatedPagesCount, InUseBytes >> 10, Integral, Fractional);
-  }
-
-  NOINLINE uptr releaseToOSMaybe(RegionInfo *Region, uptr ClassId,
-                                 ReleaseToOS ReleaseType = ReleaseToOS::Normal)
-      REQUIRES(Region->MMLock) EXCLUDES(Region->FLLock) {
-    const uptr BlockSize = getSizeByClassId(ClassId);
-    uptr BytesInFreeList;
-    const uptr AllocatedUserEnd =
-        Region->MemMapInfo.AllocatedUser + Region->RegionBeg;
-    SinglyLinkedList<BatchGroupT> GroupsToRelease;
-
-    {
-      ScopedLock L(Region->FLLock);
-
-      BytesInFreeList = Region->MemMapInfo.AllocatedUser -
-                        (Region->FreeListInfo.PoppedBlocks -
-                         Region->FreeListInfo.PushedBlocks) *
-                            BlockSize;
-      if (UNLIKELY(BytesInFreeList == 0))
-        return false;
-
-      // ==================================================================== //
-      // 1. Check if we have enough free blocks and if it's worth doing a page
-      //    release.
-      // ==================================================================== //
-      if (ReleaseType != ReleaseToOS::ForceAll &&
-          !hasChanceToReleasePages(Region, BlockSize, BytesInFreeList,
-                                   ReleaseType)) {
-        return 0;
-      }
-
-      // ==================================================================== //
-      // 2. Determine which groups can release the pages. Use a heuristic to
-      //    gather groups that are candidates for doing a release.
-      // ==================================================================== //
-      if (ReleaseType == ReleaseToOS::ForceAll) {
-        GroupsToRelease = Region->FreeListInfo.BlockList;
-        Region->FreeListInfo.BlockList.clear();
-      } else {
-        GroupsToRelease =
-            collectGroupsToRelease(Region, BlockSize, AllocatedUserEnd,
-                                   getCompactPtrBaseByClassId(ClassId));
-      }
-      if (GroupsToRelease.empty())
-        return 0;
-    }
-
-    // Note that we have extracted the `GroupsToRelease` from region freelist.
-    // It's safe to let pushBlocks()/popBatches() access the remaining region
-    // freelist. In the steps 3 and 4, we will temporarily release the FLLock
-    // and lock it again before step 5.
-
-    // ==================================================================== //
-    // 3. Mark the free blocks in `GroupsToRelease` in the `PageReleaseContext`.
-    //    Then we can tell which pages are in-use by querying
-    //    `PageReleaseContext`.
-    // ==================================================================== //
-    PageReleaseContext Context =
-        markFreeBlocks(Region, BlockSize, AllocatedUserEnd,
-                       getCompactPtrBaseByClassId(ClassId), GroupsToRelease);
-    if (UNLIKELY(!Context.hasBlockMarked())) {
-      mergeGroupsToReleaseBack(Region, GroupsToRelease);
-      return 0;
-    }
-
-    // ==================================================================== //
-    // 4. Release the unused physical pages back to the OS.
-    // ==================================================================== //
-    RegionReleaseRecorder<MemMapT> Recorder(&Region->MemMapInfo.MemMap,
-                                            Region->RegionBeg,
-                                            Context.getReleaseOffset());
-    auto SkipRegion = [](UNUSED uptr RegionIndex) { return false; };
-    releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
-    if (Recorder.getReleasedRangesCount() > 0) {
-      Region->ReleaseInfo.BytesInFreeListAtLastCheckpoint = BytesInFreeList;
-      Region->ReleaseInfo.RangesReleased += Recorder.getReleasedRangesCount();
-      Region->ReleaseInfo.LastReleasedBytes = Recorder.getReleasedBytes();
-    }
-    Region->ReleaseInfo.LastReleaseAtNs = getMonotonicTimeFast();
-
-    // ====================================================================== //
-    // 5. Merge the `GroupsToRelease` back to the freelist.
-    // ====================================================================== //
-    mergeGroupsToReleaseBack(Region, GroupsToRelease);
-
-    return Recorder.getReleasedBytes();
-  }
-
-  bool hasChanceToReleasePages(RegionInfo *Region, uptr BlockSize,
-                               uptr BytesInFreeList, ReleaseToOS ReleaseType)
-      REQUIRES(Region->MMLock, Region->FLLock) {
-    DCHECK_GE(Region->FreeListInfo.PoppedBlocks,
-              Region->FreeListInfo.PushedBlocks);
-    const uptr PageSize = getPageSizeCached();
-
-    // Always update `BytesInFreeListAtLastCheckpoint` with the smallest value
-    // so that we won't underestimate the releasable pages. For example, the
-    // following is the region usage,
-    //
-    //  BytesInFreeListAtLastCheckpoint   AllocatedUser
-    //                v                         v
-    //  |--------------------------------------->
-    //         ^                   ^
-    //  BytesInFreeList     ReleaseThreshold
-    //
-    // In general, if we have collected enough bytes and the amount of free
-    // bytes meets the ReleaseThreshold, we will try to do page release. If we
-    // don't update `BytesInFreeListAtLastCheckpoint` when the current
-    // `BytesInFreeList` is smaller, we may take longer time to wait for enough
-    // freed blocks because we miss the bytes between
-    // (BytesInFreeListAtLastCheckpoint - BytesInFreeList).
-    if (BytesInFreeList <=
-        Region->ReleaseInfo.BytesInFreeListAtLastCheckpoint) {
-      Region->ReleaseInfo.BytesInFreeListAtLastCheckpoint = BytesInFreeList;
-    }
-
-    const uptr RegionPushedBytesDelta =
-        BytesInFreeList - Region->ReleaseInfo.BytesInFreeListAtLastCheckpoint;
-    if (RegionPushedBytesDelta < PageSize)
-      return false;
-
-    // Releasing smaller blocks is expensive, so we want to make sure that a
-    // significant amount of bytes are free, and that there has been a good
-    // amount of batches pushed to the freelist before attempting to release.
-    if (isSmallBlock(BlockSize) && ReleaseType == ReleaseToOS::Normal)
-      if (RegionPushedBytesDelta < Region->TryReleaseThreshold)
-        return false;
-
-    if (ReleaseType == ReleaseToOS::Normal) {
-      const s32 IntervalMs = atomic_load_relaxed(&ReleaseToOsIntervalMs);
-      if (IntervalMs < 0)
-        return false;
-
-      // The constant 8 here is selected from profiling some apps and the number
-      // of unreleased pages in the large size classes is around 16 pages or
-      // more. Choose half of it as a heuristic and which also avoids page
-      // release every time for every pushBlocks() attempt by large blocks.
-      const bool ByPassReleaseInterval =
-          isLargeBlock(BlockSize) && RegionPushedBytesDelta > 8 * PageSize;
-      if (!ByPassReleaseInterval) {
-        if (Region->ReleaseInfo.LastReleaseAtNs +
-                static_cast<u64>(IntervalMs) * 1000000 >
-            getMonotonicTimeFast()) {
-          // Memory was returned recently.
-          return false;
-        }
-      }
-    } // if (ReleaseType == ReleaseToOS::Normal)
-
-    return true;
-  }
-
-  SinglyLinkedList<BatchGroupT>
-  collectGroupsToRelease(RegionInfo *Region, const uptr BlockSize,
-                         const uptr AllocatedUserEnd, const uptr CompactPtrBase)
-      REQUIRES(Region->MMLock, Region->FLLock) {
-    const uptr GroupSize = (1UL << GroupSizeLog);
-    const uptr PageSize = getPageSizeCached();
-    SinglyLinkedList<BatchGroupT> GroupsToRelease;
-
-    // We are examining each group and will take the minimum distance to the
-    // release threshold as the next Region::TryReleaseThreshold(). Note that if
-    // the size of free blocks has reached the release threshold, the distance
-    // to the next release will be PageSize * SmallerBlockReleasePageDelta. See
-    // the comment on `SmallerBlockReleasePageDelta` for more details.
-    uptr MinDistToThreshold = GroupSize;
-
-    for (BatchGroupT *BG = Region->FreeListInfo.BlockList.front(),
-                     *Prev = nullptr;
-         BG != nullptr;) {
-      // Group boundary is always GroupSize-aligned from CompactPtr base. The
-      // layout of memory groups is like,
-      //
-      //     (CompactPtrBase)
-      // #1 CompactPtrGroupBase   #2 CompactPtrGroupBase            ...
-      //           |                       |                       |
-      //           v                       v                       v
-      //           +-----------------------+-----------------------+
-      //            \                     / \                     /
-      //             ---   GroupSize   ---   ---   GroupSize   ---
-      //
-      // After decompacting the CompactPtrGroupBase, we expect the alignment
-      // property is held as well.
-      const uptr BatchGroupBase =
-          decompactGroupBase(CompactPtrBase, BG->CompactPtrGroupBase);
-      DCHECK_LE(Region->RegionBeg, BatchGroupBase);
-      DCHECK_GE(AllocatedUserEnd, BatchGroupBase);
-      DCHECK_EQ((Region->RegionBeg - BatchGroupBase) % GroupSize, 0U);
-      // TransferBatches are pushed in front of BG.Batches. The first one may
-      // not have all caches used.
-      const uptr NumBlocks = (BG->Batches.size() - 1) * BG->MaxCachedPerBatch +
-                             BG->Batches.front()->getCount();
-      const uptr BytesInBG = NumBlocks * BlockSize;
-
-      if (BytesInBG <= BG->BytesInBGAtLastCheckpoint) {
-        BG->BytesInBGAtLastCheckpoint = BytesInBG;
-        Prev = BG;
-        BG = BG->Next;
-        continue;
-      }
-
-      const uptr PushedBytesDelta = BG->BytesInBGAtLastCheckpoint - BytesInBG;
-
-      // Given the randomness property, we try to release the pages only if the
-      // bytes used by free blocks exceed certain proportion of group size. Note
-      // that this heuristic only applies when all the spaces in a BatchGroup
-      // are allocated.
-      if (isSmallBlock(BlockSize)) {
-        const uptr BatchGroupEnd = BatchGroupBase + GroupSize;
-        const uptr AllocatedGroupSize = AllocatedUserEnd >= BatchGroupEnd
-                                            ? GroupSize
-                                            : AllocatedUserEnd - BatchGroupBase;
-        const uptr ReleaseThreshold =
-            (AllocatedGroupSize * (100 - 1U - BlockSize / 16U)) / 100U;
-        const bool HighDensity = BytesInBG >= ReleaseThreshold;
-        const bool MayHaveReleasedAll = NumBlocks >= (GroupSize / BlockSize);
-        // If all blocks in the group are released, we will do range marking
-        // which is fast. Otherwise, we will wait until we have accumulated
-        // a certain amount of free memory.
-        const bool ReachReleaseDelta =
-            MayHaveReleasedAll
-                ? true
-                : PushedBytesDelta >= PageSize * SmallerBlockReleasePageDelta;
-
-        if (!HighDensity) {
-          DCHECK_LE(BytesInBG, ReleaseThreshold);
-          // The following is the usage of a memroy group,
-          //
-          //     BytesInBG             ReleaseThreshold
-          //  /             \                 v
-          //  +---+---------------------------+-----+
-          //  |   |         |                 |     |
-          //  +---+---------------------------+-----+
-          //       \        /                       ^
-          //    PushedBytesDelta                 GroupEnd
-          MinDistToThreshold =
-              Min(MinDistToThreshold,
-                  ReleaseThreshold - BytesInBG + PushedBytesDelta);
-        } else {
-          // If it reaches high density at this round, the next time we will try
-          // to release is based on SmallerBlockReleasePageDelta
-          MinDistToThreshold =
-              Min(MinDistToThreshold, PageSize * SmallerBlockReleasePageDelta);
-        }
-
-        if (!HighDensity || !ReachReleaseDelta) {
-          Prev = BG;
-          BG = BG->Next;
-          continue;
-        }
-      }
-
-      // If `BG` is the first BatchGroupT in the list, we only need to advance
-      // `BG` and call FreeListInfo.BlockList::pop_front(). No update is needed
-      // for `Prev`.
-      //
-      //         (BG)   (BG->Next)
-      // Prev     Cur      BG
-      //   |       |       |
-      //   v       v       v
-      //  nil     +--+    +--+
-      //          |X | -> |  | -> ...
-      //          +--+    +--+
-      //
-      // Otherwise, `Prev` will be used to extract the `Cur` from the
-      // `FreeListInfo.BlockList`.
-      //
-      //         (BG)   (BG->Next)
-      // Prev     Cur      BG
-      //   |       |       |
-      //   v       v       v
-      //  +--+    +--+    +--+
-      //  |  | -> |X | -> |  | -> ...
-      //  +--+    +--+    +--+
-      //
-      // After FreeListInfo.BlockList::extract(),
-      //
-      // Prev     Cur       BG
-      //   |       |        |
-      //   v       v        v
-      //  +--+    +--+     +--+
-      //  |  |-+  |X |  +->|  | -> ...
-      //  +--+ |  +--+  |  +--+
-      //       +--------+
-      //
-      // Note that we need to advance before pushing this BatchGroup to
-      // GroupsToRelease because it's a destructive operation.
-
-      BatchGroupT *Cur = BG;
-      BG = BG->Next;
-
-      // Ideally, we may want to update this only after successful release.
-      // However, for smaller blocks, each block marking is a costly operation.
-      // Therefore, we update it earlier.
-      // TODO: Consider updating this after releasing pages if `ReleaseRecorder`
-      // can tell the released bytes in each group.
-      Cur->BytesInBGAtLastCheckpoint = BytesInBG;
-
-      if (Prev != nullptr)
-        Region->FreeListInfo.BlockList.extract(Prev, Cur);
-      else
-        Region->FreeListInfo.BlockList.pop_front();
-      GroupsToRelease.push_back(Cur);
-    }
-
-    // Only small blocks have the adaptive `TryReleaseThreshold`.
-    if (isSmallBlock(BlockSize)) {
-      // If the MinDistToThreshold is not updated, that means each memory group
-      // may have only pushed less than a page size. In that case, just set it
-      // back to normal.
-      if (MinDistToThreshold == GroupSize)
-        MinDistToThreshold = PageSize * SmallerBlockReleasePageDelta;
-      Region->TryReleaseThreshold = MinDistToThreshold;
-    }
-
-    return GroupsToRelease;
-  }
-
-  PageReleaseContext
-  markFreeBlocks(RegionInfo *Region, const uptr BlockSize,
-                 const uptr AllocatedUserEnd, const uptr CompactPtrBase,
-                 SinglyLinkedList<BatchGroupT> &GroupsToRelease)
-      REQUIRES(Region->MMLock) EXCLUDES(Region->FLLock) {
-    const uptr GroupSize = (1UL << GroupSizeLog);
-    auto DecompactPtr = [CompactPtrBase](CompactPtrT CompactPtr) {
-      return decompactPtrInternal(CompactPtrBase, CompactPtr);
-    };
-
-    const uptr ReleaseBase = decompactGroupBase(
-        CompactPtrBase, GroupsToRelease.front()->CompactPtrGroupBase);
-    const uptr LastGroupEnd =
-        Min(decompactGroupBase(CompactPtrBase,
-                               GroupsToRelease.back()->CompactPtrGroupBase) +
-                GroupSize,
-            AllocatedUserEnd);
-    // The last block may straddle the group boundary. Rounding up to BlockSize
-    // to get the exact range.
-    const uptr ReleaseEnd =
-        roundUpSlow(LastGroupEnd - Region->RegionBeg, BlockSize) +
-        Region->RegionBeg;
-    const uptr ReleaseRangeSize = ReleaseEnd - ReleaseBase;
-    const uptr ReleaseOffset = ReleaseBase - Region->RegionBeg;
-
-    PageReleaseContext Context(BlockSize, /*NumberOfRegions=*/1U,
-                               ReleaseRangeSize, ReleaseOffset);
-    // We may not be able to do the page release in a rare case that we may
-    // fail on PageMap allocation.
-    if (UNLIKELY(!Context.ensurePageMapAllocated()))
-      return Context;
-
-    for (BatchGroupT &BG : GroupsToRelease) {
-      const uptr BatchGroupBase =
-          decompactGroupBase(CompactPtrBase, BG.CompactPtrGroupBase);
-      const uptr BatchGroupEnd = BatchGroupBase + GroupSize;
-      const uptr AllocatedGroupSize = AllocatedUserEnd >= BatchGroupEnd
-                                          ? GroupSize
-                                          : AllocatedUserEnd - BatchGroupBase;
-      const uptr BatchGroupUsedEnd = BatchGroupBase + AllocatedGroupSize;
-      const bool MayContainLastBlockInRegion =
-          BatchGroupUsedEnd == AllocatedUserEnd;
-      const bool BlockAlignedWithUsedEnd =
-          (BatchGroupUsedEnd - Region->RegionBeg) % BlockSize == 0;
-
-      uptr MaxContainedBlocks = AllocatedGroupSize / BlockSize;
-      if (!BlockAlignedWithUsedEnd)
-        ++MaxContainedBlocks;
-
-      const uptr NumBlocks = (BG.Batches.size() - 1) * BG.MaxCachedPerBatch +
-                             BG.Batches.front()->getCount();
-
-      if (NumBlocks == MaxContainedBlocks) {
-        for (const auto &It : BG.Batches) {
-          if (&It != BG.Batches.front())
-            DCHECK_EQ(It.getCount(), BG.MaxCachedPerBatch);
-          for (u16 I = 0; I < It.getCount(); ++I)
-            DCHECK_EQ(compactPtrGroup(It.get(I)), BG.CompactPtrGroupBase);
-        }
-
-        Context.markRangeAsAllCounted(BatchGroupBase, BatchGroupUsedEnd,
-                                      Region->RegionBeg, /*RegionIndex=*/0,
-                                      Region->MemMapInfo.AllocatedUser);
-      } else {
-        DCHECK_LT(NumBlocks, MaxContainedBlocks);
-        // Note that we don't always visit blocks in each BatchGroup so that we
-        // may miss the chance of releasing certain pages that cross
-        // BatchGroups.
-        Context.markFreeBlocksInRegion(
-            BG.Batches, DecompactPtr, Region->RegionBeg, /*RegionIndex=*/0,
-            Region->MemMapInfo.AllocatedUser, MayContainLastBlockInRegion);
-      }
-    }
-
-    DCHECK(Context.hasBlockMarked());
-
-    return Context;
-  }
-
-  void mergeGroupsToReleaseBack(RegionInfo *Region,
-                                SinglyLinkedList<BatchGroupT> &GroupsToRelease)
-      REQUIRES(Region->MMLock) EXCLUDES(Region->FLLock) {
-    ScopedLock L(Region->FLLock);
-
-    // After merging two freelists, we may have redundant `BatchGroup`s that
-    // need to be recycled. The number of unused `BatchGroup`s is expected to be
-    // small. Pick a constant which is inferred from real programs.
-    constexpr uptr MaxUnusedSize = 8;
-    CompactPtrT Blocks[MaxUnusedSize];
-    u32 Idx = 0;
-    RegionInfo *BatchClassRegion = getRegionInfo(SizeClassMap::BatchClassId);
-    // We can't call pushBatchClassBlocks() to recycle the unused `BatchGroup`s
-    // when we are manipulating the freelist of `BatchClassRegion`. Instead, we
-    // should just push it back to the freelist when we merge two `BatchGroup`s.
-    // This logic hasn't been implemented because we haven't supported releasing
-    // pages in `BatchClassRegion`.
-    DCHECK_NE(BatchClassRegion, Region);
-
-    // Merge GroupsToRelease back to the Region::FreeListInfo.BlockList. Note
-    // that both `Region->FreeListInfo.BlockList` and `GroupsToRelease` are
-    // sorted.
-    for (BatchGroupT *BG = Region->FreeListInfo.BlockList.front(),
-                     *Prev = nullptr;
-         ;) {
-      if (BG == nullptr || GroupsToRelease.empty()) {
-        if (!GroupsToRelease.empty())
-          Region->FreeListInfo.BlockList.append_back(&GroupsToRelease);
-        break;
-      }
-
-      DCHECK(!BG->Batches.empty());
-
-      if (BG->CompactPtrGroupBase <
-          GroupsToRelease.front()->CompactPtrGroupBase) {
-        Prev = BG;
-        BG = BG->Next;
-        continue;
-      }
-
-      BatchGroupT *Cur = GroupsToRelease.front();
-      TransferBatchT *UnusedTransferBatch = nullptr;
-      GroupsToRelease.pop_front();
-
-      if (BG->CompactPtrGroupBase == Cur->CompactPtrGroupBase) {
-        BG->PushedBlocks += Cur->PushedBlocks;
-        // We have updated `BatchGroup::BytesInBGAtLastCheckpoint` while
-        // collecting the `GroupsToRelease`.
-        BG->BytesInBGAtLastCheckpoint = Cur->BytesInBGAtLastCheckpoint;
-        const uptr MaxCachedPerBatch = BG->MaxCachedPerBatch;
-
-        // Note that the first TransferBatches in both `Batches` may not be
-        // full and only the first TransferBatch can have non-full blocks. Thus
-        // we have to merge them before appending one to another.
-        if (Cur->Batches.front()->getCount() == MaxCachedPerBatch) {
-          BG->Batches.append_back(&Cur->Batches);
-        } else {
-          TransferBatchT *NonFullBatch = Cur->Batches.front();
-          Cur->Batches.pop_front();
-          const u16 NonFullBatchCount = NonFullBatch->getCount();
-          // The remaining Batches in `Cur` are full.
-          BG->Batches.append_back(&Cur->Batches);
-
-          if (BG->Batches.front()->getCount() == MaxCachedPerBatch) {
-            // Only 1 non-full TransferBatch, push it to the front.
-            BG->Batches.push_front(NonFullBatch);
-          } else {
-            const u16 NumBlocksToMove = static_cast<u16>(
-                Min(static_cast<u16>(MaxCachedPerBatch -
-                                     BG->Batches.front()->getCount()),
-                    NonFullBatchCount));
-            BG->Batches.front()->appendFromTransferBatch(NonFullBatch,
-                                                         NumBlocksToMove);
-            if (NonFullBatch->isEmpty())
-              UnusedTransferBatch = NonFullBatch;
-            else
-              BG->Batches.push_front(NonFullBatch);
-          }
-        }
-
-        const u32 NeededSlots = UnusedTransferBatch == nullptr ? 1U : 2U;
-        if (UNLIKELY(Idx + NeededSlots > MaxUnusedSize)) {
-          ScopedLock L(BatchClassRegion->FLLock);
-          pushBatchClassBlocks(BatchClassRegion, Blocks, Idx);
-          if (conditionVariableEnabled())
-            BatchClassRegion->FLLockCV.notifyAll(BatchClassRegion->FLLock);
-          Idx = 0;
-        }
-        Blocks[Idx++] =
-            compactPtr(SizeClassMap::BatchClassId, reinterpret_cast<uptr>(Cur));
-        if (UnusedTransferBatch) {
-          Blocks[Idx++] =
-              compactPtr(SizeClassMap::BatchClassId,
-                         reinterpret_cast<uptr>(UnusedTransferBatch));
-        }
-        Prev = BG;
-        BG = BG->Next;
-        continue;
-      }
-
-      // At here, the `BG` is the first BatchGroup with CompactPtrGroupBase
-      // larger than the first element in `GroupsToRelease`. We need to insert
-      // `GroupsToRelease::front()` (which is `Cur` below)  before `BG`.
-      //
-      //   1. If `Prev` is nullptr, we simply push `Cur` to the front of
-      //      FreeListInfo.BlockList.
-      //   2. Otherwise, use `insert()` which inserts an element next to `Prev`.
-      //
-      // Afterwards, we don't need to advance `BG` because the order between
-      // `BG` and the new `GroupsToRelease::front()` hasn't been checked.
-      if (Prev == nullptr)
-        Region->FreeListInfo.BlockList.push_front(Cur);
-      else
-        Region->FreeListInfo.BlockList.insert(Prev, Cur);
-      DCHECK_EQ(Cur->Next, BG);
-      Prev = Cur;
-    }
-
-    if (Idx != 0) {
-      ScopedLock L(BatchClassRegion->FLLock);
-      pushBatchClassBlocks(BatchClassRegion, Blocks, Idx);
-      if (conditionVariableEnabled())
-        BatchClassRegion->FLLockCV.notifyAll(BatchClassRegion->FLLock);
-    }
-
-    if (SCUDO_DEBUG) {
-      BatchGroupT *Prev = Region->FreeListInfo.BlockList.front();
-      for (BatchGroupT *Cur = Prev->Next; Cur != nullptr;
-           Prev = Cur, Cur = Cur->Next) {
-        CHECK_LT(Prev->CompactPtrGroupBase, Cur->CompactPtrGroupBase);
-      }
-    }
-
-    if (conditionVariableEnabled())
-      Region->FLLockCV.notifyAll(Region->FLLock);
-  }
-
-  // TODO: `PrimaryBase` can be obtained from ReservedMemory. This needs to be
-  // deprecated.
-  uptr PrimaryBase = 0;
-  ReservedMemoryT ReservedMemory = {};
-  // The minimum size of pushed blocks that we will try to release the pages in
-  // that size class.
-  uptr SmallerBlockReleasePageDelta = 0;
-  atomic_s32 ReleaseToOsIntervalMs = {};
-  alignas(SCUDO_CACHE_LINE_SIZE) RegionInfo RegionInfoArray[NumClasses];
-};
-
-} // namespace scudo
-
-#endif // SCUDO_PRIMARY64_H_
diff --git a/Telegram/ThirdParty/scudo/quarantine.h b/Telegram/ThirdParty/scudo/quarantine.h
deleted file mode 100644
index b5f8db0e8..000000000
--- a/Telegram/ThirdParty/scudo/quarantine.h
+++ /dev/null
@@ -1,309 +0,0 @@
-//===-- quarantine.h --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_QUARANTINE_H_
-#define SCUDO_QUARANTINE_H_
-
-#include "list.h"
-#include "mutex.h"
-#include "string_utils.h"
-#include "thread_annotations.h"
-
-namespace scudo {
-
-struct QuarantineBatch {
-  // With the following count, a batch (and the header that protects it) occupy
-  // 4096 bytes on 32-bit platforms, and 8192 bytes on 64-bit.
-  static const u32 MaxCount = 1019;
-  QuarantineBatch *Next;
-  uptr Size;
-  u32 Count;
-  void *Batch[MaxCount];
-
-  void init(void *Ptr, uptr Size) {
-    Count = 1;
-    Batch[0] = Ptr;
-    this->Size = Size + sizeof(QuarantineBatch); // Account for the Batch Size.
-  }
-
-  // The total size of quarantined nodes recorded in this batch.
-  uptr getQuarantinedSize() const { return Size - sizeof(QuarantineBatch); }
-
-  void push_back(void *Ptr, uptr Size) {
-    DCHECK_LT(Count, MaxCount);
-    Batch[Count++] = Ptr;
-    this->Size += Size;
-  }
-
-  bool canMerge(const QuarantineBatch *const From) const {
-    return Count + From->Count <= MaxCount;
-  }
-
-  void merge(QuarantineBatch *const From) {
-    DCHECK_LE(Count + From->Count, MaxCount);
-    DCHECK_GE(Size, sizeof(QuarantineBatch));
-
-    for (uptr I = 0; I < From->Count; ++I)
-      Batch[Count + I] = From->Batch[I];
-    Count += From->Count;
-    Size += From->getQuarantinedSize();
-
-    From->Count = 0;
-    From->Size = sizeof(QuarantineBatch);
-  }
-
-  void shuffle(u32 State) { ::scudo::shuffle(Batch, Count, &State); }
-};
-
-static_assert(sizeof(QuarantineBatch) <= (1U << 13), ""); // 8Kb.
-
-// Per-thread cache of memory blocks.
-template <typename Callback> class QuarantineCache {
-public:
-  void init() { DCHECK_EQ(atomic_load_relaxed(&Size), 0U); }
-
-  // Total memory used, including internal accounting.
-  uptr getSize() const { return atomic_load_relaxed(&Size); }
-  // Memory used for internal accounting.
-  uptr getOverheadSize() const { return List.size() * sizeof(QuarantineBatch); }
-
-  void enqueue(Callback Cb, void *Ptr, uptr Size) {
-    if (List.empty() || List.back()->Count == QuarantineBatch::MaxCount) {
-      QuarantineBatch *B =
-          reinterpret_cast<QuarantineBatch *>(Cb.allocate(sizeof(*B)));
-      DCHECK(B);
-      B->init(Ptr, Size);
-      enqueueBatch(B);
-    } else {
-      List.back()->push_back(Ptr, Size);
-      addToSize(Size);
-    }
-  }
-
-  void transfer(QuarantineCache *From) {
-    List.append_back(&From->List);
-    addToSize(From->getSize());
-    atomic_store_relaxed(&From->Size, 0);
-  }
-
-  void enqueueBatch(QuarantineBatch *B) {
-    List.push_back(B);
-    addToSize(B->Size);
-  }
-
-  QuarantineBatch *dequeueBatch() {
-    if (List.empty())
-      return nullptr;
-    QuarantineBatch *B = List.front();
-    List.pop_front();
-    subFromSize(B->Size);
-    return B;
-  }
-
-  void mergeBatches(QuarantineCache *ToDeallocate) {
-    uptr ExtractedSize = 0;
-    QuarantineBatch *Current = List.front();
-    while (Current && Current->Next) {
-      if (Current->canMerge(Current->Next)) {
-        QuarantineBatch *Extracted = Current->Next;
-        // Move all the chunks into the current batch.
-        Current->merge(Extracted);
-        DCHECK_EQ(Extracted->Count, 0);
-        DCHECK_EQ(Extracted->Size, sizeof(QuarantineBatch));
-        // Remove the next batch From the list and account for its Size.
-        List.extract(Current, Extracted);
-        ExtractedSize += Extracted->Size;
-        // Add it to deallocation list.
-        ToDeallocate->enqueueBatch(Extracted);
-      } else {
-        Current = Current->Next;
-      }
-    }
-    subFromSize(ExtractedSize);
-  }
-
-  void getStats(ScopedString *Str) const {
-    uptr BatchCount = 0;
-    uptr TotalOverheadBytes = 0;
-    uptr TotalBytes = 0;
-    uptr TotalQuarantineChunks = 0;
-    for (const QuarantineBatch &Batch : List) {
-      BatchCount++;
-      TotalBytes += Batch.Size;
-      TotalOverheadBytes += Batch.Size - Batch.getQuarantinedSize();
-      TotalQuarantineChunks += Batch.Count;
-    }
-    const uptr QuarantineChunksCapacity =
-        BatchCount * QuarantineBatch::MaxCount;
-    const uptr ChunksUsagePercent =
-        (QuarantineChunksCapacity == 0)
-            ? 0
-            : TotalQuarantineChunks * 100 / QuarantineChunksCapacity;
-    const uptr TotalQuarantinedBytes = TotalBytes - TotalOverheadBytes;
-    const uptr MemoryOverheadPercent =
-        (TotalQuarantinedBytes == 0)
-            ? 0
-            : TotalOverheadBytes * 100 / TotalQuarantinedBytes;
-    Str->append(
-        "Stats: Quarantine: batches: %zu; bytes: %zu (user: %zu); chunks: %zu "
-        "(capacity: %zu); %zu%% chunks used; %zu%% memory overhead\n",
-        BatchCount, TotalBytes, TotalQuarantinedBytes, TotalQuarantineChunks,
-        QuarantineChunksCapacity, ChunksUsagePercent, MemoryOverheadPercent);
-  }
-
-private:
-  SinglyLinkedList<QuarantineBatch> List;
-  atomic_uptr Size = {};
-
-  void addToSize(uptr add) { atomic_store_relaxed(&Size, getSize() + add); }
-  void subFromSize(uptr sub) { atomic_store_relaxed(&Size, getSize() - sub); }
-};
-
-// The callback interface is:
-// void Callback::recycle(Node *Ptr);
-// void *Callback::allocate(uptr Size);
-// void Callback::deallocate(void *Ptr);
-template <typename Callback, typename Node> class GlobalQuarantine {
-public:
-  typedef QuarantineCache<Callback> CacheT;
-  using ThisT = GlobalQuarantine<Callback, Node>;
-
-  void init(uptr Size, uptr CacheSize) NO_THREAD_SAFETY_ANALYSIS {
-    DCHECK(isAligned(reinterpret_cast<uptr>(this), alignof(ThisT)));
-    DCHECK_EQ(atomic_load_relaxed(&MaxSize), 0U);
-    DCHECK_EQ(atomic_load_relaxed(&MinSize), 0U);
-    DCHECK_EQ(atomic_load_relaxed(&MaxCacheSize), 0U);
-    // Thread local quarantine size can be zero only when global quarantine size
-    // is zero (it allows us to perform just one atomic read per put() call).
-    CHECK((Size == 0 && CacheSize == 0) || CacheSize != 0);
-
-    atomic_store_relaxed(&MaxSize, Size);
-    atomic_store_relaxed(&MinSize, Size / 10 * 9); // 90% of max size.
-    atomic_store_relaxed(&MaxCacheSize, CacheSize);
-
-    Cache.init();
-  }
-
-  uptr getMaxSize() const { return atomic_load_relaxed(&MaxSize); }
-  uptr getCacheSize() const { return atomic_load_relaxed(&MaxCacheSize); }
-
-  // This is supposed to be used in test only.
-  bool isEmpty() {
-    ScopedLock L(CacheMutex);
-    return Cache.getSize() == 0U;
-  }
-
-  void put(CacheT *C, Callback Cb, Node *Ptr, uptr Size) {
-    C->enqueue(Cb, Ptr, Size);
-    if (C->getSize() > getCacheSize())
-      drain(C, Cb);
-  }
-
-  void NOINLINE drain(CacheT *C, Callback Cb) EXCLUDES(CacheMutex) {
-    bool needRecycle = false;
-    {
-      ScopedLock L(CacheMutex);
-      Cache.transfer(C);
-      needRecycle = Cache.getSize() > getMaxSize();
-    }
-
-    if (needRecycle && RecycleMutex.tryLock())
-      recycle(atomic_load_relaxed(&MinSize), Cb);
-  }
-
-  void NOINLINE drainAndRecycle(CacheT *C, Callback Cb) EXCLUDES(CacheMutex) {
-    {
-      ScopedLock L(CacheMutex);
-      Cache.transfer(C);
-    }
-    RecycleMutex.lock();
-    recycle(0, Cb);
-  }
-
-  void getStats(ScopedString *Str) EXCLUDES(CacheMutex) {
-    ScopedLock L(CacheMutex);
-    // It assumes that the world is stopped, just as the allocator's printStats.
-    Cache.getStats(Str);
-    Str->append("Quarantine limits: global: %zuK; thread local: %zuK\n",
-                getMaxSize() >> 10, getCacheSize() >> 10);
-  }
-
-  void disable() NO_THREAD_SAFETY_ANALYSIS {
-    // RecycleMutex must be locked 1st since we grab CacheMutex within recycle.
-    RecycleMutex.lock();
-    CacheMutex.lock();
-  }
-
-  void enable() NO_THREAD_SAFETY_ANALYSIS {
-    CacheMutex.unlock();
-    RecycleMutex.unlock();
-  }
-
-private:
-  // Read-only data.
-  alignas(SCUDO_CACHE_LINE_SIZE) HybridMutex CacheMutex;
-  CacheT Cache GUARDED_BY(CacheMutex);
-  alignas(SCUDO_CACHE_LINE_SIZE) HybridMutex RecycleMutex;
-  atomic_uptr MinSize = {};
-  atomic_uptr MaxSize = {};
-  alignas(SCUDO_CACHE_LINE_SIZE) atomic_uptr MaxCacheSize = {};
-
-  void NOINLINE recycle(uptr MinSize, Callback Cb) RELEASE(RecycleMutex)
-      EXCLUDES(CacheMutex) {
-    CacheT Tmp;
-    Tmp.init();
-    {
-      ScopedLock L(CacheMutex);
-      // Go over the batches and merge partially filled ones to
-      // save some memory, otherwise batches themselves (since the memory used
-      // by them is counted against quarantine limit) can overcome the actual
-      // user's quarantined chunks, which diminishes the purpose of the
-      // quarantine.
-      const uptr CacheSize = Cache.getSize();
-      const uptr OverheadSize = Cache.getOverheadSize();
-      DCHECK_GE(CacheSize, OverheadSize);
-      // Do the merge only when overhead exceeds this predefined limit (might
-      // require some tuning). It saves us merge attempt when the batch list
-      // quarantine is unlikely to contain batches suitable for merge.
-      constexpr uptr OverheadThresholdPercents = 100;
-      if (CacheSize > OverheadSize &&
-          OverheadSize * (100 + OverheadThresholdPercents) >
-              CacheSize * OverheadThresholdPercents) {
-        Cache.mergeBatches(&Tmp);
-      }
-      // Extract enough chunks from the quarantine to get below the max
-      // quarantine size and leave some leeway for the newly quarantined chunks.
-      while (Cache.getSize() > MinSize)
-        Tmp.enqueueBatch(Cache.dequeueBatch());
-    }
-    RecycleMutex.unlock();
-    doRecycle(&Tmp, Cb);
-  }
-
-  void NOINLINE doRecycle(CacheT *C, Callback Cb) {
-    while (QuarantineBatch *B = C->dequeueBatch()) {
-      const u32 Seed = static_cast<u32>(
-          (reinterpret_cast<uptr>(B) ^ reinterpret_cast<uptr>(C)) >> 4);
-      B->shuffle(Seed);
-      constexpr uptr NumberOfPrefetch = 8UL;
-      CHECK(NumberOfPrefetch <= ARRAY_SIZE(B->Batch));
-      for (uptr I = 0; I < NumberOfPrefetch; I++)
-        PREFETCH(B->Batch[I]);
-      for (uptr I = 0, Count = B->Count; I < Count; I++) {
-        if (I + NumberOfPrefetch < Count)
-          PREFETCH(B->Batch[I + NumberOfPrefetch]);
-        Cb.recycle(reinterpret_cast<Node *>(B->Batch[I]));
-      }
-      Cb.deallocate(B);
-    }
-  }
-};
-
-} // namespace scudo
-
-#endif // SCUDO_QUARANTINE_H_
diff --git a/Telegram/ThirdParty/scudo/release.cpp b/Telegram/ThirdParty/scudo/release.cpp
deleted file mode 100644
index 875a2b0c1..000000000
--- a/Telegram/ThirdParty/scudo/release.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//===-- release.cpp ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "release.h"
-
-namespace scudo {
-
-BufferPool<RegionPageMap::StaticBufferCount,
-           RegionPageMap::StaticBufferNumElements>
-    RegionPageMap::Buffers;
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/release.h b/Telegram/ThirdParty/scudo/release.h
deleted file mode 100644
index b6f76a4d2..000000000
--- a/Telegram/ThirdParty/scudo/release.h
+++ /dev/null
@@ -1,701 +0,0 @@
-//===-- release.h -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_RELEASE_H_
-#define SCUDO_RELEASE_H_
-
-#include "common.h"
-#include "list.h"
-#include "mem_map.h"
-#include "mutex.h"
-#include "thread_annotations.h"
-
-namespace scudo {
-
-template <typename MemMapT> class RegionReleaseRecorder {
-public:
-  RegionReleaseRecorder(MemMapT *RegionMemMap, uptr Base, uptr Offset = 0)
-      : RegionMemMap(RegionMemMap), Base(Base), Offset(Offset) {}
-
-  uptr getReleasedRangesCount() const { return ReleasedRangesCount; }
-
-  uptr getReleasedBytes() const { return ReleasedBytes; }
-
-  uptr getBase() const { return Base; }
-
-  // Releases [From, To) range of pages back to OS. Note that `From` and `To`
-  // are offseted from `Base` + Offset.
-  void releasePageRangeToOS(uptr From, uptr To) {
-    const uptr Size = To - From;
-    RegionMemMap->releasePagesToOS(getBase() + Offset + From, Size);
-    ReleasedRangesCount++;
-    ReleasedBytes += Size;
-  }
-
-private:
-  uptr ReleasedRangesCount = 0;
-  uptr ReleasedBytes = 0;
-  MemMapT *RegionMemMap = nullptr;
-  uptr Base = 0;
-  // The release offset from Base. This is used when we know a given range after
-  // Base will not be released.
-  uptr Offset = 0;
-};
-
-class ReleaseRecorder {
-public:
-  ReleaseRecorder(uptr Base, uptr Offset = 0, MapPlatformData *Data = nullptr)
-      : Base(Base), Offset(Offset), Data(Data) {}
-
-  uptr getReleasedRangesCount() const { return ReleasedRangesCount; }
-
-  uptr getReleasedBytes() const { return ReleasedBytes; }
-
-  uptr getBase() const { return Base; }
-
-  // Releases [From, To) range of pages back to OS.
-  void releasePageRangeToOS(uptr From, uptr To) {
-    const uptr Size = To - From;
-    releasePagesToOS(Base, From + Offset, Size, Data);
-    ReleasedRangesCount++;
-    ReleasedBytes += Size;
-  }
-
-private:
-  uptr ReleasedRangesCount = 0;
-  uptr ReleasedBytes = 0;
-  // The starting address to release. Note that we may want to combine (Base +
-  // Offset) as a new Base. However, the Base is retrieved from
-  // `MapPlatformData` on Fuchsia, which means the offset won't be aware.
-  // Therefore, store them separately to make it work on all the platforms.
-  uptr Base = 0;
-  // The release offset from Base. This is used when we know a given range after
-  // Base will not be released.
-  uptr Offset = 0;
-  MapPlatformData *Data = nullptr;
-};
-
-class FragmentationRecorder {
-public:
-  FragmentationRecorder() = default;
-
-  uptr getReleasedPagesCount() const { return ReleasedPagesCount; }
-
-  void releasePageRangeToOS(uptr From, uptr To) {
-    DCHECK_EQ((To - From) % getPageSizeCached(), 0U);
-    ReleasedPagesCount += (To - From) / getPageSizeCached();
-  }
-
-private:
-  uptr ReleasedPagesCount = 0;
-};
-
-// A buffer pool which holds a fixed number of static buffers of `uptr` elements
-// for fast buffer allocation. If the request size is greater than
-// `StaticBufferNumElements` or if all the static buffers are in use, it'll
-// delegate the allocation to map().
-template <uptr StaticBufferCount, uptr StaticBufferNumElements>
-class BufferPool {
-public:
-  // Preserve 1 bit in the `Mask` so that we don't need to do zero-check while
-  // extracting the least significant bit from the `Mask`.
-  static_assert(StaticBufferCount < SCUDO_WORDSIZE, "");
-  static_assert(isAligned(StaticBufferNumElements * sizeof(uptr),
-                          SCUDO_CACHE_LINE_SIZE),
-                "");
-
-  struct Buffer {
-    // Pointer to the buffer's memory, or nullptr if no buffer was allocated.
-    uptr *Data = nullptr;
-
-    // The index of the underlying static buffer, or StaticBufferCount if this
-    // buffer was dynamically allocated. This value is initially set to a poison
-    // value to aid debugging.
-    uptr BufferIndex = ~static_cast<uptr>(0);
-
-    // Only valid if BufferIndex == StaticBufferCount.
-    MemMapT MemMap = {};
-  };
-
-  // Return a zero-initialized buffer which can contain at least the given
-  // number of elements, or nullptr on failure.
-  Buffer getBuffer(const uptr NumElements) {
-    if (UNLIKELY(NumElements > StaticBufferNumElements))
-      return getDynamicBuffer(NumElements);
-
-    uptr index;
-    {
-      // TODO: In general, we expect this operation should be fast so the
-      // waiting thread won't be put into sleep. The HybridMutex does implement
-      // the busy-waiting but we may want to review the performance and see if
-      // we need an explict spin lock here.
-      ScopedLock L(Mutex);
-      index = getLeastSignificantSetBitIndex(Mask);
-      if (index < StaticBufferCount)
-        Mask ^= static_cast<uptr>(1) << index;
-    }
-
-    if (index >= StaticBufferCount)
-      return getDynamicBuffer(NumElements);
-
-    Buffer Buf;
-    Buf.Data = &RawBuffer[index * StaticBufferNumElements];
-    Buf.BufferIndex = index;
-    memset(Buf.Data, 0, StaticBufferNumElements * sizeof(uptr));
-    return Buf;
-  }
-
-  void releaseBuffer(Buffer Buf) {
-    DCHECK_NE(Buf.Data, nullptr);
-    DCHECK_LE(Buf.BufferIndex, StaticBufferCount);
-    if (Buf.BufferIndex != StaticBufferCount) {
-      ScopedLock L(Mutex);
-      DCHECK_EQ((Mask & (static_cast<uptr>(1) << Buf.BufferIndex)), 0U);
-      Mask |= static_cast<uptr>(1) << Buf.BufferIndex;
-    } else {
-      Buf.MemMap.unmap(Buf.MemMap.getBase(), Buf.MemMap.getCapacity());
-    }
-  }
-
-  bool isStaticBufferTestOnly(const Buffer &Buf) {
-    DCHECK_NE(Buf.Data, nullptr);
-    DCHECK_LE(Buf.BufferIndex, StaticBufferCount);
-    return Buf.BufferIndex != StaticBufferCount;
-  }
-
-private:
-  Buffer getDynamicBuffer(const uptr NumElements) {
-    // When using a heap-based buffer, precommit the pages backing the
-    // Vmar by passing |MAP_PRECOMMIT| flag. This allows an optimization
-    // where page fault exceptions are skipped as the allocated memory
-    // is accessed. So far, this is only enabled on Fuchsia. It hasn't proven a
-    // performance benefit on other platforms.
-    const uptr MmapFlags = MAP_ALLOWNOMEM | (SCUDO_FUCHSIA ? MAP_PRECOMMIT : 0);
-    const uptr MappedSize =
-        roundUp(NumElements * sizeof(uptr), getPageSizeCached());
-    Buffer Buf;
-    if (Buf.MemMap.map(/*Addr=*/0, MappedSize, "scudo:counters", MmapFlags)) {
-      Buf.Data = reinterpret_cast<uptr *>(Buf.MemMap.getBase());
-      Buf.BufferIndex = StaticBufferCount;
-    }
-    return Buf;
-  }
-
-  HybridMutex Mutex;
-  // '1' means that buffer index is not used. '0' means the buffer is in use.
-  uptr Mask GUARDED_BY(Mutex) = ~static_cast<uptr>(0);
-  uptr RawBuffer[StaticBufferCount * StaticBufferNumElements] GUARDED_BY(Mutex);
-};
-
-// A Region page map is used to record the usage of pages in the regions. It
-// implements a packed array of Counters. Each counter occupies 2^N bits, enough
-// to store counter's MaxValue. Ctor will try to use a static buffer first, and
-// if that fails (the buffer is too small or already locked), will allocate the
-// required Buffer via map(). The caller is expected to check whether the
-// initialization was successful by checking isAllocated() result. For
-// performance sake, none of the accessors check the validity of the arguments,
-// It is assumed that Index is always in [0, N) range and the value is not
-// incremented past MaxValue.
-class RegionPageMap {
-public:
-  RegionPageMap()
-      : Regions(0), NumCounters(0), CounterSizeBitsLog(0), CounterMask(0),
-        PackingRatioLog(0), BitOffsetMask(0), SizePerRegion(0),
-        BufferNumElements(0) {}
-  RegionPageMap(uptr NumberOfRegions, uptr CountersPerRegion, uptr MaxValue) {
-    reset(NumberOfRegions, CountersPerRegion, MaxValue);
-  }
-  ~RegionPageMap() {
-    if (!isAllocated())
-      return;
-    Buffers.releaseBuffer(Buffer);
-    Buffer = {};
-  }
-
-  // Lock of `StaticBuffer` is acquired conditionally and there's no easy way to
-  // specify the thread-safety attribute properly in current code structure.
-  // Besides, it's the only place we may want to check thread safety. Therefore,
-  // it's fine to bypass the thread-safety analysis now.
-  void reset(uptr NumberOfRegion, uptr CountersPerRegion, uptr MaxValue) {
-    DCHECK_GT(NumberOfRegion, 0);
-    DCHECK_GT(CountersPerRegion, 0);
-    DCHECK_GT(MaxValue, 0);
-
-    Regions = NumberOfRegion;
-    NumCounters = CountersPerRegion;
-
-    constexpr uptr MaxCounterBits = sizeof(*Buffer.Data) * 8UL;
-    // Rounding counter storage size up to the power of two allows for using
-    // bit shifts calculating particular counter's Index and offset.
-    const uptr CounterSizeBits =
-        roundUpPowerOfTwo(getMostSignificantSetBitIndex(MaxValue) + 1);
-    DCHECK_LE(CounterSizeBits, MaxCounterBits);
-    CounterSizeBitsLog = getLog2(CounterSizeBits);
-    CounterMask = ~(static_cast<uptr>(0)) >> (MaxCounterBits - CounterSizeBits);
-
-    const uptr PackingRatio = MaxCounterBits >> CounterSizeBitsLog;
-    DCHECK_GT(PackingRatio, 0);
-    PackingRatioLog = getLog2(PackingRatio);
-    BitOffsetMask = PackingRatio - 1;
-
-    SizePerRegion =
-        roundUp(NumCounters, static_cast<uptr>(1U) << PackingRatioLog) >>
-        PackingRatioLog;
-    BufferNumElements = SizePerRegion * Regions;
-    Buffer = Buffers.getBuffer(BufferNumElements);
-  }
-
-  bool isAllocated() const { return Buffer.Data != nullptr; }
-
-  uptr getCount() const { return NumCounters; }
-
-  uptr get(uptr Region, uptr I) const {
-    DCHECK_LT(Region, Regions);
-    DCHECK_LT(I, NumCounters);
-    const uptr Index = I >> PackingRatioLog;
-    const uptr BitOffset = (I & BitOffsetMask) << CounterSizeBitsLog;
-    return (Buffer.Data[Region * SizePerRegion + Index] >> BitOffset) &
-           CounterMask;
-  }
-
-  void inc(uptr Region, uptr I) const {
-    DCHECK_LT(get(Region, I), CounterMask);
-    const uptr Index = I >> PackingRatioLog;
-    const uptr BitOffset = (I & BitOffsetMask) << CounterSizeBitsLog;
-    DCHECK_LT(BitOffset, SCUDO_WORDSIZE);
-    DCHECK_EQ(isAllCounted(Region, I), false);
-    Buffer.Data[Region * SizePerRegion + Index] += static_cast<uptr>(1U)
-                                                   << BitOffset;
-  }
-
-  void incN(uptr Region, uptr I, uptr N) const {
-    DCHECK_GT(N, 0U);
-    DCHECK_LE(N, CounterMask);
-    DCHECK_LE(get(Region, I), CounterMask - N);
-    const uptr Index = I >> PackingRatioLog;
-    const uptr BitOffset = (I & BitOffsetMask) << CounterSizeBitsLog;
-    DCHECK_LT(BitOffset, SCUDO_WORDSIZE);
-    DCHECK_EQ(isAllCounted(Region, I), false);
-    Buffer.Data[Region * SizePerRegion + Index] += N << BitOffset;
-  }
-
-  void incRange(uptr Region, uptr From, uptr To) const {
-    DCHECK_LE(From, To);
-    const uptr Top = Min(To + 1, NumCounters);
-    for (uptr I = From; I < Top; I++)
-      inc(Region, I);
-  }
-
-  // Set the counter to the max value. Note that the max number of blocks in a
-  // page may vary. To provide an easier way to tell if all the blocks are
-  // counted for different pages, set to the same max value to denote the
-  // all-counted status.
-  void setAsAllCounted(uptr Region, uptr I) const {
-    DCHECK_LE(get(Region, I), CounterMask);
-    const uptr Index = I >> PackingRatioLog;
-    const uptr BitOffset = (I & BitOffsetMask) << CounterSizeBitsLog;
-    DCHECK_LT(BitOffset, SCUDO_WORDSIZE);
-    Buffer.Data[Region * SizePerRegion + Index] |= CounterMask << BitOffset;
-  }
-  void setAsAllCountedRange(uptr Region, uptr From, uptr To) const {
-    DCHECK_LE(From, To);
-    const uptr Top = Min(To + 1, NumCounters);
-    for (uptr I = From; I < Top; I++)
-      setAsAllCounted(Region, I);
-  }
-
-  bool updateAsAllCountedIf(uptr Region, uptr I, uptr MaxCount) {
-    const uptr Count = get(Region, I);
-    if (Count == CounterMask)
-      return true;
-    if (Count == MaxCount) {
-      setAsAllCounted(Region, I);
-      return true;
-    }
-    return false;
-  }
-  bool isAllCounted(uptr Region, uptr I) const {
-    return get(Region, I) == CounterMask;
-  }
-
-  uptr getBufferNumElements() const { return BufferNumElements; }
-
-private:
-  // We may consider making this configurable if there are cases which may
-  // benefit from this.
-  static const uptr StaticBufferCount = 2U;
-  static const uptr StaticBufferNumElements = 512U;
-  using BufferPoolT = BufferPool<StaticBufferCount, StaticBufferNumElements>;
-  static BufferPoolT Buffers;
-
-  uptr Regions;
-  uptr NumCounters;
-  uptr CounterSizeBitsLog;
-  uptr CounterMask;
-  uptr PackingRatioLog;
-  uptr BitOffsetMask;
-
-  uptr SizePerRegion;
-  uptr BufferNumElements;
-  BufferPoolT::Buffer Buffer;
-};
-
-template <class ReleaseRecorderT> class FreePagesRangeTracker {
-public:
-  explicit FreePagesRangeTracker(ReleaseRecorderT &Recorder)
-      : Recorder(Recorder), PageSizeLog(getLog2(getPageSizeCached())) {}
-
-  void processNextPage(bool Released) {
-    if (Released) {
-      if (!InRange) {
-        CurrentRangeStatePage = CurrentPage;
-        InRange = true;
-      }
-    } else {
-      closeOpenedRange();
-    }
-    CurrentPage++;
-  }
-
-  void skipPages(uptr N) {
-    closeOpenedRange();
-    CurrentPage += N;
-  }
-
-  void finish() { closeOpenedRange(); }
-
-private:
-  void closeOpenedRange() {
-    if (InRange) {
-      Recorder.releasePageRangeToOS((CurrentRangeStatePage << PageSizeLog),
-                                    (CurrentPage << PageSizeLog));
-      InRange = false;
-    }
-  }
-
-  ReleaseRecorderT &Recorder;
-  const uptr PageSizeLog;
-  bool InRange = false;
-  uptr CurrentPage = 0;
-  uptr CurrentRangeStatePage = 0;
-};
-
-struct PageReleaseContext {
-  PageReleaseContext(uptr BlockSize, uptr NumberOfRegions, uptr ReleaseSize,
-                     uptr ReleaseOffset = 0)
-      : BlockSize(BlockSize), NumberOfRegions(NumberOfRegions) {
-    PageSize = getPageSizeCached();
-    if (BlockSize <= PageSize) {
-      if (PageSize % BlockSize == 0) {
-        // Same number of chunks per page, no cross overs.
-        FullPagesBlockCountMax = PageSize / BlockSize;
-        SameBlockCountPerPage = true;
-      } else if (BlockSize % (PageSize % BlockSize) == 0) {
-        // Some chunks are crossing page boundaries, which means that the page
-        // contains one or two partial chunks, but all pages contain the same
-        // number of chunks.
-        FullPagesBlockCountMax = PageSize / BlockSize + 1;
-        SameBlockCountPerPage = true;
-      } else {
-        // Some chunks are crossing page boundaries, which means that the page
-        // contains one or two partial chunks.
-        FullPagesBlockCountMax = PageSize / BlockSize + 2;
-        SameBlockCountPerPage = false;
-      }
-    } else {
-      if (BlockSize % PageSize == 0) {
-        // One chunk covers multiple pages, no cross overs.
-        FullPagesBlockCountMax = 1;
-        SameBlockCountPerPage = true;
-      } else {
-        // One chunk covers multiple pages, Some chunks are crossing page
-        // boundaries. Some pages contain one chunk, some contain two.
-        FullPagesBlockCountMax = 2;
-        SameBlockCountPerPage = false;
-      }
-    }
-
-    // TODO: For multiple regions, it's more complicated to support partial
-    // region marking (which includes the complexity of how to handle the last
-    // block in a region). We may consider this after markFreeBlocks() accepts
-    // only free blocks from the same region.
-    if (NumberOfRegions != 1)
-      DCHECK_EQ(ReleaseOffset, 0U);
-
-    PagesCount = roundUp(ReleaseSize, PageSize) / PageSize;
-    PageSizeLog = getLog2(PageSize);
-    ReleasePageOffset = ReleaseOffset >> PageSizeLog;
-  }
-
-  // PageMap is lazily allocated when markFreeBlocks() is invoked.
-  bool hasBlockMarked() const {
-    return PageMap.isAllocated();
-  }
-
-  bool ensurePageMapAllocated() {
-    if (PageMap.isAllocated())
-      return true;
-    PageMap.reset(NumberOfRegions, PagesCount, FullPagesBlockCountMax);
-    // TODO: Log some message when we fail on PageMap allocation.
-    return PageMap.isAllocated();
-  }
-
-  // Mark all the blocks in the given range [From, to). Instead of visiting all
-  // the blocks, we will just mark the page as all counted. Note the `From` and
-  // `To` has to be page aligned but with one exception, if `To` is equal to the
-  // RegionSize, it's not necessary to be aligned with page size.
-  bool markRangeAsAllCounted(uptr From, uptr To, uptr Base,
-                             const uptr RegionIndex, const uptr RegionSize) {
-    DCHECK_LT(From, To);
-    DCHECK_LE(To, Base + RegionSize);
-    DCHECK_EQ(From % PageSize, 0U);
-    DCHECK_LE(To - From, RegionSize);
-
-    if (!ensurePageMapAllocated())
-      return false;
-
-    uptr FromInRegion = From - Base;
-    uptr ToInRegion = To - Base;
-    uptr FirstBlockInRange = roundUpSlow(FromInRegion, BlockSize);
-
-    // The straddling block sits across entire range.
-    if (FirstBlockInRange >= ToInRegion)
-      return true;
-
-    // First block may not sit at the first pape in the range, move
-    // `FromInRegion` to the first block page.
-    FromInRegion = roundDown(FirstBlockInRange, PageSize);
-
-    // When The first block is not aligned to the range boundary, which means
-    // there is a block sitting acorss `From`, that looks like,
-    //
-    //   From                                             To
-    //     V                                               V
-    //     +-----------------------------------------------+
-    //  +-----+-----+-----+-----+
-    //  |     |     |     |     | ...
-    //  +-----+-----+-----+-----+
-    //     |-    first page     -||-    second page    -||- ...
-    //
-    // Therefore, we can't just mark the first page as all counted. Instead, we
-    // increment the number of blocks in the first page in the page map and
-    // then round up the `From` to the next page.
-    if (FirstBlockInRange != FromInRegion) {
-      DCHECK_GT(FromInRegion + PageSize, FirstBlockInRange);
-      uptr NumBlocksInFirstPage =
-          (FromInRegion + PageSize - FirstBlockInRange + BlockSize - 1) /
-          BlockSize;
-      PageMap.incN(RegionIndex, getPageIndex(FromInRegion),
-                   NumBlocksInFirstPage);
-      FromInRegion = roundUp(FromInRegion + 1, PageSize);
-    }
-
-    uptr LastBlockInRange = roundDownSlow(ToInRegion - 1, BlockSize);
-
-    // Note that LastBlockInRange may be smaller than `FromInRegion` at this
-    // point because it may contain only one block in the range.
-
-    // When the last block sits across `To`, we can't just mark the pages
-    // occupied by the last block as all counted. Instead, we increment the
-    // counters of those pages by 1. The exception is that if it's the last
-    // block in the region, it's fine to mark those pages as all counted.
-    if (LastBlockInRange + BlockSize != RegionSize) {
-      DCHECK_EQ(ToInRegion % PageSize, 0U);
-      // The case below is like,
-      //
-      //   From                                      To
-      //     V                                        V
-      //     +----------------------------------------+
-      //                          +-----+-----+-----+-----+
-      //                          |     |     |     |     | ...
-      //                          +-----+-----+-----+-----+
-      //                    ... -||-    last page    -||-    next page    -|
-      //
-      // The last block is not aligned to `To`, we need to increment the
-      // counter of `next page` by 1.
-      if (LastBlockInRange + BlockSize != ToInRegion) {
-        PageMap.incRange(RegionIndex, getPageIndex(ToInRegion),
-                         getPageIndex(LastBlockInRange + BlockSize - 1));
-      }
-    } else {
-      ToInRegion = RegionSize;
-    }
-
-    // After handling the first page and the last block, it's safe to mark any
-    // page in between the range [From, To).
-    if (FromInRegion < ToInRegion) {
-      PageMap.setAsAllCountedRange(RegionIndex, getPageIndex(FromInRegion),
-                                   getPageIndex(ToInRegion - 1));
-    }
-
-    return true;
-  }
-
-  template <class TransferBatchT, typename DecompactPtrT>
-  bool markFreeBlocksInRegion(const IntrusiveList<TransferBatchT> &FreeList,
-                              DecompactPtrT DecompactPtr, const uptr Base,
-                              const uptr RegionIndex, const uptr RegionSize,
-                              bool MayContainLastBlockInRegion) {
-    if (!ensurePageMapAllocated())
-      return false;
-
-    if (MayContainLastBlockInRegion) {
-      const uptr LastBlockInRegion =
-          ((RegionSize / BlockSize) - 1U) * BlockSize;
-      // The last block in a region may not use the entire page, we mark the
-      // following "pretend" memory block(s) as free in advance.
-      //
-      //     Region Boundary
-      //         v
-      //  -----+-----------------------+
-      //       |      Last Page        | <- Rounded Region Boundary
-      //  -----+-----------------------+
-      //   |-----||- trailing blocks  -|
-      //      ^
-      //   last block
-      const uptr RoundedRegionSize = roundUp(RegionSize, PageSize);
-      const uptr TrailingBlockBase = LastBlockInRegion + BlockSize;
-      // If the difference between `RoundedRegionSize` and
-      // `TrailingBlockBase` is larger than a page, that implies the reported
-      // `RegionSize` may not be accurate.
-      DCHECK_LT(RoundedRegionSize - TrailingBlockBase, PageSize);
-
-      // Only the last page touched by the last block needs to mark the trailing
-      // blocks. Note that if the last "pretend" block straddles the boundary,
-      // we still have to count it in so that the logic of counting the number
-      // of blocks on a page is consistent.
-      uptr NumTrailingBlocks =
-          (roundUpSlow(RoundedRegionSize - TrailingBlockBase, BlockSize) +
-           BlockSize - 1) /
-          BlockSize;
-      if (NumTrailingBlocks > 0) {
-        PageMap.incN(RegionIndex, getPageIndex(TrailingBlockBase),
-                     NumTrailingBlocks);
-      }
-    }
-
-    // Iterate over free chunks and count how many free chunks affect each
-    // allocated page.
-    if (BlockSize <= PageSize && PageSize % BlockSize == 0) {
-      // Each chunk affects one page only.
-      for (const auto &It : FreeList) {
-        for (u16 I = 0; I < It.getCount(); I++) {
-          const uptr PInRegion = DecompactPtr(It.get(I)) - Base;
-          DCHECK_LT(PInRegion, RegionSize);
-          PageMap.inc(RegionIndex, getPageIndex(PInRegion));
-        }
-      }
-    } else {
-      // In all other cases chunks might affect more than one page.
-      DCHECK_GE(RegionSize, BlockSize);
-      for (const auto &It : FreeList) {
-        for (u16 I = 0; I < It.getCount(); I++) {
-          const uptr PInRegion = DecompactPtr(It.get(I)) - Base;
-          PageMap.incRange(RegionIndex, getPageIndex(PInRegion),
-                           getPageIndex(PInRegion + BlockSize - 1));
-        }
-      }
-    }
-
-    return true;
-  }
-
-  uptr getPageIndex(uptr P) { return (P >> PageSizeLog) - ReleasePageOffset; }
-  uptr getReleaseOffset() { return ReleasePageOffset << PageSizeLog; }
-
-  uptr BlockSize;
-  uptr NumberOfRegions;
-  // For partial region marking, some pages in front are not needed to be
-  // counted.
-  uptr ReleasePageOffset;
-  uptr PageSize;
-  uptr PagesCount;
-  uptr PageSizeLog;
-  uptr FullPagesBlockCountMax;
-  bool SameBlockCountPerPage;
-  RegionPageMap PageMap;
-};
-
-// Try to release the page which doesn't have any in-used block, i.e., they are
-// all free blocks. The `PageMap` will record the number of free blocks in each
-// page.
-template <class ReleaseRecorderT, typename SkipRegionT>
-NOINLINE void
-releaseFreeMemoryToOS(PageReleaseContext &Context,
-                      ReleaseRecorderT &Recorder, SkipRegionT SkipRegion) {
-  const uptr PageSize = Context.PageSize;
-  const uptr BlockSize = Context.BlockSize;
-  const uptr PagesCount = Context.PagesCount;
-  const uptr NumberOfRegions = Context.NumberOfRegions;
-  const uptr ReleasePageOffset = Context.ReleasePageOffset;
-  const uptr FullPagesBlockCountMax = Context.FullPagesBlockCountMax;
-  const bool SameBlockCountPerPage = Context.SameBlockCountPerPage;
-  RegionPageMap &PageMap = Context.PageMap;
-
-  // Iterate over pages detecting ranges of pages with chunk Counters equal
-  // to the expected number of chunks for the particular page.
-  FreePagesRangeTracker<ReleaseRecorderT> RangeTracker(Recorder);
-  if (SameBlockCountPerPage) {
-    // Fast path, every page has the same number of chunks affecting it.
-    for (uptr I = 0; I < NumberOfRegions; I++) {
-      if (SkipRegion(I)) {
-        RangeTracker.skipPages(PagesCount);
-        continue;
-      }
-      for (uptr J = 0; J < PagesCount; J++) {
-        const bool CanRelease =
-            PageMap.updateAsAllCountedIf(I, J, FullPagesBlockCountMax);
-        RangeTracker.processNextPage(CanRelease);
-      }
-    }
-  } else {
-    // Slow path, go through the pages keeping count how many chunks affect
-    // each page.
-    const uptr Pn = BlockSize < PageSize ? PageSize / BlockSize : 1;
-    const uptr Pnc = Pn * BlockSize;
-    // The idea is to increment the current page pointer by the first chunk
-    // size, middle portion size (the portion of the page covered by chunks
-    // except the first and the last one) and then the last chunk size, adding
-    // up the number of chunks on the current page and checking on every step
-    // whether the page boundary was crossed.
-    for (uptr I = 0; I < NumberOfRegions; I++) {
-      if (SkipRegion(I)) {
-        RangeTracker.skipPages(PagesCount);
-        continue;
-      }
-      uptr PrevPageBoundary = 0;
-      uptr CurrentBoundary = 0;
-      if (ReleasePageOffset > 0) {
-        PrevPageBoundary = ReleasePageOffset * PageSize;
-        CurrentBoundary = roundUpSlow(PrevPageBoundary, BlockSize);
-      }
-      for (uptr J = 0; J < PagesCount; J++) {
-        const uptr PageBoundary = PrevPageBoundary + PageSize;
-        uptr BlocksPerPage = Pn;
-        if (CurrentBoundary < PageBoundary) {
-          if (CurrentBoundary > PrevPageBoundary)
-            BlocksPerPage++;
-          CurrentBoundary += Pnc;
-          if (CurrentBoundary < PageBoundary) {
-            BlocksPerPage++;
-            CurrentBoundary += BlockSize;
-          }
-        }
-        PrevPageBoundary = PageBoundary;
-        const bool CanRelease =
-            PageMap.updateAsAllCountedIf(I, J, BlocksPerPage);
-        RangeTracker.processNextPage(CanRelease);
-      }
-    }
-  }
-  RangeTracker.finish();
-}
-
-} // namespace scudo
-
-#endif // SCUDO_RELEASE_H_
diff --git a/Telegram/ThirdParty/scudo/report.cpp b/Telegram/ThirdParty/scudo/report.cpp
deleted file mode 100644
index 9cef0adc0..000000000
--- a/Telegram/ThirdParty/scudo/report.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-//===-- report.cpp ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "report.h"
-
-#include "atomic_helpers.h"
-#include "string_utils.h"
-
-#include <stdarg.h>
-
-namespace scudo {
-
-class ScopedErrorReport {
-public:
-  ScopedErrorReport() : Message() { Message.append("Scudo ERROR: "); }
-  void append(const char *Format, ...) {
-    va_list Args;
-    va_start(Args, Format);
-    Message.vappend(Format, Args);
-    va_end(Args);
-  }
-  NORETURN ~ScopedErrorReport() { reportRawError(Message.data()); }
-
-private:
-  ScopedString Message;
-};
-
-inline void NORETURN trap() { __builtin_trap(); }
-
-// This could potentially be called recursively if a CHECK fails in the reports.
-void NORETURN reportCheckFailed(const char *File, int Line,
-                                const char *Condition, u64 Value1, u64 Value2) {
-  static atomic_u32 NumberOfCalls;
-  if (atomic_fetch_add(&NumberOfCalls, 1, memory_order_relaxed) > 2) {
-    // TODO(kostyak): maybe sleep here?
-    trap();
-  }
-  ScopedErrorReport Report;
-  Report.append("CHECK failed @ %s:%d %s ((u64)op1=%llu, (u64)op2=%llu)\n",
-                File, Line, Condition, Value1, Value2);
-}
-
-// Generic string fatal error message.
-void NORETURN reportError(const char *Message) {
-  ScopedErrorReport Report;
-  Report.append("%s\n", Message);
-}
-
-// Generic fatal error message without ScopedString.
-void NORETURN reportRawError(const char *Message) {
-  outputRaw(Message);
-  setAbortMessage(Message);
-  die();
-}
-
-void NORETURN reportInvalidFlag(const char *FlagType, const char *Value) {
-  ScopedErrorReport Report;
-  Report.append("invalid value for %s option: '%s'\n", FlagType, Value);
-}
-
-// The checksum of a chunk header is invalid. This could be caused by an
-// {over,under}write of the header, a pointer that is not an actual chunk.
-void NORETURN reportHeaderCorruption(void *Ptr) {
-  ScopedErrorReport Report;
-  Report.append("corrupted chunk header at address %p\n", Ptr);
-}
-
-// The allocator was compiled with parameters that conflict with field size
-// requirements.
-void NORETURN reportSanityCheckError(const char *Field) {
-  ScopedErrorReport Report;
-  Report.append("maximum possible %s doesn't fit in header\n", Field);
-}
-
-// We enforce a maximum alignment, to keep fields smaller and generally prevent
-// integer overflows, or unexpected corner cases.
-void NORETURN reportAlignmentTooBig(uptr Alignment, uptr MaxAlignment) {
-  ScopedErrorReport Report;
-  Report.append("invalid allocation alignment: %zu exceeds maximum supported "
-                "alignment of %zu\n",
-                Alignment, MaxAlignment);
-}
-
-// See above, we also enforce a maximum size.
-void NORETURN reportAllocationSizeTooBig(uptr UserSize, uptr TotalSize,
-                                         uptr MaxSize) {
-  ScopedErrorReport Report;
-  Report.append("requested allocation size %zu (%zu after adjustments) exceeds "
-                "maximum supported size of %zu\n",
-                UserSize, TotalSize, MaxSize);
-}
-
-void NORETURN reportOutOfBatchClass() {
-  ScopedErrorReport Report;
-  Report.append("BatchClass region is used up, can't hold any free block\n");
-}
-
-void NORETURN reportOutOfMemory(uptr RequestedSize) {
-  ScopedErrorReport Report;
-  Report.append("out of memory trying to allocate %zu bytes\n", RequestedSize);
-}
-
-static const char *stringifyAction(AllocatorAction Action) {
-  switch (Action) {
-  case AllocatorAction::Recycling:
-    return "recycling";
-  case AllocatorAction::Deallocating:
-    return "deallocating";
-  case AllocatorAction::Reallocating:
-    return "reallocating";
-  case AllocatorAction::Sizing:
-    return "sizing";
-  }
-  return "<invalid action>";
-}
-
-// The chunk is not in a state congruent with the operation we want to perform.
-// This is usually the case with a double-free, a realloc of a freed pointer.
-void NORETURN reportInvalidChunkState(AllocatorAction Action, void *Ptr) {
-  ScopedErrorReport Report;
-  Report.append("invalid chunk state when %s address %p\n",
-                stringifyAction(Action), Ptr);
-}
-
-void NORETURN reportMisalignedPointer(AllocatorAction Action, void *Ptr) {
-  ScopedErrorReport Report;
-  Report.append("misaligned pointer when %s address %p\n",
-                stringifyAction(Action), Ptr);
-}
-
-// The deallocation function used is at odds with the one used to allocate the
-// chunk (eg: new[]/delete or malloc/delete, and so on).
-void NORETURN reportDeallocTypeMismatch(AllocatorAction Action, void *Ptr,
-                                        u8 TypeA, u8 TypeB) {
-  ScopedErrorReport Report;
-  Report.append("allocation type mismatch when %s address %p (%d vs %d)\n",
-                stringifyAction(Action), Ptr, TypeA, TypeB);
-}
-
-// The size specified to the delete operator does not match the one that was
-// passed to new when allocating the chunk.
-void NORETURN reportDeleteSizeMismatch(void *Ptr, uptr Size,
-                                       uptr ExpectedSize) {
-  ScopedErrorReport Report;
-  Report.append(
-      "invalid sized delete when deallocating address %p (%zu vs %zu)\n", Ptr,
-      Size, ExpectedSize);
-}
-
-void NORETURN reportAlignmentNotPowerOfTwo(uptr Alignment) {
-  ScopedErrorReport Report;
-  Report.append(
-      "invalid allocation alignment: %zu, alignment must be a power of two\n",
-      Alignment);
-}
-
-void NORETURN reportCallocOverflow(uptr Count, uptr Size) {
-  ScopedErrorReport Report;
-  Report.append("calloc parameters overflow: count * size (%zu * %zu) cannot "
-                "be represented with type size_t\n",
-                Count, Size);
-}
-
-void NORETURN reportInvalidPosixMemalignAlignment(uptr Alignment) {
-  ScopedErrorReport Report;
-  Report.append(
-      "invalid alignment requested in posix_memalign: %zu, alignment must be a "
-      "power of two and a multiple of sizeof(void *) == %zu\n",
-      Alignment, sizeof(void *));
-}
-
-void NORETURN reportPvallocOverflow(uptr Size) {
-  ScopedErrorReport Report;
-  Report.append("pvalloc parameters overflow: size %zu rounded up to system "
-                "page size %zu cannot be represented in type size_t\n",
-                Size, getPageSizeCached());
-}
-
-void NORETURN reportInvalidAlignedAllocAlignment(uptr Alignment, uptr Size) {
-  ScopedErrorReport Report;
-  Report.append("invalid alignment requested in aligned_alloc: %zu, alignment "
-                "must be a power of two and the requested size %zu must be a "
-                "multiple of alignment\n",
-                Alignment, Size);
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/report.h b/Telegram/ThirdParty/scudo/report.h
deleted file mode 100644
index a510fdaeb..000000000
--- a/Telegram/ThirdParty/scudo/report.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//===-- report.h ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_REPORT_H_
-#define SCUDO_REPORT_H_
-
-#include "internal_defs.h"
-
-namespace scudo {
-
-// Reports are *fatal* unless stated otherwise.
-
-// Generic error, adds newline to end of message.
-void NORETURN reportError(const char *Message);
-
-// Generic error, but the message is not modified.
-void NORETURN reportRawError(const char *Message);
-
-// Flags related errors.
-void NORETURN reportInvalidFlag(const char *FlagType, const char *Value);
-
-// Chunk header related errors.
-void NORETURN reportHeaderCorruption(void *Ptr);
-
-// Sanity checks related error.
-void NORETURN reportSanityCheckError(const char *Field);
-
-// Combined allocator errors.
-void NORETURN reportAlignmentTooBig(uptr Alignment, uptr MaxAlignment);
-void NORETURN reportAllocationSizeTooBig(uptr UserSize, uptr TotalSize,
-                                         uptr MaxSize);
-void NORETURN reportOutOfBatchClass();
-void NORETURN reportOutOfMemory(uptr RequestedSize);
-enum class AllocatorAction : u8 {
-  Recycling,
-  Deallocating,
-  Reallocating,
-  Sizing,
-};
-void NORETURN reportInvalidChunkState(AllocatorAction Action, void *Ptr);
-void NORETURN reportMisalignedPointer(AllocatorAction Action, void *Ptr);
-void NORETURN reportDeallocTypeMismatch(AllocatorAction Action, void *Ptr,
-                                        u8 TypeA, u8 TypeB);
-void NORETURN reportDeleteSizeMismatch(void *Ptr, uptr Size, uptr ExpectedSize);
-
-// C wrappers errors.
-void NORETURN reportAlignmentNotPowerOfTwo(uptr Alignment);
-void NORETURN reportInvalidPosixMemalignAlignment(uptr Alignment);
-void NORETURN reportCallocOverflow(uptr Count, uptr Size);
-void NORETURN reportPvallocOverflow(uptr Size);
-void NORETURN reportInvalidAlignedAllocAlignment(uptr Size, uptr Alignment);
-
-} // namespace scudo
-
-#endif // SCUDO_REPORT_H_
diff --git a/Telegram/ThirdParty/scudo/report_linux.cpp b/Telegram/ThirdParty/scudo/report_linux.cpp
deleted file mode 100644
index 6a983036e..000000000
--- a/Telegram/ThirdParty/scudo/report_linux.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===-- report_linux.cpp ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-#if SCUDO_LINUX || SCUDO_TRUSTY
-
-#include "common.h"
-#include "internal_defs.h"
-#include "report.h"
-#include "report_linux.h"
-#include "string_utils.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-namespace scudo {
-
-// Fatal internal map() error (potentially OOM related).
-void NORETURN reportMapError(uptr SizeIfOOM) {
-  char Error[128] = "Scudo ERROR: internal map failure\n";
-  if (SizeIfOOM) {
-    formatString(
-        Error, sizeof(Error),
-        "Scudo ERROR: internal map failure (NO MEMORY) requesting %zuKB\n",
-        SizeIfOOM >> 10);
-  }
-  reportRawError(Error);
-}
-
-void NORETURN reportUnmapError(uptr Addr, uptr Size) {
-  char Error[128];
-  formatString(Error, sizeof(Error),
-               "Scudo ERROR: internal unmap failure (error desc=%s) Addr 0x%zx "
-               "Size %zu\n",
-               strerror(errno), Addr, Size);
-  reportRawError(Error);
-}
-
-void NORETURN reportProtectError(uptr Addr, uptr Size, int Prot) {
-  char Error[128];
-  formatString(
-      Error, sizeof(Error),
-      "Scudo ERROR: internal protect failure (error desc=%s) Addr 0x%zx "
-      "Size %zu Prot %x\n",
-      strerror(errno), Addr, Size, Prot);
-  reportRawError(Error);
-}
-
-} // namespace scudo
-
-#endif // SCUDO_LINUX || SCUDO_TRUSTY
diff --git a/Telegram/ThirdParty/scudo/report_linux.h b/Telegram/ThirdParty/scudo/report_linux.h
deleted file mode 100644
index aa0bb247e..000000000
--- a/Telegram/ThirdParty/scudo/report_linux.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//===-- report_linux.h ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_REPORT_LINUX_H_
-#define SCUDO_REPORT_LINUX_H_
-
-#include "platform.h"
-
-#if SCUDO_LINUX || SCUDO_TRUSTY
-
-#include "internal_defs.h"
-
-namespace scudo {
-
-// Report a fatal error when a map call fails. SizeIfOOM shall
-// hold the requested size on an out-of-memory error, 0 otherwise.
-void NORETURN reportMapError(uptr SizeIfOOM = 0);
-
-// Report a fatal error when an unmap call fails.
-void NORETURN reportUnmapError(uptr Addr, uptr Size);
-
-// Report a fatal error when a mprotect call fails.
-void NORETURN reportProtectError(uptr Addr, uptr Size, int Prot);
-
-} // namespace scudo
-
-#endif // SCUDO_LINUX || SCUDO_TRUSTY
-
-#endif // SCUDO_REPORT_LINUX_H_
diff --git a/Telegram/ThirdParty/scudo/secondary.h b/Telegram/ThirdParty/scudo/secondary.h
deleted file mode 100644
index f52a4188b..000000000
--- a/Telegram/ThirdParty/scudo/secondary.h
+++ /dev/null
@@ -1,708 +0,0 @@
-//===-- secondary.h ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_SECONDARY_H_
-#define SCUDO_SECONDARY_H_
-
-#include "chunk.h"
-#include "common.h"
-#include "list.h"
-#include "mem_map.h"
-#include "memtag.h"
-#include "mutex.h"
-#include "options.h"
-#include "stats.h"
-#include "string_utils.h"
-#include "thread_annotations.h"
-
-namespace scudo {
-
-// This allocator wraps the platform allocation primitives, and as such is on
-// the slower side and should preferably be used for larger sized allocations.
-// Blocks allocated will be preceded and followed by a guard page, and hold
-// their own header that is not checksummed: the guard pages and the Combined
-// header should be enough for our purpose.
-
-namespace LargeBlock {
-
-struct alignas(Max<uptr>(archSupportsMemoryTagging()
-                             ? archMemoryTagGranuleSize()
-                             : 1,
-                         1U << SCUDO_MIN_ALIGNMENT_LOG)) Header {
-  LargeBlock::Header *Prev;
-  LargeBlock::Header *Next;
-  uptr CommitBase;
-  uptr CommitSize;
-  MemMapT MemMap;
-};
-
-static_assert(sizeof(Header) % (1U << SCUDO_MIN_ALIGNMENT_LOG) == 0, "");
-static_assert(!archSupportsMemoryTagging() ||
-                  sizeof(Header) % archMemoryTagGranuleSize() == 0,
-              "");
-
-constexpr uptr getHeaderSize() { return sizeof(Header); }
-
-template <typename Config> static uptr addHeaderTag(uptr Ptr) {
-  if (allocatorSupportsMemoryTagging<Config>())
-    return addFixedTag(Ptr, 1);
-  return Ptr;
-}
-
-template <typename Config> static Header *getHeader(uptr Ptr) {
-  return reinterpret_cast<Header *>(addHeaderTag<Config>(Ptr)) - 1;
-}
-
-template <typename Config> static Header *getHeader(const void *Ptr) {
-  return getHeader<Config>(reinterpret_cast<uptr>(Ptr));
-}
-
-} // namespace LargeBlock
-
-static inline void unmap(LargeBlock::Header *H) {
-  // Note that the `H->MapMap` is stored on the pages managed by itself. Take
-  // over the ownership before unmap() so that any operation along with unmap()
-  // won't touch inaccessible pages.
-  MemMapT MemMap = H->MemMap;
-  MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
-}
-
-namespace {
-struct CachedBlock {
-  uptr CommitBase = 0;
-  uptr CommitSize = 0;
-  uptr BlockBegin = 0;
-  MemMapT MemMap = {};
-  u64 Time = 0;
-
-  bool isValid() { return CommitBase != 0; }
-
-  void invalidate() { CommitBase = 0; }
-};
-} // namespace
-
-template <typename Config> class MapAllocatorNoCache {
-public:
-  void init(UNUSED s32 ReleaseToOsInterval) {}
-  bool retrieve(UNUSED Options Options, UNUSED uptr Size, UNUSED uptr Alignment,
-                UNUSED uptr HeadersSize, UNUSED LargeBlock::Header **H,
-                UNUSED bool *Zeroed) {
-    return false;
-  }
-  void store(UNUSED Options Options, LargeBlock::Header *H) { unmap(H); }
-  bool canCache(UNUSED uptr Size) { return false; }
-  void disable() {}
-  void enable() {}
-  void releaseToOS() {}
-  void disableMemoryTagging() {}
-  void unmapTestOnly() {}
-  bool setOption(Option O, UNUSED sptr Value) {
-    if (O == Option::ReleaseInterval || O == Option::MaxCacheEntriesCount ||
-        O == Option::MaxCacheEntrySize)
-      return false;
-    // Not supported by the Secondary Cache, but not an error either.
-    return true;
-  }
-
-  void getStats(UNUSED ScopedString *Str) {
-    Str->append("Secondary Cache Disabled\n");
-  }
-};
-
-static const uptr MaxUnusedCachePages = 4U;
-
-template <typename Config>
-bool mapSecondary(const Options &Options, uptr CommitBase, uptr CommitSize,
-                  uptr AllocPos, uptr Flags, MemMapT &MemMap) {
-  Flags |= MAP_RESIZABLE;
-  Flags |= MAP_ALLOWNOMEM;
-
-  const uptr MaxUnusedCacheBytes = MaxUnusedCachePages * getPageSizeCached();
-  if (useMemoryTagging<Config>(Options) && CommitSize > MaxUnusedCacheBytes) {
-    const uptr UntaggedPos = Max(AllocPos, CommitBase + MaxUnusedCacheBytes);
-    return MemMap.remap(CommitBase, UntaggedPos - CommitBase, "scudo:secondary",
-                        MAP_MEMTAG | Flags) &&
-           MemMap.remap(UntaggedPos, CommitBase + CommitSize - UntaggedPos,
-                        "scudo:secondary", Flags);
-  } else {
-    const uptr RemapFlags =
-        (useMemoryTagging<Config>(Options) ? MAP_MEMTAG : 0) | Flags;
-    return MemMap.remap(CommitBase, CommitSize, "scudo:secondary", RemapFlags);
-  }
-}
-
-// Template specialization to avoid producing zero-length array
-template <typename T, size_t Size> class NonZeroLengthArray {
-public:
-  T &operator[](uptr Idx) { return values[Idx]; }
-
-private:
-  T values[Size];
-};
-template <typename T> class NonZeroLengthArray<T, 0> {
-public:
-  T &operator[](uptr UNUSED Idx) { UNREACHABLE("Unsupported!"); }
-};
-
-template <typename Config> class MapAllocatorCache {
-public:
-  using CacheConfig = typename Config::Secondary::Cache;
-
-  void getStats(ScopedString *Str) {
-    ScopedLock L(Mutex);
-    uptr Integral;
-    uptr Fractional;
-    computePercentage(SuccessfulRetrieves, CallsToRetrieve, &Integral,
-                      &Fractional);
-    Str->append("Stats: MapAllocatorCache: EntriesCount: %d, "
-                "MaxEntriesCount: %u, MaxEntrySize: %zu\n",
-                EntriesCount, atomic_load_relaxed(&MaxEntriesCount),
-                atomic_load_relaxed(&MaxEntrySize));
-    Str->append("Stats: CacheRetrievalStats: SuccessRate: %u/%u "
-                "(%zu.%02zu%%)\n",
-                SuccessfulRetrieves, CallsToRetrieve, Integral, Fractional);
-    for (CachedBlock Entry : Entries) {
-      if (!Entry.isValid())
-        continue;
-      Str->append("StartBlockAddress: 0x%zx, EndBlockAddress: 0x%zx, "
-                  "BlockSize: %zu %s\n",
-                  Entry.CommitBase, Entry.CommitBase + Entry.CommitSize,
-                  Entry.CommitSize, Entry.Time == 0 ? "[R]" : "");
-    }
-  }
-
-  // Ensure the default maximum specified fits the array.
-  static_assert(CacheConfig::DefaultMaxEntriesCount <=
-                    CacheConfig::EntriesArraySize,
-                "");
-
-  void init(s32 ReleaseToOsInterval) NO_THREAD_SAFETY_ANALYSIS {
-    DCHECK_EQ(EntriesCount, 0U);
-    setOption(Option::MaxCacheEntriesCount,
-              static_cast<sptr>(CacheConfig::DefaultMaxEntriesCount));
-    setOption(Option::MaxCacheEntrySize,
-              static_cast<sptr>(CacheConfig::DefaultMaxEntrySize));
-    setOption(Option::ReleaseInterval, static_cast<sptr>(ReleaseToOsInterval));
-  }
-
-  void store(const Options &Options, LargeBlock::Header *H) EXCLUDES(Mutex) {
-    if (!canCache(H->CommitSize))
-      return unmap(H);
-
-    bool EntryCached = false;
-    bool EmptyCache = false;
-    const s32 Interval = atomic_load_relaxed(&ReleaseToOsIntervalMs);
-    const u64 Time = getMonotonicTimeFast();
-    const u32 MaxCount = atomic_load_relaxed(&MaxEntriesCount);
-    CachedBlock Entry;
-    Entry.CommitBase = H->CommitBase;
-    Entry.CommitSize = H->CommitSize;
-    Entry.BlockBegin = reinterpret_cast<uptr>(H + 1);
-    Entry.MemMap = H->MemMap;
-    Entry.Time = Time;
-    if (useMemoryTagging<Config>(Options)) {
-      if (Interval == 0 && !SCUDO_FUCHSIA) {
-        // Release the memory and make it inaccessible at the same time by
-        // creating a new MAP_NOACCESS mapping on top of the existing mapping.
-        // Fuchsia does not support replacing mappings by creating a new mapping
-        // on top so we just do the two syscalls there.
-        Entry.Time = 0;
-        mapSecondary<Config>(Options, Entry.CommitBase, Entry.CommitSize,
-                             Entry.CommitBase, MAP_NOACCESS, Entry.MemMap);
-      } else {
-        Entry.MemMap.setMemoryPermission(Entry.CommitBase, Entry.CommitSize,
-                                         MAP_NOACCESS);
-      }
-    } else if (Interval == 0) {
-      Entry.MemMap.releaseAndZeroPagesToOS(Entry.CommitBase, Entry.CommitSize);
-      Entry.Time = 0;
-    }
-    do {
-      ScopedLock L(Mutex);
-      if (useMemoryTagging<Config>(Options) && QuarantinePos == -1U) {
-        // If we get here then memory tagging was disabled in between when we
-        // read Options and when we locked Mutex. We can't insert our entry into
-        // the quarantine or the cache because the permissions would be wrong so
-        // just unmap it.
-        break;
-      }
-      if (CacheConfig::QuarantineSize && useMemoryTagging<Config>(Options)) {
-        QuarantinePos =
-            (QuarantinePos + 1) % Max(CacheConfig::QuarantineSize, 1u);
-        if (!Quarantine[QuarantinePos].isValid()) {
-          Quarantine[QuarantinePos] = Entry;
-          return;
-        }
-        CachedBlock PrevEntry = Quarantine[QuarantinePos];
-        Quarantine[QuarantinePos] = Entry;
-        if (OldestTime == 0)
-          OldestTime = Entry.Time;
-        Entry = PrevEntry;
-      }
-      if (EntriesCount >= MaxCount) {
-        if (IsFullEvents++ == 4U)
-          EmptyCache = true;
-      } else {
-        for (u32 I = 0; I < MaxCount; I++) {
-          if (Entries[I].isValid())
-            continue;
-          if (I != 0)
-            Entries[I] = Entries[0];
-          Entries[0] = Entry;
-          EntriesCount++;
-          if (OldestTime == 0)
-            OldestTime = Entry.Time;
-          EntryCached = true;
-          break;
-        }
-      }
-    } while (0);
-    if (EmptyCache)
-      empty();
-    else if (Interval >= 0)
-      releaseOlderThan(Time - static_cast<u64>(Interval) * 1000000);
-    if (!EntryCached)
-      Entry.MemMap.unmap(Entry.MemMap.getBase(), Entry.MemMap.getCapacity());
-  }
-
-  bool retrieve(Options Options, uptr Size, uptr Alignment, uptr HeadersSize,
-                LargeBlock::Header **H, bool *Zeroed) EXCLUDES(Mutex) {
-    const uptr PageSize = getPageSizeCached();
-    const u32 MaxCount = atomic_load_relaxed(&MaxEntriesCount);
-    // 10% of the requested size proved to be the optimal choice for
-    // retrieving cached blocks after testing several options.
-    constexpr u32 FragmentedBytesDivisor = 10;
-    bool Found = false;
-    CachedBlock Entry;
-    uptr EntryHeaderPos = 0;
-    {
-      ScopedLock L(Mutex);
-      CallsToRetrieve++;
-      if (EntriesCount == 0)
-        return false;
-      u32 OptimalFitIndex = 0;
-      uptr MinDiff = UINTPTR_MAX;
-      for (u32 I = 0; I < MaxCount; I++) {
-        if (!Entries[I].isValid())
-          continue;
-        const uptr CommitBase = Entries[I].CommitBase;
-        const uptr CommitSize = Entries[I].CommitSize;
-        const uptr AllocPos =
-            roundDown(CommitBase + CommitSize - Size, Alignment);
-        const uptr HeaderPos = AllocPos - HeadersSize;
-        if (HeaderPos > CommitBase + CommitSize)
-          continue;
-        if (HeaderPos < CommitBase ||
-            AllocPos > CommitBase + PageSize * MaxUnusedCachePages) {
-          continue;
-        }
-        Found = true;
-        const uptr Diff = HeaderPos - CommitBase;
-        // immediately use a cached block if it's size is close enough to the
-        // requested size.
-        const uptr MaxAllowedFragmentedBytes =
-            (CommitBase + CommitSize - HeaderPos) / FragmentedBytesDivisor;
-        if (Diff <= MaxAllowedFragmentedBytes) {
-          OptimalFitIndex = I;
-          EntryHeaderPos = HeaderPos;
-          break;
-        }
-        // keep track of the smallest cached block
-        // that is greater than (AllocSize + HeaderSize)
-        if (Diff > MinDiff)
-          continue;
-        OptimalFitIndex = I;
-        MinDiff = Diff;
-        EntryHeaderPos = HeaderPos;
-      }
-      if (Found) {
-        Entry = Entries[OptimalFitIndex];
-        Entries[OptimalFitIndex].invalidate();
-        EntriesCount--;
-        SuccessfulRetrieves++;
-      }
-    }
-    if (!Found)
-      return false;
-
-    *H = reinterpret_cast<LargeBlock::Header *>(
-        LargeBlock::addHeaderTag<Config>(EntryHeaderPos));
-    *Zeroed = Entry.Time == 0;
-    if (useMemoryTagging<Config>(Options))
-      Entry.MemMap.setMemoryPermission(Entry.CommitBase, Entry.CommitSize, 0);
-    uptr NewBlockBegin = reinterpret_cast<uptr>(*H + 1);
-    if (useMemoryTagging<Config>(Options)) {
-      if (*Zeroed) {
-        storeTags(LargeBlock::addHeaderTag<Config>(Entry.CommitBase),
-                  NewBlockBegin);
-      } else if (Entry.BlockBegin < NewBlockBegin) {
-        storeTags(Entry.BlockBegin, NewBlockBegin);
-      } else {
-        storeTags(untagPointer(NewBlockBegin), untagPointer(Entry.BlockBegin));
-      }
-    }
-    (*H)->CommitBase = Entry.CommitBase;
-    (*H)->CommitSize = Entry.CommitSize;
-    (*H)->MemMap = Entry.MemMap;
-    return true;
-  }
-
-  bool canCache(uptr Size) {
-    return atomic_load_relaxed(&MaxEntriesCount) != 0U &&
-           Size <= atomic_load_relaxed(&MaxEntrySize);
-  }
-
-  bool setOption(Option O, sptr Value) {
-    if (O == Option::ReleaseInterval) {
-      const s32 Interval = Max(
-          Min(static_cast<s32>(Value), CacheConfig::MaxReleaseToOsIntervalMs),
-          CacheConfig::MinReleaseToOsIntervalMs);
-      atomic_store_relaxed(&ReleaseToOsIntervalMs, Interval);
-      return true;
-    }
-    if (O == Option::MaxCacheEntriesCount) {
-      const u32 MaxCount = static_cast<u32>(Value);
-      if (MaxCount > CacheConfig::EntriesArraySize)
-        return false;
-      atomic_store_relaxed(&MaxEntriesCount, MaxCount);
-      return true;
-    }
-    if (O == Option::MaxCacheEntrySize) {
-      atomic_store_relaxed(&MaxEntrySize, static_cast<uptr>(Value));
-      return true;
-    }
-    // Not supported by the Secondary Cache, but not an error either.
-    return true;
-  }
-
-  void releaseToOS() { releaseOlderThan(UINT64_MAX); }
-
-  void disableMemoryTagging() EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-    for (u32 I = 0; I != CacheConfig::QuarantineSize; ++I) {
-      if (Quarantine[I].isValid()) {
-        MemMapT &MemMap = Quarantine[I].MemMap;
-        MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
-        Quarantine[I].invalidate();
-      }
-    }
-    const u32 MaxCount = atomic_load_relaxed(&MaxEntriesCount);
-    for (u32 I = 0; I < MaxCount; I++) {
-      if (Entries[I].isValid()) {
-        Entries[I].MemMap.setMemoryPermission(Entries[I].CommitBase,
-                                              Entries[I].CommitSize, 0);
-      }
-    }
-    QuarantinePos = -1U;
-  }
-
-  void disable() NO_THREAD_SAFETY_ANALYSIS { Mutex.lock(); }
-
-  void enable() NO_THREAD_SAFETY_ANALYSIS { Mutex.unlock(); }
-
-  void unmapTestOnly() { empty(); }
-
-private:
-  void empty() {
-    MemMapT MapInfo[CacheConfig::EntriesArraySize];
-    uptr N = 0;
-    {
-      ScopedLock L(Mutex);
-      for (uptr I = 0; I < CacheConfig::EntriesArraySize; I++) {
-        if (!Entries[I].isValid())
-          continue;
-        MapInfo[N] = Entries[I].MemMap;
-        Entries[I].invalidate();
-        N++;
-      }
-      EntriesCount = 0;
-      IsFullEvents = 0;
-    }
-    for (uptr I = 0; I < N; I++) {
-      MemMapT &MemMap = MapInfo[I];
-      MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
-    }
-  }
-
-  void releaseIfOlderThan(CachedBlock &Entry, u64 Time) REQUIRES(Mutex) {
-    if (!Entry.isValid() || !Entry.Time)
-      return;
-    if (Entry.Time > Time) {
-      if (OldestTime == 0 || Entry.Time < OldestTime)
-        OldestTime = Entry.Time;
-      return;
-    }
-    Entry.MemMap.releaseAndZeroPagesToOS(Entry.CommitBase, Entry.CommitSize);
-    Entry.Time = 0;
-  }
-
-  void releaseOlderThan(u64 Time) EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-    if (!EntriesCount || OldestTime == 0 || OldestTime > Time)
-      return;
-    OldestTime = 0;
-    for (uptr I = 0; I < CacheConfig::QuarantineSize; I++)
-      releaseIfOlderThan(Quarantine[I], Time);
-    for (uptr I = 0; I < CacheConfig::EntriesArraySize; I++)
-      releaseIfOlderThan(Entries[I], Time);
-  }
-
-  HybridMutex Mutex;
-  u32 EntriesCount GUARDED_BY(Mutex) = 0;
-  u32 QuarantinePos GUARDED_BY(Mutex) = 0;
-  atomic_u32 MaxEntriesCount = {};
-  atomic_uptr MaxEntrySize = {};
-  u64 OldestTime GUARDED_BY(Mutex) = 0;
-  u32 IsFullEvents GUARDED_BY(Mutex) = 0;
-  atomic_s32 ReleaseToOsIntervalMs = {};
-  u32 CallsToRetrieve GUARDED_BY(Mutex) = 0;
-  u32 SuccessfulRetrieves GUARDED_BY(Mutex) = 0;
-
-  CachedBlock Entries[CacheConfig::EntriesArraySize] GUARDED_BY(Mutex) = {};
-  NonZeroLengthArray<CachedBlock, CacheConfig::QuarantineSize>
-      Quarantine GUARDED_BY(Mutex) = {};
-};
-
-template <typename Config> class MapAllocator {
-public:
-  void init(GlobalStats *S,
-            s32 ReleaseToOsInterval = -1) NO_THREAD_SAFETY_ANALYSIS {
-    DCHECK_EQ(AllocatedBytes, 0U);
-    DCHECK_EQ(FreedBytes, 0U);
-    Cache.init(ReleaseToOsInterval);
-    Stats.init();
-    if (LIKELY(S))
-      S->link(&Stats);
-  }
-
-  void *allocate(const Options &Options, uptr Size, uptr AlignmentHint = 0,
-                 uptr *BlockEnd = nullptr,
-                 FillContentsMode FillContents = NoFill);
-
-  void deallocate(const Options &Options, void *Ptr);
-
-  static uptr getBlockEnd(void *Ptr) {
-    auto *B = LargeBlock::getHeader<Config>(Ptr);
-    return B->CommitBase + B->CommitSize;
-  }
-
-  static uptr getBlockSize(void *Ptr) {
-    return getBlockEnd(Ptr) - reinterpret_cast<uptr>(Ptr);
-  }
-
-  static constexpr uptr getHeadersSize() {
-    return Chunk::getHeaderSize() + LargeBlock::getHeaderSize();
-  }
-
-  void disable() NO_THREAD_SAFETY_ANALYSIS {
-    Mutex.lock();
-    Cache.disable();
-  }
-
-  void enable() NO_THREAD_SAFETY_ANALYSIS {
-    Cache.enable();
-    Mutex.unlock();
-  }
-
-  template <typename F> void iterateOverBlocks(F Callback) const {
-    Mutex.assertHeld();
-
-    for (const auto &H : InUseBlocks) {
-      uptr Ptr = reinterpret_cast<uptr>(&H) + LargeBlock::getHeaderSize();
-      if (allocatorSupportsMemoryTagging<Config>())
-        Ptr = untagPointer(Ptr);
-      Callback(Ptr);
-    }
-  }
-
-  bool canCache(uptr Size) { return Cache.canCache(Size); }
-
-  bool setOption(Option O, sptr Value) { return Cache.setOption(O, Value); }
-
-  void releaseToOS() { Cache.releaseToOS(); }
-
-  void disableMemoryTagging() { Cache.disableMemoryTagging(); }
-
-  void unmapTestOnly() { Cache.unmapTestOnly(); }
-
-  void getStats(ScopedString *Str);
-
-private:
-  typename Config::Secondary::template CacheT<Config> Cache;
-
-  mutable HybridMutex Mutex;
-  DoublyLinkedList<LargeBlock::Header> InUseBlocks GUARDED_BY(Mutex);
-  uptr AllocatedBytes GUARDED_BY(Mutex) = 0;
-  uptr FreedBytes GUARDED_BY(Mutex) = 0;
-  uptr FragmentedBytes GUARDED_BY(Mutex) = 0;
-  uptr LargestSize GUARDED_BY(Mutex) = 0;
-  u32 NumberOfAllocs GUARDED_BY(Mutex) = 0;
-  u32 NumberOfFrees GUARDED_BY(Mutex) = 0;
-  LocalStats Stats GUARDED_BY(Mutex);
-};
-
-// As with the Primary, the size passed to this function includes any desired
-// alignment, so that the frontend can align the user allocation. The hint
-// parameter allows us to unmap spurious memory when dealing with larger
-// (greater than a page) alignments on 32-bit platforms.
-// Due to the sparsity of address space available on those platforms, requesting
-// an allocation from the Secondary with a large alignment would end up wasting
-// VA space (even though we are not committing the whole thing), hence the need
-// to trim off some of the reserved space.
-// For allocations requested with an alignment greater than or equal to a page,
-// the committed memory will amount to something close to Size - AlignmentHint
-// (pending rounding and headers).
-template <typename Config>
-void *MapAllocator<Config>::allocate(const Options &Options, uptr Size,
-                                     uptr Alignment, uptr *BlockEndPtr,
-                                     FillContentsMode FillContents) {
-  if (Options.get(OptionBit::AddLargeAllocationSlack))
-    Size += 1UL << SCUDO_MIN_ALIGNMENT_LOG;
-  Alignment = Max(Alignment, uptr(1U) << SCUDO_MIN_ALIGNMENT_LOG);
-  const uptr PageSize = getPageSizeCached();
-
-  // Note that cached blocks may have aligned address already. Thus we simply
-  // pass the required size (`Size` + `getHeadersSize()`) to do cache look up.
-  const uptr MinNeededSizeForCache = roundUp(Size + getHeadersSize(), PageSize);
-
-  if (Alignment < PageSize && Cache.canCache(MinNeededSizeForCache)) {
-    LargeBlock::Header *H;
-    bool Zeroed;
-    if (Cache.retrieve(Options, Size, Alignment, getHeadersSize(), &H,
-                       &Zeroed)) {
-      const uptr BlockEnd = H->CommitBase + H->CommitSize;
-      if (BlockEndPtr)
-        *BlockEndPtr = BlockEnd;
-      uptr HInt = reinterpret_cast<uptr>(H);
-      if (allocatorSupportsMemoryTagging<Config>())
-        HInt = untagPointer(HInt);
-      const uptr PtrInt = HInt + LargeBlock::getHeaderSize();
-      void *Ptr = reinterpret_cast<void *>(PtrInt);
-      if (FillContents && !Zeroed)
-        memset(Ptr, FillContents == ZeroFill ? 0 : PatternFillByte,
-               BlockEnd - PtrInt);
-      {
-        ScopedLock L(Mutex);
-        InUseBlocks.push_back(H);
-        AllocatedBytes += H->CommitSize;
-        FragmentedBytes += H->MemMap.getCapacity() - H->CommitSize;
-        NumberOfAllocs++;
-        Stats.add(StatAllocated, H->CommitSize);
-        Stats.add(StatMapped, H->MemMap.getCapacity());
-      }
-      return Ptr;
-    }
-  }
-
-  uptr RoundedSize =
-      roundUp(roundUp(Size, Alignment) + getHeadersSize(), PageSize);
-  if (Alignment > PageSize)
-    RoundedSize += Alignment - PageSize;
-
-  ReservedMemoryT ReservedMemory;
-  const uptr MapSize = RoundedSize + 2 * PageSize;
-  if (UNLIKELY(!ReservedMemory.create(/*Addr=*/0U, MapSize, nullptr,
-                                      MAP_ALLOWNOMEM))) {
-    return nullptr;
-  }
-
-  // Take the entire ownership of reserved region.
-  MemMapT MemMap = ReservedMemory.dispatch(ReservedMemory.getBase(),
-                                           ReservedMemory.getCapacity());
-  uptr MapBase = MemMap.getBase();
-  uptr CommitBase = MapBase + PageSize;
-  uptr MapEnd = MapBase + MapSize;
-
-  // In the unlikely event of alignments larger than a page, adjust the amount
-  // of memory we want to commit, and trim the extra memory.
-  if (UNLIKELY(Alignment >= PageSize)) {
-    // For alignments greater than or equal to a page, the user pointer (eg: the
-    // pointer that is returned by the C or C++ allocation APIs) ends up on a
-    // page boundary , and our headers will live in the preceding page.
-    CommitBase = roundUp(MapBase + PageSize + 1, Alignment) - PageSize;
-    const uptr NewMapBase = CommitBase - PageSize;
-    DCHECK_GE(NewMapBase, MapBase);
-    // We only trim the extra memory on 32-bit platforms: 64-bit platforms
-    // are less constrained memory wise, and that saves us two syscalls.
-    if (SCUDO_WORDSIZE == 32U && NewMapBase != MapBase) {
-      MemMap.unmap(MapBase, NewMapBase - MapBase);
-      MapBase = NewMapBase;
-    }
-    const uptr NewMapEnd =
-        CommitBase + PageSize + roundUp(Size, PageSize) + PageSize;
-    DCHECK_LE(NewMapEnd, MapEnd);
-    if (SCUDO_WORDSIZE == 32U && NewMapEnd != MapEnd) {
-      MemMap.unmap(NewMapEnd, MapEnd - NewMapEnd);
-      MapEnd = NewMapEnd;
-    }
-  }
-
-  const uptr CommitSize = MapEnd - PageSize - CommitBase;
-  const uptr AllocPos = roundDown(CommitBase + CommitSize - Size, Alignment);
-  if (!mapSecondary<Config>(Options, CommitBase, CommitSize, AllocPos, 0,
-                            MemMap)) {
-    MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
-    return nullptr;
-  }
-  const uptr HeaderPos = AllocPos - getHeadersSize();
-  LargeBlock::Header *H = reinterpret_cast<LargeBlock::Header *>(
-      LargeBlock::addHeaderTag<Config>(HeaderPos));
-  if (useMemoryTagging<Config>(Options))
-    storeTags(LargeBlock::addHeaderTag<Config>(CommitBase),
-              reinterpret_cast<uptr>(H + 1));
-  H->CommitBase = CommitBase;
-  H->CommitSize = CommitSize;
-  H->MemMap = MemMap;
-  if (BlockEndPtr)
-    *BlockEndPtr = CommitBase + CommitSize;
-  {
-    ScopedLock L(Mutex);
-    InUseBlocks.push_back(H);
-    AllocatedBytes += CommitSize;
-    FragmentedBytes += H->MemMap.getCapacity() - CommitSize;
-    if (LargestSize < CommitSize)
-      LargestSize = CommitSize;
-    NumberOfAllocs++;
-    Stats.add(StatAllocated, CommitSize);
-    Stats.add(StatMapped, H->MemMap.getCapacity());
-  }
-  return reinterpret_cast<void *>(HeaderPos + LargeBlock::getHeaderSize());
-}
-
-template <typename Config>
-void MapAllocator<Config>::deallocate(const Options &Options, void *Ptr)
-    EXCLUDES(Mutex) {
-  LargeBlock::Header *H = LargeBlock::getHeader<Config>(Ptr);
-  const uptr CommitSize = H->CommitSize;
-  {
-    ScopedLock L(Mutex);
-    InUseBlocks.remove(H);
-    FreedBytes += CommitSize;
-    FragmentedBytes -= H->MemMap.getCapacity() - CommitSize;
-    NumberOfFrees++;
-    Stats.sub(StatAllocated, CommitSize);
-    Stats.sub(StatMapped, H->MemMap.getCapacity());
-  }
-  Cache.store(Options, H);
-}
-
-template <typename Config>
-void MapAllocator<Config>::getStats(ScopedString *Str) EXCLUDES(Mutex) {
-  ScopedLock L(Mutex);
-  Str->append("Stats: MapAllocator: allocated %u times (%zuK), freed %u times "
-              "(%zuK), remains %u (%zuK) max %zuM, Fragmented %zuK\n",
-              NumberOfAllocs, AllocatedBytes >> 10, NumberOfFrees,
-              FreedBytes >> 10, NumberOfAllocs - NumberOfFrees,
-              (AllocatedBytes - FreedBytes) >> 10, LargestSize >> 20,
-              FragmentedBytes >> 10);
-  Cache.getStats(Str);
-}
-
-} // namespace scudo
-
-#endif // SCUDO_SECONDARY_H_
diff --git a/Telegram/ThirdParty/scudo/size_class_map.h b/Telegram/ThirdParty/scudo/size_class_map.h
deleted file mode 100644
index 4138885de..000000000
--- a/Telegram/ThirdParty/scudo/size_class_map.h
+++ /dev/null
@@ -1,353 +0,0 @@
-//===-- size_class_map.h ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_SIZE_CLASS_MAP_H_
-#define SCUDO_SIZE_CLASS_MAP_H_
-
-#include "chunk.h"
-#include "common.h"
-#include "string_utils.h"
-
-namespace scudo {
-
-inline uptr scaledLog2(uptr Size, uptr ZeroLog, uptr LogBits) {
-  const uptr L = getMostSignificantSetBitIndex(Size);
-  const uptr LBits = (Size >> (L - LogBits)) - (1 << LogBits);
-  const uptr HBits = (L - ZeroLog) << LogBits;
-  return LBits + HBits;
-}
-
-template <typename Config> struct SizeClassMapBase {
-  static u16 getMaxCachedHint(uptr Size) {
-    DCHECK_NE(Size, 0);
-    u32 N;
-    // Force a 32-bit division if the template parameters allow for it.
-    if (Config::MaxBytesCachedLog > 31 || Config::MaxSizeLog > 31)
-      N = static_cast<u32>((1UL << Config::MaxBytesCachedLog) / Size);
-    else
-      N = (1U << Config::MaxBytesCachedLog) / static_cast<u32>(Size);
-
-    // Note that Config::MaxNumCachedHint is u16 so the result is guaranteed to
-    // fit in u16.
-    return static_cast<u16>(Max(1U, Min<u32>(Config::MaxNumCachedHint, N)));
-  }
-};
-
-// SizeClassMap maps allocation sizes into size classes and back, in an
-// efficient table-free manner.
-//
-// Class 0 is a special class that doesn't abide by the same rules as other
-// classes. The allocator uses it to hold batches.
-//
-// The other sizes are controlled by the template parameters:
-// - MinSizeLog: defines the first class as 2^MinSizeLog bytes.
-// - MaxSizeLog: defines the last class as 2^MaxSizeLog bytes.
-// - MidSizeLog: classes increase with step 2^MinSizeLog from 2^MinSizeLog to
-//               2^MidSizeLog bytes.
-// - NumBits: the number of non-zero bits in sizes after 2^MidSizeLog.
-//            eg. with NumBits==3 all size classes after 2^MidSizeLog look like
-//            0b1xx0..0 (where x is either 0 or 1).
-//
-// This class also gives a hint to a thread-caching allocator about the amount
-// of chunks that can be cached per-thread:
-// - MaxNumCachedHint is a hint for the max number of chunks cached per class.
-// - 2^MaxBytesCachedLog is the max number of bytes cached per class.
-template <typename Config>
-class FixedSizeClassMap : public SizeClassMapBase<Config> {
-  typedef SizeClassMapBase<Config> Base;
-
-  static const uptr MinSize = 1UL << Config::MinSizeLog;
-  static const uptr MidSize = 1UL << Config::MidSizeLog;
-  static const uptr MidClass = MidSize / MinSize;
-  static const u8 S = Config::NumBits - 1;
-  static const uptr M = (1UL << S) - 1;
-
-public:
-  static const u16 MaxNumCachedHint = Config::MaxNumCachedHint;
-
-  static const uptr MaxSize = (1UL << Config::MaxSizeLog) + Config::SizeDelta;
-  static const uptr NumClasses =
-      MidClass + ((Config::MaxSizeLog - Config::MidSizeLog) << S) + 1;
-  static_assert(NumClasses <= 256, "");
-  static const uptr LargestClassId = NumClasses - 1;
-  static const uptr BatchClassId = 0;
-
-  static uptr getSizeByClassId(uptr ClassId) {
-    DCHECK_NE(ClassId, BatchClassId);
-    if (ClassId <= MidClass)
-      return (ClassId << Config::MinSizeLog) + Config::SizeDelta;
-    ClassId -= MidClass;
-    const uptr T = MidSize << (ClassId >> S);
-    return T + (T >> S) * (ClassId & M) + Config::SizeDelta;
-  }
-
-  static u8 getSizeLSBByClassId(uptr ClassId) {
-    return u8(getLeastSignificantSetBitIndex(getSizeByClassId(ClassId)));
-  }
-
-  static constexpr bool usesCompressedLSBFormat() { return false; }
-
-  static uptr getClassIdBySize(uptr Size) {
-    if (Size <= Config::SizeDelta + (1 << Config::MinSizeLog))
-      return 1;
-    Size -= Config::SizeDelta;
-    DCHECK_LE(Size, MaxSize);
-    if (Size <= MidSize)
-      return (Size + MinSize - 1) >> Config::MinSizeLog;
-    return MidClass + 1 + scaledLog2(Size - 1, Config::MidSizeLog, S);
-  }
-
-  static u16 getMaxCachedHint(uptr Size) {
-    DCHECK_LE(Size, MaxSize);
-    return Base::getMaxCachedHint(Size);
-  }
-};
-
-template <typename Config>
-class TableSizeClassMap : public SizeClassMapBase<Config> {
-  typedef SizeClassMapBase<Config> Base;
-
-  static const u8 S = Config::NumBits - 1;
-  static const uptr M = (1UL << S) - 1;
-  static const uptr ClassesSize =
-      sizeof(Config::Classes) / sizeof(Config::Classes[0]);
-
-  struct SizeTable {
-    constexpr SizeTable() {
-      uptr Pos = 1 << Config::MidSizeLog;
-      uptr Inc = 1 << (Config::MidSizeLog - S);
-      for (uptr i = 0; i != getTableSize(); ++i) {
-        Pos += Inc;
-        if ((Pos & (Pos - 1)) == 0)
-          Inc *= 2;
-        Tab[i] = computeClassId(Pos + Config::SizeDelta);
-      }
-    }
-
-    constexpr static u8 computeClassId(uptr Size) {
-      for (uptr i = 0; i != ClassesSize; ++i) {
-        if (Size <= Config::Classes[i])
-          return static_cast<u8>(i + 1);
-      }
-      return static_cast<u8>(-1);
-    }
-
-    constexpr static uptr getTableSize() {
-      return (Config::MaxSizeLog - Config::MidSizeLog) << S;
-    }
-
-    u8 Tab[getTableSize()] = {};
-  };
-
-  static constexpr SizeTable SzTable = {};
-
-  struct LSBTable {
-    constexpr LSBTable() {
-      u8 Min = 255, Max = 0;
-      for (uptr I = 0; I != ClassesSize; ++I) {
-        for (u8 Bit = 0; Bit != 64; ++Bit) {
-          if (Config::Classes[I] & (1 << Bit)) {
-            Tab[I] = Bit;
-            if (Bit < Min)
-              Min = Bit;
-            if (Bit > Max)
-              Max = Bit;
-            break;
-          }
-        }
-      }
-
-      if (Max - Min > 3 || ClassesSize > 32)
-        return;
-
-      UseCompressedFormat = true;
-      CompressedMin = Min;
-      for (uptr I = 0; I != ClassesSize; ++I)
-        CompressedValue |= u64(Tab[I] - Min) << (I * 2);
-    }
-
-    u8 Tab[ClassesSize] = {};
-
-    bool UseCompressedFormat = false;
-    u8 CompressedMin = 0;
-    u64 CompressedValue = 0;
-  };
-
-  static constexpr LSBTable LTable = {};
-
-public:
-  static const u16 MaxNumCachedHint = Config::MaxNumCachedHint;
-
-  static const uptr NumClasses = ClassesSize + 1;
-  static_assert(NumClasses < 256, "");
-  static const uptr LargestClassId = NumClasses - 1;
-  static const uptr BatchClassId = 0;
-  static const uptr MaxSize = Config::Classes[LargestClassId - 1];
-
-  static uptr getSizeByClassId(uptr ClassId) {
-    return Config::Classes[ClassId - 1];
-  }
-
-  static u8 getSizeLSBByClassId(uptr ClassId) {
-    if (LTable.UseCompressedFormat)
-      return ((LTable.CompressedValue >> ((ClassId - 1) * 2)) & 3) +
-             LTable.CompressedMin;
-    else
-      return LTable.Tab[ClassId - 1];
-  }
-
-  static constexpr bool usesCompressedLSBFormat() {
-    return LTable.UseCompressedFormat;
-  }
-
-  static uptr getClassIdBySize(uptr Size) {
-    if (Size <= Config::Classes[0])
-      return 1;
-    Size -= Config::SizeDelta;
-    DCHECK_LE(Size, MaxSize);
-    if (Size <= (1 << Config::MidSizeLog))
-      return ((Size - 1) >> Config::MinSizeLog) + 1;
-    return SzTable.Tab[scaledLog2(Size - 1, Config::MidSizeLog, S)];
-  }
-
-  static u16 getMaxCachedHint(uptr Size) {
-    DCHECK_LE(Size, MaxSize);
-    return Base::getMaxCachedHint(Size);
-  }
-};
-
-struct DefaultSizeClassConfig {
-  static const uptr NumBits = 3;
-  static const uptr MinSizeLog = 5;
-  static const uptr MidSizeLog = 8;
-  static const uptr MaxSizeLog = 17;
-  static const u16 MaxNumCachedHint = 14;
-  static const uptr MaxBytesCachedLog = 10;
-  static const uptr SizeDelta = 0;
-};
-
-typedef FixedSizeClassMap<DefaultSizeClassConfig> DefaultSizeClassMap;
-
-struct FuchsiaSizeClassConfig {
-  static const uptr NumBits = 3;
-  static const uptr MinSizeLog = 5;
-  static const uptr MidSizeLog = 8;
-  static const uptr MaxSizeLog = 17;
-  static const u16 MaxNumCachedHint = 12;
-  static const uptr MaxBytesCachedLog = 10;
-  static const uptr SizeDelta = Chunk::getHeaderSize();
-};
-
-typedef FixedSizeClassMap<FuchsiaSizeClassConfig> FuchsiaSizeClassMap;
-
-struct AndroidSizeClassConfig {
-#if SCUDO_WORDSIZE == 64U
-  static const uptr NumBits = 7;
-  static const uptr MinSizeLog = 4;
-  static const uptr MidSizeLog = 6;
-  static const uptr MaxSizeLog = 16;
-  static const u16 MaxNumCachedHint = 13;
-  static const uptr MaxBytesCachedLog = 13;
-
-  static constexpr uptr Classes[] = {
-      0x00020, 0x00030, 0x00040, 0x00050, 0x00060, 0x00070, 0x00090, 0x000b0,
-      0x000c0, 0x000e0, 0x00120, 0x00160, 0x001c0, 0x00250, 0x00320, 0x00450,
-      0x00670, 0x00830, 0x00a10, 0x00c30, 0x01010, 0x01210, 0x01bd0, 0x02210,
-      0x02d90, 0x03790, 0x04010, 0x04810, 0x05a10, 0x07310, 0x08210, 0x10010,
-  };
-  static const uptr SizeDelta = 16;
-#else
-  static const uptr NumBits = 8;
-  static const uptr MinSizeLog = 4;
-  static const uptr MidSizeLog = 7;
-  static const uptr MaxSizeLog = 16;
-  static const u16 MaxNumCachedHint = 14;
-  static const uptr MaxBytesCachedLog = 13;
-
-  static constexpr uptr Classes[] = {
-      0x00020, 0x00030, 0x00040, 0x00050, 0x00060, 0x00070, 0x00080, 0x00090,
-      0x000a0, 0x000b0, 0x000c0, 0x000e0, 0x000f0, 0x00110, 0x00120, 0x00130,
-      0x00150, 0x00160, 0x00170, 0x00190, 0x001d0, 0x00210, 0x00240, 0x002a0,
-      0x00330, 0x00370, 0x003a0, 0x00400, 0x00430, 0x004a0, 0x00530, 0x00610,
-      0x00730, 0x00840, 0x00910, 0x009c0, 0x00a60, 0x00b10, 0x00ca0, 0x00e00,
-      0x00fb0, 0x01030, 0x01130, 0x011f0, 0x01490, 0x01650, 0x01930, 0x02010,
-      0x02190, 0x02490, 0x02850, 0x02d50, 0x03010, 0x03210, 0x03c90, 0x04090,
-      0x04510, 0x04810, 0x05c10, 0x06f10, 0x07310, 0x08010, 0x0c010, 0x10010,
-  };
-  static const uptr SizeDelta = 16;
-#endif
-};
-
-typedef TableSizeClassMap<AndroidSizeClassConfig> AndroidSizeClassMap;
-
-#if SCUDO_WORDSIZE == 64U && defined(__clang__)
-static_assert(AndroidSizeClassMap::usesCompressedLSBFormat(), "");
-#endif
-
-struct TrustySizeClassConfig {
-  static const uptr NumBits = 1;
-  static const uptr MinSizeLog = 5;
-  static const uptr MidSizeLog = 5;
-  static const uptr MaxSizeLog = 15;
-  static const u16 MaxNumCachedHint = 12;
-  static const uptr MaxBytesCachedLog = 10;
-  static const uptr SizeDelta = 0;
-};
-
-typedef FixedSizeClassMap<TrustySizeClassConfig> TrustySizeClassMap;
-
-template <typename SCMap> inline void printMap() {
-  ScopedString Buffer;
-  uptr PrevS = 0;
-  uptr TotalCached = 0;
-  for (uptr I = 0; I < SCMap::NumClasses; I++) {
-    if (I == SCMap::BatchClassId)
-      continue;
-    const uptr S = SCMap::getSizeByClassId(I);
-    const uptr D = S - PrevS;
-    const uptr P = PrevS ? (D * 100 / PrevS) : 0;
-    const uptr L = S ? getMostSignificantSetBitIndex(S) : 0;
-    const uptr Cached = SCMap::getMaxCachedHint(S) * S;
-    Buffer.append(
-        "C%02zu => S: %zu diff: +%zu %02zu%% L %zu Cached: %u %zu; id %zu\n", I,
-        S, D, P, L, SCMap::getMaxCachedHint(S), Cached,
-        SCMap::getClassIdBySize(S));
-    TotalCached += Cached;
-    PrevS = S;
-  }
-  Buffer.append("Total Cached: %zu\n", TotalCached);
-  Buffer.output();
-}
-
-template <typename SCMap> static UNUSED void validateMap() {
-  for (uptr C = 0; C < SCMap::NumClasses; C++) {
-    if (C == SCMap::BatchClassId)
-      continue;
-    const uptr S = SCMap::getSizeByClassId(C);
-    CHECK_NE(S, 0U);
-    CHECK_EQ(SCMap::getClassIdBySize(S), C);
-    if (C < SCMap::LargestClassId)
-      CHECK_EQ(SCMap::getClassIdBySize(S + 1), C + 1);
-    CHECK_EQ(SCMap::getClassIdBySize(S - 1), C);
-    if (C - 1 != SCMap::BatchClassId)
-      CHECK_GT(SCMap::getSizeByClassId(C), SCMap::getSizeByClassId(C - 1));
-  }
-  // Do not perform the loop if the maximum size is too large.
-  if (SCMap::MaxSize > (1 << 19))
-    return;
-  for (uptr S = 1; S <= SCMap::MaxSize; S++) {
-    const uptr C = SCMap::getClassIdBySize(S);
-    CHECK_LT(C, SCMap::NumClasses);
-    CHECK_GE(SCMap::getSizeByClassId(C), S);
-    if (C - 1 != SCMap::BatchClassId)
-      CHECK_LT(SCMap::getSizeByClassId(C - 1), S);
-  }
-}
-} // namespace scudo
-
-#endif // SCUDO_SIZE_CLASS_MAP_H_
diff --git a/Telegram/ThirdParty/scudo/stack_depot.h b/Telegram/ThirdParty/scudo/stack_depot.h
deleted file mode 100644
index 12c35eb2a..000000000
--- a/Telegram/ThirdParty/scudo/stack_depot.h
+++ /dev/null
@@ -1,143 +0,0 @@
-//===-- stack_depot.h -------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_STACK_DEPOT_H_
-#define SCUDO_STACK_DEPOT_H_
-
-#include "atomic_helpers.h"
-#include "mutex.h"
-
-namespace scudo {
-
-class MurMur2HashBuilder {
-  static const u32 M = 0x5bd1e995;
-  static const u32 Seed = 0x9747b28c;
-  static const u32 R = 24;
-  u32 H;
-
-public:
-  explicit MurMur2HashBuilder(u32 Init = 0) { H = Seed ^ Init; }
-  void add(u32 K) {
-    K *= M;
-    K ^= K >> R;
-    K *= M;
-    H *= M;
-    H ^= K;
-  }
-  u32 get() {
-    u32 X = H;
-    X ^= X >> 13;
-    X *= M;
-    X ^= X >> 15;
-    return X;
-  }
-};
-
-class StackDepot {
-  HybridMutex RingEndMu;
-  u32 RingEnd = 0;
-
-  // This data structure stores a stack trace for each allocation and
-  // deallocation when stack trace recording is enabled, that may be looked up
-  // using a hash of the stack trace. The lower bits of the hash are an index
-  // into the Tab array, which stores an index into the Ring array where the
-  // stack traces are stored. As the name implies, Ring is a ring buffer, so a
-  // stack trace may wrap around to the start of the array.
-  //
-  // Each stack trace in Ring is prefixed by a stack trace marker consisting of
-  // a fixed 1 bit in bit 0 (this allows disambiguation between stack frames
-  // and stack trace markers in the case where instruction pointers are 4-byte
-  // aligned, as they are on arm64), the stack trace hash in bits 1-32, and the
-  // size of the stack trace in bits 33-63.
-  //
-  // The insert() function is potentially racy in its accesses to the Tab and
-  // Ring arrays, but find() is resilient to races in the sense that, barring
-  // hash collisions, it will either return the correct stack trace or no stack
-  // trace at all, even if two instances of insert() raced with one another.
-  // This is achieved by re-checking the hash of the stack trace before
-  // returning the trace.
-
-#if SCUDO_SMALL_STACK_DEPOT
-  static const uptr TabBits = 4;
-#else
-  static const uptr TabBits = 16;
-#endif
-  static const uptr TabSize = 1 << TabBits;
-  static const uptr TabMask = TabSize - 1;
-  atomic_u32 Tab[TabSize] = {};
-
-#if SCUDO_SMALL_STACK_DEPOT
-  static const uptr RingBits = 4;
-#else
-  static const uptr RingBits = 19;
-#endif
-  static const uptr RingSize = 1 << RingBits;
-  static const uptr RingMask = RingSize - 1;
-  atomic_u64 Ring[RingSize] = {};
-
-public:
-  // Insert hash of the stack trace [Begin, End) into the stack depot, and
-  // return the hash.
-  u32 insert(uptr *Begin, uptr *End) {
-    MurMur2HashBuilder B;
-    for (uptr *I = Begin; I != End; ++I)
-      B.add(u32(*I) >> 2);
-    u32 Hash = B.get();
-
-    u32 Pos = Hash & TabMask;
-    u32 RingPos = atomic_load_relaxed(&Tab[Pos]);
-    u64 Entry = atomic_load_relaxed(&Ring[RingPos]);
-    u64 Id = (u64(End - Begin) << 33) | (u64(Hash) << 1) | 1;
-    if (Entry == Id)
-      return Hash;
-
-    ScopedLock Lock(RingEndMu);
-    RingPos = RingEnd;
-    atomic_store_relaxed(&Tab[Pos], RingPos);
-    atomic_store_relaxed(&Ring[RingPos], Id);
-    for (uptr *I = Begin; I != End; ++I) {
-      RingPos = (RingPos + 1) & RingMask;
-      atomic_store_relaxed(&Ring[RingPos], *I);
-    }
-    RingEnd = (RingPos + 1) & RingMask;
-    return Hash;
-  }
-
-  // Look up a stack trace by hash. Returns true if successful. The trace may be
-  // accessed via operator[] passing indexes between *RingPosPtr and
-  // *RingPosPtr + *SizePtr.
-  bool find(u32 Hash, uptr *RingPosPtr, uptr *SizePtr) const {
-    u32 Pos = Hash & TabMask;
-    u32 RingPos = atomic_load_relaxed(&Tab[Pos]);
-    if (RingPos >= RingSize)
-      return false;
-    u64 Entry = atomic_load_relaxed(&Ring[RingPos]);
-    u64 HashWithTagBit = (u64(Hash) << 1) | 1;
-    if ((Entry & 0x1ffffffff) != HashWithTagBit)
-      return false;
-    u32 Size = u32(Entry >> 33);
-    if (Size >= RingSize)
-      return false;
-    *RingPosPtr = (RingPos + 1) & RingMask;
-    *SizePtr = Size;
-    MurMur2HashBuilder B;
-    for (uptr I = 0; I != Size; ++I) {
-      RingPos = (RingPos + 1) & RingMask;
-      B.add(u32(atomic_load_relaxed(&Ring[RingPos])) >> 2);
-    }
-    return B.get() == Hash;
-  }
-
-  u64 operator[](uptr RingPos) const {
-    return atomic_load_relaxed(&Ring[RingPos & RingMask]);
-  }
-};
-
-} // namespace scudo
-
-#endif // SCUDO_STACK_DEPOT_H_
diff --git a/Telegram/ThirdParty/scudo/stats.h b/Telegram/ThirdParty/scudo/stats.h
deleted file mode 100644
index 658b75863..000000000
--- a/Telegram/ThirdParty/scudo/stats.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//===-- stats.h -------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_STATS_H_
-#define SCUDO_STATS_H_
-
-#include "atomic_helpers.h"
-#include "list.h"
-#include "mutex.h"
-#include "thread_annotations.h"
-
-#include <string.h>
-
-namespace scudo {
-
-// Memory allocator statistics
-enum StatType { StatAllocated, StatFree, StatMapped, StatCount };
-
-typedef uptr StatCounters[StatCount];
-
-// Per-thread stats, live in per-thread cache. We use atomics so that the
-// numbers themselves are consistent. But we don't use atomic_{add|sub} or a
-// lock, because those are expensive operations , and we only care for the stats
-// to be "somewhat" correct: eg. if we call GlobalStats::get while a thread is
-// LocalStats::add'ing, this is OK, we will still get a meaningful number.
-class LocalStats {
-public:
-  void init() {
-    for (uptr I = 0; I < StatCount; I++)
-      DCHECK_EQ(get(static_cast<StatType>(I)), 0U);
-  }
-
-  void add(StatType I, uptr V) {
-    V += atomic_load_relaxed(&StatsArray[I]);
-    atomic_store_relaxed(&StatsArray[I], V);
-  }
-
-  void sub(StatType I, uptr V) {
-    V = atomic_load_relaxed(&StatsArray[I]) - V;
-    atomic_store_relaxed(&StatsArray[I], V);
-  }
-
-  void set(StatType I, uptr V) { atomic_store_relaxed(&StatsArray[I], V); }
-
-  uptr get(StatType I) const { return atomic_load_relaxed(&StatsArray[I]); }
-
-  LocalStats *Next = nullptr;
-  LocalStats *Prev = nullptr;
-
-private:
-  atomic_uptr StatsArray[StatCount] = {};
-};
-
-// Global stats, used for aggregation and querying.
-class GlobalStats : public LocalStats {
-public:
-  void init() { LocalStats::init(); }
-
-  void link(LocalStats *S) EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-    StatsList.push_back(S);
-  }
-
-  void unlink(LocalStats *S) EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-    StatsList.remove(S);
-    for (uptr I = 0; I < StatCount; I++)
-      add(static_cast<StatType>(I), S->get(static_cast<StatType>(I)));
-  }
-
-  void get(uptr *S) const EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-    for (uptr I = 0; I < StatCount; I++)
-      S[I] = LocalStats::get(static_cast<StatType>(I));
-    for (const auto &Stats : StatsList) {
-      for (uptr I = 0; I < StatCount; I++)
-        S[I] += Stats.get(static_cast<StatType>(I));
-    }
-    // All stats must be non-negative.
-    for (uptr I = 0; I < StatCount; I++)
-      S[I] = static_cast<sptr>(S[I]) >= 0 ? S[I] : 0;
-  }
-
-  void lock() ACQUIRE(Mutex) { Mutex.lock(); }
-  void unlock() RELEASE(Mutex) { Mutex.unlock(); }
-
-  void disable() ACQUIRE(Mutex) { lock(); }
-  void enable() RELEASE(Mutex) { unlock(); }
-
-private:
-  mutable HybridMutex Mutex;
-  DoublyLinkedList<LocalStats> StatsList GUARDED_BY(Mutex);
-};
-
-} // namespace scudo
-
-#endif // SCUDO_STATS_H_
diff --git a/Telegram/ThirdParty/scudo/string_utils.cpp b/Telegram/ThirdParty/scudo/string_utils.cpp
deleted file mode 100644
index d4e4e3bec..000000000
--- a/Telegram/ThirdParty/scudo/string_utils.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-//===-- string_utils.cpp ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "string_utils.h"
-#include "common.h"
-
-#include <stdarg.h>
-#include <string.h>
-
-namespace scudo {
-
-static int appendChar(char **Buffer, const char *BufferEnd, char C) {
-  if (*Buffer < BufferEnd) {
-    **Buffer = C;
-    (*Buffer)++;
-  }
-  return 1;
-}
-
-// Appends number in a given Base to buffer. If its length is less than
-// |MinNumberLength|, it is padded with leading zeroes or spaces, depending
-// on the value of |PadWithZero|.
-static int appendNumber(char **Buffer, const char *BufferEnd, u64 AbsoluteValue,
-                        u8 Base, u8 MinNumberLength, bool PadWithZero,
-                        bool Negative, bool Upper) {
-  constexpr uptr MaxLen = 30;
-  RAW_CHECK(Base == 10 || Base == 16);
-  RAW_CHECK(Base == 10 || !Negative);
-  RAW_CHECK(AbsoluteValue || !Negative);
-  RAW_CHECK(MinNumberLength < MaxLen);
-  int Res = 0;
-  if (Negative && MinNumberLength)
-    --MinNumberLength;
-  if (Negative && PadWithZero)
-    Res += appendChar(Buffer, BufferEnd, '-');
-  uptr NumBuffer[MaxLen];
-  int Pos = 0;
-  do {
-    RAW_CHECK_MSG(static_cast<uptr>(Pos) < MaxLen,
-                  "appendNumber buffer overflow");
-    NumBuffer[Pos++] = static_cast<uptr>(AbsoluteValue % Base);
-    AbsoluteValue /= Base;
-  } while (AbsoluteValue > 0);
-  if (Pos < MinNumberLength) {
-    memset(&NumBuffer[Pos], 0,
-           sizeof(NumBuffer[0]) * static_cast<uptr>(MinNumberLength - Pos));
-    Pos = MinNumberLength;
-  }
-  RAW_CHECK(Pos > 0);
-  Pos--;
-  for (; Pos >= 0 && NumBuffer[Pos] == 0; Pos--) {
-    char c = (PadWithZero || Pos == 0) ? '0' : ' ';
-    Res += appendChar(Buffer, BufferEnd, c);
-  }
-  if (Negative && !PadWithZero)
-    Res += appendChar(Buffer, BufferEnd, '-');
-  for (; Pos >= 0; Pos--) {
-    char Digit = static_cast<char>(NumBuffer[Pos]);
-    Digit = static_cast<char>((Digit < 10) ? '0' + Digit
-                                           : (Upper ? 'A' : 'a') + Digit - 10);
-    Res += appendChar(Buffer, BufferEnd, Digit);
-  }
-  return Res;
-}
-
-static int appendUnsigned(char **Buffer, const char *BufferEnd, u64 Num,
-                          u8 Base, u8 MinNumberLength, bool PadWithZero,
-                          bool Upper) {
-  return appendNumber(Buffer, BufferEnd, Num, Base, MinNumberLength,
-                      PadWithZero, /*Negative=*/false, Upper);
-}
-
-static int appendSignedDecimal(char **Buffer, const char *BufferEnd, s64 Num,
-                               u8 MinNumberLength, bool PadWithZero) {
-  const bool Negative = (Num < 0);
-  const u64 UnsignedNum = (Num == INT64_MIN)
-                              ? static_cast<u64>(INT64_MAX) + 1
-                              : static_cast<u64>(Negative ? -Num : Num);
-  return appendNumber(Buffer, BufferEnd, UnsignedNum, 10, MinNumberLength,
-                      PadWithZero, Negative, /*Upper=*/false);
-}
-
-// Use the fact that explicitly requesting 0 Width (%0s) results in UB and
-// interpret Width == 0 as "no Width requested":
-// Width == 0 - no Width requested
-// Width  < 0 - left-justify S within and pad it to -Width chars, if necessary
-// Width  > 0 - right-justify S, not implemented yet
-static int appendString(char **Buffer, const char *BufferEnd, int Width,
-                        int MaxChars, const char *S) {
-  if (!S)
-    S = "<null>";
-  int Res = 0;
-  for (; *S; S++) {
-    if (MaxChars >= 0 && Res >= MaxChars)
-      break;
-    Res += appendChar(Buffer, BufferEnd, *S);
-  }
-  // Only the left justified strings are supported.
-  while (Width < -Res)
-    Res += appendChar(Buffer, BufferEnd, ' ');
-  return Res;
-}
-
-static int appendPointer(char **Buffer, const char *BufferEnd, u64 ptr_value) {
-  int Res = 0;
-  Res += appendString(Buffer, BufferEnd, 0, -1, "0x");
-  Res += appendUnsigned(Buffer, BufferEnd, ptr_value, 16,
-                        SCUDO_POINTER_FORMAT_LENGTH, /*PadWithZero=*/true,
-                        /*Upper=*/false);
-  return Res;
-}
-
-static int formatString(char *Buffer, uptr BufferLength, const char *Format,
-                        va_list Args) {
-  static const char *PrintfFormatsHelp =
-      "Supported formatString formats: %([0-9]*)?(z|ll)?{d,u,x,X}; %p; "
-      "%[-]([0-9]*)?(\\.\\*)?s; %c\n";
-  RAW_CHECK(Format);
-  RAW_CHECK(BufferLength > 0);
-  const char *BufferEnd = &Buffer[BufferLength - 1];
-  const char *Cur = Format;
-  int Res = 0;
-  for (; *Cur; Cur++) {
-    if (*Cur != '%') {
-      Res += appendChar(&Buffer, BufferEnd, *Cur);
-      continue;
-    }
-    Cur++;
-    const bool LeftJustified = *Cur == '-';
-    if (LeftJustified)
-      Cur++;
-    bool HaveWidth = (*Cur >= '0' && *Cur <= '9');
-    const bool PadWithZero = (*Cur == '0');
-    u8 Width = 0;
-    if (HaveWidth) {
-      while (*Cur >= '0' && *Cur <= '9')
-        Width = static_cast<u8>(Width * 10 + *Cur++ - '0');
-    }
-    const bool HavePrecision = (Cur[0] == '.' && Cur[1] == '*');
-    int Precision = -1;
-    if (HavePrecision) {
-      Cur += 2;
-      Precision = va_arg(Args, int);
-    }
-    const bool HaveZ = (*Cur == 'z');
-    Cur += HaveZ;
-    const bool HaveLL = !HaveZ && (Cur[0] == 'l' && Cur[1] == 'l');
-    Cur += HaveLL * 2;
-    s64 DVal;
-    u64 UVal;
-    const bool HaveLength = HaveZ || HaveLL;
-    const bool HaveFlags = HaveWidth || HaveLength;
-    // At the moment only %s supports precision and left-justification.
-    CHECK(!((Precision >= 0 || LeftJustified) && *Cur != 's'));
-    switch (*Cur) {
-    case 'd': {
-      DVal = HaveLL  ? va_arg(Args, s64)
-             : HaveZ ? va_arg(Args, sptr)
-                     : va_arg(Args, int);
-      Res += appendSignedDecimal(&Buffer, BufferEnd, DVal, Width, PadWithZero);
-      break;
-    }
-    case 'u':
-    case 'x':
-    case 'X': {
-      UVal = HaveLL  ? va_arg(Args, u64)
-             : HaveZ ? va_arg(Args, uptr)
-                     : va_arg(Args, unsigned);
-      const bool Upper = (*Cur == 'X');
-      Res += appendUnsigned(&Buffer, BufferEnd, UVal, (*Cur == 'u') ? 10 : 16,
-                            Width, PadWithZero, Upper);
-      break;
-    }
-    case 'p': {
-      RAW_CHECK_MSG(!HaveFlags, PrintfFormatsHelp);
-      Res += appendPointer(&Buffer, BufferEnd, va_arg(Args, uptr));
-      break;
-    }
-    case 's': {
-      RAW_CHECK_MSG(!HaveLength, PrintfFormatsHelp);
-      // Only left-justified Width is supported.
-      CHECK(!HaveWidth || LeftJustified);
-      Res += appendString(&Buffer, BufferEnd, LeftJustified ? -Width : Width,
-                          Precision, va_arg(Args, char *));
-      break;
-    }
-    case 'c': {
-      RAW_CHECK_MSG(!HaveFlags, PrintfFormatsHelp);
-      Res +=
-          appendChar(&Buffer, BufferEnd, static_cast<char>(va_arg(Args, int)));
-      break;
-    }
-    // In Scudo, `s64`/`u64` are supposed to use `lld` and `llu` respectively.
-    // However, `-Wformat` doesn't know we have a different parser for those
-    // placeholders and it keeps complaining the type mismatch on 64-bit
-    // platform which uses `ld`/`lu` for `s64`/`u64`. Therefore, in order to
-    // silence the warning, we turn to use `PRId64`/`PRIu64` for printing
-    // `s64`/`u64` and handle the `ld`/`lu` here.
-    case 'l': {
-      ++Cur;
-      RAW_CHECK(*Cur == 'd' || *Cur == 'u');
-
-      if (*Cur == 'd') {
-        DVal = va_arg(Args, s64);
-        Res +=
-            appendSignedDecimal(&Buffer, BufferEnd, DVal, Width, PadWithZero);
-      } else {
-        UVal = va_arg(Args, u64);
-        Res += appendUnsigned(&Buffer, BufferEnd, UVal, 10, Width, PadWithZero,
-                              false);
-      }
-
-      break;
-    }
-    case '%': {
-      RAW_CHECK_MSG(!HaveFlags, PrintfFormatsHelp);
-      Res += appendChar(&Buffer, BufferEnd, '%');
-      break;
-    }
-    default: {
-      RAW_CHECK_MSG(false, PrintfFormatsHelp);
-    }
-    }
-  }
-  RAW_CHECK(Buffer <= BufferEnd);
-  appendChar(&Buffer, BufferEnd + 1, '\0');
-  return Res;
-}
-
-int formatString(char *Buffer, uptr BufferLength, const char *Format, ...) {
-  va_list Args;
-  va_start(Args, Format);
-  int Res = formatString(Buffer, BufferLength, Format, Args);
-  va_end(Args);
-  return Res;
-}
-
-void ScopedString::vappend(const char *Format, va_list Args) {
-  va_list ArgsCopy;
-  va_copy(ArgsCopy, Args);
-  // formatString doesn't currently support a null buffer or zero buffer length,
-  // so in order to get the resulting formatted string length, we use a one-char
-  // buffer.
-  char C[1];
-  const uptr AdditionalLength =
-      static_cast<uptr>(formatString(C, sizeof(C), Format, Args)) + 1;
-  const uptr Length = length();
-  String.resize(Length + AdditionalLength);
-  const uptr FormattedLength = static_cast<uptr>(formatString(
-      String.data() + Length, String.size() - Length, Format, ArgsCopy));
-  RAW_CHECK(data()[length()] == '\0');
-  RAW_CHECK(FormattedLength + 1 == AdditionalLength);
-  va_end(ArgsCopy);
-}
-
-void ScopedString::append(const char *Format, ...) {
-  va_list Args;
-  va_start(Args, Format);
-  vappend(Format, Args);
-  va_end(Args);
-}
-
-void Printf(const char *Format, ...) {
-  va_list Args;
-  va_start(Args, Format);
-  ScopedString Msg;
-  Msg.vappend(Format, Args);
-  outputRaw(Msg.data());
-  va_end(Args);
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/string_utils.h b/Telegram/ThirdParty/scudo/string_utils.h
deleted file mode 100644
index a4cab5268..000000000
--- a/Telegram/ThirdParty/scudo/string_utils.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//===-- string_utils.h ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_STRING_UTILS_H_
-#define SCUDO_STRING_UTILS_H_
-
-#include "internal_defs.h"
-#include "vector.h"
-
-#include <stdarg.h>
-
-namespace scudo {
-
-class ScopedString {
-public:
-  explicit ScopedString() { String.push_back('\0'); }
-  uptr length() { return String.size() - 1; }
-  const char *data() { return String.data(); }
-  void clear() {
-    String.clear();
-    String.push_back('\0');
-  }
-  void vappend(const char *Format, va_list Args);
-  void append(const char *Format, ...) FORMAT(2, 3);
-  void output() const { outputRaw(String.data()); }
-  void reserve(size_t Size) { String.reserve(Size + 1); }
-
-private:
-  Vector<char> String;
-};
-
-int formatString(char *Buffer, uptr BufferLength, const char *Format, ...)
-    FORMAT(3, 4);
-void Printf(const char *Format, ...) FORMAT(1, 2);
-
-} // namespace scudo
-
-#endif // SCUDO_STRING_UTILS_H_
diff --git a/Telegram/ThirdParty/scudo/tests/CMakeLists.txt b/Telegram/ThirdParty/scudo/tests/CMakeLists.txt
deleted file mode 100644
index c6b6a1cb5..000000000
--- a/Telegram/ThirdParty/scudo/tests/CMakeLists.txt
+++ /dev/null
@@ -1,144 +0,0 @@
-include_directories(..)
-
-add_custom_target(ScudoUnitTests)
-set_target_properties(ScudoUnitTests PROPERTIES
-  FOLDER "Compiler-RT Tests")
-
-set(SCUDO_UNITTEST_CFLAGS
-  ${COMPILER_RT_UNITTEST_CFLAGS}
-  ${COMPILER_RT_GTEST_CFLAGS}
-  ${SANITIZER_TEST_CXX_CFLAGS}
-  -I${COMPILER_RT_SOURCE_DIR}/include
-  -I${COMPILER_RT_SOURCE_DIR}/lib
-  -I${COMPILER_RT_SOURCE_DIR}/lib/scudo/standalone
-  -I${COMPILER_RT_SOURCE_DIR}/lib/scudo/standalone/include
-  -DGTEST_HAS_RTTI=0
-  -g
-  # Extra flags for the C++ tests
-  -Wconversion
-  # TODO(kostyak): find a way to make -fsized-deallocation work
-  -Wno-mismatched-new-delete)
-
-if(COMPILER_RT_DEBUG)
-  list(APPEND SCUDO_UNITTEST_CFLAGS -DSCUDO_DEBUG=1 -DSCUDO_ENABLE_HOOKS=1)
-  if (NOT FUCHSIA)
-    list(APPEND SCUDO_UNITTEST_CFLAGS -DSCUDO_ENABLE_HOOKS_TESTS=1)
-  endif()
-endif()
-
-if(ANDROID)
-  list(APPEND SCUDO_UNITTEST_CFLAGS -fno-emulated-tls)
-endif()
-
-if (COMPILER_RT_HAS_GWP_ASAN)
-  list(APPEND SCUDO_UNITTEST_CFLAGS -DGWP_ASAN_HOOKS -fno-omit-frame-pointer
-       -mno-omit-leaf-frame-pointer)
-endif()
-
-append_list_if(COMPILER_RT_HAS_WTHREAD_SAFETY_FLAG -Werror=thread-safety
-  SCUDO_UNITTEST_CFLAGS)
-
-set(SCUDO_TEST_ARCH ${SCUDO_STANDALONE_SUPPORTED_ARCH})
-
-# gtests requires c++
-set(SCUDO_UNITTEST_LINK_FLAGS
-  ${COMPILER_RT_UNITTEST_LINK_FLAGS}
-  ${COMPILER_RT_UNWINDER_LINK_LIBS}
-  ${SANITIZER_TEST_CXX_LIBRARIES})
-list(APPEND SCUDO_UNITTEST_LINK_FLAGS -pthread -no-pie)
-# Linking against libatomic is required with some compilers
-check_library_exists(atomic __atomic_load_8 "" COMPILER_RT_HAS_LIBATOMIC)
-if (COMPILER_RT_HAS_LIBATOMIC)
-  list(APPEND SCUDO_UNITTEST_LINK_FLAGS -latomic)
-endif()
-
-set(SCUDO_TEST_HEADERS
-  scudo_unit_test.h
-  )
-foreach (header ${SCUDO_HEADERS})
-  list(APPEND SCUDO_TEST_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../${header})
-endforeach()
-
-macro(add_scudo_unittest testname)
-  cmake_parse_arguments(TEST "" "" "SOURCES;ADDITIONAL_RTOBJECTS" ${ARGN})
-  if (COMPILER_RT_HAS_GWP_ASAN)
-    list(APPEND TEST_ADDITIONAL_RTOBJECTS
-         RTGwpAsan RTGwpAsanBacktraceLibc RTGwpAsanSegvHandler)
-  endif()
-
-  if(COMPILER_RT_HAS_SCUDO_STANDALONE)
-    foreach(arch ${SCUDO_TEST_ARCH})
-      # Additional runtime objects get added along RTScudoStandalone
-      set(SCUDO_TEST_RTOBJECTS $<TARGET_OBJECTS:RTScudoStandalone.${arch}>)
-      foreach(rtobject ${TEST_ADDITIONAL_RTOBJECTS})
-        list(APPEND SCUDO_TEST_RTOBJECTS $<TARGET_OBJECTS:${rtobject}.${arch}>)
-      endforeach()
-      # Add the static runtime library made of all the runtime objects
-      set(RUNTIME RT${testname}.${arch})
-      add_library(${RUNTIME} STATIC ${SCUDO_TEST_RTOBJECTS})
-      set(ScudoUnitTestsObjects)
-      generate_compiler_rt_tests(ScudoUnitTestsObjects ScudoUnitTests
-        "${testname}-${arch}-Test" ${arch}
-        SOURCES ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE}
-        COMPILE_DEPS ${SCUDO_TEST_HEADERS}
-        DEPS llvm_gtest scudo_standalone
-        RUNTIME ${RUNTIME}
-        CFLAGS ${SCUDO_UNITTEST_CFLAGS}
-        LINK_FLAGS ${SCUDO_UNITTEST_LINK_FLAGS})
-    endforeach()
-  endif()
-endmacro()
-
-set(SCUDO_UNIT_TEST_SOURCES
-  atomic_test.cpp
-  bytemap_test.cpp
-  checksum_test.cpp
-  chunk_test.cpp
-  combined_test.cpp
-  common_test.cpp
-  condition_variable_test.cpp
-  flags_test.cpp
-  list_test.cpp
-  map_test.cpp
-  memtag_test.cpp
-  mutex_test.cpp
-  primary_test.cpp
-  quarantine_test.cpp
-  release_test.cpp
-  report_test.cpp
-  secondary_test.cpp
-  size_class_map_test.cpp
-  stats_test.cpp
-  strings_test.cpp
-  timing_test.cpp
-  tsd_test.cpp
-  vector_test.cpp
-  scudo_unit_test_main.cpp
-  )
-
-# Temporary hack until LLVM libc supports inttypes.h print format macros
-# See: https://github.com/llvm/llvm-project/issues/63317#issuecomment-1591906241
-if(LLVM_LIBC_INCLUDE_SCUDO)
-  list(REMOVE_ITEM SCUDO_UNIT_TEST_SOURCES timing_test.cpp)
-endif()
-
-add_scudo_unittest(ScudoUnitTest
-  SOURCES ${SCUDO_UNIT_TEST_SOURCES})
-
-set(SCUDO_C_UNIT_TEST_SOURCES
-  wrappers_c_test.cpp
-  scudo_unit_test_main.cpp
-  )
-
-add_scudo_unittest(ScudoCUnitTest
-  SOURCES ${SCUDO_C_UNIT_TEST_SOURCES}
-  ADDITIONAL_RTOBJECTS RTScudoStandaloneCWrappers)
-
-set(SCUDO_CXX_UNIT_TEST_SOURCES
-  wrappers_cpp_test.cpp
-  scudo_unit_test_main.cpp
-  )
-
-add_scudo_unittest(ScudoCxxUnitTest
-  SOURCES ${SCUDO_CXX_UNIT_TEST_SOURCES}
-  ADDITIONAL_RTOBJECTS RTScudoStandaloneCWrappers RTScudoStandaloneCxxWrappers)
diff --git a/Telegram/ThirdParty/scudo/tests/atomic_test.cpp b/Telegram/ThirdParty/scudo/tests/atomic_test.cpp
deleted file mode 100644
index e90a642fd..000000000
--- a/Telegram/ThirdParty/scudo/tests/atomic_test.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//===-- atomic_test.cpp -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "atomic_helpers.h"
-
-namespace scudo {
-
-template <typename T> struct ValAndMagic {
-  typename T::Type Magic0;
-  T A;
-  typename T::Type Magic1;
-
-  static ValAndMagic<T> *Sink;
-};
-
-template <typename T> ValAndMagic<T> *ValAndMagic<T>::Sink;
-
-template <typename T, memory_order LoadMO, memory_order StoreMO>
-void checkStoreLoad() {
-  typedef typename T::Type Type;
-  ValAndMagic<T> Val;
-  // Prevent the compiler from scalarizing the struct.
-  ValAndMagic<T>::Sink = &Val;
-  // Ensure that surrounding memory is not overwritten.
-  Val.Magic0 = Val.Magic1 = (Type)-3;
-  for (u64 I = 0; I < 100; I++) {
-    // Generate A value that occupies all bytes of the variable.
-    u64 V = I;
-    V |= V << 8;
-    V |= V << 16;
-    V |= V << 32;
-    Val.A.ValDoNotUse = (Type)V;
-    EXPECT_EQ(atomic_load(&Val.A, LoadMO), (Type)V);
-    Val.A.ValDoNotUse = (Type)-1;
-    atomic_store(&Val.A, (Type)V, StoreMO);
-    EXPECT_EQ(Val.A.ValDoNotUse, (Type)V);
-  }
-  EXPECT_EQ(Val.Magic0, (Type)-3);
-  EXPECT_EQ(Val.Magic1, (Type)-3);
-}
-
-TEST(ScudoAtomicTest, AtomicStoreLoad) {
-  checkStoreLoad<atomic_u8, memory_order_relaxed, memory_order_relaxed>();
-  checkStoreLoad<atomic_u8, memory_order_consume, memory_order_relaxed>();
-  checkStoreLoad<atomic_u8, memory_order_acquire, memory_order_relaxed>();
-  checkStoreLoad<atomic_u8, memory_order_relaxed, memory_order_release>();
-  checkStoreLoad<atomic_u8, memory_order_seq_cst, memory_order_seq_cst>();
-
-  checkStoreLoad<atomic_u16, memory_order_relaxed, memory_order_relaxed>();
-  checkStoreLoad<atomic_u16, memory_order_consume, memory_order_relaxed>();
-  checkStoreLoad<atomic_u16, memory_order_acquire, memory_order_relaxed>();
-  checkStoreLoad<atomic_u16, memory_order_relaxed, memory_order_release>();
-  checkStoreLoad<atomic_u16, memory_order_seq_cst, memory_order_seq_cst>();
-
-  checkStoreLoad<atomic_u32, memory_order_relaxed, memory_order_relaxed>();
-  checkStoreLoad<atomic_u32, memory_order_consume, memory_order_relaxed>();
-  checkStoreLoad<atomic_u32, memory_order_acquire, memory_order_relaxed>();
-  checkStoreLoad<atomic_u32, memory_order_relaxed, memory_order_release>();
-  checkStoreLoad<atomic_u32, memory_order_seq_cst, memory_order_seq_cst>();
-
-  checkStoreLoad<atomic_u64, memory_order_relaxed, memory_order_relaxed>();
-  checkStoreLoad<atomic_u64, memory_order_consume, memory_order_relaxed>();
-  checkStoreLoad<atomic_u64, memory_order_acquire, memory_order_relaxed>();
-  checkStoreLoad<atomic_u64, memory_order_relaxed, memory_order_release>();
-  checkStoreLoad<atomic_u64, memory_order_seq_cst, memory_order_seq_cst>();
-
-  checkStoreLoad<atomic_uptr, memory_order_relaxed, memory_order_relaxed>();
-  checkStoreLoad<atomic_uptr, memory_order_consume, memory_order_relaxed>();
-  checkStoreLoad<atomic_uptr, memory_order_acquire, memory_order_relaxed>();
-  checkStoreLoad<atomic_uptr, memory_order_relaxed, memory_order_release>();
-  checkStoreLoad<atomic_uptr, memory_order_seq_cst, memory_order_seq_cst>();
-}
-
-template <typename T> void checkAtomicCompareExchange() {
-  typedef typename T::Type Type;
-  Type OldVal = 42;
-  Type NewVal = 24;
-  Type V = OldVal;
-  EXPECT_TRUE(atomic_compare_exchange_strong(reinterpret_cast<T *>(&V), &OldVal,
-                                             NewVal, memory_order_relaxed));
-  EXPECT_FALSE(atomic_compare_exchange_strong(
-      reinterpret_cast<T *>(&V), &OldVal, NewVal, memory_order_relaxed));
-  EXPECT_EQ(NewVal, OldVal);
-}
-
-TEST(ScudoAtomicTest, AtomicCompareExchangeTest) {
-  checkAtomicCompareExchange<atomic_u8>();
-  checkAtomicCompareExchange<atomic_u16>();
-  checkAtomicCompareExchange<atomic_u32>();
-  checkAtomicCompareExchange<atomic_u64>();
-  checkAtomicCompareExchange<atomic_uptr>();
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/tests/bytemap_test.cpp b/Telegram/ThirdParty/scudo/tests/bytemap_test.cpp
deleted file mode 100644
index 4034b108f..000000000
--- a/Telegram/ThirdParty/scudo/tests/bytemap_test.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//===-- bytemap_test.cpp ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "bytemap.h"
-
-#include <pthread.h>
-#include <string.h>
-
-template <typename T> void testMap(T &Map, scudo::uptr Size) {
-  Map.init();
-  for (scudo::uptr I = 0; I < Size; I += 7)
-    Map.set(I, (I % 100) + 1);
-  for (scudo::uptr J = 0; J < Size; J++) {
-    if (J % 7)
-      EXPECT_EQ(Map[J], 0);
-    else
-      EXPECT_EQ(Map[J], (J % 100) + 1);
-  }
-}
-
-TEST(ScudoByteMapTest, FlatByteMap) {
-  const scudo::uptr Size = 1U << 10;
-  scudo::FlatByteMap<Size> Map;
-  testMap(Map, Size);
-  Map.unmapTestOnly();
-}
diff --git a/Telegram/ThirdParty/scudo/tests/checksum_test.cpp b/Telegram/ThirdParty/scudo/tests/checksum_test.cpp
deleted file mode 100644
index c5d5b7379..000000000
--- a/Telegram/ThirdParty/scudo/tests/checksum_test.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===-- checksum_test.cpp ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "checksum.h"
-
-#include <string.h>
-
-static scudo::u16 computeSoftwareChecksum(scudo::u32 Seed, scudo::uptr *Array,
-                                          scudo::uptr ArraySize) {
-  scudo::u16 Checksum = static_cast<scudo::u16>(Seed & 0xffff);
-  for (scudo::uptr I = 0; I < ArraySize; I++)
-    Checksum = scudo::computeBSDChecksum(Checksum, Array[I]);
-  return Checksum;
-}
-
-static scudo::u16 computeHardwareChecksum(scudo::u32 Seed, scudo::uptr *Array,
-                                          scudo::uptr ArraySize) {
-  scudo::u32 Crc = Seed;
-  for (scudo::uptr I = 0; I < ArraySize; I++)
-    Crc = scudo::computeHardwareCRC32(Crc, Array[I]);
-  return static_cast<scudo::u16>((Crc & 0xffff) ^ (Crc >> 16));
-}
-
-typedef scudo::u16 (*ComputeChecksum)(scudo::u32, scudo::uptr *, scudo::uptr);
-
-// This verifies that flipping bits in the data being checksummed produces a
-// different checksum. We do not use random data to avoid flakyness.
-template <ComputeChecksum F> static void verifyChecksumFunctionBitFlip() {
-  scudo::uptr Array[sizeof(scudo::u64) / sizeof(scudo::uptr)];
-  const scudo::uptr ArraySize = ARRAY_SIZE(Array);
-  memset(Array, 0xaa, sizeof(Array));
-  const scudo::u32 Seed = 0x41424343U;
-  const scudo::u16 Reference = F(Seed, Array, ArraySize);
-  scudo::u8 IdenticalChecksums = 0;
-  for (scudo::uptr I = 0; I < ArraySize; I++) {
-    for (scudo::uptr J = 0; J < SCUDO_WORDSIZE; J++) {
-      Array[I] ^= scudo::uptr{1} << J;
-      if (F(Seed, Array, ArraySize) == Reference)
-        IdenticalChecksums++;
-      Array[I] ^= scudo::uptr{1} << J;
-    }
-  }
-  // Allow for a couple of identical checksums over the whole set of flips.
-  EXPECT_LE(IdenticalChecksums, 2);
-}
-
-TEST(ScudoChecksumTest, ChecksumFunctions) {
-  verifyChecksumFunctionBitFlip<computeSoftwareChecksum>();
-  if (&scudo::computeHardwareCRC32 && scudo::hasHardwareCRC32())
-    verifyChecksumFunctionBitFlip<computeHardwareChecksum>();
-}
diff --git a/Telegram/ThirdParty/scudo/tests/chunk_test.cpp b/Telegram/ThirdParty/scudo/tests/chunk_test.cpp
deleted file mode 100644
index 1b2c1eb5a..000000000
--- a/Telegram/ThirdParty/scudo/tests/chunk_test.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//===-- chunk_test.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "chunk.h"
-
-#include <stdlib.h>
-
-static constexpr scudo::uptr HeaderSize = scudo::Chunk::getHeaderSize();
-static constexpr scudo::u32 Cookie = 0x41424344U;
-static constexpr scudo::u32 InvalidCookie = 0x11223344U;
-
-static void initChecksum(void) {
-  if (&scudo::computeHardwareCRC32 && scudo::hasHardwareCRC32())
-    scudo::HashAlgorithm = scudo::Checksum::HardwareCRC32;
-}
-
-TEST(ScudoChunkDeathTest, ChunkBasic) {
-  initChecksum();
-  const scudo::uptr Size = 0x100U;
-  scudo::Chunk::UnpackedHeader Header = {};
-  void *Block = malloc(HeaderSize + Size);
-  void *P = reinterpret_cast<void *>(reinterpret_cast<scudo::uptr>(Block) +
-                                     HeaderSize);
-  scudo::Chunk::storeHeader(Cookie, P, &Header);
-  memset(P, 'A', Size);
-  scudo::Chunk::loadHeader(Cookie, P, &Header);
-  EXPECT_TRUE(scudo::Chunk::isValid(Cookie, P, &Header));
-  EXPECT_FALSE(scudo::Chunk::isValid(InvalidCookie, P, &Header));
-  EXPECT_DEATH(scudo::Chunk::loadHeader(InvalidCookie, P, &Header), "");
-  free(Block);
-}
-
-TEST(ScudoChunkDeathTest, CorruptHeader) {
-  initChecksum();
-  const scudo::uptr Size = 0x100U;
-  scudo::Chunk::UnpackedHeader Header = {};
-  void *Block = malloc(HeaderSize + Size);
-  void *P = reinterpret_cast<void *>(reinterpret_cast<scudo::uptr>(Block) +
-                                     HeaderSize);
-  scudo::Chunk::storeHeader(Cookie, P, &Header);
-  memset(P, 'A', Size);
-  scudo::Chunk::loadHeader(Cookie, P, &Header);
-  // Simulate a couple of corrupted bits per byte of header data.
-  for (scudo::uptr I = 0; I < sizeof(scudo::Chunk::PackedHeader); I++) {
-    *(reinterpret_cast<scudo::u8 *>(Block) + I) ^= 0x42U;
-    EXPECT_DEATH(scudo::Chunk::loadHeader(Cookie, P, &Header), "");
-    *(reinterpret_cast<scudo::u8 *>(Block) + I) ^= 0x42U;
-  }
-  free(Block);
-}
diff --git a/Telegram/ThirdParty/scudo/tests/combined_test.cpp b/Telegram/ThirdParty/scudo/tests/combined_test.cpp
deleted file mode 100644
index 3dbd93cac..000000000
--- a/Telegram/ThirdParty/scudo/tests/combined_test.cpp
+++ /dev/null
@@ -1,903 +0,0 @@
-//===-- combined_test.cpp ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "memtag.h"
-#include "tests/scudo_unit_test.h"
-
-#include "allocator_config.h"
-#include "chunk.h"
-#include "combined.h"
-#include "condition_variable.h"
-#include "mem_map.h"
-#include "size_class_map.h"
-
-#include <algorithm>
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <stdlib.h>
-#include <thread>
-#include <vector>
-
-static constexpr scudo::Chunk::Origin Origin = scudo::Chunk::Origin::Malloc;
-static constexpr scudo::uptr MinAlignLog = FIRST_32_SECOND_64(3U, 4U);
-
-// Fuchsia complains that the function is not used.
-UNUSED static void disableDebuggerdMaybe() {
-#if SCUDO_ANDROID
-  // Disable the debuggerd signal handler on Android, without this we can end
-  // up spending a significant amount of time creating tombstones.
-  signal(SIGSEGV, SIG_DFL);
-#endif
-}
-
-template <class AllocatorT>
-bool isPrimaryAllocation(scudo::uptr Size, scudo::uptr Alignment) {
-  const scudo::uptr MinAlignment = 1UL << SCUDO_MIN_ALIGNMENT_LOG;
-  if (Alignment < MinAlignment)
-    Alignment = MinAlignment;
-  const scudo::uptr NeededSize =
-      scudo::roundUp(Size, MinAlignment) +
-      ((Alignment > MinAlignment) ? Alignment : scudo::Chunk::getHeaderSize());
-  return AllocatorT::PrimaryT::canAllocate(NeededSize);
-}
-
-template <class AllocatorT>
-void checkMemoryTaggingMaybe(AllocatorT *Allocator, void *P, scudo::uptr Size,
-                             scudo::uptr Alignment) {
-  const scudo::uptr MinAlignment = 1UL << SCUDO_MIN_ALIGNMENT_LOG;
-  Size = scudo::roundUp(Size, MinAlignment);
-  if (Allocator->useMemoryTaggingTestOnly())
-    EXPECT_DEATH(
-        {
-          disableDebuggerdMaybe();
-          reinterpret_cast<char *>(P)[-1] = 'A';
-        },
-        "");
-  if (isPrimaryAllocation<AllocatorT>(Size, Alignment)
-          ? Allocator->useMemoryTaggingTestOnly()
-          : Alignment == MinAlignment) {
-    EXPECT_DEATH(
-        {
-          disableDebuggerdMaybe();
-          reinterpret_cast<char *>(P)[Size] = 'A';
-        },
-        "");
-  }
-}
-
-template <typename Config> struct TestAllocator : scudo::Allocator<Config> {
-  TestAllocator() {
-    this->initThreadMaybe();
-    if (scudo::archSupportsMemoryTagging() &&
-        !scudo::systemDetectsMemoryTagFaultsTestOnly())
-      this->disableMemoryTagging();
-  }
-  ~TestAllocator() { this->unmapTestOnly(); }
-
-  void *operator new(size_t size);
-  void operator delete(void *ptr);
-};
-
-constexpr size_t kMaxAlign = std::max({
-  alignof(scudo::Allocator<scudo::DefaultConfig>),
-#if SCUDO_CAN_USE_PRIMARY64
-      alignof(scudo::Allocator<scudo::FuchsiaConfig>),
-#endif
-      alignof(scudo::Allocator<scudo::AndroidConfig>)
-});
-
-#if SCUDO_RISCV64
-// The allocator is over 4MB large. Rather than creating an instance of this on
-// the heap, keep it in a global storage to reduce fragmentation from having to
-// mmap this at the start of every test.
-struct TestAllocatorStorage {
-  static constexpr size_t kMaxSize = std::max({
-    sizeof(scudo::Allocator<scudo::DefaultConfig>),
-#if SCUDO_CAN_USE_PRIMARY64
-        sizeof(scudo::Allocator<scudo::FuchsiaConfig>),
-#endif
-        sizeof(scudo::Allocator<scudo::AndroidConfig>)
-  });
-
-  // To alleviate some problem, let's skip the thread safety analysis here.
-  static void *get(size_t size) NO_THREAD_SAFETY_ANALYSIS {
-    CHECK(size <= kMaxSize &&
-          "Allocation size doesn't fit in the allocator storage");
-    M.lock();
-    return AllocatorStorage;
-  }
-
-  static void release(void *ptr) NO_THREAD_SAFETY_ANALYSIS {
-    M.assertHeld();
-    M.unlock();
-    ASSERT_EQ(ptr, AllocatorStorage);
-  }
-
-  static scudo::HybridMutex M;
-  static uint8_t AllocatorStorage[kMaxSize];
-};
-scudo::HybridMutex TestAllocatorStorage::M;
-alignas(kMaxAlign) uint8_t TestAllocatorStorage::AllocatorStorage[kMaxSize];
-#else
-struct TestAllocatorStorage {
-  static void *get(size_t size) NO_THREAD_SAFETY_ANALYSIS {
-    void *p = nullptr;
-    EXPECT_EQ(0, posix_memalign(&p, kMaxAlign, size));
-    return p;
-  }
-  static void release(void *ptr) NO_THREAD_SAFETY_ANALYSIS { free(ptr); }
-};
-#endif
-
-template <typename Config>
-void *TestAllocator<Config>::operator new(size_t size) {
-  return TestAllocatorStorage::get(size);
-}
-
-template <typename Config>
-void TestAllocator<Config>::operator delete(void *ptr) {
-  TestAllocatorStorage::release(ptr);
-}
-
-template <class TypeParam> struct ScudoCombinedTest : public Test {
-  ScudoCombinedTest() {
-    UseQuarantine = std::is_same<TypeParam, scudo::AndroidConfig>::value;
-    Allocator = std::make_unique<AllocatorT>();
-  }
-  ~ScudoCombinedTest() {
-    Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-    UseQuarantine = true;
-  }
-
-  void RunTest();
-
-  void BasicTest(scudo::uptr SizeLog);
-
-  using AllocatorT = TestAllocator<TypeParam>;
-  std::unique_ptr<AllocatorT> Allocator;
-};
-
-template <typename T> using ScudoCombinedDeathTest = ScudoCombinedTest<T>;
-
-namespace scudo {
-struct TestConditionVariableConfig {
-  static const bool MaySupportMemoryTagging = true;
-  template <class A>
-  using TSDRegistryT =
-      scudo::TSDRegistrySharedT<A, 8U, 4U>; // Shared, max 8 TSDs.
-
-  struct Primary {
-    using SizeClassMap = scudo::AndroidSizeClassMap;
-#if SCUDO_CAN_USE_PRIMARY64
-    static const scudo::uptr RegionSizeLog = 28U;
-    typedef scudo::u32 CompactPtrT;
-    static const scudo::uptr CompactPtrScale = SCUDO_MIN_ALIGNMENT_LOG;
-    static const scudo::uptr GroupSizeLog = 20U;
-    static const bool EnableRandomOffset = true;
-    static const scudo::uptr MapSizeIncrement = 1UL << 18;
-#else
-    static const scudo::uptr RegionSizeLog = 18U;
-    static const scudo::uptr GroupSizeLog = 18U;
-    typedef scudo::uptr CompactPtrT;
-#endif
-    static const scudo::s32 MinReleaseToOsIntervalMs = 1000;
-    static const scudo::s32 MaxReleaseToOsIntervalMs = 1000;
-    static const bool UseConditionVariable = true;
-#if SCUDO_LINUX
-    using ConditionVariableT = scudo::ConditionVariableLinux;
-#else
-    using ConditionVariableT = scudo::ConditionVariableDummy;
-#endif
-  };
-#if SCUDO_CAN_USE_PRIMARY64
-  template <typename Config>
-  using PrimaryT = scudo::SizeClassAllocator64<Config>;
-#else
-  template <typename Config>
-  using PrimaryT = scudo::SizeClassAllocator32<Config>;
-#endif
-
-  struct Secondary {
-    template <typename Config>
-    using CacheT = scudo::MapAllocatorNoCache<Config>;
-  };
-  template <typename Config> using SecondaryT = scudo::MapAllocator<Config>;
-};
-} // namespace scudo
-
-#if SCUDO_FUCHSIA
-#define SCUDO_TYPED_TEST_ALL_TYPES(FIXTURE, NAME)                              \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, FuchsiaConfig)
-#else
-#define SCUDO_TYPED_TEST_ALL_TYPES(FIXTURE, NAME)                              \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, DefaultConfig)                          \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, AndroidConfig)                          \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConditionVariableConfig)
-#endif
-
-#define SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TYPE)                             \
-  using FIXTURE##NAME##_##TYPE = FIXTURE##NAME<scudo::TYPE>;                   \
-  TEST_F(FIXTURE##NAME##_##TYPE, NAME) { FIXTURE##NAME<scudo::TYPE>::Run(); }
-
-#define SCUDO_TYPED_TEST(FIXTURE, NAME)                                        \
-  template <class TypeParam>                                                   \
-  struct FIXTURE##NAME : public FIXTURE<TypeParam> {                           \
-    void Run();                                                                \
-  };                                                                           \
-  SCUDO_TYPED_TEST_ALL_TYPES(FIXTURE, NAME)                                    \
-  template <class TypeParam> void FIXTURE##NAME<TypeParam>::Run()
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, IsOwned) {
-  auto *Allocator = this->Allocator.get();
-  static scudo::u8 StaticBuffer[scudo::Chunk::getHeaderSize() + 1];
-  EXPECT_FALSE(
-      Allocator->isOwned(&StaticBuffer[scudo::Chunk::getHeaderSize()]));
-
-  scudo::u8 StackBuffer[scudo::Chunk::getHeaderSize() + 1];
-  for (scudo::uptr I = 0; I < sizeof(StackBuffer); I++)
-    StackBuffer[I] = 0x42U;
-  EXPECT_FALSE(Allocator->isOwned(&StackBuffer[scudo::Chunk::getHeaderSize()]));
-  for (scudo::uptr I = 0; I < sizeof(StackBuffer); I++)
-    EXPECT_EQ(StackBuffer[I], 0x42U);
-}
-
-template <class Config>
-void ScudoCombinedTest<Config>::BasicTest(scudo::uptr SizeLog) {
-  auto *Allocator = this->Allocator.get();
-
-  // This allocates and deallocates a bunch of chunks, with a wide range of
-  // sizes and alignments, with a focus on sizes that could trigger weird
-  // behaviors (plus or minus a small delta of a power of two for example).
-  for (scudo::uptr AlignLog = MinAlignLog; AlignLog <= 16U; AlignLog++) {
-    const scudo::uptr Align = 1U << AlignLog;
-    for (scudo::sptr Delta = -32; Delta <= 32; Delta++) {
-      if ((1LL << SizeLog) + Delta < 0)
-        continue;
-      const scudo::uptr Size =
-          static_cast<scudo::uptr>((1LL << SizeLog) + Delta);
-      void *P = Allocator->allocate(Size, Origin, Align);
-      EXPECT_NE(P, nullptr);
-      EXPECT_TRUE(Allocator->isOwned(P));
-      EXPECT_TRUE(scudo::isAligned(reinterpret_cast<scudo::uptr>(P), Align));
-      EXPECT_LE(Size, Allocator->getUsableSize(P));
-      memset(P, 0xaa, Size);
-      checkMemoryTaggingMaybe(Allocator, P, Size, Align);
-      Allocator->deallocate(P, Origin, Size);
-    }
-  }
-
-  Allocator->printStats();
-  Allocator->printFragmentationInfo();
-}
-
-#define SCUDO_MAKE_BASIC_TEST(SizeLog)                                         \
-  SCUDO_TYPED_TEST(ScudoCombinedDeathTest, BasicCombined##SizeLog) {           \
-    this->BasicTest(SizeLog);                                                  \
-  }
-
-SCUDO_MAKE_BASIC_TEST(0)
-SCUDO_MAKE_BASIC_TEST(1)
-SCUDO_MAKE_BASIC_TEST(2)
-SCUDO_MAKE_BASIC_TEST(3)
-SCUDO_MAKE_BASIC_TEST(4)
-SCUDO_MAKE_BASIC_TEST(5)
-SCUDO_MAKE_BASIC_TEST(6)
-SCUDO_MAKE_BASIC_TEST(7)
-SCUDO_MAKE_BASIC_TEST(8)
-SCUDO_MAKE_BASIC_TEST(9)
-SCUDO_MAKE_BASIC_TEST(10)
-SCUDO_MAKE_BASIC_TEST(11)
-SCUDO_MAKE_BASIC_TEST(12)
-SCUDO_MAKE_BASIC_TEST(13)
-SCUDO_MAKE_BASIC_TEST(14)
-SCUDO_MAKE_BASIC_TEST(15)
-SCUDO_MAKE_BASIC_TEST(16)
-SCUDO_MAKE_BASIC_TEST(17)
-SCUDO_MAKE_BASIC_TEST(18)
-SCUDO_MAKE_BASIC_TEST(19)
-SCUDO_MAKE_BASIC_TEST(20)
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, ZeroContents) {
-  auto *Allocator = this->Allocator.get();
-
-  // Ensure that specifying ZeroContents returns a zero'd out block.
-  for (scudo::uptr SizeLog = 0U; SizeLog <= 20U; SizeLog++) {
-    for (scudo::uptr Delta = 0U; Delta <= 4U; Delta++) {
-      const scudo::uptr Size = (1U << SizeLog) + Delta * 128U;
-      void *P = Allocator->allocate(Size, Origin, 1U << MinAlignLog, true);
-      EXPECT_NE(P, nullptr);
-      for (scudo::uptr I = 0; I < Size; I++)
-        ASSERT_EQ((reinterpret_cast<char *>(P))[I], '\0');
-      memset(P, 0xaa, Size);
-      Allocator->deallocate(P, Origin, Size);
-    }
-  }
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, ZeroFill) {
-  auto *Allocator = this->Allocator.get();
-
-  // Ensure that specifying ZeroFill returns a zero'd out block.
-  Allocator->setFillContents(scudo::ZeroFill);
-  for (scudo::uptr SizeLog = 0U; SizeLog <= 20U; SizeLog++) {
-    for (scudo::uptr Delta = 0U; Delta <= 4U; Delta++) {
-      const scudo::uptr Size = (1U << SizeLog) + Delta * 128U;
-      void *P = Allocator->allocate(Size, Origin, 1U << MinAlignLog, false);
-      EXPECT_NE(P, nullptr);
-      for (scudo::uptr I = 0; I < Size; I++)
-        ASSERT_EQ((reinterpret_cast<char *>(P))[I], '\0');
-      memset(P, 0xaa, Size);
-      Allocator->deallocate(P, Origin, Size);
-    }
-  }
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, PatternOrZeroFill) {
-  auto *Allocator = this->Allocator.get();
-
-  // Ensure that specifying PatternOrZeroFill returns a pattern or zero filled
-  // block. The primary allocator only produces pattern filled blocks if MTE
-  // is disabled, so we only require pattern filled blocks in that case.
-  Allocator->setFillContents(scudo::PatternOrZeroFill);
-  for (scudo::uptr SizeLog = 0U; SizeLog <= 20U; SizeLog++) {
-    for (scudo::uptr Delta = 0U; Delta <= 4U; Delta++) {
-      const scudo::uptr Size = (1U << SizeLog) + Delta * 128U;
-      void *P = Allocator->allocate(Size, Origin, 1U << MinAlignLog, false);
-      EXPECT_NE(P, nullptr);
-      for (scudo::uptr I = 0; I < Size; I++) {
-        unsigned char V = (reinterpret_cast<unsigned char *>(P))[I];
-        if (isPrimaryAllocation<TestAllocator<TypeParam>>(Size,
-                                                          1U << MinAlignLog) &&
-            !Allocator->useMemoryTaggingTestOnly())
-          ASSERT_EQ(V, scudo::PatternFillByte);
-        else
-          ASSERT_TRUE(V == scudo::PatternFillByte || V == 0);
-      }
-      memset(P, 0xaa, Size);
-      Allocator->deallocate(P, Origin, Size);
-    }
-  }
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, BlockReuse) {
-  auto *Allocator = this->Allocator.get();
-
-  // Verify that a chunk will end up being reused, at some point.
-  const scudo::uptr NeedleSize = 1024U;
-  void *NeedleP = Allocator->allocate(NeedleSize, Origin);
-  Allocator->deallocate(NeedleP, Origin);
-  bool Found = false;
-  for (scudo::uptr I = 0; I < 1024U && !Found; I++) {
-    void *P = Allocator->allocate(NeedleSize, Origin);
-    if (Allocator->getHeaderTaggedPointer(P) ==
-        Allocator->getHeaderTaggedPointer(NeedleP))
-      Found = true;
-    Allocator->deallocate(P, Origin);
-  }
-  EXPECT_TRUE(Found);
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, ReallocateLargeIncreasing) {
-  auto *Allocator = this->Allocator.get();
-
-  // Reallocate a chunk all the way up to a secondary allocation, verifying that
-  // we preserve the data in the process.
-  scudo::uptr Size = 16;
-  void *P = Allocator->allocate(Size, Origin);
-  const char Marker = 'A';
-  memset(P, Marker, Size);
-  while (Size < TypeParam::Primary::SizeClassMap::MaxSize * 4) {
-    void *NewP = Allocator->reallocate(P, Size * 2);
-    EXPECT_NE(NewP, nullptr);
-    for (scudo::uptr J = 0; J < Size; J++)
-      EXPECT_EQ((reinterpret_cast<char *>(NewP))[J], Marker);
-    memset(reinterpret_cast<char *>(NewP) + Size, Marker, Size);
-    Size *= 2U;
-    P = NewP;
-  }
-  Allocator->deallocate(P, Origin);
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, ReallocateLargeDecreasing) {
-  auto *Allocator = this->Allocator.get();
-
-  // Reallocate a large chunk all the way down to a byte, verifying that we
-  // preserve the data in the process.
-  scudo::uptr Size = TypeParam::Primary::SizeClassMap::MaxSize * 2;
-  const scudo::uptr DataSize = 2048U;
-  void *P = Allocator->allocate(Size, Origin);
-  const char Marker = 'A';
-  memset(P, Marker, scudo::Min(Size, DataSize));
-  while (Size > 1U) {
-    Size /= 2U;
-    void *NewP = Allocator->reallocate(P, Size);
-    EXPECT_NE(NewP, nullptr);
-    for (scudo::uptr J = 0; J < scudo::Min(Size, DataSize); J++)
-      EXPECT_EQ((reinterpret_cast<char *>(NewP))[J], Marker);
-    P = NewP;
-  }
-  Allocator->deallocate(P, Origin);
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedDeathTest, ReallocateSame) {
-  auto *Allocator = this->Allocator.get();
-
-  // Check that reallocating a chunk to a slightly smaller or larger size
-  // returns the same chunk. This requires that all the sizes we iterate on use
-  // the same block size, but that should be the case for MaxSize - 64 with our
-  // default class size maps.
-  constexpr scudo::uptr ReallocSize =
-      TypeParam::Primary::SizeClassMap::MaxSize - 64;
-  void *P = Allocator->allocate(ReallocSize, Origin);
-  const char Marker = 'A';
-  memset(P, Marker, ReallocSize);
-  for (scudo::sptr Delta = -32; Delta < 32; Delta += 8) {
-    const scudo::uptr NewSize =
-        static_cast<scudo::uptr>(static_cast<scudo::sptr>(ReallocSize) + Delta);
-    void *NewP = Allocator->reallocate(P, NewSize);
-    EXPECT_EQ(NewP, P);
-    for (scudo::uptr I = 0; I < ReallocSize - 32; I++)
-      EXPECT_EQ((reinterpret_cast<char *>(NewP))[I], Marker);
-    checkMemoryTaggingMaybe(Allocator, NewP, NewSize, 0);
-  }
-  Allocator->deallocate(P, Origin);
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, IterateOverChunks) {
-  auto *Allocator = this->Allocator.get();
-  // Allocates a bunch of chunks, then iterate over all the chunks, ensuring
-  // they are the ones we allocated. This requires the allocator to not have any
-  // other allocated chunk at this point (eg: won't work with the Quarantine).
-  // FIXME: Make it work with UseQuarantine and tagging enabled. Internals of
-  // iterateOverChunks reads header by tagged and non-tagger pointers so one of
-  // them will fail.
-  if (!UseQuarantine) {
-    std::vector<void *> V;
-    for (scudo::uptr I = 0; I < 64U; I++)
-      V.push_back(Allocator->allocate(
-          static_cast<scudo::uptr>(std::rand()) %
-              (TypeParam::Primary::SizeClassMap::MaxSize / 2U),
-          Origin));
-    Allocator->disable();
-    Allocator->iterateOverChunks(
-        0U, static_cast<scudo::uptr>(SCUDO_MMAP_RANGE_SIZE - 1),
-        [](uintptr_t Base, UNUSED size_t Size, void *Arg) {
-          std::vector<void *> *V = reinterpret_cast<std::vector<void *> *>(Arg);
-          void *P = reinterpret_cast<void *>(Base);
-          EXPECT_NE(std::find(V->begin(), V->end(), P), V->end());
-        },
-        reinterpret_cast<void *>(&V));
-    Allocator->enable();
-    for (auto P : V)
-      Allocator->deallocate(P, Origin);
-  }
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedDeathTest, UseAfterFree) {
-  auto *Allocator = this->Allocator.get();
-
-  // Check that use-after-free is detected.
-  for (scudo::uptr SizeLog = 0U; SizeLog <= 20U; SizeLog++) {
-    const scudo::uptr Size = 1U << SizeLog;
-    if (!Allocator->useMemoryTaggingTestOnly())
-      continue;
-    EXPECT_DEATH(
-        {
-          disableDebuggerdMaybe();
-          void *P = Allocator->allocate(Size, Origin);
-          Allocator->deallocate(P, Origin);
-          reinterpret_cast<char *>(P)[0] = 'A';
-        },
-        "");
-    EXPECT_DEATH(
-        {
-          disableDebuggerdMaybe();
-          void *P = Allocator->allocate(Size, Origin);
-          Allocator->deallocate(P, Origin);
-          reinterpret_cast<char *>(P)[Size - 1] = 'A';
-        },
-        "");
-  }
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedDeathTest, DisableMemoryTagging) {
-  auto *Allocator = this->Allocator.get();
-
-  if (Allocator->useMemoryTaggingTestOnly()) {
-    // Check that disabling memory tagging works correctly.
-    void *P = Allocator->allocate(2048, Origin);
-    EXPECT_DEATH(reinterpret_cast<char *>(P)[2048] = 'A', "");
-    scudo::ScopedDisableMemoryTagChecks NoTagChecks;
-    Allocator->disableMemoryTagging();
-    reinterpret_cast<char *>(P)[2048] = 'A';
-    Allocator->deallocate(P, Origin);
-
-    P = Allocator->allocate(2048, Origin);
-    EXPECT_EQ(scudo::untagPointer(P), P);
-    reinterpret_cast<char *>(P)[2048] = 'A';
-    Allocator->deallocate(P, Origin);
-
-    Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-  }
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, Stats) {
-  auto *Allocator = this->Allocator.get();
-
-  scudo::uptr BufferSize = 8192;
-  std::vector<char> Buffer(BufferSize);
-  scudo::uptr ActualSize = Allocator->getStats(Buffer.data(), BufferSize);
-  while (ActualSize > BufferSize) {
-    BufferSize = ActualSize + 1024;
-    Buffer.resize(BufferSize);
-    ActualSize = Allocator->getStats(Buffer.data(), BufferSize);
-  }
-  std::string Stats(Buffer.begin(), Buffer.end());
-  // Basic checks on the contents of the statistics output, which also allows us
-  // to verify that we got it all.
-  EXPECT_NE(Stats.find("Stats: SizeClassAllocator"), std::string::npos);
-  EXPECT_NE(Stats.find("Stats: MapAllocator"), std::string::npos);
-  EXPECT_NE(Stats.find("Stats: Quarantine"), std::string::npos);
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, CacheDrain) NO_THREAD_SAFETY_ANALYSIS {
-  auto *Allocator = this->Allocator.get();
-
-  std::vector<void *> V;
-  for (scudo::uptr I = 0; I < 64U; I++)
-    V.push_back(Allocator->allocate(
-        static_cast<scudo::uptr>(std::rand()) %
-            (TypeParam::Primary::SizeClassMap::MaxSize / 2U),
-        Origin));
-  for (auto P : V)
-    Allocator->deallocate(P, Origin);
-
-  bool UnlockRequired;
-  auto *TSD = Allocator->getTSDRegistry()->getTSDAndLock(&UnlockRequired);
-  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-  EXPECT_TRUE(!TSD->getCache().isEmpty());
-  TSD->getCache().drain();
-  EXPECT_TRUE(TSD->getCache().isEmpty());
-  if (UnlockRequired)
-    TSD->unlock();
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, ForceCacheDrain) NO_THREAD_SAFETY_ANALYSIS {
-  auto *Allocator = this->Allocator.get();
-
-  std::vector<void *> V;
-  for (scudo::uptr I = 0; I < 64U; I++)
-    V.push_back(Allocator->allocate(
-        static_cast<scudo::uptr>(std::rand()) %
-            (TypeParam::Primary::SizeClassMap::MaxSize / 2U),
-        Origin));
-  for (auto P : V)
-    Allocator->deallocate(P, Origin);
-
-  // `ForceAll` will also drain the caches.
-  Allocator->releaseToOS(scudo::ReleaseToOS::ForceAll);
-
-  bool UnlockRequired;
-  auto *TSD = Allocator->getTSDRegistry()->getTSDAndLock(&UnlockRequired);
-  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-  EXPECT_TRUE(TSD->getCache().isEmpty());
-  EXPECT_EQ(TSD->getQuarantineCache().getSize(), 0U);
-  EXPECT_TRUE(Allocator->getQuarantine()->isEmpty());
-  if (UnlockRequired)
-    TSD->unlock();
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, ThreadedCombined) {
-  std::mutex Mutex;
-  std::condition_variable Cv;
-  bool Ready = false;
-  auto *Allocator = this->Allocator.get();
-  std::thread Threads[32];
-  for (scudo::uptr I = 0; I < ARRAY_SIZE(Threads); I++)
-    Threads[I] = std::thread([&]() {
-      {
-        std::unique_lock<std::mutex> Lock(Mutex);
-        while (!Ready)
-          Cv.wait(Lock);
-      }
-      std::vector<std::pair<void *, scudo::uptr>> V;
-      for (scudo::uptr I = 0; I < 256U; I++) {
-        const scudo::uptr Size = static_cast<scudo::uptr>(std::rand()) % 4096U;
-        void *P = Allocator->allocate(Size, Origin);
-        // A region could have ran out of memory, resulting in a null P.
-        if (P)
-          V.push_back(std::make_pair(P, Size));
-      }
-
-      // Try to interleave pushBlocks(), popBatch() and releaseToOS().
-      Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-
-      while (!V.empty()) {
-        auto Pair = V.back();
-        Allocator->deallocate(Pair.first, Origin, Pair.second);
-        V.pop_back();
-      }
-    });
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    Ready = true;
-    Cv.notify_all();
-  }
-  for (auto &T : Threads)
-    T.join();
-  Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-}
-
-// Test that multiple instantiations of the allocator have not messed up the
-// process's signal handlers (GWP-ASan used to do this).
-TEST(ScudoCombinedDeathTest, SKIP_ON_FUCHSIA(testSEGV)) {
-  const scudo::uptr Size = 4 * scudo::getPageSizeCached();
-  scudo::ReservedMemoryT ReservedMemory;
-  ASSERT_TRUE(ReservedMemory.create(/*Addr=*/0U, Size, "testSEGV"));
-  void *P = reinterpret_cast<void *>(ReservedMemory.getBase());
-  ASSERT_NE(P, nullptr);
-  EXPECT_DEATH(memset(P, 0xaa, Size), "");
-  ReservedMemory.release();
-}
-
-struct DeathSizeClassConfig {
-  static const scudo::uptr NumBits = 1;
-  static const scudo::uptr MinSizeLog = 10;
-  static const scudo::uptr MidSizeLog = 10;
-  static const scudo::uptr MaxSizeLog = 13;
-  static const scudo::u16 MaxNumCachedHint = 8;
-  static const scudo::uptr MaxBytesCachedLog = 12;
-  static const scudo::uptr SizeDelta = 0;
-};
-
-static const scudo::uptr DeathRegionSizeLog = 21U;
-struct DeathConfig {
-  static const bool MaySupportMemoryTagging = false;
-  template <class A> using TSDRegistryT = scudo::TSDRegistrySharedT<A, 1U, 1U>;
-
-  struct Primary {
-    // Tiny allocator, its Primary only serves chunks of four sizes.
-    using SizeClassMap = scudo::FixedSizeClassMap<DeathSizeClassConfig>;
-    static const scudo::uptr RegionSizeLog = DeathRegionSizeLog;
-    static const scudo::s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const scudo::s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-    typedef scudo::uptr CompactPtrT;
-    static const scudo::uptr CompactPtrScale = 0;
-    static const bool EnableRandomOffset = true;
-    static const scudo::uptr MapSizeIncrement = 1UL << 18;
-    static const scudo::uptr GroupSizeLog = 18;
-  };
-  template <typename Config>
-  using PrimaryT = scudo::SizeClassAllocator64<Config>;
-
-  struct Secondary {
-    template <typename Config>
-    using CacheT = scudo::MapAllocatorNoCache<Config>;
-  };
-
-  template <typename Config> using SecondaryT = scudo::MapAllocator<Config>;
-};
-
-TEST(ScudoCombinedDeathTest, DeathCombined) {
-  using AllocatorT = TestAllocator<DeathConfig>;
-  auto Allocator = std::unique_ptr<AllocatorT>(new AllocatorT());
-
-  const scudo::uptr Size = 1000U;
-  void *P = Allocator->allocate(Size, Origin);
-  EXPECT_NE(P, nullptr);
-
-  // Invalid sized deallocation.
-  EXPECT_DEATH(Allocator->deallocate(P, Origin, Size + 8U), "");
-
-  // Misaligned pointer. Potentially unused if EXPECT_DEATH isn't available.
-  UNUSED void *MisalignedP =
-      reinterpret_cast<void *>(reinterpret_cast<scudo::uptr>(P) | 1U);
-  EXPECT_DEATH(Allocator->deallocate(MisalignedP, Origin, Size), "");
-  EXPECT_DEATH(Allocator->reallocate(MisalignedP, Size * 2U), "");
-
-  // Header corruption.
-  scudo::u64 *H =
-      reinterpret_cast<scudo::u64 *>(scudo::Chunk::getAtomicHeader(P));
-  *H ^= 0x42U;
-  EXPECT_DEATH(Allocator->deallocate(P, Origin, Size), "");
-  *H ^= 0x420042U;
-  EXPECT_DEATH(Allocator->deallocate(P, Origin, Size), "");
-  *H ^= 0x420000U;
-
-  // Invalid chunk state.
-  Allocator->deallocate(P, Origin, Size);
-  EXPECT_DEATH(Allocator->deallocate(P, Origin, Size), "");
-  EXPECT_DEATH(Allocator->reallocate(P, Size * 2U), "");
-  EXPECT_DEATH(Allocator->getUsableSize(P), "");
-}
-
-// Verify that when a region gets full, the allocator will still manage to
-// fulfill the allocation through a larger size class.
-TEST(ScudoCombinedTest, FullRegion) {
-  using AllocatorT = TestAllocator<DeathConfig>;
-  auto Allocator = std::unique_ptr<AllocatorT>(new AllocatorT());
-
-  std::vector<void *> V;
-  scudo::uptr FailedAllocationsCount = 0;
-  for (scudo::uptr ClassId = 1U;
-       ClassId <= DeathConfig::Primary::SizeClassMap::LargestClassId;
-       ClassId++) {
-    const scudo::uptr Size =
-        DeathConfig::Primary::SizeClassMap::getSizeByClassId(ClassId);
-    // Allocate enough to fill all of the regions above this one.
-    const scudo::uptr MaxNumberOfChunks =
-        ((1U << DeathRegionSizeLog) / Size) *
-        (DeathConfig::Primary::SizeClassMap::LargestClassId - ClassId + 1);
-    void *P;
-    for (scudo::uptr I = 0; I <= MaxNumberOfChunks; I++) {
-      P = Allocator->allocate(Size - 64U, Origin);
-      if (!P)
-        FailedAllocationsCount++;
-      else
-        V.push_back(P);
-    }
-    while (!V.empty()) {
-      Allocator->deallocate(V.back(), Origin);
-      V.pop_back();
-    }
-  }
-  EXPECT_EQ(FailedAllocationsCount, 0U);
-}
-
-// Ensure that releaseToOS can be called prior to any other allocator
-// operation without issue.
-SCUDO_TYPED_TEST(ScudoCombinedTest, ReleaseToOS) {
-  auto *Allocator = this->Allocator.get();
-  Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, OddEven) {
-  auto *Allocator = this->Allocator.get();
-  Allocator->setOption(scudo::Option::MemtagTuning, M_MEMTAG_TUNING_BUFFER_OVERFLOW);
-
-  if (!Allocator->useMemoryTaggingTestOnly())
-    return;
-
-  auto CheckOddEven = [](scudo::uptr P1, scudo::uptr P2) {
-    scudo::uptr Tag1 = scudo::extractTag(scudo::loadTag(P1));
-    scudo::uptr Tag2 = scudo::extractTag(scudo::loadTag(P2));
-    EXPECT_NE(Tag1 % 2, Tag2 % 2);
-  };
-
-  using SizeClassMap = typename TypeParam::Primary::SizeClassMap;
-  for (scudo::uptr ClassId = 1U; ClassId <= SizeClassMap::LargestClassId;
-       ClassId++) {
-    const scudo::uptr Size = SizeClassMap::getSizeByClassId(ClassId);
-
-    std::set<scudo::uptr> Ptrs;
-    bool Found = false;
-    for (unsigned I = 0; I != 65536; ++I) {
-      scudo::uptr P = scudo::untagPointer(reinterpret_cast<scudo::uptr>(
-          Allocator->allocate(Size - scudo::Chunk::getHeaderSize(), Origin)));
-      if (Ptrs.count(P - Size)) {
-        Found = true;
-        CheckOddEven(P, P - Size);
-        break;
-      }
-      if (Ptrs.count(P + Size)) {
-        Found = true;
-        CheckOddEven(P, P + Size);
-        break;
-      }
-      Ptrs.insert(P);
-    }
-    EXPECT_TRUE(Found);
-  }
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, DisableMemInit) {
-  auto *Allocator = this->Allocator.get();
-
-  std::vector<void *> Ptrs(65536);
-
-  Allocator->setOption(scudo::Option::ThreadDisableMemInit, 1);
-
-  constexpr scudo::uptr MinAlignLog = FIRST_32_SECOND_64(3U, 4U);
-
-  // Test that if mem-init is disabled on a thread, calloc should still work as
-  // expected. This is tricky to ensure when MTE is enabled, so this test tries
-  // to exercise the relevant code on our MTE path.
-  for (scudo::uptr ClassId = 1U; ClassId <= 8; ClassId++) {
-    using SizeClassMap = typename TypeParam::Primary::SizeClassMap;
-    const scudo::uptr Size =
-        SizeClassMap::getSizeByClassId(ClassId) - scudo::Chunk::getHeaderSize();
-    if (Size < 8)
-      continue;
-    for (unsigned I = 0; I != Ptrs.size(); ++I) {
-      Ptrs[I] = Allocator->allocate(Size, Origin);
-      memset(Ptrs[I], 0xaa, Size);
-    }
-    for (unsigned I = 0; I != Ptrs.size(); ++I)
-      Allocator->deallocate(Ptrs[I], Origin, Size);
-    for (unsigned I = 0; I != Ptrs.size(); ++I) {
-      Ptrs[I] = Allocator->allocate(Size - 8, Origin);
-      memset(Ptrs[I], 0xbb, Size - 8);
-    }
-    for (unsigned I = 0; I != Ptrs.size(); ++I)
-      Allocator->deallocate(Ptrs[I], Origin, Size - 8);
-    for (unsigned I = 0; I != Ptrs.size(); ++I) {
-      Ptrs[I] = Allocator->allocate(Size, Origin, 1U << MinAlignLog, true);
-      for (scudo::uptr J = 0; J < Size; ++J)
-        ASSERT_EQ((reinterpret_cast<char *>(Ptrs[I]))[J], '\0');
-    }
-  }
-
-  Allocator->setOption(scudo::Option::ThreadDisableMemInit, 0);
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, ReallocateInPlaceStress) {
-  auto *Allocator = this->Allocator.get();
-
-  // Regression test: make realloc-in-place happen at the very right end of a
-  // mapped region.
-  constexpr size_t nPtrs = 10000;
-  for (scudo::uptr i = 1; i < 32; ++i) {
-    scudo::uptr Size = 16 * i - 1;
-    std::vector<void *> Ptrs;
-    for (size_t i = 0; i < nPtrs; ++i) {
-      void *P = Allocator->allocate(Size, Origin);
-      P = Allocator->reallocate(P, Size + 1);
-      Ptrs.push_back(P);
-    }
-
-    for (size_t i = 0; i < nPtrs; ++i)
-      Allocator->deallocate(Ptrs[i], Origin);
-  }
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, RingBufferSize) {
-  auto *Allocator = this->Allocator.get();
-  auto Size = Allocator->getRingBufferSize();
-  if (Size > 0)
-    EXPECT_EQ(Allocator->getRingBufferAddress()[Size - 1], '\0');
-}
-
-SCUDO_TYPED_TEST(ScudoCombinedTest, RingBufferAddress) {
-  auto *Allocator = this->Allocator.get();
-  auto *Addr = Allocator->getRingBufferAddress();
-  EXPECT_NE(Addr, nullptr);
-  EXPECT_EQ(Addr, Allocator->getRingBufferAddress());
-}
-
-#if SCUDO_CAN_USE_PRIMARY64
-#if SCUDO_TRUSTY
-
-// TrustyConfig is designed for a domain-specific allocator. Add a basic test
-// which covers only simple operations and ensure the configuration is able to
-// compile.
-TEST(ScudoCombinedTest, BasicTrustyConfig) {
-  using AllocatorT = scudo::Allocator<scudo::TrustyConfig>;
-  auto Allocator = std::unique_ptr<AllocatorT>(new AllocatorT());
-
-  for (scudo::uptr ClassId = 1U;
-       ClassId <= scudo::TrustyConfig::SizeClassMap::LargestClassId;
-       ClassId++) {
-    const scudo::uptr Size =
-        scudo::TrustyConfig::SizeClassMap::getSizeByClassId(ClassId);
-    void *p = Allocator->allocate(Size - scudo::Chunk::getHeaderSize(), Origin);
-    ASSERT_NE(p, nullptr);
-    free(p);
-  }
-
-  bool UnlockRequired;
-  auto *TSD = Allocator->getTSDRegistry()->getTSDAndLock(&UnlockRequired);
-  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-  TSD->getCache().drain();
-
-  Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-}
-
-#endif
-#endif
diff --git a/Telegram/ThirdParty/scudo/tests/common_test.cpp b/Telegram/ThirdParty/scudo/tests/common_test.cpp
deleted file mode 100644
index fff7c662a..000000000
--- a/Telegram/ThirdParty/scudo/tests/common_test.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//===-- common_test.cpp -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "internal_defs.h"
-#include "tests/scudo_unit_test.h"
-
-#include "common.h"
-#include "mem_map.h"
-#include <algorithm>
-#include <fstream>
-
-namespace scudo {
-
-static uptr getResidentMemorySize() {
-  if (!SCUDO_LINUX)
-    UNREACHABLE("Not implemented!");
-  uptr Size;
-  uptr Resident;
-  std::ifstream IFS("/proc/self/statm");
-  IFS >> Size;
-  IFS >> Resident;
-  return Resident * getPageSizeCached();
-}
-
-// Fuchsia needs getResidentMemorySize implementation.
-TEST(ScudoCommonTest, SKIP_ON_FUCHSIA(ResidentMemorySize)) {
-  uptr OnStart = getResidentMemorySize();
-  EXPECT_GT(OnStart, 0UL);
-
-  const uptr Size = 1ull << 30;
-  const uptr Threshold = Size >> 3;
-
-  MemMapT MemMap;
-  ASSERT_TRUE(MemMap.map(/*Addr=*/0U, Size, "ResidentMemorySize"));
-  ASSERT_NE(MemMap.getBase(), 0U);
-  void *P = reinterpret_cast<void *>(MemMap.getBase());
-  EXPECT_LT(getResidentMemorySize(), OnStart + Threshold);
-
-  memset(P, 1, Size);
-  EXPECT_GT(getResidentMemorySize(), OnStart + Size - Threshold);
-
-  MemMap.releasePagesToOS(MemMap.getBase(), Size);
-  EXPECT_LT(getResidentMemorySize(), OnStart + Threshold);
-
-  memset(P, 1, Size);
-  EXPECT_GT(getResidentMemorySize(), OnStart + Size - Threshold);
-
-  MemMap.unmap(MemMap.getBase(), Size);
-}
-
-TEST(ScudoCommonTest, Zeros) {
-  const uptr Size = 1ull << 20;
-
-  MemMapT MemMap;
-  ASSERT_TRUE(MemMap.map(/*Addr=*/0U, Size, "Zeros"));
-  ASSERT_NE(MemMap.getBase(), 0U);
-  uptr *P = reinterpret_cast<uptr *>(MemMap.getBase());
-  const ptrdiff_t N = Size / sizeof(uptr);
-  EXPECT_EQ(std::count(P, P + N, 0), N);
-
-  memset(P, 1, Size);
-  EXPECT_EQ(std::count(P, P + N, 0), 0);
-
-  MemMap.releasePagesToOS(MemMap.getBase(), Size);
-  EXPECT_EQ(std::count(P, P + N, 0), N);
-
-  MemMap.unmap(MemMap.getBase(), Size);
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/tests/condition_variable_test.cpp b/Telegram/ThirdParty/scudo/tests/condition_variable_test.cpp
deleted file mode 100644
index caba1f64a..000000000
--- a/Telegram/ThirdParty/scudo/tests/condition_variable_test.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//===-- condition_variable_test.cpp -----------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "common.h"
-#include "condition_variable.h"
-#include "mutex.h"
-
-#include <thread>
-
-template <typename ConditionVariableT> void simpleWaitAndNotifyAll() {
-  constexpr scudo::u32 NumThreads = 2;
-  constexpr scudo::u32 CounterMax = 1024;
-  std::thread Threads[NumThreads];
-
-  scudo::HybridMutex M;
-  ConditionVariableT CV;
-  CV.bindTestOnly(M);
-  scudo::u32 Counter = 0;
-
-  for (scudo::u32 I = 0; I < NumThreads; ++I) {
-    Threads[I] = std::thread(
-        [&](scudo::u32 Id) {
-          do {
-            scudo::ScopedLock L(M);
-            if (Counter % NumThreads != Id && Counter < CounterMax)
-              CV.wait(M);
-            if (Counter >= CounterMax) {
-              break;
-            } else {
-              ++Counter;
-              CV.notifyAll(M);
-            }
-          } while (true);
-        },
-        I);
-  }
-
-  for (std::thread &T : Threads)
-    T.join();
-
-  EXPECT_EQ(Counter, CounterMax);
-}
-
-TEST(ScudoConditionVariableTest, DummyCVWaitAndNotifyAll) {
-  simpleWaitAndNotifyAll<scudo::ConditionVariableDummy>();
-}
-
-#ifdef SCUDO_LINUX
-TEST(ScudoConditionVariableTest, LinuxCVWaitAndNotifyAll) {
-  simpleWaitAndNotifyAll<scudo::ConditionVariableLinux>();
-}
-#endif
diff --git a/Telegram/ThirdParty/scudo/tests/flags_test.cpp b/Telegram/ThirdParty/scudo/tests/flags_test.cpp
deleted file mode 100644
index 0205052ed..000000000
--- a/Telegram/ThirdParty/scudo/tests/flags_test.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//===-- flags_test.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "flags.h"
-#include "flags_parser.h"
-
-#include <string.h>
-
-static const char FlagName[] = "flag_name";
-static const char FlagDesc[] = "flag description";
-
-template <typename T>
-static void testFlag(scudo::FlagType Type, T StartValue, const char *Env,
-                     T FinalValue) {
-  scudo::FlagParser Parser;
-  T Flag = StartValue;
-  Parser.registerFlag(FlagName, FlagDesc, Type, &Flag);
-  Parser.parseString(Env);
-  EXPECT_EQ(FinalValue, Flag);
-  // Reporting unrecognized flags is needed to reset them.
-  scudo::reportUnrecognizedFlags();
-}
-
-TEST(ScudoFlagsTest, BooleanFlags) {
-  testFlag(scudo::FlagType::FT_bool, false, "flag_name=1", true);
-  testFlag(scudo::FlagType::FT_bool, false, "flag_name=yes", true);
-  testFlag(scudo::FlagType::FT_bool, false, "flag_name='yes'", true);
-  testFlag(scudo::FlagType::FT_bool, false, "flag_name=true", true);
-  testFlag(scudo::FlagType::FT_bool, true, "flag_name=0", false);
-  testFlag(scudo::FlagType::FT_bool, true, "flag_name=\"0\"", false);
-  testFlag(scudo::FlagType::FT_bool, true, "flag_name=no", false);
-  testFlag(scudo::FlagType::FT_bool, true, "flag_name=false", false);
-  testFlag(scudo::FlagType::FT_bool, true, "flag_name='false'", false);
-}
-
-TEST(ScudoFlagsDeathTest, BooleanFlags) {
-  EXPECT_DEATH(testFlag(scudo::FlagType::FT_bool, false, "flag_name", true),
-               "expected '='");
-  EXPECT_DEATH(testFlag(scudo::FlagType::FT_bool, false, "flag_name=", true),
-               "invalid value for bool option: ''");
-  EXPECT_DEATH(testFlag(scudo::FlagType::FT_bool, false, "flag_name=2", true),
-               "invalid value for bool option: '2'");
-  EXPECT_DEATH(testFlag(scudo::FlagType::FT_bool, false, "flag_name=-1", true),
-               "invalid value for bool option: '-1'");
-  EXPECT_DEATH(testFlag(scudo::FlagType::FT_bool, false, "flag_name=on", true),
-               "invalid value for bool option: 'on'");
-}
-
-TEST(ScudoFlagsTest, IntFlags) {
-  testFlag(scudo::FlagType::FT_int, -11, nullptr, -11);
-  testFlag(scudo::FlagType::FT_int, -11, "flag_name=0", 0);
-  testFlag(scudo::FlagType::FT_int, -11, "flag_name='0'", 0);
-  testFlag(scudo::FlagType::FT_int, -11, "flag_name=42", 42);
-  testFlag(scudo::FlagType::FT_int, -11, "flag_name=-42", -42);
-  testFlag(scudo::FlagType::FT_int, -11, "flag_name=\"-42\"", -42);
-
-  // Unrecognized flags are ignored.
-  testFlag(scudo::FlagType::FT_int, -11, "--flag_name=42", -11);
-  testFlag(scudo::FlagType::FT_int, -11, "zzzzzzz=42", -11);
-}
-
-TEST(ScudoFlagsDeathTest, IntFlags) {
-  EXPECT_DEATH(testFlag(scudo::FlagType::FT_int, -11, "flag_name", 0),
-               "expected '='");
-  EXPECT_DEATH(testFlag(scudo::FlagType::FT_int, -11, "flag_name=42U", 0),
-               "invalid value for int option");
-}
-
-static void testTwoFlags(const char *Env, bool ExpectedFlag1,
-                         const int ExpectedFlag2, const char *Name1 = "flag1",
-                         const char *Name2 = "flag2") {
-  scudo::FlagParser Parser;
-  bool Flag1 = !ExpectedFlag1;
-  int Flag2;
-  Parser.registerFlag(Name1, FlagDesc, scudo::FlagType::FT_bool, &Flag1);
-  Parser.registerFlag(Name2, FlagDesc, scudo::FlagType::FT_int, &Flag2);
-  Parser.parseString(Env);
-  EXPECT_EQ(ExpectedFlag1, Flag1);
-  EXPECT_EQ(Flag2, ExpectedFlag2);
-  // Reporting unrecognized flags is needed to reset them.
-  scudo::reportUnrecognizedFlags();
-}
-
-TEST(ScudoFlagsTest, MultipleFlags) {
-  testTwoFlags("flag1=1 flag2=42", true, 42);
-  testTwoFlags("flag2=-1 flag1=0", false, -1);
-  testTwoFlags("flag1=false:flag2=1337", false, 1337);
-  testTwoFlags("flag2=42:flag1=yes", true, 42);
-  testTwoFlags("flag2=42\nflag1=yes", true, 42);
-  testTwoFlags("flag2=42\r\nflag1=yes", true, 42);
-  testTwoFlags("flag2=42\tflag1=yes", true, 42);
-}
-
-TEST(ScudoFlagsTest, CommonSuffixFlags) {
-  testTwoFlags("flag=1 other_flag=42", true, 42, "flag", "other_flag");
-  testTwoFlags("other_flag=42 flag=1", true, 42, "flag", "other_flag");
-}
-
-TEST(ScudoFlagsTest, AllocatorFlags) {
-  scudo::FlagParser Parser;
-  scudo::Flags Flags;
-  scudo::registerFlags(&Parser, &Flags);
-  Flags.setDefaults();
-  Flags.dealloc_type_mismatch = false;
-  Flags.delete_size_mismatch = false;
-  Flags.quarantine_max_chunk_size = 1024;
-  Parser.parseString("dealloc_type_mismatch=true:delete_size_mismatch=true:"
-                     "quarantine_max_chunk_size=2048");
-  EXPECT_TRUE(Flags.dealloc_type_mismatch);
-  EXPECT_TRUE(Flags.delete_size_mismatch);
-  EXPECT_EQ(2048, Flags.quarantine_max_chunk_size);
-}
-
-#ifdef GWP_ASAN_HOOKS
-TEST(ScudoFlagsTest, GWPASanFlags) {
-  scudo::FlagParser Parser;
-  scudo::Flags Flags;
-  scudo::registerFlags(&Parser, &Flags);
-  Flags.setDefaults();
-  Flags.GWP_ASAN_Enabled = false;
-  Parser.parseString("GWP_ASAN_Enabled=true:GWP_ASAN_SampleRate=1:"
-                     "GWP_ASAN_InstallSignalHandlers=false");
-  EXPECT_TRUE(Flags.GWP_ASAN_Enabled);
-  EXPECT_FALSE(Flags.GWP_ASAN_InstallSignalHandlers);
-  EXPECT_EQ(1, Flags.GWP_ASAN_SampleRate);
-}
-#endif // GWP_ASAN_HOOKS
diff --git a/Telegram/ThirdParty/scudo/tests/list_test.cpp b/Telegram/ThirdParty/scudo/tests/list_test.cpp
deleted file mode 100644
index 140ca027a..000000000
--- a/Telegram/ThirdParty/scudo/tests/list_test.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-//===-- list_test.cpp -------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "list.h"
-
-struct ListItem {
-  ListItem *Next;
-  ListItem *Prev;
-};
-
-static ListItem Items[6];
-static ListItem *X = &Items[0];
-static ListItem *Y = &Items[1];
-static ListItem *Z = &Items[2];
-static ListItem *A = &Items[3];
-static ListItem *B = &Items[4];
-static ListItem *C = &Items[5];
-
-typedef scudo::SinglyLinkedList<ListItem> SLList;
-typedef scudo::DoublyLinkedList<ListItem> DLList;
-
-template <typename ListT>
-static void setList(ListT *L, ListItem *I1 = nullptr, ListItem *I2 = nullptr,
-                    ListItem *I3 = nullptr) {
-  L->clear();
-  if (I1)
-    L->push_back(I1);
-  if (I2)
-    L->push_back(I2);
-  if (I3)
-    L->push_back(I3);
-}
-
-template <typename ListT>
-static void checkList(ListT *L, ListItem *I1, ListItem *I2 = nullptr,
-                      ListItem *I3 = nullptr, ListItem *I4 = nullptr,
-                      ListItem *I5 = nullptr, ListItem *I6 = nullptr) {
-  if (I1) {
-    EXPECT_EQ(L->front(), I1);
-    L->pop_front();
-  }
-  if (I2) {
-    EXPECT_EQ(L->front(), I2);
-    L->pop_front();
-  }
-  if (I3) {
-    EXPECT_EQ(L->front(), I3);
-    L->pop_front();
-  }
-  if (I4) {
-    EXPECT_EQ(L->front(), I4);
-    L->pop_front();
-  }
-  if (I5) {
-    EXPECT_EQ(L->front(), I5);
-    L->pop_front();
-  }
-  if (I6) {
-    EXPECT_EQ(L->front(), I6);
-    L->pop_front();
-  }
-  EXPECT_TRUE(L->empty());
-}
-
-template <typename ListT> static void testListCommon(void) {
-  ListT L;
-  L.clear();
-
-  EXPECT_EQ(L.size(), 0U);
-  L.push_back(X);
-  EXPECT_EQ(L.size(), 1U);
-  EXPECT_EQ(L.back(), X);
-  EXPECT_EQ(L.front(), X);
-  L.pop_front();
-  EXPECT_TRUE(L.empty());
-  L.checkConsistency();
-
-  L.push_front(X);
-  EXPECT_EQ(L.size(), 1U);
-  EXPECT_EQ(L.back(), X);
-  EXPECT_EQ(L.front(), X);
-  L.pop_front();
-  EXPECT_TRUE(L.empty());
-  L.checkConsistency();
-
-  L.push_front(X);
-  L.push_front(Y);
-  L.push_front(Z);
-  EXPECT_EQ(L.size(), 3U);
-  EXPECT_EQ(L.front(), Z);
-  EXPECT_EQ(L.back(), X);
-  L.checkConsistency();
-
-  L.pop_front();
-  EXPECT_EQ(L.size(), 2U);
-  EXPECT_EQ(L.front(), Y);
-  EXPECT_EQ(L.back(), X);
-  L.pop_front();
-  L.pop_front();
-  EXPECT_TRUE(L.empty());
-  L.checkConsistency();
-
-  L.push_back(X);
-  L.push_back(Y);
-  L.push_back(Z);
-  EXPECT_EQ(L.size(), 3U);
-  EXPECT_EQ(L.front(), X);
-  EXPECT_EQ(L.back(), Z);
-  L.checkConsistency();
-
-  L.pop_front();
-  EXPECT_EQ(L.size(), 2U);
-  EXPECT_EQ(L.front(), Y);
-  EXPECT_EQ(L.back(), Z);
-  L.pop_front();
-  L.pop_front();
-  EXPECT_TRUE(L.empty());
-  L.checkConsistency();
-}
-
-TEST(ScudoListTest, LinkedListCommon) {
-  testListCommon<SLList>();
-  testListCommon<DLList>();
-}
-
-TEST(ScudoListTest, SinglyLinkedList) {
-  SLList L;
-  L.clear();
-
-  L.push_back(X);
-  L.push_back(Y);
-  L.push_back(Z);
-  L.extract(X, Y);
-  EXPECT_EQ(L.size(), 2U);
-  EXPECT_EQ(L.front(), X);
-  EXPECT_EQ(L.back(), Z);
-  L.checkConsistency();
-  L.extract(X, Z);
-  EXPECT_EQ(L.size(), 1U);
-  EXPECT_EQ(L.front(), X);
-  EXPECT_EQ(L.back(), X);
-  L.checkConsistency();
-  L.pop_front();
-  EXPECT_TRUE(L.empty());
-
-  SLList L1, L2;
-  L1.clear();
-  L2.clear();
-
-  L1.append_back(&L2);
-  EXPECT_TRUE(L1.empty());
-  EXPECT_TRUE(L2.empty());
-
-  setList(&L1, X);
-  checkList(&L1, X);
-
-  setList(&L1, X, Y);
-  L1.insert(X, Z);
-  checkList(&L1, X, Z, Y);
-
-  setList(&L1, X, Y, Z);
-  setList(&L2, A, B, C);
-  L1.append_back(&L2);
-  checkList(&L1, X, Y, Z, A, B, C);
-  EXPECT_TRUE(L2.empty());
-
-  L1.clear();
-  L2.clear();
-  L1.push_back(X);
-  L1.append_back(&L2);
-  EXPECT_EQ(L1.back(), X);
-  EXPECT_EQ(L1.front(), X);
-  EXPECT_EQ(L1.size(), 1U);
-}
-
-TEST(ScudoListTest, DoublyLinkedList) {
-  DLList L;
-  L.clear();
-
-  L.push_back(X);
-  L.push_back(Y);
-  L.push_back(Z);
-  L.remove(Y);
-  EXPECT_EQ(L.size(), 2U);
-  EXPECT_EQ(L.front(), X);
-  EXPECT_EQ(L.back(), Z);
-  L.checkConsistency();
-  L.remove(Z);
-  EXPECT_EQ(L.size(), 1U);
-  EXPECT_EQ(L.front(), X);
-  EXPECT_EQ(L.back(), X);
-  L.checkConsistency();
-  L.pop_front();
-  EXPECT_TRUE(L.empty());
-
-  L.push_back(X);
-  L.insert(Y, X);
-  EXPECT_EQ(L.size(), 2U);
-  EXPECT_EQ(L.front(), Y);
-  EXPECT_EQ(L.back(), X);
-  L.checkConsistency();
-  L.remove(Y);
-  EXPECT_EQ(L.size(), 1U);
-  EXPECT_EQ(L.front(), X);
-  EXPECT_EQ(L.back(), X);
-  L.checkConsistency();
-  L.pop_front();
-  EXPECT_TRUE(L.empty());
-}
diff --git a/Telegram/ThirdParty/scudo/tests/map_test.cpp b/Telegram/ThirdParty/scudo/tests/map_test.cpp
deleted file mode 100644
index 06a56f848..000000000
--- a/Telegram/ThirdParty/scudo/tests/map_test.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//===-- map_test.cpp --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "common.h"
-#include "mem_map.h"
-
-#include <string.h>
-#include <unistd.h>
-
-static const char *MappingName = "scudo:test";
-
-TEST(ScudoMapTest, PageSize) {
-  EXPECT_EQ(scudo::getPageSizeCached(),
-            static_cast<scudo::uptr>(sysconf(_SC_PAGESIZE)));
-}
-
-TEST(ScudoMapDeathTest, MapNoAccessUnmap) {
-  const scudo::uptr Size = 4 * scudo::getPageSizeCached();
-  scudo::ReservedMemoryT ReservedMemory;
-
-  ASSERT_TRUE(ReservedMemory.create(/*Addr=*/0U, Size, MappingName));
-  EXPECT_NE(ReservedMemory.getBase(), 0U);
-  EXPECT_DEATH(
-      memset(reinterpret_cast<void *>(ReservedMemory.getBase()), 0xaa, Size),
-      "");
-
-  ReservedMemory.release();
-}
-
-TEST(ScudoMapDeathTest, MapUnmap) {
-  const scudo::uptr Size = 4 * scudo::getPageSizeCached();
-  EXPECT_DEATH(
-      {
-        // Repeat few time to avoid missing crash if it's mmaped by unrelated
-        // code.
-        for (int i = 0; i < 10; ++i) {
-          scudo::MemMapT MemMap;
-          MemMap.map(/*Addr=*/0U, Size, MappingName);
-          scudo::uptr P = MemMap.getBase();
-          if (P == 0U)
-            continue;
-          MemMap.unmap(MemMap.getBase(), Size);
-          memset(reinterpret_cast<void *>(P), 0xbb, Size);
-        }
-      },
-      "");
-}
-
-TEST(ScudoMapDeathTest, MapWithGuardUnmap) {
-  const scudo::uptr PageSize = scudo::getPageSizeCached();
-  const scudo::uptr Size = 4 * PageSize;
-  scudo::ReservedMemoryT ReservedMemory;
-  ASSERT_TRUE(
-      ReservedMemory.create(/*Addr=*/0U, Size + 2 * PageSize, MappingName));
-  ASSERT_NE(ReservedMemory.getBase(), 0U);
-
-  scudo::MemMapT MemMap =
-      ReservedMemory.dispatch(ReservedMemory.getBase(), Size + 2 * PageSize);
-  ASSERT_TRUE(MemMap.isAllocated());
-  scudo::uptr Q = MemMap.getBase() + PageSize;
-  ASSERT_TRUE(MemMap.remap(Q, Size, MappingName));
-  memset(reinterpret_cast<void *>(Q), 0xaa, Size);
-  EXPECT_DEATH(memset(reinterpret_cast<void *>(Q), 0xaa, Size + 1), "");
-  MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
-}
-
-TEST(ScudoMapTest, MapGrowUnmap) {
-  const scudo::uptr PageSize = scudo::getPageSizeCached();
-  const scudo::uptr Size = 4 * PageSize;
-  scudo::ReservedMemoryT ReservedMemory;
-  ReservedMemory.create(/*Addr=*/0U, Size, MappingName);
-  ASSERT_TRUE(ReservedMemory.isCreated());
-
-  scudo::MemMapT MemMap =
-      ReservedMemory.dispatch(ReservedMemory.getBase(), Size);
-  ASSERT_TRUE(MemMap.isAllocated());
-  scudo::uptr Q = MemMap.getBase() + PageSize;
-  ASSERT_TRUE(MemMap.remap(Q, PageSize, MappingName));
-  memset(reinterpret_cast<void *>(Q), 0xaa, PageSize);
-  Q += PageSize;
-  ASSERT_TRUE(MemMap.remap(Q, PageSize, MappingName));
-  memset(reinterpret_cast<void *>(Q), 0xbb, PageSize);
-  MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
-}
diff --git a/Telegram/ThirdParty/scudo/tests/memtag_test.cpp b/Telegram/ThirdParty/scudo/tests/memtag_test.cpp
deleted file mode 100644
index fd277f962..000000000
--- a/Telegram/ThirdParty/scudo/tests/memtag_test.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-//===-- memtag_test.cpp -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "common.h"
-#include "mem_map.h"
-#include "memtag.h"
-#include "platform.h"
-#include "tests/scudo_unit_test.h"
-
-#if SCUDO_LINUX
-namespace scudo {
-
-TEST(MemtagBasicDeathTest, Unsupported) {
-  if (archSupportsMemoryTagging())
-    GTEST_SKIP();
-
-  EXPECT_DEATH(archMemoryTagGranuleSize(), "not supported");
-  EXPECT_DEATH(untagPointer((uptr)0), "not supported");
-  EXPECT_DEATH(extractTag((uptr)0), "not supported");
-
-  EXPECT_DEATH(systemSupportsMemoryTagging(), "not supported");
-  EXPECT_DEATH(systemDetectsMemoryTagFaultsTestOnly(), "not supported");
-  EXPECT_DEATH(enableSystemMemoryTaggingTestOnly(), "not supported");
-
-  EXPECT_DEATH(selectRandomTag((uptr)0, 0), "not supported");
-  EXPECT_DEATH(addFixedTag((uptr)0, 1), "not supported");
-  EXPECT_DEATH(storeTags((uptr)0, (uptr)0 + sizeof(0)), "not supported");
-  EXPECT_DEATH(storeTag((uptr)0), "not supported");
-  EXPECT_DEATH(loadTag((uptr)0), "not supported");
-
-  EXPECT_DEATH(setRandomTag(nullptr, 64, 0, nullptr, nullptr), "not supported");
-  EXPECT_DEATH(untagPointer(nullptr), "not supported");
-  EXPECT_DEATH(loadTag(nullptr), "not supported");
-  EXPECT_DEATH(addFixedTag(nullptr, 0), "not supported");
-}
-
-class MemtagTest : public Test {
-protected:
-  void SetUp() override {
-    if (!archSupportsMemoryTagging() || !systemDetectsMemoryTagFaultsTestOnly())
-      GTEST_SKIP() << "Memory tagging is not supported";
-
-    BufferSize = getPageSizeCached();
-    ASSERT_FALSE(MemMap.isAllocated());
-    ASSERT_TRUE(MemMap.map(/*Addr=*/0U, BufferSize, "MemtagTest", MAP_MEMTAG));
-    ASSERT_NE(MemMap.getBase(), 0U);
-    Addr = MemMap.getBase();
-    Buffer = reinterpret_cast<u8 *>(Addr);
-    EXPECT_TRUE(isAligned(Addr, archMemoryTagGranuleSize()));
-    EXPECT_EQ(Addr, untagPointer(Addr));
-  }
-
-  void TearDown() override {
-    if (Buffer) {
-      ASSERT_TRUE(MemMap.isAllocated());
-      MemMap.unmap(MemMap.getBase(), MemMap.getCapacity());
-    }
-  }
-
-  uptr BufferSize = 0;
-  scudo::MemMapT MemMap = {};
-  u8 *Buffer = nullptr;
-  uptr Addr = 0;
-};
-
-using MemtagDeathTest = MemtagTest;
-
-TEST_F(MemtagTest, ArchMemoryTagGranuleSize) {
-  EXPECT_GT(archMemoryTagGranuleSize(), 1u);
-  EXPECT_TRUE(isPowerOfTwo(archMemoryTagGranuleSize()));
-}
-
-TEST_F(MemtagTest, ExtractTag) {
-// The test is already skipped on anything other than 64 bit. But
-// compiling on 32 bit leads to warnings/errors, so skip compiling the test.
-#if defined(__LP64__)
-  uptr Tags = 0;
-  // Try all value for the top byte and check the tags values are in the
-  // expected range.
-  for (u64 Top = 0; Top < 0x100; ++Top)
-    Tags = Tags | (1u << extractTag(Addr | (Top << 56)));
-  EXPECT_EQ(0xffffull, Tags);
-#endif
-}
-
-TEST_F(MemtagDeathTest, AddFixedTag) {
-  for (uptr Tag = 0; Tag < 0x10; ++Tag)
-    EXPECT_EQ(Tag, extractTag(addFixedTag(Addr, Tag)));
-  if (SCUDO_DEBUG) {
-    EXPECT_DEATH(addFixedTag(Addr, 16), "");
-    EXPECT_DEATH(addFixedTag(~Addr, 0), "");
-  }
-}
-
-TEST_F(MemtagTest, UntagPointer) {
-  uptr UnTagMask = untagPointer(~uptr(0));
-  for (u64 Top = 0; Top < 0x100; ++Top) {
-    uptr Ptr = (Addr | (Top << 56)) & UnTagMask;
-    EXPECT_EQ(addFixedTag(Ptr, 0), untagPointer(Ptr));
-  }
-}
-
-TEST_F(MemtagDeathTest, ScopedDisableMemoryTagChecks) {
-  u8 *P = reinterpret_cast<u8 *>(addFixedTag(Addr, 1));
-  EXPECT_NE(P, Buffer);
-
-  EXPECT_DEATH(*P = 20, "");
-  ScopedDisableMemoryTagChecks Disable;
-  *P = 10;
-}
-
-TEST_F(MemtagTest, SelectRandomTag) {
-  for (uptr SrcTag = 0; SrcTag < 0x10; ++SrcTag) {
-    uptr Ptr = addFixedTag(Addr, SrcTag);
-    uptr Tags = 0;
-    for (uptr I = 0; I < 100000; ++I)
-      Tags = Tags | (1u << extractTag(selectRandomTag(Ptr, 0)));
-    // std::popcnt is C++20
-    int PopCnt = 0;
-    while (Tags) {
-      PopCnt += Tags & 1;
-      Tags >>= 1;
-    }
-    // Random tags are not always very random, and this test is not about PRNG
-    // quality.  Anything above half would be satisfactory.
-    EXPECT_GE(PopCnt, 8);
-  }
-}
-
-TEST_F(MemtagTest, SelectRandomTagWithMask) {
-// The test is already skipped on anything other than 64 bit. But
-// compiling on 32 bit leads to warnings/errors, so skip compiling the test.
-#if defined(__LP64__)
-  for (uptr j = 0; j < 32; ++j) {
-    for (uptr i = 0; i < 1000; ++i)
-      EXPECT_NE(j, extractTag(selectRandomTag(Addr, 1ull << j)));
-  }
-#endif
-}
-
-TEST_F(MemtagDeathTest, SKIP_NO_DEBUG(LoadStoreTagUnaligned)) {
-  for (uptr P = Addr; P < Addr + 4 * archMemoryTagGranuleSize(); ++P) {
-    if (P % archMemoryTagGranuleSize() == 0)
-      continue;
-    EXPECT_DEATH(loadTag(P), "");
-    EXPECT_DEATH(storeTag(P), "");
-  }
-}
-
-TEST_F(MemtagTest, LoadStoreTag) {
-  uptr Base = Addr + 0x100;
-  uptr Tagged = addFixedTag(Base, 7);
-  storeTag(Tagged);
-
-  EXPECT_EQ(Base - archMemoryTagGranuleSize(),
-            loadTag(Base - archMemoryTagGranuleSize()));
-  EXPECT_EQ(Tagged, loadTag(Base));
-  EXPECT_EQ(Base + archMemoryTagGranuleSize(),
-            loadTag(Base + archMemoryTagGranuleSize()));
-}
-
-TEST_F(MemtagDeathTest, SKIP_NO_DEBUG(StoreTagsUnaligned)) {
-  for (uptr P = Addr; P < Addr + 4 * archMemoryTagGranuleSize(); ++P) {
-    uptr Tagged = addFixedTag(P, 5);
-    if (Tagged % archMemoryTagGranuleSize() == 0)
-      continue;
-    EXPECT_DEATH(storeTags(Tagged, Tagged), "");
-  }
-}
-
-TEST_F(MemtagTest, StoreTags) {
-// The test is already skipped on anything other than 64 bit. But
-// compiling on 32 bit leads to warnings/errors, so skip compiling the test.
-#if defined(__LP64__)
-  const uptr MaxTaggedSize = 4 * archMemoryTagGranuleSize();
-  for (uptr Size = 0; Size <= MaxTaggedSize; ++Size) {
-    uptr NoTagBegin = Addr + archMemoryTagGranuleSize();
-    uptr NoTagEnd = NoTagBegin + Size;
-
-    u8 Tag = 5;
-
-    uptr TaggedBegin = addFixedTag(NoTagBegin, Tag);
-    uptr TaggedEnd = addFixedTag(NoTagEnd, Tag);
-
-    EXPECT_EQ(roundUp(TaggedEnd, archMemoryTagGranuleSize()),
-              storeTags(TaggedBegin, TaggedEnd));
-
-    uptr LoadPtr = Addr;
-    // Untagged left granule.
-    EXPECT_EQ(LoadPtr, loadTag(LoadPtr));
-
-    for (LoadPtr += archMemoryTagGranuleSize(); LoadPtr < NoTagEnd;
-         LoadPtr += archMemoryTagGranuleSize()) {
-      EXPECT_EQ(addFixedTag(LoadPtr, 5), loadTag(LoadPtr));
-    }
-
-    // Untagged right granule.
-    EXPECT_EQ(LoadPtr, loadTag(LoadPtr));
-
-    // Reset tags without using StoreTags.
-    MemMap.releasePagesToOS(Addr, BufferSize);
-  }
-#endif
-}
-
-} // namespace scudo
-
-#endif
diff --git a/Telegram/ThirdParty/scudo/tests/mutex_test.cpp b/Telegram/ThirdParty/scudo/tests/mutex_test.cpp
deleted file mode 100644
index c3efeab82..000000000
--- a/Telegram/ThirdParty/scudo/tests/mutex_test.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//===-- mutex_test.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "mutex.h"
-
-#include <pthread.h>
-#include <string.h>
-
-class TestData {
-public:
-  explicit TestData(scudo::HybridMutex &M) : Mutex(M) {
-    for (scudo::u32 I = 0; I < Size; I++)
-      Data[I] = 0;
-  }
-
-  void write() {
-    scudo::ScopedLock L(Mutex);
-    T V0 = Data[0];
-    for (scudo::u32 I = 0; I < Size; I++) {
-      EXPECT_EQ(Data[I], V0);
-      Data[I]++;
-    }
-  }
-
-  void tryWrite() {
-    if (!Mutex.tryLock())
-      return;
-    T V0 = Data[0];
-    for (scudo::u32 I = 0; I < Size; I++) {
-      EXPECT_EQ(Data[I], V0);
-      Data[I]++;
-    }
-    Mutex.unlock();
-  }
-
-  void backoff() {
-    volatile T LocalData[Size] = {};
-    for (scudo::u32 I = 0; I < Size; I++) {
-      LocalData[I] = LocalData[I] + 1;
-      EXPECT_EQ(LocalData[I], 1U);
-    }
-  }
-
-private:
-  static const scudo::u32 Size = 64U;
-  typedef scudo::u64 T;
-  scudo::HybridMutex &Mutex;
-  alignas(SCUDO_CACHE_LINE_SIZE) T Data[Size];
-};
-
-const scudo::u32 NumberOfThreads = 8;
-#if SCUDO_DEBUG
-const scudo::u32 NumberOfIterations = 4 * 1024;
-#else
-const scudo::u32 NumberOfIterations = 16 * 1024;
-#endif
-
-static void *lockThread(void *Param) {
-  TestData *Data = reinterpret_cast<TestData *>(Param);
-  for (scudo::u32 I = 0; I < NumberOfIterations; I++) {
-    Data->write();
-    Data->backoff();
-  }
-  return 0;
-}
-
-static void *tryThread(void *Param) {
-  TestData *Data = reinterpret_cast<TestData *>(Param);
-  for (scudo::u32 I = 0; I < NumberOfIterations; I++) {
-    Data->tryWrite();
-    Data->backoff();
-  }
-  return 0;
-}
-
-TEST(ScudoMutexTest, Mutex) {
-  scudo::HybridMutex M;
-  TestData Data(M);
-  pthread_t Threads[NumberOfThreads];
-  for (scudo::u32 I = 0; I < NumberOfThreads; I++)
-    pthread_create(&Threads[I], 0, lockThread, &Data);
-  for (scudo::u32 I = 0; I < NumberOfThreads; I++)
-    pthread_join(Threads[I], 0);
-}
-
-TEST(ScudoMutexTest, MutexTry) {
-  scudo::HybridMutex M;
-  TestData Data(M);
-  pthread_t Threads[NumberOfThreads];
-  for (scudo::u32 I = 0; I < NumberOfThreads; I++)
-    pthread_create(&Threads[I], 0, tryThread, &Data);
-  for (scudo::u32 I = 0; I < NumberOfThreads; I++)
-    pthread_join(Threads[I], 0);
-}
-
-TEST(ScudoMutexTest, MutexAssertHeld) {
-  scudo::HybridMutex M;
-  M.lock();
-  M.assertHeld();
-  M.unlock();
-}
diff --git a/Telegram/ThirdParty/scudo/tests/primary_test.cpp b/Telegram/ThirdParty/scudo/tests/primary_test.cpp
deleted file mode 100644
index 181715117..000000000
--- a/Telegram/ThirdParty/scudo/tests/primary_test.cpp
+++ /dev/null
@@ -1,441 +0,0 @@
-//===-- primary_test.cpp ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "allocator_config.h"
-#include "condition_variable.h"
-#include "primary32.h"
-#include "primary64.h"
-#include "size_class_map.h"
-
-#include <algorithm>
-#include <chrono>
-#include <condition_variable>
-#include <mutex>
-#include <random>
-#include <stdlib.h>
-#include <thread>
-#include <vector>
-
-// Note that with small enough regions, the SizeClassAllocator64 also works on
-// 32-bit architectures. It's not something we want to encourage, but we still
-// should ensure the tests pass.
-
-template <typename SizeClassMapT> struct TestConfig1 {
-  static const bool MaySupportMemoryTagging = false;
-
-  struct Primary {
-    using SizeClassMap = SizeClassMapT;
-    static const scudo::uptr RegionSizeLog = 18U;
-    static const scudo::uptr GroupSizeLog = 18U;
-    static const scudo::s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const scudo::s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-    typedef scudo::uptr CompactPtrT;
-    static const scudo::uptr CompactPtrScale = 0;
-    static const bool EnableRandomOffset = true;
-    static const scudo::uptr MapSizeIncrement = 1UL << 18;
-  };
-};
-
-template <typename SizeClassMapT> struct TestConfig2 {
-  static const bool MaySupportMemoryTagging = false;
-
-  struct Primary {
-    using SizeClassMap = SizeClassMapT;
-#if defined(__mips__)
-    // Unable to allocate greater size on QEMU-user.
-    static const scudo::uptr RegionSizeLog = 23U;
-#else
-    static const scudo::uptr RegionSizeLog = 24U;
-#endif
-    static const scudo::uptr GroupSizeLog = 20U;
-    static const scudo::s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const scudo::s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-    typedef scudo::uptr CompactPtrT;
-    static const scudo::uptr CompactPtrScale = 0;
-    static const bool EnableRandomOffset = true;
-    static const scudo::uptr MapSizeIncrement = 1UL << 18;
-  };
-};
-
-template <typename SizeClassMapT> struct TestConfig3 {
-  static const bool MaySupportMemoryTagging = true;
-
-  struct Primary {
-    using SizeClassMap = SizeClassMapT;
-#if defined(__mips__)
-    // Unable to allocate greater size on QEMU-user.
-    static const scudo::uptr RegionSizeLog = 23U;
-#else
-    static const scudo::uptr RegionSizeLog = 24U;
-#endif
-    static const scudo::uptr GroupSizeLog = 20U;
-    static const scudo::s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const scudo::s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-    typedef scudo::uptr CompactPtrT;
-    static const scudo::uptr CompactPtrScale = 0;
-    static const bool EnableRandomOffset = true;
-    static const scudo::uptr MapSizeIncrement = 1UL << 18;
-  };
-};
-
-template <typename SizeClassMapT> struct TestConfig4 {
-  static const bool MaySupportMemoryTagging = true;
-
-  struct Primary {
-    using SizeClassMap = SizeClassMapT;
-#if defined(__mips__)
-    // Unable to allocate greater size on QEMU-user.
-    static const scudo::uptr RegionSizeLog = 23U;
-#else
-    static const scudo::uptr RegionSizeLog = 24U;
-#endif
-    static const scudo::s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const scudo::s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-    static const scudo::uptr CompactPtrScale = 3U;
-    static const scudo::uptr GroupSizeLog = 20U;
-    typedef scudo::u32 CompactPtrT;
-    static const bool EnableRandomOffset = true;
-    static const scudo::uptr MapSizeIncrement = 1UL << 18;
-  };
-};
-
-// This is the only test config that enables the condition variable.
-template <typename SizeClassMapT> struct TestConfig5 {
-  static const bool MaySupportMemoryTagging = true;
-
-  struct Primary {
-    using SizeClassMap = SizeClassMapT;
-#if defined(__mips__)
-    // Unable to allocate greater size on QEMU-user.
-    static const scudo::uptr RegionSizeLog = 23U;
-#else
-    static const scudo::uptr RegionSizeLog = 24U;
-#endif
-    static const scudo::s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const scudo::s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-    static const scudo::uptr CompactPtrScale = SCUDO_MIN_ALIGNMENT_LOG;
-    static const scudo::uptr GroupSizeLog = 18U;
-    typedef scudo::u32 CompactPtrT;
-    static const bool EnableRandomOffset = true;
-    static const scudo::uptr MapSizeIncrement = 1UL << 18;
-    static const bool UseConditionVariable = true;
-#if SCUDO_LINUX
-    using ConditionVariableT = scudo::ConditionVariableLinux;
-#else
-    using ConditionVariableT = scudo::ConditionVariableDummy;
-#endif
-  };
-};
-
-template <template <typename> class BaseConfig, typename SizeClassMapT>
-struct Config : public BaseConfig<SizeClassMapT> {};
-
-template <template <typename> class BaseConfig, typename SizeClassMapT>
-struct SizeClassAllocator
-    : public scudo::SizeClassAllocator64<Config<BaseConfig, SizeClassMapT>> {};
-template <typename SizeClassMapT>
-struct SizeClassAllocator<TestConfig1, SizeClassMapT>
-    : public scudo::SizeClassAllocator32<Config<TestConfig1, SizeClassMapT>> {};
-
-template <template <typename> class BaseConfig, typename SizeClassMapT>
-struct TestAllocator : public SizeClassAllocator<BaseConfig, SizeClassMapT> {
-  ~TestAllocator() {
-    this->verifyAllBlocksAreReleasedTestOnly();
-    this->unmapTestOnly();
-  }
-
-  void *operator new(size_t size) {
-    void *p = nullptr;
-    EXPECT_EQ(0, posix_memalign(&p, alignof(TestAllocator), size));
-    return p;
-  }
-
-  void operator delete(void *ptr) { free(ptr); }
-};
-
-template <template <typename> class BaseConfig>
-struct ScudoPrimaryTest : public Test {};
-
-#if SCUDO_FUCHSIA
-#define SCUDO_TYPED_TEST_ALL_TYPES(FIXTURE, NAME)                              \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig2)                            \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig3)
-#else
-#define SCUDO_TYPED_TEST_ALL_TYPES(FIXTURE, NAME)                              \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig1)                            \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig2)                            \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig3)                            \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig4)                            \
-  SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TestConfig5)
-#endif
-
-#define SCUDO_TYPED_TEST_TYPE(FIXTURE, NAME, TYPE)                             \
-  using FIXTURE##NAME##_##TYPE = FIXTURE##NAME<TYPE>;                          \
-  TEST_F(FIXTURE##NAME##_##TYPE, NAME) { FIXTURE##NAME<TYPE>::Run(); }
-
-#define SCUDO_TYPED_TEST(FIXTURE, NAME)                                        \
-  template <template <typename> class TypeParam>                               \
-  struct FIXTURE##NAME : public FIXTURE<TypeParam> {                           \
-    void Run();                                                                \
-  };                                                                           \
-  SCUDO_TYPED_TEST_ALL_TYPES(FIXTURE, NAME)                                    \
-  template <template <typename> class TypeParam>                               \
-  void FIXTURE##NAME<TypeParam>::Run()
-
-SCUDO_TYPED_TEST(ScudoPrimaryTest, BasicPrimary) {
-  using Primary = TestAllocator<TypeParam, scudo::DefaultSizeClassMap>;
-  std::unique_ptr<Primary> Allocator(new Primary);
-  Allocator->init(/*ReleaseToOsInterval=*/-1);
-  typename Primary::CacheT Cache;
-  Cache.init(nullptr, Allocator.get());
-  const scudo::uptr NumberOfAllocations = 32U;
-  for (scudo::uptr I = 0; I <= 16U; I++) {
-    const scudo::uptr Size = 1UL << I;
-    if (!Primary::canAllocate(Size))
-      continue;
-    const scudo::uptr ClassId = Primary::SizeClassMap::getClassIdBySize(Size);
-    void *Pointers[NumberOfAllocations];
-    for (scudo::uptr J = 0; J < NumberOfAllocations; J++) {
-      void *P = Cache.allocate(ClassId);
-      memset(P, 'B', Size);
-      Pointers[J] = P;
-    }
-    for (scudo::uptr J = 0; J < NumberOfAllocations; J++)
-      Cache.deallocate(ClassId, Pointers[J]);
-  }
-  Cache.destroy(nullptr);
-  Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-  scudo::ScopedString Str;
-  Allocator->getStats(&Str);
-  Str.output();
-}
-
-struct SmallRegionsConfig {
-  static const bool MaySupportMemoryTagging = false;
-
-  struct Primary {
-    using SizeClassMap = scudo::DefaultSizeClassMap;
-    static const scudo::uptr RegionSizeLog = 21U;
-    static const scudo::s32 MinReleaseToOsIntervalMs = INT32_MIN;
-    static const scudo::s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-    typedef scudo::uptr CompactPtrT;
-    static const scudo::uptr CompactPtrScale = 0;
-    static const bool EnableRandomOffset = true;
-    static const scudo::uptr MapSizeIncrement = 1UL << 18;
-    static const scudo::uptr GroupSizeLog = 20U;
-  };
-};
-
-// The 64-bit SizeClassAllocator can be easily OOM'd with small region sizes.
-// For the 32-bit one, it requires actually exhausting memory, so we skip it.
-TEST(ScudoPrimaryTest, Primary64OOM) {
-  using Primary = scudo::SizeClassAllocator64<SmallRegionsConfig>;
-  using TransferBatch = Primary::TransferBatchT;
-  Primary Allocator;
-  Allocator.init(/*ReleaseToOsInterval=*/-1);
-  typename Primary::CacheT Cache;
-  scudo::GlobalStats Stats;
-  Stats.init();
-  Cache.init(&Stats, &Allocator);
-  bool AllocationFailed = false;
-  std::vector<TransferBatch *> Batches;
-  const scudo::uptr ClassId = Primary::SizeClassMap::LargestClassId;
-  const scudo::uptr Size = Primary::getSizeByClassId(ClassId);
-  typename Primary::CacheT::CompactPtrT Blocks[TransferBatch::MaxNumCached];
-
-  for (scudo::uptr I = 0; I < 10000U; I++) {
-    TransferBatch *B = Allocator.popBatch(&Cache, ClassId);
-    if (!B) {
-      AllocationFailed = true;
-      break;
-    }
-    for (scudo::u16 J = 0; J < B->getCount(); J++)
-      memset(Allocator.decompactPtr(ClassId, B->get(J)), 'B', Size);
-    Batches.push_back(B);
-  }
-  while (!Batches.empty()) {
-    TransferBatch *B = Batches.back();
-    Batches.pop_back();
-    const scudo::u16 Count = B->getCount();
-    B->moveToArray(Blocks);
-    Allocator.pushBlocks(&Cache, ClassId, Blocks, Count);
-    Cache.deallocate(Primary::SizeClassMap::BatchClassId, B);
-  }
-  Cache.destroy(nullptr);
-  Allocator.releaseToOS(scudo::ReleaseToOS::Force);
-  scudo::ScopedString Str;
-  Allocator.getStats(&Str);
-  Str.output();
-  EXPECT_EQ(AllocationFailed, true);
-  Allocator.unmapTestOnly();
-}
-
-SCUDO_TYPED_TEST(ScudoPrimaryTest, PrimaryIterate) {
-  using Primary = TestAllocator<TypeParam, scudo::DefaultSizeClassMap>;
-  std::unique_ptr<Primary> Allocator(new Primary);
-  Allocator->init(/*ReleaseToOsInterval=*/-1);
-  typename Primary::CacheT Cache;
-  Cache.init(nullptr, Allocator.get());
-  std::vector<std::pair<scudo::uptr, void *>> V;
-  for (scudo::uptr I = 0; I < 64U; I++) {
-    const scudo::uptr Size =
-        static_cast<scudo::uptr>(std::rand()) % Primary::SizeClassMap::MaxSize;
-    const scudo::uptr ClassId = Primary::SizeClassMap::getClassIdBySize(Size);
-    void *P = Cache.allocate(ClassId);
-    V.push_back(std::make_pair(ClassId, P));
-  }
-  scudo::uptr Found = 0;
-  auto Lambda = [&V, &Found](scudo::uptr Block) {
-    for (const auto &Pair : V) {
-      if (Pair.second == reinterpret_cast<void *>(Block))
-        Found++;
-    }
-  };
-  Allocator->disable();
-  Allocator->iterateOverBlocks(Lambda);
-  Allocator->enable();
-  EXPECT_EQ(Found, V.size());
-  while (!V.empty()) {
-    auto Pair = V.back();
-    Cache.deallocate(Pair.first, Pair.second);
-    V.pop_back();
-  }
-  Cache.destroy(nullptr);
-  Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-  scudo::ScopedString Str;
-  Allocator->getStats(&Str);
-  Str.output();
-}
-
-SCUDO_TYPED_TEST(ScudoPrimaryTest, PrimaryThreaded) {
-  using Primary = TestAllocator<TypeParam, scudo::Config::Primary::SizeClassMap>;
-  std::unique_ptr<Primary> Allocator(new Primary);
-  Allocator->init(/*ReleaseToOsInterval=*/-1);
-  std::mutex Mutex;
-  std::condition_variable Cv;
-  bool Ready = false;
-  std::thread Threads[32];
-  for (scudo::uptr I = 0; I < ARRAY_SIZE(Threads); I++) {
-    Threads[I] = std::thread([&]() {
-      static thread_local typename Primary::CacheT Cache;
-      Cache.init(nullptr, Allocator.get());
-      std::vector<std::pair<scudo::uptr, void *>> V;
-      {
-        std::unique_lock<std::mutex> Lock(Mutex);
-        while (!Ready)
-          Cv.wait(Lock);
-      }
-      for (scudo::uptr I = 0; I < 256U; I++) {
-        const scudo::uptr Size = static_cast<scudo::uptr>(std::rand()) %
-                                 Primary::SizeClassMap::MaxSize / 4;
-        const scudo::uptr ClassId =
-            Primary::SizeClassMap::getClassIdBySize(Size);
-        void *P = Cache.allocate(ClassId);
-        if (P)
-          V.push_back(std::make_pair(ClassId, P));
-      }
-
-      // Try to interleave pushBlocks(), popBatch() and releaseToOS().
-      Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-
-      while (!V.empty()) {
-        auto Pair = V.back();
-        Cache.deallocate(Pair.first, Pair.second);
-        V.pop_back();
-        // This increases the chance of having non-full TransferBatches and it
-        // will jump into the code path of merging TransferBatches.
-        if (std::rand() % 8 == 0)
-          Cache.drain();
-      }
-      Cache.destroy(nullptr);
-    });
-  }
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    Ready = true;
-    Cv.notify_all();
-  }
-  for (auto &T : Threads)
-    T.join();
-  Allocator->releaseToOS(scudo::ReleaseToOS::Force);
-  scudo::ScopedString Str;
-  Allocator->getStats(&Str);
-  Allocator->getFragmentationInfo(&Str);
-  Str.output();
-}
-
-// Through a simple allocation that spans two pages, verify that releaseToOS
-// actually releases some bytes (at least one page worth). This is a regression
-// test for an error in how the release criteria were computed.
-SCUDO_TYPED_TEST(ScudoPrimaryTest, ReleaseToOS) {
-  using Primary = TestAllocator<TypeParam, scudo::DefaultSizeClassMap>;
-  std::unique_ptr<Primary> Allocator(new Primary);
-  Allocator->init(/*ReleaseToOsInterval=*/-1);
-  typename Primary::CacheT Cache;
-  Cache.init(nullptr, Allocator.get());
-  const scudo::uptr Size = scudo::getPageSizeCached() * 2;
-  EXPECT_TRUE(Primary::canAllocate(Size));
-  const scudo::uptr ClassId = Primary::SizeClassMap::getClassIdBySize(Size);
-  void *P = Cache.allocate(ClassId);
-  EXPECT_NE(P, nullptr);
-  Cache.deallocate(ClassId, P);
-  Cache.destroy(nullptr);
-  EXPECT_GT(Allocator->releaseToOS(scudo::ReleaseToOS::ForceAll), 0U);
-}
-
-SCUDO_TYPED_TEST(ScudoPrimaryTest, MemoryGroup) {
-  using Primary = TestAllocator<TypeParam, scudo::DefaultSizeClassMap>;
-  std::unique_ptr<Primary> Allocator(new Primary);
-  Allocator->init(/*ReleaseToOsInterval=*/-1);
-  typename Primary::CacheT Cache;
-  Cache.init(nullptr, Allocator.get());
-  const scudo::uptr Size = 32U;
-  const scudo::uptr ClassId = Primary::SizeClassMap::getClassIdBySize(Size);
-
-  // We will allocate 4 times the group size memory and release all of them. We
-  // expect the free blocks will be classified with groups. Then we will
-  // allocate the same amount of memory as group size and expect the blocks will
-  // have the max address difference smaller or equal to 2 times the group size.
-  // Note that it isn't necessary to be in the range of single group size
-  // because the way we get the group id is doing compact pointer shifting.
-  // According to configuration, the compact pointer may not align to group
-  // size. As a result, the blocks can cross two groups at most.
-  const scudo::uptr GroupSizeMem = (1ULL << Primary::GroupSizeLog);
-  const scudo::uptr PeakAllocationMem = 4 * GroupSizeMem;
-  const scudo::uptr PeakNumberOfAllocations = PeakAllocationMem / Size;
-  const scudo::uptr FinalNumberOfAllocations = GroupSizeMem / Size;
-  std::vector<scudo::uptr> Blocks;
-  std::mt19937 R;
-
-  for (scudo::uptr I = 0; I < PeakNumberOfAllocations; ++I)
-    Blocks.push_back(reinterpret_cast<scudo::uptr>(Cache.allocate(ClassId)));
-
-  std::shuffle(Blocks.begin(), Blocks.end(), R);
-
-  // Release all the allocated blocks, including those held by local cache.
-  while (!Blocks.empty()) {
-    Cache.deallocate(ClassId, reinterpret_cast<void *>(Blocks.back()));
-    Blocks.pop_back();
-  }
-  Cache.drain();
-
-  for (scudo::uptr I = 0; I < FinalNumberOfAllocations; ++I)
-    Blocks.push_back(reinterpret_cast<scudo::uptr>(Cache.allocate(ClassId)));
-
-  EXPECT_LE(*std::max_element(Blocks.begin(), Blocks.end()) -
-                *std::min_element(Blocks.begin(), Blocks.end()),
-            GroupSizeMem * 2);
-
-  while (!Blocks.empty()) {
-    Cache.deallocate(ClassId, reinterpret_cast<void *>(Blocks.back()));
-    Blocks.pop_back();
-  }
-  Cache.drain();
-}
diff --git a/Telegram/ThirdParty/scudo/tests/quarantine_test.cpp b/Telegram/ThirdParty/scudo/tests/quarantine_test.cpp
deleted file mode 100644
index 972c98d51..000000000
--- a/Telegram/ThirdParty/scudo/tests/quarantine_test.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-//===-- quarantine_test.cpp -------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "quarantine.h"
-
-#include <pthread.h>
-#include <stdlib.h>
-
-static void *FakePtr = reinterpret_cast<void *>(0xFA83FA83);
-static const scudo::uptr BlockSize = 8UL;
-static const scudo::uptr LargeBlockSize = 16384UL;
-
-struct QuarantineCallback {
-  void recycle(void *P) { EXPECT_EQ(P, FakePtr); }
-  void *allocate(scudo::uptr Size) { return malloc(Size); }
-  void deallocate(void *P) { free(P); }
-};
-
-typedef scudo::GlobalQuarantine<QuarantineCallback, void> QuarantineT;
-typedef typename QuarantineT::CacheT CacheT;
-
-static QuarantineCallback Cb;
-
-static void deallocateCache(CacheT *Cache) {
-  while (scudo::QuarantineBatch *Batch = Cache->dequeueBatch())
-    Cb.deallocate(Batch);
-}
-
-TEST(ScudoQuarantineTest, QuarantineBatchMerge) {
-  // Verify the trivial case.
-  scudo::QuarantineBatch Into;
-  Into.init(FakePtr, 4UL);
-  scudo::QuarantineBatch From;
-  From.init(FakePtr, 8UL);
-
-  Into.merge(&From);
-
-  EXPECT_EQ(Into.Count, 2UL);
-  EXPECT_EQ(Into.Batch[0], FakePtr);
-  EXPECT_EQ(Into.Batch[1], FakePtr);
-  EXPECT_EQ(Into.Size, 12UL + sizeof(scudo::QuarantineBatch));
-  EXPECT_EQ(Into.getQuarantinedSize(), 12UL);
-
-  EXPECT_EQ(From.Count, 0UL);
-  EXPECT_EQ(From.Size, sizeof(scudo::QuarantineBatch));
-  EXPECT_EQ(From.getQuarantinedSize(), 0UL);
-
-  // Merge the batch to the limit.
-  for (scudo::uptr I = 2; I < scudo::QuarantineBatch::MaxCount; ++I)
-    From.push_back(FakePtr, 8UL);
-  EXPECT_TRUE(Into.Count + From.Count == scudo::QuarantineBatch::MaxCount);
-  EXPECT_TRUE(Into.canMerge(&From));
-
-  Into.merge(&From);
-  EXPECT_TRUE(Into.Count == scudo::QuarantineBatch::MaxCount);
-
-  // No more space, not even for one element.
-  From.init(FakePtr, 8UL);
-
-  EXPECT_FALSE(Into.canMerge(&From));
-}
-
-TEST(ScudoQuarantineTest, QuarantineCacheMergeBatchesEmpty) {
-  CacheT Cache;
-  CacheT ToDeallocate;
-  Cache.init();
-  ToDeallocate.init();
-  Cache.mergeBatches(&ToDeallocate);
-
-  EXPECT_EQ(ToDeallocate.getSize(), 0UL);
-  EXPECT_EQ(ToDeallocate.dequeueBatch(), nullptr);
-}
-
-TEST(SanitizerCommon, QuarantineCacheMergeBatchesOneBatch) {
-  CacheT Cache;
-  Cache.init();
-  Cache.enqueue(Cb, FakePtr, BlockSize);
-  EXPECT_EQ(BlockSize + sizeof(scudo::QuarantineBatch), Cache.getSize());
-
-  CacheT ToDeallocate;
-  ToDeallocate.init();
-  Cache.mergeBatches(&ToDeallocate);
-
-  // Nothing to merge, nothing to deallocate.
-  EXPECT_EQ(BlockSize + sizeof(scudo::QuarantineBatch), Cache.getSize());
-
-  EXPECT_EQ(ToDeallocate.getSize(), 0UL);
-  EXPECT_EQ(ToDeallocate.dequeueBatch(), nullptr);
-
-  deallocateCache(&Cache);
-}
-
-TEST(ScudoQuarantineTest, QuarantineCacheMergeBatchesSmallBatches) {
-  // Make a Cache with two batches small enough to merge.
-  CacheT From;
-  From.init();
-  From.enqueue(Cb, FakePtr, BlockSize);
-  CacheT Cache;
-  Cache.init();
-  Cache.enqueue(Cb, FakePtr, BlockSize);
-
-  Cache.transfer(&From);
-  EXPECT_EQ(BlockSize * 2 + sizeof(scudo::QuarantineBatch) * 2,
-            Cache.getSize());
-
-  CacheT ToDeallocate;
-  ToDeallocate.init();
-  Cache.mergeBatches(&ToDeallocate);
-
-  // Batches merged, one batch to deallocate.
-  EXPECT_EQ(BlockSize * 2 + sizeof(scudo::QuarantineBatch), Cache.getSize());
-  EXPECT_EQ(ToDeallocate.getSize(), sizeof(scudo::QuarantineBatch));
-
-  deallocateCache(&Cache);
-  deallocateCache(&ToDeallocate);
-}
-
-TEST(ScudoQuarantineTest, QuarantineCacheMergeBatchesTooBigToMerge) {
-  const scudo::uptr NumBlocks = scudo::QuarantineBatch::MaxCount - 1;
-
-  // Make a Cache with two batches small enough to merge.
-  CacheT From;
-  CacheT Cache;
-  From.init();
-  Cache.init();
-  for (scudo::uptr I = 0; I < NumBlocks; ++I) {
-    From.enqueue(Cb, FakePtr, BlockSize);
-    Cache.enqueue(Cb, FakePtr, BlockSize);
-  }
-  Cache.transfer(&From);
-  EXPECT_EQ(BlockSize * NumBlocks * 2 + sizeof(scudo::QuarantineBatch) * 2,
-            Cache.getSize());
-
-  CacheT ToDeallocate;
-  ToDeallocate.init();
-  Cache.mergeBatches(&ToDeallocate);
-
-  // Batches cannot be merged.
-  EXPECT_EQ(BlockSize * NumBlocks * 2 + sizeof(scudo::QuarantineBatch) * 2,
-            Cache.getSize());
-  EXPECT_EQ(ToDeallocate.getSize(), 0UL);
-
-  deallocateCache(&Cache);
-}
-
-TEST(ScudoQuarantineTest, QuarantineCacheMergeBatchesALotOfBatches) {
-  const scudo::uptr NumBatchesAfterMerge = 3;
-  const scudo::uptr NumBlocks =
-      scudo::QuarantineBatch::MaxCount * NumBatchesAfterMerge;
-  const scudo::uptr NumBatchesBeforeMerge = NumBlocks;
-
-  // Make a Cache with many small batches.
-  CacheT Cache;
-  Cache.init();
-  for (scudo::uptr I = 0; I < NumBlocks; ++I) {
-    CacheT From;
-    From.init();
-    From.enqueue(Cb, FakePtr, BlockSize);
-    Cache.transfer(&From);
-  }
-
-  EXPECT_EQ(BlockSize * NumBlocks +
-                sizeof(scudo::QuarantineBatch) * NumBatchesBeforeMerge,
-            Cache.getSize());
-
-  CacheT ToDeallocate;
-  ToDeallocate.init();
-  Cache.mergeBatches(&ToDeallocate);
-
-  // All blocks should fit Into 3 batches.
-  EXPECT_EQ(BlockSize * NumBlocks +
-                sizeof(scudo::QuarantineBatch) * NumBatchesAfterMerge,
-            Cache.getSize());
-
-  EXPECT_EQ(ToDeallocate.getSize(),
-            sizeof(scudo::QuarantineBatch) *
-                (NumBatchesBeforeMerge - NumBatchesAfterMerge));
-
-  deallocateCache(&Cache);
-  deallocateCache(&ToDeallocate);
-}
-
-static const scudo::uptr MaxQuarantineSize = 1024UL << 10; // 1MB
-static const scudo::uptr MaxCacheSize = 256UL << 10;       // 256KB
-
-TEST(ScudoQuarantineTest, GlobalQuarantine) {
-  QuarantineT Quarantine;
-  CacheT Cache;
-  Cache.init();
-  Quarantine.init(MaxQuarantineSize, MaxCacheSize);
-  EXPECT_EQ(Quarantine.getMaxSize(), MaxQuarantineSize);
-  EXPECT_EQ(Quarantine.getCacheSize(), MaxCacheSize);
-
-  bool DrainOccurred = false;
-  scudo::uptr CacheSize = Cache.getSize();
-  EXPECT_EQ(Cache.getSize(), 0UL);
-  // We quarantine enough blocks that a drain has to occur. Verify this by
-  // looking for a decrease of the size of the cache.
-  for (scudo::uptr I = 0; I < 128UL; I++) {
-    Quarantine.put(&Cache, Cb, FakePtr, LargeBlockSize);
-    if (!DrainOccurred && Cache.getSize() < CacheSize)
-      DrainOccurred = true;
-    CacheSize = Cache.getSize();
-  }
-  EXPECT_TRUE(DrainOccurred);
-
-  Quarantine.drainAndRecycle(&Cache, Cb);
-  EXPECT_EQ(Cache.getSize(), 0UL);
-
-  scudo::ScopedString Str;
-  Quarantine.getStats(&Str);
-  Str.output();
-}
-
-struct PopulateQuarantineThread {
-  pthread_t Thread;
-  QuarantineT *Quarantine;
-  CacheT Cache;
-};
-
-void *populateQuarantine(void *Param) {
-  PopulateQuarantineThread *P = static_cast<PopulateQuarantineThread *>(Param);
-  P->Cache.init();
-  for (scudo::uptr I = 0; I < 128UL; I++)
-    P->Quarantine->put(&P->Cache, Cb, FakePtr, LargeBlockSize);
-  return 0;
-}
-
-TEST(ScudoQuarantineTest, ThreadedGlobalQuarantine) {
-  QuarantineT Quarantine;
-  Quarantine.init(MaxQuarantineSize, MaxCacheSize);
-
-  const scudo::uptr NumberOfThreads = 32U;
-  PopulateQuarantineThread T[NumberOfThreads];
-  for (scudo::uptr I = 0; I < NumberOfThreads; I++) {
-    T[I].Quarantine = &Quarantine;
-    pthread_create(&T[I].Thread, 0, populateQuarantine, &T[I]);
-  }
-  for (scudo::uptr I = 0; I < NumberOfThreads; I++)
-    pthread_join(T[I].Thread, 0);
-
-  scudo::ScopedString Str;
-  Quarantine.getStats(&Str);
-  Str.output();
-
-  for (scudo::uptr I = 0; I < NumberOfThreads; I++)
-    Quarantine.drainAndRecycle(&T[I].Cache, Cb);
-}
diff --git a/Telegram/ThirdParty/scudo/tests/release_test.cpp b/Telegram/ThirdParty/scudo/tests/release_test.cpp
deleted file mode 100644
index 14b398a91..000000000
--- a/Telegram/ThirdParty/scudo/tests/release_test.cpp
+++ /dev/null
@@ -1,654 +0,0 @@
-//===-- release_test.cpp ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "list.h"
-#include "release.h"
-#include "size_class_map.h"
-
-#include <string.h>
-
-#include <algorithm>
-#include <random>
-#include <set>
-
-TEST(ScudoReleaseTest, RegionPageMap) {
-  for (scudo::uptr I = 0; I < SCUDO_WORDSIZE; I++) {
-    // Various valid counter's max values packed into one word.
-    scudo::RegionPageMap PageMap2N(1U, 1U, 1UL << I);
-    ASSERT_TRUE(PageMap2N.isAllocated());
-    EXPECT_EQ(1U, PageMap2N.getBufferNumElements());
-    // Check the "all bit set" values too.
-    scudo::RegionPageMap PageMap2N1_1(1U, 1U, ~0UL >> I);
-    ASSERT_TRUE(PageMap2N1_1.isAllocated());
-    EXPECT_EQ(1U, PageMap2N1_1.getBufferNumElements());
-    // Verify the packing ratio, the counter is Expected to be packed into the
-    // closest power of 2 bits.
-    scudo::RegionPageMap PageMap(1U, SCUDO_WORDSIZE, 1UL << I);
-    ASSERT_TRUE(PageMap.isAllocated());
-    EXPECT_EQ(scudo::roundUpPowerOfTwo(I + 1), PageMap.getBufferNumElements());
-  }
-
-  // Go through 1, 2, 4, 8, .. {32,64} bits per counter.
-  for (scudo::uptr I = 0; (SCUDO_WORDSIZE >> I) != 0; I++) {
-    // Make sure counters request one memory page for the buffer.
-    const scudo::uptr NumCounters =
-        (scudo::getPageSizeCached() / 8) * (SCUDO_WORDSIZE >> I);
-    scudo::RegionPageMap PageMap(1U, NumCounters,
-                                       1UL << ((1UL << I) - 1));
-    ASSERT_TRUE(PageMap.isAllocated());
-    PageMap.inc(0U, 0U);
-    for (scudo::uptr C = 1; C < NumCounters - 1; C++) {
-      EXPECT_EQ(0UL, PageMap.get(0U, C));
-      PageMap.inc(0U, C);
-      EXPECT_EQ(1UL, PageMap.get(0U, C - 1));
-    }
-    EXPECT_EQ(0UL, PageMap.get(0U, NumCounters - 1));
-    PageMap.inc(0U, NumCounters - 1);
-    if (I > 0) {
-      PageMap.incRange(0u, 0U, NumCounters - 1);
-      for (scudo::uptr C = 0; C < NumCounters; C++)
-        EXPECT_EQ(2UL, PageMap.get(0U, C));
-    }
-  }
-
-  // Similar to the above except that we are using incN().
-  for (scudo::uptr I = 0; (SCUDO_WORDSIZE >> I) != 0; I++) {
-    // Make sure counters request one memory page for the buffer.
-    const scudo::uptr NumCounters =
-        (scudo::getPageSizeCached() / 8) * (SCUDO_WORDSIZE >> I);
-    scudo::uptr MaxValue = 1UL << ((1UL << I) - 1);
-    if (MaxValue <= 1U)
-      continue;
-
-    scudo::RegionPageMap PageMap(1U, NumCounters, MaxValue);
-
-    scudo::uptr N = MaxValue / 2;
-    PageMap.incN(0U, 0, N);
-    for (scudo::uptr C = 1; C < NumCounters; C++) {
-      EXPECT_EQ(0UL, PageMap.get(0U, C));
-      PageMap.incN(0U, C, N);
-      EXPECT_EQ(N, PageMap.get(0U, C - 1));
-    }
-    EXPECT_EQ(N, PageMap.get(0U, NumCounters - 1));
-  }
-}
-
-class StringRangeRecorder {
-public:
-  std::string ReportedPages;
-
-  StringRangeRecorder()
-      : PageSizeScaledLog(scudo::getLog2(scudo::getPageSizeCached())) {}
-
-  void releasePageRangeToOS(scudo::uptr From, scudo::uptr To) {
-    From >>= PageSizeScaledLog;
-    To >>= PageSizeScaledLog;
-    EXPECT_LT(From, To);
-    if (!ReportedPages.empty())
-      EXPECT_LT(LastPageReported, From);
-    ReportedPages.append(From - LastPageReported, '.');
-    ReportedPages.append(To - From, 'x');
-    LastPageReported = To;
-  }
-
-private:
-  const scudo::uptr PageSizeScaledLog;
-  scudo::uptr LastPageReported = 0;
-};
-
-TEST(ScudoReleaseTest, FreePagesRangeTracker) {
-  // 'x' denotes a page to be released, '.' denotes a page to be kept around.
-  const char *TestCases[] = {
-      "",
-      ".",
-      "x",
-      "........",
-      "xxxxxxxxxxx",
-      "..............xxxxx",
-      "xxxxxxxxxxxxxxxxxx.....",
-      "......xxxxxxxx........",
-      "xxx..........xxxxxxxxxxxxxxx",
-      "......xxxx....xxxx........",
-      "xxx..........xxxxxxxx....xxxxxxx",
-      "x.x.x.x.x.x.x.x.x.x.x.x.",
-      ".x.x.x.x.x.x.x.x.x.x.x.x",
-      ".x.x.x.x.x.x.x.x.x.x.x.x.",
-      "x.x.x.x.x.x.x.x.x.x.x.x.x",
-  };
-  typedef scudo::FreePagesRangeTracker<StringRangeRecorder> RangeTracker;
-
-  for (auto TestCase : TestCases) {
-    StringRangeRecorder Recorder;
-    RangeTracker Tracker(Recorder);
-    for (scudo::uptr I = 0; TestCase[I] != 0; I++)
-      Tracker.processNextPage(TestCase[I] == 'x');
-    Tracker.finish();
-    // Strip trailing '.'-pages before comparing the results as they are not
-    // going to be reported to range_recorder anyway.
-    const char *LastX = strrchr(TestCase, 'x');
-    std::string Expected(
-        TestCase,
-        LastX == nullptr ? 0U : static_cast<size_t>(LastX - TestCase + 1));
-    EXPECT_STREQ(Expected.c_str(), Recorder.ReportedPages.c_str());
-  }
-}
-
-class ReleasedPagesRecorder {
-public:
-  ReleasedPagesRecorder() = default;
-  explicit ReleasedPagesRecorder(scudo::uptr Base) : Base(Base) {}
-  std::set<scudo::uptr> ReportedPages;
-
-  void releasePageRangeToOS(scudo::uptr From, scudo::uptr To) {
-    const scudo::uptr PageSize = scudo::getPageSizeCached();
-    for (scudo::uptr I = From; I < To; I += PageSize)
-      ReportedPages.insert(I + getBase());
-  }
-
-  scudo::uptr getBase() const { return Base; }
-  scudo::uptr Base = 0;
-};
-
-// Simplified version of a TransferBatch.
-template <class SizeClassMap> struct FreeBatch {
-  static const scudo::u16 MaxCount = SizeClassMap::MaxNumCachedHint;
-  void clear() { Count = 0; }
-  void add(scudo::uptr P) {
-    DCHECK_LT(Count, MaxCount);
-    Batch[Count++] = P;
-  }
-  scudo::u16 getCount() const { return Count; }
-  scudo::uptr get(scudo::u16 I) const {
-    DCHECK_LE(I, Count);
-    return Batch[I];
-  }
-  FreeBatch *Next;
-
-private:
-  scudo::uptr Batch[MaxCount];
-  scudo::u16 Count;
-};
-
-template <class SizeClassMap> void testReleaseFreeMemoryToOS() {
-  typedef FreeBatch<SizeClassMap> Batch;
-  const scudo::uptr PagesCount = 1024;
-  const scudo::uptr PageSize = scudo::getPageSizeCached();
-  const scudo::uptr PageSizeLog = scudo::getLog2(PageSize);
-  std::mt19937 R;
-  scudo::u32 RandState = 42;
-
-  for (scudo::uptr I = 1; I <= SizeClassMap::LargestClassId; I++) {
-    const scudo::uptr BlockSize = SizeClassMap::getSizeByClassId(I);
-    const scudo::uptr MaxBlocks = PagesCount * PageSize / BlockSize;
-
-    // Generate the random free list.
-    std::vector<scudo::uptr> FreeArray;
-    bool InFreeRange = false;
-    scudo::uptr CurrentRangeEnd = 0;
-    for (scudo::uptr I = 0; I < MaxBlocks; I++) {
-      if (I == CurrentRangeEnd) {
-        InFreeRange = (scudo::getRandomU32(&RandState) & 1U) == 1;
-        CurrentRangeEnd += (scudo::getRandomU32(&RandState) & 0x7f) + 1;
-      }
-      if (InFreeRange)
-        FreeArray.push_back(I * BlockSize);
-    }
-    if (FreeArray.empty())
-      continue;
-    // Shuffle the array to ensure that the order is irrelevant.
-    std::shuffle(FreeArray.begin(), FreeArray.end(), R);
-
-    // Build the FreeList from the FreeArray.
-    scudo::SinglyLinkedList<Batch> FreeList;
-    FreeList.clear();
-    Batch *CurrentBatch = nullptr;
-    for (auto const &Block : FreeArray) {
-      if (!CurrentBatch) {
-        CurrentBatch = new Batch;
-        CurrentBatch->clear();
-        FreeList.push_back(CurrentBatch);
-      }
-      CurrentBatch->add(Block);
-      if (CurrentBatch->getCount() == Batch::MaxCount)
-        CurrentBatch = nullptr;
-    }
-
-    // Release the memory.
-    auto SkipRegion = [](UNUSED scudo::uptr RegionIndex) { return false; };
-    auto DecompactPtr = [](scudo::uptr P) { return P; };
-    ReleasedPagesRecorder Recorder;
-    scudo::PageReleaseContext Context(BlockSize, /*NumberOfRegions=*/1U,
-                                      /*ReleaseSize=*/MaxBlocks * BlockSize);
-    ASSERT_FALSE(Context.hasBlockMarked());
-    Context.markFreeBlocksInRegion(FreeList, DecompactPtr, Recorder.getBase(),
-                                   /*RegionIndex=*/0, MaxBlocks * BlockSize,
-                                   /*MayContainLastBlockInRegion=*/true);
-    ASSERT_TRUE(Context.hasBlockMarked());
-    releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
-    scudo::RegionPageMap &PageMap = Context.PageMap;
-
-    // Verify that there are no released pages touched by used chunks and all
-    // ranges of free chunks big enough to contain the entire memory pages had
-    // these pages released.
-    scudo::uptr VerifiedReleasedPages = 0;
-    std::set<scudo::uptr> FreeBlocks(FreeArray.begin(), FreeArray.end());
-
-    scudo::uptr CurrentBlock = 0;
-    InFreeRange = false;
-    scudo::uptr CurrentFreeRangeStart = 0;
-    for (scudo::uptr I = 0; I < MaxBlocks; I++) {
-      const bool IsFreeBlock =
-          FreeBlocks.find(CurrentBlock) != FreeBlocks.end();
-      if (IsFreeBlock) {
-        if (!InFreeRange) {
-          InFreeRange = true;
-          CurrentFreeRangeStart = CurrentBlock;
-        }
-      } else {
-        // Verify that this used chunk does not touch any released page.
-        const scudo::uptr StartPage = CurrentBlock / PageSize;
-        const scudo::uptr EndPage = (CurrentBlock + BlockSize - 1) / PageSize;
-        for (scudo::uptr J = StartPage; J <= EndPage; J++) {
-          const bool PageReleased = Recorder.ReportedPages.find(J * PageSize) !=
-                                    Recorder.ReportedPages.end();
-          EXPECT_EQ(false, PageReleased);
-          EXPECT_EQ(false,
-                    PageMap.isAllCounted(0, (J * PageSize) >> PageSizeLog));
-        }
-
-        if (InFreeRange) {
-          InFreeRange = false;
-          // Verify that all entire memory pages covered by this range of free
-          // chunks were released.
-          scudo::uptr P = scudo::roundUp(CurrentFreeRangeStart, PageSize);
-          while (P + PageSize <= CurrentBlock) {
-            const bool PageReleased =
-                Recorder.ReportedPages.find(P) != Recorder.ReportedPages.end();
-            EXPECT_EQ(true, PageReleased);
-            EXPECT_EQ(true, PageMap.isAllCounted(0, P >> PageSizeLog));
-            VerifiedReleasedPages++;
-            P += PageSize;
-          }
-        }
-      }
-
-      CurrentBlock += BlockSize;
-    }
-
-    if (InFreeRange) {
-      scudo::uptr P = scudo::roundUp(CurrentFreeRangeStart, PageSize);
-      const scudo::uptr EndPage =
-          scudo::roundUp(MaxBlocks * BlockSize, PageSize);
-      while (P + PageSize <= EndPage) {
-        const bool PageReleased =
-            Recorder.ReportedPages.find(P) != Recorder.ReportedPages.end();
-        EXPECT_EQ(true, PageReleased);
-        EXPECT_EQ(true, PageMap.isAllCounted(0, P >> PageSizeLog));
-        VerifiedReleasedPages++;
-        P += PageSize;
-      }
-    }
-
-    EXPECT_EQ(Recorder.ReportedPages.size(), VerifiedReleasedPages);
-
-    while (!FreeList.empty()) {
-      CurrentBatch = FreeList.front();
-      FreeList.pop_front();
-      delete CurrentBatch;
-    }
-  }
-}
-
-template <class SizeClassMap> void testPageMapMarkRange() {
-  const scudo::uptr PageSize = scudo::getPageSizeCached();
-
-  for (scudo::uptr I = 1; I <= SizeClassMap::LargestClassId; I++) {
-    const scudo::uptr BlockSize = SizeClassMap::getSizeByClassId(I);
-
-    const scudo::uptr GroupNum = 2;
-    const scudo::uptr GroupSize = scudo::roundUp(BlockSize, PageSize) * 2;
-    const scudo::uptr RegionSize =
-        scudo::roundUpSlow(GroupSize * GroupNum, BlockSize);
-    const scudo::uptr RoundedRegionSize = scudo::roundUp(RegionSize, PageSize);
-
-    std::vector<scudo::uptr> Pages(RoundedRegionSize / PageSize, 0);
-    for (scudo::uptr Block = 0; Block < RoundedRegionSize; Block += BlockSize) {
-      for (scudo::uptr Page = Block / PageSize;
-           Page <= (Block + BlockSize - 1) / PageSize &&
-           Page < RoundedRegionSize / PageSize;
-           ++Page) {
-        ASSERT_LT(Page, Pages.size());
-        ++Pages[Page];
-      }
-    }
-
-    for (scudo::uptr GroupId = 0; GroupId < GroupNum; ++GroupId) {
-      const scudo::uptr GroupBeg = GroupId * GroupSize;
-      const scudo::uptr GroupEnd = GroupBeg + GroupSize;
-
-      scudo::PageReleaseContext Context(BlockSize, /*NumberOfRegions=*/1U,
-                                        /*ReleaseSize=*/RegionSize);
-      Context.markRangeAsAllCounted(GroupBeg, GroupEnd, /*Base=*/0U,
-                                    /*RegionIndex=*/0, RegionSize);
-
-      scudo::uptr FirstBlock =
-          ((GroupBeg + BlockSize - 1) / BlockSize) * BlockSize;
-
-      // All the pages before first block page are not supposed to be marked.
-      if (FirstBlock / PageSize > 0) {
-        for (scudo::uptr Page = 0; Page <= FirstBlock / PageSize - 1; ++Page)
-          EXPECT_EQ(Context.PageMap.get(/*Region=*/0, Page), 0U);
-      }
-
-      // Verify the pages used by the blocks in the group except that if the
-      // end of the last block is not aligned with `GroupEnd`, it'll be verified
-      // later.
-      scudo::uptr Block;
-      for (Block = FirstBlock; Block + BlockSize <= GroupEnd;
-           Block += BlockSize) {
-        for (scudo::uptr Page = Block / PageSize;
-             Page <= (Block + BlockSize - 1) / PageSize; ++Page) {
-          // First used page in the group has two cases, which are w/ and w/o
-          // block sitting across the boundary.
-          if (Page == FirstBlock / PageSize) {
-            if (FirstBlock % PageSize == 0) {
-              EXPECT_TRUE(Context.PageMap.isAllCounted(/*Region=*/0U, Page));
-            } else {
-              // There's a block straddling `GroupBeg`, it's supposed to only
-              // increment the counter and we expect it should be 1 less
-              // (exclude the straddling one) than the total blocks on the page.
-              EXPECT_EQ(Context.PageMap.get(/*Region=*/0U, Page),
-                        Pages[Page] - 1);
-            }
-          } else {
-            EXPECT_TRUE(Context.PageMap.isAllCounted(/*Region=*/0, Page));
-          }
-        }
-      }
-
-      if (Block == GroupEnd)
-        continue;
-
-      // Examine the last block which sits across the group boundary.
-      if (Block + BlockSize == RegionSize) {
-        // This is the last block in the region, it's supposed to mark all the
-        // pages as all counted.
-        for (scudo::uptr Page = Block / PageSize;
-             Page <= (Block + BlockSize - 1) / PageSize; ++Page) {
-          EXPECT_TRUE(Context.PageMap.isAllCounted(/*Region=*/0, Page));
-        }
-      } else {
-        for (scudo::uptr Page = Block / PageSize;
-             Page <= (Block + BlockSize - 1) / PageSize; ++Page) {
-          if (Page <= (GroupEnd - 1) / PageSize)
-            EXPECT_TRUE(Context.PageMap.isAllCounted(/*Region=*/0, Page));
-          else
-            EXPECT_EQ(Context.PageMap.get(/*Region=*/0U, Page), 1U);
-        }
-      }
-
-      const scudo::uptr FirstUncountedPage =
-          scudo::roundUp(Block + BlockSize, PageSize);
-      for (scudo::uptr Page = FirstUncountedPage;
-           Page <= RoundedRegionSize / PageSize; ++Page) {
-        EXPECT_EQ(Context.PageMap.get(/*Region=*/0U, Page), 0U);
-      }
-    } // Iterate each Group
-
-    // Release the entire region. This is to ensure the last page is counted.
-    scudo::PageReleaseContext Context(BlockSize, /*NumberOfRegions=*/1U,
-                                      /*ReleaseSize=*/RegionSize);
-    Context.markRangeAsAllCounted(/*From=*/0U, /*To=*/RegionSize, /*Base=*/0,
-                                  /*RegionIndex=*/0, RegionSize);
-    for (scudo::uptr Page = 0; Page < RoundedRegionSize / PageSize; ++Page)
-      EXPECT_TRUE(Context.PageMap.isAllCounted(/*Region=*/0, Page));
-  } // Iterate each size class
-}
-
-template <class SizeClassMap> void testReleasePartialRegion() {
-  typedef FreeBatch<SizeClassMap> Batch;
-  const scudo::uptr PageSize = scudo::getPageSizeCached();
-
-  for (scudo::uptr I = 1; I <= SizeClassMap::LargestClassId; I++) {
-    // In the following, we want to ensure the region includes at least 2 pages
-    // and we will release all the pages except the first one. The handling of
-    // the last block is tricky, so we always test the case that includes the
-    // last block.
-    const scudo::uptr BlockSize = SizeClassMap::getSizeByClassId(I);
-    const scudo::uptr ReleaseBase = scudo::roundUp(BlockSize, PageSize);
-    const scudo::uptr BasePageOffset = ReleaseBase / PageSize;
-    const scudo::uptr RegionSize =
-        scudo::roundUpSlow(scudo::roundUp(BlockSize, PageSize) + ReleaseBase,
-                           BlockSize) +
-        BlockSize;
-    const scudo::uptr RoundedRegionSize = scudo::roundUp(RegionSize, PageSize);
-
-    scudo::SinglyLinkedList<Batch> FreeList;
-    FreeList.clear();
-
-    // Skip the blocks in the first page and add the remaining.
-    std::vector<scudo::uptr> Pages(RoundedRegionSize / PageSize, 0);
-    for (scudo::uptr Block = scudo::roundUpSlow(ReleaseBase, BlockSize);
-         Block + BlockSize <= RoundedRegionSize; Block += BlockSize) {
-      for (scudo::uptr Page = Block / PageSize;
-           Page <= (Block + BlockSize - 1) / PageSize; ++Page) {
-        ASSERT_LT(Page, Pages.size());
-        ++Pages[Page];
-      }
-    }
-
-    // This follows the logic how we count the last page. It should be
-    // consistent with how markFreeBlocksInRegion() handles the last block.
-    if (RoundedRegionSize % BlockSize != 0)
-      ++Pages.back();
-
-    Batch *CurrentBatch = nullptr;
-    for (scudo::uptr Block = scudo::roundUpSlow(ReleaseBase, BlockSize);
-         Block < RegionSize; Block += BlockSize) {
-      if (CurrentBatch == nullptr ||
-          CurrentBatch->getCount() == Batch::MaxCount) {
-        CurrentBatch = new Batch;
-        CurrentBatch->clear();
-        FreeList.push_back(CurrentBatch);
-      }
-      CurrentBatch->add(Block);
-    }
-
-    auto VerifyReleaseToOs = [&](scudo::PageReleaseContext &Context) {
-      auto SkipRegion = [](UNUSED scudo::uptr RegionIndex) { return false; };
-      ReleasedPagesRecorder Recorder(ReleaseBase);
-      releaseFreeMemoryToOS(Context, Recorder, SkipRegion);
-      const scudo::uptr FirstBlock = scudo::roundUpSlow(ReleaseBase, BlockSize);
-
-      for (scudo::uptr P = 0; P < RoundedRegionSize; P += PageSize) {
-        if (P < FirstBlock) {
-          // If FirstBlock is not aligned with page boundary, the first touched
-          // page will not be released either.
-          EXPECT_TRUE(Recorder.ReportedPages.find(P) ==
-                      Recorder.ReportedPages.end());
-        } else {
-          EXPECT_TRUE(Recorder.ReportedPages.find(P) !=
-                      Recorder.ReportedPages.end());
-        }
-      }
-    };
-
-    // Test marking by visiting each block.
-    {
-      auto DecompactPtr = [](scudo::uptr P) { return P; };
-      scudo::PageReleaseContext Context(BlockSize, /*NumberOfRegions=*/1U,
-                                        /*ReleaseSize=*/RegionSize - PageSize,
-                                        ReleaseBase);
-      Context.markFreeBlocksInRegion(FreeList, DecompactPtr, /*Base=*/0U,
-                                     /*RegionIndex=*/0, RegionSize,
-                                     /*MayContainLastBlockInRegion=*/true);
-      for (const Batch &It : FreeList) {
-        for (scudo::u16 I = 0; I < It.getCount(); I++) {
-          scudo::uptr Block = It.get(I);
-          for (scudo::uptr Page = Block / PageSize;
-               Page <= (Block + BlockSize - 1) / PageSize; ++Page) {
-            EXPECT_EQ(Pages[Page], Context.PageMap.get(/*Region=*/0U,
-                                                       Page - BasePageOffset));
-          }
-        }
-      }
-
-      VerifyReleaseToOs(Context);
-    }
-
-    // Test range marking.
-    {
-      scudo::PageReleaseContext Context(BlockSize, /*NumberOfRegions=*/1U,
-                                        /*ReleaseSize=*/RegionSize - PageSize,
-                                        ReleaseBase);
-      Context.markRangeAsAllCounted(ReleaseBase, RegionSize, /*Base=*/0U,
-                                    /*RegionIndex=*/0, RegionSize);
-      for (scudo::uptr Page = ReleaseBase / PageSize;
-           Page < RoundedRegionSize / PageSize; ++Page) {
-        if (Context.PageMap.get(/*Region=*/0, Page - BasePageOffset) !=
-            Pages[Page]) {
-          EXPECT_TRUE(Context.PageMap.isAllCounted(/*Region=*/0,
-                                                   Page - BasePageOffset));
-        }
-      }
-
-      VerifyReleaseToOs(Context);
-    }
-
-    // Check the buffer size of PageMap.
-    {
-      scudo::PageReleaseContext Full(BlockSize, /*NumberOfRegions=*/1U,
-                                     /*ReleaseSize=*/RegionSize);
-      Full.ensurePageMapAllocated();
-      scudo::PageReleaseContext Partial(BlockSize, /*NumberOfRegions=*/1U,
-                                        /*ReleaseSize=*/RegionSize - PageSize,
-                                        ReleaseBase);
-      Partial.ensurePageMapAllocated();
-
-      EXPECT_GE(Full.PageMap.getBufferNumElements(),
-                Partial.PageMap.getBufferNumElements());
-    }
-
-    while (!FreeList.empty()) {
-      CurrentBatch = FreeList.front();
-      FreeList.pop_front();
-      delete CurrentBatch;
-    }
-  } // Iterate each size class
-}
-
-TEST(ScudoReleaseTest, ReleaseFreeMemoryToOSDefault) {
-  testReleaseFreeMemoryToOS<scudo::DefaultSizeClassMap>();
-}
-
-TEST(ScudoReleaseTest, ReleaseFreeMemoryToOSAndroid) {
-  testReleaseFreeMemoryToOS<scudo::AndroidSizeClassMap>();
-}
-
-TEST(ScudoReleaseTest, PageMapMarkRange) {
-  testPageMapMarkRange<scudo::DefaultSizeClassMap>();
-  testPageMapMarkRange<scudo::AndroidSizeClassMap>();
-  testPageMapMarkRange<scudo::FuchsiaSizeClassMap>();
-}
-
-TEST(ScudoReleaseTest, ReleasePartialRegion) {
-  testReleasePartialRegion<scudo::DefaultSizeClassMap>();
-  testReleasePartialRegion<scudo::AndroidSizeClassMap>();
-  testReleasePartialRegion<scudo::FuchsiaSizeClassMap>();
-}
-
-template <class SizeClassMap> void testReleaseRangeWithSingleBlock() {
-  const scudo::uptr PageSize = scudo::getPageSizeCached();
-
-  // We want to test if a memory group only contains single block that will be
-  // handled properly. The case is like:
-  //
-  //   From                     To
-  //     +----------------------+
-  //  +------------+------------+
-  //  |            |            |
-  //  +------------+------------+
-  //                            ^
-  //                        RegionSize
-  //
-  // Note that `From` will be page aligned.
-  //
-  // If the second from the last block is aligned at `From`, then we expect all
-  // the pages after `From` will be marked as can-be-released. Otherwise, the
-  // pages only touched by the last blocks will be marked as can-be-released.
-  for (scudo::uptr I = 1; I <= SizeClassMap::LargestClassId; I++) {
-    const scudo::uptr BlockSize = SizeClassMap::getSizeByClassId(I);
-    const scudo::uptr From = scudo::roundUp(BlockSize, PageSize);
-    const scudo::uptr To =
-        From % BlockSize == 0
-            ? From + BlockSize
-            : scudo::roundDownSlow(From + BlockSize, BlockSize) + BlockSize;
-    const scudo::uptr RoundedRegionSize = scudo::roundUp(To, PageSize);
-
-    std::vector<scudo::uptr> Pages(RoundedRegionSize / PageSize, 0);
-    for (scudo::uptr Block = (To - BlockSize); Block < RoundedRegionSize;
-         Block += BlockSize) {
-      for (scudo::uptr Page = Block / PageSize;
-           Page <= (Block + BlockSize - 1) / PageSize &&
-           Page < RoundedRegionSize / PageSize;
-           ++Page) {
-        ASSERT_LT(Page, Pages.size());
-        ++Pages[Page];
-      }
-    }
-
-    scudo::PageReleaseContext Context(BlockSize, /*NumberOfRegions=*/1U,
-                                      /*ReleaseSize=*/To,
-                                      /*ReleaseBase=*/0U);
-    Context.markRangeAsAllCounted(From, To, /*Base=*/0U, /*RegionIndex=*/0,
-                                  /*RegionSize=*/To);
-
-    for (scudo::uptr Page = 0; Page < RoundedRegionSize; Page += PageSize) {
-      if (Context.PageMap.get(/*Region=*/0U, Page / PageSize) !=
-          Pages[Page / PageSize]) {
-        EXPECT_TRUE(
-            Context.PageMap.isAllCounted(/*Region=*/0U, Page / PageSize));
-      }
-    }
-  } // for each size class
-}
-
-TEST(ScudoReleaseTest, RangeReleaseRegionWithSingleBlock) {
-  testReleaseRangeWithSingleBlock<scudo::DefaultSizeClassMap>();
-  testReleaseRangeWithSingleBlock<scudo::AndroidSizeClassMap>();
-  testReleaseRangeWithSingleBlock<scudo::FuchsiaSizeClassMap>();
-}
-
-TEST(ScudoReleaseTest, BufferPool) {
-  constexpr scudo::uptr StaticBufferCount = SCUDO_WORDSIZE - 1;
-  constexpr scudo::uptr StaticBufferNumElements = 512U;
-
-  // Allocate the buffer pool on the heap because it is quite large (slightly
-  // more than StaticBufferCount * StaticBufferNumElements * sizeof(uptr)) and
-  // it may not fit in the stack on some platforms.
-  using BufferPool =
-      scudo::BufferPool<StaticBufferCount, StaticBufferNumElements>;
-  std::unique_ptr<BufferPool> Pool(new BufferPool());
-
-  std::vector<BufferPool::Buffer> Buffers;
-  for (scudo::uptr I = 0; I < StaticBufferCount; ++I) {
-    BufferPool::Buffer Buffer = Pool->getBuffer(StaticBufferNumElements);
-    EXPECT_TRUE(Pool->isStaticBufferTestOnly(Buffer));
-    Buffers.push_back(Buffer);
-  }
-
-  // The static buffer is supposed to be used up.
-  BufferPool::Buffer Buffer = Pool->getBuffer(StaticBufferNumElements);
-  EXPECT_FALSE(Pool->isStaticBufferTestOnly(Buffer));
-
-  Pool->releaseBuffer(Buffer);
-  for (auto &Buffer : Buffers)
-    Pool->releaseBuffer(Buffer);
-}
diff --git a/Telegram/ThirdParty/scudo/tests/report_test.cpp b/Telegram/ThirdParty/scudo/tests/report_test.cpp
deleted file mode 100644
index 92f1ee813..000000000
--- a/Telegram/ThirdParty/scudo/tests/report_test.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//===-- report_test.cpp -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "report.h"
-
-TEST(ScudoReportDeathTest, Check) {
-  CHECK_LT(-1, 1);
-  EXPECT_DEATH(CHECK_GT(-1, 1),
-               "\\(-1\\) > \\(1\\) \\(\\(u64\\)op1=18446744073709551615, "
-               "\\(u64\\)op2=1");
-}
-
-TEST(ScudoReportDeathTest, Generic) {
-  // Potentially unused if EXPECT_DEATH isn't defined.
-  UNUSED void *P = reinterpret_cast<void *>(0x42424242U);
-  EXPECT_DEATH(scudo::reportError("TEST123"), "Scudo ERROR.*TEST123");
-  EXPECT_DEATH(scudo::reportInvalidFlag("ABC", "DEF"), "Scudo ERROR.*ABC.*DEF");
-  EXPECT_DEATH(scudo::reportHeaderCorruption(P), "Scudo ERROR.*42424242");
-  EXPECT_DEATH(scudo::reportSanityCheckError("XYZ"), "Scudo ERROR.*XYZ");
-  EXPECT_DEATH(scudo::reportAlignmentTooBig(123, 456), "Scudo ERROR.*123.*456");
-  EXPECT_DEATH(scudo::reportAllocationSizeTooBig(123, 456, 789),
-               "Scudo ERROR.*123.*456.*789");
-  EXPECT_DEATH(scudo::reportOutOfMemory(4242), "Scudo ERROR.*4242");
-  EXPECT_DEATH(
-      scudo::reportInvalidChunkState(scudo::AllocatorAction::Recycling, P),
-      "Scudo ERROR.*recycling.*42424242");
-  EXPECT_DEATH(
-      scudo::reportInvalidChunkState(scudo::AllocatorAction::Sizing, P),
-      "Scudo ERROR.*sizing.*42424242");
-  EXPECT_DEATH(
-      scudo::reportMisalignedPointer(scudo::AllocatorAction::Deallocating, P),
-      "Scudo ERROR.*deallocating.*42424242");
-  EXPECT_DEATH(scudo::reportDeallocTypeMismatch(
-                   scudo::AllocatorAction::Reallocating, P, 0, 1),
-               "Scudo ERROR.*reallocating.*42424242");
-  EXPECT_DEATH(scudo::reportDeleteSizeMismatch(P, 123, 456),
-               "Scudo ERROR.*42424242.*123.*456");
-}
-
-TEST(ScudoReportDeathTest, CSpecific) {
-  EXPECT_DEATH(scudo::reportAlignmentNotPowerOfTwo(123), "Scudo ERROR.*123");
-  EXPECT_DEATH(scudo::reportCallocOverflow(123, 456), "Scudo ERROR.*123.*456");
-  EXPECT_DEATH(scudo::reportInvalidPosixMemalignAlignment(789),
-               "Scudo ERROR.*789");
-  EXPECT_DEATH(scudo::reportPvallocOverflow(123), "Scudo ERROR.*123");
-  EXPECT_DEATH(scudo::reportInvalidAlignedAllocAlignment(123, 456),
-               "Scudo ERROR.*123.*456");
-}
diff --git a/Telegram/ThirdParty/scudo/tests/scudo_unit_test.h b/Telegram/ThirdParty/scudo/tests/scudo_unit_test.h
deleted file mode 100644
index 428341643..000000000
--- a/Telegram/ThirdParty/scudo/tests/scudo_unit_test.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//===-- scudo_unit_test.h ---------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-#if SCUDO_FUCHSIA
-#include <zxtest/zxtest.h>
-using Test = ::zxtest::Test;
-#else
-#include "gtest/gtest.h"
-using Test = ::testing::Test;
-#endif
-
-// If EXPECT_DEATH isn't defined, make it a no-op.
-#ifndef EXPECT_DEATH
-// If ASSERT_DEATH is defined, make EXPECT_DEATH a wrapper to it.
-#ifdef ASSERT_DEATH
-#define EXPECT_DEATH(X, Y) ASSERT_DEATH(([&] { X; }), "")
-#else
-#define EXPECT_DEATH(X, Y)                                                     \
-  do {                                                                         \
-  } while (0)
-#endif // ASSERT_DEATH
-#endif // EXPECT_DEATH
-
-// If EXPECT_STREQ isn't defined, define our own simple one.
-#ifndef EXPECT_STREQ
-#define EXPECT_STREQ(X, Y) EXPECT_EQ(strcmp(X, Y), 0)
-#endif
-
-#if SCUDO_FUCHSIA
-#define SKIP_ON_FUCHSIA(T) DISABLED_##T
-#else
-#define SKIP_ON_FUCHSIA(T) T
-#endif
-
-#if SCUDO_DEBUG
-#define SKIP_NO_DEBUG(T) T
-#else
-#define SKIP_NO_DEBUG(T) DISABLED_##T
-#endif
-
-#if SCUDO_FUCHSIA
-// The zxtest library provides a default main function that does the same thing
-// for Fuchsia builds.
-#define SCUDO_NO_TEST_MAIN
-#endif
-
-extern bool UseQuarantine;
diff --git a/Telegram/ThirdParty/scudo/tests/scudo_unit_test_main.cpp b/Telegram/ThirdParty/scudo/tests/scudo_unit_test_main.cpp
deleted file mode 100644
index 881e0265b..000000000
--- a/Telegram/ThirdParty/scudo/tests/scudo_unit_test_main.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-//===-- scudo_unit_test_main.cpp --------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "memtag.h"
-#include "tests/scudo_unit_test.h"
-
-// Match Android's default configuration, which disables Scudo's mismatch
-// allocation check, as it is being triggered by some third party code.
-#if SCUDO_ANDROID
-#define DEALLOC_TYPE_MISMATCH "false"
-#else
-#define DEALLOC_TYPE_MISMATCH "true"
-#endif
-
-static void EnableMemoryTaggingIfSupported() {
-  if (!scudo::archSupportsMemoryTagging())
-    return;
-  static bool Done = []() {
-    if (!scudo::systemDetectsMemoryTagFaultsTestOnly())
-      scudo::enableSystemMemoryTaggingTestOnly();
-    return true;
-  }();
-  (void)Done;
-}
-
-// This allows us to turn on/off a Quarantine for specific tests. The Quarantine
-// parameters are on the low end, to avoid having to loop excessively in some
-// tests.
-bool UseQuarantine = true;
-extern "C" __attribute__((visibility("default"))) const char *
-__scudo_default_options() {
-  // The wrapper tests initialize the global allocator early, before main(). We
-  // need to have Memory Tagging enabled before that happens or the allocator
-  // will disable the feature entirely.
-  EnableMemoryTaggingIfSupported();
-  if (!UseQuarantine)
-    return "dealloc_type_mismatch=" DEALLOC_TYPE_MISMATCH;
-  return "quarantine_size_kb=256:thread_local_quarantine_size_kb=128:"
-         "quarantine_max_chunk_size=512:"
-         "dealloc_type_mismatch=" DEALLOC_TYPE_MISMATCH;
-}
-
-#if !defined(SCUDO_NO_TEST_MAIN)
-int main(int argc, char **argv) {
-  EnableMemoryTaggingIfSupported();
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-#endif
diff --git a/Telegram/ThirdParty/scudo/tests/secondary_test.cpp b/Telegram/ThirdParty/scudo/tests/secondary_test.cpp
deleted file mode 100644
index 18d2e187f..000000000
--- a/Telegram/ThirdParty/scudo/tests/secondary_test.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-//===-- secondary_test.cpp --------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "memtag.h"
-#include "tests/scudo_unit_test.h"
-
-#include "allocator_config.h"
-#include "secondary.h"
-
-#include <algorithm>
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <stdio.h>
-#include <thread>
-#include <vector>
-
-template <typename Config> static scudo::Options getOptionsForConfig() {
-  if (!Config::MaySupportMemoryTagging || !scudo::archSupportsMemoryTagging() ||
-      !scudo::systemSupportsMemoryTagging())
-    return {};
-  scudo::AtomicOptions AO;
-  AO.set(scudo::OptionBit::UseMemoryTagging);
-  return AO.load();
-}
-
-template <typename Config> static void testSecondaryBasic(void) {
-  using SecondaryT = scudo::MapAllocator<Config>;
-  scudo::Options Options = getOptionsForConfig<Config>();
-
-  scudo::GlobalStats S;
-  S.init();
-  std::unique_ptr<SecondaryT> L(new SecondaryT);
-  L->init(&S);
-  const scudo::uptr Size = 1U << 16;
-  void *P = L->allocate(Options, Size);
-  EXPECT_NE(P, nullptr);
-  memset(P, 'A', Size);
-  EXPECT_GE(SecondaryT::getBlockSize(P), Size);
-  L->deallocate(Options, P);
-
-  // If the Secondary can't cache that pointer, it will be unmapped.
-  if (!L->canCache(Size)) {
-    EXPECT_DEATH(
-        {
-          // Repeat few time to avoid missing crash if it's mmaped by unrelated
-          // code.
-          for (int i = 0; i < 10; ++i) {
-            P = L->allocate(Options, Size);
-            L->deallocate(Options, P);
-            memset(P, 'A', Size);
-          }
-        },
-        "");
-  }
-
-  const scudo::uptr Align = 1U << 16;
-  P = L->allocate(Options, Size + Align, Align);
-  EXPECT_NE(P, nullptr);
-  void *AlignedP = reinterpret_cast<void *>(
-      scudo::roundUp(reinterpret_cast<scudo::uptr>(P), Align));
-  memset(AlignedP, 'A', Size);
-  L->deallocate(Options, P);
-
-  std::vector<void *> V;
-  for (scudo::uptr I = 0; I < 32U; I++)
-    V.push_back(L->allocate(Options, Size));
-  std::shuffle(V.begin(), V.end(), std::mt19937(std::random_device()()));
-  while (!V.empty()) {
-    L->deallocate(Options, V.back());
-    V.pop_back();
-  }
-  scudo::ScopedString Str;
-  L->getStats(&Str);
-  Str.output();
-  L->unmapTestOnly();
-}
-
-struct NoCacheConfig {
-  static const bool MaySupportMemoryTagging = false;
-  struct Secondary {
-    template <typename Config>
-    using CacheT = scudo::MapAllocatorNoCache<Config>;
-  };
-};
-
-struct TestConfig {
-  static const bool MaySupportMemoryTagging = false;
-  struct Secondary {
-    struct Cache {
-      static const scudo::u32 EntriesArraySize = 128U;
-      static const scudo::u32 QuarantineSize = 0U;
-      static const scudo::u32 DefaultMaxEntriesCount = 64U;
-      static const scudo::uptr DefaultMaxEntrySize = 1UL << 20;
-      static const scudo::s32 MinReleaseToOsIntervalMs = INT32_MIN;
-      static const scudo::s32 MaxReleaseToOsIntervalMs = INT32_MAX;
-    };
-
-    template <typename Config> using CacheT = scudo::MapAllocatorCache<Config>;
-  };
-};
-
-TEST(ScudoSecondaryTest, SecondaryBasic) {
-  testSecondaryBasic<NoCacheConfig>();
-  testSecondaryBasic<scudo::DefaultConfig>();
-  testSecondaryBasic<TestConfig>();
-}
-
-struct MapAllocatorTest : public Test {
-  using Config = scudo::DefaultConfig;
-  using LargeAllocator = scudo::MapAllocator<Config>;
-
-  void SetUp() override { Allocator->init(nullptr); }
-
-  void TearDown() override { Allocator->unmapTestOnly(); }
-
-  std::unique_ptr<LargeAllocator> Allocator =
-      std::make_unique<LargeAllocator>();
-  scudo::Options Options = getOptionsForConfig<Config>();
-};
-
-// This exercises a variety of combinations of size and alignment for the
-// MapAllocator. The size computation done here mimic the ones done by the
-// combined allocator.
-TEST_F(MapAllocatorTest, SecondaryCombinations) {
-  constexpr scudo::uptr MinAlign = FIRST_32_SECOND_64(8, 16);
-  constexpr scudo::uptr HeaderSize = scudo::roundUp(8, MinAlign);
-  for (scudo::uptr SizeLog = 0; SizeLog <= 20; SizeLog++) {
-    for (scudo::uptr AlignLog = FIRST_32_SECOND_64(3, 4); AlignLog <= 16;
-         AlignLog++) {
-      const scudo::uptr Align = 1U << AlignLog;
-      for (scudo::sptr Delta = -128; Delta <= 128; Delta += 8) {
-        if ((1LL << SizeLog) + Delta <= 0)
-          continue;
-        const scudo::uptr UserSize = scudo::roundUp(
-            static_cast<scudo::uptr>((1LL << SizeLog) + Delta), MinAlign);
-        const scudo::uptr Size =
-            HeaderSize + UserSize + (Align > MinAlign ? Align - HeaderSize : 0);
-        void *P = Allocator->allocate(Options, Size, Align);
-        EXPECT_NE(P, nullptr);
-        void *AlignedP = reinterpret_cast<void *>(
-            scudo::roundUp(reinterpret_cast<scudo::uptr>(P), Align));
-        memset(AlignedP, 0xff, UserSize);
-        Allocator->deallocate(Options, P);
-      }
-    }
-  }
-  scudo::ScopedString Str;
-  Allocator->getStats(&Str);
-  Str.output();
-}
-
-TEST_F(MapAllocatorTest, SecondaryIterate) {
-  std::vector<void *> V;
-  const scudo::uptr PageSize = scudo::getPageSizeCached();
-  for (scudo::uptr I = 0; I < 32U; I++)
-    V.push_back(Allocator->allocate(
-        Options, (static_cast<scudo::uptr>(std::rand()) % 16U) * PageSize));
-  auto Lambda = [&V](scudo::uptr Block) {
-    EXPECT_NE(std::find(V.begin(), V.end(), reinterpret_cast<void *>(Block)),
-              V.end());
-  };
-  Allocator->disable();
-  Allocator->iterateOverBlocks(Lambda);
-  Allocator->enable();
-  while (!V.empty()) {
-    Allocator->deallocate(Options, V.back());
-    V.pop_back();
-  }
-  scudo::ScopedString Str;
-  Allocator->getStats(&Str);
-  Str.output();
-}
-
-TEST_F(MapAllocatorTest, SecondaryOptions) {
-  // Attempt to set a maximum number of entries higher than the array size.
-  EXPECT_FALSE(
-      Allocator->setOption(scudo::Option::MaxCacheEntriesCount, 4096U));
-  // A negative number will be cast to a scudo::u32, and fail.
-  EXPECT_FALSE(Allocator->setOption(scudo::Option::MaxCacheEntriesCount, -1));
-  if (Allocator->canCache(0U)) {
-    // Various valid combinations.
-    EXPECT_TRUE(Allocator->setOption(scudo::Option::MaxCacheEntriesCount, 4U));
-    EXPECT_TRUE(
-        Allocator->setOption(scudo::Option::MaxCacheEntrySize, 1UL << 20));
-    EXPECT_TRUE(Allocator->canCache(1UL << 18));
-    EXPECT_TRUE(
-        Allocator->setOption(scudo::Option::MaxCacheEntrySize, 1UL << 17));
-    EXPECT_FALSE(Allocator->canCache(1UL << 18));
-    EXPECT_TRUE(Allocator->canCache(1UL << 16));
-    EXPECT_TRUE(Allocator->setOption(scudo::Option::MaxCacheEntriesCount, 0U));
-    EXPECT_FALSE(Allocator->canCache(1UL << 16));
-    EXPECT_TRUE(Allocator->setOption(scudo::Option::MaxCacheEntriesCount, 4U));
-    EXPECT_TRUE(
-        Allocator->setOption(scudo::Option::MaxCacheEntrySize, 1UL << 20));
-    EXPECT_TRUE(Allocator->canCache(1UL << 16));
-  }
-}
-
-struct MapAllocatorWithReleaseTest : public MapAllocatorTest {
-  void SetUp() override { Allocator->init(nullptr, /*ReleaseToOsInterval=*/0); }
-
-  void performAllocations() {
-    std::vector<void *> V;
-    const scudo::uptr PageSize = scudo::getPageSizeCached();
-    {
-      std::unique_lock<std::mutex> Lock(Mutex);
-      while (!Ready)
-        Cv.wait(Lock);
-    }
-    for (scudo::uptr I = 0; I < 128U; I++) {
-      // Deallocate 75% of the blocks.
-      const bool Deallocate = (std::rand() & 3) != 0;
-      void *P = Allocator->allocate(
-          Options, (static_cast<scudo::uptr>(std::rand()) % 16U) * PageSize);
-      if (Deallocate)
-        Allocator->deallocate(Options, P);
-      else
-        V.push_back(P);
-    }
-    while (!V.empty()) {
-      Allocator->deallocate(Options, V.back());
-      V.pop_back();
-    }
-  }
-
-  std::mutex Mutex;
-  std::condition_variable Cv;
-  bool Ready = false;
-};
-
-TEST_F(MapAllocatorWithReleaseTest, SecondaryThreadsRace) {
-  std::thread Threads[16];
-  for (scudo::uptr I = 0; I < ARRAY_SIZE(Threads); I++)
-    Threads[I] =
-        std::thread(&MapAllocatorWithReleaseTest::performAllocations, this);
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    Ready = true;
-    Cv.notify_all();
-  }
-  for (auto &T : Threads)
-    T.join();
-  scudo::ScopedString Str;
-  Allocator->getStats(&Str);
-  Str.output();
-}
diff --git a/Telegram/ThirdParty/scudo/tests/size_class_map_test.cpp b/Telegram/ThirdParty/scudo/tests/size_class_map_test.cpp
deleted file mode 100644
index 05b5835ff..000000000
--- a/Telegram/ThirdParty/scudo/tests/size_class_map_test.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//===-- size_class_map_test.cpp ---------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "size_class_map.h"
-
-template <class SizeClassMap> void testSizeClassMap() {
-  typedef SizeClassMap SCMap;
-  scudo::printMap<SCMap>();
-  scudo::validateMap<SCMap>();
-}
-
-TEST(ScudoSizeClassMapTest, DefaultSizeClassMap) {
-  testSizeClassMap<scudo::DefaultSizeClassMap>();
-}
-
-TEST(ScudoSizeClassMapTest, AndroidSizeClassMap) {
-  testSizeClassMap<scudo::AndroidSizeClassMap>();
-}
-
-struct OneClassSizeClassConfig {
-  static const scudo::uptr NumBits = 1;
-  static const scudo::uptr MinSizeLog = 5;
-  static const scudo::uptr MidSizeLog = 5;
-  static const scudo::uptr MaxSizeLog = 5;
-  static const scudo::u16 MaxNumCachedHint = 0;
-  static const scudo::uptr MaxBytesCachedLog = 0;
-  static const scudo::uptr SizeDelta = 0;
-};
-
-TEST(ScudoSizeClassMapTest, OneClassSizeClassMap) {
-  testSizeClassMap<scudo::FixedSizeClassMap<OneClassSizeClassConfig>>();
-}
-
-#if SCUDO_CAN_USE_PRIMARY64
-struct LargeMaxSizeClassConfig {
-  static const scudo::uptr NumBits = 3;
-  static const scudo::uptr MinSizeLog = 4;
-  static const scudo::uptr MidSizeLog = 8;
-  static const scudo::uptr MaxSizeLog = 63;
-  static const scudo::u16 MaxNumCachedHint = 128;
-  static const scudo::uptr MaxBytesCachedLog = 16;
-  static const scudo::uptr SizeDelta = 0;
-};
-
-TEST(ScudoSizeClassMapTest, LargeMaxSizeClassMap) {
-  testSizeClassMap<scudo::FixedSizeClassMap<LargeMaxSizeClassConfig>>();
-}
-#endif
diff --git a/Telegram/ThirdParty/scudo/tests/stats_test.cpp b/Telegram/ThirdParty/scudo/tests/stats_test.cpp
deleted file mode 100644
index cdadfbad3..000000000
--- a/Telegram/ThirdParty/scudo/tests/stats_test.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//===-- stats_test.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "stats.h"
-
-TEST(ScudoStatsTest, LocalStats) {
-  scudo::LocalStats LStats;
-  LStats.init();
-  for (scudo::uptr I = 0; I < scudo::StatCount; I++)
-    EXPECT_EQ(LStats.get(static_cast<scudo::StatType>(I)), 0U);
-  LStats.add(scudo::StatAllocated, 4096U);
-  EXPECT_EQ(LStats.get(scudo::StatAllocated), 4096U);
-  LStats.sub(scudo::StatAllocated, 4096U);
-  EXPECT_EQ(LStats.get(scudo::StatAllocated), 0U);
-  LStats.set(scudo::StatAllocated, 4096U);
-  EXPECT_EQ(LStats.get(scudo::StatAllocated), 4096U);
-}
-
-TEST(ScudoStatsTest, GlobalStats) {
-  scudo::GlobalStats GStats;
-  GStats.init();
-  scudo::uptr Counters[scudo::StatCount] = {};
-  GStats.get(Counters);
-  for (scudo::uptr I = 0; I < scudo::StatCount; I++)
-    EXPECT_EQ(Counters[I], 0U);
-  scudo::LocalStats LStats;
-  LStats.init();
-  GStats.link(&LStats);
-  for (scudo::uptr I = 0; I < scudo::StatCount; I++)
-    LStats.add(static_cast<scudo::StatType>(I), 4096U);
-  GStats.get(Counters);
-  for (scudo::uptr I = 0; I < scudo::StatCount; I++)
-    EXPECT_EQ(Counters[I], 4096U);
-  // Unlinking the local stats move numbers to the global stats.
-  GStats.unlink(&LStats);
-  GStats.get(Counters);
-  for (scudo::uptr I = 0; I < scudo::StatCount; I++)
-    EXPECT_EQ(Counters[I], 4096U);
-}
diff --git a/Telegram/ThirdParty/scudo/tests/strings_test.cpp b/Telegram/ThirdParty/scudo/tests/strings_test.cpp
deleted file mode 100644
index 7a69ffd97..000000000
--- a/Telegram/ThirdParty/scudo/tests/strings_test.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-//===-- strings_test.cpp ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "string_utils.h"
-
-#include <limits.h>
-
-TEST(ScudoStringsTest, Constructor) {
-  scudo::ScopedString Str;
-  EXPECT_EQ(0ul, Str.length());
-  EXPECT_EQ('\0', *Str.data());
-}
-
-TEST(ScudoStringsTest, Basic) {
-  scudo::ScopedString Str;
-  Str.append("a%db%zdc%ue%zuf%xh%zxq%pe%sr", static_cast<int>(-1),
-             static_cast<scudo::uptr>(-2), static_cast<unsigned>(-4),
-             static_cast<scudo::uptr>(5), static_cast<unsigned>(10),
-             static_cast<scudo::uptr>(11), reinterpret_cast<void *>(0x123),
-             "_string_");
-  EXPECT_EQ(Str.length(), strlen(Str.data()));
-
-  std::string expectedString = "a-1b-2c4294967292e5fahbq0x";
-  expectedString += std::string(SCUDO_POINTER_FORMAT_LENGTH - 3, '0');
-  expectedString += "123e_string_r";
-  EXPECT_EQ(Str.length(), strlen(Str.data()));
-  EXPECT_STREQ(expectedString.c_str(), Str.data());
-}
-
-TEST(ScudoStringsTest, Clear) {
-  scudo::ScopedString Str;
-  Str.append("123");
-  Str.clear();
-  EXPECT_EQ(0ul, Str.length());
-  EXPECT_EQ('\0', *Str.data());
-}
-
-TEST(ScudoStringsTest, ClearLarge) {
-  constexpr char appendString[] = "123";
-  scudo::ScopedString Str;
-  Str.reserve(sizeof(appendString) * 10000);
-  for (int i = 0; i < 10000; ++i)
-    Str.append(appendString);
-  Str.clear();
-  EXPECT_EQ(0ul, Str.length());
-  EXPECT_EQ('\0', *Str.data());
-}
-
-TEST(ScudoStringsTest, Precision) {
-  scudo::ScopedString Str;
-  Str.append("%.*s", 3, "12345");
-  EXPECT_EQ(Str.length(), strlen(Str.data()));
-  EXPECT_STREQ("123", Str.data());
-  Str.clear();
-  Str.append("%.*s", 6, "12345");
-  EXPECT_EQ(Str.length(), strlen(Str.data()));
-  EXPECT_STREQ("12345", Str.data());
-  Str.clear();
-  Str.append("%-6s", "12345");
-  EXPECT_EQ(Str.length(), strlen(Str.data()));
-  EXPECT_STREQ("12345 ", Str.data());
-}
-
-static void fillString(scudo::ScopedString &Str, scudo::uptr Size) {
-  for (scudo::uptr I = 0; I < Size; I++)
-    Str.append("A");
-}
-
-TEST(ScudoStringTest, PotentialOverflows) {
-  // Use a ScopedString that spans a page, and attempt to write past the end
-  // of it with variations of append. The expectation is for nothing to crash.
-  const scudo::uptr PageSize = scudo::getPageSizeCached();
-  scudo::ScopedString Str;
-  Str.reserve(2 * PageSize);
-  Str.clear();
-  fillString(Str, 2 * PageSize);
-  Str.clear();
-  fillString(Str, PageSize - 64);
-  Str.append("%-128s", "12345");
-  Str.clear();
-  fillString(Str, PageSize - 16);
-  Str.append("%024x", 12345);
-  Str.clear();
-  fillString(Str, PageSize - 16);
-  Str.append("EEEEEEEEEEEEEEEEEEEEEEEE");
-}
-
-template <typename T>
-static void testAgainstLibc(const char *Format, T Arg1, T Arg2) {
-  scudo::ScopedString Str;
-  Str.append(Format, Arg1, Arg2);
-  char Buffer[128];
-  snprintf(Buffer, sizeof(Buffer), Format, Arg1, Arg2);
-  EXPECT_EQ(Str.length(), strlen(Str.data()));
-  EXPECT_STREQ(Buffer, Str.data());
-}
-
-TEST(ScudoStringsTest, MinMax) {
-  testAgainstLibc<int>("%d-%d", INT_MIN, INT_MAX);
-  testAgainstLibc<unsigned>("%u-%u", 0, UINT_MAX);
-  testAgainstLibc<unsigned>("%x-%x", 0, UINT_MAX);
-  testAgainstLibc<long>("%zd-%zd", LONG_MIN, LONG_MAX);
-  testAgainstLibc<unsigned long>("%zu-%zu", 0, ULONG_MAX);
-  testAgainstLibc<unsigned long>("%zx-%zx", 0, ULONG_MAX);
-}
-
-TEST(ScudoStringsTest, Padding) {
-  testAgainstLibc<int>("%3d - %3d", 1, 0);
-  testAgainstLibc<int>("%3d - %3d", -1, 123);
-  testAgainstLibc<int>("%3d - %3d", -1, -123);
-  testAgainstLibc<int>("%3d - %3d", 12, 1234);
-  testAgainstLibc<int>("%3d - %3d", -12, -1234);
-  testAgainstLibc<int>("%03d - %03d", 1, 0);
-  testAgainstLibc<int>("%03d - %03d", -1, 123);
-  testAgainstLibc<int>("%03d - %03d", -1, -123);
-  testAgainstLibc<int>("%03d - %03d", 12, 1234);
-  testAgainstLibc<int>("%03d - %03d", -12, -1234);
-}
diff --git a/Telegram/ThirdParty/scudo/tests/timing_test.cpp b/Telegram/ThirdParty/scudo/tests/timing_test.cpp
deleted file mode 100644
index 09a6c3122..000000000
--- a/Telegram/ThirdParty/scudo/tests/timing_test.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//===-- timing_test.cpp -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "timing.h"
-
-#include <string>
-
-class ScudoTimingTest : public Test {
-public:
-  void testFunc1() { scudo::ScopedTimer ST(Manager, __func__); }
-
-  void testFunc2() {
-    scudo::ScopedTimer ST(Manager, __func__);
-    testFunc1();
-  }
-
-  void testChainedCalls() {
-    scudo::ScopedTimer ST(Manager, __func__);
-    testFunc2();
-  }
-
-  void testIgnoredTimer() {
-    scudo::ScopedTimer ST(Manager, __func__);
-    ST.ignore();
-  }
-
-  void printAllTimersStats() { Manager.printAll(); }
-
-  scudo::TimingManager &getTimingManager() { return Manager; }
-
-private:
-  scudo::TimingManager Manager;
-};
-
-// Given that the output of statistics of timers are dumped through
-// `scudo::Printf` which is platform dependent, so we don't have a reliable way
-// to catch the output and verify the details. Now we only verify the number of
-// invocations on linux.
-TEST_F(ScudoTimingTest, SimpleTimer) {
-#if SCUDO_LINUX
-  testing::internal::LogToStderr();
-  testing::internal::CaptureStderr();
-#endif
-
-  testIgnoredTimer();
-  testChainedCalls();
-  printAllTimersStats();
-
-#if SCUDO_LINUX
-  std::string output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(output.find("testIgnoredTimer (1)") == std::string::npos);
-  EXPECT_TRUE(output.find("testChainedCalls (1)") != std::string::npos);
-  EXPECT_TRUE(output.find("testFunc2 (1)") != std::string::npos);
-  EXPECT_TRUE(output.find("testFunc1 (1)") != std::string::npos);
-#endif
-}
-
-TEST_F(ScudoTimingTest, NestedTimer) {
-#if SCUDO_LINUX
-  testing::internal::LogToStderr();
-  testing::internal::CaptureStderr();
-#endif
-
-  {
-    scudo::ScopedTimer Outer(getTimingManager(), "Outer");
-    {
-      scudo::ScopedTimer Inner1(getTimingManager(), Outer, "Inner1");
-      { scudo::ScopedTimer Inner2(getTimingManager(), Inner1, "Inner2"); }
-    }
-  }
-  printAllTimersStats();
-
-#if SCUDO_LINUX
-  std::string output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(output.find("Outer (1)") != std::string::npos);
-  EXPECT_TRUE(output.find("Inner1 (1)") != std::string::npos);
-  EXPECT_TRUE(output.find("Inner2 (1)") != std::string::npos);
-#endif
-}
diff --git a/Telegram/ThirdParty/scudo/tests/tsd_test.cpp b/Telegram/ThirdParty/scudo/tests/tsd_test.cpp
deleted file mode 100644
index fad8fcf90..000000000
--- a/Telegram/ThirdParty/scudo/tests/tsd_test.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-//===-- tsd_test.cpp --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "tsd_exclusive.h"
-#include "tsd_shared.h"
-
-#include <stdlib.h>
-
-#include <condition_variable>
-#include <mutex>
-#include <set>
-#include <thread>
-
-// We mock out an allocator with a TSD registry, mostly using empty stubs. The
-// cache contains a single volatile uptr, to be able to test that several
-// concurrent threads will not access or modify the same cache at the same time.
-template <class Config> class MockAllocator {
-public:
-  using ThisT = MockAllocator<Config>;
-  using TSDRegistryT = typename Config::template TSDRegistryT<ThisT>;
-  using CacheT = struct MockCache {
-    volatile scudo::uptr Canary;
-  };
-  using QuarantineCacheT = struct MockQuarantine {};
-
-  void init() {
-    // This should only be called once by the registry.
-    EXPECT_FALSE(Initialized);
-    Initialized = true;
-  }
-
-  void unmapTestOnly() { TSDRegistry.unmapTestOnly(this); }
-  void initCache(CacheT *Cache) { *Cache = {}; }
-  void commitBack(UNUSED scudo::TSD<MockAllocator> *TSD) {}
-  TSDRegistryT *getTSDRegistry() { return &TSDRegistry; }
-  void callPostInitCallback() {}
-
-  bool isInitialized() { return Initialized; }
-
-  void *operator new(size_t Size) {
-    void *P = nullptr;
-    EXPECT_EQ(0, posix_memalign(&P, alignof(ThisT), Size));
-    return P;
-  }
-  void operator delete(void *P) { free(P); }
-
-private:
-  bool Initialized = false;
-  TSDRegistryT TSDRegistry;
-};
-
-struct OneCache {
-  template <class Allocator>
-  using TSDRegistryT = scudo::TSDRegistrySharedT<Allocator, 1U, 1U>;
-};
-
-struct SharedCaches {
-  template <class Allocator>
-  using TSDRegistryT = scudo::TSDRegistrySharedT<Allocator, 16U, 8U>;
-};
-
-struct ExclusiveCaches {
-  template <class Allocator>
-  using TSDRegistryT = scudo::TSDRegistryExT<Allocator>;
-};
-
-TEST(ScudoTSDTest, TSDRegistryInit) {
-  using AllocatorT = MockAllocator<OneCache>;
-  auto Deleter = [](AllocatorT *A) {
-    A->unmapTestOnly();
-    delete A;
-  };
-  std::unique_ptr<AllocatorT, decltype(Deleter)> Allocator(new AllocatorT,
-                                                           Deleter);
-  EXPECT_FALSE(Allocator->isInitialized());
-
-  auto Registry = Allocator->getTSDRegistry();
-  Registry->initOnceMaybe(Allocator.get());
-  EXPECT_TRUE(Allocator->isInitialized());
-}
-
-template <class AllocatorT> static void testRegistry() {
-  auto Deleter = [](AllocatorT *A) {
-    A->unmapTestOnly();
-    delete A;
-  };
-  std::unique_ptr<AllocatorT, decltype(Deleter)> Allocator(new AllocatorT,
-                                                           Deleter);
-  EXPECT_FALSE(Allocator->isInitialized());
-
-  auto Registry = Allocator->getTSDRegistry();
-  Registry->initThreadMaybe(Allocator.get(), /*MinimalInit=*/true);
-  EXPECT_TRUE(Allocator->isInitialized());
-
-  bool UnlockRequired;
-  auto TSD = Registry->getTSDAndLock(&UnlockRequired);
-  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-  EXPECT_NE(TSD, nullptr);
-  EXPECT_EQ(TSD->getCache().Canary, 0U);
-  if (UnlockRequired)
-    TSD->unlock();
-
-  Registry->initThreadMaybe(Allocator.get(), /*MinimalInit=*/false);
-  TSD = Registry->getTSDAndLock(&UnlockRequired);
-  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-  EXPECT_NE(TSD, nullptr);
-  EXPECT_EQ(TSD->getCache().Canary, 0U);
-  memset(&TSD->getCache(), 0x42, sizeof(TSD->getCache()));
-  if (UnlockRequired)
-    TSD->unlock();
-}
-
-TEST(ScudoTSDTest, TSDRegistryBasic) {
-  testRegistry<MockAllocator<OneCache>>();
-  testRegistry<MockAllocator<SharedCaches>>();
-#if !SCUDO_FUCHSIA
-  testRegistry<MockAllocator<ExclusiveCaches>>();
-#endif
-}
-
-static std::mutex Mutex;
-static std::condition_variable Cv;
-static bool Ready;
-
-template <typename AllocatorT> static void stressCache(AllocatorT *Allocator) {
-  auto Registry = Allocator->getTSDRegistry();
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    while (!Ready)
-      Cv.wait(Lock);
-  }
-  Registry->initThreadMaybe(Allocator, /*MinimalInit=*/false);
-  bool UnlockRequired;
-  auto TSD = Registry->getTSDAndLock(&UnlockRequired);
-  TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-  EXPECT_NE(TSD, nullptr);
-  // For an exclusive TSD, the cache should be empty. We cannot guarantee the
-  // same for a shared TSD.
-  if (!UnlockRequired)
-    EXPECT_EQ(TSD->getCache().Canary, 0U);
-  // Transform the thread id to a uptr to use it as canary.
-  const scudo::uptr Canary = static_cast<scudo::uptr>(
-      std::hash<std::thread::id>{}(std::this_thread::get_id()));
-  TSD->getCache().Canary = Canary;
-  // Loop a few times to make sure that a concurrent thread isn't modifying it.
-  for (scudo::uptr I = 0; I < 4096U; I++)
-    EXPECT_EQ(TSD->getCache().Canary, Canary);
-  if (UnlockRequired)
-    TSD->unlock();
-}
-
-template <class AllocatorT> static void testRegistryThreaded() {
-  Ready = false;
-  auto Deleter = [](AllocatorT *A) {
-    A->unmapTestOnly();
-    delete A;
-  };
-  std::unique_ptr<AllocatorT, decltype(Deleter)> Allocator(new AllocatorT,
-                                                           Deleter);
-  std::thread Threads[32];
-  for (scudo::uptr I = 0; I < ARRAY_SIZE(Threads); I++)
-    Threads[I] = std::thread(stressCache<AllocatorT>, Allocator.get());
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    Ready = true;
-    Cv.notify_all();
-  }
-  for (auto &T : Threads)
-    T.join();
-}
-
-TEST(ScudoTSDTest, TSDRegistryThreaded) {
-  testRegistryThreaded<MockAllocator<OneCache>>();
-  testRegistryThreaded<MockAllocator<SharedCaches>>();
-#if !SCUDO_FUCHSIA
-  testRegistryThreaded<MockAllocator<ExclusiveCaches>>();
-#endif
-}
-
-static std::set<void *> Pointers;
-
-static void stressSharedRegistry(MockAllocator<SharedCaches> *Allocator) {
-  std::set<void *> Set;
-  auto Registry = Allocator->getTSDRegistry();
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    while (!Ready)
-      Cv.wait(Lock);
-  }
-  Registry->initThreadMaybe(Allocator, /*MinimalInit=*/false);
-  bool UnlockRequired;
-  for (scudo::uptr I = 0; I < 4096U; I++) {
-    auto TSD = Registry->getTSDAndLock(&UnlockRequired);
-    TSD->assertLocked(/*BypassCheck=*/!UnlockRequired);
-    EXPECT_NE(TSD, nullptr);
-    Set.insert(reinterpret_cast<void *>(TSD));
-    if (UnlockRequired)
-      TSD->unlock();
-  }
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    Pointers.insert(Set.begin(), Set.end());
-  }
-}
-
-TEST(ScudoTSDTest, TSDRegistryTSDsCount) {
-  Ready = false;
-  Pointers.clear();
-  using AllocatorT = MockAllocator<SharedCaches>;
-  auto Deleter = [](AllocatorT *A) {
-    A->unmapTestOnly();
-    delete A;
-  };
-  std::unique_ptr<AllocatorT, decltype(Deleter)> Allocator(new AllocatorT,
-                                                           Deleter);
-  // We attempt to use as many TSDs as the shared cache offers by creating a
-  // decent amount of threads that will be run concurrently and attempt to get
-  // and lock TSDs. We put them all in a set and count the number of entries
-  // after we are done.
-  std::thread Threads[32];
-  for (scudo::uptr I = 0; I < ARRAY_SIZE(Threads); I++)
-    Threads[I] = std::thread(stressSharedRegistry, Allocator.get());
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    Ready = true;
-    Cv.notify_all();
-  }
-  for (auto &T : Threads)
-    T.join();
-  // The initial number of TSDs we get will be the minimum of the default count
-  // and the number of CPUs.
-  EXPECT_LE(Pointers.size(), 8U);
-  Pointers.clear();
-  auto Registry = Allocator->getTSDRegistry();
-  // Increase the number of TSDs to 16.
-  Registry->setOption(scudo::Option::MaxTSDsCount, 16);
-  Ready = false;
-  for (scudo::uptr I = 0; I < ARRAY_SIZE(Threads); I++)
-    Threads[I] = std::thread(stressSharedRegistry, Allocator.get());
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    Ready = true;
-    Cv.notify_all();
-  }
-  for (auto &T : Threads)
-    T.join();
-  // We should get 16 distinct TSDs back.
-  EXPECT_EQ(Pointers.size(), 16U);
-}
diff --git a/Telegram/ThirdParty/scudo/tests/vector_test.cpp b/Telegram/ThirdParty/scudo/tests/vector_test.cpp
deleted file mode 100644
index dc23c2a34..000000000
--- a/Telegram/ThirdParty/scudo/tests/vector_test.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//===-- vector_test.cpp -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "tests/scudo_unit_test.h"
-
-#include "vector.h"
-
-TEST(ScudoVectorTest, Basic) {
-  scudo::Vector<int> V;
-  EXPECT_EQ(V.size(), 0U);
-  V.push_back(42);
-  EXPECT_EQ(V.size(), 1U);
-  EXPECT_EQ(V[0], 42);
-  V.push_back(43);
-  EXPECT_EQ(V.size(), 2U);
-  EXPECT_EQ(V[0], 42);
-  EXPECT_EQ(V[1], 43);
-}
-
-TEST(ScudoVectorTest, Stride) {
-  scudo::Vector<scudo::uptr> V;
-  for (scudo::uptr I = 0; I < 1000; I++) {
-    V.push_back(I);
-    EXPECT_EQ(V.size(), I + 1U);
-    EXPECT_EQ(V[I], I);
-  }
-  for (scudo::uptr I = 0; I < 1000; I++)
-    EXPECT_EQ(V[I], I);
-}
-
-TEST(ScudoVectorTest, ResizeReduction) {
-  scudo::Vector<int> V;
-  V.push_back(0);
-  V.push_back(0);
-  EXPECT_EQ(V.size(), 2U);
-  V.resize(1);
-  EXPECT_EQ(V.size(), 1U);
-}
diff --git a/Telegram/ThirdParty/scudo/tests/wrappers_c_test.cpp b/Telegram/ThirdParty/scudo/tests/wrappers_c_test.cpp
deleted file mode 100644
index f5e17d721..000000000
--- a/Telegram/ThirdParty/scudo/tests/wrappers_c_test.cpp
+++ /dev/null
@@ -1,663 +0,0 @@
-//===-- wrappers_c_test.cpp -------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "common.h"
-#include "memtag.h"
-#include "scudo/interface.h"
-#include "tests/scudo_unit_test.h"
-
-#include <errno.h>
-#include <limits.h>
-#include <malloc.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <vector>
-
-#ifndef __GLIBC_PREREQ
-#define __GLIBC_PREREQ(x, y) 0
-#endif
-
-#if SCUDO_FUCHSIA
-// Fuchsia only has valloc
-#define HAVE_VALLOC 1
-#elif SCUDO_ANDROID
-// Android only has pvalloc/valloc on 32 bit
-#if !defined(__LP64__)
-#define HAVE_PVALLOC 1
-#define HAVE_VALLOC 1
-#endif // !defined(__LP64__)
-#else
-// All others assumed to support both functions.
-#define HAVE_PVALLOC 1
-#define HAVE_VALLOC 1
-#endif
-
-extern "C" {
-void malloc_enable(void);
-void malloc_disable(void);
-int malloc_iterate(uintptr_t base, size_t size,
-                   void (*callback)(uintptr_t base, size_t size, void *arg),
-                   void *arg);
-void *valloc(size_t size);
-void *pvalloc(size_t size);
-
-#ifndef SCUDO_ENABLE_HOOKS_TESTS
-#define SCUDO_ENABLE_HOOKS_TESTS 0
-#endif
-
-#if (SCUDO_ENABLE_HOOKS_TESTS == 1) && (SCUDO_ENABLE_HOOKS == 0)
-#error "Hooks tests should have hooks enabled as well!"
-#endif
-
-struct AllocContext {
-  void *Ptr;
-  size_t Size;
-};
-struct DeallocContext {
-  void *Ptr;
-};
-struct ReallocContext {
-  void *AllocPtr;
-  void *DeallocPtr;
-  size_t Size;
-};
-static AllocContext AC;
-static DeallocContext DC;
-static ReallocContext RC;
-
-#if (SCUDO_ENABLE_HOOKS_TESTS == 1)
-__attribute__((visibility("default"))) void __scudo_allocate_hook(void *Ptr,
-                                                                  size_t Size) {
-  AC.Ptr = Ptr;
-  AC.Size = Size;
-}
-__attribute__((visibility("default"))) void __scudo_deallocate_hook(void *Ptr) {
-  DC.Ptr = Ptr;
-}
-__attribute__((visibility("default"))) void
-__scudo_realloc_allocate_hook(void *OldPtr, void *NewPtr, size_t Size) {
-  // Verify that __scudo_realloc_deallocate_hook is called first and set the
-  // right pointer.
-  EXPECT_EQ(OldPtr, RC.DeallocPtr);
-  RC.AllocPtr = NewPtr;
-  RC.Size = Size;
-
-  // Note that this is only used for testing. In general, only one pair of hooks
-  // will be invoked in `realloc`. if __scudo_realloc_*_hook are not defined,
-  // it'll call the general hooks only. To make the test easier, we call the
-  // general one here so that either case (whether __scudo_realloc_*_hook are
-  // defined) will be verified without separating them into different tests.
-  __scudo_allocate_hook(NewPtr, Size);
-}
-__attribute__((visibility("default"))) void
-__scudo_realloc_deallocate_hook(void *Ptr) {
-  RC.DeallocPtr = Ptr;
-
-  // See the comment in the __scudo_realloc_allocate_hook above.
-  __scudo_deallocate_hook(Ptr);
-}
-#endif // (SCUDO_ENABLE_HOOKS_TESTS == 1)
-}
-
-class ScudoWrappersCTest : public Test {
-protected:
-  void SetUp() override {
-    if (SCUDO_ENABLE_HOOKS && !SCUDO_ENABLE_HOOKS_TESTS)
-      printf("Hooks are enabled but hooks tests are disabled.\n");
-  }
-
-  void invalidateHookPtrs() {
-    if (SCUDO_ENABLE_HOOKS_TESTS) {
-      void *InvalidPtr = reinterpret_cast<void *>(0xdeadbeef);
-      AC.Ptr = InvalidPtr;
-      DC.Ptr = InvalidPtr;
-      RC.AllocPtr = RC.DeallocPtr = InvalidPtr;
-    }
-  }
-  void verifyAllocHookPtr(UNUSED void *Ptr) {
-    if (SCUDO_ENABLE_HOOKS_TESTS)
-      EXPECT_EQ(Ptr, AC.Ptr);
-  }
-  void verifyAllocHookSize(UNUSED size_t Size) {
-    if (SCUDO_ENABLE_HOOKS_TESTS)
-      EXPECT_EQ(Size, AC.Size);
-  }
-  void verifyDeallocHookPtr(UNUSED void *Ptr) {
-    if (SCUDO_ENABLE_HOOKS_TESTS)
-      EXPECT_EQ(Ptr, DC.Ptr);
-  }
-  void verifyReallocHookPtrs(UNUSED void *OldPtr, void *NewPtr, size_t Size) {
-    if (SCUDO_ENABLE_HOOKS_TESTS) {
-      EXPECT_EQ(OldPtr, RC.DeallocPtr);
-      EXPECT_EQ(NewPtr, RC.AllocPtr);
-      EXPECT_EQ(Size, RC.Size);
-    }
-  }
-};
-using ScudoWrappersCDeathTest = ScudoWrappersCTest;
-
-// Note that every C allocation function in the test binary will be fulfilled
-// by Scudo (this includes the gtest APIs, etc.), which is a test by itself.
-// But this might also lead to unexpected side-effects, since the allocation and
-// deallocation operations in the TEST functions will coexist with others (see
-// the EXPECT_DEATH comment below).
-
-// We have to use a small quarantine to make sure that our double-free tests
-// trigger. Otherwise EXPECT_DEATH ends up reallocating the chunk that was just
-// freed (this depends on the size obviously) and the following free succeeds.
-
-static const size_t Size = 100U;
-
-TEST_F(ScudoWrappersCDeathTest, Malloc) {
-  void *P = malloc(Size);
-  EXPECT_NE(P, nullptr);
-  EXPECT_LE(Size, malloc_usable_size(P));
-  EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % FIRST_32_SECOND_64(8U, 16U), 0U);
-  verifyAllocHookPtr(P);
-  verifyAllocHookSize(Size);
-
-  // An update to this warning in Clang now triggers in this line, but it's ok
-  // because the check is expecting a bad pointer and should fail.
-#if defined(__has_warning) && __has_warning("-Wfree-nonheap-object")
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfree-nonheap-object"
-#endif
-  EXPECT_DEATH(
-      free(reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(P) | 1U)), "");
-#if defined(__has_warning) && __has_warning("-Wfree-nonheap-object")
-#pragma GCC diagnostic pop
-#endif
-
-  free(P);
-  verifyDeallocHookPtr(P);
-  EXPECT_DEATH(free(P), "");
-
-  P = malloc(0U);
-  EXPECT_NE(P, nullptr);
-  free(P);
-
-  errno = 0;
-  EXPECT_EQ(malloc(SIZE_MAX), nullptr);
-  EXPECT_EQ(errno, ENOMEM);
-}
-
-TEST_F(ScudoWrappersCTest, Calloc) {
-  void *P = calloc(1U, Size);
-  EXPECT_NE(P, nullptr);
-  EXPECT_LE(Size, malloc_usable_size(P));
-  verifyAllocHookPtr(P);
-  verifyAllocHookSize(Size);
-  for (size_t I = 0; I < Size; I++)
-    EXPECT_EQ((reinterpret_cast<uint8_t *>(P))[I], 0U);
-  free(P);
-  verifyDeallocHookPtr(P);
-
-  P = calloc(1U, 0U);
-  EXPECT_NE(P, nullptr);
-  free(P);
-  P = calloc(0U, 1U);
-  EXPECT_NE(P, nullptr);
-  free(P);
-
-  errno = 0;
-  EXPECT_EQ(calloc(SIZE_MAX, 1U), nullptr);
-  EXPECT_EQ(errno, ENOMEM);
-  errno = 0;
-  EXPECT_EQ(calloc(static_cast<size_t>(LONG_MAX) + 1U, 2U), nullptr);
-  if (SCUDO_ANDROID)
-    EXPECT_EQ(errno, ENOMEM);
-  errno = 0;
-  EXPECT_EQ(calloc(SIZE_MAX, SIZE_MAX), nullptr);
-  EXPECT_EQ(errno, ENOMEM);
-}
-
-TEST_F(ScudoWrappersCTest, SmallAlign) {
-  // Allocating pointers by the powers of 2 from 1 to 0x10000
-  // Using powers of 2 due to memalign using powers of 2 and test more sizes
-  constexpr size_t MaxSize = 0x10000;
-  std::vector<void *> ptrs;
-  // Reserving space to prevent further allocation during the test
-  ptrs.reserve((scudo::getLeastSignificantSetBitIndex(MaxSize) + 1) *
-               (scudo::getLeastSignificantSetBitIndex(MaxSize) + 1) * 3);
-  for (size_t Size = 1; Size <= MaxSize; Size <<= 1) {
-    for (size_t Align = 1; Align <= MaxSize; Align <<= 1) {
-      for (size_t Count = 0; Count < 3; ++Count) {
-        void *P = memalign(Align, Size);
-        EXPECT_TRUE(reinterpret_cast<uintptr_t>(P) % Align == 0);
-        ptrs.push_back(P);
-      }
-    }
-  }
-  for (void *ptr : ptrs)
-    free(ptr);
-}
-
-TEST_F(ScudoWrappersCTest, Memalign) {
-  void *P;
-  for (size_t I = FIRST_32_SECOND_64(2U, 3U); I <= 18U; I++) {
-    const size_t Alignment = 1U << I;
-
-    P = memalign(Alignment, Size);
-    EXPECT_NE(P, nullptr);
-    EXPECT_LE(Size, malloc_usable_size(P));
-    EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
-    verifyAllocHookPtr(P);
-    verifyAllocHookSize(Size);
-    free(P);
-    verifyDeallocHookPtr(P);
-
-    P = nullptr;
-    EXPECT_EQ(posix_memalign(&P, Alignment, Size), 0);
-    EXPECT_NE(P, nullptr);
-    EXPECT_LE(Size, malloc_usable_size(P));
-    EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
-    verifyAllocHookPtr(P);
-    verifyAllocHookSize(Size);
-    free(P);
-    verifyDeallocHookPtr(P);
-  }
-
-  EXPECT_EQ(memalign(4096U, SIZE_MAX), nullptr);
-  EXPECT_EQ(posix_memalign(&P, 15U, Size), EINVAL);
-  EXPECT_EQ(posix_memalign(&P, 4096U, SIZE_MAX), ENOMEM);
-
-  // Android's memalign accepts non power-of-2 alignments, and 0.
-  if (SCUDO_ANDROID) {
-    for (size_t Alignment = 0U; Alignment <= 128U; Alignment++) {
-      P = memalign(Alignment, 1024U);
-      EXPECT_NE(P, nullptr);
-      verifyAllocHookPtr(P);
-      verifyAllocHookSize(Size);
-      free(P);
-      verifyDeallocHookPtr(P);
-    }
-  }
-}
-
-TEST_F(ScudoWrappersCTest, AlignedAlloc) {
-  const size_t Alignment = 4096U;
-  void *P = aligned_alloc(Alignment, Alignment * 4U);
-  EXPECT_NE(P, nullptr);
-  EXPECT_LE(Alignment * 4U, malloc_usable_size(P));
-  EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
-  verifyAllocHookPtr(P);
-  verifyAllocHookSize(Alignment * 4U);
-  free(P);
-  verifyDeallocHookPtr(P);
-
-  errno = 0;
-  P = aligned_alloc(Alignment, Size);
-  EXPECT_EQ(P, nullptr);
-  EXPECT_EQ(errno, EINVAL);
-}
-
-TEST_F(ScudoWrappersCDeathTest, Realloc) {
-  invalidateHookPtrs();
-  // realloc(nullptr, N) is malloc(N)
-  void *P = realloc(nullptr, Size);
-  EXPECT_NE(P, nullptr);
-  verifyAllocHookPtr(P);
-  verifyAllocHookSize(Size);
-  free(P);
-  verifyDeallocHookPtr(P);
-
-  invalidateHookPtrs();
-  P = malloc(Size);
-  EXPECT_NE(P, nullptr);
-  // realloc(P, 0U) is free(P) and returns nullptr
-  EXPECT_EQ(realloc(P, 0U), nullptr);
-  verifyDeallocHookPtr(P);
-
-  P = malloc(Size);
-  EXPECT_NE(P, nullptr);
-  EXPECT_LE(Size, malloc_usable_size(P));
-  memset(P, 0x42, Size);
-
-  invalidateHookPtrs();
-  void *OldP = P;
-  P = realloc(P, Size * 2U);
-  EXPECT_NE(P, nullptr);
-  EXPECT_LE(Size * 2U, malloc_usable_size(P));
-  for (size_t I = 0; I < Size; I++)
-    EXPECT_EQ(0x42, (reinterpret_cast<uint8_t *>(P))[I]);
-  if (OldP == P) {
-    verifyDeallocHookPtr(OldP);
-    verifyAllocHookPtr(OldP);
-  } else {
-    verifyAllocHookPtr(P);
-    verifyAllocHookSize(Size * 2U);
-    verifyDeallocHookPtr(OldP);
-  }
-  verifyReallocHookPtrs(OldP, P, Size * 2U);
-
-  invalidateHookPtrs();
-  OldP = P;
-  P = realloc(P, Size / 2U);
-  EXPECT_NE(P, nullptr);
-  EXPECT_LE(Size / 2U, malloc_usable_size(P));
-  for (size_t I = 0; I < Size / 2U; I++)
-    EXPECT_EQ(0x42, (reinterpret_cast<uint8_t *>(P))[I]);
-  if (OldP == P) {
-    verifyDeallocHookPtr(OldP);
-    verifyAllocHookPtr(OldP);
-  } else {
-    verifyAllocHookPtr(P);
-    verifyAllocHookSize(Size / 2U);
-  }
-  verifyReallocHookPtrs(OldP, P, Size / 2U);
-  free(P);
-
-  EXPECT_DEATH(P = realloc(P, Size), "");
-
-  errno = 0;
-  EXPECT_EQ(realloc(nullptr, SIZE_MAX), nullptr);
-  EXPECT_EQ(errno, ENOMEM);
-  P = malloc(Size);
-  EXPECT_NE(P, nullptr);
-  errno = 0;
-  EXPECT_EQ(realloc(P, SIZE_MAX), nullptr);
-  EXPECT_EQ(errno, ENOMEM);
-  free(P);
-
-  // Android allows realloc of memalign pointers.
-  if (SCUDO_ANDROID) {
-    const size_t Alignment = 1024U;
-    P = memalign(Alignment, Size);
-    EXPECT_NE(P, nullptr);
-    EXPECT_LE(Size, malloc_usable_size(P));
-    EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
-    memset(P, 0x42, Size);
-
-    P = realloc(P, Size * 2U);
-    EXPECT_NE(P, nullptr);
-    EXPECT_LE(Size * 2U, malloc_usable_size(P));
-    for (size_t I = 0; I < Size; I++)
-      EXPECT_EQ(0x42, (reinterpret_cast<uint8_t *>(P))[I]);
-    free(P);
-  }
-}
-
-#if !SCUDO_FUCHSIA
-TEST_F(ScudoWrappersCTest, MallOpt) {
-  errno = 0;
-  EXPECT_EQ(mallopt(-1000, 1), 0);
-  // mallopt doesn't set errno.
-  EXPECT_EQ(errno, 0);
-
-  EXPECT_EQ(mallopt(M_PURGE, 0), 1);
-
-  EXPECT_EQ(mallopt(M_DECAY_TIME, 1), 1);
-  EXPECT_EQ(mallopt(M_DECAY_TIME, 0), 1);
-  EXPECT_EQ(mallopt(M_DECAY_TIME, 1), 1);
-  EXPECT_EQ(mallopt(M_DECAY_TIME, 0), 1);
-
-  if (SCUDO_ANDROID) {
-    EXPECT_EQ(mallopt(M_CACHE_COUNT_MAX, 100), 1);
-    EXPECT_EQ(mallopt(M_CACHE_SIZE_MAX, 1024 * 1024 * 2), 1);
-    EXPECT_EQ(mallopt(M_TSDS_COUNT_MAX, 10), 1);
-  }
-}
-#endif
-
-TEST_F(ScudoWrappersCTest, OtherAlloc) {
-#if HAVE_PVALLOC
-  const size_t PageSize = static_cast<size_t>(sysconf(_SC_PAGESIZE));
-
-  void *P = pvalloc(Size);
-  EXPECT_NE(P, nullptr);
-  EXPECT_EQ(reinterpret_cast<uintptr_t>(P) & (PageSize - 1), 0U);
-  EXPECT_LE(PageSize, malloc_usable_size(P));
-  verifyAllocHookPtr(P);
-  // Size will be rounded up to PageSize.
-  verifyAllocHookSize(PageSize);
-  free(P);
-  verifyDeallocHookPtr(P);
-
-  EXPECT_EQ(pvalloc(SIZE_MAX), nullptr);
-
-  P = pvalloc(Size);
-  EXPECT_NE(P, nullptr);
-  EXPECT_EQ(reinterpret_cast<uintptr_t>(P) & (PageSize - 1), 0U);
-  free(P);
-#endif
-
-#if HAVE_VALLOC
-  EXPECT_EQ(valloc(SIZE_MAX), nullptr);
-#endif
-}
-
-template<typename FieldType>
-void MallInfoTest() {
-  // mallinfo is deprecated.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  const FieldType BypassQuarantineSize = 1024U;
-  struct mallinfo MI = mallinfo();
-  FieldType Allocated = MI.uordblks;
-  void *P = malloc(BypassQuarantineSize);
-  EXPECT_NE(P, nullptr);
-  MI = mallinfo();
-  EXPECT_GE(MI.uordblks, Allocated + BypassQuarantineSize);
-  EXPECT_GT(MI.hblkhd, static_cast<FieldType>(0));
-  FieldType Free = MI.fordblks;
-  free(P);
-  MI = mallinfo();
-  EXPECT_GE(MI.fordblks, Free + BypassQuarantineSize);
-#pragma clang diagnostic pop
-}
-
-#if !SCUDO_FUCHSIA
-TEST_F(ScudoWrappersCTest, MallInfo) {
-#if SCUDO_ANDROID
-  // Android accidentally set the fields to size_t instead of int.
-  MallInfoTest<size_t>();
-#else
-  MallInfoTest<int>();
-#endif
-}
-#endif
-
-#if __GLIBC_PREREQ(2, 33) || SCUDO_ANDROID
-TEST_F(ScudoWrappersCTest, MallInfo2) {
-  const size_t BypassQuarantineSize = 1024U;
-  struct mallinfo2 MI = mallinfo2();
-  size_t Allocated = MI.uordblks;
-  void *P = malloc(BypassQuarantineSize);
-  EXPECT_NE(P, nullptr);
-  MI = mallinfo2();
-  EXPECT_GE(MI.uordblks, Allocated + BypassQuarantineSize);
-  EXPECT_GT(MI.hblkhd, 0U);
-  size_t Free = MI.fordblks;
-  free(P);
-  MI = mallinfo2();
-  EXPECT_GE(MI.fordblks, Free + BypassQuarantineSize);
-}
-#endif
-
-static uintptr_t BoundaryP;
-static size_t Count;
-
-static void callback(uintptr_t Base, UNUSED size_t Size, UNUSED void *Arg) {
-  if (scudo::archSupportsMemoryTagging()) {
-    Base = scudo::untagPointer(Base);
-    BoundaryP = scudo::untagPointer(BoundaryP);
-  }
-  if (Base == BoundaryP)
-    Count++;
-}
-
-// Verify that a block located on an iteration boundary is not mis-accounted.
-// To achieve this, we allocate a chunk for which the backing block will be
-// aligned on a page, then run the malloc_iterate on both the pages that the
-// block is a boundary for. It must only be seen once by the callback function.
-TEST_F(ScudoWrappersCTest, MallocIterateBoundary) {
-  const size_t PageSize = static_cast<size_t>(sysconf(_SC_PAGESIZE));
-#if SCUDO_ANDROID
-  // Android uses a 16 byte alignment for both 32 bit and 64 bit.
-  const size_t BlockDelta = 16U;
-#else
-  const size_t BlockDelta = FIRST_32_SECOND_64(8U, 16U);
-#endif
-  const size_t SpecialSize = PageSize - BlockDelta;
-
-  // We aren't guaranteed that any size class is exactly a page wide. So we need
-  // to keep making allocations until we get an allocation that starts exactly
-  // on a page boundary. The BlockDelta value is expected to be the number of
-  // bytes to subtract from a returned pointer to get to the actual start of
-  // the pointer in the size class. In practice, this means BlockDelta should
-  // be set to the minimum alignment in bytes for the allocation.
-  //
-  // With a 16-byte block alignment and 4096-byte page size, each allocation has
-  // a probability of (1 - (16/4096)) of failing to meet the alignment
-  // requirements, and the probability of failing 65536 times is
-  // (1 - (16/4096))^65536 < 10^-112. So if we still haven't succeeded after
-  // 65536 tries, give up.
-  uintptr_t Block;
-  void *P = nullptr;
-  for (unsigned I = 0; I != 65536; ++I) {
-    void *PrevP = P;
-    P = malloc(SpecialSize);
-    EXPECT_NE(P, nullptr);
-    *reinterpret_cast<void **>(P) = PrevP;
-    BoundaryP = reinterpret_cast<uintptr_t>(P);
-    Block = BoundaryP - BlockDelta;
-    if ((Block & (PageSize - 1)) == 0U)
-      break;
-  }
-  EXPECT_EQ((Block & (PageSize - 1)), 0U);
-
-  Count = 0U;
-  malloc_disable();
-  malloc_iterate(Block - PageSize, PageSize, callback, nullptr);
-  malloc_iterate(Block, PageSize, callback, nullptr);
-  malloc_enable();
-  EXPECT_EQ(Count, 1U);
-
-  while (P) {
-    void *NextP = *reinterpret_cast<void **>(P);
-    free(P);
-    P = NextP;
-  }
-}
-
-// Fuchsia doesn't have alarm, fork or malloc_info.
-#if !SCUDO_FUCHSIA
-TEST_F(ScudoWrappersCDeathTest, MallocDisableDeadlock) {
-  // We expect heap operations within a disable/enable scope to deadlock.
-  EXPECT_DEATH(
-      {
-        void *P = malloc(Size);
-        EXPECT_NE(P, nullptr);
-        free(P);
-        malloc_disable();
-        alarm(1);
-        P = malloc(Size);
-        malloc_enable();
-      },
-      "");
-}
-
-TEST_F(ScudoWrappersCTest, MallocInfo) {
-  // Use volatile so that the allocations don't get optimized away.
-  void *volatile P1 = malloc(1234);
-  void *volatile P2 = malloc(4321);
-
-  char Buffer[16384];
-  FILE *F = fmemopen(Buffer, sizeof(Buffer), "w+");
-  EXPECT_NE(F, nullptr);
-  errno = 0;
-  EXPECT_EQ(malloc_info(0, F), 0);
-  EXPECT_EQ(errno, 0);
-  fclose(F);
-  EXPECT_EQ(strncmp(Buffer, "<malloc version=\"scudo-", 23), 0);
-  EXPECT_NE(nullptr, strstr(Buffer, "<alloc size=\"1234\" count=\""));
-  EXPECT_NE(nullptr, strstr(Buffer, "<alloc size=\"4321\" count=\""));
-
-  free(P1);
-  free(P2);
-}
-
-TEST_F(ScudoWrappersCDeathTest, Fork) {
-  void *P;
-  pid_t Pid = fork();
-  EXPECT_GE(Pid, 0) << strerror(errno);
-  if (Pid == 0) {
-    P = malloc(Size);
-    EXPECT_NE(P, nullptr);
-    memset(P, 0x42, Size);
-    free(P);
-    _exit(0);
-  }
-  waitpid(Pid, nullptr, 0);
-  P = malloc(Size);
-  EXPECT_NE(P, nullptr);
-  memset(P, 0x42, Size);
-  free(P);
-
-  // fork should stall if the allocator has been disabled.
-  EXPECT_DEATH(
-      {
-        malloc_disable();
-        alarm(1);
-        Pid = fork();
-        EXPECT_GE(Pid, 0);
-      },
-      "");
-}
-
-static pthread_mutex_t Mutex;
-static pthread_cond_t Conditional = PTHREAD_COND_INITIALIZER;
-static bool Ready;
-
-static void *enableMalloc(UNUSED void *Unused) {
-  // Initialize the allocator for this thread.
-  void *P = malloc(Size);
-  EXPECT_NE(P, nullptr);
-  memset(P, 0x42, Size);
-  free(P);
-
-  // Signal the main thread we are ready.
-  pthread_mutex_lock(&Mutex);
-  Ready = true;
-  pthread_cond_signal(&Conditional);
-  pthread_mutex_unlock(&Mutex);
-
-  // Wait for the malloc_disable & fork, then enable the allocator again.
-  sleep(1);
-  malloc_enable();
-
-  return nullptr;
-}
-
-TEST_F(ScudoWrappersCTest, DisableForkEnable) {
-  pthread_t ThreadId;
-  Ready = false;
-  EXPECT_EQ(pthread_create(&ThreadId, nullptr, &enableMalloc, nullptr), 0);
-
-  // Wait for the thread to be warmed up.
-  pthread_mutex_lock(&Mutex);
-  while (!Ready)
-    pthread_cond_wait(&Conditional, &Mutex);
-  pthread_mutex_unlock(&Mutex);
-
-  // Disable the allocator and fork. fork should succeed after malloc_enable.
-  malloc_disable();
-  pid_t Pid = fork();
-  EXPECT_GE(Pid, 0);
-  if (Pid == 0) {
-    void *P = malloc(Size);
-    EXPECT_NE(P, nullptr);
-    memset(P, 0x42, Size);
-    free(P);
-    _exit(0);
-  }
-  waitpid(Pid, nullptr, 0);
-  EXPECT_EQ(pthread_join(ThreadId, 0), 0);
-}
-
-#endif // SCUDO_FUCHSIA
diff --git a/Telegram/ThirdParty/scudo/tests/wrappers_cpp_test.cpp b/Telegram/ThirdParty/scudo/tests/wrappers_cpp_test.cpp
deleted file mode 100644
index c802ed22f..000000000
--- a/Telegram/ThirdParty/scudo/tests/wrappers_cpp_test.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-//===-- wrappers_cpp_test.cpp -----------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "memtag.h"
-#include "tests/scudo_unit_test.h"
-
-#include <atomic>
-#include <condition_variable>
-#include <fstream>
-#include <memory>
-#include <mutex>
-#include <thread>
-#include <vector>
-
-// Android does not support checking for new/delete mismatches.
-#if SCUDO_ANDROID
-#define SKIP_MISMATCH_TESTS 1
-#else
-#define SKIP_MISMATCH_TESTS 0
-#endif
-
-void operator delete(void *, size_t) noexcept;
-void operator delete[](void *, size_t) noexcept;
-
-extern "C" {
-#ifndef SCUDO_ENABLE_HOOKS_TESTS
-#define SCUDO_ENABLE_HOOKS_TESTS 0
-#endif
-
-#if (SCUDO_ENABLE_HOOKS_TESTS == 1) && (SCUDO_ENABLE_HOOKS == 0)
-#error "Hooks tests should have hooks enabled as well!"
-#endif
-
-struct AllocContext {
-  void *Ptr;
-  size_t Size;
-};
-struct DeallocContext {
-  void *Ptr;
-};
-static AllocContext AC;
-static DeallocContext DC;
-
-#if (SCUDO_ENABLE_HOOKS_TESTS == 1)
-__attribute__((visibility("default"))) void __scudo_allocate_hook(void *Ptr,
-                                                                  size_t Size) {
-  AC.Ptr = Ptr;
-  AC.Size = Size;
-}
-__attribute__((visibility("default"))) void __scudo_deallocate_hook(void *Ptr) {
-  DC.Ptr = Ptr;
-}
-#endif // (SCUDO_ENABLE_HOOKS_TESTS == 1)
-}
-
-class ScudoWrappersCppTest : public Test {
-protected:
-  void SetUp() override {
-    if (SCUDO_ENABLE_HOOKS && !SCUDO_ENABLE_HOOKS_TESTS)
-      printf("Hooks are enabled but hooks tests are disabled.\n");
-  }
-
-  void verifyAllocHookPtr(UNUSED void *Ptr) {
-    if (SCUDO_ENABLE_HOOKS_TESTS)
-      EXPECT_EQ(Ptr, AC.Ptr);
-  }
-  void verifyAllocHookSize(UNUSED size_t Size) {
-    if (SCUDO_ENABLE_HOOKS_TESTS)
-      EXPECT_EQ(Size, AC.Size);
-  }
-  void verifyDeallocHookPtr(UNUSED void *Ptr) {
-    if (SCUDO_ENABLE_HOOKS_TESTS)
-      EXPECT_EQ(Ptr, DC.Ptr);
-  }
-
-  template <typename T> void testCxxNew() {
-    T *P = new T;
-    EXPECT_NE(P, nullptr);
-    verifyAllocHookPtr(P);
-    verifyAllocHookSize(sizeof(T));
-    memset(P, 0x42, sizeof(T));
-    EXPECT_DEATH(delete[] P, "");
-    delete P;
-    verifyDeallocHookPtr(P);
-    EXPECT_DEATH(delete P, "");
-
-    P = new T;
-    EXPECT_NE(P, nullptr);
-    memset(P, 0x42, sizeof(T));
-    operator delete(P, sizeof(T));
-    verifyDeallocHookPtr(P);
-
-    P = new (std::nothrow) T;
-    verifyAllocHookPtr(P);
-    verifyAllocHookSize(sizeof(T));
-    EXPECT_NE(P, nullptr);
-    memset(P, 0x42, sizeof(T));
-    delete P;
-    verifyDeallocHookPtr(P);
-
-    const size_t N = 16U;
-    T *A = new T[N];
-    EXPECT_NE(A, nullptr);
-    verifyAllocHookPtr(A);
-    verifyAllocHookSize(sizeof(T) * N);
-    memset(A, 0x42, sizeof(T) * N);
-    EXPECT_DEATH(delete A, "");
-    delete[] A;
-    verifyDeallocHookPtr(A);
-    EXPECT_DEATH(delete[] A, "");
-
-    A = new T[N];
-    EXPECT_NE(A, nullptr);
-    memset(A, 0x42, sizeof(T) * N);
-    operator delete[](A, sizeof(T) * N);
-    verifyDeallocHookPtr(A);
-
-    A = new (std::nothrow) T[N];
-    verifyAllocHookPtr(A);
-    verifyAllocHookSize(sizeof(T) * N);
-    EXPECT_NE(A, nullptr);
-    memset(A, 0x42, sizeof(T) * N);
-    delete[] A;
-    verifyDeallocHookPtr(A);
-  }
-};
-using ScudoWrappersCppDeathTest = ScudoWrappersCppTest;
-
-class Pixel {
-public:
-  enum class Color { Red, Green, Blue };
-  int X = 0;
-  int Y = 0;
-  Color C = Color::Red;
-};
-
-// Note that every Cxx allocation function in the test binary will be fulfilled
-// by Scudo. See the comment in the C counterpart of this file.
-
-TEST_F(ScudoWrappersCppDeathTest, New) {
-  if (getenv("SKIP_TYPE_MISMATCH") || SKIP_MISMATCH_TESTS) {
-    printf("Skipped type mismatch tests.\n");
-    return;
-  }
-  testCxxNew<bool>();
-  testCxxNew<uint8_t>();
-  testCxxNew<uint16_t>();
-  testCxxNew<uint32_t>();
-  testCxxNew<uint64_t>();
-  testCxxNew<float>();
-  testCxxNew<double>();
-  testCxxNew<long double>();
-  testCxxNew<Pixel>();
-}
-
-static std::mutex Mutex;
-static std::condition_variable Cv;
-static bool Ready;
-
-static void stressNew() {
-  std::vector<uintptr_t *> V;
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    while (!Ready)
-      Cv.wait(Lock);
-  }
-  for (size_t I = 0; I < 256U; I++) {
-    const size_t N = static_cast<size_t>(std::rand()) % 128U;
-    uintptr_t *P = new uintptr_t[N];
-    if (P) {
-      memset(P, 0x42, sizeof(uintptr_t) * N);
-      V.push_back(P);
-    }
-  }
-  while (!V.empty()) {
-    delete[] V.back();
-    V.pop_back();
-  }
-}
-
-TEST_F(ScudoWrappersCppTest, ThreadedNew) {
-  // TODO: Investigate why libc sometimes crashes with tag missmatch in
-  // __pthread_clockjoin_ex.
-  std::unique_ptr<scudo::ScopedDisableMemoryTagChecks> NoTags;
-  if (!SCUDO_ANDROID && scudo::archSupportsMemoryTagging() &&
-      scudo::systemSupportsMemoryTagging())
-    NoTags = std::make_unique<scudo::ScopedDisableMemoryTagChecks>();
-
-  Ready = false;
-  std::thread Threads[32];
-  for (size_t I = 0U; I < sizeof(Threads) / sizeof(Threads[0]); I++)
-    Threads[I] = std::thread(stressNew);
-  {
-    std::unique_lock<std::mutex> Lock(Mutex);
-    Ready = true;
-    Cv.notify_all();
-  }
-  for (auto &T : Threads)
-    T.join();
-}
-
-#if !SCUDO_FUCHSIA
-TEST_F(ScudoWrappersCppTest, AllocAfterFork) {
-  // This test can fail flakily when ran as a part of large number of
-  // other tests if the maxmimum number of mappings allowed is low.
-  // We tried to reduce the number of iterations of the loops with
-  // moderate success, so we will now skip this test under those
-  // circumstances.
-  if (SCUDO_LINUX) {
-    long MaxMapCount = 0;
-    // If the file can't be accessed, we proceed with the test.
-    std::ifstream Stream("/proc/sys/vm/max_map_count");
-    if (Stream.good()) {
-      Stream >> MaxMapCount;
-      if (MaxMapCount < 200000)
-        return;
-    }
-  }
-
-  std::atomic_bool Stop;
-
-  // Create threads that simply allocate and free different sizes.
-  std::vector<std::thread *> Threads;
-  for (size_t N = 0; N < 5; N++) {
-    std::thread *T = new std::thread([&Stop] {
-      while (!Stop) {
-        for (size_t SizeLog = 3; SizeLog <= 20; SizeLog++) {
-          char *P = new char[1UL << SizeLog];
-          EXPECT_NE(P, nullptr);
-          // Make sure this value is not optimized away.
-          asm volatile("" : : "r,m"(P) : "memory");
-          delete[] P;
-        }
-      }
-    });
-    Threads.push_back(T);
-  }
-
-  // Create a thread to fork and allocate.
-  for (size_t N = 0; N < 50; N++) {
-    pid_t Pid;
-    if ((Pid = fork()) == 0) {
-      for (size_t SizeLog = 3; SizeLog <= 20; SizeLog++) {
-        char *P = new char[1UL << SizeLog];
-        EXPECT_NE(P, nullptr);
-        // Make sure this value is not optimized away.
-        asm volatile("" : : "r,m"(P) : "memory");
-        // Make sure we can touch all of the allocation.
-        memset(P, 0x32, 1U << SizeLog);
-        // EXPECT_LE(1U << SizeLog, malloc_usable_size(ptr));
-        delete[] P;
-      }
-      _exit(10);
-    }
-    EXPECT_NE(-1, Pid);
-    int Status;
-    EXPECT_EQ(Pid, waitpid(Pid, &Status, 0));
-    EXPECT_FALSE(WIFSIGNALED(Status));
-    EXPECT_EQ(10, WEXITSTATUS(Status));
-  }
-
-  printf("Waiting for threads to complete\n");
-  Stop = true;
-  for (auto Thread : Threads)
-    Thread->join();
-  Threads.clear();
-}
-#endif
diff --git a/Telegram/ThirdParty/scudo/thread_annotations.h b/Telegram/ThirdParty/scudo/thread_annotations.h
deleted file mode 100644
index 68a1087c2..000000000
--- a/Telegram/ThirdParty/scudo/thread_annotations.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//===-- thread_annotations.h ------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_THREAD_ANNOTATIONS_
-#define SCUDO_THREAD_ANNOTATIONS_
-
-// Enable thread safety attributes only with clang.
-// The attributes can be safely ignored when compiling with other compilers.
-#if defined(__clang__)
-#define THREAD_ANNOTATION_ATTRIBUTE_(x) __attribute__((x))
-#else
-#define THREAD_ANNOTATION_ATTRIBUTE_(x) // no-op
-#endif
-
-#define CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE_(capability(x))
-
-#define SCOPED_CAPABILITY THREAD_ANNOTATION_ATTRIBUTE_(scoped_lockable)
-
-#define GUARDED_BY(x) THREAD_ANNOTATION_ATTRIBUTE_(guarded_by(x))
-
-#define PT_GUARDED_BY(x) THREAD_ANNOTATION_ATTRIBUTE_(pt_guarded_by(x))
-
-#define ACQUIRED_BEFORE(...)                                                   \
-  THREAD_ANNOTATION_ATTRIBUTE_(acquired_before(__VA_ARGS__))
-
-#define ACQUIRED_AFTER(...)                                                    \
-  THREAD_ANNOTATION_ATTRIBUTE_(acquired_after(__VA_ARGS__))
-
-#define REQUIRES(...)                                                          \
-  THREAD_ANNOTATION_ATTRIBUTE_(requires_capability(__VA_ARGS__))
-
-#define REQUIRES_SHARED(...)                                                   \
-  THREAD_ANNOTATION_ATTRIBUTE_(requires_shared_capability(__VA_ARGS__))
-
-#define ACQUIRE(...)                                                           \
-  THREAD_ANNOTATION_ATTRIBUTE_(acquire_capability(__VA_ARGS__))
-
-#define ACQUIRE_SHARED(...)                                                    \
-  THREAD_ANNOTATION_ATTRIBUTE_(acquire_shared_capability(__VA_ARGS__))
-
-#define RELEASE(...)                                                           \
-  THREAD_ANNOTATION_ATTRIBUTE_(release_capability(__VA_ARGS__))
-
-#define RELEASE_SHARED(...)                                                    \
-  THREAD_ANNOTATION_ATTRIBUTE_(release_shared_capability(__VA_ARGS__))
-
-#define TRY_ACQUIRE(...)                                                       \
-  THREAD_ANNOTATION_ATTRIBUTE_(try_acquire_capability(__VA_ARGS__))
-
-#define TRY_ACQUIRE_SHARED(...)                                                \
-  THREAD_ANNOTATION_ATTRIBUTE_(try_acquire_shared_capability(__VA_ARGS__))
-
-#define EXCLUDES(...) THREAD_ANNOTATION_ATTRIBUTE_(locks_excluded(__VA_ARGS__))
-
-#define ASSERT_CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE_(assert_capability(x))
-
-#define ASSERT_SHARED_CAPABILITY(x)                                            \
-  THREAD_ANNOTATION_ATTRIBUTE_(assert_shared_capability(x))
-
-#define RETURN_CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE_(lock_returned(x))
-
-#define NO_THREAD_SAFETY_ANALYSIS                                              \
-  THREAD_ANNOTATION_ATTRIBUTE_(no_thread_safety_analysis)
-
-#endif // SCUDO_THREAD_ANNOTATIONS_
diff --git a/Telegram/ThirdParty/scudo/timing.cpp b/Telegram/ThirdParty/scudo/timing.cpp
deleted file mode 100644
index 59ae21d10..000000000
--- a/Telegram/ThirdParty/scudo/timing.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//===-- timing.cpp ----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "timing.h"
-
-namespace scudo {
-
-Timer::~Timer() {
-  if (Manager)
-    Manager->report(*this);
-}
-
-ScopedTimer::ScopedTimer(TimingManager &Manager, const char *Name)
-    : Timer(Manager.getOrCreateTimer(Name)) {
-  start();
-}
-
-ScopedTimer::ScopedTimer(TimingManager &Manager, const Timer &Nest,
-                         const char *Name)
-    : Timer(Manager.nest(Nest, Name)) {
-  start();
-}
-
-} // namespace scudo
diff --git a/Telegram/ThirdParty/scudo/timing.h b/Telegram/ThirdParty/scudo/timing.h
deleted file mode 100644
index 84caa79e5..000000000
--- a/Telegram/ThirdParty/scudo/timing.h
+++ /dev/null
@@ -1,221 +0,0 @@
-//===-- timing.h ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_TIMING_H_
-#define SCUDO_TIMING_H_
-
-#include "common.h"
-#include "mutex.h"
-#include "string_utils.h"
-#include "thread_annotations.h"
-
-#include <inttypes.h>
-#include <string.h>
-
-namespace scudo {
-
-class TimingManager;
-
-// A simple timer for evaluating execution time of code snippets. It can be used
-// along with TimingManager or standalone.
-class Timer {
-public:
-  // The use of Timer without binding to a TimingManager is supposed to do the
-  // timer logging manually. Otherwise, TimingManager will do the logging stuff
-  // for you.
-  Timer() = default;
-  Timer(Timer &&Other)
-      : StartTime(0), AccTime(Other.AccTime), Manager(Other.Manager),
-        HandleId(Other.HandleId) {
-    Other.Manager = nullptr;
-  }
-
-  Timer(const Timer &) = delete;
-
-  ~Timer();
-
-  void start() {
-    CHECK_EQ(StartTime, 0U);
-    StartTime = getMonotonicTime();
-  }
-  void stop() {
-    AccTime += getMonotonicTime() - StartTime;
-    StartTime = 0;
-  }
-  u64 getAccumulatedTime() const { return AccTime; }
-
-  // Unset the bound TimingManager so that we don't report the data back. This
-  // is useful if we only want to track subset of certain scope events.
-  void ignore() {
-    StartTime = 0;
-    AccTime = 0;
-    Manager = nullptr;
-  }
-
-protected:
-  friend class TimingManager;
-  Timer(TimingManager &Manager, u32 HandleId)
-      : Manager(&Manager), HandleId(HandleId) {}
-
-  u64 StartTime = 0;
-  u64 AccTime = 0;
-  TimingManager *Manager = nullptr;
-  u32 HandleId;
-};
-
-// A RAII-style wrapper for easy scope execution measurement. Note that in order
-// not to take additional space for the message like `Name`. It only works with
-// TimingManager.
-class ScopedTimer : public Timer {
-public:
-  ScopedTimer(TimingManager &Manager, const char *Name);
-  ScopedTimer(TimingManager &Manager, const Timer &Nest, const char *Name);
-  ~ScopedTimer() { stop(); }
-};
-
-// In Scudo, the execution time of single run of code snippets may not be
-// useful, we are more interested in the average time from several runs.
-// TimingManager lets the registered timer report their data and reports the
-// average execution time for each timer periodically.
-class TimingManager {
-public:
-  TimingManager(u32 PrintingInterval = DefaultPrintingInterval)
-      : PrintingInterval(PrintingInterval) {}
-  ~TimingManager() {
-    if (NumAllocatedTimers != 0)
-      printAll();
-  }
-
-  Timer getOrCreateTimer(const char *Name) EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-
-    CHECK_LT(strlen(Name), MaxLenOfTimerName);
-    for (u32 I = 0; I < NumAllocatedTimers; ++I) {
-      if (strncmp(Name, Timers[I].Name, MaxLenOfTimerName) == 0)
-        return Timer(*this, I);
-    }
-
-    CHECK_LT(NumAllocatedTimers, MaxNumberOfTimers);
-    strncpy(Timers[NumAllocatedTimers].Name, Name, MaxLenOfTimerName);
-    TimerRecords[NumAllocatedTimers].AccumulatedTime = 0;
-    TimerRecords[NumAllocatedTimers].Occurrence = 0;
-    return Timer(*this, NumAllocatedTimers++);
-  }
-
-  // Add a sub-Timer associated with another Timer. This is used when we want to
-  // detail the execution time in the scope of a Timer.
-  // For example,
-  //   void Foo() {
-  //     // T1 records the time spent in both first and second tasks.
-  //     ScopedTimer T1(getTimingManager(), "Task1");
-  //     {
-  //       // T2 records the time spent in first task
-  //       ScopedTimer T2(getTimingManager, T1, "Task2");
-  //       // Do first task.
-  //     }
-  //     // Do second task.
-  //   }
-  //
-  // The report will show proper indents to indicate the nested relation like,
-  //   -- Average Operation Time -- -- Name (# of Calls) --
-  //             10.0(ns)            Task1 (1)
-  //              5.0(ns)              Task2 (1)
-  Timer nest(const Timer &T, const char *Name) EXCLUDES(Mutex) {
-    CHECK_EQ(T.Manager, this);
-    Timer Nesting = getOrCreateTimer(Name);
-
-    ScopedLock L(Mutex);
-    CHECK_NE(Nesting.HandleId, T.HandleId);
-    Timers[Nesting.HandleId].Nesting = T.HandleId;
-    return Nesting;
-  }
-
-  void report(const Timer &T) EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-
-    const u32 HandleId = T.HandleId;
-    CHECK_LT(HandleId, MaxNumberOfTimers);
-    TimerRecords[HandleId].AccumulatedTime += T.getAccumulatedTime();
-    ++TimerRecords[HandleId].Occurrence;
-    ++NumEventsReported;
-    if (NumEventsReported % PrintingInterval == 0)
-      printAllImpl();
-  }
-
-  void printAll() EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-    printAllImpl();
-  }
-
-private:
-  void printAllImpl() REQUIRES(Mutex) {
-    static char NameHeader[] = "-- Name (# of Calls) --";
-    static char AvgHeader[] = "-- Average Operation Time --";
-    ScopedString Str;
-    Str.append("%-15s %-15s\n", AvgHeader, NameHeader);
-
-    for (u32 I = 0; I < NumAllocatedTimers; ++I) {
-      if (Timers[I].Nesting != MaxNumberOfTimers)
-        continue;
-      printImpl(Str, I);
-    }
-
-    Str.output();
-  }
-
-  void printImpl(ScopedString &Str, const u32 HandleId,
-                 const u32 ExtraIndent = 0) REQUIRES(Mutex) {
-    const u64 AccumulatedTime = TimerRecords[HandleId].AccumulatedTime;
-    const u64 Occurrence = TimerRecords[HandleId].Occurrence;
-    const u64 Integral = Occurrence == 0 ? 0 : AccumulatedTime / Occurrence;
-    // Only keep single digit of fraction is enough and it enables easier layout
-    // maintenance.
-    const u64 Fraction =
-        Occurrence == 0 ? 0
-                        : ((AccumulatedTime % Occurrence) * 10) / Occurrence;
-
-    Str.append("%14" PRId64 ".%" PRId64 "(ns) %-11s", Integral, Fraction, " ");
-
-    for (u32 I = 0; I < ExtraIndent; ++I)
-      Str.append("%s", "  ");
-    Str.append("%s (%" PRId64 ")\n", Timers[HandleId].Name, Occurrence);
-
-    for (u32 I = 0; I < NumAllocatedTimers; ++I)
-      if (Timers[I].Nesting == HandleId)
-        printImpl(Str, I, ExtraIndent + 1);
-  }
-
-  // Instead of maintaining pages for timer registration, a static buffer is
-  // sufficient for most use cases in Scudo.
-  static constexpr u32 MaxNumberOfTimers = 50;
-  static constexpr u32 MaxLenOfTimerName = 50;
-  static constexpr u32 DefaultPrintingInterval = 100;
-
-  struct Record {
-    u64 AccumulatedTime = 0;
-    u64 Occurrence = 0;
-  };
-
-  struct TimerInfo {
-    char Name[MaxLenOfTimerName + 1];
-    u32 Nesting = MaxNumberOfTimers;
-  };
-
-  HybridMutex Mutex;
-  // The frequency of proactively dumping the timer statistics. For example, the
-  // default setting is to dump the statistics every 100 reported events.
-  u32 PrintingInterval GUARDED_BY(Mutex);
-  u64 NumEventsReported GUARDED_BY(Mutex) = 0;
-  u32 NumAllocatedTimers GUARDED_BY(Mutex) = 0;
-  TimerInfo Timers[MaxNumberOfTimers] GUARDED_BY(Mutex);
-  Record TimerRecords[MaxNumberOfTimers] GUARDED_BY(Mutex);
-};
-
-} // namespace scudo
-
-#endif // SCUDO_TIMING_H_
diff --git a/Telegram/ThirdParty/scudo/tools/compute_size_class_config.cpp b/Telegram/ThirdParty/scudo/tools/compute_size_class_config.cpp
deleted file mode 100644
index bcaa58349..000000000
--- a/Telegram/ThirdParty/scudo/tools/compute_size_class_config.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-//===-- compute_size_class_config.cpp -------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <algorithm>
-#include <vector>
-
-struct Alloc {
-  size_t size, count;
-};
-
-size_t measureWastage(const std::vector<Alloc> &allocs,
-                      const std::vector<size_t> &classes, size_t pageSize,
-                      size_t headerSize) {
-  size_t totalWastage = 0;
-  for (auto &a : allocs) {
-    size_t sizePlusHeader = a.size + headerSize;
-    size_t wastage = -1ull;
-    for (auto c : classes)
-      if (c >= sizePlusHeader && c - sizePlusHeader < wastage)
-        wastage = c - sizePlusHeader;
-    if (wastage == -1ull)
-      continue;
-    if (wastage > 2 * pageSize)
-      wastage = 2 * pageSize;
-    totalWastage += wastage * a.count;
-  }
-  return totalWastage;
-}
-
-void readAllocs(std::vector<Alloc> &allocs, const char *path) {
-  FILE *f = fopen(path, "r");
-  if (!f) {
-    fprintf(stderr, "compute_size_class_config: could not open %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  const char header[] = "<malloc version=\"scudo-1\">\n";
-  char buf[sizeof(header) - 1];
-  if (fread(buf, 1, sizeof(header) - 1, f) != sizeof(header) - 1 ||
-      memcmp(buf, header, sizeof(header) - 1) != 0) {
-    fprintf(stderr, "compute_size_class_config: invalid input format\n");
-    exit(1);
-  }
-
-  Alloc a;
-  while (fscanf(f, "<alloc size=\"%zu\" count=\"%zu\"/>\n", &a.size,
-                &a.count) == 2)
-    allocs.push_back(a);
-  fclose(f);
-}
-
-size_t log2Floor(size_t x) { return sizeof(long) * 8 - 1 - __builtin_clzl(x); }
-
-void usage() {
-  fprintf(stderr,
-          "usage: compute_size_class_config [-p pageSize] [-c largestClass] "
-          "[-h headerSize] [-n numClasses] [-b numBits] profile...\n");
-  exit(1);
-}
-
-int main(int argc, char **argv) {
-  size_t pageSize = 4096;
-  size_t largestClass = 65552;
-  size_t headerSize = 16;
-  size_t numClasses = 32;
-  size_t numBits = 5;
-
-  std::vector<Alloc> allocs;
-  for (size_t i = 1; i != argc;) {
-    auto matchArg = [&](size_t &arg, const char *name) {
-      if (strcmp(argv[i], name) == 0) {
-        if (i + 1 != argc) {
-          arg = atoi(argv[i + 1]);
-          i += 2;
-        } else {
-          usage();
-        }
-        return true;
-      }
-      return false;
-    };
-    if (matchArg(pageSize, "-p") || matchArg(largestClass, "-c") ||
-        matchArg(headerSize, "-h") || matchArg(numClasses, "-n") ||
-        matchArg(numBits, "-b"))
-      continue;
-    readAllocs(allocs, argv[i]);
-    ++i;
-  }
-
-  if (allocs.empty())
-    usage();
-
-  std::vector<size_t> classes;
-  classes.push_back(largestClass);
-  for (size_t i = 1; i != numClasses; ++i) {
-    size_t minWastage = -1ull;
-    size_t minWastageClass;
-    for (size_t newClass = 16; newClass != largestClass; newClass += 16) {
-      // Skip classes with more than numBits bits, ignoring leading or trailing
-      // zero bits.
-      if (__builtin_ctzl(newClass - headerSize) +
-              __builtin_clzl(newClass - headerSize) <
-          sizeof(long) * 8 - numBits)
-        continue;
-
-      classes.push_back(newClass);
-      size_t newWastage = measureWastage(allocs, classes, pageSize, headerSize);
-      classes.pop_back();
-      if (newWastage < minWastage) {
-        minWastage = newWastage;
-        minWastageClass = newClass;
-      }
-    }
-    classes.push_back(minWastageClass);
-  }
-
-  std::sort(classes.begin(), classes.end());
-  size_t minSizeLog = log2Floor(headerSize);
-  size_t midSizeIndex = 0;
-  while (classes[midSizeIndex + 1] - classes[midSizeIndex] == (1 << minSizeLog))
-    midSizeIndex++;
-  size_t midSizeLog = log2Floor(classes[midSizeIndex] - headerSize);
-  size_t maxSizeLog = log2Floor(classes.back() - headerSize - 1) + 1;
-
-  printf(R"(// wastage = %zu
-
-struct MySizeClassConfig {
-  static const uptr NumBits = %zu;
-  static const uptr MinSizeLog = %zu;
-  static const uptr MidSizeLog = %zu;
-  static const uptr MaxSizeLog = %zu;
-  static const u16 MaxNumCachedHint = 14;
-  static const uptr MaxBytesCachedLog = 14;
-
-  static constexpr u32 Classes[] = {)",
-         measureWastage(allocs, classes, pageSize, headerSize), numBits,
-         minSizeLog, midSizeLog, maxSizeLog);
-  for (size_t i = 0; i != classes.size(); ++i) {
-    if ((i % 8) == 0)
-      printf("\n      ");
-    else
-      printf(" ");
-    printf("0x%05zx,", classes[i]);
-  }
-  printf(R"(
-  };
-  static const uptr SizeDelta = %zu;
-};
-)",
-         headerSize);
-}
diff --git a/Telegram/ThirdParty/scudo/trusty.cpp b/Telegram/ThirdParty/scudo/trusty.cpp
deleted file mode 100644
index 26b349c6e..000000000
--- a/Telegram/ThirdParty/scudo/trusty.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//===-- trusty.cpp ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-#if SCUDO_TRUSTY
-
-#include "common.h"
-#include "mutex.h"
-#include "report_linux.h"
-#include "trusty.h"
-
-#include <errno.h>           // for errno
-#include <lk/err_ptr.h>      // for PTR_ERR and IS_ERR
-#include <stdio.h>           // for printf()
-#include <stdlib.h>          // for getenv()
-#include <sys/auxv.h>        // for getauxval()
-#include <time.h>            // for clock_gettime()
-#include <trusty_err.h>      // for lk_err_to_errno()
-#include <trusty_syscalls.h> // for _trusty_brk()
-#include <uapi/mm.h>         // for MMAP flags
-
-namespace scudo {
-
-uptr getPageSize() { return getauxval(AT_PAGESZ); }
-
-void NORETURN die() { abort(); }
-
-void *map(void *Addr, uptr Size, const char *Name, uptr Flags,
-          UNUSED MapPlatformData *Data) {
-  uint32_t MmapFlags =
-      MMAP_FLAG_ANONYMOUS | MMAP_FLAG_PROT_READ | MMAP_FLAG_PROT_WRITE;
-
-  // If the MAP_NOACCESS flag is set, Scudo tries to reserve
-  // a memory region without mapping physical pages. This corresponds
-  // to MMAP_FLAG_NO_PHYSICAL in Trusty.
-  if (Flags & MAP_NOACCESS)
-    MmapFlags |= MMAP_FLAG_NO_PHYSICAL;
-  if (Addr)
-    MmapFlags |= MMAP_FLAG_FIXED_NOREPLACE;
-
-  if (Flags & MAP_MEMTAG)
-    MmapFlags |= MMAP_FLAG_PROT_MTE;
-
-  void *P = (void *)_trusty_mmap(Addr, Size, MmapFlags, 0);
-
-  if (IS_ERR(P)) {
-    errno = lk_err_to_errno(PTR_ERR(P));
-    if (!(Flags & MAP_ALLOWNOMEM) || errno != ENOMEM)
-      reportMapError(Size);
-    return nullptr;
-  }
-
-  return P;
-}
-
-void unmap(UNUSED void *Addr, UNUSED uptr Size, UNUSED uptr Flags,
-           UNUSED MapPlatformData *Data) {
-  if (_trusty_munmap(Addr, Size) != 0)
-    reportUnmapError(reinterpret_cast<uptr>(Addr), Size);
-}
-
-void setMemoryPermission(UNUSED uptr Addr, UNUSED uptr Size, UNUSED uptr Flags,
-                         UNUSED MapPlatformData *Data) {}
-
-void releasePagesToOS(UNUSED uptr BaseAddress, UNUSED uptr Offset,
-                      UNUSED uptr Size, UNUSED MapPlatformData *Data) {}
-
-const char *getEnv(const char *Name) { return getenv(Name); }
-
-// All mutex operations are a no-op since Trusty doesn't currently support
-// threads.
-bool HybridMutex::tryLock() { return true; }
-
-void HybridMutex::lockSlow() {}
-
-void HybridMutex::unlock() {}
-
-void HybridMutex::assertHeldImpl() {}
-
-u64 getMonotonicTime() {
-  timespec TS;
-  clock_gettime(CLOCK_MONOTONIC, &TS);
-  return static_cast<u64>(TS.tv_sec) * (1000ULL * 1000 * 1000) +
-         static_cast<u64>(TS.tv_nsec);
-}
-
-u64 getMonotonicTimeFast() {
-#if defined(CLOCK_MONOTONIC_COARSE)
-  timespec TS;
-  clock_gettime(CLOCK_MONOTONIC_COARSE, &TS);
-  return static_cast<u64>(TS.tv_sec) * (1000ULL * 1000 * 1000) +
-         static_cast<u64>(TS.tv_nsec);
-#else
-  return getMonotonicTime();
-#endif
-}
-
-u32 getNumberOfCPUs() { return 0; }
-
-u32 getThreadID() { return 0; }
-
-bool getRandom(UNUSED void *Buffer, UNUSED uptr Length, UNUSED bool Blocking) {
-  return false;
-}
-
-void outputRaw(const char *Buffer) { printf("%s", Buffer); }
-
-void setAbortMessage(UNUSED const char *Message) {}
-
-} // namespace scudo
-
-#endif // SCUDO_TRUSTY
diff --git a/Telegram/ThirdParty/scudo/trusty.h b/Telegram/ThirdParty/scudo/trusty.h
deleted file mode 100644
index 50edd1c6f..000000000
--- a/Telegram/ThirdParty/scudo/trusty.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//===-- trusty.h -----------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_TRUSTY_H_
-#define SCUDO_TRUSTY_H_
-
-#include "platform.h"
-
-#if SCUDO_TRUSTY
-
-namespace scudo {
-// MapPlatformData is unused on Trusty, define it as a minimially sized
-// structure.
-struct MapPlatformData {};
-} // namespace scudo
-
-#endif // SCUDO_TRUSTY
-
-#endif // SCUDO_TRUSTY_H_
diff --git a/Telegram/ThirdParty/scudo/tsd.h b/Telegram/ThirdParty/scudo/tsd.h
deleted file mode 100644
index b2108a019..000000000
--- a/Telegram/ThirdParty/scudo/tsd.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//===-- tsd.h ---------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_TSD_H_
-#define SCUDO_TSD_H_
-
-#include "atomic_helpers.h"
-#include "common.h"
-#include "mutex.h"
-#include "thread_annotations.h"
-
-#include <limits.h> // for PTHREAD_DESTRUCTOR_ITERATIONS
-#include <pthread.h>
-
-// With some build setups, this might still not be defined.
-#ifndef PTHREAD_DESTRUCTOR_ITERATIONS
-#define PTHREAD_DESTRUCTOR_ITERATIONS 4
-#endif
-
-namespace scudo {
-
-template <class Allocator> struct alignas(SCUDO_CACHE_LINE_SIZE) TSD {
-  using ThisT = TSD<Allocator>;
-  u8 DestructorIterations = 0;
-
-  void init(Allocator *Instance) NO_THREAD_SAFETY_ANALYSIS {
-    DCHECK_EQ(DestructorIterations, 0U);
-    DCHECK(isAligned(reinterpret_cast<uptr>(this), alignof(ThisT)));
-    Instance->initCache(&Cache);
-    DestructorIterations = PTHREAD_DESTRUCTOR_ITERATIONS;
-  }
-
-  inline bool tryLock() NO_THREAD_SAFETY_ANALYSIS {
-    if (Mutex.tryLock()) {
-      atomic_store_relaxed(&Precedence, 0);
-      return true;
-    }
-    if (atomic_load_relaxed(&Precedence) == 0)
-      atomic_store_relaxed(&Precedence,
-                           static_cast<uptr>(getMonotonicTimeFast() >>
-                                             FIRST_32_SECOND_64(16, 0)));
-    return false;
-  }
-  inline void lock() NO_THREAD_SAFETY_ANALYSIS {
-    atomic_store_relaxed(&Precedence, 0);
-    Mutex.lock();
-  }
-  inline void unlock() NO_THREAD_SAFETY_ANALYSIS { Mutex.unlock(); }
-  inline uptr getPrecedence() { return atomic_load_relaxed(&Precedence); }
-
-  void commitBack(Allocator *Instance) { Instance->commitBack(this); }
-
-  // As the comments attached to `getCache()`, the TSD doesn't always need to be
-  // locked. In that case, we would only skip the check before we have all TSDs
-  // locked in all paths.
-  void assertLocked(bool BypassCheck) ASSERT_CAPABILITY(Mutex) {
-    if (SCUDO_DEBUG && !BypassCheck)
-      Mutex.assertHeld();
-  }
-
-  // Ideally, we may want to assert that all the operations on
-  // Cache/QuarantineCache always have the `Mutex` acquired. However, the
-  // current architecture of accessing TSD is not easy to cooperate with the
-  // thread-safety analysis because of pointer aliasing. So now we just add the
-  // assertion on the getters of Cache/QuarantineCache.
-  //
-  // TODO(chiahungduan): Ideally, we want to do `Mutex.assertHeld` but acquiring
-  // TSD doesn't always require holding the lock. Add this assertion while the
-  // lock is always acquired.
-  typename Allocator::CacheT &getCache() REQUIRES(Mutex) { return Cache; }
-  typename Allocator::QuarantineCacheT &getQuarantineCache() REQUIRES(Mutex) {
-    return QuarantineCache;
-  }
-
-private:
-  HybridMutex Mutex;
-  atomic_uptr Precedence = {};
-
-  typename Allocator::CacheT Cache GUARDED_BY(Mutex);
-  typename Allocator::QuarantineCacheT QuarantineCache GUARDED_BY(Mutex);
-};
-
-} // namespace scudo
-
-#endif // SCUDO_TSD_H_
diff --git a/Telegram/ThirdParty/scudo/tsd_exclusive.h b/Telegram/ThirdParty/scudo/tsd_exclusive.h
deleted file mode 100644
index 238367420..000000000
--- a/Telegram/ThirdParty/scudo/tsd_exclusive.h
+++ /dev/null
@@ -1,178 +0,0 @@
-//===-- tsd_exclusive.h -----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_TSD_EXCLUSIVE_H_
-#define SCUDO_TSD_EXCLUSIVE_H_
-
-#include "tsd.h"
-
-#include "string_utils.h"
-
-namespace scudo {
-
-struct ThreadState {
-  bool DisableMemInit : 1;
-  enum : unsigned {
-    NotInitialized = 0,
-    Initialized,
-    TornDown,
-  } InitState : 2;
-};
-
-template <class Allocator> void teardownThread(void *Ptr);
-
-template <class Allocator> struct TSDRegistryExT {
-  void init(Allocator *Instance) REQUIRES(Mutex) {
-    DCHECK(!Initialized);
-    Instance->init();
-    CHECK_EQ(pthread_key_create(&PThreadKey, teardownThread<Allocator>), 0);
-    FallbackTSD.init(Instance);
-    Initialized = true;
-  }
-
-  void initOnceMaybe(Allocator *Instance) EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-    if (LIKELY(Initialized))
-      return;
-    init(Instance); // Sets Initialized.
-  }
-
-  void unmapTestOnly(Allocator *Instance) EXCLUDES(Mutex) {
-    DCHECK(Instance);
-    if (reinterpret_cast<Allocator *>(pthread_getspecific(PThreadKey))) {
-      DCHECK_EQ(reinterpret_cast<Allocator *>(pthread_getspecific(PThreadKey)),
-                Instance);
-      ThreadTSD.commitBack(Instance);
-      ThreadTSD = {};
-    }
-    CHECK_EQ(pthread_key_delete(PThreadKey), 0);
-    PThreadKey = {};
-    FallbackTSD.commitBack(Instance);
-    FallbackTSD = {};
-    State = {};
-    ScopedLock L(Mutex);
-    Initialized = false;
-  }
-
-  void drainCaches(Allocator *Instance) {
-    // We don't have a way to iterate all thread local `ThreadTSD`s. Simply
-    // drain the `ThreadTSD` of current thread and `FallbackTSD`.
-    Instance->drainCache(&ThreadTSD);
-    FallbackTSD.lock();
-    Instance->drainCache(&FallbackTSD);
-    FallbackTSD.unlock();
-  }
-
-  ALWAYS_INLINE void initThreadMaybe(Allocator *Instance, bool MinimalInit) {
-    if (LIKELY(State.InitState != ThreadState::NotInitialized))
-      return;
-    initThread(Instance, MinimalInit);
-  }
-
-  // TODO(chiahungduan): Consider removing the argument `UnlockRequired` by
-  // embedding the logic into TSD or always locking the TSD. It will enable us
-  // to properly mark thread annotation here and adding proper runtime
-  // assertions in the member functions of TSD. For example, assert the lock is
-  // acquired before calling TSD::commitBack().
-  ALWAYS_INLINE TSD<Allocator> *
-  getTSDAndLock(bool *UnlockRequired) NO_THREAD_SAFETY_ANALYSIS {
-    if (LIKELY(State.InitState == ThreadState::Initialized &&
-               !atomic_load(&Disabled, memory_order_acquire))) {
-      *UnlockRequired = false;
-      return &ThreadTSD;
-    }
-    FallbackTSD.lock();
-    *UnlockRequired = true;
-    return &FallbackTSD;
-  }
-
-  // To disable the exclusive TSD registry, we effectively lock the fallback TSD
-  // and force all threads to attempt to use it instead of their local one.
-  void disable() NO_THREAD_SAFETY_ANALYSIS {
-    Mutex.lock();
-    FallbackTSD.lock();
-    atomic_store(&Disabled, 1U, memory_order_release);
-  }
-
-  void enable() NO_THREAD_SAFETY_ANALYSIS {
-    atomic_store(&Disabled, 0U, memory_order_release);
-    FallbackTSD.unlock();
-    Mutex.unlock();
-  }
-
-  bool setOption(Option O, sptr Value) {
-    if (O == Option::ThreadDisableMemInit)
-      State.DisableMemInit = Value;
-    if (O == Option::MaxTSDsCount)
-      return false;
-    return true;
-  }
-
-  bool getDisableMemInit() { return State.DisableMemInit; }
-
-  void getStats(ScopedString *Str) {
-    // We don't have a way to iterate all thread local `ThreadTSD`s. Instead of
-    // printing only self `ThreadTSD` which may mislead the usage, we just skip
-    // it.
-    Str->append("Exclusive TSD don't support iterating each TSD\n");
-  }
-
-private:
-  // Using minimal initialization allows for global initialization while keeping
-  // the thread specific structure untouched. The fallback structure will be
-  // used instead.
-  NOINLINE void initThread(Allocator *Instance, bool MinimalInit) {
-    initOnceMaybe(Instance);
-    if (UNLIKELY(MinimalInit))
-      return;
-    CHECK_EQ(
-        pthread_setspecific(PThreadKey, reinterpret_cast<void *>(Instance)), 0);
-    ThreadTSD.init(Instance);
-    State.InitState = ThreadState::Initialized;
-    Instance->callPostInitCallback();
-  }
-
-  pthread_key_t PThreadKey = {};
-  bool Initialized GUARDED_BY(Mutex) = false;
-  atomic_u8 Disabled = {};
-  TSD<Allocator> FallbackTSD;
-  HybridMutex Mutex;
-  static thread_local ThreadState State;
-  static thread_local TSD<Allocator> ThreadTSD;
-
-  friend void teardownThread<Allocator>(void *Ptr);
-};
-
-template <class Allocator>
-thread_local TSD<Allocator> TSDRegistryExT<Allocator>::ThreadTSD;
-template <class Allocator>
-thread_local ThreadState TSDRegistryExT<Allocator>::State;
-
-template <class Allocator>
-void teardownThread(void *Ptr) NO_THREAD_SAFETY_ANALYSIS {
-  typedef TSDRegistryExT<Allocator> TSDRegistryT;
-  Allocator *Instance = reinterpret_cast<Allocator *>(Ptr);
-  // The glibc POSIX thread-local-storage deallocation routine calls user
-  // provided destructors in a loop of PTHREAD_DESTRUCTOR_ITERATIONS.
-  // We want to be called last since other destructors might call free and the
-  // like, so we wait until PTHREAD_DESTRUCTOR_ITERATIONS before draining the
-  // quarantine and swallowing the cache.
-  if (TSDRegistryT::ThreadTSD.DestructorIterations > 1) {
-    TSDRegistryT::ThreadTSD.DestructorIterations--;
-    // If pthread_setspecific fails, we will go ahead with the teardown.
-    if (LIKELY(pthread_setspecific(Instance->getTSDRegistry()->PThreadKey,
-                                   Ptr) == 0))
-      return;
-  }
-  TSDRegistryT::ThreadTSD.commitBack(Instance);
-  TSDRegistryT::State.InitState = ThreadState::TornDown;
-}
-
-} // namespace scudo
-
-#endif // SCUDO_TSD_EXCLUSIVE_H_
diff --git a/Telegram/ThirdParty/scudo/tsd_shared.h b/Telegram/ThirdParty/scudo/tsd_shared.h
deleted file mode 100644
index 1bca578ee..000000000
--- a/Telegram/ThirdParty/scudo/tsd_shared.h
+++ /dev/null
@@ -1,252 +0,0 @@
-//===-- tsd_shared.h --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_TSD_SHARED_H_
-#define SCUDO_TSD_SHARED_H_
-
-#include "tsd.h"
-
-#include "string_utils.h"
-
-#if SCUDO_HAS_PLATFORM_TLS_SLOT
-// This is a platform-provided header that needs to be on the include path when
-// Scudo is compiled. It must declare a function with the prototype:
-//   uintptr_t *getPlatformAllocatorTlsSlot()
-// that returns the address of a thread-local word of storage reserved for
-// Scudo, that must be zero-initialized in newly created threads.
-#include "scudo_platform_tls_slot.h"
-#endif
-
-namespace scudo {
-
-template <class Allocator, u32 TSDsArraySize, u32 DefaultTSDCount>
-struct TSDRegistrySharedT {
-  void init(Allocator *Instance) REQUIRES(Mutex) {
-    DCHECK(!Initialized);
-    Instance->init();
-    for (u32 I = 0; I < TSDsArraySize; I++)
-      TSDs[I].init(Instance);
-    const u32 NumberOfCPUs = getNumberOfCPUs();
-    setNumberOfTSDs((NumberOfCPUs == 0) ? DefaultTSDCount
-                                        : Min(NumberOfCPUs, DefaultTSDCount));
-    Initialized = true;
-  }
-
-  void initOnceMaybe(Allocator *Instance) EXCLUDES(Mutex) {
-    ScopedLock L(Mutex);
-    if (LIKELY(Initialized))
-      return;
-    init(Instance); // Sets Initialized.
-  }
-
-  void unmapTestOnly(Allocator *Instance) EXCLUDES(Mutex) {
-    for (u32 I = 0; I < TSDsArraySize; I++) {
-      TSDs[I].commitBack(Instance);
-      TSDs[I] = {};
-    }
-    setCurrentTSD(nullptr);
-    ScopedLock L(Mutex);
-    Initialized = false;
-  }
-
-  void drainCaches(Allocator *Instance) {
-    ScopedLock L(MutexTSDs);
-    for (uptr I = 0; I < NumberOfTSDs; ++I) {
-      TSDs[I].lock();
-      Instance->drainCache(&TSDs[I]);
-      TSDs[I].unlock();
-    }
-  }
-
-  ALWAYS_INLINE void initThreadMaybe(Allocator *Instance,
-                                     UNUSED bool MinimalInit) {
-    if (LIKELY(getCurrentTSD()))
-      return;
-    initThread(Instance);
-  }
-
-  // TSDs is an array of locks and which is not supported for marking
-  // thread-safety capability.
-  ALWAYS_INLINE TSD<Allocator> *
-  getTSDAndLock(bool *UnlockRequired) NO_THREAD_SAFETY_ANALYSIS {
-    TSD<Allocator> *TSD = getCurrentTSD();
-    DCHECK(TSD);
-    *UnlockRequired = true;
-    // Try to lock the currently associated context.
-    if (TSD->tryLock())
-      return TSD;
-    // If that fails, go down the slow path.
-    if (TSDsArraySize == 1U) {
-      // Only 1 TSD, not need to go any further.
-      // The compiler will optimize this one way or the other.
-      TSD->lock();
-      return TSD;
-    }
-    return getTSDAndLockSlow(TSD);
-  }
-
-  void disable() NO_THREAD_SAFETY_ANALYSIS {
-    Mutex.lock();
-    for (u32 I = 0; I < TSDsArraySize; I++)
-      TSDs[I].lock();
-  }
-
-  void enable() NO_THREAD_SAFETY_ANALYSIS {
-    for (s32 I = static_cast<s32>(TSDsArraySize - 1); I >= 0; I--)
-      TSDs[I].unlock();
-    Mutex.unlock();
-  }
-
-  bool setOption(Option O, sptr Value) {
-    if (O == Option::MaxTSDsCount)
-      return setNumberOfTSDs(static_cast<u32>(Value));
-    if (O == Option::ThreadDisableMemInit)
-      setDisableMemInit(Value);
-    // Not supported by the TSD Registry, but not an error either.
-    return true;
-  }
-
-  bool getDisableMemInit() const { return *getTlsPtr() & 1; }
-
-  void getStats(ScopedString *Str) EXCLUDES(MutexTSDs) {
-    ScopedLock L(MutexTSDs);
-
-    Str->append("Stats: SharedTSDs: %u available; total %u\n", NumberOfTSDs,
-                TSDsArraySize);
-    for (uptr I = 0; I < NumberOfTSDs; ++I) {
-      TSDs[I].lock();
-      // Theoretically, we want to mark TSD::lock()/TSD::unlock() with proper
-      // thread annotations. However, given the TSD is only locked on shared
-      // path, do the assertion in a separate path to avoid confusing the
-      // analyzer.
-      TSDs[I].assertLocked(/*BypassCheck=*/true);
-      Str->append("  Shared TSD[%zu]:\n", I);
-      TSDs[I].getCache().getStats(Str);
-      TSDs[I].unlock();
-    }
-  }
-
-private:
-  ALWAYS_INLINE uptr *getTlsPtr() const {
-#if SCUDO_HAS_PLATFORM_TLS_SLOT
-    return reinterpret_cast<uptr *>(getPlatformAllocatorTlsSlot());
-#else
-    static thread_local uptr ThreadTSD;
-    return &ThreadTSD;
-#endif
-  }
-
-  static_assert(alignof(TSD<Allocator>) >= 2, "");
-
-  ALWAYS_INLINE void setCurrentTSD(TSD<Allocator> *CurrentTSD) {
-    *getTlsPtr() &= 1;
-    *getTlsPtr() |= reinterpret_cast<uptr>(CurrentTSD);
-  }
-
-  ALWAYS_INLINE TSD<Allocator> *getCurrentTSD() {
-    return reinterpret_cast<TSD<Allocator> *>(*getTlsPtr() & ~1ULL);
-  }
-
-  bool setNumberOfTSDs(u32 N) EXCLUDES(MutexTSDs) {
-    ScopedLock L(MutexTSDs);
-    if (N < NumberOfTSDs)
-      return false;
-    if (N > TSDsArraySize)
-      N = TSDsArraySize;
-    NumberOfTSDs = N;
-    NumberOfCoPrimes = 0;
-    // Compute all the coprimes of NumberOfTSDs. This will be used to walk the
-    // array of TSDs in a random order. For details, see:
-    // https://lemire.me/blog/2017/09/18/visiting-all-values-in-an-array-exactly-once-in-random-order/
-    for (u32 I = 0; I < N; I++) {
-      u32 A = I + 1;
-      u32 B = N;
-      // Find the GCD between I + 1 and N. If 1, they are coprimes.
-      while (B != 0) {
-        const u32 T = A;
-        A = B;
-        B = T % B;
-      }
-      if (A == 1)
-        CoPrimes[NumberOfCoPrimes++] = I + 1;
-    }
-    return true;
-  }
-
-  void setDisableMemInit(bool B) {
-    *getTlsPtr() &= ~1ULL;
-    *getTlsPtr() |= B;
-  }
-
-  NOINLINE void initThread(Allocator *Instance) NO_THREAD_SAFETY_ANALYSIS {
-    initOnceMaybe(Instance);
-    // Initial context assignment is done in a plain round-robin fashion.
-    const u32 Index = atomic_fetch_add(&CurrentIndex, 1U, memory_order_relaxed);
-    setCurrentTSD(&TSDs[Index % NumberOfTSDs]);
-    Instance->callPostInitCallback();
-  }
-
-  // TSDs is an array of locks which is not supported for marking thread-safety
-  // capability.
-  NOINLINE TSD<Allocator> *getTSDAndLockSlow(TSD<Allocator> *CurrentTSD)
-      EXCLUDES(MutexTSDs) {
-    // Use the Precedence of the current TSD as our random seed. Since we are
-    // in the slow path, it means that tryLock failed, and as a result it's
-    // very likely that said Precedence is non-zero.
-    const u32 R = static_cast<u32>(CurrentTSD->getPrecedence());
-    u32 N, Inc;
-    {
-      ScopedLock L(MutexTSDs);
-      N = NumberOfTSDs;
-      DCHECK_NE(NumberOfCoPrimes, 0U);
-      Inc = CoPrimes[R % NumberOfCoPrimes];
-    }
-    if (N > 1U) {
-      u32 Index = R % N;
-      uptr LowestPrecedence = UINTPTR_MAX;
-      TSD<Allocator> *CandidateTSD = nullptr;
-      // Go randomly through at most 4 contexts and find a candidate.
-      for (u32 I = 0; I < Min(4U, N); I++) {
-        if (TSDs[Index].tryLock()) {
-          setCurrentTSD(&TSDs[Index]);
-          return &TSDs[Index];
-        }
-        const uptr Precedence = TSDs[Index].getPrecedence();
-        // A 0 precedence here means another thread just locked this TSD.
-        if (Precedence && Precedence < LowestPrecedence) {
-          CandidateTSD = &TSDs[Index];
-          LowestPrecedence = Precedence;
-        }
-        Index += Inc;
-        if (Index >= N)
-          Index -= N;
-      }
-      if (CandidateTSD) {
-        CandidateTSD->lock();
-        setCurrentTSD(CandidateTSD);
-        return CandidateTSD;
-      }
-    }
-    // Last resort, stick with the current one.
-    CurrentTSD->lock();
-    return CurrentTSD;
-  }
-
-  atomic_u32 CurrentIndex = {};
-  u32 NumberOfTSDs GUARDED_BY(MutexTSDs) = 0;
-  u32 NumberOfCoPrimes GUARDED_BY(MutexTSDs) = 0;
-  u32 CoPrimes[TSDsArraySize] GUARDED_BY(MutexTSDs) = {};
-  bool Initialized GUARDED_BY(Mutex) = false;
-  HybridMutex Mutex;
-  HybridMutex MutexTSDs;
-  TSD<Allocator> TSDs[TSDsArraySize];
-};
-
-} // namespace scudo
-
-#endif // SCUDO_TSD_SHARED_H_
diff --git a/Telegram/ThirdParty/scudo/vector.h b/Telegram/ThirdParty/scudo/vector.h
deleted file mode 100644
index c0f1ba0ed..000000000
--- a/Telegram/ThirdParty/scudo/vector.h
+++ /dev/null
@@ -1,131 +0,0 @@
-//===-- vector.h ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_VECTOR_H_
-#define SCUDO_VECTOR_H_
-
-#include "mem_map.h"
-
-#include <string.h>
-
-namespace scudo {
-
-// A low-level vector based on map. It stores the contents inline up to a fixed
-// capacity, or in an external memory buffer if it grows bigger than that. May
-// incur a significant memory overhead for small vectors. The current
-// implementation supports only POD types.
-//
-// NOTE: This class is not meant to be used directly, use Vector<T> instead.
-template <typename T> class VectorNoCtor {
-public:
-  T &operator[](uptr I) {
-    DCHECK_LT(I, Size);
-    return Data[I];
-  }
-  const T &operator[](uptr I) const {
-    DCHECK_LT(I, Size);
-    return Data[I];
-  }
-  void push_back(const T &Element) {
-    DCHECK_LE(Size, capacity());
-    if (Size == capacity()) {
-      const uptr NewCapacity = roundUpPowerOfTwo(Size + 1);
-      reallocate(NewCapacity);
-    }
-    memcpy(&Data[Size++], &Element, sizeof(T));
-  }
-  T &back() {
-    DCHECK_GT(Size, 0);
-    return Data[Size - 1];
-  }
-  void pop_back() {
-    DCHECK_GT(Size, 0);
-    Size--;
-  }
-  uptr size() const { return Size; }
-  const T *data() const { return Data; }
-  T *data() { return Data; }
-  constexpr uptr capacity() const { return CapacityBytes / sizeof(T); }
-  void reserve(uptr NewSize) {
-    // Never downsize internal buffer.
-    if (NewSize > capacity())
-      reallocate(NewSize);
-  }
-  void resize(uptr NewSize) {
-    if (NewSize > Size) {
-      reserve(NewSize);
-      memset(&Data[Size], 0, sizeof(T) * (NewSize - Size));
-    }
-    Size = NewSize;
-  }
-
-  void clear() { Size = 0; }
-  bool empty() const { return size() == 0; }
-
-  const T *begin() const { return data(); }
-  T *begin() { return data(); }
-  const T *end() const { return data() + size(); }
-  T *end() { return data() + size(); }
-
-protected:
-  constexpr void init(uptr InitialCapacity = 0) {
-    Data = &LocalData[0];
-    CapacityBytes = sizeof(LocalData);
-    if (InitialCapacity > capacity())
-      reserve(InitialCapacity);
-  }
-  void destroy() {
-    if (Data != &LocalData[0])
-      ExternalBuffer.unmap(ExternalBuffer.getBase(),
-                           ExternalBuffer.getCapacity());
-  }
-
-private:
-  void reallocate(uptr NewCapacity) {
-    DCHECK_GT(NewCapacity, 0);
-    DCHECK_LE(Size, NewCapacity);
-
-    MemMapT NewExternalBuffer;
-    NewCapacity = roundUp(NewCapacity * sizeof(T), getPageSizeCached());
-    NewExternalBuffer.map(/*Addr=*/0U, NewCapacity, "scudo:vector");
-    T *NewExternalData = reinterpret_cast<T *>(NewExternalBuffer.getBase());
-
-    memcpy(NewExternalData, Data, Size * sizeof(T));
-    destroy();
-
-    Data = NewExternalData;
-    CapacityBytes = NewCapacity;
-    ExternalBuffer = NewExternalBuffer;
-  }
-
-  T *Data = nullptr;
-  uptr CapacityBytes = 0;
-  uptr Size = 0;
-
-  T LocalData[256 / sizeof(T)] = {};
-  MemMapT ExternalBuffer;
-};
-
-template <typename T> class Vector : public VectorNoCtor<T> {
-public:
-  constexpr Vector() { VectorNoCtor<T>::init(); }
-  explicit Vector(uptr Count) {
-    VectorNoCtor<T>::init(Count);
-    this->resize(Count);
-  }
-  ~Vector() { VectorNoCtor<T>::destroy(); }
-  // Disallow copies and moves.
-  Vector(const Vector &) = delete;
-  Vector &operator=(const Vector &) = delete;
-  Vector(Vector &&) = delete;
-  Vector &operator=(Vector &&) = delete;
-};
-
-} // namespace scudo
-
-#endif // SCUDO_VECTOR_H_
diff --git a/Telegram/ThirdParty/scudo/wrappers_c.cpp b/Telegram/ThirdParty/scudo/wrappers_c.cpp
deleted file mode 100644
index 60014a0f6..000000000
--- a/Telegram/ThirdParty/scudo/wrappers_c.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//===-- wrappers_c.cpp ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-// Skip this compilation unit if compiled as part of Bionic.
-#if !SCUDO_ANDROID || !_BIONIC
-
-#include "allocator_config.h"
-#include "internal_defs.h"
-#include "platform.h"
-#include "scudo/interface.h"
-#include "wrappers_c.h"
-#include "wrappers_c_checks.h"
-
-#include <stdint.h>
-#include <stdio.h>
-
-#define SCUDO_PREFIX(name) name
-#define SCUDO_ALLOCATOR Allocator
-
-// Export the static allocator so that the C++ wrappers can access it.
-// Technically we could have a completely separated heap for C & C++ but in
-// reality the amount of cross pollination between the two is staggering.
-SCUDO_REQUIRE_CONSTANT_INITIALIZATION
-scudo::Allocator<scudo::Config, SCUDO_PREFIX(malloc_postinit)> SCUDO_ALLOCATOR;
-
-#include "wrappers_c.inc"
-
-#undef SCUDO_ALLOCATOR
-#undef SCUDO_PREFIX
-
-extern "C" INTERFACE void __scudo_print_stats(void) { Allocator.printStats(); }
-
-#endif // !SCUDO_ANDROID || !_BIONIC
diff --git a/Telegram/ThirdParty/scudo/wrappers_c.h b/Telegram/ThirdParty/scudo/wrappers_c.h
deleted file mode 100644
index 08dc679b3..000000000
--- a/Telegram/ThirdParty/scudo/wrappers_c.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//===-- wrappers_c.h --------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_WRAPPERS_C_H_
-#define SCUDO_WRAPPERS_C_H_
-
-#include "platform.h"
-#include "stats.h"
-
-// Bionic's struct mallinfo consists of size_t (mallinfo(3) uses int).
-#if SCUDO_ANDROID
-typedef size_t __scudo_mallinfo_data_t;
-#else
-typedef int __scudo_mallinfo_data_t;
-#endif
-
-struct __scudo_mallinfo {
-  __scudo_mallinfo_data_t arena;
-  __scudo_mallinfo_data_t ordblks;
-  __scudo_mallinfo_data_t smblks;
-  __scudo_mallinfo_data_t hblks;
-  __scudo_mallinfo_data_t hblkhd;
-  __scudo_mallinfo_data_t usmblks;
-  __scudo_mallinfo_data_t fsmblks;
-  __scudo_mallinfo_data_t uordblks;
-  __scudo_mallinfo_data_t fordblks;
-  __scudo_mallinfo_data_t keepcost;
-};
-
-struct __scudo_mallinfo2 {
-  size_t arena;
-  size_t ordblks;
-  size_t smblks;
-  size_t hblks;
-  size_t hblkhd;
-  size_t usmblks;
-  size_t fsmblks;
-  size_t uordblks;
-  size_t fordblks;
-  size_t keepcost;
-};
-
-// Android sometimes includes malloc.h no matter what, which yields to
-// conflicting return types for mallinfo() if we use our own structure. So if
-// struct mallinfo is declared (#define courtesy of malloc.h), use it directly.
-#if STRUCT_MALLINFO_DECLARED
-#define SCUDO_MALLINFO mallinfo
-#else
-#define SCUDO_MALLINFO __scudo_mallinfo
-#endif
-
-#if !SCUDO_ANDROID || !_BIONIC
-extern "C" void malloc_postinit();
-extern HIDDEN scudo::Allocator<scudo::Config, malloc_postinit> Allocator;
-#endif
-
-#endif // SCUDO_WRAPPERS_C_H_
diff --git a/Telegram/ThirdParty/scudo/wrappers_c.inc b/Telegram/ThirdParty/scudo/wrappers_c.inc
deleted file mode 100644
index 56d8ef201..000000000
--- a/Telegram/ThirdParty/scudo/wrappers_c.inc
+++ /dev/null
@@ -1,374 +0,0 @@
-//===-- wrappers_c.inc ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_PREFIX
-#error "Define SCUDO_PREFIX prior to including this file!"
-#endif
-
-// malloc-type functions have to be aligned to std::max_align_t. This is
-// distinct from (1U << SCUDO_MIN_ALIGNMENT_LOG), since C++ new-type functions
-// do not have to abide by the same requirement.
-#ifndef SCUDO_MALLOC_ALIGNMENT
-#define SCUDO_MALLOC_ALIGNMENT FIRST_32_SECOND_64(8U, 16U)
-#endif
-
-static void reportAllocation(void *ptr, size_t size) {
-  if (SCUDO_ENABLE_HOOKS)
-    if (__scudo_allocate_hook && ptr)
-      __scudo_allocate_hook(ptr, size);
-}
-static void reportDeallocation(void *ptr) {
-  if (SCUDO_ENABLE_HOOKS)
-    if (__scudo_deallocate_hook)
-      __scudo_deallocate_hook(ptr);
-}
-static void reportReallocAllocation(void *old_ptr, void *new_ptr, size_t size) {
-  DCHECK_NE(new_ptr, nullptr);
-
-  if (SCUDO_ENABLE_HOOKS) {
-    if (__scudo_realloc_allocate_hook)
-      __scudo_realloc_allocate_hook(old_ptr, new_ptr, size);
-    else if (__scudo_allocate_hook)
-      __scudo_allocate_hook(new_ptr, size);
-  }
-}
-static void reportReallocDeallocation(void *old_ptr) {
-  if (SCUDO_ENABLE_HOOKS) {
-    if (__scudo_realloc_deallocate_hook)
-      __scudo_realloc_deallocate_hook(old_ptr);
-    else if (__scudo_deallocate_hook)
-      __scudo_deallocate_hook(old_ptr);
-  }
-}
-
-extern "C" {
-
-INTERFACE WEAK void *SCUDO_PREFIX(calloc)(size_t nmemb, size_t size) {
-  scudo::uptr Product;
-  if (UNLIKELY(scudo::checkForCallocOverflow(size, nmemb, &Product))) {
-    if (SCUDO_ALLOCATOR.canReturnNull()) {
-      errno = ENOMEM;
-      return nullptr;
-    }
-    scudo::reportCallocOverflow(nmemb, size);
-  }
-  void *Ptr = SCUDO_ALLOCATOR.allocate(Product, scudo::Chunk::Origin::Malloc,
-                                       SCUDO_MALLOC_ALIGNMENT, true);
-  reportAllocation(Ptr, Product);
-  return scudo::setErrnoOnNull(Ptr);
-}
-
-INTERFACE WEAK void SCUDO_PREFIX(free)(void *ptr) {
-  reportDeallocation(ptr);
-  SCUDO_ALLOCATOR.deallocate(ptr, scudo::Chunk::Origin::Malloc);
-}
-
-INTERFACE WEAK struct SCUDO_MALLINFO SCUDO_PREFIX(mallinfo)(void) {
-  struct SCUDO_MALLINFO Info = {};
-  scudo::StatCounters Stats;
-  SCUDO_ALLOCATOR.getStats(Stats);
-  // Space allocated in mmapped regions (bytes)
-  Info.hblkhd = static_cast<__scudo_mallinfo_data_t>(Stats[scudo::StatMapped]);
-  // Maximum total allocated space (bytes)
-  Info.usmblks = Info.hblkhd;
-  // Space in freed fastbin blocks (bytes)
-  Info.fsmblks = static_cast<__scudo_mallinfo_data_t>(Stats[scudo::StatFree]);
-  // Total allocated space (bytes)
-  Info.uordblks =
-      static_cast<__scudo_mallinfo_data_t>(Stats[scudo::StatAllocated]);
-  // Total free space (bytes)
-  Info.fordblks = Info.fsmblks;
-  return Info;
-}
-
-// On Android, mallinfo2 is an alias of mallinfo, so don't define both.
-#if !SCUDO_ANDROID
-INTERFACE WEAK struct __scudo_mallinfo2 SCUDO_PREFIX(mallinfo2)(void) {
-  struct __scudo_mallinfo2 Info = {};
-  scudo::StatCounters Stats;
-  SCUDO_ALLOCATOR.getStats(Stats);
-  // Space allocated in mmapped regions (bytes)
-  Info.hblkhd = Stats[scudo::StatMapped];
-  // Maximum total allocated space (bytes)
-  Info.usmblks = Info.hblkhd;
-  // Space in freed fastbin blocks (bytes)
-  Info.fsmblks = Stats[scudo::StatFree];
-  // Total allocated space (bytes)
-  Info.uordblks = Stats[scudo::StatAllocated];
-  // Total free space (bytes)
-  Info.fordblks = Info.fsmblks;
-  return Info;
-}
-#endif
-
-INTERFACE WEAK void *SCUDO_PREFIX(malloc)(size_t size) {
-  void *Ptr = SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc,
-                                       SCUDO_MALLOC_ALIGNMENT);
-  reportAllocation(Ptr, size);
-  return scudo::setErrnoOnNull(Ptr);
-}
-
-#if SCUDO_ANDROID
-INTERFACE WEAK size_t SCUDO_PREFIX(malloc_usable_size)(const void *ptr) {
-#else
-INTERFACE WEAK size_t SCUDO_PREFIX(malloc_usable_size)(void *ptr) {
-#endif
-  return SCUDO_ALLOCATOR.getUsableSize(ptr);
-}
-
-INTERFACE WEAK void *SCUDO_PREFIX(memalign)(size_t alignment, size_t size) {
-  // Android rounds up the alignment to a power of two if it isn't one.
-  if (SCUDO_ANDROID) {
-    if (UNLIKELY(!alignment)) {
-      alignment = 1U;
-    } else {
-      if (UNLIKELY(!scudo::isPowerOfTwo(alignment)))
-        alignment = scudo::roundUpPowerOfTwo(alignment);
-    }
-  } else {
-    if (UNLIKELY(!scudo::isPowerOfTwo(alignment))) {
-      if (SCUDO_ALLOCATOR.canReturnNull()) {
-        errno = EINVAL;
-        return nullptr;
-      }
-      scudo::reportAlignmentNotPowerOfTwo(alignment);
-    }
-  }
-  void *Ptr =
-      SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign, alignment);
-  reportAllocation(Ptr, size);
-  return Ptr;
-}
-
-INTERFACE WEAK int SCUDO_PREFIX(posix_memalign)(void **memptr, size_t alignment,
-                                                size_t size) {
-  if (UNLIKELY(scudo::checkPosixMemalignAlignment(alignment))) {
-    if (!SCUDO_ALLOCATOR.canReturnNull())
-      scudo::reportInvalidPosixMemalignAlignment(alignment);
-    return EINVAL;
-  }
-  void *Ptr =
-      SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign, alignment);
-  if (UNLIKELY(!Ptr))
-    return ENOMEM;
-  reportAllocation(Ptr, size);
-
-  *memptr = Ptr;
-  return 0;
-}
-
-INTERFACE WEAK void *SCUDO_PREFIX(pvalloc)(size_t size) {
-  const scudo::uptr PageSize = scudo::getPageSizeCached();
-  if (UNLIKELY(scudo::checkForPvallocOverflow(size, PageSize))) {
-    if (SCUDO_ALLOCATOR.canReturnNull()) {
-      errno = ENOMEM;
-      return nullptr;
-    }
-    scudo::reportPvallocOverflow(size);
-  }
-  // pvalloc(0) should allocate one page.
-  void *Ptr =
-      SCUDO_ALLOCATOR.allocate(size ? scudo::roundUp(size, PageSize) : PageSize,
-                               scudo::Chunk::Origin::Memalign, PageSize);
-  reportAllocation(Ptr, scudo::roundUp(size, PageSize));
-
-  return scudo::setErrnoOnNull(Ptr);
-}
-
-INTERFACE WEAK void *SCUDO_PREFIX(realloc)(void *ptr, size_t size) {
-  if (!ptr) {
-    void *Ptr = SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc,
-                                         SCUDO_MALLOC_ALIGNMENT);
-    reportAllocation(Ptr, size);
-    return scudo::setErrnoOnNull(Ptr);
-  }
-  if (size == 0) {
-    reportDeallocation(ptr);
-    SCUDO_ALLOCATOR.deallocate(ptr, scudo::Chunk::Origin::Malloc);
-    return nullptr;
-  }
-
-  // Given that the reporting of deallocation and allocation are not atomic, we
-  // always pretend the old pointer will be released so that the user doesn't
-  // need to worry about the false double-use case from the view of hooks.
-  //
-  // For example, assume that `realloc` releases the old pointer and allocates a
-  // new pointer. Before the reporting of both operations has been done, another
-  // thread may get the old pointer from `malloc`. It may be misinterpreted as
-  // double-use if it's not handled properly on the hook side.
-  reportReallocDeallocation(ptr);
-  void *NewPtr = SCUDO_ALLOCATOR.reallocate(ptr, size, SCUDO_MALLOC_ALIGNMENT);
-  if (NewPtr != nullptr) {
-    // Note that even if NewPtr == ptr, the size has changed. We still need to
-    // report the new size.
-    reportReallocAllocation(/*OldPtr=*/ptr, NewPtr, size);
-  } else {
-    // If `realloc` fails, the old pointer is not released. Report the old
-    // pointer as allocated again.
-    reportReallocAllocation(/*OldPtr=*/ptr, /*NewPtr=*/ptr,
-                            SCUDO_ALLOCATOR.getAllocSize(ptr));
-  }
-
-  return scudo::setErrnoOnNull(NewPtr);
-}
-
-INTERFACE WEAK void *SCUDO_PREFIX(valloc)(size_t size) {
-  void *Ptr = SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign,
-                                       scudo::getPageSizeCached());
-  reportAllocation(Ptr, size);
-
-  return scudo::setErrnoOnNull(Ptr);
-}
-
-INTERFACE WEAK int SCUDO_PREFIX(malloc_iterate)(
-    uintptr_t base, size_t size,
-    void (*callback)(uintptr_t base, size_t size, void *arg), void *arg) {
-  SCUDO_ALLOCATOR.iterateOverChunks(base, size, callback, arg);
-  return 0;
-}
-
-INTERFACE WEAK void SCUDO_PREFIX(malloc_enable)() { SCUDO_ALLOCATOR.enable(); }
-
-INTERFACE WEAK void SCUDO_PREFIX(malloc_disable)() {
-  SCUDO_ALLOCATOR.disable();
-}
-
-void SCUDO_PREFIX(malloc_postinit)() {
-  SCUDO_ALLOCATOR.initGwpAsan();
-  pthread_atfork(SCUDO_PREFIX(malloc_disable), SCUDO_PREFIX(malloc_enable),
-                 SCUDO_PREFIX(malloc_enable));
-}
-
-INTERFACE WEAK int SCUDO_PREFIX(mallopt)(int param, int value) {
-  if (param == M_DECAY_TIME) {
-    if (SCUDO_ANDROID) {
-      if (value == 0) {
-        // Will set the release values to their minimum values.
-        value = INT32_MIN;
-      } else {
-        // Will set the release values to their maximum values.
-        value = INT32_MAX;
-      }
-    }
-
-    SCUDO_ALLOCATOR.setOption(scudo::Option::ReleaseInterval,
-                              static_cast<scudo::sptr>(value));
-    return 1;
-  } else if (param == M_PURGE) {
-    SCUDO_ALLOCATOR.releaseToOS(scudo::ReleaseToOS::Force);
-    return 1;
-  } else if (param == M_PURGE_ALL) {
-    SCUDO_ALLOCATOR.releaseToOS(scudo::ReleaseToOS::ForceAll);
-    return 1;
-  } else if (param == M_LOG_STATS) {
-    SCUDO_ALLOCATOR.printStats();
-    SCUDO_ALLOCATOR.printFragmentationInfo();
-    return 1;
-  } else {
-    scudo::Option option;
-    switch (param) {
-    case M_MEMTAG_TUNING:
-      option = scudo::Option::MemtagTuning;
-      break;
-    case M_THREAD_DISABLE_MEM_INIT:
-      option = scudo::Option::ThreadDisableMemInit;
-      break;
-    case M_CACHE_COUNT_MAX:
-      option = scudo::Option::MaxCacheEntriesCount;
-      break;
-    case M_CACHE_SIZE_MAX:
-      option = scudo::Option::MaxCacheEntrySize;
-      break;
-    case M_TSDS_COUNT_MAX:
-      option = scudo::Option::MaxTSDsCount;
-      break;
-    default:
-      return 0;
-    }
-    return SCUDO_ALLOCATOR.setOption(option, static_cast<scudo::sptr>(value));
-  }
-}
-
-INTERFACE WEAK void *SCUDO_PREFIX(aligned_alloc)(size_t alignment,
-                                                 size_t size) {
-  if (UNLIKELY(scudo::checkAlignedAllocAlignmentAndSize(alignment, size))) {
-    if (SCUDO_ALLOCATOR.canReturnNull()) {
-      errno = EINVAL;
-      return nullptr;
-    }
-    scudo::reportInvalidAlignedAllocAlignment(alignment, size);
-  }
-
-  void *Ptr =
-      SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc, alignment);
-  reportAllocation(Ptr, size);
-
-  return scudo::setErrnoOnNull(Ptr);
-}
-
-INTERFACE WEAK int SCUDO_PREFIX(malloc_info)(UNUSED int options, FILE *stream) {
-  const scudo::uptr max_size =
-      decltype(SCUDO_ALLOCATOR)::PrimaryT::SizeClassMap::MaxSize;
-  auto *sizes = static_cast<scudo::uptr *>(
-      SCUDO_PREFIX(calloc)(max_size, sizeof(scudo::uptr)));
-  auto callback = [](uintptr_t, size_t size, void *arg) {
-    auto *sizes = reinterpret_cast<scudo::uptr *>(arg);
-    if (size < max_size)
-      sizes[size]++;
-  };
-
-  SCUDO_ALLOCATOR.disable();
-  SCUDO_ALLOCATOR.iterateOverChunks(0, -1ul, callback, sizes);
-  SCUDO_ALLOCATOR.enable();
-
-  fputs("<malloc version=\"scudo-1\">\n", stream);
-  for (scudo::uptr i = 0; i != max_size; ++i)
-    if (sizes[i])
-      fprintf(stream, "<alloc size=\"%zu\" count=\"%zu\"/>\n", i, sizes[i]);
-  fputs("</malloc>\n", stream);
-  SCUDO_PREFIX(free)(sizes);
-  return 0;
-}
-
-// Disable memory tagging for the heap. The caller must disable memory tag
-// checks globally (e.g. by clearing TCF0 on aarch64) before calling this
-// function, and may not re-enable them after calling the function.
-INTERFACE WEAK void SCUDO_PREFIX(malloc_disable_memory_tagging)() {
-  SCUDO_ALLOCATOR.disableMemoryTagging();
-}
-
-// Sets whether scudo records stack traces and other metadata for allocations
-// and deallocations. This function only has an effect if the allocator and
-// hardware support memory tagging.
-INTERFACE WEAK void
-SCUDO_PREFIX(malloc_set_track_allocation_stacks)(int track) {
-  SCUDO_ALLOCATOR.setTrackAllocationStacks(track);
-}
-
-// Sets whether scudo zero-initializes all allocated memory.
-INTERFACE WEAK void SCUDO_PREFIX(malloc_set_zero_contents)(int zero_contents) {
-  SCUDO_ALLOCATOR.setFillContents(zero_contents ? scudo::ZeroFill
-                                                : scudo::NoFill);
-}
-
-// Sets whether scudo pattern-initializes all allocated memory.
-INTERFACE WEAK void
-SCUDO_PREFIX(malloc_set_pattern_fill_contents)(int pattern_fill_contents) {
-  SCUDO_ALLOCATOR.setFillContents(
-      pattern_fill_contents ? scudo::PatternOrZeroFill : scudo::NoFill);
-}
-
-// Sets whether scudo adds a small amount of slack at the end of large
-// allocations, before the guard page. This can be enabled to work around buggy
-// applications that read a few bytes past the end of their allocation.
-INTERFACE WEAK void
-SCUDO_PREFIX(malloc_set_add_large_allocation_slack)(int add_slack) {
-  SCUDO_ALLOCATOR.setAddLargeAllocationSlack(add_slack);
-}
-
-} // extern "C"
diff --git a/Telegram/ThirdParty/scudo/wrappers_c_bionic.cpp b/Telegram/ThirdParty/scudo/wrappers_c_bionic.cpp
deleted file mode 100644
index 21694c3f1..000000000
--- a/Telegram/ThirdParty/scudo/wrappers_c_bionic.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//===-- wrappers_c_bionic.cpp -----------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-// This is only used when compiled as part of Bionic.
-#if SCUDO_ANDROID && _BIONIC
-
-#include "allocator_config.h"
-#include "internal_defs.h"
-#include "platform.h"
-#include "scudo/interface.h"
-#include "wrappers_c.h"
-#include "wrappers_c_checks.h"
-
-#include <stdint.h>
-#include <stdio.h>
-
-// Regular MallocDispatch definitions.
-#define SCUDO_PREFIX(name) CONCATENATE(scudo_, name)
-#define SCUDO_ALLOCATOR Allocator
-
-extern "C" void SCUDO_PREFIX(malloc_postinit)();
-SCUDO_REQUIRE_CONSTANT_INITIALIZATION
-static scudo::Allocator<scudo::Config, SCUDO_PREFIX(malloc_postinit)>
-    SCUDO_ALLOCATOR;
-
-#include "wrappers_c.inc"
-
-#undef SCUDO_ALLOCATOR
-#undef SCUDO_PREFIX
-
-// TODO(kostyak): support both allocators.
-INTERFACE void __scudo_print_stats(void) { Allocator.printStats(); }
-
-INTERFACE void __scudo_get_error_info(
-    struct scudo_error_info *error_info, uintptr_t fault_addr,
-    const char *stack_depot, size_t stack_depot_size, const char *region_info,
-    const char *ring_buffer, size_t ring_buffer_size, const char *memory,
-    const char *memory_tags, uintptr_t memory_addr, size_t memory_size) {
-  (void)(stack_depot_size);
-  Allocator.getErrorInfo(error_info, fault_addr, stack_depot, region_info,
-                         ring_buffer, ring_buffer_size, memory, memory_tags,
-                         memory_addr, memory_size);
-}
-
-INTERFACE const char *__scudo_get_stack_depot_addr() {
-  return Allocator.getStackDepotAddress();
-}
-
-INTERFACE size_t __scudo_get_stack_depot_size() {
-  return sizeof(scudo::StackDepot);
-}
-
-INTERFACE const char *__scudo_get_region_info_addr() {
-  return Allocator.getRegionInfoArrayAddress();
-}
-
-INTERFACE size_t __scudo_get_region_info_size() {
-  return Allocator.getRegionInfoArraySize();
-}
-
-INTERFACE const char *__scudo_get_ring_buffer_addr() {
-  return Allocator.getRingBufferAddress();
-}
-
-INTERFACE size_t __scudo_get_ring_buffer_size() {
-  return Allocator.getRingBufferSize();
-}
-
-#endif // SCUDO_ANDROID && _BIONIC
diff --git a/Telegram/ThirdParty/scudo/wrappers_c_checks.h b/Telegram/ThirdParty/scudo/wrappers_c_checks.h
deleted file mode 100644
index 9cd48e827..000000000
--- a/Telegram/ThirdParty/scudo/wrappers_c_checks.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//===-- wrappers_c_checks.h -------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SCUDO_CHECKS_H_
-#define SCUDO_CHECKS_H_
-
-#include "common.h"
-
-#include <errno.h>
-
-#ifndef __has_builtin
-#define __has_builtin(X) 0
-#endif
-
-namespace scudo {
-
-// A common errno setting logic shared by almost all Scudo C wrappers.
-inline void *setErrnoOnNull(void *Ptr) {
-  if (UNLIKELY(!Ptr))
-    errno = ENOMEM;
-  return Ptr;
-}
-
-// Checks return true on failure.
-
-// Checks aligned_alloc() parameters, verifies that the alignment is a power of
-// two and that the size is a multiple of alignment.
-inline bool checkAlignedAllocAlignmentAndSize(uptr Alignment, uptr Size) {
-  return Alignment == 0 || !isPowerOfTwo(Alignment) ||
-         !isAligned(Size, Alignment);
-}
-
-// Checks posix_memalign() parameters, verifies that alignment is a power of two
-// and a multiple of sizeof(void *).
-inline bool checkPosixMemalignAlignment(uptr Alignment) {
-  return Alignment == 0 || !isPowerOfTwo(Alignment) ||
-         !isAligned(Alignment, sizeof(void *));
-}
-
-// Returns true if calloc(Size, N) overflows on Size*N calculation. Use a
-// builtin supported by recent clang & GCC if it exists, otherwise fallback to a
-// costly division.
-inline bool checkForCallocOverflow(uptr Size, uptr N, uptr *Product) {
-#if __has_builtin(__builtin_umull_overflow) && (SCUDO_WORDSIZE == 64U)
-  return __builtin_umull_overflow(Size, N,
-                                  reinterpret_cast<unsigned long *>(Product));
-#elif __has_builtin(__builtin_umul_overflow) && (SCUDO_WORDSIZE == 32U)
-  // On, e.g. armv7, uptr/uintptr_t may be defined as unsigned long
-  return __builtin_umul_overflow(Size, N,
-                                 reinterpret_cast<unsigned int *>(Product));
-#else
-  *Product = Size * N;
-  if (!Size)
-    return false;
-  return (*Product / Size) != N;
-#endif
-}
-
-// Returns true if the size passed to pvalloc overflows when rounded to the next
-// multiple of PageSize.
-inline bool checkForPvallocOverflow(uptr Size, uptr PageSize) {
-  return roundUp(Size, PageSize) < Size;
-}
-
-} // namespace scudo
-
-#endif // SCUDO_CHECKS_H_
diff --git a/Telegram/ThirdParty/scudo/wrappers_cpp.cpp b/Telegram/ThirdParty/scudo/wrappers_cpp.cpp
deleted file mode 100644
index 098d4f71a..000000000
--- a/Telegram/ThirdParty/scudo/wrappers_cpp.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-//===-- wrappers_cpp.cpp ----------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "platform.h"
-
-// Skip this compilation unit if compiled as part of Bionic.
-#if !SCUDO_ANDROID || !_BIONIC
-
-#include "allocator_config.h"
-#include "internal_defs.h"
-#include "platform.h"
-#include "scudo/interface.h"
-#include "wrappers_c.h"
-
-#include <stdint.h>
-
-namespace std {
-struct nothrow_t {};
-enum class align_val_t : size_t {};
-} // namespace std
-
-static void reportAllocation(void *ptr, size_t size) {
-  if (SCUDO_ENABLE_HOOKS)
-    if (__scudo_allocate_hook && ptr)
-      __scudo_allocate_hook(ptr, size);
-}
-static void reportDeallocation(void *ptr) {
-  if (SCUDO_ENABLE_HOOKS)
-    if (__scudo_deallocate_hook)
-      __scudo_deallocate_hook(ptr);
-}
-
-INTERFACE WEAK void *operator new(size_t size) {
-  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New);
-  reportAllocation(Ptr, size);
-  return Ptr;
-}
-INTERFACE WEAK void *operator new[](size_t size) {
-  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
-  reportAllocation(Ptr, size);
-  return Ptr;
-}
-INTERFACE WEAK void *operator new(size_t size,
-                                  std::nothrow_t const &) NOEXCEPT {
-  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New);
-  reportAllocation(Ptr, size);
-  return Ptr;
-}
-INTERFACE WEAK void *operator new[](size_t size,
-                                    std::nothrow_t const &) NOEXCEPT {
-  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
-  reportAllocation(Ptr, size);
-  return Ptr;
-}
-INTERFACE WEAK void *operator new(size_t size, std::align_val_t align) {
-  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New,
-                                 static_cast<scudo::uptr>(align));
-  reportAllocation(Ptr, size);
-  return Ptr;
-}
-INTERFACE WEAK void *operator new[](size_t size, std::align_val_t align) {
-  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
-                                 static_cast<scudo::uptr>(align));
-  reportAllocation(Ptr, size);
-  return Ptr;
-}
-INTERFACE WEAK void *operator new(size_t size, std::align_val_t align,
-                                  std::nothrow_t const &) NOEXCEPT {
-  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New,
-                                 static_cast<scudo::uptr>(align));
-  reportAllocation(Ptr, size);
-  return Ptr;
-}
-INTERFACE WEAK void *operator new[](size_t size, std::align_val_t align,
-                                    std::nothrow_t const &) NOEXCEPT {
-  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
-                                 static_cast<scudo::uptr>(align));
-  reportAllocation(Ptr, size);
-  return Ptr;
-}
-
-INTERFACE WEAK void operator delete(void *ptr) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::New);
-}
-INTERFACE WEAK void operator delete[](void *ptr) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray);
-}
-INTERFACE WEAK void operator delete(void *ptr,
-                                    std::nothrow_t const &) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::New);
-}
-INTERFACE WEAK void operator delete[](void *ptr,
-                                      std::nothrow_t const &) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray);
-}
-INTERFACE WEAK void operator delete(void *ptr, size_t size) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::New, size);
-}
-INTERFACE WEAK void operator delete[](void *ptr, size_t size) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, size);
-}
-INTERFACE WEAK void operator delete(void *ptr,
-                                    std::align_val_t align) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::New, 0,
-                       static_cast<scudo::uptr>(align));
-}
-INTERFACE WEAK void operator delete[](void *ptr,
-                                      std::align_val_t align) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, 0,
-                       static_cast<scudo::uptr>(align));
-}
-INTERFACE WEAK void operator delete(void *ptr, std::align_val_t align,
-                                    std::nothrow_t const &) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::New, 0,
-                       static_cast<scudo::uptr>(align));
-}
-INTERFACE WEAK void operator delete[](void *ptr, std::align_val_t align,
-                                      std::nothrow_t const &) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, 0,
-                       static_cast<scudo::uptr>(align));
-}
-INTERFACE WEAK void operator delete(void *ptr, size_t size,
-                                    std::align_val_t align) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::New, size,
-                       static_cast<scudo::uptr>(align));
-}
-INTERFACE WEAK void operator delete[](void *ptr, size_t size,
-                                      std::align_val_t align) NOEXCEPT {
-  reportDeallocation(ptr);
-  Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, size,
-                       static_cast<scudo::uptr>(align));
-}
-
-#endif // !SCUDO_ANDROID || !_BIONIC
diff --git a/cmake b/cmake
index 022c15d43..f921cb6ab 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 022c15d437aba149b1495532b1560de2a71b13df
+Subproject commit f921cb6aba9ada6099b3f9c8c237986ecda238f5

From 60805bd916677eb5b45b087304cf2436836d9d00 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Apr 2024 22:13:29 +0400
Subject: [PATCH 262/596] Version 4.16.5.

- Fix editing privacy for groups and channels invitations.
- Possible fix for the network unresponsiveness after sleep.
- Possible fix for wide range of memory allocator crashes on Linux.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml    | 2 +-
 Telegram/Resources/winrc/Telegram.rc            | 8 ++++----
 Telegram/Resources/winrc/Updater.rc             | 8 ++++----
 Telegram/SourceFiles/boxes/edit_privacy_box.cpp | 4 +---
 Telegram/SourceFiles/core/version.h             | 4 ++--
 Telegram/build/version                          | 8 ++++----
 changelog.txt                                   | 6 ++++++
 7 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index c4d83fefb..eed18252f 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.4.0" />
+    Version="4.16.5.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 4d01d2396..ccb788b23 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 4,16,4,0
- PRODUCTVERSION 4,16,4,0
+ FILEVERSION 4,16,5,0
+ PRODUCTVERSION 4,16,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.16.4.0"
+            VALUE "FileVersion", "4.16.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.4.0"
+            VALUE "ProductVersion", "4.16.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 945b1bbb8..0ff036543 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 4,16,4,0
- PRODUCTVERSION 4,16,4,0
+ FILEVERSION 4,16,5,0
+ PRODUCTVERSION 4,16,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.16.4.0"
+            VALUE "FileVersion", "4.16.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.4.0"
+            VALUE "ProductVersion", "4.16.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 5fbb5383b..7800e277e 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -160,7 +160,6 @@ public:
 
 private:
 	const not_null<Main::Session*> _session;
-	bool _premiums = false;
 
 	rpl::event_stream<> _selectionChanged;
 	rpl::event_stream<RowSelectionChange> _rowSelectionChanges;
@@ -207,8 +206,7 @@ bool PremiumsRow::useForumLikeUserpic() const {
 TypesController::TypesController(
 	not_null<Main::Session*> session,
 	bool premiums)
-: _session(session)
-, _premiums(premiums) {
+: _session(session) {
 }
 
 Main::Session &TypesController::session() const {
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 6b30124d7..35d3a09e1 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 = 4016004;
-constexpr auto AppVersionStr = "4.16.4";
+constexpr auto AppVersion = 4016005;
+constexpr auto AppVersionStr = "4.16.5";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 7d28e3677..599d948d4 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016004
+AppVersion         4016005
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.4
-AppVersionStr      4.16.4
+AppVersionStrSmall 4.16.5
+AppVersionStr      4.16.5
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.16.4
+AppVersionOriginal 4.16.5
diff --git a/changelog.txt b/changelog.txt
index bff1b5e4f..f3bb9b3e7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+4.16.5 (08.04.24)
+
+- Fix editing privacy for groups and channels invitations.
+- Possible fix for the network unresponsiveness after sleep.
+- Possible fix for wide range of memory allocator crashes on Linux.
+
 4.16.4 (06.04.24)
 
 - Bug fixes and other minor improvements.

From 7f1c319aee367be6ec7e7a11f92421d48ce3d0a5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Apr 2024 11:23:38 +0400
Subject: [PATCH 263/596] Add interactive mode to prepare script.

---
 Telegram/build/prepare/prepare.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 8188b10f1..0f2a1d4f3 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -59,6 +59,9 @@ for arg in sys.argv[1:]:
         options.append(arg)
     elif arg == 'run':
         customRunCommand = True
+    elif arg == 'shell':
+        customRunCommand = True
+        runCommand.append('shell')
 
 buildQt5 = not 'skip-qt5' in options if win else 'build-qt5' in options
 buildQt6 = 'build-qt6' in options if win else not 'skip-qt6' in options
@@ -416,8 +419,15 @@ def runStages():
 
 if customRunCommand:
     os.chdir(executePath)
-    command = ' '.join(runCommand) + '\n'
-    if not run(command):
+    if len(runCommand) == 1 and runCommand[0] == 'shell':
+        print('Preparing interactive mode..')
+        if win:
+            modifiedEnv['PROMPT'] = '(prepare) $P$G'
+            subprocess.run("cmd.exe", shell=True, env=modifiedEnv)
+        else:
+            modifiedEnv['PS1'] = '(prepare) \\w \\$ '
+            subprocess.run("bash --noprofile --norc", env=modifiedEnv)
+    elif not run(command):
         print('FAILED :(')
         finish(1)
     finish(0)

From 72770aa76d16ffa96984eb2fd35cc870d495692e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Apr 2024 11:25:27 +0400
Subject: [PATCH 264/596] Add GIF parser to FFmpeg build.

Fixes #27722.
---
 Telegram/build/docker/centos_env/Dockerfile | 1 +
 Telegram/build/prepare/prepare.py           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 9568cc7e4..92cd7bf31 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -591,6 +591,7 @@ RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \
 		--enable-parser=aac \
 		--enable-parser=aac_latm \
 		--enable-parser=flac \
+		--enable-parser=gif \
 		--enable-parser=h264 \
 		--enable-parser=hevc \
 		--enable-parser=mpeg4video \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 0f2a1d4f3..b2e59ef31 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 1fef4b342a
+    git checkout b35735cd14
 """)
 
 stage('msys64', """
@@ -1188,6 +1188,7 @@ depends:yasm/yasm
         --enable-parser=aac \
         --enable-parser=aac_latm \
         --enable-parser=flac \
+        --enable-parser=gif \
         --enable-parser=h264 \
         --enable-parser=hevc \
         --enable-parser=mpeg4video \

From 29dd574e22c32f6eeca2be17949306b27e923b51 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Apr 2024 11:55:38 +0400
Subject: [PATCH 265/596] Fix toggling chatbot replying, fix saving.

---
 .../data/business/data_business_chatbots.cpp           |  6 ++++--
 .../SourceFiles/data/business/data_business_common.cpp |  7 +++++++
 .../SourceFiles/data/business/data_business_common.h   |  3 +++
 .../history/view/history_view_contact_status.cpp       | 10 +++++-----
 .../settings/business/settings_away_message.cpp        |  2 +-
 .../settings/business/settings_chatbots.cpp            |  2 +-
 .../settings/business/settings_greeting.cpp            |  2 +-
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/data/business/data_business_chatbots.cpp b/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
index dd95482db..ca894acf5 100644
--- a/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
@@ -125,8 +125,10 @@ void Chatbots::togglePaused(not_null<PeerData*> peer, bool paused) {
 			return;
 		} else if (const auto settings = peer->barSettings()) {
 			peer->setBarSettings(paused
-				? (*settings | PeerBarSetting::BusinessBotPaused)
-				: (*settings & ~PeerBarSetting::BusinessBotPaused));
+				? ((*settings | PeerBarSetting::BusinessBotPaused)
+					& ~PeerBarSetting::BusinessBotCanReply)
+				: ((*settings & ~PeerBarSetting::BusinessBotPaused)
+					| PeerBarSetting::BusinessBotCanReply));
 		} else {
 			api->requestPeerSettings(peer);
 		}
diff --git a/Telegram/SourceFiles/data/business/data_business_common.cpp b/Telegram/SourceFiles/data/business/data_business_common.cpp
index 52c545bc4..149a3ee13 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_common.cpp
@@ -71,6 +71,13 @@ auto RecipientsFlags(const BusinessRecipients &data) {
 
 } // namespace
 
+BusinessRecipients BusinessRecipients::MakeValid(BusinessRecipients value) {
+	if (value.included.empty()) {
+		value.allButExcluded = true;
+	}
+	return value;
+}
+
 MTPInputBusinessRecipients ForMessagesToMTP(const BusinessRecipients &data) {
 	using Flag = MTPDinputBusinessRecipients::Flag;
 	const auto &chats = data.allButExcluded ? data.excluded : data.included;
diff --git a/Telegram/SourceFiles/data/business/data_business_common.h b/Telegram/SourceFiles/data/business/data_business_common.h
index d6f4121a6..600d5ff79 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.h
+++ b/Telegram/SourceFiles/data/business/data_business_common.h
@@ -44,6 +44,9 @@ struct BusinessRecipients {
 	BusinessChats excluded;
 	bool allButExcluded = false;
 
+	[[nodiscard]] static BusinessRecipients MakeValid(
+		BusinessRecipients value);
+
 	friend inline bool operator==(
 		const BusinessRecipients &a,
 		const BusinessRecipients &b) = default;
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index 858b89fbc..524719f92 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -902,15 +902,15 @@ void BusinessBotStatus::Bar::showState(State state) {
 	_userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_userpic->show();
 	_name->setText(state.bot->name());
-	_status->setText(!state.canReply
-		? tr::lng_chatbot_status_views(tr::now)
-		: state.paused
+	_status->setText(state.paused
 		? tr::lng_chatbot_status_paused(tr::now)
-		: tr::lng_chatbot_status_can_reply(tr::now));
+		: state.canReply
+		? tr::lng_chatbot_status_can_reply(tr::now)
+		: tr::lng_chatbot_status_views(tr::now));
 	_togglePaused->setText(state.paused
 		? tr::lng_chatbot_button_resume()
 		: tr::lng_chatbot_button_pause());
-	_togglePaused->setVisible(state.canReply);
+	_togglePaused->setVisible(state.canReply || state.paused);
 	_paused = state.paused;
 	resizeToWidth(width());
 }
diff --git a/Telegram/SourceFiles/settings/business/settings_away_message.cpp b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
index afaeb3a2b..58f3a6165 100644
--- a/Telegram/SourceFiles/settings/business/settings_away_message.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
@@ -220,7 +220,7 @@ void AwayMessage::setupContent(
 
 	_recipients = disabled
 		? Data::BusinessRecipients{ .allButExcluded = true }
-		: current.recipients;
+		: Data::BusinessRecipients::MakeValid(current.recipients);
 	auto initialSchedule = disabled ? AwaySchedule{
 		.type = AwayScheduleType::Always,
 	} : current.schedule;
diff --git a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
index d31239e19..3c75cf9ba 100644
--- a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
@@ -408,7 +408,7 @@ void Chatbots::setupContent(
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 	const auto current = controller->session().data().chatbots().current();
 
-	_recipients = current.recipients;
+	_recipients = Data::BusinessRecipients::MakeValid(current.recipients);
 	_repliesAllowed = current.repliesAllowed;
 
 	AddDividerTextWithLottie(content, {
diff --git a/Telegram/SourceFiles/settings/business/settings_greeting.cpp b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
index 052e97a39..8437acc7c 100644
--- a/Telegram/SourceFiles/settings/business/settings_greeting.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
@@ -125,7 +125,7 @@ void Greeting::setupContent(
 
 	_recipients = disabled
 		? Data::BusinessRecipients{ .allButExcluded = true }
-		: current.recipients;
+		: Data::BusinessRecipients::MakeValid(current.recipients);
 	_noActivityDays = disabled
 		? kDefaultNoActivityDays
 		: current.noActivityDays;

From 170ebb57c6e6717bff087d041da3f578a3ebc137 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Apr 2024 12:10:55 +0400
Subject: [PATCH 266/596] Preview custom emoji on long press from the panel.

---
 .../chat_helpers/emoji_list_widget.cpp        | 49 ++++++++++++++++---
 .../chat_helpers/emoji_list_widget.h          |  6 +++
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 42513a6ed..ac8b6f117 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
+#include "data/data_file_origin.h"
 #include "data/data_peer_values.h"
 #include "data/stickers/data_stickers.h"
 #include "data/stickers/data_custom_emoji.h"
@@ -51,12 +52,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
+#include <QtWidgets/QApplication>
+
 namespace ChatHelpers {
 namespace {
 
 constexpr auto kCollapsedRows = 3;
 constexpr auto kAppearDuration = 0.3;
 constexpr auto kCustomSearchLimit = 256;
+constexpr auto kColorPickerDelay = crl::time(500);
 
 using Core::RecentEmojiId;
 using Core::RecentEmojiDocument;
@@ -477,7 +481,8 @@ EmojiListWidget::EmojiListWidget(
 , _overBg(st::emojiPanRadius, st().overBg)
 , _collapsedBg(st::emojiPanExpand.height / 2, st().headerFg)
 , _picker(this, st())
-, _showPickerTimer([=] { showPicker(); }) {
+, _showPickerTimer([=] { showPicker(); })
+, _previewTimer([=] { showPreview(); }) {
 	setMouseTracking(true);
 	if (st().bg->c.alpha() > 0) {
 		setAttribute(Qt::WA_OpaquePaintEvent);
@@ -624,6 +629,15 @@ void EmojiListWidget::applyNextSearchQuery() {
 	}
 }
 
+void EmojiListWidget::showPreview() {
+	if (const auto over = std::get_if<OverEmoji>(&_pressed)) {
+		if (const auto custom = lookupCustomEmoji(over)) {
+			_show->showMediaPreview(custom->stickerSetOrigin(), custom);
+			_previewShown = true;
+		}
+	}
+}
+
 std::vector<EmojiPtr> EmojiListWidget::collectPlainSearchResults() {
 	return SearchEmoji(_searchQuery, _searchEmoji);
 }
@@ -1119,7 +1133,7 @@ void EmojiListWidget::fillRecentMenu(
 	const auto addAction = Ui::Menu::CreateAddActionCallback(menu);
 	const auto over = OverEmoji{ section, index };
 	const auto emoji = lookupOverEmoji(&over);
-	const auto custom = lookupCustomEmoji(index, section);
+	const auto custom = lookupCustomEmoji(&over);
 	if (custom && custom->sticker()) {
 		const auto sticker = custom->sticker();
 		const auto emoji = sticker->alt;
@@ -1492,6 +1506,11 @@ bool EmojiListWidget::checkPickerHide() {
 	return false;
 }
 
+DocumentData *EmojiListWidget::lookupCustomEmoji(
+		const OverEmoji *over) const {
+	return over ? lookupCustomEmoji(over->index, over->section) : nullptr;
+}
+
 DocumentData *EmojiListWidget::lookupCustomEmoji(
 		int index,
 		int section) const {
@@ -1594,13 +1613,19 @@ void EmojiListWidget::mousePressEvent(QMouseEvent *e) {
 			if (!Core::App().settings().hasChosenEmojiVariant(emoji)) {
 				showPicker();
 			} else {
-				_showPickerTimer.callOnce(500);
+				_previewTimer.cancel();
+				_showPickerTimer.callOnce(kColorPickerDelay);
 			}
+		} else if (lookupCustomEmoji(over)) {
+			_showPickerTimer.cancel();
+			_previewTimer.callOnce(QApplication::startDragTime());
 		}
 	}
 }
 
 void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
+	_previewTimer.cancel();
+
 	auto pressed = _pressed;
 	setPressed(v::null);
 	_lastMousePos = e->globalPos();
@@ -1625,7 +1650,10 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 		_picker->hide();
 	}
 
-	if (v::is_null(_selected) || _selected != pressed) {
+	if (_previewShown) {
+		_previewShown = false;
+		return;
+	} else if (v::is_null(_selected) || _selected != pressed) {
 		return;
 	}
 
@@ -1644,7 +1672,7 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 				return;
 			}
 			selectEmoji(lookupChosen(emoji, over));
-		} else if (const auto custom = lookupCustomEmoji(index, section)) {
+		} else if (const auto custom = lookupCustomEmoji(over)) {
 			selectCustom(lookupChosen(custom, over));
 		}
 	} else if (const auto set = std::get_if<OverSet>(&pressed)) {
@@ -2478,7 +2506,9 @@ bool EmojiListWidget::eventHook(QEvent *e) {
 
 void EmojiListWidget::updateSelected() {
 	if (!v::is_null(_pressed) || !v::is_null(_pickerSelected)) {
-		return;
+		if (!_previewShown) {
+			return;
+		}
 	}
 
 	auto newSelected = OverState{ v::null };
@@ -2537,6 +2567,13 @@ void EmojiListWidget::setSelected(OverState newSelected) {
 		} else {
 			_picker->showAnimated();
 		}
+	} else if (_previewShown && _pressed != _selected) {
+		if (const auto over = std::get_if<OverEmoji>(&_selected)) {
+			if (const auto custom = lookupCustomEmoji(over)) {
+				_pressed = _selected;
+				_show->showMediaPreview(custom->stickerSetOrigin(), custom);
+			}
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index 0f1c897a6..d3fba5c72 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -287,6 +287,8 @@ private:
 		int index);
 
 	[[nodiscard]] EmojiPtr lookupOverEmoji(const OverEmoji *over) const;
+	[[nodiscard]] DocumentData *lookupCustomEmoji(
+		const OverEmoji *over) const;
 	[[nodiscard]] DocumentData *lookupCustomEmoji(
 		int index,
 		int section) const;
@@ -371,6 +373,8 @@ private:
 		DocumentId documentId,
 		uint64 setId);
 
+	void showPreview();
+
 	void applyNextSearchQuery();
 
 	const std::shared_ptr<Show> _show;
@@ -440,6 +444,8 @@ private:
 
 	object_ptr<EmojiColorPicker> _picker;
 	base::Timer _showPickerTimer;
+	base::Timer _previewTimer;
+	bool _previewShown = false;
 
 	rpl::event_stream<EmojiChosen> _chosen;
 	rpl::event_stream<FileChosen> _customChosen;

From a506b8b25c491d09f57c47acffaf3c942fe15d44 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Apr 2024 14:00:48 +0400
Subject: [PATCH 267/596] Support t.me/username?text=.. links.

---
 Telegram/SourceFiles/core/local_url_handlers.cpp              | 1 +
 Telegram/SourceFiles/window/window_session_controller.cpp     | 4 ++++
 .../SourceFiles/window/window_session_controller_link_info.h  | 1 +
 3 files changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 58c7af3a6..6fa9d7bb6 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -563,6 +563,7 @@ bool ResolveUsernameOrPhone(
 		.phone = phone,
 		.messageId = post,
 		.storyId = storyId,
+		.text = params.value(u"text"_q),
 		.repliesInfo = commentId
 			? Window::RepliesByLinkInfo{
 				Window::CommentId{ commentId }
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 86a5f53c1..47cf5326c 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -702,7 +702,11 @@ void SessionNavigation::showPeerByLinkResolved(
 						contextUser->owner().history(contextUser))
 					: std::optional<Api::SendAction>()));
 		} else {
+			const auto draft = info.text;
 			crl::on_main(this, [=] {
+				if (peer->isUser() && !draft.isEmpty()) {
+					Data::SetChatLinkDraft(peer, { draft });
+				}
 				showPeerHistory(peer, params, msgId);
 			});
 		}
diff --git a/Telegram/SourceFiles/window/window_session_controller_link_info.h b/Telegram/SourceFiles/window/window_session_controller_link_info.h
index 01224a3f0..2c7457122 100644
--- a/Telegram/SourceFiles/window/window_session_controller_link_info.h
+++ b/Telegram/SourceFiles/window/window_session_controller_link_info.h
@@ -34,6 +34,7 @@ struct PeerByLinkInfo {
 	QString chatLinkSlug;
 	MsgId messageId = ShowAtUnreadMsgId;
 	StoryId storyId = 0;
+	QString text;
 	RepliesByLinkInfo repliesInfo;
 	ResolveType resolveType = ResolveType::Default;
 	QString startToken;

From 6ed910de9ff4788a0acac6c368d6c11f383bb28b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Apr 2024 12:14:32 +0400
Subject: [PATCH 268/596] Version 4.16.6.

- Show custom emoji preview on long press.
- Fix resume chat bot button disappearance.
- Fix GIF files playback. (regression in 4.16.3.beta)
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index eed18252f..3488163e5 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.5.0" />
+    Version="4.16.6.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index ccb788b23..55576529e 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 4,16,5,0
- PRODUCTVERSION 4,16,5,0
+ FILEVERSION 4,16,6,0
+ PRODUCTVERSION 4,16,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.16.5.0"
+            VALUE "FileVersion", "4.16.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.5.0"
+            VALUE "ProductVersion", "4.16.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 0ff036543..b923f66c3 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 4,16,5,0
- PRODUCTVERSION 4,16,5,0
+ FILEVERSION 4,16,6,0
+ PRODUCTVERSION 4,16,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.16.5.0"
+            VALUE "FileVersion", "4.16.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.5.0"
+            VALUE "ProductVersion", "4.16.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 35d3a09e1..618dff5c0 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 = 4016005;
-constexpr auto AppVersionStr = "4.16.5";
+constexpr auto AppVersion = 4016006;
+constexpr auto AppVersionStr = "4.16.6";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 599d948d4..700c4cc2a 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016005
+AppVersion         4016006
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.5
-AppVersionStr      4.16.5
+AppVersionStrSmall 4.16.6
+AppVersionStr      4.16.6
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.16.5
+AppVersionOriginal 4.16.6
diff --git a/changelog.txt b/changelog.txt
index f3bb9b3e7..0b1319a36 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+4.16.6 (09.04.24)
+
+- Show custom emoji preview on long press.
+- Fix resume chat bot button disappearance.
+- Fix GIF files playback. (regression in 4.16.3.beta)
+
 4.16.5 (08.04.24)
 
 - Fix editing privacy for groups and channels invitations.

From 6c9d5e1499cc6fb1479371e6c0da1dae13917c93 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Apr 2024 19:04:09 +0400
Subject: [PATCH 269/596] Improve clipboard QR code image logo quality.

---
 Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 7b80e2652..8f67b6ba4 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -227,9 +227,9 @@ QImage QrExact(const Qr::Data &data, int pixel, QColor color) {
 			p.drawImage(
 				skip,
 				skip,
-				Intro::details::TelegramLogoImage().scaled(
-					logoSize * style::DevicePixelRatio(),
-					logoSize * style::DevicePixelRatio(),
+				Window::LogoNoMargin().scaled(
+					logoSize,
+					logoSize,
 					Qt::IgnoreAspectRatio,
 					Qt::SmoothTransformation));
 		}

From fe06cd63ac0c07cc833abb20d5b63e3ffdd12d48 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 9 Apr 2024 19:16:00 +0400
Subject: [PATCH 270/596] Lock event loop

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

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 6feacdb5b..3daf91784 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -82,7 +82,6 @@ bool Sandbox::QuitOnStartRequested = false;
 Sandbox::Sandbox(int &argc, char **argv)
 : QApplication(argc, argv)
 , _mainThreadId(QThread::currentThreadId()) {
-	setQuitOnLastWindowClosed(false);
 }
 
 int Sandbox::start() {
diff --git a/Telegram/SourceFiles/core/sandbox.h b/Telegram/SourceFiles/core/sandbox.h
index 4c15c2828..dfb1fe4a6 100644
--- a/Telegram/SourceFiles/core/sandbox.h
+++ b/Telegram/SourceFiles/core/sandbox.h
@@ -107,6 +107,7 @@ private:
 	void readClients();
 	void removeClients();
 
+	QEventLoopLocker _eventLoopLocker;
 	const Qt::HANDLE _mainThreadId = nullptr;
 	int _eventNestingLevel = 0;
 	int _loopNestingLevel = 0;

From 11b57ff7d3b61684daf03b350d90e5f8d68c24b1 Mon Sep 17 00:00:00 2001
From: Nyan <93275906+el-garro@users.noreply.github.com>
Date: Wed, 10 Apr 2024 09:30:52 -0400
Subject: [PATCH 271/596] Update data_document_resolver.cpp

The correct python zipapp extension on windows is pyzw, this typo could lead to executing code in the client device without proper warning
---
 Telegram/SourceFiles/data/data_document_resolver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp
index 8ab502564..b7dc51e2c 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.cpp
+++ b/Telegram/SourceFiles/data/data_document_resolver.cpp
@@ -169,7 +169,7 @@ lnk local lua mad maf mag mam manifest maq mar mas mat mau mav maw mcf mda \
 mdb mde mdt mdw mdz mht mhtml mjs mmc mof msc msg msh msh1 msh2 msh1xml \
 msh2xml mshxml msi msp mst ops osd paf pcd phar php php3 php4 php5 php7 phps \
 php-s pht phtml pif pl plg pm pod prf prg ps1 ps2 ps1xml ps2xml psc1 psc2 \
-psd1 psm1 pssc pst py py3 pyc pyd pyi pyo pyw pywz pyz rb reg rgs scf scr \
+psd1 psm1 pssc pst py py3 pyc pyd pyi pyo pyw pyzw pyz rb reg rgs scf scr \
 sct search-ms settingcontent-ms sh shb shs slk sys t tmp u3p url vb vbe vbp \
 vbs vbscript vdx vsmacros vsd vsdm vsdx vss vssm vssx vst vstm vstx vsw vsx \
 vtx website ws wsc wsf wsh xbap xll xnk xs"_q;

From 90405f3ebc981ebd789887a235bd311a62eb876a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 9 Apr 2024 23:40:32 +0400
Subject: [PATCH 272/596] Install protobuf in Docker

---
 Telegram/build/docker/centos_env/Dockerfile | 9 +++++----
 cmake                                       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 92cd7bf31..47164dc3e 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -90,10 +90,11 @@ RUN git clone -b v21.9 --depth=1 --recursive {{ GIT }}/protocolbuffers/protobuf.
 		-Dprotobuf_BUILD_TESTS=OFF \
 		-Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \
 		-Dprotobuf_BUILD_LIBPROTOC=ON \
-		-Dprotobuf_WITH_ZLIB_DEFAULT=OFF \
-		-Dprotobuf_DEBUG_POSTFIX="" \
+		-Dprotobuf_WITH_ZLIB=OFF \
 	&& cmake --build build --parallel \
-	&& rm -rf .git
+	&& DESTDIR="{{ LibrariesPath }}/protobuf-cache" cmake --install build \
+	&& cd .. \
+	&& rm -rf protobuf
 
 FROM builder AS lcms2
 RUN git clone -b lcms2.15 --depth=1 {{ GIT }}/mm2/Little-CMS.git \
@@ -800,7 +801,7 @@ RUN cmake --build out --config Debug --parallel \
 FROM builder-base
 COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
 COPY --link --from=xz {{ LibrariesPath }}/xz-cache /
-COPY --link --from=protobuf {{ LibrariesPath }}/protobuf protobuf
+COPY --link --from=protobuf {{ LibrariesPath }}/protobuf-cache /
 COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
 COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
 COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
diff --git a/cmake b/cmake
index f921cb6ab..bf157ab03 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit f921cb6aba9ada6099b3f9c8c237986ecda238f5
+Subproject commit bf157ab03f3d07c3822dcdd3e3f90a8e4ccb7d66

From 5e546d1198fd368019230496265714393bb03e68 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 10 Apr 2024 04:14:07 +0400
Subject: [PATCH 273/596] Update libjxl in Docker & snap

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 47164dc3e..964684ab8 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -263,7 +263,7 @@ COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
 COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
 COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
 
-RUN git clone -b v0.8.2 --depth=1 {{ GIT }}/libjxl/libjxl.git \
+RUN git clone -b v0.10.2 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 	&& cd libjxl \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 574d3c996..8a122ab95 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -246,7 +246,7 @@ parts:
   libjxl:
     source: https://github.com/libjxl/libjxl.git
     source-depth: 1
-    source-tag: v0.8.2
+    source-tag: v0.10.2
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s

From a1e2e3d011ad32413833a665447b23b955c2495e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 9 Apr 2024 23:41:01 +0400
Subject: [PATCH 274/596] Replace mozjpeg with jpegli in Docker

---
 Telegram/build/docker/centos_env/Dockerfile | 26 +++++++--------------
 cmake                                       |  2 +-
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 964684ab8..28d1095d5 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -132,19 +132,6 @@ RUN git clone -b 1.0.7 --depth=1 {{ GIT }}/google/highway.git \
 	&& cd .. \
 	&& rm -rf highway
 
-FROM builder AS mozjpeg
-RUN git clone -b v4.1.4 --depth=1 {{ GIT }}/mozilla/mozjpeg.git \
-	&& cd mozjpeg \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr/local \
-		-DWITH_JPEG8=ON \
-		-DPNG_SUPPORTED=OFF \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/mozjpeg-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf mozjpeg
-
 FROM builder AS opus
 RUN git clone -b v1.4 --depth=1 {{ GIT }}/xiph/opus.git \
 	&& cd opus \
@@ -265,13 +252,14 @@ COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
 
 RUN git clone -b v0.10.2 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 	&& cd libjxl \
+	&& git submodule update --init --recursive --depth=1 third_party/libjpeg-turbo \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \
 		-DBUILD_SHARED_LIBS=OFF \
 		-DBUILD_TESTING=OFF \
 		-DJPEGXL_ENABLE_DEVTOOLS=OFF \
 		-DJPEGXL_ENABLE_TOOLS=OFF \
-		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF \
+		-DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON \
 		-DJPEGXL_ENABLE_DOXYGEN=OFF \
 		-DJPEGXL_ENABLE_MANPAGES=OFF \
 		-DJPEGXL_ENABLE_BENCHMARK=OFF \
@@ -281,7 +269,10 @@ RUN git clone -b v0.10.2 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 		-DJPEGXL_ENABLE_OPENEXR=OFF \
 		-DJPEGXL_ENABLE_SKCMS=OFF \
 	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/libjxl-cache" cmake --install build \
+	&& export DESTDIR="{{ LibrariesPath }}/libjxl-cache" \
+	&& cmake --install build \
+	&& cp build/lib/libjpegli-static.a $DESTDIR/usr/local/lib64/libjpeg.a \
+	&& ar rcs $DESTDIR/usr/local/lib64/libjpeg.a build/lib/CMakeFiles/jpegli-libjpeg-obj.dir/jpegli/libjpeg_wrapper.cc.o \
 	&& cd .. \
 	&& rm -rf libjxl
 
@@ -704,7 +695,7 @@ RUN git clone -b 1.78.1 --depth=1 {{ GIT }}/GNOME/gobject-introspection.git \
 FROM patches AS qt
 COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
 COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
-COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
+COPY --link --from=libjxl {{ LibrariesPath }}/libjxl-cache /
 COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
 COPY --link --from=xcb-wm {{ LibrariesPath }}/xcb-wm-cache /
 COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
@@ -757,9 +748,9 @@ RUN git clone -b v2023.06.01 --depth=1 https://chromium.googlesource.com/breakpa
 	&& rm -rf breakpad
 
 FROM builder AS webrtc
-COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
 COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
 COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache /
+COPY --link --from=libjxl {{ LibrariesPath }}/libjxl-cache /
 COPY --link --from=ffmpeg {{ LibrariesPath }}/ffmpeg-cache /
 COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
 COPY --link --from=libXtst {{ LibrariesPath }}/libXtst-cache /
@@ -805,7 +796,6 @@ COPY --link --from=protobuf {{ LibrariesPath }}/protobuf-cache /
 COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
 COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
 COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
-COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
 COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
 COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
 COPY --link --from=libde265 {{ LibrariesPath }}/libde265-cache /
diff --git a/cmake b/cmake
index bf157ab03..621b01ec9 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit bf157ab03f3d07c3822dcdd3e3f90a8e4ccb7d66
+Subproject commit 621b01ec9bd7f953223147daf59ab4c850cb3c40

From f57e2edf2af61a285ad70ebe7a63a7bac95ba4c6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 10 Apr 2024 00:03:34 +0400
Subject: [PATCH 275/596] Replace mozjpeg with jpegli in snap

---
 snap/snapcraft.yaml | 38 ++++++++------------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8a122ab95..0d79929de 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -131,6 +131,7 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
       - -DTDESKTOP_API_ID=611335
       - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
       - -DDESKTOP_APP_USE_PACKAGED_LAZY=ON
@@ -158,7 +159,6 @@ parts:
     after:
       - ffmpeg
       - libjxl
-      - mozjpeg
       - openal
       - protobuf
       - qt
@@ -238,10 +238,6 @@ parts:
       rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas"
       mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
       rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
-    after:
-      - mozjpeg
 
   libjxl:
     source: https://github.com/libjxl/libjxl.git
@@ -257,7 +253,7 @@ parts:
       - -DBUILD_TESTING=OFF
       - -DJPEGXL_ENABLE_DEVTOOLS=OFF
       - -DJPEGXL_ENABLE_TOOLS=OFF
-      - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+      - -DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON
       - -DJPEGXL_ENABLE_DOXYGEN=OFF
       - -DJPEGXL_ENABLE_MANPAGES=OFF
       - -DJPEGXL_ENABLE_BENCHMARK=OFF
@@ -276,27 +272,6 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
       - -./usr/share
 
-  mozjpeg:
-    source: https://github.com/mozilla/mozjpeg.git
-    source-depth: 1
-    source-tag: v4.1.4
-    plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    cmake-generator: Ninja
-    cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DENABLE_STATIC=OFF
-      - -DWITH_JPEG8=ON
-      - -DPNG_SUPPORTED=OFF
-    prime:
-      - -./usr/bin
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-      - -./usr/share
-
   openal:
     source: https://github.com/kcat/openal-soft.git
     source-depth: 1
@@ -458,7 +433,9 @@ parts:
         -confirm-license \
         -openssl-linked \
         -nomake examples \
-        -nomake tests
+        -nomake tests \
+        -- \
+        -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
 
       cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
       DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
@@ -479,7 +456,7 @@ parts:
       - -./usr/mkspecs
       - -./usr/modules
     after:
-      - mozjpeg
+      - libjxl
       - patches
 
   rnnoise:
@@ -559,10 +536,11 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
     prime:
       - -./usr/include
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
     after:
       - ffmpeg
-      - mozjpeg
+      - libjxl

From d9d9a8f49d93434df59a8304d887107f27caa8c1 Mon Sep 17 00:00:00 2001
From: Nyan <93275906+el-garro@users.noreply.github.com>
Date: Fri, 12 Apr 2024 09:01:58 -0400
Subject: [PATCH 276/596] Update data_document_resolver.cpp

Added the LEXE and WLUA extensions to the IsExecutableName function for Windows. Those are registered by default on Windows devices with LUA installed
---
 Telegram/SourceFiles/data/data_document_resolver.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp
index b7dc51e2c..be68c2476 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.cpp
+++ b/Telegram/SourceFiles/data/data_document_resolver.cpp
@@ -165,14 +165,14 @@ bool IsExecutableName(const QString &filepath) {
 ad ade adp app application appref-ms asp asx bas bat bin cab cdxml cer cfg \
 chi chm cmd cnt com cpl crt csh der diagcab dll drv eml exe fon fxp gadget \
 grp hlp hpj hta htt inf ini ins inx isp isu its jar jnlp job js jse key ksh \
-lnk local lua mad maf mag mam manifest maq mar mas mat mau mav maw mcf mda \
-mdb mde mdt mdw mdz mht mhtml mjs mmc mof msc msg msh msh1 msh2 msh1xml \
+lexe lnk local lua mad maf mag mam manifest maq mar mas mat mau mav maw mcf \
+mda mdb mde mdt mdw mdz mht mhtml mjs mmc mof msc msg msh msh1 msh2 msh1xml \
 msh2xml mshxml msi msp mst ops osd paf pcd phar php php3 php4 php5 php7 phps \
 php-s pht phtml pif pl plg pm pod prf prg ps1 ps2 ps1xml ps2xml psc1 psc2 \
 psd1 psm1 pssc pst py py3 pyc pyd pyi pyo pyw pyzw pyz rb reg rgs scf scr \
 sct search-ms settingcontent-ms sh shb shs slk sys t tmp u3p url vb vbe vbp \
 vbs vbscript vdx vsmacros vsd vsdm vsdx vss vssm vssx vst vstm vstx vsw vsx \
-vtx website ws wsc wsf wsh xbap xll xnk xs"_q;
+vtx website wlua ws wsc wsf wsh xbap xll xnk xs"_q;
 #elif defined Q_OS_MAC // Q_OS_MAC
 			u"\
 applescript action app bin command csh osx workflow terminal url caction \

From a503197352c4a5f08899a4b53e34085b513bab65 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 14 Apr 2024 02:25:39 +0400
Subject: [PATCH 277/596] Remove XCBSetDesktopFileName

This is done by Qt nowadays
---
 .../platform/linux/main_window_linux.cpp      | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index e6a3b68a6..c8218ca7d 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -99,42 +99,6 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
 			| XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY,
 		reinterpret_cast<const char*>(&xev));
 }
-
-void XCBSetDesktopFileName(QWindow *window) {
-	const auto connection = base::Platform::XCB::GetConnectionFromQt();
-	if (!connection) {
-		return;
-	}
-
-	const auto utf8Atom = base::Platform::XCB::GetAtom(
-		connection,
-		"UTF8_STRING");
-
-	if (!utf8Atom.has_value()) {
-		return;
-	}
-
-	const auto filenameAtoms = {
-		base::Platform::XCB::GetAtom(connection, "_GTK_APPLICATION_ID"),
-		base::Platform::XCB::GetAtom(connection, "_KDE_NET_WM_DESKTOP_FILE"),
-	};
-
-	const auto filename = QGuiApplication::desktopFileName().toUtf8();
-
-	for (const auto atom : filenameAtoms) {
-		if (atom.has_value()) {
-			xcb_change_property(
-				connection,
-				XCB_PROP_MODE_REPLACE,
-				window->winId(),
-				*atom,
-				*utf8Atom,
-				8,
-				filename.size(),
-				filename.data());
-		}
-	}
-}
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
 void SkipTaskbar(QWindow *window, bool skip) {
@@ -206,10 +170,6 @@ void MainWindow::initHook() {
 		}
 		return base::EventFilterResult::Continue;
 	});
-
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-	XCBSetDesktopFileName(windowHandle());
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 }
 
 void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {

From da1909cc1d88dd9be294ebddb12c24b623ba6319 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 14 Apr 2024 05:45:54 +0400
Subject: [PATCH 278/596] Clean remainings of mozjpeg in snapcraft.yml

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 0d79929de..c95d0ab94 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -154,8 +154,6 @@ parts:
     override-build: |
       craftctl default
       rm -rf "$CRAFT_PART_INSTALL/usr/share/icons"
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
     after:
       - ffmpeg
       - libjxl
@@ -209,8 +207,6 @@ parts:
         fi
       done
       GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
     after:
       - telegram
 
@@ -439,8 +435,6 @@ parts:
 
       cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
       DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
     prime:
       - -./usr/bin
       - -./usr/doc

From bdf5872f04a89d87bf73fd2a4b2f9121b1491072 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 11 Apr 2024 17:11:38 +0300
Subject: [PATCH 279/596] Fixed opening channel earn info section for admins.

---
 Telegram/SourceFiles/api/api_statistics.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index 9bc31c483..7139c5ebb 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -860,6 +860,7 @@ void EarnStatistics::requestHistory(
 			.token = Data::EarnHistorySlice::OffsetToken(nextToken),
 		});
 	}).fail([=] {
+		done({});
 		_requestId = 0;
 	}).send();
 }

From 7ffa9844e2076a27eff89f0c066dae18eeb0f478 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 11 Apr 2024 18:29:31 +0300
Subject: [PATCH 280/596] Fixed currency formatting for channel earn info
 section.

---
 .../info/channel_statistics/earn/earn_format.cpp           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
index ea470af93..4f87fa505 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
@@ -48,8 +48,11 @@ QString MinorPart(EarnInt value) {
 
 QString ToUsd(EarnInt value, float64 rate) {
 	constexpr auto kApproximately = QChar(0x2248);
-	const auto multiplier = EarnInt(rate * Data::kEarnMultiplier);
-	const auto result = (value * multiplier) / Data::kEarnMultiplier;
+
+	const auto result = value
+		/ float64(Data::kEarnMultiplier)
+		* rate
+		* Data::kEarnMultiplier;
 	return QString(kApproximately)
 		+ QChar('$')
 		+ MajorPart(result)

From a37cbd7d05a31b01b856bc1043c011d736e6ea97 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 11 Apr 2024 17:37:54 +0300
Subject: [PATCH 281/596] Initially refactored statistics module to simplify
 value types changing.

---
 .../SourceFiles/data/data_statistics_chart.h  | 12 ++++---
 .../statistics/chart_rulers_data.cpp          | 36 ++++++++++---------
 .../statistics/chart_rulers_data.h            | 12 ++++---
 .../SourceFiles/statistics/chart_widget.cpp   |  2 +-
 .../SourceFiles/statistics/segment_tree.cpp   | 22 ++++++------
 .../SourceFiles/statistics/segment_tree.h     | 28 ++++++++-------
 .../statistics_data_deserialize.cpp           |  3 +-
 .../SourceFiles/statistics/statistics_types.h | 14 ++++++++
 .../statistics/view/abstract_chart_view.cpp   | 17 ++++-----
 .../statistics/view/bar_chart_view.cpp        |  6 ++--
 .../statistics/view/bar_chart_view.h          |  3 +-
 .../view/stack_linear_chart_common.cpp        |  2 +-
 .../view/stack_linear_chart_view.cpp          | 10 +++---
 Telegram/cmake/td_ui.cmake                    |  1 +
 14 files changed, 97 insertions(+), 71 deletions(-)
 create mode 100644 Telegram/SourceFiles/statistics/statistics_types.h

diff --git a/Telegram/SourceFiles/data/data_statistics_chart.h b/Telegram/SourceFiles/data/data_statistics_chart.h
index 5a29ebef7..2354e9e4d 100644
--- a/Telegram/SourceFiles/data/data_statistics_chart.h
+++ b/Telegram/SourceFiles/data/data_statistics_chart.h
@@ -30,14 +30,15 @@ struct StatisticalChart {
 	[[nodiscard]] int findIndex(int left, int right, float64 v) const;
 
 	struct Line final {
-		std::vector<int> y;
+		std::vector<Statistic::ChartValue> y;
 
 		Statistic::SegmentTree segmentTree;
 		int id = 0;
 		QString idString;
 		QString name;
-		int maxValue = 0;
-		int minValue = std::numeric_limits<int>::max();
+		Statistic::ChartValue maxValue = 0;
+		Statistic::ChartValue minValue =
+			std::numeric_limits<Statistic::ChartValue>::max();
 		QString colorKey;
 		QColor color;
 		QColor colorDark;
@@ -55,8 +56,9 @@ struct StatisticalChart {
 		float64 max = 0.;
 	} defaultZoomXIndex;
 
-	int maxValue = 0;
-	int minValue = std::numeric_limits<int>::max();
+	Statistic::ChartValue maxValue = 0;
+	Statistic::ChartValue minValue =
+		std::numeric_limits<Statistic::ChartValue>::max();
 
 	float64 oneDayPercentage = 0.;
 
diff --git a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
index 1b4e9c33a..4f9471c8c 100644
--- a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
+++ b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
@@ -12,17 +12,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Statistic {
 namespace {
 
-constexpr auto kMinLines = int(2);
-constexpr auto kMaxLines = int(6);
+constexpr auto kMinLines = ChartValue(2);
+constexpr auto kMaxLines = ChartValue(6);
 constexpr auto kStep = 5.;
 
-[[nodiscard]] int Round(int maxValue) {
-	const auto k = int(maxValue / kStep);
+[[nodiscard]] ChartValue Round(ChartValue maxValue) {
+	const auto k = ChartValue(maxValue / kStep);
 	return (k % 10 == 0) ? maxValue : ((maxValue / 10 + 1) * 10);
 }
 
-[[nodiscard]] QString Format(int absoluteValue) {
-	constexpr auto kTooMuch = int(10'000);
+[[nodiscard]] QString Format(ChartValue absoluteValue) {
+	constexpr auto kTooMuch = ChartValue(10'000);
 	return (absoluteValue >= kTooMuch)
 		? Lang::FormatCountToShort(absoluteValue).string
 		: QString::number(absoluteValue);
@@ -31,8 +31,8 @@ constexpr auto kStep = 5.;
 } // namespace
 
 ChartRulersData::ChartRulersData(
-		int newMaxHeight,
-		int newMinHeight,
+		ChartValue newMaxHeight,
+		ChartValue newMinHeight,
 		bool useMinHeight,
 		float64 rightRatio,
 		Fn<QString(float64)> leftCustomCaption,
@@ -42,11 +42,13 @@ ChartRulersData::ChartRulersData(
 			? Round(newMaxHeight)
 			: newMaxHeight;
 
-		const auto step = std::max(1, int(std::ceil(v / kStep)));
+		const auto step = std::max(
+			ChartValue(1),
+			ChartValue(std::ceil(v / kStep)));
 
 		auto n = kMaxLines;
 		if (v < kMaxLines) {
-			n = std::max(2, v + 1);
+			n = std::max(2, int(v + 1));
 		} else if (v / 2 < kMaxLines) {
 			n = v / 2 + 1;
 			if (v % 2 != 0) {
@@ -87,11 +89,11 @@ ChartRulersData::ChartRulersData(
 		}
 
 		lines.resize(n);
-		const auto diffAbsoluteValue = int((n - 1) * step);
+		const auto diffAbsoluteValue = ChartValue((n - 1) * step);
 		const auto skipFloatValues = (step / rightRatio) < 1;
 		for (auto i = 0; i < n; i++) {
 			auto &line = lines[i];
-			const auto value = int(i * step);
+			const auto value = ChartValue(i * step);
 			line.absoluteValue = newMinHeight + value;
 			line.relativeValue = 1. - value / float64(diffAbsoluteValue);
 			line.caption = leftCustomCaption
@@ -103,7 +105,7 @@ ChartRulersData::ChartRulersData(
 					? rightCustomCaption(line.absoluteValue)
 					: (!skipFloatValues)
 					? Format(v)
-					: ((v - int(v)) < 0.01)
+					: ((v - ChartValue(v)) < 0.01)
 					? Format(v)
 					: QString();
 			}
@@ -112,8 +114,8 @@ ChartRulersData::ChartRulersData(
 }
 
 void ChartRulersData::computeRelative(
-		int newMaxHeight,
-		int newMinHeight) {
+		ChartValue newMaxHeight,
+		ChartValue newMinHeight) {
 	for (auto &line : lines) {
 		line.relativeValue = 1.
 			- ((line.absoluteValue - newMinHeight)
@@ -121,10 +123,10 @@ void ChartRulersData::computeRelative(
 	}
 }
 
-int ChartRulersData::LookupHeight(int maxValue) {
+ChartValue ChartRulersData::LookupHeight(ChartValue maxValue) {
 	const auto v = (maxValue > 100) ? Round(maxValue) : maxValue;
 
-	const auto step = int(std::ceil(v / kStep));
+	const auto step = ChartValue(std::ceil(v / kStep));
 	return step * kStep;
 }
 
diff --git a/Telegram/SourceFiles/statistics/chart_rulers_data.h b/Telegram/SourceFiles/statistics/chart_rulers_data.h
index 4b5d63202..fef960c35 100644
--- a/Telegram/SourceFiles/statistics/chart_rulers_data.h
+++ b/Telegram/SourceFiles/statistics/chart_rulers_data.h
@@ -7,23 +7,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "statistics/statistics_types.h"
+
 namespace Statistic {
 
 struct ChartRulersData final {
 public:
 	ChartRulersData(
-		int newMaxHeight,
-		int newMinHeight,
+		ChartValue newMaxHeight,
+		ChartValue newMinHeight,
 		bool useMinHeight,
 		float64 rightRatio,
 		Fn<QString(float64)> leftCustomCaption = nullptr,
 		Fn<QString(float64)> rightCustomCaption = nullptr);
 
 	void computeRelative(
-		int newMaxHeight,
-		int newMinHeight);
+		ChartValue newMaxHeight,
+		ChartValue newMinHeight);
 
-	[[nodiscard]] static int LookupHeight(int maxValue);
+	[[nodiscard]] static ChartValue LookupHeight(ChartValue maxValue);
 
 	struct Line final {
 		float64 absoluteValue = 0.;
diff --git a/Telegram/SourceFiles/statistics/chart_widget.cpp b/Telegram/SourceFiles/statistics/chart_widget.cpp
index 93d225c70..823481e6b 100644
--- a/Telegram/SourceFiles/statistics/chart_widget.cpp
+++ b/Telegram/SourceFiles/statistics/chart_widget.cpp
@@ -1157,7 +1157,7 @@ void ChartWidget::setupDetails() {
 		return;
 	}
 	const auto maxAbsoluteValue = [&] {
-		auto maxValue = 0;
+		auto maxValue = ChartValue(0);
 		for (const auto &l : _chartData.lines) {
 			maxValue = std::max(l.maxValue, maxValue);
 		}
diff --git a/Telegram/SourceFiles/statistics/segment_tree.cpp b/Telegram/SourceFiles/statistics/segment_tree.cpp
index f19f8b8d6..51c2082ed 100644
--- a/Telegram/SourceFiles/statistics/segment_tree.cpp
+++ b/Telegram/SourceFiles/statistics/segment_tree.cpp
@@ -14,7 +14,7 @@ constexpr auto kMinArraySize = size_t(30);
 
 } // namespace
 
-SegmentTree::SegmentTree(std::vector<int> array)
+SegmentTree::SegmentTree(std::vector<ChartValue> array)
 : _array(std::move(array)) {
 	if (_array.size() < kMinArraySize) {
 		return;
@@ -28,7 +28,7 @@ SegmentTree::SegmentTree(std::vector<int> array)
 	build(1, 0, _array.size());
 }
 
-void SegmentTree::build(int v, int from, int size) {
+void SegmentTree::build(ChartValue v, int from, int size) {
 	_heap[v].from = from;
 	_heap[v].to = (from + size - 1);
 
@@ -48,9 +48,9 @@ void SegmentTree::build(int v, int from, int size) {
 	}
 }
 
-int SegmentTree::rMaxQ(int from, int to) {
+ChartValue SegmentTree::rMaxQ(int from, int to) {
 	if (_array.size() < kMinArraySize) {
-		auto max = 0;
+		auto max = ChartValue(0);
 		from = std::max(from, 0);
 		to = std::min(to, int(_array.size() - 1));
 		for (auto i = from; i <= to; i++) {
@@ -61,7 +61,7 @@ int SegmentTree::rMaxQ(int from, int to) {
 	return rMaxQ(1, from, to);
 }
 
-int SegmentTree::rMaxQ(int v, int from, int to) {
+ChartValue SegmentTree::rMaxQ(ChartValue v, int from, int to) {
 	const auto &n = _heap[v];
 	// If you did a range update that contained this node,
 	// you can infer the Min value without going down the tree.
@@ -84,9 +84,9 @@ int SegmentTree::rMaxQ(int v, int from, int to) {
 	return 0;
 }
 
-int SegmentTree::rMinQ(int from, int to) {
+ChartValue SegmentTree::rMinQ(int from, int to) {
 	if (_array.size() < kMinArraySize) {
-		auto min = std::numeric_limits<int>::max();
+		auto min = std::numeric_limits<ChartValue>::max();
 		from = std::max(from, 0);
 		to = std::min(to, int(_array.size() - 1));
 		for (auto i = from; i <= to; i++) {
@@ -97,7 +97,7 @@ int SegmentTree::rMinQ(int from, int to) {
 	return rMinQ(1, from, to);
 }
 
-int SegmentTree::rMinQ(int v, int from, int to) {
+ChartValue SegmentTree::rMinQ(ChartValue v, int from, int to) {
 	const auto &n = _heap[v];
 	// If you did a range update that contained this node,
 	// you can infer the Min value without going down the tree.
@@ -117,10 +117,10 @@ int SegmentTree::rMinQ(int v, int from, int to) {
 		return std::min(leftMin, rightMin);
 	}
 
-	return std::numeric_limits<int>::max();
+	return std::numeric_limits<ChartValue>::max();
 }
 
-void SegmentTree::propagate(int v) {
+void SegmentTree::propagate(ChartValue v) {
 	auto &n = _heap[v];
 
 	if (n.pendingVal) {
@@ -131,7 +131,7 @@ void SegmentTree::propagate(int v) {
 	}
 }
 
-void SegmentTree::change(SegmentTree::Node &n, int value) {
+void SegmentTree::change(SegmentTree::Node &n, ChartValue value) {
 	n.pendingVal = { value, true };
 	n.sum = n.size() * value;
 	n.max = value;
diff --git a/Telegram/SourceFiles/statistics/segment_tree.h b/Telegram/SourceFiles/statistics/segment_tree.h
index e67adc76a..f83b16dd4 100644
--- a/Telegram/SourceFiles/statistics/segment_tree.h
+++ b/Telegram/SourceFiles/statistics/segment_tree.h
@@ -7,12 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "statistics/statistics_types.h"
+
 namespace Statistic {
 
 class SegmentTree final {
 public:
 	SegmentTree() = default;
-	SegmentTree(std::vector<int> array);
+	SegmentTree(std::vector<ChartValue> array);
 
 	[[nodiscard]] bool empty() const {
 		return _array.empty();
@@ -21,20 +23,20 @@ public:
 		return !empty();
 	}
 
-	[[nodiscard]] int rMaxQ(int from, int to);
-	[[nodiscard]] int rMinQ(int from, int to);
+	[[nodiscard]] ChartValue rMaxQ(int from, int to);
+	[[nodiscard]] ChartValue rMinQ(int from, int to);
 
 private:
 	struct Node final {
-		int sum = 0;
-		int max = 0;
-		int min = 0;
+		ChartValue sum = 0;
+		ChartValue max = 0;
+		ChartValue min = 0;
 
 		struct PendingVal {
 			[[nodiscard]] explicit operator bool() const {
 				return available;
 			}
-			int value = 0;
+			ChartValue value = 0;
 			bool available = false;
 		};
 		PendingVal pendingVal;
@@ -47,12 +49,12 @@ private:
 		}
 	};
 
-	void build(int v, int from, int size);
-	void propagate(int v);
-	void change(Node &n, int value);
+	void build(ChartValue v, int from, int size);
+	void propagate(ChartValue v);
+	void change(Node &n, ChartValue value);
 
-	[[nodiscard]] int rMaxQ(int v, int from, int to);
-	[[nodiscard]] int rMinQ(int v, int from, int to);
+	[[nodiscard]] ChartValue rMaxQ(ChartValue v, int from, int to);
+	[[nodiscard]] ChartValue rMinQ(ChartValue v, int from, int to);
 
 	[[nodiscard]] bool contains(int from1, int to1, int from2, int to2) const;
 	[[nodiscard]] bool intersects(
@@ -61,7 +63,7 @@ private:
 		int from2,
 		int to2) const;
 
-	std::vector<int> _array;
+	std::vector<ChartValue> _array;
 	std::vector<Node> _heap;
 
 };
diff --git a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
index ac649cf13..7f47a396a 100644
--- a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
+++ b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/debug_log.h"
 #include "data/data_statistics_chart.h"
+#include "statistics/statistics_types.h"
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
@@ -61,7 +62,7 @@ Data::StatisticalChart StatisticalChartFromJSON(const QByteArray &json) {
 			line.isHiddenOnStart = ranges::contains(hiddenLines, columnId);
 			line.y.resize(length);
 			for (auto i = 0; i < length; i++) {
-				const auto value = int(base::SafeRound(
+				const auto value = ChartValue(base::SafeRound(
 					array.at(i + 1).toDouble()));
 				line.y[i] = value;
 				if (value > line.maxValue) {
diff --git a/Telegram/SourceFiles/statistics/statistics_types.h b/Telegram/SourceFiles/statistics/statistics_types.h
new file mode 100644
index 000000000..5d04d3442
--- /dev/null
+++ b/Telegram/SourceFiles/statistics/statistics_types.h
@@ -0,0 +1,14 @@
+/*
+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 Statistic {
+
+using ChartValue = int64;
+
+} // namespace Statistic
diff --git a/Telegram/SourceFiles/statistics/view/abstract_chart_view.cpp b/Telegram/SourceFiles/statistics/view/abstract_chart_view.cpp
index d2c8e6bae..4b5f2929a 100644
--- a/Telegram/SourceFiles/statistics/view/abstract_chart_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/abstract_chart_view.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/data_statistics_chart.h"
 #include "statistics/chart_lines_filter_controller.h"
+#include "statistics/statistics_types.h"
 
 namespace Statistic {
 
@@ -71,11 +72,11 @@ AbstractChartView::HeightLimits DefaultHeightLimits(
 		const std::shared_ptr<LinesFilterController> &linesFilter,
 		Data::StatisticalChart &chartData,
 		Limits xIndices) {
-	auto minValue = std::numeric_limits<int>::max();
-	auto maxValue = 0;
+	auto minValue = std::numeric_limits<ChartValue>::max();
+	auto maxValue = ChartValue(0);
 
-	auto minValueFull = std::numeric_limits<int>::max();
-	auto maxValueFull = 0;
+	auto minValueFull = std::numeric_limits<ChartValue>::max();
+	auto maxValueFull = ChartValue(0);
 	for (auto &l : chartData.lines) {
 		if (!linesFilter->isEnabled(l.id)) {
 			continue;
@@ -83,11 +84,11 @@ AbstractChartView::HeightLimits DefaultHeightLimits(
 		const auto r = ratios.ratio(l.id);
 		const auto lineMax = l.segmentTree.rMaxQ(xIndices.min, xIndices.max);
 		const auto lineMin = l.segmentTree.rMinQ(xIndices.min, xIndices.max);
-		maxValue = std::max(int(lineMax * r), maxValue);
-		minValue = std::min(int(lineMin * r), minValue);
+		maxValue = std::max(ChartValue(lineMax * r), maxValue);
+		minValue = std::min(ChartValue(lineMin * r), minValue);
 
-		maxValueFull = std::max(int(l.maxValue * r), maxValueFull);
-		minValueFull = std::min(int(l.minValue * r), minValueFull);
+		maxValueFull = std::max(ChartValue(l.maxValue * r), maxValueFull);
+		minValueFull = std::min(ChartValue(l.minValue * r), minValueFull);
 	}
 	if (maxValue == minValue) {
 		maxValue = chartData.maxValue;
diff --git a/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp b/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp
index 8beeaa509..f796e0294 100644
--- a/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp
@@ -256,9 +256,9 @@ AbstractChartView::HeightLimits BarChartView::heightLimits(
 	if (_cachedHeightLimits.ySum.empty()) {
 		_cachedHeightLimits.ySum.reserve(chartData.x.size());
 
-		auto maxValueFull = 0;
+		auto maxValueFull = ChartValue(0);
 		for (auto i = 0; i < chartData.x.size(); i++) {
-			auto sum = 0;
+			auto sum = ChartValue(0);
 			for (const auto &line : chartData.lines) {
 				if (linesFilterController()->isEnabled(line.id)) {
 					sum += line.y[i];
@@ -276,7 +276,7 @@ AbstractChartView::HeightLimits BarChartView::heightLimits(
 		_cachedHeightLimits.ySumSegmentTree.rMaxQ(
 			xIndices.min,
 			xIndices.max),
-		1);
+		ChartValue(1));
 	return {
 		.full = _cachedHeightLimits.full,
 		.ranged = { 0., float64(max) },
diff --git a/Telegram/SourceFiles/statistics/view/bar_chart_view.h b/Telegram/SourceFiles/statistics/view/bar_chart_view.h
index 44c1a7a6e..3105e0dae 100644
--- a/Telegram/SourceFiles/statistics/view/bar_chart_view.h
+++ b/Telegram/SourceFiles/statistics/view/bar_chart_view.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "statistics/segment_tree.h"
 #include "statistics/statistics_common.h"
+#include "statistics/statistics_types.h"
 #include "statistics/view/abstract_chart_view.h"
 #include "ui/effects/animation_value.h"
 
@@ -48,7 +49,7 @@ private:
 
 	struct {
 		Limits full;
-		std::vector<int> ySum;
+		std::vector<ChartValue> ySum;
 		SegmentTree ySumSegmentTree;
 	} _cachedHeightLimits;
 
diff --git a/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp b/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp
index a2ca3ff01..b7727bd71 100644
--- a/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp
+++ b/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp
@@ -81,7 +81,7 @@ PiePartData PiePartsPercentageByIndices(
 	sums.reserve(chartData.lines.size());
 	auto totalSum = 0.;
 	for (const auto &line : chartData.lines) {
-		auto sum = 0;
+		auto sum = ChartValue(0);
 		for (auto i = xIndices.min; i <= xIndices.max; i++) {
 			sum += line.y[i];
 		}
diff --git a/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp b/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp
index dc3e00d04..a4e4a7c87 100644
--- a/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/stack_linear_chart_view.cpp
@@ -165,8 +165,8 @@ void StackLinearChartView::prepareZoom(
 		_transition.zoomedOutXIndices = c.xIndices;
 		_transition.zoomedOutXPercentage = c.xPercentageLimits;
 	} else if (step == TransitionStep::PrepareToZoomIn) {
-		const auto &[zoomedStart, zoomedEnd] =
-			_transition.zoomedOutXIndices;
+		const auto &[zoomedStart, zoomedEnd]
+			= _transition.zoomedOutXIndices;
 		_transition.lines = std::vector<Transition::TransitionLine>(
 			c.chartData.lines.size(),
 			Transition::TransitionLine());
@@ -624,7 +624,7 @@ void StackLinearChartView::paintZoomed(QPainter &p, const PaintContext &c) {
 
 	if (selectedLineIndex >= 0) {
 		const auto &line = c.chartData.lines[selectedLineIndex];
-		auto sum = 0;
+		auto sum = ChartValue(0);
 		for (auto i = zoomedStart; i <= zoomedEnd; i++) {
 			sum += line.y[i];
 		}
@@ -669,8 +669,8 @@ void StackLinearChartView::paintZoomedFooter(
 			0);
 
 		const auto next = std::clamp(i + offset, zoomedStart, zoomedEnd);
-		const auto xPointPercentage =
-			(xPercentage[next] - xPercentage[zoomedStart])
+		const auto xPointPercentage
+			= (xPercentage[next] - xPercentage[zoomedStart])
 				/ (xPercentage[zoomedEnd] - xPercentage[zoomedStart]);
 		const auto xPoint = leftStart + width * xPointPercentage;
 
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 3a8f8ef34..524aba51b 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -205,6 +205,7 @@ PRIVATE
     statistics/statistics_data_deserialize.h
     statistics/statistics_format_values.cpp
     statistics/statistics_format_values.h
+    statistics/statistics_types.h
     statistics/view/abstract_chart_view.cpp
     statistics/view/abstract_chart_view.h
     statistics/view/bar_chart_view.cpp

From 1c223e570a2c7c66b17fb4fd1762121b9e4ce24d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 11 Apr 2024 18:56:11 +0300
Subject: [PATCH 282/596] Slightly improved code style for long equality
 expressions.

---
 .../SourceFiles/api/api_chat_participants.cpp |  4 ++--
 Telegram/SourceFiles/api/api_earn.cpp         |  8 +++----
 Telegram/SourceFiles/api/api_editing.cpp      | 20 ++++++++--------
 Telegram/SourceFiles/api/api_user_privacy.cpp |  4 ++--
 Telegram/SourceFiles/apiwrap.cpp              |  8 +++----
 .../SourceFiles/boxes/add_contact_box.cpp     | 12 +++++-----
 .../SourceFiles/boxes/delete_messages_box.cpp |  4 ++--
 .../boxes/peers/edit_peer_info_box.cpp        |  8 +++----
 .../SourceFiles/boxes/premium_preview_box.cpp |  4 ++--
 .../SourceFiles/boxes/sticker_set_box.cpp     |  8 +++----
 Telegram/SourceFiles/calls/calls_call.cpp     |  4 ++--
 Telegram/SourceFiles/calls/calls_call.h       |  8 +++----
 Telegram/SourceFiles/calls/calls_panel.h      |  4 ++--
 .../calls/group/calls_volume_item.cpp         | 12 +++++-----
 .../chat_helpers/field_autocomplete.cpp       |  9 +++----
 Telegram/SourceFiles/core/application.cpp     |  4 ++--
 .../SourceFiles/core/core_cloud_password.cpp  |  4 ++--
 Telegram/SourceFiles/core/core_settings.h     |  4 ++--
 Telegram/SourceFiles/data/data_poll.cpp       |  4 ++--
 .../SourceFiles/data/data_statistics_chart.h  |  8 +++----
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  4 ++--
 .../editor/photo_editor_content.cpp           |  4 ++--
 .../SourceFiles/export/export_api_wrap.cpp    |  4 ++--
 .../admin_log/history_admin_log_item.cpp      | 24 +++++++++----------
 .../SourceFiles/history/history_drag_area.cpp |  8 +++----
 .../SourceFiles/history/history_drag_area.h   |  4 ++--
 .../history_view_voice_record_bar.cpp         |  4 ++--
 .../history/view/history_view_list_widget.cpp |  4 ++--
 .../history/view/history_view_message.cpp     |  4 ++--
 .../history/view/history_view_send_action.cpp |  4 ++--
 .../view/media/history_view_web_page.cpp      |  4 ++--
 Telegram/SourceFiles/info/info_top_bar.cpp    | 12 +++++-----
 .../info/media/info_media_list_widget.cpp     |  4 ++--
 Telegram/SourceFiles/mainwindow.cpp           |  4 ++--
 .../media/player/media_player_dropdown.cpp    |  4 ++--
 .../media/system_media_controls_manager.cpp   |  4 ++--
 .../passport/passport_form_controller.cpp     |  4 ++--
 .../passport/passport_panel_controller.h      |  4 ++--
 .../linux/notifications_manager_linux.cpp     | 24 +++++++++----------
 .../touchbar/items/mac_pinned_chats_item.mm   | 10 ++++----
 .../mac/touchbar/mac_touchbar_manager.mm      |  4 ++--
 .../settings/settings_business.cpp            |  4 ++--
 .../SourceFiles/settings/settings_premium.cpp |  4 ++--
 .../SourceFiles/storage/storage_account.cpp   |  4 ++--
 .../SourceFiles/ui/boxes/choose_date_time.cpp |  4 ++--
 .../ui/controls/call_mute_button.cpp          |  8 +++----
 .../SourceFiles/window/window_peer_menu.cpp   |  4 ++--
 .../window/window_session_controller.cpp      |  8 +++----
 48 files changed, 159 insertions(+), 160 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
index 6761d2fff..745e0b883 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.cpp
+++ b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -112,8 +112,8 @@ void ApplyLastList(
 	channel->mgInfo->lastAdmins.clear();
 	channel->mgInfo->lastRestricted.clear();
 	channel->mgInfo->lastParticipants.clear();
-	channel->mgInfo->lastParticipantsStatus =
-		MegagroupInfo::LastParticipantsUpToDate
+	channel->mgInfo->lastParticipantsStatus
+		= MegagroupInfo::LastParticipantsUpToDate
 			| MegagroupInfo::LastParticipantsOnceReceived;
 
 	auto botStatus = channel->mgInfo->botStatus;
diff --git a/Telegram/SourceFiles/api/api_earn.cpp b/Telegram/SourceFiles/api/api_earn.cpp
index e8f38e06b..61cfaf10f 100644
--- a/Telegram/SourceFiles/api/api_earn.cpp
+++ b/Telegram/SourceFiles/api/api_earn.cpp
@@ -58,10 +58,10 @@ void HandleWithdrawalButton(
 			state->loading = false;
 
 			auto fields = PasscodeBox::CloudFields::From(pass);
-			fields.customTitle =
-				tr::lng_channel_earn_balance_password_title();
-			fields.customDescription =
-				tr::lng_channel_earn_balance_password_description(tr::now);
+			fields.customTitle
+				= tr::lng_channel_earn_balance_password_title();
+			fields.customDescription
+				= tr::lng_channel_earn_balance_password_description(tr::now);
 			fields.customSubmitButton = tr::lng_passcode_submit();
 			fields.customCheckCallback = crl::guard(button, [=](
 					const Core::CloudPasswordResult &result) {
diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index 84f0cbfff..1dba418dd 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -29,20 +29,20 @@ namespace {
 using namespace rpl::details;
 
 template <typename T>
-constexpr auto WithId =
-	is_callable_plain_v<T, Fn<void()>, mtpRequestId>;
+constexpr auto WithId
+	= is_callable_plain_v<T, Fn<void()>, mtpRequestId>;
 template <typename T>
-constexpr auto WithoutId =
-	is_callable_plain_v<T, Fn<void()>>;
+constexpr auto WithoutId
+	= is_callable_plain_v<T, Fn<void()>>;
 template <typename T>
-constexpr auto WithoutCallback =
-	is_callable_plain_v<T>;
+constexpr auto WithoutCallback
+	= is_callable_plain_v<T>;
 template <typename T>
-constexpr auto ErrorWithId =
-	is_callable_plain_v<T, QString, mtpRequestId>;
+constexpr auto ErrorWithId
+	= is_callable_plain_v<T, QString, mtpRequestId>;
 template <typename T>
-constexpr auto ErrorWithoutId =
-	is_callable_plain_v<T, QString>;
+constexpr auto ErrorWithoutId
+	= is_callable_plain_v<T, QString>;
 
 template <typename DoneCallback, typename FailCallback>
 mtpRequestId EditMessage(
diff --git a/Telegram/SourceFiles/api/api_user_privacy.cpp b/Telegram/SourceFiles/api/api_user_privacy.cpp
index b27580aaa..d0c17fa6b 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -307,8 +307,8 @@ void UserPrivacy::reload(Key key) {
 }
 
 void UserPrivacy::pushPrivacy(Key key, const TLRules &rules) {
-	const auto &saved = (_privacyValues[key] =
-		TLToRules(rules, _session->data()));
+	const auto &saved
+		= (_privacyValues[key] = TLToRules(rules, _session->data()));
 	const auto i = _privacyChanges.find(key);
 	if (i != end(_privacyChanges)) {
 		i->second.fire_copy(saved);
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index b8919617d..20c52fbdd 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -1544,8 +1544,8 @@ void ApiWrap::saveStickerSets(
 				writeRecent = true;
 			}
 
-			const auto isAttached =
-				(removedSetId == Data::Stickers::CloudRecentAttachedSetId);
+			const auto isAttached
+				= (removedSetId == Data::Stickers::CloudRecentAttachedSetId);
 			const auto flags = isAttached
 				? MTPmessages_ClearRecentStickers::Flag::f_attached
 				: MTPmessages_ClearRecentStickers::Flags(0);
@@ -2494,8 +2494,8 @@ void ApiWrap::refreshFileReference(
 	}, [&](Data::FileOriginPeerPhoto data) {
 		fail();
 	}, [&](Data::FileOriginStickerSet data) {
-		const auto isRecentAttached =
-			(data.setId == Data::Stickers::CloudRecentAttachedSetId);
+		const auto isRecentAttached
+			= (data.setId == Data::Stickers::CloudRecentAttachedSetId);
 		if (data.setId == Data::Stickers::CloudRecentSetId
 			|| data.setId == Data::Stickers::RecentSetId
 			|| isRecentAttached) {
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index ba35e8d98..45d4b1e99 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -605,8 +605,8 @@ void GroupInfoBox::prepare() {
 		_navigation->session().api().selfDestruct().reload();
 
 		const auto top = addTopButton(st::infoTopBarMenu);
-		const auto menu =
-			top->lifetime().make_state<base::unique_qptr<Ui::PopupMenu>>();
+		const auto menu
+			= top->lifetime().make_state<base::unique_qptr<Ui::PopupMenu>>();
 		top->setClickedCallback([=] {
 			*menu = base::make_unique_q<Ui::PopupMenu>(
 				top,
@@ -1306,8 +1306,8 @@ void SetupChannelBox::handleChange() {
 				&& (ch < 'a' || ch > 'z')
 				&& (ch < '0' || ch > '9')
 				&& ch != '_') {
-				const auto badSymbols =
-					tr::lng_create_channel_link_bad_symbols(tr::now);
+				const auto badSymbols
+					= tr::lng_create_channel_link_bad_symbols(tr::now);
 				if (_errorText != badSymbols) {
 					_errorText = badSymbols;
 					update();
@@ -1317,8 +1317,8 @@ void SetupChannelBox::handleChange() {
 			}
 		}
 		if (name.size() < Ui::EditPeer::kMinUsernameLength) {
-			const auto tooShort =
-				tr::lng_create_channel_link_too_short(tr::now);
+			const auto tooShort
+				= tr::lng_create_channel_link_too_short(tr::now);
 			if (_errorText != tooShort) {
 				_errorText = tooShort;
 				update();
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index 0a939ace6..1def53870 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -232,8 +232,8 @@ void DeleteMessagesBox::prepare() {
 			if (hasScheduledMessages()) {
 			} else if (auto revoke = revokeText(peer)) {
 				const auto &settings = Core::App().settings();
-				const auto revokeByDefault =
-					!settings.rememberedDeleteMessageOnlyForYou();
+				const auto revokeByDefault
+					= !settings.rememberedDeleteMessageOnlyForYou();
 				_revoke.create(
 					this,
 					revoke->checkbox,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 31faabec1..a1ee68248 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -983,8 +983,8 @@ void Controller::fillHistoryVisibilityButton() {
 		: HistoryVisibility::Visible;
 	_channelHasLocationOriginalValue = channel && channel->hasLocation();
 
-	const auto updateHistoryVisibility =
-		std::make_shared<rpl::event_stream<HistoryVisibility>>();
+	const auto updateHistoryVisibility
+		= std::make_shared<rpl::event_stream<HistoryVisibility>>();
 
 	const auto boxCallback = crl::guard(this, [=](HistoryVisibility checked) {
 		updateHistoryVisibility->fire(std::move(checked));
@@ -1698,8 +1698,8 @@ void Controller::saveUsernamesOrder() {
 			channel->setUsernames(ranges::views::all(
 				newUsernames
 			) | ranges::views::transform([&](QString username) {
-				const auto editable =
-					(channel->editableUsername() == username);
+				const auto editable
+					= (channel->editableUsername() == username);
 				return Data::Username{
 					.username = std::move(username),
 					.active = true,
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index 67e402da5..da1ab9064 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -1240,8 +1240,8 @@ void DecorateListPromoBox(
 		box->setStyle(st::premiumPreviewDoubledLimitsBox);
 		box->widthValue(
 		) | rpl::start_with_next([=](int width) {
-			const auto &padding =
-				st::premiumPreviewDoubledLimitsBox.buttonPadding;
+			const auto &padding
+				= st::premiumPreviewDoubledLimitsBox.buttonPadding;
 			button->resizeToWidth(width
 				- padding.left()
 				- padding.right());
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 414f098e2..88163356c 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -569,8 +569,8 @@ void StickerSetBox::updateButtons() {
 
 			if (!_inner->shortName().isEmpty()) {
 				const auto top = addTopButton(st::infoTopBarMenu);
-				const auto menu =
-					std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
+				const auto menu
+					= std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
 				top->setClickedCallback([=] {
 					*menu = base::make_unique_q<Ui::PopupMenu>(
 						top,
@@ -613,8 +613,8 @@ void StickerSetBox::updateButtons() {
 						_show->showBox(std::move(box));
 					}
 				};
-				const auto menu =
-					std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
+				const auto menu
+					= std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
 				top->setClickedCallback([=] {
 					*menu = base::make_unique_q<Ui::PopupMenu>(
 						top,
diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 3f6c2a7a8..3a3e68b47 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -945,8 +945,8 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 	tgcalls::Descriptor descriptor = {
 		.version = versionString,
 		.config = tgcalls::Config{
-			.initializationTimeout =
-				serverConfig.callConnectTimeoutMs / 1000.,
+			.initializationTimeout
+				= serverConfig.callConnectTimeoutMs / 1000.,
 			.receiveTimeout = serverConfig.callPacketTimeoutMs / 1000.,
 			.dataSaving = tgcalls::DataSaving::Never,
 			.enableP2P = call.is_p2p_allowed(),
diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 55f48237a..0a99c8067 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -277,11 +277,11 @@ private:
 	MTP::Sender _api;
 	Type _type = Type::Outgoing;
 	rpl::variable<State> _state = State::Starting;
-	rpl::variable<RemoteAudioState> _remoteAudioState =
-		RemoteAudioState::Active;
+	rpl::variable<RemoteAudioState> _remoteAudioState
+		= RemoteAudioState::Active;
 	rpl::variable<Webrtc::VideoState> _remoteVideoState;
-	rpl::variable<RemoteBatteryState> _remoteBatteryState =
-		RemoteBatteryState::Normal;
+	rpl::variable<RemoteBatteryState> _remoteBatteryState
+		= RemoteBatteryState::Normal;
 	rpl::event_stream<Error> _errors;
 	FinishType _finishAfterRequestingCall = FinishType::None;
 	bool _answerAfterDhConfigReceived = false;
diff --git a/Telegram/SourceFiles/calls/calls_panel.h b/Telegram/SourceFiles/calls/calls_panel.h
index f6c8666d8..11c6dceae 100644
--- a/Telegram/SourceFiles/calls/calls_panel.h
+++ b/Telegram/SourceFiles/calls/calls_panel.h
@@ -162,8 +162,8 @@ private:
 	object_ptr<Ui::FlatLabel> _status;
 	object_ptr<Ui::RpWidget> _fingerprint = { nullptr };
 	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>> _remoteAudioMute = { nullptr };
-	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>> _remoteLowBattery =
-		{ nullptr };
+	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>> _remoteLowBattery
+		= { nullptr };
 	std::unique_ptr<Userpic> _userpic;
 	std::unique_ptr<VideoBubble> _outgoingVideoBubble;
 	QPixmap _bottomShadow;
diff --git a/Telegram/SourceFiles/calls/group/calls_volume_item.cpp b/Telegram/SourceFiles/calls/group/calls_volume_item.cpp
index 5942a97e7..d34a51060 100644
--- a/Telegram/SourceFiles/calls/group/calls_volume_item.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_volume_item.cpp
@@ -25,8 +25,8 @@ const auto kSpeakerThreshold = std::vector<float>{
 	50.0f / kMaxVolumePercent,
 	150.0f / kMaxVolumePercent };
 
-constexpr auto kVolumeStickedValues =
-	std::array<std::pair<float64, float64>, 7>{{
+constexpr auto kVolumeStickedValues
+	= std::array<std::pair<float64, float64>, 7>{{
 		{ 25. / kMaxVolumePercent, 2. / kMaxVolumePercent },
 		{ 50. / kMaxVolumePercent, 2. / kMaxVolumePercent },
 		{ 75. / kMaxVolumePercent, 2. / kMaxVolumePercent },
@@ -93,8 +93,8 @@ MenuVolumeItem::MenuVolumeItem(
 		const auto volume = _localMuted
 			? 0
 			: base::SafeRound(_slider->value() * kMaxVolumePercent);
-		const auto muteProgress =
-			_crossLineAnimation.value((!volume) ? 1. : 0.);
+		const auto muteProgress
+			= _crossLineAnimation.value((!volume) ? 1. : 0.);
 
 		const auto selected = isSelected();
 		p.fillRect(clip, selected ? st.itemBgOver : st.itemBg);
@@ -174,8 +174,8 @@ MenuVolumeItem::MenuVolumeItem(
 			return;
 		}
 		if (_waitingForUpdateVolume) {
-			const auto localVolume =
-				base::SafeRound(_slider->value() * _maxVolume);
+			const auto localVolume
+				= base::SafeRound(_slider->value() * _maxVolume);
 			if ((localVolume != newVolume)
 				&& (_cloudVolume == newVolume)) {
 				_changeVolumeRequests.fire(int(localVolume));
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index e82ab9b9f..9bc6e88f2 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -437,8 +437,8 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 
 		auto filterNotPassedByUsername = [this](UserData *user) -> bool {
 			if (PrimaryUsername(user).startsWith(_filter, Qt::CaseInsensitive)) {
-				const auto exactUsername =
-					(PrimaryUsername(user).size() == _filter.size());
+				const auto exactUsername
+					= (PrimaryUsername(user).size() == _filter.size());
 				return exactUsername;
 			}
 			return true;
@@ -446,8 +446,9 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 		auto filterNotPassedByName = [&](UserData *user) -> bool {
 			for (const auto &nameWord : user->nameWords()) {
 				if (nameWord.startsWith(_filter, Qt::CaseInsensitive)) {
-					const auto exactUsername =
-						(PrimaryUsername(user).compare(_filter, Qt::CaseInsensitive) == 0);
+					const auto exactUsername = PrimaryUsername(user).compare(
+						_filter,
+						Qt::CaseInsensitive) == 0;
 					return exactUsername;
 				}
 			}
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 3f643b6dd..917baf16e 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -933,8 +933,8 @@ void Application::handleAppDeactivated() {
 }
 
 rpl::producer<bool> Application::appDeactivatedValue() const {
-	const auto &app =
-		static_cast<QGuiApplication*>(QCoreApplication::instance());
+	const auto &app
+		= static_cast<QGuiApplication*>(QCoreApplication::instance());
 	return rpl::single(
 		app->applicationState()
 	) | rpl::then(
diff --git a/Telegram/SourceFiles/core/core_cloud_password.cpp b/Telegram/SourceFiles/core/core_cloud_password.cpp
index 3a65f24d5..a835112dc 100644
--- a/Telegram/SourceFiles/core/core_cloud_password.cpp
+++ b/Telegram/SourceFiles/core/core_cloud_password.cpp
@@ -313,8 +313,8 @@ CloudPasswordState ParseCloudPasswordState(
 		ParseCloudPasswordAlgo(data.vnew_algo()));
 	result.mtp.newSecureSecret = ValidateNewSecureSecretAlgo(
 		ParseSecureSecretAlgo(data.vnew_secure_algo()));
-	result.unconfirmedPattern =
-		qs(data.vemail_unconfirmed_pattern().value_or_empty());
+	result.unconfirmedPattern = qs(
+		data.vemail_unconfirmed_pattern().value_or_empty());
 	result.pendingResetDate = data.vpending_reset_date().value_or_empty();
 
 	result.outdatedClient = [&] {
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 93e0727d7..12b7fa431 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -984,8 +984,8 @@ private:
 #else // Q_OS_MAC
 	bool _hardwareAcceleratedVideo = false;
 #endif // Q_OS_MAC
-	HistoryView::DoubleClickQuickAction _chatQuickAction =
-		HistoryView::DoubleClickQuickAction();
+	HistoryView::DoubleClickQuickAction _chatQuickAction
+		= HistoryView::DoubleClickQuickAction();
 	bool _translateButtonEnabled = false;
 	rpl::variable<bool> _translateChatEnabled = true;
 	rpl::variable<int> _translateToRaw = 0;
diff --git a/Telegram/SourceFiles/data/data_poll.cpp b/Telegram/SourceFiles/data/data_poll.cpp
index f781f95bc..800f3ee32 100644
--- a/Telegram/SourceFiles/data/data_poll.cpp
+++ b/Telegram/SourceFiles/data/data_poll.cpp
@@ -121,8 +121,8 @@ bool PollData::applyResults(const MTPPollResults &results) {
 	return results.match([&](const MTPDpollResults &results) {
 		_lastResultsUpdate = crl::now();
 
-		const auto newTotalVoters =
-			results.vtotal_voters().value_or(totalVoters);
+		const auto newTotalVoters
+			= results.vtotal_voters().value_or(totalVoters);
 		auto changed = (newTotalVoters != totalVoters);
 		if (const auto list = results.vresults()) {
 			for (const auto &result : list->v) {
diff --git a/Telegram/SourceFiles/data/data_statistics_chart.h b/Telegram/SourceFiles/data/data_statistics_chart.h
index 2354e9e4d..fba664d34 100644
--- a/Telegram/SourceFiles/data/data_statistics_chart.h
+++ b/Telegram/SourceFiles/data/data_statistics_chart.h
@@ -37,8 +37,8 @@ struct StatisticalChart {
 		QString idString;
 		QString name;
 		Statistic::ChartValue maxValue = 0;
-		Statistic::ChartValue minValue =
-			std::numeric_limits<Statistic::ChartValue>::max();
+		Statistic::ChartValue minValue
+			= std::numeric_limits<Statistic::ChartValue>::max();
 		QString colorKey;
 		QColor color;
 		QColor colorDark;
@@ -57,8 +57,8 @@ struct StatisticalChart {
 	} defaultZoomXIndex;
 
 	Statistic::ChartValue maxValue = 0;
-	Statistic::ChartValue minValue =
-		std::numeric_limits<Statistic::ChartValue>::max();
+	Statistic::ChartValue minValue
+		= std::numeric_limits<Statistic::ChartValue>::max();
 
 	float64 oneDayPercentage = 0.;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 8ac5c91b3..873b15324 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -770,8 +770,8 @@ void Widget::updateScrollUpPosition() {
 	_scrollToTop->moveToRight(
 		st::historyToDownPosition.x(),
 		_scroll->height() - top);
-	const auto shouldBeHidden =
-		!_scrollToTopIsShown && !_scrollToTopShown.animating();
+	const auto shouldBeHidden
+		= !_scrollToTopIsShown && !_scrollToTopShown.animating();
 	if (shouldBeHidden != _scrollToTop->isHidden()) {
 		_scrollToTop->setVisible(!shouldBeHidden);
 	}
diff --git a/Telegram/SourceFiles/editor/photo_editor_content.cpp b/Telegram/SourceFiles/editor/photo_editor_content.cpp
index 065b2a1a6..1a379b9b3 100644
--- a/Telegram/SourceFiles/editor/photo_editor_content.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_content.cpp
@@ -48,8 +48,8 @@ PhotoEditorContent::PhotoEditorContent(
 			return;
 		}
 		const auto imageSizeF = [&] {
-			const auto rotatedSize =
-				FlipSizeByRotation(size, mods.angle);
+			const auto rotatedSize
+				= FlipSizeByRotation(size, mods.angle);
 			const auto m = _crop->cropMargins();
 			const auto sizeForCrop = rotatedSize
 				- QSize(m.left() + m.right(), m.top() + m.bottom());
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index b50c105f3..69861015c 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -541,8 +541,8 @@ void ApiWrap::requestDialogsCount() {
 	Expects(_startProcess != nullptr);
 
 	if (_settings->onlySinglePeer()) {
-		_startProcess->info.dialogsCount =
-			(_settings->singlePeer.type() == mtpc_inputPeerChannel
+		_startProcess->info.dialogsCount
+			= (_settings->singlePeer.type() == mtpc_inputPeerChannel
 				? 1
 				: _splits.size());
 		sendNextStartRequest();
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 5899117be..53e0926e0 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -738,8 +738,8 @@ void GenerateItems(
 	using LogPromote = MTPDchannelAdminLogEventActionParticipantToggleAdmin;
 	using LogSticker = MTPDchannelAdminLogEventActionChangeStickerSet;
 	using LogEmoji = MTPDchannelAdminLogEventActionChangeEmojiStickerSet;
-	using LogPreHistory =
-		MTPDchannelAdminLogEventActionTogglePreHistoryHidden;
+	using LogPreHistory
+		= MTPDchannelAdminLogEventActionTogglePreHistoryHidden;
 	using LogPermissions = MTPDchannelAdminLogEventActionDefaultBannedRights;
 	using LogPoll = MTPDchannelAdminLogEventActionStopPoll;
 	using LogDiscussion = MTPDchannelAdminLogEventActionChangeLinkedChat;
@@ -749,19 +749,19 @@ void GenerateItems(
 	using LogDiscardCall = MTPDchannelAdminLogEventActionDiscardGroupCall;
 	using LogMute = MTPDchannelAdminLogEventActionParticipantMute;
 	using LogUnmute = MTPDchannelAdminLogEventActionParticipantUnmute;
-	using LogCallSetting =
-		MTPDchannelAdminLogEventActionToggleGroupCallSetting;
-	using LogJoinByInvite =
-		MTPDchannelAdminLogEventActionParticipantJoinByInvite;
-	using LogInviteDelete =
-		MTPDchannelAdminLogEventActionExportedInviteDelete;
-	using LogInviteRevoke =
-		MTPDchannelAdminLogEventActionExportedInviteRevoke;
+	using LogCallSetting
+		= MTPDchannelAdminLogEventActionToggleGroupCallSetting;
+	using LogJoinByInvite
+		= MTPDchannelAdminLogEventActionParticipantJoinByInvite;
+	using LogInviteDelete
+		= MTPDchannelAdminLogEventActionExportedInviteDelete;
+	using LogInviteRevoke
+		= MTPDchannelAdminLogEventActionExportedInviteRevoke;
 	using LogInviteEdit = MTPDchannelAdminLogEventActionExportedInviteEdit;
 	using LogVolume = MTPDchannelAdminLogEventActionParticipantVolume;
 	using LogTTL = MTPDchannelAdminLogEventActionChangeHistoryTTL;
-	using LogJoinByRequest =
-		MTPDchannelAdminLogEventActionParticipantJoinByRequest;
+	using LogJoinByRequest
+		= MTPDchannelAdminLogEventActionParticipantJoinByRequest;
 	using LogNoForwards = MTPDchannelAdminLogEventActionToggleNoForwards;
 	using LogSendMessage = MTPDchannelAdminLogEventActionSendMessage;
 	using LogChangeAvailableReactions = MTPDchannelAdminLogEventActionChangeAvailableReactions;
diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp
index 39ba5fe3c..4f99ec778 100644
--- a/Telegram/SourceFiles/history/history_drag_area.cpp
+++ b/Telegram/SourceFiles/history/history_drag_area.cpp
@@ -52,8 +52,8 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 	auto &lifetime = container->lifetime();
 	container->setAcceptDrops(true);
 
-	const auto attachDragDocument =
-		Ui::CreateChild<DragArea>(container.get());
+	const auto attachDragDocument
+		= Ui::CreateChild<DragArea>(container.get());
 	const auto attachDragPhoto = Ui::CreateChild<DragArea>(container.get());
 
 	attachDragDocument->hide();
@@ -62,8 +62,8 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 	attachDragDocument->raise();
 	attachDragPhoto->raise();
 
-	const auto attachDragState =
-		lifetime.make_state<DragState>(DragState::None);
+	const auto attachDragState
+		= lifetime.make_state<DragState>(DragState::None);
 
 	const auto width = [=] {
 		return container->width();
diff --git a/Telegram/SourceFiles/history/history_drag_area.h b/Telegram/SourceFiles/history/history_drag_area.h
index 64e581d58..c9c075c5a 100644
--- a/Telegram/SourceFiles/history/history_drag_area.h
+++ b/Telegram/SourceFiles/history/history_drag_area.h
@@ -23,8 +23,8 @@ public:
 		DragArea *photo;
 	};
 
-	using CallbackComputeState =
-		Fn<Storage::MimeDataState(const QMimeData *data)>;
+	using CallbackComputeState
+		= Fn<Storage::MimeDataState(const QMimeData *data)>;
 
 	static Areas SetupDragAreaToContainer(
 		not_null<Ui::RpWidget*> container,
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 aa0c740da..ade1c9eec 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
@@ -372,8 +372,8 @@ TTLButton::TTLButton(
 			return (r.left() + r.width() > parentWidget()->width());
 		}) | rpl::distinct_until_changed(
 		) | rpl::start_with_next([=](bool toHide) {
-			const auto isFirstTooltip =
-				!Core::App().settings().ttlVoiceClickTooltipHidden();
+			const auto isFirstTooltip
+				= !Core::App().settings().ttlVoiceClickTooltipHidden();
 			if (isFirstTooltip || (!isFirstTooltip && toHide)) {
 				_tooltip->toggleAnimated(!toHide);
 			}
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 23b7c0be3..dc1255e2c 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -3898,8 +3898,8 @@ bool ListWidget::lastMessageEditRequestNotify() const {
 	if (it == end(list)) {
 		return false;
 	} else {
-		const auto item =
-			session().data().groups().findItemToEdit((*it)->data()).get();
+		const auto item
+			= session().data().groups().findItemToEdit((*it)->data()).get();
 		editMessageRequestNotify(item->fullId());
 		return true;
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 100fff459..3a94363e2 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1849,8 +1849,8 @@ void Message::clickHandlerPressedChanged(
 			if (pressed) {
 				if (!_rightAction->second->ripple) {
 					// Create a ripple.
-					_rightAction->second->ripple =
-						std::make_unique<Ui::RippleAnimation>(
+					_rightAction->second->ripple
+						= std::make_unique<Ui::RippleAnimation>(
 							st::defaultRippleAnimation,
 							Ui::RippleAnimation::RoundRectMask(
 								Size(rightSize->width()),
diff --git a/Telegram/SourceFiles/history/view/history_view_send_action.cpp b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
index 5380ccfb5..460941e6d 100644
--- a/Telegram/SourceFiles/history/view/history_view_send_action.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
@@ -150,8 +150,8 @@ bool SendActionPainter::paint(
 		const auto extraAnimationWidth = _animationLeft
 			? animationWidth * 2
 			: 0;
-		const auto left =
-			(availableWidth < _animationLeft + extraAnimationWidth)
+		const auto left
+			= (availableWidth < _animationLeft + extraAnimationWidth)
 				? 0
 				: _animationLeft;
 		_sendActionAnimation.paint(
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 fbd61a00e..c275e3b35 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -496,8 +496,8 @@ QSize WebPage::countOptimalSize() {
 		minHeight = resizeGetHeight(maxWidth);
 	}
 	if (_sponsoredData && _sponsoredData->canReport) {
-		_sponsoredData->widthBeforeHint =
-			st::webPageTitleStyle.font->width(siteName);
+		_sponsoredData->widthBeforeHint
+			= st::webPageTitleStyle.font->width(siteName);
 		const auto &font = st::webPageSponsoredHintFont;
 		_sponsoredData->hintSize = QSize(
 			font->width(tr::lng_sponsored_message_revenue_button(tr::now))
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 1e5f34c2f..2caa1ffa8 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -683,13 +683,13 @@ void TopBar::createSelectionControls() {
 		_selectionActionRequests,
 		_cancelSelection->lifetime());
 	_delete->entity()->setVisible(_canDelete);
-	const auto archive =
-	_toggleStoryPin = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
-		this,
-		object_ptr<Ui::IconButton>(
+	const auto archive = _toggleStoryPin = wrap(
+		Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
 			this,
-			_storiesArchive ? _st.storiesSave : _st.storiesArchive),
-		st::infoTopBarScale));
+			object_ptr<Ui::IconButton>(
+				this,
+				_storiesArchive ? _st.storiesSave : _st.storiesArchive),
+			st::infoTopBarScale));
 	registerToggleControlCallback(
 		_toggleStoryPin.data(),
 		[this] { return selectionMode() && _canToggleStoryPin; });
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 1a42e6379..4e30f0b09 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -814,8 +814,8 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 	}
 
 	if (_dateBadge->goodType && clip.intersects(_dateBadge->rect)) {
-		const auto scrollDateOpacity =
-			_dateBadge->opacity.value(_dateBadge->shown ? 1. : 0.);
+		const auto scrollDateOpacity
+			= _dateBadge->opacity.value(_dateBadge->shown ? 1. : 0.);
 		if (scrollDateOpacity > 0.) {
 			p.setOpacity(scrollDateOpacity);
 			if (_dateBadge->corners.p[0].isNull()) {
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 5e8724b37..93d6d3060 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -77,8 +77,8 @@ base::options::toggle AutoScrollInactiveChat({
 
 } // namespace
 
-const char kOptionAutoScrollInactiveChat[] =
-	"auto-scroll-inactive-chat";
+const char kOptionAutoScrollInactiveChat[]
+	= "auto-scroll-inactive-chat";
 
 MainWindow::MainWindow(not_null<Window::Controller*> controller)
 : Platform::MainWindow(controller) {
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
index c00765cf8..073ae2531 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
@@ -35,8 +35,8 @@ constexpr auto kSpeedDebounceTimeout = crl::time(1000);
 	return base::SafeRound(speed * 10) / 10.;
 }
 
-constexpr auto kSpeedStickedValues =
-	std::array<std::pair<float64, float64>, 7>{{
+constexpr auto kSpeedStickedValues
+	= std::array<std::pair<float64, float64>, 7>{{
 		{ 0.8, 0.05 },
 		{ 1.0, 0.05 },
 		{ 1.2, 0.05 },
diff --git a/Telegram/SourceFiles/media/system_media_controls_manager.cpp b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
index d16685860..91f016aa5 100644
--- a/Telegram/SourceFiles/media/system_media_controls_manager.cpp
+++ b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
@@ -44,8 +44,8 @@ bool SystemMediaControlsManager::Supported() {
 SystemMediaControlsManager::SystemMediaControlsManager()
 : _controls(std::make_unique<base::Platform::SystemMediaControls>()) {
 
-	using PlaybackStatus =
-		base::Platform::SystemMediaControls::PlaybackStatus;
+	using PlaybackStatus
+		= base::Platform::SystemMediaControls::PlaybackStatus;
 	using Command = base::Platform::SystemMediaControls::Command;
 
 	_controls->setApplicationName(AppName.utf16());
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index 980888ffb..b0ad0fcdf 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -2686,8 +2686,8 @@ bool FormController::applyPassword(const MTPDaccount_password &result) {
 	settings.notEmptyPassport = result.is_has_secure_values();
 	settings.request = Core::ParseCloudPasswordCheckRequest(result);
 	settings.unknownAlgo = result.vcurrent_algo() && !settings.request;
-	settings.unconfirmedPattern =
-		qs(result.vemail_unconfirmed_pattern().value_or_empty());
+	settings.unconfirmedPattern = qs(
+		result.vemail_unconfirmed_pattern().value_or_empty());
 	settings.newAlgo = Core::ValidateNewCloudPasswordAlgo(
 		Core::ParseCloudPasswordAlgo(result.vnew_algo()));
 	settings.newSecureAlgo = Core::ValidateNewSecureSecretAlgo(
diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.h b/Telegram/SourceFiles/passport/passport_panel_controller.h
index 94cd418c8..5c3d296b4 100644
--- a/Telegram/SourceFiles/passport/passport_panel_controller.h
+++ b/Telegram/SourceFiles/passport/passport_panel_controller.h
@@ -26,8 +26,8 @@ struct EditContactScheme;
 
 enum class ReadScanError;
 
-using preferredLangCallback =
-	Fn<rpl::producer<EditDocumentCountry>(const QString &)>;
+using preferredLangCallback
+	= Fn<rpl::producer<EditDocumentCountry>(const QString &)>;
 EditDocumentScheme GetDocumentScheme(
 	Scope::Type type,
 	std::optional<Value::Type> scansType,
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 0ea48a7de..747e4c2fa 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -315,19 +315,19 @@ bool NotificationData::init(
 		_actions.push_back("inline-reply");
 		_actions.push_back(tr::lng_notification_reply(tr::now).toStdString());
 
-		_notificationRepliedSignalId =
-			_interface.signal_notification_replied().connect([=](
-					XdgNotifications::Notifications,
-					uint id,
-					std::string text) {
-				Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-					if (id == _notificationId) {
-						_manager->notificationReplied(
-							_id,
-							{ QString::fromStdString(text), {} });
-					}
+		_notificationRepliedSignalId
+			= _interface.signal_notification_replied().connect([=](
+						XdgNotifications::Notifications,
+						uint id,
+						std::string text) {
+					Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+						if (id == _notificationId) {
+							_manager->notificationReplied(
+								_id,
+								{ QString::fromStdString(text), {} });
+						}
+					});
 				});
-			});
 	}
 
 	_actionInvokedSignalId = _interface.signal_action_invoked().connect([=](
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
index 477075719..ca4f88dad 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
@@ -551,13 +551,11 @@ NSRect PeerRectByIndex(int index) {
 	const auto processOnline = [=](const auto &pin) {
 		// TODO: this should be replaced
 		// with the global application timer for online statuses.
-		const auto onlineChanges =
-			peerChangedLifetime->make_state<rpl::event_stream<PeerData*>>();
+		const auto onlineChanges
+			= peerChangedLifetime->make_state<rpl::event_stream<PeerData*>>();
 		const auto peer = pin->peer;
-		const auto onlineTimer =
-			peerChangedLifetime->make_state<base::Timer>([=] {
-				onlineChanges->fire_copy({ peer });
-			});
+		const auto onlineTimer = peerChangedLifetime->make_state<base::Timer>(
+			[=] { onlineChanges->fire_copy({ peer }); });
 
 		const auto callTimer = [=](const auto &pin) {
 			onlineTimer->cancel();
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
index f9c24a5a5..5f314e4b5 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
@@ -135,8 +135,8 @@ const auto kAudioItemIdentifier = @"touchbarAudio";
 
 	if (isEqual(kMainItemIdentifier)) {
 		auto *item = [[GroupTouchBarItem alloc] initWithIdentifier:itemId];
-		item.groupTouchBar =
-			[[[TouchBarMain alloc]
+		item.groupTouchBar
+			= [[[TouchBarMain alloc]
 				init:_controller
 				touchBarSwitches:_touchBarSwitches.events()] autorelease];
 		rpl::combine(
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index feee8e87c..163716819 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -605,8 +605,8 @@ QPointer<Ui::RpWidget> Business::createPinnedToBottom(
 	});
 	{
 		const auto callback = [=](int value) {
-			const auto options =
-				_controller->session().api().premium().subscriptionOptions();
+			auto &api = _controller->session().api();
+			const auto options = api.premium().subscriptionOptions();
 			if (options.empty()) {
 				return;
 			}
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index d1962e407..601f1f978 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -1211,8 +1211,8 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 #endif
 	{
 		const auto callback = [=](int value) {
-			const auto options =
-				_controller->session().api().premium().subscriptionOptions();
+			auto &api = _controller->session().api();
+			const auto options = api.premium().subscriptionOptions();
 			if (options.empty()) {
 				return;
 			}
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index ca04135e8..e3c2e69c4 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -1991,8 +1991,8 @@ void Account::readStickerSets(
 			if (datesCount != scnt) {
 				return failed();
 			}
-			const auto fillDates =
-				((set->id == Data::Stickers::CloudRecentSetId)
+			const auto fillDates
+				= ((set->id == Data::Stickers::CloudRecentSetId)
 					|| (set->id == Data::Stickers::CloudRecentAttachedSetId))
 				&& (set->stickers.size() == datesCount);
 			if (fillDates) {
diff --git a/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp b/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
index e4d8092a5..8651b5b01 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
@@ -146,8 +146,8 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 			width);
 	}, content->lifetime());
 
-	const auto calendar =
-		content->lifetime().make_state<QPointer<CalendarBox>>();
+	const auto calendar
+		= content->lifetime().make_state<QPointer<CalendarBox>>();
 	const auto calendarStyle = args.style.calendarStyle;
 	state->day->focusedChanges(
 	) | rpl::start_with_next([=](bool focused) {
diff --git a/Telegram/SourceFiles/ui/controls/call_mute_button.cpp b/Telegram/SourceFiles/ui/controls/call_mute_button.cpp
index dfb31807e..731df0c81 100644
--- a/Telegram/SourceFiles/ui/controls/call_mute_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/call_mute_button.cpp
@@ -414,8 +414,8 @@ void BlobsWidget::init(int diameter) {
 		}
 
 		// Main circle.
-		const auto circleProgress =
-			Clamp(_switchConnectingProgress - kBlobPartAnimation)
+		const auto circleProgress
+			= Clamp(_switchConnectingProgress - kBlobPartAnimation)
 				/ kFillCirclePartAnimation;
 		const auto skipColoredCircle = (circleProgress == 1.);
 
@@ -744,8 +744,8 @@ void CallMuteButton::init() {
 	}, lifetime());
 
 	// State type.
-	const auto previousType =
-		lifetime().make_state<CallMuteButtonType>(_state.current().type);
+	const auto previousType
+		= lifetime().make_state<CallMuteButtonType>(_state.current().type);
 	setHandleMouseState(HandleMouseState::Disabled);
 
 	refreshGradients();
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index c3c0950c2..e03e69c52 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -143,8 +143,8 @@ void ShareBotGame(
 
 } // namespace
 
-const char kOptionViewProfileInChatsListContextMenu[] =
-	"view-profile-in-chats-list-context-menu";
+const char kOptionViewProfileInChatsListContextMenu[]
+	= "view-profile-in-chats-list-context-menu";
 
 namespace {
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 47cf5326c..833ff1a96 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2015,10 +2015,10 @@ void SessionController::resizeForThirdSection() {
 
 	auto &settings = Core::App().settings();
 	auto layout = computeColumnLayout();
-	auto tabbedSelectorSectionEnabled =
-		settings.tabbedSelectorSectionEnabled();
-	auto thirdSectionInfoEnabled =
-		settings.thirdSectionInfoEnabled();
+	auto tabbedSelectorSectionEnabled
+		= settings.tabbedSelectorSectionEnabled();
+	auto thirdSectionInfoEnabled
+		= settings.thirdSectionInfoEnabled();
 	settings.setTabbedSelectorSectionEnabled(false);
 	settings.setThirdSectionInfoEnabled(false);
 

From d1be7c1ff7f1cb08d416a0db2c9649fbf3c833c9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 11 Apr 2024 19:35:06 +0300
Subject: [PATCH 283/596] Simplified management of PasscodeBox within
 customCheckCallback.

---
 Telegram/SourceFiles/api/api_bot.cpp          | 13 +++++------
 Telegram/SourceFiles/api/api_earn.cpp         | 22 +++++++++++++------
 Telegram/SourceFiles/boxes/passcode_box.cpp   |  2 +-
 Telegram/SourceFiles/boxes/passcode_box.h     |  5 ++++-
 .../boxes/peers/edit_participant_box.cpp      | 10 ++++-----
 .../payments/payments_checkout_process.cpp    |  8 +++----
 6 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index 706b7a7cb..0284ae719 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -236,14 +236,14 @@ void SendBotCallbackDataWithPassword(
 				} else {
 					return;
 				}
-				const auto box = std::make_shared<QPointer<PasscodeBox>>();
 				auto fields = PasscodeBox::CloudFields::From(state);
 				fields.customTitle = tr::lng_bots_password_confirm_title();
 				fields.customDescription
 					= tr::lng_bots_password_confirm_description(tr::now);
 				fields.customSubmitButton = tr::lng_passcode_submit();
 				fields.customCheckCallback = [=](
-						const Core::CloudPasswordResult &result) {
+						const Core::CloudPasswordResult &result,
+						QPointer<PasscodeBox> box) {
 					if (const auto button = getButton()) {
 						if (button->requestId) {
 							return;
@@ -257,18 +257,17 @@ void SendBotCallbackDataWithPassword(
 							return;
 						}
 						SendBotCallbackData(strongController, item, row, column, result, [=] {
-							if (*box) {
-								(*box)->closeBox();
+							if (box) {
+								box->closeBox();
 							}
 						}, [=](const QString &error) {
-							if (*box) {
-								(*box)->handleCustomCheckError(error);
+							if (box) {
+								box->handleCustomCheckError(error);
 							}
 						});
 					}
 				};
 				auto object = Box<PasscodeBox>(session, fields);
-				*box = Ui::MakeWeak(object.data());
 				show->showBox(std::move(object), Ui::LayerOption::CloseOther);
 			}, *lifetime);
 		}
diff --git a/Telegram/SourceFiles/api/api_earn.cpp b/Telegram/SourceFiles/api/api_earn.cpp
index 61cfaf10f..d6425ef69 100644
--- a/Telegram/SourceFiles/api/api_earn.cpp
+++ b/Telegram/SourceFiles/api/api_earn.cpp
@@ -64,19 +64,27 @@ void HandleWithdrawalButton(
 				= tr::lng_channel_earn_balance_password_description(tr::now);
 			fields.customSubmitButton = tr::lng_passcode_submit();
 			fields.customCheckCallback = crl::guard(button, [=](
-					const Core::CloudPasswordResult &result) {
+					const Core::CloudPasswordResult &result,
+					QPointer<PasscodeBox> box) {
+				const auto done = [=](const QString &result) {
+					if (!result.isEmpty()) {
+						UrlClickHandler::Open(result);
+						if (box) {
+							box->closeBox();
+						}
+					}
+				};
+				const auto fail = [=](const QString &error) {
+					show->showToast(error);
+				};
 				session->api().request(
 					MTPstats_GetBroadcastRevenueWithdrawalUrl(
 						channel->inputChannel,
 						result.result
 				)).done([=](const MTPstats_BroadcastRevenueWithdrawalUrl &r) {
-					const auto url = qs(r.data().vurl());
-
-					if (!url.isEmpty()) {
-						UrlClickHandler::Open(url);
-					}
+					done(qs(r.data().vurl()));
 				}).fail([=](const MTP::Error &error) {
-					show->showToast(error.type());
+					fail(error.type());
 				}).send();
 			});
 			show->show(Box<PasscodeBox>(session, fields));
diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp
index e320b434f..840e4872d 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.cpp
+++ b/Telegram/SourceFiles/boxes/passcode_box.cpp
@@ -740,7 +740,7 @@ void PasscodeBox::submitOnlyCheckCloudPassword(const QString &oldPassword) {
 void PasscodeBox::sendOnlyCheckCloudPassword(const QString &oldPassword) {
 	checkPassword(oldPassword, [=](const Core::CloudPasswordResult &check) {
 		if (const auto onstack = _cloudFields.customCheckCallback) {
-			onstack(check);
+			onstack(check, Ui::MakeWeak(this));
 		} else {
 			Assert(_cloudFields.turningOff);
 			sendClearCloudPassword(check);
diff --git a/Telegram/SourceFiles/boxes/passcode_box.h b/Telegram/SourceFiles/boxes/passcode_box.h
index 684da859a..b651cda64 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.h
+++ b/Telegram/SourceFiles/boxes/passcode_box.h
@@ -51,7 +51,10 @@ public:
 		TimeId pendingResetDate = 0;
 
 		// Check cloud password for some action.
-		Fn<void(const Core::CloudPasswordResult &)> customCheckCallback;
+		using CustomCheck = Fn<void(
+			const Core::CloudPasswordResult &,
+			QPointer<PasscodeBox>)>;
+		CustomCheck customCheckCallback;
 		rpl::producer<QString> customTitle;
 		std::optional<QString> customDescription;
 		rpl::producer<QString> customSubmitButton;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index c1c086ad1..39389d1d5 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -598,19 +598,17 @@ void EditAdminBox::requestTransferPassword(not_null<ChannelData*> channel) {
 	) | rpl::take(
 		1
 	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
-		const auto box = std::make_shared<QPointer<PasscodeBox>>();
 		auto fields = PasscodeBox::CloudFields::From(state);
 		fields.customTitle = tr::lng_rights_transfer_password_title();
 		fields.customDescription
 			= tr::lng_rights_transfer_password_description(tr::now);
 		fields.customSubmitButton = tr::lng_passcode_submit();
 		fields.customCheckCallback = crl::guard(this, [=](
-				const Core::CloudPasswordResult &result) {
-			sendTransferRequestFrom(*box, channel, result);
+				const Core::CloudPasswordResult &result,
+				QPointer<PasscodeBox> box) {
+			sendTransferRequestFrom(box, channel, result);
 		});
-		*box = getDelegate()->show(Box<PasscodeBox>(
-			&channel->session(),
-			fields));
+		getDelegate()->show(Box<PasscodeBox>(&channel->session(), fields));
 	}, lifetime());
 }
 
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index b9e1b631d..ad7299664 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -766,12 +766,12 @@ void CheckoutProcess::requestPassword() {
 			(index < list.size()) ? list[index].title : QString());
 		fields.customSubmitButton = tr::lng_payments_password_submit();
 		fields.customCheckCallback = [=](
-				const Core::CloudPasswordResult &result) {
+				const Core::CloudPasswordResult &result,
+				QPointer<PasscodeBox> box) {
+			_enterPasswordBox = box;
 			_form->submit(result);
 		};
-		auto owned = Box<PasscodeBox>(_session, fields);
-		_enterPasswordBox = owned.data();
-		_panel->showBox(std::move(owned));
+		_panel->showBox(Box<PasscodeBox>(_session, fields));
 	});
 }
 

From abe83ccb8f4de2445a033bcf453274a1ea0d25e8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 11 Apr 2024 20:37:10 +0300
Subject: [PATCH 284/596] Moved inaccessible groups in box for user's own
 groups to sub-list.

Fixed #27729.
---
 Telegram/SourceFiles/ui/menu_icons.style      |  1 +
 .../window/window_main_menu_helpers.cpp       | 51 +++++++++++++++----
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 862caf79d..4ec165b62 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -151,6 +151,7 @@ menuIconAsTopics: icon {{ "menu/mode_topics", menuIconColor }};
 menuIconAsMessages: icon {{ "menu/mode_messages", menuIconColor }};
 menuIconTagFilter: icon{{ "menu/tag_filter", menuIconColor }};
 menuIconTagRename: icon{{ "menu/tag_rename", menuIconColor }};
+menuIconGroupsHide: icon {{ "menu/hide_members", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
diff --git a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
index 88c0af421..b70fb833a 100644
--- a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
@@ -27,10 +27,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rect.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/tooltip.h"
+#include "ui/wrap/slide_wrap.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
-#include "styles/style_chat.h" // popupMenuExpandedSeparator
-#include "styles/style_info.h" // infoTopBarMenu
+#include "styles/style_chat.h"
+#include "styles/style_info.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_window.h"
 
@@ -177,7 +178,9 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 				const auto count = c ? c->membersCount() : g->count;
 				_status.setText(
 					st::defaultTextStyle,
-					!p->username().isEmpty()
+					(g && !g->amIn())
+						? tr::lng_chat_status_unaccessible(tr::now)
+						: !p->username().isEmpty()
 						? ('@' + p->username())
 						: (count > 0)
 						? ((c && !c->isMegagroup())
@@ -219,10 +222,11 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 
 		};
 
-		const auto add = [&](not_null<PeerData*> peer) {
-			const auto row = box->addRow(
-				object_ptr<Button>(box, rpl::single(QString())),
-				{});
+		const auto add = [&](
+				not_null<PeerData*> peer,
+				not_null<Ui::VerticalLayout*> container) {
+			const auto row = container->add(
+				object_ptr<Button>(container, rpl::single(QString())));
 			row->setPeer(peer);
 			row->setClickedCallback([=] {
 				controller->showPeerHistory(peer);
@@ -233,8 +237,16 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 		};
 
+		const auto inaccessibleWrap = box->verticalLayout()->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				box->verticalLayout(),
+				object_ptr<Ui::VerticalLayout>(box->verticalLayout())));
+		inaccessibleWrap->toggle(false, anim::type::instant);
+
 		const auto &data = controller->session().data();
 		auto ids = std::vector<PeerId>();
+		auto inaccessibleIds = std::vector<PeerId>();
+
 		if (chats) {
 			data.enumerateGroups([&](not_null<PeerData*> peer) {
 				peer = peer->migrateToOrMe();
@@ -244,8 +256,13 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 				const auto c = peer->asChannel();
 				const auto g = peer->asChat();
 				if ((c && c->amCreator()) || (g && g->amCreator())) {
+					if (g && !g->amIn()) {
+						inaccessibleIds.push_back(peer->id);
+						add(peer, inaccessibleWrap->entity());
+					} else {
+						add(peer, box->verticalLayout());
+					}
 					ids.push_back(peer->id);
-					add(peer);
 				}
 			});
 		} else {
@@ -253,13 +270,29 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 				if (channel->amCreator()
 					&& !ranges::contains(ids, channel->id)) {
 					ids.push_back(channel->id);
-					add(channel);
+					add(channel, box->verticalLayout());
 				}
 			});
 		}
 		if (ids.empty()) {
 			addIcon(box);
 		}
+		if (!inaccessibleIds.empty()) {
+			const auto icon = [=] {
+				return !inaccessibleWrap->toggled()
+					? &st::menuIconGroups
+					: &st::menuIconGroupsHide;
+			};
+			auto button = object_ptr<Ui::IconButton>(box, st::backgroundSwitchToDark);
+			button->setClickedCallback([=, raw = button.data()] {
+				inaccessibleWrap->toggle(
+					!inaccessibleWrap->toggled(),
+					anim::type::normal);
+				raw->setIconOverride(icon(), icon());
+			});
+			button->setIconOverride(icon(), icon());
+			box->addTopButton(std::move(button));
+		}
 	};
 
 	using Menu = base::unique_qptr<Ui::PopupMenu>;

From 39ed7d7f4c5e6d847f02cb5d85a36da99b4bbf9a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 11 Apr 2024 22:55:23 +0300
Subject: [PATCH 285/596] Increased clickable area for each item in
 EditPeerHistoryVisibilityBox.

---
 .../edit_peer_history_visibility_box.cpp      | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp
index 9086dfce8..8883ad0a5 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "lang/lang_keys.h"
 #include "ui/layers/generic_box.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
 #include "styles/style_layers.h"
@@ -23,6 +24,17 @@ void EditPeerHistoryVisibilityBox(
 		Ui::RadioenumGroup<HistoryVisibility>
 	>(historyVisibilitySavedValue);
 
+	const auto addButton = [=](
+			not_null<Ui::RpWidget*> inner,
+			HistoryVisibility v) {
+		const auto button = Ui::CreateChild<Ui::AbstractButton>(inner.get());
+		inner->sizeValue(
+		) | rpl::start_with_next([=](const QSize &s) {
+			button->resize(s);
+		}, button->lifetime());
+		button->setClickedCallback([=] { historyVisibility->setValue(v); });
+	};
+
 	box->setTitle(tr::lng_manage_history_visibility_title());
 	box->addButton(tr::lng_settings_save(), [=] {
 		savedCallback(historyVisibility->current());
@@ -31,32 +43,36 @@ void EditPeerHistoryVisibilityBox(
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 
 	box->addSkip(st::editPeerHistoryVisibilityTopSkip);
-	box->addRow(object_ptr<Ui::Radioenum<HistoryVisibility>>(
+	const auto visible = box->addRow(object_ptr<Ui::VerticalLayout>(box));
+	visible->add(object_ptr<Ui::Radioenum<HistoryVisibility>>(
 		box,
 		historyVisibility,
 		HistoryVisibility::Visible,
 		tr::lng_manage_history_visibility_shown(tr::now),
 		st::defaultBoxCheckbox));
-	box->addRow(
+	visible->add(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			tr::lng_manage_history_visibility_shown_about(),
 			st::editPeerPrivacyLabel),
-		st::editPeerPreHistoryLabelMargins + st::boxRowPadding);
+		st::editPeerPreHistoryLabelMargins);
+	addButton(visible, HistoryVisibility::Visible);
 
 	box->addSkip(st::editPeerHistoryVisibilityTopSkip);
-	box->addRow(object_ptr<Ui::Radioenum<HistoryVisibility>>(
+	const auto hidden = box->addRow(object_ptr<Ui::VerticalLayout>(box));
+	hidden->add(object_ptr<Ui::Radioenum<HistoryVisibility>>(
 		box,
 		historyVisibility,
 		HistoryVisibility::Hidden,
 		tr::lng_manage_history_visibility_hidden(tr::now),
 		st::defaultBoxCheckbox));
-	box->addRow(
+	hidden->add(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			(isLegacy
 				? tr::lng_manage_history_visibility_hidden_legacy
 				: tr::lng_manage_history_visibility_hidden_about)(),
 			st::editPeerPrivacyLabel),
-		st::editPeerPreHistoryLabelMargins + st::boxRowPadding);
+		st::editPeerPreHistoryLabelMargins);
+	addButton(hidden, HistoryVisibility::Hidden);
 }

From 3d481113688041b85523628a06a6863f7e21ed64 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 13 Apr 2024 17:56:45 +0300
Subject: [PATCH 286/596] Moved out SponsoredMessages module to components
 submodule.

---
 Telegram/CMakeLists.txt                       |  4 ++--
 Telegram/SourceFiles/core/ui_integration.cpp  |  4 ++--
 .../sponsored_messages.cpp}                   |  6 +++---
 .../sponsored_messages.h}                     |  4 +---
 Telegram/SourceFiles/data/data_session.cpp    |  5 +----
 Telegram/SourceFiles/data/data_session.h      |  5 -----
 Telegram/SourceFiles/history/history.cpp      |  2 +-
 Telegram/SourceFiles/history/history.h        |  4 ----
 .../history/history_inner_widget.cpp          |  6 +++---
 Telegram/SourceFiles/history/history_item.cpp |  2 +-
 .../SourceFiles/history/history_widget.cpp    | 20 +++++++++----------
 .../history/view/history_view_element.cpp     |  4 ++--
 .../history/view/history_view_list_widget.cpp |  5 ++---
 .../history/view/history_view_message.cpp     |  7 ++++---
 .../history_view_sponsored_click_handler.cpp  |  6 +++---
 .../view/media/history_view_web_page.cpp      |  6 +++---
 Telegram/SourceFiles/main/main_session.cpp    |  2 ++
 Telegram/SourceFiles/main/main_session.h      |  5 +++++
 Telegram/SourceFiles/menu/menu_sponsored.cpp  |  4 ++--
 19 files changed, 46 insertions(+), 55 deletions(-)
 rename Telegram/SourceFiles/data/{data_sponsored_messages.cpp => components/sponsored_messages.cpp} (99%)
 rename Telegram/SourceFiles/data/{data_sponsored_messages.h => components/sponsored_messages.h} (98%)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2e26bf4d6..ea13cd743 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -460,6 +460,8 @@ PRIVATE
     data/business/data_business_info.h
     data/business/data_shortcut_messages.cpp
     data/business/data_shortcut_messages.h
+    data/components/sponsored_messages.cpp
+    data/components/sponsored_messages.h
     data/notify/data_notify_settings.cpp
     data/notify/data_notify_settings.h
     data/notify/data_peer_notify_settings.cpp
@@ -583,8 +585,6 @@ PRIVATE
     data/data_shared_media.h
     data/data_sparse_ids.cpp
     data/data_sparse_ids.h
-    data/data_sponsored_messages.cpp
-    data/data_sponsored_messages.h
     data/data_statistics.h
     data/data_stories.cpp
     data/data_stories.h
diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index 6de0c7570..c1ef63e1b 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -13,9 +13,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/sandbox.h"
 #include "core/click_handler_types.h"
+#include "data/components/sponsored_messages.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_session.h"
-#include "data/data_sponsored_messages.h"
 #include "iv/iv_instance.h"
 #include "ui/text/text_custom_emoji.h"
 #include "ui/basic_click_handlers.h"
@@ -295,7 +295,7 @@ bool UiIntegration::allowClickHandlerActivation(
 		const ClickContext &context) {
 	const auto my = context.other.value<ClickHandlerContext>();
 	if (const auto window = my.sessionWindow.get()) {
-		window->session().data().sponsoredMessages().clicked(my.itemId);
+		window->session().sponsoredMessages().clicked(my.itemId);
 	}
 	return true;
 }
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
similarity index 99%
rename from Telegram/SourceFiles/data/data_sponsored_messages.cpp
rename to Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 22cfbfeef..a60d7c3fd 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.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 "data/data_sponsored_messages.h"
+#include "data/components/sponsored_messages.h"
 
 #include "api/api_text_entities.h"
 #include "apiwrap.h"
@@ -30,8 +30,8 @@ constexpr auto kRequestTimeLimit = 5 * 60 * crl::time(1000);
 
 } // namespace
 
-SponsoredMessages::SponsoredMessages(not_null<Session*> owner)
-: _session(&owner->session())
+SponsoredMessages::SponsoredMessages(not_null<Main::Session*> session)
+: _session(session)
 , _clearTimer([=] { clearOldRequests(); }) {
 }
 
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.h b/Telegram/SourceFiles/data/components/sponsored_messages.h
similarity index 98%
rename from Telegram/SourceFiles/data/data_sponsored_messages.h
rename to Telegram/SourceFiles/data/components/sponsored_messages.h
index cad8a6134..022ccd19e 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.h
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.h
@@ -20,8 +20,6 @@ class Session;
 
 namespace Data {
 
-class Session;
-
 struct SponsoredReportResult final {
 	using Id = QByteArray;
 	struct Option final {
@@ -89,7 +87,7 @@ public:
 		bool canReport = false;
 	};
 	using RandomId = QByteArray;
-	explicit SponsoredMessages(not_null<Session*> owner);
+	explicit SponsoredMessages(not_null<Main::Session*> session);
 	SponsoredMessages(const SponsoredMessages &other) = delete;
 	SponsoredMessages &operator=(const SponsoredMessages &other) = delete;
 	~SponsoredMessages();
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 4614fae09..7a8e9e372 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -58,7 +58,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat_filters.h"
 #include "data/data_scheduled_messages.h"
 #include "data/data_send_action.h"
-#include "data/data_sponsored_messages.h"
 #include "data/data_message_reactions.h"
 #include "data/data_emoji_statuses.h"
 #include "data/data_forum_icons.h"
@@ -273,8 +272,7 @@ Session::Session(not_null<Main::Session*> session)
 , _chatbots(std::make_unique<Chatbots>(this))
 , _businessInfo(std::make_unique<BusinessInfo>(this))
 , _scheduledMessages(std::make_unique<ScheduledMessages>(this))
-, _shortcutMessages(std::make_unique<ShortcutMessages>(this))
-, _sponsoredMessages(std::make_unique<SponsoredMessages>(this)) {
+, _shortcutMessages(std::make_unique<ShortcutMessages>(this)) {
 	_cache->open(_session->local().cacheKey());
 	_bigFileCache->open(_session->local().cacheBigFileKey());
 
@@ -399,7 +397,6 @@ void Session::clear() {
 	_histories->unloadAll();
 	_scheduledMessages = nullptr;
 	_shortcutMessages = nullptr;
-	_sponsoredMessages = nullptr;
 	_dependentMessages.clear();
 	base::take(_messages);
 	base::take(_nonChannelMessages);
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 0f7df77f4..9bf97e60f 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -50,7 +50,6 @@ class WallPaper;
 class ScheduledMessages;
 class ShortcutMessages;
 class SendActionManager;
-class SponsoredMessages;
 class Reactions;
 class EmojiStatuses;
 class ForumIcons;
@@ -128,9 +127,6 @@ public:
 	[[nodiscard]] Stickers &stickers() const {
 		return *_stickers;
 	}
-	[[nodiscard]] SponsoredMessages &sponsoredMessages() const {
-		return *_sponsoredMessages;
-	}
 	[[nodiscard]] Reactions &reactions() const {
 		return *_reactions;
 	}
@@ -1086,7 +1082,6 @@ private:
 	const std::unique_ptr<BusinessInfo> _businessInfo;
 	std::unique_ptr<ScheduledMessages> _scheduledMessages;
 	std::unique_ptr<ShortcutMessages> _shortcutMessages;
-	std::unique_ptr<SponsoredMessages> _sponsoredMessages;
 
 	MsgId _nonHistoryEntryId = ShortcutMaxMsgId;
 
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 499bf7cea..b91d0fdf4 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_unread_things.h"
 #include "dialogs/ui/dialogs_layout.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/sponsored_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_drafts.h"
@@ -29,7 +30,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_chat_filters.h"
 #include "data/data_scheduled_messages.h"
-#include "data/data_sponsored_messages.h"
 #include "data/data_send_action.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 29620dc2e..4a4ad8ddc 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -25,10 +25,6 @@ struct HistoryMessageMarkupData;
 class HistoryMainElementDelegateMixin;
 struct LanguageId;
 
-namespace Main {
-class Session;
-} // namespace Main
-
 namespace Data {
 struct Draft;
 class Session;
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 26ca88b58..b450b3f43 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -68,6 +68,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_who_reacted.h"
 #include "api/api_views.h"
 #include "lang/lang_keys.h"
+#include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
 #include "data/data_document.h"
 #include "data/data_channel.h"
@@ -79,7 +80,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_file_click_handler.h"
 #include "data/data_histories.h"
 #include "data/data_changes.h"
-#include "data/data_sponsored_messages.h"
 #include "dialogs/ui/dialogs_video_userpic.h"
 #include "styles/style_chat.h"
 #include "styles/style_menu_icons.h"
@@ -118,7 +118,7 @@ void FillSponsoredMessagesMenu(
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
 		not_null<Ui::PopupMenu*> menu) {
-	const auto &data = controller->session().data().sponsoredMessages();
+	const auto &data = controller->session().sponsoredMessages();
 	const auto info = data.lookupDetails(itemId).info;
 	const auto show = controller->uiShow();
 	if (!info.empty()) {
@@ -979,7 +979,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 			: yShown(top + height / 2);
 		if (markShown) {
 			if (isSponsored) {
-				session().data().sponsoredMessages().view(item->fullId());
+				session().sponsoredMessages().view(item->fullId());
 			} else if (isUnread) {
 				readTill = item;
 			}
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index dc5ad0b86..10dfc93f0 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer_rpl.h"
 #include "api/api_text_entities.h"
 #include "api/api_updates.h"
+#include "data/components/sponsored_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_bot_app.h"
 #include "data/data_saved_messages.h"
@@ -57,7 +58,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_group_call.h" // Data::GroupCall::id().
 #include "data/data_poll.h" // PollData::publicVotes.
-#include "data/data_sponsored_messages.h"
 #include "data/data_stories.h"
 #include "data/data_web_page.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index a3bd3ebf8..6938bafd8 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -54,6 +54,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/sponsored_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
 #include "data/data_drafts.h"
@@ -69,7 +70,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_chat_filters.h"
 #include "data/data_scheduled_messages.h"
-#include "data/data_sponsored_messages.h"
 #include "data/data_file_origin.h"
 #include "data/data_histories.h"
 #include "data/data_group_call.h"
@@ -311,7 +311,7 @@ HistoryWidget::HistoryWidget(
 	) | rpl::start_with_next([=] {
 		if (_history
 			&& _history->loadedAtBottom()
-			&& session().data().sponsoredMessages().append(_history)) {
+			&& session().sponsoredMessages().append(_history)) {
 			_scroll->contentAdded();
 		}
 	}, lifetime());
@@ -2216,7 +2216,7 @@ void HistoryWidget::showHistory(
 			return;
 		} else {
 			_sponsoredMessagesStateKnown = false;
-			session().data().sponsoredMessages().clearItems(_history);
+			session().sponsoredMessages().clearItems(_history);
 			session().data().hideShownSpoilers();
 			_composeSearch = nullptr;
 		}
@@ -2466,20 +2466,18 @@ void HistoryWidget::showHistory(
 				if (history != _history) {
 					return;
 				}
-				auto &sponsored = session().data().sponsoredMessages();
 				using State = Data::SponsoredMessages::State;
-				const auto state = sponsored.state(_history);
+				const auto state = session().sponsoredMessages().state(
+					_history);
 				_sponsoredMessagesStateKnown = (state != State::None);
 				if (state == State::AppendToEnd) {
 					_scroll->setTrackingContent(
-						sponsored.canHaveFor(_history));
+						session().sponsoredMessages().canHaveFor(_history));
 				} else if (state == State::InjectToMiddle) {
 					injectSponsoredMessages();
 				}
 			});
-			session().data().sponsoredMessages().request(
-				_history,
-				checkState);
+			session().sponsoredMessages().request(_history, checkState);
 			checkState();
 		}
 	} else {
@@ -2583,7 +2581,7 @@ void HistoryWidget::setupPreview() {
 }
 
 void HistoryWidget::injectSponsoredMessages() const {
-	session().data().sponsoredMessages().inject(
+	session().sponsoredMessages().inject(
 		_history,
 		_showAtMsgId,
 		_scroll->height() * 2,
@@ -3631,7 +3629,7 @@ void HistoryWidget::loadMessagesDown() {
 	auto from = loadMigrated ? _migrated : _history;
 	if (from->loadedAtBottom()) {
 		if (_sponsoredMessagesStateKnown) {
-			session().data().sponsoredMessages().request(_history, nullptr);
+			session().sponsoredMessages().request(_history, nullptr);
 		}
 		return;
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index ce25da4dd..1c7927701 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -39,10 +39,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/item_text_options.h"
 #include "ui/painter.h"
+#include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
-#include "data/data_sponsored_messages.h"
 #include "data/data_message_reactions.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
@@ -1108,7 +1108,7 @@ ClickHandlerPtr Element::fromLink() const {
 			}
 			const auto my = context.other.value<ClickHandlerContext>();
 			if (const auto window = ContextOrSessionWindow(my, session)) {
-				auto &sponsored = session->data().sponsoredMessages();
+				auto &sponsored = session->sponsoredMessages();
 				const auto itemId = my.itemId ? my.itemId : item->fullId();
 				const auto details = sponsored.lookupDetails(itemId);
 				if (!details.externalLink.isEmpty()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index dc1255e2c..e849bd943 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -56,8 +56,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/premium_preview_box.h"
 #include "boxes/peers/edit_participant_box.h"
 #include "core/crash_reports.h"
+#include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
-#include "data/data_sponsored_messages.h"
 #include "data/data_changes.h"
 #include "data/data_folder.h"
 #include "data/data_media_types.h"
@@ -2138,8 +2138,7 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 			: yShown(top + height / 2);
 		if (markShown) {
 			if (isSponsored) {
-				session->data().sponsoredMessages().view(
-					item->fullId());
+				session->sponsoredMessages().view(item->fullId());
 			} else if (isUnread) {
 				readTill = item;
 			}
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 3a94363e2..2a7ee708d 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -27,12 +27,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/round_rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/power_saving.h"
+#include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_channel.h"
 #include "data/data_forum_topic.h"
 #include "data/data_message_reactions.h"
-#include "data/data_sponsored_messages.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "main/main_session.h"
@@ -435,8 +435,9 @@ Message::Message(
 		}
 	}
 	if (data->isSponsored()) {
-		const auto &messages = data->history()->owner().sponsoredMessages();
-		const auto details = messages.lookupDetails(data->fullId());
+		const auto &session = data->history()->session();
+		const auto details = session.sponsoredMessages().lookupDetails(
+			data->fullId());
 		if (details.canReport) {
 			_rightAction = std::make_unique<RightAction>();
 			_rightAction->second = std::make_unique<SecondRightAction>();
diff --git a/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.cpp b/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.cpp
index 65b030476..7a6d7b685 100644
--- a/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.cpp
@@ -10,8 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_chat_invite.h"
 #include "core/click_handler_types.h"
 #include "core/file_utilities.h"
+#include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
-#include "data/data_sponsored_messages.h"
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 
@@ -37,8 +37,8 @@ ClickHandlerPtr SponsoredLink(const QString &externalLink) {
 			if (!controller) {
 				return;
 			}
-			const auto &data = controller->session().data();
-			const auto details = data.sponsoredMessages().lookupDetails(
+			const auto &session = controller->session();
+			const auto details = session.sponsoredMessages().lookupDetails(
 				my.itemId);
 			if (!details.externalLink.isEmpty()) {
 				File::OpenUrl(details.externalLink);
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 c275e3b35..3acd1c69f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "iv/iv_instance.h"
 #include "core/click_handler_types.h"
 #include "core/ui_integration.h"
+#include "data/components/sponsored_messages.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_file_click_handler.h"
 #include "data/data_photo_media.h"
 #include "data/data_session.h"
-#include "data/data_sponsored_messages.h"
 #include "data/data_web_page.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
@@ -227,8 +227,8 @@ WebPage::WebPage(
 	if (!(flags & MediaWebPageFlag::Sponsored)) {
 		return std::nullopt;
 	}
-	const auto &data = _parent->data()->history()->owner();
-	const auto details = data.sponsoredMessages().lookupDetails(
+	const auto &session = _parent->data()->history()->session();
+	const auto details = session.sponsoredMessages().lookupDetails(
 		_parent->data()->fullId());
 	auto result = std::make_optional<SponsoredData>();
 	result->buttonText = details.buttonText;
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index 8ec284294..95d39c141 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/file_upload.h"
 #include "storage/storage_account.h"
 #include "storage/storage_facade.h"
+#include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_user.h"
@@ -96,6 +97,7 @@ Session::Session(
 , _giftBoxStickersPacks(std::make_unique<Stickers::GiftBoxPack>(this))
 , _sendAsPeers(std::make_unique<SendAsPeers>(this))
 , _attachWebView(std::make_unique<InlineBots::AttachWebView>(this))
+, _sponsoredMessages(std::make_unique<Data::SponsoredMessages>(this))
 , _supportHelper(Support::Helper::Create(this))
 , _saveSettingsTimer([=] { saveSettings(); }) {
 	Expects(_settings != nullptr);
diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h
index d8c74e087..7346498d8 100644
--- a/Telegram/SourceFiles/main/main_session.h
+++ b/Telegram/SourceFiles/main/main_session.h
@@ -31,6 +31,7 @@ class Templates;
 namespace Data {
 class Session;
 class Changes;
+class SponsoredMessages;
 } // namespace Data
 
 namespace Storage {
@@ -104,6 +105,9 @@ public:
 	[[nodiscard]] Data::Changes &changes() const {
 		return *_changes;
 	}
+	[[nodiscard]] Data::SponsoredMessages &sponsoredMessages() const {
+		return *_sponsoredMessages;
+	}
 	[[nodiscard]] Api::Updates &updates() const {
 		return *_updates;
 	}
@@ -224,6 +228,7 @@ private:
 	const std::unique_ptr<Stickers::GiftBoxPack> _giftBoxStickersPacks;
 	const std::unique_ptr<SendAsPeers> _sendAsPeers;
 	const std::unique_ptr<InlineBots::AttachWebView> _attachWebView;
+	const std::unique_ptr<Data::SponsoredMessages> _sponsoredMessages;
 
 	const std::unique_ptr<Support::Helper> _supportHelper;
 
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index bfa8427f1..153bb46bd 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -10,9 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/premium_preview_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "data/components/sponsored_messages.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
-#include "data/data_sponsored_messages.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
@@ -217,7 +217,7 @@ void ShowReportSponsoredBox(
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<HistoryItem*> item) {
 	const auto peer = item->history()->peer;
-	auto &sponsoredMessages = peer->session().data().sponsoredMessages();
+	auto &sponsoredMessages = peer->session().sponsoredMessages();
 	const auto fullId = item->fullId();
 	const auto report = sponsoredMessages.createReportCallback(fullId);
 	const auto guideLink = Ui::Text::Link(

From a35f020f5676b3b6cb83427b66bf873818d84364 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 13 Apr 2024 18:16:07 +0300
Subject: [PATCH 287/596] Moved out ScheduledMessages module to components
 submodule.

---
 Telegram/CMakeLists.txt                           |  4 ++--
 Telegram/SourceFiles/api/api_editing.cpp          |  5 ++---
 Telegram/SourceFiles/api/api_updates.cpp          | 14 ++++++++------
 Telegram/SourceFiles/apiwrap.cpp                  |  8 ++++----
 .../scheduled_messages.cpp}                       |  8 ++++----
 .../scheduled_messages.h}                         |  3 +--
 Telegram/SourceFiles/data/data_histories.cpp      |  9 +++++----
 Telegram/SourceFiles/data/data_session.cpp        |  3 ---
 Telegram/SourceFiles/data/data_session.h          |  5 -----
 Telegram/SourceFiles/data/data_shared_media.cpp   |  6 +++---
 Telegram/SourceFiles/history/history.cpp          |  4 ++--
 Telegram/SourceFiles/history/history_item.cpp     |  2 +-
 .../history/history_item_components.cpp           |  4 ++--
 Telegram/SourceFiles/history/history_widget.cpp   |  8 ++++----
 .../history/view/history_view_replies_section.cpp |  7 +++----
 .../view/history_view_scheduled_section.cpp       | 15 ++++++++-------
 Telegram/SourceFiles/main/main_session.cpp        |  2 ++
 Telegram/SourceFiles/main/main_session.h          |  5 +++++
 Telegram/SourceFiles/mainwidget.cpp               |  2 +-
 Telegram/SourceFiles/window/window_peer_menu.cpp  |  6 +++---
 20 files changed, 60 insertions(+), 60 deletions(-)
 rename Telegram/SourceFiles/data/{data_scheduled_messages.cpp => components/scheduled_messages.cpp} (99%)
 rename Telegram/SourceFiles/data/{data_scheduled_messages.h => components/scheduled_messages.h} (97%)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index ea13cd743..0e007ca90 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -460,6 +460,8 @@ PRIVATE
     data/business/data_business_info.h
     data/business/data_shortcut_messages.cpp
     data/business/data_shortcut_messages.h
+    data/components/scheduled_messages.cpp
+    data/components/scheduled_messages.h
     data/components/sponsored_messages.cpp
     data/components/sponsored_messages.h
     data/notify/data_notify_settings.cpp
@@ -579,8 +581,6 @@ PRIVATE
     data/data_send_action.h
     data/data_session.cpp
     data/data_session.h
-    data/data_scheduled_messages.cpp
-    data/data_scheduled_messages.h
     data/data_shared_media.cpp
     data/data_shared_media.h
     data/data_sparse_ids.cpp
diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index 1dba418dd..f91a73579 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -12,12 +12,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_text_entities.h"
 #include "ui/boxes/confirm_box.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/scheduled_messages.h"
 #include "data/data_histories.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
 #include "history/history.h"
-#include "history/history_item.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "mtproto/mtproto_response.h"
@@ -95,7 +94,7 @@ mtpRequestId EditMessage(
 		: emptyFlag);
 
 	const auto id = item->isScheduled()
-		? session->data().scheduledMessages().lookupId(item)
+		? session->scheduledMessages().lookupId(item)
 		: item->isBusinessShortcut()
 		? session->data().shortcutMessages().lookupId(item)
 		: item->id;
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index c9c000782..9918ec7a9 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/mtproto_config.h"
 #include "mtproto/mtproto_dc_options.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/scheduled_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_saved_messages.h"
@@ -37,7 +38,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_histories.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_send_action.h"
 #include "data/data_stories.h"
 #include "data/data_message_reactions.h"
@@ -94,7 +94,7 @@ void ProcessScheduledMessageWithElapsedTime(
 		// Note that when a message is scheduled until online
 		// while the recipient is already online, the server sends
 		// an ordinary new message with skipped "from_scheduled" flag.
-		session->data().scheduledMessages().checkEntitiesAndUpdate(data);
+		session->scheduledMessages().checkEntitiesAndUpdate(data);
 	}
 }
 
@@ -1464,7 +1464,9 @@ void Updates::applyUpdates(
 			if (const auto id = owner.messageIdByRandomId(randomId)) {
 				const auto local = owner.message(id);
 				if (local && local->isScheduled()) {
-					owner.scheduledMessages().sendNowSimpleMessage(d, local);
+					session().scheduledMessages().sendNowSimpleMessage(
+						d,
+						local);
 				}
 			}
 			const auto wasAlready = (lookupMessage() != nullptr);
@@ -1561,7 +1563,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 			auto &owner = session().data();
 			if (const auto local = owner.message(id)) {
 				if (local->isScheduled()) {
-					session().data().scheduledMessages().apply(d, local);
+					session().scheduledMessages().apply(d, local);
 				} else if (local->isBusinessShortcut()) {
 					session().data().shortcutMessages().apply(d, local);
 				} else {
@@ -1771,12 +1773,12 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 
 	case mtpc_updateNewScheduledMessage: {
 		const auto &d = update.c_updateNewScheduledMessage();
-		session().data().scheduledMessages().apply(d);
+		session().scheduledMessages().apply(d);
 	} break;
 
 	case mtpc_updateDeleteScheduledMessages: {
 		const auto &d = update.c_updateDeleteScheduledMessages();
-		session().data().scheduledMessages().apply(d);
+		session().scheduledMessages().apply(d);
 	} break;
 
 	case mtpc_updateQuickReplies: {
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 20c52fbdd..aeed9e1b3 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_user_names.h"
 #include "api/api_websites.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/scheduled_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
 #include "data/data_web_page.h"
@@ -43,7 +44,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_search_controller.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -542,7 +542,7 @@ void ApiWrap::sendMessageFail(
 			}
 		}
 	} else if (error == u"SCHEDULE_STATUS_PRIVATE"_q) {
-		auto &scheduled = _session->data().scheduledMessages();
+		auto &scheduled = _session->scheduledMessages();
 		Assert(peer->isUser());
 		if (const auto item = scheduled.lookupItem(peer->id, itemId.msg)) {
 			scheduled.removeSending(item);
@@ -2447,8 +2447,8 @@ void ApiWrap::refreshFileReference(
 					_session->data().peer(storyId.peer)->input,
 					MTP_vector<MTPint>(1, MTP_int(storyId.story))));
 			} else if (item->isScheduled()) {
-				const auto &scheduled = _session->data().scheduledMessages();
-				const auto realId = scheduled.lookupId(item);
+				const auto realId = _session->scheduledMessages().lookupId(
+					item);
 				request(MTPmessages_GetScheduledMessages(
 					item->history()->peer->input,
 					MTP_vector<MTPint>(1, MTP_int(realId))));
diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.cpp b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
similarity index 99%
rename from Telegram/SourceFiles/data/data_scheduled_messages.cpp
rename to Telegram/SourceFiles/data/components/scheduled_messages.cpp
index ffe4ab436..c7e2daddc 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.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 "data/data_scheduled_messages.h"
+#include "data/components/scheduled_messages.h"
 
 #include "base/unixtime.h"
 #include "data/data_forum_topic.h"
@@ -101,10 +101,10 @@ bool IsScheduledMsgId(MsgId id) {
 	return (id > ServerMaxMsgId) && (id < ScheduledMaxMsgId);
 }
 
-ScheduledMessages::ScheduledMessages(not_null<Session*> owner)
-: _session(&owner->session())
+ScheduledMessages::ScheduledMessages(not_null<Main::Session*> session)
+: _session(session)
 , _clearTimer([=] { clearOldRequests(); }) {
-	owner->itemRemoved(
+	_session->data().itemRemoved(
 	) | rpl::filter([](not_null<const HistoryItem*> item) {
 		return item->isScheduled();
 	}) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.h b/Telegram/SourceFiles/data/components/scheduled_messages.h
similarity index 97%
rename from Telegram/SourceFiles/data/data_scheduled_messages.h
rename to Telegram/SourceFiles/data/components/scheduled_messages.h
index 5daacd099..f1c568d92 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.h
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.h
@@ -18,14 +18,13 @@ class Session;
 
 namespace Data {
 
-class Session;
 struct MessagesSlice;
 
 [[nodiscard]] bool IsScheduledMsgId(MsgId id);
 
 class ScheduledMessages final {
 public:
-	explicit ScheduledMessages(not_null<Session*> owner);
+	explicit ScheduledMessages(not_null<Main::Session*> session);
 	ScheduledMessages(const ScheduledMessages &other) = delete;
 	ScheduledMessages &operator=(const ScheduledMessages &other) = delete;
 	~ScheduledMessages();
diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index 26fb8b864..0f428913a 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -9,13 +9,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_text_entities.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/scheduled_messages.h"
 #include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_user.h"
 #include "base/unixtime.h"
 #include "base/random.h"
@@ -830,11 +830,12 @@ void Histories::deleteMessages(const MessageIdsList &ids, bool revoke) {
 			if (item->isScheduled()) {
 				const auto wasOnServer = !item->isSending()
 					&& !item->hasFailed();
+				auto &scheduled = _owner->session().scheduledMessages();
 				if (wasOnServer) {
-					scheduledIdsByPeer[history->peer].push_back(MTP_int(
-						_owner->scheduledMessages().lookupId(item)));
+					scheduledIdsByPeer[history->peer].push_back(
+						MTP_int(scheduled.lookupId(item)));
 				} else {
-					_owner->scheduledMessages().removeSending(item);
+					scheduled.removeSending(item);
 				}
 				continue;
 			} else if (item->isBusinessShortcut()) {
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 7a8e9e372..ed165a0c9 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -56,7 +56,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_poll.h"
 #include "data/data_replies_list.h"
 #include "data/data_chat_filters.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_send_action.h"
 #include "data/data_message_reactions.h"
 #include "data/data_emoji_statuses.h"
@@ -271,7 +270,6 @@ Session::Session(not_null<Main::Session*> session)
 , _savedMessages(std::make_unique<SavedMessages>(this))
 , _chatbots(std::make_unique<Chatbots>(this))
 , _businessInfo(std::make_unique<BusinessInfo>(this))
-, _scheduledMessages(std::make_unique<ScheduledMessages>(this))
 , _shortcutMessages(std::make_unique<ShortcutMessages>(this)) {
 	_cache->open(_session->local().cacheKey());
 	_bigFileCache->open(_session->local().cacheBigFileKey());
@@ -395,7 +393,6 @@ void Session::clear() {
 	_sendActionManager->clear();
 
 	_histories->unloadAll();
-	_scheduledMessages = nullptr;
 	_shortcutMessages = nullptr;
 	_dependentMessages.clear();
 	base::take(_messages);
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 9bf97e60f..fa58d4847 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -47,7 +47,6 @@ namespace Data {
 class Folder;
 class LocationPoint;
 class WallPaper;
-class ScheduledMessages;
 class ShortcutMessages;
 class SendActionManager;
 class Reactions;
@@ -103,9 +102,6 @@ public:
 	[[nodiscard]] ChatFilters &chatsFilters() const {
 		return *_chatsFilters;
 	}
-	[[nodiscard]] ScheduledMessages &scheduledMessages() const {
-		return *_scheduledMessages;
-	}
 	[[nodiscard]] ShortcutMessages &shortcutMessages() const {
 		return *_shortcutMessages;
 	}
@@ -1080,7 +1076,6 @@ private:
 	const std::unique_ptr<SavedMessages> _savedMessages;
 	const std::unique_ptr<Chatbots> _chatbots;
 	const std::unique_ptr<BusinessInfo> _businessInfo;
-	std::unique_ptr<ScheduledMessages> _scheduledMessages;
 	std::unique_ptr<ShortcutMessages> _shortcutMessages;
 
 	MsgId _nonHistoryEntryId = ShortcutMaxMsgId;
diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
index 8033fba9c..6834190bf 100644
--- a/Telegram/SourceFiles/data/data_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -13,10 +13,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_facade.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "data/components/scheduled_messages.h"
 #include "data/data_document.h"
 #include "data/data_media_types.h"
 #include "data/data_photo.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_session.h"
 #include "core/crash_reports.h"
 
@@ -193,9 +193,9 @@ rpl::producer<SparseIdsMergedSlice> SharedScheduledMediaViewer(
 	const auto history = session->data().history(key.mergedKey.peerId);
 
 	return rpl::single(rpl::empty) | rpl::then(
-		session->data().scheduledMessages().updates(history)
+		session->scheduledMessages().updates(history)
 	) | rpl::map([=] {
-		const auto list = session->data().scheduledMessages().list(history);
+		const auto list = session->scheduledMessages().list(history);
 
 		auto items = ranges::views::all(
 			list.ids
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index b91d0fdf4..c269dba39 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_unread_things.h"
 #include "dialogs/ui/dialogs_layout.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_stickers.h"
@@ -29,7 +30,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel_admins.h"
 #include "data/data_changes.h"
 #include "data/data_chat_filters.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_send_action.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
@@ -590,7 +590,7 @@ not_null<HistoryItem*> History::addNewItem(
 		not_null<HistoryItem*> item,
 		bool unread) {
 	if (item->isScheduled()) {
-		owner().scheduledMessages().appendSending(item);
+		session().scheduledMessages().appendSending(item);
 		return item;
 	} else if (item->isBusinessShortcut()) {
 		owner().shortcutMessages().appendSending(item);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 10dfc93f0..80a19453e 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -40,12 +40,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer_rpl.h"
 #include "api/api_text_entities.h"
 #include "api/api_updates.h"
+#include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_bot_app.h"
 #include "data/data_saved_messages.h"
 #include "data/data_saved_sublist.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
 #include "data/data_message_reactions.h"
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index f2ebc57c5..b8a64263b 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio.h"
 #include "media/player/media_player_instance.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/scheduled_messages.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_channel.h"
 #include "data/data_media_types.h"
@@ -42,7 +43,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_web_page.h"
 #include "data/data_file_click_handler.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "main/main_session.h"
@@ -301,7 +301,7 @@ ReplyFields ReplyFieldsFromMTP(
 		const auto owner = &item->history()->owner();
 		if (const auto id = data.vreply_to_msg_id().value_or_empty()) {
 			result.messageId = data.is_reply_to_scheduled()
-				? owner->scheduledMessages().localMessageId(id)
+				? owner->session().scheduledMessages().localMessageId(id)
 				: item->shortcutId()
 				? owner->shortcutMessages().localMessageId(id)
 				: id;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 6938bafd8..e36501a74 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -54,6 +54,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
@@ -69,7 +70,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum_topic.h"
 #include "data/data_user.h"
 #include "data/data_chat_filters.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_file_origin.h"
 #include "data/data_histories.h"
 #include "data/data_group_call.h"
@@ -2772,9 +2772,9 @@ void HistoryWidget::setupScheduledToggle() {
 	controller()->activeChatValue(
 	) | rpl::map([=](Dialogs::Key key) -> rpl::producer<> {
 		if (const auto history = key.history()) {
-			return session().data().scheduledMessages().updates(history);
+			return session().scheduledMessages().updates(history);
 		} else if (const auto topic = key.topic()) {
-			return session().data().scheduledMessages().updates(
+			return session().scheduledMessages().updates(
 				topic->owningHistory());
 		}
 		return rpl::never<rpl::empty_value>();
@@ -2789,7 +2789,7 @@ void HistoryWidget::setupScheduledToggle() {
 void HistoryWidget::refreshScheduledToggle() {
 	const auto has = _history
 		&& _canSendMessages
-		&& (session().data().scheduledMessages().count(_history) > 0);
+		&& (session().scheduledMessages().count(_history) > 0);
 	if (!_scheduled && has) {
 		_scheduled.create(this, st::historyScheduledToggle);
 		_scheduled->show();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 9543eeae0..fe9ef26e8 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -52,6 +52,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/mime_type.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "data/components/scheduled_messages.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_chat.h"
@@ -63,7 +64,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_shared_media.h"
 #include "data/data_send_action.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_premium_limits.h"
 #include "storage/storage_media_prepare.h"
 #include "storage/storage_account.h"
@@ -230,10 +230,9 @@ RepliesWidget::RepliesWidget(
 		.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
 		.scheduledToggleValue = _topic
 			? rpl::single(rpl::empty_value()) | rpl::then(
-				session().data().scheduledMessages().updates(
-					_topic->owningHistory())
+				session().scheduledMessages().updates(_topic->owningHistory())
 			) | rpl::map([=] {
-				return session().data().scheduledMessages().hasFor(_topic);
+				return session().scheduledMessages().hasFor(_topic);
 			}) | rpl::type_erased()
 			: rpl::single(false),
 	}))
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 6c989fd1e..667347423 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -33,11 +33,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/mime_type.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "main/main_session.h"
+#include "data/components/scheduled_messages.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_user.h"
 #include "data/data_message_reactions.h"
 #include "data/data_peer_values.h"
@@ -58,7 +58,7 @@ namespace HistoryView {
 ScheduledMemento::ScheduledMemento(not_null<History*> history)
 : _history(history)
 , _forumTopic(nullptr) {
-	const auto list = _history->owner().scheduledMessages().list(_history);
+	const auto list = _history->session().scheduledMessages().list(_history);
 	if (!list.ids.empty()) {
 		_list.setScrollTopState({ .item = { .fullId = list.ids.front() } });
 	}
@@ -67,7 +67,8 @@ ScheduledMemento::ScheduledMemento(not_null<History*> history)
 ScheduledMemento::ScheduledMemento(not_null<Data::ForumTopic*> forumTopic)
 : _history(forumTopic->owningHistory())
 , _forumTopic(forumTopic) {
-	const auto list = _history->owner().scheduledMessages().list(_forumTopic);
+	const auto list = _history->session().scheduledMessages().list(
+		_forumTopic);
 	if (!list.ids.empty()) {
 		_list.setScrollTopState({ .item = { .fullId = list.ids.front() } });
 	}
@@ -1193,13 +1194,13 @@ rpl::producer<Data::MessagesSlice> ScheduledWidget::listSource(
 		Data::MessagePosition aroundId,
 		int limitBefore,
 		int limitAfter) {
-	const auto data = &controller()->session().data();
+	const auto session = &controller()->session();
 	return rpl::single(rpl::empty) | rpl::then(
-		data->scheduledMessages().updates(_history)
+		session->scheduledMessages().updates(_history)
 	) | rpl::map([=] {
 		return _forumTopic
-			? data->scheduledMessages().list(_forumTopic)
-			: data->scheduledMessages().list(_history);
+			? session->scheduledMessages().list(_forumTopic)
+			: session->scheduledMessages().list(_history);
 	}) | rpl::after_next([=](const Data::MessagesSlice &slice) {
 		highlightSingleNewMessage(slice);
 	});
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index 95d39c141..d0785b2bd 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/file_upload.h"
 #include "storage/storage_account.h"
 #include "storage/storage_facade.h"
+#include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
@@ -97,6 +98,7 @@ Session::Session(
 , _giftBoxStickersPacks(std::make_unique<Stickers::GiftBoxPack>(this))
 , _sendAsPeers(std::make_unique<SendAsPeers>(this))
 , _attachWebView(std::make_unique<InlineBots::AttachWebView>(this))
+, _scheduledMessages(std::make_unique<Data::ScheduledMessages>(this))
 , _sponsoredMessages(std::make_unique<Data::SponsoredMessages>(this))
 , _supportHelper(Support::Helper::Create(this))
 , _saveSettingsTimer([=] { saveSettings(); }) {
diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h
index 7346498d8..4249f888f 100644
--- a/Telegram/SourceFiles/main/main_session.h
+++ b/Telegram/SourceFiles/main/main_session.h
@@ -31,6 +31,7 @@ class Templates;
 namespace Data {
 class Session;
 class Changes;
+class ScheduledMessages;
 class SponsoredMessages;
 } // namespace Data
 
@@ -108,6 +109,9 @@ public:
 	[[nodiscard]] Data::SponsoredMessages &sponsoredMessages() const {
 		return *_sponsoredMessages;
 	}
+	[[nodiscard]] Data::ScheduledMessages &scheduledMessages() const {
+		return *_scheduledMessages;
+	}
 	[[nodiscard]] Api::Updates &updates() const {
 		return *_updates;
 	}
@@ -228,6 +232,7 @@ private:
 	const std::unique_ptr<Stickers::GiftBoxPack> _giftBoxStickersPacks;
 	const std::unique_ptr<SendAsPeers> _sendAsPeers;
 	const std::unique_ptr<InlineBots::AttachWebView> _attachWebView;
+	const std::unique_ptr<Data::ScheduledMessages> _scheduledMessages;
 	const std::unique_ptr<Data::SponsoredMessages> _sponsoredMessages;
 
 	const std::unique_ptr<Support::Helper> _supportHelper;
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 5b8d4fc25..6cf5e55a2 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_updates.h"
 #include "api/api_views.h"
+#include "data/components/scheduled_messages.h"
 #include "data/data_document_media.h"
 #include "data/data_document_resolver.h"
 #include "data/data_forum_topic.h"
@@ -22,7 +23,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat.h"
 #include "data/data_user.h"
 #include "data/data_chat_filters.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_file_origin.h"
 #include "data/data_histories.h"
 #include "data/stickers/data_stickers.h"
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index e03e69c52..510902a15 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -68,6 +68,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h"
 #include "info/statistics/info_statistics_widget.h"
 #include "info/stories/info_stories_widget.h"
+#include "data/components/scheduled_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
@@ -79,7 +80,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum_topic.h"
 #include "data/data_user.h"
 #include "data/data_saved_sublist.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_histories.h"
 #include "data/data_chat_filters.h"
 #include "dialogs/dialogs_key.h"
@@ -2255,8 +2255,8 @@ QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
 		auto ids = QVector<MTPint>();
 		for (const auto item : session->data().idsToItems(list)) {
 			if (item->allowsSendNow()) {
-				ids.push_back(MTP_int(
-					session->data().scheduledMessages().lookupId(item)));
+				ids.push_back(
+					MTP_int(session->scheduledMessages().lookupId(item)));
 			}
 		}
 		session->api().request(MTPmessages_SendScheduledMessages(

From f4a09a9ca09ea99098edb165e35b21fa8945dd9d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 14 Apr 2024 04:13:34 +0300
Subject: [PATCH 288/596] Fixed display of growth rate in statistics info for
 huge values.

---
 .../info/statistics/info_statistics_inner_widget.cpp          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
index 6f4e45fb2..6e5803114 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
@@ -349,12 +349,14 @@ void FillOverview(
 		const auto diffText = diffAbs > kTooMuchDiff
 			? Lang::FormatCountToShort(std::abs(diff)).string
 			: QString::number(diffAbs);
+		const auto percentage = std::abs(v.growthRatePercentage);
+		const auto precision = (percentage == int(percentage)) ? 0 : 1;
 		return {
 			(diff < 0 ? st::menuIconAttentionColor : st::settingsIconBg2)->c,
 			QString("%1%2 (%3%)")
 				.arg((diff < 0) ? QChar(0x2212) : QChar(0x002B))
 				.arg(diffText)
-				.arg(std::abs(std::round(v.growthRatePercentage * 10.) / 10.))
+				.arg(QString::number(percentage, 'f', precision))
 		};
 	};
 

From 6a28cd1a35d5185cc3fdb6f8636d6a3251f1cf5f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Apr 2024 11:18:57 +0400
Subject: [PATCH 289/596] Reimplement file open confirmations.

---
 Telegram/Resources/langs/lang.strings         |  11 +-
 Telegram/SourceFiles/boxes/ringtones_box.cpp  |   2 +-
 Telegram/SourceFiles/core/core_settings.cpp   |  30 +++-
 Telegram/SourceFiles/core/core_settings.h     |  11 +-
 Telegram/SourceFiles/core/mime_type.cpp       | 141 +++++++++++++---
 Telegram/SourceFiles/core/mime_type.h         |  17 ++
 Telegram/SourceFiles/data/data_cloud_file.cpp |   8 +
 Telegram/SourceFiles/data/data_cloud_file.h   |   2 +
 Telegram/SourceFiles/data/data_document.cpp   |  51 +++++-
 Telegram/SourceFiles/data/data_document.h     |   6 +
 .../SourceFiles/data/data_document_media.cpp  |   5 +-
 .../data/data_document_resolver.cpp           | 150 ++++++------------
 .../SourceFiles/data/data_document_resolver.h |   4 -
 .../view/media/history_view_document.cpp      |   9 +-
 .../main/main_session_settings.cpp            |   5 +-
 .../SourceFiles/overview/overview_layout.cpp  |   4 +-
 .../settings/settings_privacy_security.cpp    |  77 ++++++++-
 17 files changed, 375 insertions(+), 158 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 74b1518ab..11b1a75e8 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -734,6 +734,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_sensitive_disable_filtering" = "Disable filtering";
 "lng_settings_sensitive_about" = "Display sensitive media in public channels on all your Telegram devices.";
 "lng_settings_security_bots" = "Bots and websites";
+"lng_settings_file_confirmations" = "File open confirmations";
+"lng_settings_edit_extensions" = "Extensions whitelist";
+"lng_settings_edit_extensions_about" = "Open files with the following extensions without additional confirmation.";
+"lng_settings_edit_ip_confirm" = "IP reveal warning";
+"lng_settings_edit_ip_confirm_about" = "Show confirmation when opening files that may reveal your IP address.";
 "lng_settings_clear_payment_info" = "Clear Payment and Shipping Info";
 "lng_settings_logged_in" = "Connected websites";
 "lng_settings_logged_in_title" = "Logged in with Telegram";
@@ -4480,10 +4485,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_translate_settings_about" = "The 'Translate' button will appear when you open a context menu on a text message.";
 "lng_translate_settings_one" = "Please choose at least one language so that it can be used as the \"Translate to\" language.";
 
-"lng_launch_exe_warning" = "This file has a {extension} extension.\nAre you sure you want to run it?";
+"lng_launch_exe_warning" = "This file has {extension} extension.\nAre you sure you want to run it?";
+"lng_launch_other_warning" = "This file has {extension} extension.\nAre you sure you want to open it?";
 "lng_launch_svg_warning" = "Opening this file can potentially expose your IP address to its sender. Continue?";
 "lng_launch_exe_sure" = "Run";
+"lng_launch_other_sure" = "Open";
 "lng_launch_exe_dont_ask" = "Don't ask me again";
+"lng_launch_dont_ask" = "Remember for this file type";
+"lng_launch_dont_ask_settings" = "You can later edit trusted file types in Settings > Privacy and Security > File open confirmations.";
 
 "lng_polls_anonymous" = "Anonymous Poll";
 "lng_polls_public" = "Poll";
diff --git a/Telegram/SourceFiles/boxes/ringtones_box.cpp b/Telegram/SourceFiles/boxes/ringtones_box.cpp
index d8097222e..4c299c162 100644
--- a/Telegram/SourceFiles/boxes/ringtones_box.cpp
+++ b/Telegram/SourceFiles/boxes/ringtones_box.cpp
@@ -90,7 +90,7 @@ QString ExtractRingtoneName(not_null<DocumentData*> document) {
 	}
 	const auto name = document->filename();
 	if (!name.isEmpty()) {
-		const auto extension = Data::FileExtension(name);
+		const auto extension = Core::FileExtension(name);
 		if (extension.isEmpty()) {
 			return name;
 		} else if (name.size() > extension.size() + 1) {
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index b4f770876..faa41445f 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -156,6 +156,10 @@ QByteArray Settings::serialize() const {
 	const auto &recentEmojiPreloadData = _recentEmojiPreload.empty()
 		? recentEmojiPreloadGenerated
 		: _recentEmojiPreload;
+	const auto noWarningExtensions = QStringList(
+		begin(_noWarningExtensions),
+		end(_noWarningExtensions)
+	).join(' ');
 
 	auto size = Serialize::bytearraySize(themesAccentColors)
 		+ sizeof(qint32) * 5
@@ -212,7 +216,8 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_captureDeviceId.current())
 		+ Serialize::stringSize(_callPlaybackDeviceId.current())
 		+ Serialize::stringSize(_callCaptureDeviceId.current())
-		+ Serialize::bytearraySize(ivPosition);
+		+ Serialize::bytearraySize(ivPosition)
+		+ Serialize::stringSize(noWarningExtensions);
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -252,7 +257,7 @@ QByteArray Settings::serialize() const {
 			<< qint32(_sendSubmitWay)
 			<< qint32(_includeMutedCounter ? 1 : 0)
 			<< qint32(_countUnreadMessages ? 1 : 0)
-			<< qint32(_exeLaunchWarning ? 1 : 0)
+			<< qint32(1) // legacy exe launch warning
 			<< qint32(_notifyAboutPinned.current() ? 1 : 0)
 			<< qint32(_loopAnimatedStickers ? 1 : 0)
 			<< qint32(_largeEmoji.current() ? 1 : 0)
@@ -357,7 +362,8 @@ QByteArray Settings::serialize() const {
 			<< _captureDeviceId.current()
 			<< _callPlaybackDeviceId.current()
 			<< _callCaptureDeviceId.current()
-			<< ivPosition;
+			<< ivPosition
+			<< noWarningExtensions;
 	}
 
 	Ensures(result.size() == size);
@@ -406,7 +412,8 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 sendSubmitWay = static_cast<qint32>(_sendSubmitWay);
 	qint32 includeMutedCounter = _includeMutedCounter ? 1 : 0;
 	qint32 countUnreadMessages = _countUnreadMessages ? 1 : 0;
-	qint32 exeLaunchWarning = _exeLaunchWarning ? 1 : 0;
+	std::optional<QString> noWarningExtensions;
+	qint32 legacyExeLaunchWarning = 1;
 	qint32 notifyAboutPinned = _notifyAboutPinned.current() ? 1 : 0;
 	qint32 loopAnimatedStickers = _loopAnimatedStickers ? 1 : 0;
 	qint32 largeEmoji = _largeEmoji.current() ? 1 : 0;
@@ -513,7 +520,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 			>> sendSubmitWay
 			>> includeMutedCounter
 			>> countUnreadMessages
-			>> exeLaunchWarning
+			>> legacyExeLaunchWarning
 			>> notifyAboutPinned
 			>> loopAnimatedStickers
 			>> largeEmoji
@@ -755,6 +762,10 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> ivPosition;
 	}
+	if (!stream.atEnd()) {
+		noWarningExtensions = QString();
+		stream >> *noWarningExtensions;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -817,7 +828,12 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	}
 	_includeMutedCounter = (includeMutedCounter == 1);
 	_countUnreadMessages = (countUnreadMessages == 1);
-	_exeLaunchWarning = (exeLaunchWarning == 1);
+	if (noWarningExtensions) {
+		const auto list = noWarningExtensions->mid(0, 10240)
+			.split(' ', Qt::SkipEmptyParts)
+			.mid(0, 1024);
+		_noWarningExtensions = base::flat_set<QString>(list.begin(), list.end());
+	}
 	_ipRevealWarning = (ipRevealWarning == 1);
 	_notifyAboutPinned = (notifyAboutPinned == 1);
 	_loopAnimatedStickers = (loopAnimatedStickers == 1);
@@ -1283,7 +1299,7 @@ void Settings::resetOnLastLogout() {
 	//_sendSubmitWay = Ui::InputSubmitSettings::Enter;
 	_soundOverrides = {};
 
-	_exeLaunchWarning = true;
+	_noWarningExtensions.clear();
 	_ipRevealWarning = true;
 	_loopAnimatedStickers = true;
 	_largeEmoji = true;
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 12b7fa431..cded2ec20 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -398,11 +398,12 @@ public:
 	}
 	[[nodiscard]] QString getSoundPath(const QString &key) const;
 
-	[[nodiscard]] bool exeLaunchWarning() const {
-		return _exeLaunchWarning;
+	[[nodiscard]] auto noWarningExtensions() const
+	-> const base::flat_set<QString> & {
+		return _noWarningExtensions;
 	}
-	void setExeLaunchWarning(bool warning) {
-		_exeLaunchWarning = warning;
+	void setNoWarningExtensions(base::flat_set<QString> extensions) {
+		_noWarningExtensions = std::move(extensions);
 	}
 	[[nodiscard]] bool ipRevealWarning() const {
 		return _ipRevealWarning;
@@ -933,7 +934,7 @@ private:
 	Ui::SendFilesWay _sendFilesWay = Ui::SendFilesWay();
 	Ui::InputSubmitSettings _sendSubmitWay = Ui::InputSubmitSettings();
 	base::flat_map<QString, QString> _soundOverrides;
-	bool _exeLaunchWarning = true;
+	base::flat_set<QString> _noWarningExtensions;
 	bool _ipRevealWarning = true;
 	bool _loopAnimatedStickers = true;
 	rpl::variable<bool> _largeEmoji = true;
diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index 8ba1b6494..7467145cf 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -37,6 +37,12 @@ namespace {
 		&& data->hasImage();
 }
 
+[[nodiscard]] base::flat_set<QString> SplitExtensions(
+		const QString &joined) {
+	const auto list = joined.split(' ');
+	return base::flat_set<QString>(list.begin(), list.end());
+}
+
 } // namespace
 
 MimeType::MimeType(const QMimeType &type) : _typeStruct(type) {
@@ -162,22 +168,9 @@ bool IsMimeAcceptedForPhotoVideoAlbum(const QString &mime) {
 }
 
 bool FileIsImage(const QString &name, const QString &mime) {
-	QString lowermime = mime.toLower(), namelower = name.toLower();
-	if (lowermime.startsWith(u"image/"_q)) {
-		return true;
-	} else if (namelower.endsWith(u".bmp"_q)
-		|| namelower.endsWith(u".jpg"_q)
-		|| namelower.endsWith(u".jpeg"_q)
-		|| namelower.endsWith(u".gif"_q)
-		|| namelower.endsWith(u".webp"_q)
-		|| namelower.endsWith(u".tga"_q)
-		|| namelower.endsWith(u".tiff"_q)
-		|| namelower.endsWith(u".tif"_q)
-		|| namelower.endsWith(u".psd"_q)
-		|| namelower.endsWith(u".png"_q)) {
-		return true;
-	}
-	return false;
+	return name.isEmpty()
+		? mime.toLower().startsWith(u"image/"_q)
+		: (DetectNameType(name) == NameType::Image);
 }
 
 std::shared_ptr<QMimeData> ShareMimeMediaData(
@@ -194,10 +187,10 @@ std::shared_ptr<QMimeData> ShareMimeMediaData(
 		result->setData(u"application/x-td-use-jpeg"_q, "1");
 		result->setData(u"image/jpeg"_q, original->data(u"image/jpeg"_q));
 	}
-	if (auto list = Core::ReadMimeUrls(original); !list.isEmpty()) {
+	if (auto list = ReadMimeUrls(original); !list.isEmpty()) {
 		result->setUrls(std::move(list));
 	}
-	result->setText(Core::ReadMimeText(original));
+	result->setText(ReadMimeText(original));
 	return result;
 }
 
@@ -240,4 +233,116 @@ bool CanSendFiles(not_null<const QMimeData*> data) {
 	return false;
 }
 
+QString FileExtension(const QString &filepath) {
+	const auto reversed = ranges::views::reverse(filepath);
+	const auto last = ranges::find_first_of(reversed, ".\\/");
+	if (last == reversed.end() || *last != '.') {
+		return QString();
+	}
+	return QString(last.base(), last - reversed.begin());
+}
+
+NameType DetectNameType(const QString &filepath) {
+	static const auto kImage = SplitExtensions(u"\
+afdesign ai avif bmp dng gif heic icns ico jfif jpeg jpg jpg-large nef png \
+png-large psd raw sketch svg tga tif tiff webp"_q);
+	static const auto kVideo = SplitExtensions(u"\
+3g2 3gp 3gpp aep avi flv h264 m4s m4v mkv mov mp4 mpeg mpg ogv srt tgs tgv \
+vob webm wmv"_q);
+	static const auto kAudio = SplitExtensions(u"\
+aac ac3 aif amr caf cda cue flac m4a m4b mid midi mp3 ogg opus wav wma"_q);
+	static const auto kDocument = SplitExtensions(u"\
+pdf doc docx ppt pptx pps ppsx xls xlsx txt rtf odt ods odp csv text log tl \
+tex xspf xml djvu diag ps ost kml pub epub mobi cbr cbz fb2 prc ris pem p7b \
+m3u m3u8 wpd wpl htm html xhtml key"_q);
+	static const auto kArchive = SplitExtensions(u"\
+7z arj bz2 gz rar tar xz z zip zst"_q);
+	static const auto kThemeFile = SplitExtensions(u"\
+tdesktop-theme tdesktop-palette tgios-theme attheme"_q);
+	static const auto kOtherBenign = SplitExtensions(u"\
+c cc cpp cxx h m mm swift cs ts class java css ninja cmake patch diff plist \
+gyp gitignore strings asoundrc torrent csr json xaml md keylayout sql \
+sln xib mk \
+\
+dmg img iso vcd \
+\
+pdb eot ics ips ipa core mem pcap ovpn part pcapng dmp pkpass dat zxp crash \
+file bak gbr plain dlc fon fnt otf ttc ttf gpx db rss cur \
+\
+tdesktop-endpoints"_q);
+
+	static const auto kExecutable = SplitExtensions(
+#ifdef Q_OS_WIN
+		u"\
+ad ade adp ahk app application appref-ms asp aspx asx bas bat bin cab cdxml \
+cer cfg cgi chi chm cmd cnt com conf cpl crt csh der diagcab dll drv eml \
+exe fon fxp gadget grp hlp hpj hta htt inf ini ins inx isp isu its jar jnlp \
+job js jse jsp key ksh lexe library-ms lnk local lua mad maf mag mam \
+manifest maq mar mas mat mau mav maw mcf mda mdb mde mdt mdw mdz mht mhtml \
+mjs mmc mof msc msg msh msh1 msh2 msh1xml msh2xml mshxml msi msp mst ops \
+osd paf pcd phar php php3 php4 php5 php7 phps php-s pht phtml pif pl plg pm \
+pod prf prg ps1 ps2 ps1xml ps2xml psc1 psc2 psd1 psm1 pssc pst py py3 pyc \
+pyd pyi pyo pyw pyzw pyz rb reg rgs scf scr sct search-ms settingcontent-ms \
+sh shb shs slk sys swf t tmp u3p url vb vbe vbp vbs vbscript vdx vsmacros \
+vsd vsdm vsdx vss vssm vssx vst vstm vstx vsw vsx vtx website wlua ws wsc \
+wsf wsh xbap xll xlsm xnk xs"_q
+#elif defined Q_OS_MAC // Q_OS_MAC
+		u"\
+applescript action app bin command csh osx workflow terminal url caction \
+mpkg pkg scpt scptd xhtm xhtml webarchive"_q
+#else // Q_OS_WIN || Q_OS_MAC
+		u"bin csh deb desktop ksh out pet pkg pup rpm run sh shar slp zsh"_q
+#endif // !Q_OS_WIN && !Q_OS_MAC
+	);
+
+	const auto extension = FileExtension(filepath).toLower();
+	if (kExecutable.contains(extension)) {
+		return NameType::Executable;
+	} else if (kImage.contains(extension)) {
+		return NameType::Image;
+	} else if (kVideo.contains(extension)) {
+		return NameType::Video;
+	} else if (kAudio.contains(extension)) {
+		return NameType::Audio;
+	} else if (kDocument.contains(extension)) {
+		return NameType::Document;
+	} else if (kArchive.contains(extension)) {
+		return NameType::Archive;
+	} else if (kThemeFile.contains(extension)) {
+		return NameType::ThemeFile;
+	} else if (kOtherBenign.contains(extension)) {
+		return NameType::OtherBenign;
+	}
+	return NameType::Unknown;
+}
+
+bool NameTypeAllowsThumbnail(NameType type) {
+	return type == NameType::Image
+		|| type == NameType::Video
+		|| type == NameType::Audio
+		|| type == NameType::Document
+		|| type == NameType::ThemeFile;
+}
+
+bool IsIpRevealingPath(const QString &filepath) {
+	static const auto kExtensions = [] {
+		const auto joined = u"htm html svg m4v m3u8 xhtml"_q;
+		const auto list = joined.split(' ');
+		return base::flat_set<QString>(list.begin(), list.end());
+	}();
+	static const auto kMimeTypes = [] {
+		const auto joined = u"text/html image/svg+xml"_q;
+		const auto list = joined.split(' ');
+		return base::flat_set<QString>(list.begin(), list.end());
+	}();
+
+	return ranges::binary_search(
+		kExtensions,
+		FileExtension(filepath).toLower()
+	) || ranges::binary_search(
+		kMimeTypes,
+		QMimeDatabase().mimeTypeForFile(QFileInfo(filepath)).name()
+	);
+}
+
 } // namespace Core
diff --git a/Telegram/SourceFiles/core/mime_type.h b/Telegram/SourceFiles/core/mime_type.h
index 3271adafe..ebf4db64b 100644
--- a/Telegram/SourceFiles/core/mime_type.h
+++ b/Telegram/SourceFiles/core/mime_type.h
@@ -69,4 +69,21 @@ struct MimeImageData {
 [[nodiscard]] QList<QUrl> ReadMimeUrls(not_null<const QMimeData*> data);
 [[nodiscard]] bool CanSendFiles(not_null<const QMimeData*> data);
 
+enum class NameType : uchar {
+	Unknown,
+	Executable,
+	Image,
+	Video,
+	Audio,
+	Document,
+	Archive,
+	ThemeFile,
+	OtherBenign,
+};
+
+[[nodiscard]] QString FileExtension(const QString &filepath);
+[[nodiscard]] NameType DetectNameType(const QString &filepath);
+[[nodiscard]] bool NameTypeAllowsThumbnail(NameType type);
+[[nodiscard]] bool IsIpRevealingPath(const QString &filepath);
+
 } // namespace Core
diff --git a/Telegram/SourceFiles/data/data_cloud_file.cpp b/Telegram/SourceFiles/data/data_cloud_file.cpp
index bee90358a..526dd8904 100644
--- a/Telegram/SourceFiles/data/data_cloud_file.cpp
+++ b/Telegram/SourceFiles/data/data_cloud_file.cpp
@@ -22,6 +22,14 @@ CloudFile::~CloudFile() {
 	base::take(loader);
 }
 
+void CloudFile::clear() {
+	location = {};
+	base::take(loader);
+	byteSize = 0;
+	progressivePartSize = 0;
+	flags = {};
+}
+
 CloudImage::CloudImage() = default;
 
 CloudImage::CloudImage(
diff --git a/Telegram/SourceFiles/data/data_cloud_file.h b/Telegram/SourceFiles/data/data_cloud_file.h
index e71cbe462..b44a35c7d 100644
--- a/Telegram/SourceFiles/data/data_cloud_file.h
+++ b/Telegram/SourceFiles/data/data_cloud_file.h
@@ -37,6 +37,8 @@ struct CloudFile final {
 
 	~CloudFile();
 
+	void clear();
+
 	ImageLocation location;
 	std::unique_ptr<FileLoader> loader;
 	int byteSize = 0;
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index afe91b8a1..2bf1a0104 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -478,6 +478,31 @@ void DocumentData::setattributes(
 		_additional = nullptr;
 	}
 
+	if (!_filename.isEmpty()) {
+		using Type = Core::NameType;
+		if (type == VideoDocument
+			|| type == AnimatedDocument
+			|| type == RoundVideoDocument
+			|| isAnimation()) {
+			if (_nameType != Type::Video) {
+				type = FileDocument;
+				_additional = nullptr;
+			}
+		}
+		if (type == SongDocument || type == VoiceDocument || isAudioFile()) {
+			if (_nameType != Type::Audio) {
+				type = FileDocument;
+				_additional = nullptr;
+			}
+		}
+		if (!Core::NameTypeAllowsThumbnail(_nameType)) {
+			_inlineThumbnailBytes = {};
+			_flags &= ~Flag::InlineThumbnailIsPath;
+			_thumbnail.clear();
+			_videoThumbnail.clear();
+		}
+	}
+
 	if (isAudioFile()
 		|| isAnimation()
 		|| isVoiceMessage()
@@ -530,6 +555,10 @@ void DocumentData::updateThumbnails(
 		const ImageWithLocation &thumbnail,
 		const ImageWithLocation &videoThumbnail,
 		bool isPremiumSticker) {
+	if (!_filename.isEmpty()
+		&& !Core::NameTypeAllowsThumbnail(Core::DetectNameType(_filename))) {
+		return;
+	}
 	if (!inlineThumbnail.bytes.isEmpty()
 		&& _inlineThumbnailBytes.isEmpty()) {
 		_inlineThumbnailBytes = inlineThumbnail.bytes;
@@ -919,6 +948,7 @@ void DocumentData::setFileName(const QString &remoteFileName) {
 	for (const auto &ch : controls) {
 		_filename = std::move(_filename).replace(ch, "_");
 	}
+	_nameType = Core::DetectNameType(_filename);
 }
 
 void DocumentData::setLoadedInMediaCacheLocation() {
@@ -1460,6 +1490,10 @@ QString DocumentData::filename() const {
 	return _filename;
 }
 
+Core::NameType DocumentData::nameType() const {
+	return _nameType;
+}
+
 QString DocumentData::mimeString() const {
 	return _mimeString;
 }
@@ -1527,7 +1561,10 @@ bool DocumentData::isVideoMessage() const {
 bool DocumentData::isAnimation() const {
 	return (type == AnimatedDocument)
 		|| isVideoMessage()
-		|| (hasMimeType(u"image/gif"_q)
+		|| ((_filename.isEmpty()
+			|| _nameType == Core::NameType::Image
+			|| _nameType == Core::NameType::Video)
+			&& hasMimeType(u"image/gif"_q)
 			&& !(_flags & Flag::StreamingPlaybackFailed));
 }
 
@@ -1537,9 +1574,11 @@ bool DocumentData::isGifv() const {
 }
 
 bool DocumentData::isTheme() const {
-	return hasMimeType(u"application/x-tgtheme-tdesktop"_q)
-		|| _filename.endsWith(u".tdesktop-theme"_q, Qt::CaseInsensitive)
-		|| _filename.endsWith(u".tdesktop-palette"_q, Qt::CaseInsensitive);
+	return _filename.endsWith(u".tdesktop-theme"_q, Qt::CaseInsensitive)
+		|| _filename.endsWith(u".tdesktop-palette"_q, Qt::CaseInsensitive)
+		|| (hasMimeType(u"application/x-tgtheme-tdesktop"_q)
+			&& (_filename.isEmpty()
+				|| _nameType == Core::NameType::ThemeFile));
 }
 
 bool DocumentData::isSong() const {
@@ -1562,6 +1601,10 @@ bool DocumentData::isAudioFile() const {
 			return true;
 		}
 		return false;
+	} else if (!_filename.isEmpty()
+		&& _nameType != Core::NameType::Audio
+		&& _nameType != Core::NameType::Video) {
+		return false;
 	}
 	const auto left = _mimeString.mid(prefix.size());
 	const auto types = { u"x-wav"_q, u"wav"_q, u"mp4"_q };
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index c33c9cbd0..299a6caf1 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -20,6 +20,10 @@ namespace Images {
 class Source;
 } // namespace Images
 
+namespace Core {
+enum class NameType : uchar;
+} // namespace Core
+
 namespace Storage {
 namespace Cache {
 struct Key;
@@ -255,6 +259,7 @@ public:
 	void collectLocalData(not_null<DocumentData*> local);
 
 	[[nodiscard]] QString filename() const;
+	[[nodiscard]] Core::NameType nameType() const;
 	[[nodiscard]] QString mimeString() const;
 	[[nodiscard]] bool hasMimeType(const QString &mime) const;
 	void setMimeString(const QString &mime);
@@ -369,6 +374,7 @@ private:
 	std::unique_ptr<DocumentAdditionalData> _additional;
 	mutable Flags _flags = kStreamingSupportedUnknown;
 	GoodThumbnailState _goodThumbnailState = GoodThumbnailState();
+	Core::NameType _nameType = Core::NameType();
 	std::unique_ptr<FileLoader> _loader;
 
 };
diff --git a/Telegram/SourceFiles/data/data_document_media.cpp b/Telegram/SourceFiles/data/data_document_media.cpp
index 101f0f8cc..e61030302 100644
--- a/Telegram/SourceFiles/data/data_document_media.cpp
+++ b/Telegram/SourceFiles/data/data_document_media.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/themes/window_theme_preview.h"
 #include "core/core_settings.h"
 #include "core/application.h"
+#include "core/mime_type.h"
 #include "storage/file_download.h"
 #include "ui/chat/attach/attach_prepare.h"
 
@@ -295,10 +296,12 @@ void DocumentMedia::automaticLoad(
 		// No automatic download in this case.
 		return;
 	}
+	const auto indata = _owner->filename();
 	const auto filename = toCache
 		? QString()
 		: DocumentFileNameForSave(_owner);
-	const auto shouldLoadFromCloud = !Data::IsExecutableName(filename)
+	const auto shouldLoadFromCloud = (indata.isEmpty()
+		|| Core::DetectNameType(indata) != Core::NameType::Executable)
 		&& (item
 			? Data::AutoDownload::Should(
 				_owner->session().settings().autoDownload(),
diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp
index be68c2476..575d695cf 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.cpp
+++ b/Telegram/SourceFiles/data/data_document_resolver.cpp
@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/chat_theme.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/checkbox.h"
+#include "ui/wrap/slide_wrap.h"
 #include "window/window_session_controller.h"
 #include "styles/style_layers.h"
 
@@ -46,11 +47,12 @@ base::options::toggle OptionExternalVideoPlayer({
 void ConfirmDontWarnBox(
 		not_null<Ui::GenericBox*> box,
 		rpl::producer<TextWithEntities> &&text,
+		rpl::producer<QString> &&check,
 		rpl::producer<QString> &&confirm,
 		Fn<void(bool)> callback) {
 	auto checkbox = object_ptr<Ui::Checkbox>(
 		box.get(),
-		tr::lng_launch_exe_dont_ask(),
+		std::move(check),
 		false,
 		st::defaultBoxCheckbox);
 	const auto weak = Ui::MakeWeak(checkbox.data());
@@ -67,29 +69,43 @@ void ConfirmDontWarnBox(
 	auto padding = st::boxPadding;
 	padding.setTop(padding.bottom());
 	box->addRow(std::move(checkbox), std::move(padding));
+	box->addRow(object_ptr<Ui::SlideWrap<Ui::FlatLabel>>(
+		box,
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_launch_dont_ask_settings(),
+			st::boxLabel)
+	))->toggleOn(weak->checkedValue());
 }
 
 void LaunchWithWarning(
 		// not_null<Window::Controller*> controller,
 		const QString &name,
 		HistoryItem *item) {
-	const auto isExecutable = Data::IsExecutableName(name);
-	const auto isIpReveal = Data::IsIpRevealingName(name);
+	const auto nameType = Core::DetectNameType(name);
+	const auto isIpReveal = (nameType != Core::NameType::Executable)
+		&& Core::IsIpRevealingPath(name);
+	const auto extension = Core::FileExtension(name).toLower();
+
 	auto &app = Core::App();
+	auto &settings = app.settings();
 	const auto warn = [&] {
 		if (item && item->history()->peer->isVerified()) {
 			return false;
 		}
-		return (isExecutable && app.settings().exeLaunchWarning())
-			|| (isIpReveal && app.settings().ipRevealWarning());
+		return (isIpReveal && settings.ipRevealWarning())
+			|| ((nameType == Core::NameType::Executable
+				|| nameType == Core::NameType::Unknown)
+				&& !settings.noWarningExtensions().contains(extension));
 	}();
-	const auto extension = '.' + Data::FileExtension(name);
-	if (Platform::IsWindows() && extension == u"."_q) {
+	if (extension.isEmpty()) {
 		// If you launch a file without extension, like "test", in case
 		// there is an executable file with the same name in this folder,
 		// like "test.bat", the executable file will be launched.
 		//
 		// Now we always force an Open With dialog box for such files.
+		//
+		// Let's force it for all platforms for files without extension.
 		crl::on_main([=] {
 			Platform::File::UnsafeShowOpenWith(name);
 		});
@@ -98,27 +114,38 @@ void LaunchWithWarning(
 		File::Launch(name);
 		return;
 	}
-	const auto callback = [=, &app](bool checked) {
+	const auto callback = [=, &app, &settings](bool checked) {
 		if (checked) {
-			if (isExecutable) {
-				app.settings().setExeLaunchWarning(false);
-			} else if (isIpReveal) {
-				app.settings().setIpRevealWarning(false);
+			if (isIpReveal) {
+				settings.setIpRevealWarning(false);
+			} else {
+				auto copy = settings.noWarningExtensions();
+				copy.emplace(extension);
+				settings.setNoWarningExtensions(std::move(copy));
 			}
 			app.saveSettingsDelayed();
 		}
 		File::Launch(name);
 	};
-	auto text = isExecutable
-		? tr::lng_launch_exe_warning(
-			lt_extension,
-			rpl::single(Ui::Text::Bold(extension)),
-			Ui::Text::WithEntities)
-		: tr::lng_launch_svg_warning(Ui::Text::WithEntities);
+	auto text = isIpReveal
+		? tr::lng_launch_svg_warning(Ui::Text::WithEntities)
+		: ((nameType == Core::NameType::Executable)
+			? tr::lng_launch_exe_warning
+			: tr::lng_launch_other_warning)(
+				lt_extension,
+				rpl::single(Ui::Text::Bold('.' + extension)),
+				Ui::Text::WithEntities);
+	auto check = (isIpReveal
+		? tr::lng_launch_exe_dont_ask
+		: tr::lng_launch_dont_ask)();
+	auto confirm = ((nameType == Core::NameType::Executable)
+		? tr::lng_launch_exe_sure
+		: tr::lng_launch_other_sure)();
 	Ui::show(Box(
 		ConfirmDontWarnBox,
 		std::move(text),
-		(isExecutable ? tr::lng_launch_exe_sure : tr::lng_continue)(),
+		std::move(check),
+		std::move(confirm),
 		callback));
 }
 
@@ -126,91 +153,6 @@ void LaunchWithWarning(
 
 const char kOptionExternalVideoPlayer[] = "external-video-player";
 
-QString FileExtension(const QString &filepath) {
-	const auto reversed = ranges::views::reverse(filepath);
-	const auto last = ranges::find_first_of(reversed, ".\\/");
-	if (last == reversed.end() || *last != '.') {
-		return QString();
-	}
-	return QString(last.base(), last - reversed.begin());
-}
-
-#if 0
-bool IsValidMediaFile(const QString &filepath) {
-	static const auto kExtensions = [] {
-		const auto list = qsl("\
-16svx 2sf 3g2 3gp 8svx aac aaf aif aifc aiff amr amv ape asf ast au aup \
-avchd avi brstm bwf cam cdda cust dat divx drc dsh dsf dts dtshd dtsma \
-dvr-ms dwd evo f4a f4b f4p f4v fla flac flr flv gif gifv gsf gsm gym iff \
-ifo it jam la ly m1v m2p m2ts m2v m4a m4p m4v mcf mid mk3d mka mks mkv mng \
-mov mp1 mp2 mp3 mp4 minipsf mod mpc mpe mpeg mpg mpv mscz mt2 mus mxf mxl \
-niff nsf nsv off ofr ofs ogg ogv opus ots pac ps psf psf2 psflib ptb qsf \
-qt ra raw rka rm rmj rmvb roq s3m shn sib sid smi smp sol spc spx ssf svi \
-swa swf tak ts tta txm usf vgm vob voc vox vqf wav webm wma wmv wrap wtv \
-wv xm xml ym yuv").split(' ');
-		return base::flat_set<QString>(list.begin(), list.end());
-	}();
-
-	return ranges::binary_search(
-		kExtensions,
-		FileExtension(filepath).toLower());
-}
-#endif
-
-bool IsExecutableName(const QString &filepath) {
-	static const auto kExtensions = [] {
-		const auto joined =
-#ifdef Q_OS_WIN
-			u"\
-ad ade adp app application appref-ms asp asx bas bat bin cab cdxml cer cfg \
-chi chm cmd cnt com cpl crt csh der diagcab dll drv eml exe fon fxp gadget \
-grp hlp hpj hta htt inf ini ins inx isp isu its jar jnlp job js jse key ksh \
-lexe lnk local lua mad maf mag mam manifest maq mar mas mat mau mav maw mcf \
-mda mdb mde mdt mdw mdz mht mhtml mjs mmc mof msc msg msh msh1 msh2 msh1xml \
-msh2xml mshxml msi msp mst ops osd paf pcd phar php php3 php4 php5 php7 phps \
-php-s pht phtml pif pl plg pm pod prf prg ps1 ps2 ps1xml ps2xml psc1 psc2 \
-psd1 psm1 pssc pst py py3 pyc pyd pyi pyo pyw pyzw pyz rb reg rgs scf scr \
-sct search-ms settingcontent-ms sh shb shs slk sys t tmp u3p url vb vbe vbp \
-vbs vbscript vdx vsmacros vsd vsdm vsdx vss vssm vssx vst vstm vstx vsw vsx \
-vtx website wlua ws wsc wsf wsh xbap xll xnk xs"_q;
-#elif defined Q_OS_MAC // Q_OS_MAC
-			u"\
-applescript action app bin command csh osx workflow terminal url caction \
-mpkg pkg scpt scptd xhtm webarchive"_q;
-#else // Q_OS_WIN || Q_OS_MAC
-			u"bin csh deb desktop ksh out pet pkg pup rpm run sh shar \
-slp zsh"_q;
-#endif // !Q_OS_WIN && !Q_OS_MAC
-		const auto list = joined.split(' ');
-		return base::flat_set<QString>(list.begin(), list.end());
-	}();
-
-	return ranges::binary_search(
-		kExtensions,
-		FileExtension(filepath).toLower());
-}
-
-bool IsIpRevealingName(const QString &filepath) {
-	static const auto kExtensions = [] {
-		const auto joined = u"htm html svg m4v m3u8"_q;
-		const auto list = joined.split(' ');
-		return base::flat_set<QString>(list.begin(), list.end());
-	}();
-	static const auto kMimeTypes = [] {
-		const auto joined = u"text/html image/svg+xml"_q;
-		const auto list = joined.split(' ');
-		return base::flat_set<QString>(list.begin(), list.end());
-	}();
-
-	return ranges::binary_search(
-		kExtensions,
-		FileExtension(filepath).toLower()
-	) || ranges::binary_search(
-		kMimeTypes,
-		QMimeDatabase().mimeTypeForFile(QFileInfo(filepath)).name()
-	);
-}
-
 base::binary_guard ReadBackgroundImageAsync(
 		not_null<Data::DocumentMedia*> media,
 		FnMut<QImage(QImage)> postprocess,
diff --git a/Telegram/SourceFiles/data/data_document_resolver.h b/Telegram/SourceFiles/data/data_document_resolver.h
index 9931da3e8..4988297aa 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.h
+++ b/Telegram/SourceFiles/data/data_document_resolver.h
@@ -22,10 +22,6 @@ class DocumentMedia;
 
 extern const char kOptionExternalVideoPlayer[];
 
-[[nodiscard]] QString FileExtension(const QString &filepath);
-// [[nodiscard]] bool IsValidMediaFile(const QString &filepath);
-[[nodiscard]] bool IsExecutableName(const QString &filepath);
-[[nodiscard]] bool IsIpRevealingName(const QString &filepath);
 base::binary_guard ReadBackgroundImageAsync(
 	not_null<Data::DocumentMedia*> media,
 	FnMut<QImage(QImage)> postprocess,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index d884580d5..b7714d579 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -380,12 +380,9 @@ void Document::createComponents(bool caption) {
 		mask |= HistoryDocumentVoice::Bit();
 	} else {
 		mask |= HistoryDocumentNamed::Bit();
-		if (_data->hasThumbnail()) {
-			if (!_data->isSong()
-				&& !Data::IsExecutableName(_data->filename())) {
-				_data->loadThumbnail(_realParent->fullId());
-				mask |= HistoryDocumentThumbed::Bit();
-			}
+		if (_data->hasThumbnail() && !_data->isSong()) {
+			_data->loadThumbnail(_realParent->fullId());
+			mask |= HistoryDocumentThumbed::Bit();
 		}
 	}
 	if (caption) {
diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index 239bc7cf6..7806dea9f 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -140,7 +140,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	qint32 supportChatsTimeSlice = _supportChatsTimeSlice.current();
 	qint32 appIncludeMutedCounter = app.includeMutedCounter() ? 1 : 0;
 	qint32 appCountUnreadMessages = app.countUnreadMessages() ? 1 : 0;
-	qint32 appExeLaunchWarning = app.exeLaunchWarning() ? 1 : 0;
+	qint32 legacyAppExeLaunchWarning = 1;
 	QByteArray autoDownload;
 	qint32 supportAllSearchResults = _supportAllSearchResults.current() ? 1 : 0;
 	qint32 archiveCollapsed = _archiveCollapsed.current() ? 1 : 0;
@@ -262,7 +262,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 			stream >> appCountUnreadMessages;
 		}
 		if (!stream.atEnd()) {
-			stream >> appExeLaunchWarning;
+			stream >> legacyAppExeLaunchWarning;
 		}
 	}
 	if (!stream.atEnd()) {
@@ -509,7 +509,6 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 		}
 		app.setIncludeMutedCounter(appIncludeMutedCounter == 1);
 		app.setCountUnreadMessages(appCountUnreadMessages == 1);
-		app.setExeLaunchWarning(appExeLaunchWarning == 1);
 		app.setNotifyAboutPinned(appNotifyAboutPinned == 1);
 		app.setLoopAnimatedStickers(appLoopAnimatedStickers == 1);
 		app.setLargeEmoji(appLargeEmoji == 1);
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 69fc9f292..b742a6436 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -1514,9 +1514,7 @@ bool Document::iconAnimated() const {
 }
 
 bool Document::withThumb() const {
-	return !songLayout()
-		&& _data->hasThumbnail()
-		&& !Data::IsExecutableName(_data->filename());
+	return !songLayout() && _data->hasThumbnail();
 }
 
 bool Document::updateStatusText() {
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 045457819..4849719ff 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -36,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/fade_wrap.h"
+#include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/vertical_list.h"
@@ -114,6 +115,56 @@ void AddPremiumStar(
 	}, badge->lifetime());
 }
 
+void OpenFileConfirmationsBox(not_null<Ui::GenericBox*> box) {
+	box->setTitle(tr::lng_settings_file_confirmations());
+
+	const auto settings = &Core::App().settings();
+	const auto &list = settings->noWarningExtensions();
+	const auto text = QStringList(begin(list), end(list)).join(' ');
+	const auto layout = box->verticalLayout();
+	const auto extensions = box->addRow(
+		object_ptr<Ui::InputField>(
+			box,
+			st::defaultInputField,
+			Ui::InputField::Mode::MultiLine,
+			tr::lng_settings_edit_extensions(),
+			TextWithTags{ text }),
+		st::boxRowPadding + QMargins(0, 0, 0, st::settingsPrivacySkip));
+	Ui::AddDividerText(layout, tr::lng_settings_edit_extensions_about());
+	Ui::AddSkip(layout);
+	const auto ip = layout->add(object_ptr<Ui::SettingsButton>(
+		box,
+		tr::lng_settings_edit_ip_confirm(),
+		st::settingsButtonNoIcon
+	))->toggleOn(rpl::single(settings->ipRevealWarning()));
+	Ui::AddSkip(layout);
+	Ui::AddDividerText(layout, tr::lng_settings_edit_ip_confirm_about());
+
+	box->setFocusCallback([=] {
+		extensions->setFocusFast();
+	});
+
+	box->addButton(tr::lng_settings_save(), [=] {
+		const auto extensionsList = extensions->getLastText()
+			.mid(0, 10240)
+			.split(' ', Qt::SkipEmptyParts)
+			.mid(0, 1024);
+		auto extensions = base::flat_set<QString>(
+			extensionsList.begin(),
+			extensionsList.end());
+		const auto ipRevealWarning = ip->toggled();
+		if (extensions != settings->noWarningExtensions()
+			|| ipRevealWarning != settings->ipRevealWarning()) {
+			settings->setNoWarningExtensions(std::move(extensions));
+			settings->setIpRevealWarning(ipRevealWarning);
+			Core::App().saveSettingsDelayed();
+		}
+		box->closeBox();
+
+	});
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
 QString PrivacyBase(Privacy::Key key, const Privacy::Rule &rule) {
 	using Key = Privacy::Key;
 	using Option = Privacy::Option;
@@ -645,6 +696,30 @@ void SetupBotsAndWebsites(
 	});
 
 	Ui::AddSkip(container);
+	Ui::AddDivider(container);
+}
+
+void SetupConfirmationExtensions(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container) {
+	if (Core::App().settings().noWarningExtensions().empty()
+		&& Core::App().settings().ipRevealWarning()) {
+		return;
+	}
+
+	Ui::AddSkip(container);
+	Ui::AddSubsectionTitle(container, tr::lng_settings_file_confirmations());
+
+	container->add(object_ptr<Button>(
+		container,
+		tr::lng_settings_edit_extensions(),
+		st::settingsButtonNoIcon
+	))->addClickHandler([=] {
+		controller->show(Box(OpenFileConfirmationsBox));
+	});
+
+	Ui::AddSkip(container);
+	Ui::AddDividerText(container, tr::lng_settings_edit_extensions_about());
 }
 
 void SetupBlockedList(
@@ -996,8 +1071,8 @@ void PrivacySecurity::setupContent(
 	AddDivider(content);
 #endif // !OS_MAC_STORE && !OS_WIN_STORE
 	SetupArchiveAndMute(controller, content);
+	SetupConfirmationExtensions(controller, content);
 	SetupBotsAndWebsites(controller, content);
-	AddDivider(content);
 	SetupSelfDestruction(controller, content, trigger());
 
 	Ui::ResizeFitChild(this, content);

From af2cb9b757df5b7ca88c8f5e9147beed3d7e2317 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Apr 2024 17:53:32 +0400
Subject: [PATCH 290/596] Fix possible unhandled exception in highlighting.

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

diff --git a/Telegram/ThirdParty/libprisma b/Telegram/ThirdParty/libprisma
index adf35ba88..23b0d70f9 160000
--- a/Telegram/ThirdParty/libprisma
+++ b/Telegram/ThirdParty/libprisma
@@ -1 +1 @@
-Subproject commit adf35ba88160777ce5b8d122630852394c58279f
+Subproject commit 23b0d70f9709da9b38561d5706891a134d18df76

From 06911ae42a2ceb80b497e166fff8e4bf802e1567 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Apr 2024 12:07:10 +0400
Subject: [PATCH 291/596] Version 4.16.7.

- Reimplement file open confirmations.
---
 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 3488163e5..1c4a9794d 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.6.0" />
+    Version="4.16.7.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 55576529e..a24bbed32 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 4,16,6,0
- PRODUCTVERSION 4,16,6,0
+ FILEVERSION 4,16,7,0
+ PRODUCTVERSION 4,16,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.16.6.0"
+            VALUE "FileVersion", "4.16.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.6.0"
+            VALUE "ProductVersion", "4.16.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index b923f66c3..96049776c 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 4,16,6,0
- PRODUCTVERSION 4,16,6,0
+ FILEVERSION 4,16,7,0
+ PRODUCTVERSION 4,16,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.16.6.0"
+            VALUE "FileVersion", "4.16.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.6.0"
+            VALUE "ProductVersion", "4.16.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 618dff5c0..c6f36ac7f 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 = 4016006;
-constexpr auto AppVersionStr = "4.16.6";
+constexpr auto AppVersion = 4016007;
+constexpr auto AppVersionStr = "4.16.7";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 700c4cc2a..58add7e50 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016006
+AppVersion         4016007
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.6
-AppVersionStr      4.16.6
+AppVersionStrSmall 4.16.7
+AppVersionStr      4.16.7
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.16.6
+AppVersionOriginal 4.16.7
diff --git a/changelog.txt b/changelog.txt
index 0b1319a36..6100f1afa 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.16.7 (15.04.24)
+
+- Reimplement file open confirmations.
+
 4.16.6 (09.04.24)
 
 - Show custom emoji preview on long press.

From 86b9d16747437a509d4547f0b817469d528cdcba Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 15 Apr 2024 23:30:57 +0300
Subject: [PATCH 292/596] Added additional note for macOS keys to json of
 custom shortcuts.

---
 Telegram/SourceFiles/core/shortcuts.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 270785fcb..8c0727db0 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -230,8 +230,24 @@ void WriteDefaultCustomFile() {
 	const auto path = CustomFilePath();
 	auto input = QFile(":/misc/default_shortcuts-custom.json");
 	auto output = QFile(path);
-	if (input.open(QIODevice::ReadOnly) && output.open(QIODevice::WriteOnly)) {
+	if (input.open(QIODevice::ReadOnly)
+		&& output.open(QIODevice::WriteOnly)) {
+#ifdef Q_OS_MAC
+		auto text = qs(input.readAll());
+		const auto note = R"(
+// Note:
+// On Apple platforms, reference to "ctrl" corresponds to the Command keys )"
+			+ QByteArray()
+			+ R"(on the Macintosh keyboard.
+// On Apple platforms, reference to "meta" corresponds to the Control keys.
+
+[
+)";
+		text.replace(u"\n\n["_q, QString(note));
+		output.write(text.toUtf8());
+#else
 		output.write(input.readAll());
+#endif // !Q_OS_MAC
 	}
 }
 

From ce596e29c4de1c25929954630b1b13f1c9159eb3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 15 Apr 2024 23:41:00 +0300
Subject: [PATCH 293/596] Fixed opening message from media player widget in
 corresponding window.

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

diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 6cf5e55a2..c1a6e1b2e 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -811,6 +811,13 @@ void MainWidget::createPlayer() {
 		});
 		_player->entity()->setShowItemCallback([=](
 				not_null<const HistoryItem*> item) {
+			const auto peer = item->history()->peer;
+			if (const auto window = Core::App().windowFor(peer)) {
+				if (const auto controller = window->sessionController()) {
+					controller->showMessage(item);
+					return;
+				}
+			}
 			_controller->showMessage(item);
 		});
 

From 6f1457d30dc616b385a1c648445548e5e24793c0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 15 Apr 2024 23:56:37 +0300
Subject: [PATCH 294/596] Fixed phrase of placeholder for message edition mode.

---
 Telegram/Resources/langs/lang.strings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 11b1a75e8..f3be3dc3d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -309,7 +309,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_limit_reached#one" = "You've reached the message text limit. Please make the text shorter by {count} character.";
 "lng_edit_limit_reached#other" = "You've reached the message text limit. Please make the text shorter by {count} characters.";
 "lng_edit_message" = "Edit message";
-"lng_edit_message_text" = "New message text...";
+"lng_edit_message_text" = "Caption";
 "lng_deleted" = "Deleted Account";
 "lng_deleted_message" = "Deleted message";
 "lng_deleted_story" = "Deleted story";

From 045919698297ab99cd5ef7050107b45a3ba556dc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 16 Apr 2024 01:54:22 +0300
Subject: [PATCH 295/596] Moved out level meter widget to td_ui.

---
 Telegram/CMakeLists.txt                         | 2 --
 Telegram/SourceFiles/ui/widgets/level_meter.cpp | 4 ++--
 Telegram/cmake/td_ui.cmake                      | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 0e007ca90..0a6ed8663 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1459,8 +1459,6 @@ PRIVATE
     ui/image/image_location.h
     ui/image/image_location_factory.cpp
     ui/image/image_location_factory.h
-    ui/widgets/level_meter.cpp
-    ui/widgets/level_meter.h
     ui/countryinput.cpp
     ui/countryinput.h
     ui/dynamic_thumbnails.cpp
diff --git a/Telegram/SourceFiles/ui/widgets/level_meter.cpp b/Telegram/SourceFiles/ui/widgets/level_meter.cpp
index 15acd28ab..7a94b8c46 100644
--- a/Telegram/SourceFiles/ui/widgets/level_meter.cpp
+++ b/Telegram/SourceFiles/ui/widgets/level_meter.cpp
@@ -24,7 +24,7 @@ void LevelMeter::setValue(float value) {
 
 void LevelMeter::paintEvent(QPaintEvent* event) {
 	auto p = QPainter(this);
-	PainterHighQualityEnabler hq(p);
+	auto hq = PainterHighQualityEnabler(p);
 
 	p.setPen(Qt::NoPen);
 
@@ -34,7 +34,7 @@ void LevelMeter::paintEvent(QPaintEvent* event) {
 	const auto rect = QRect(0, 0, _st.lineWidth, height());
 	p.setBrush(activeFg);
 	for (auto i = 0; i < _st.lineCount; ++i) {
-		const auto valueAtLine = (float)(i + 1) / _st.lineCount;
+		const auto valueAtLine = (float64)(i + 1) / _st.lineCount;
 		if (valueAtLine > _value) {
 			p.setBrush(inactiveFg);
 		}
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 524aba51b..65bbc1eaa 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -383,6 +383,8 @@ PRIVATE
     ui/widgets/discrete_sliders.h
     ui/widgets/gradient_round_button.cpp
     ui/widgets/gradient_round_button.h
+    ui/widgets/level_meter.cpp
+    ui/widgets/level_meter.h
     ui/widgets/multi_select.cpp
     ui/widgets/multi_select.h
     ui/widgets/sent_code_field.cpp

From 5433f95eda3f55248cfcf998b72ff2ad2bfacb5f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 16 Apr 2024 02:26:37 +0300
Subject: [PATCH 296/596] Simplified creation of label with custom emoji.

---
 Telegram/CMakeLists.txt                       |  2 +
 .../SourceFiles/boxes/gift_premium_box.cpp    | 43 +++++-----
 .../earn/info_earn_inner_widget.cpp           | 79 +++++++++----------
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 42 ++++------
 .../ui/widgets/label_with_custom_emoji.cpp    | 32 ++++++++
 .../ui/widgets/label_with_custom_emoji.h      | 35 ++++++++
 6 files changed, 143 insertions(+), 90 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp
 create mode 100644 Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 0a6ed8663..c99cd34b5 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1474,6 +1474,8 @@ PRIVATE
     ui/search_field_controller.h
     ui/text/format_song_document_name.cpp
     ui/text/format_song_document_name.h
+    ui/widgets/label_with_custom_emoji.cpp
+    ui/widgets/label_with_custom_emoji.h
     ui/unread_badge.cpp
     ui/unread_badge.h
     window/main_window.cpp
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index b107af7c9..10ad9409d 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -16,7 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/prepare_short_info_box.h"
 #include "boxes/peers/replace_boost_box.h" // BoostsForGift.
 #include "boxes/premium_preview_box.h" // ShowPremiumPreviewBox.
-#include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_boosts.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
@@ -48,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/gradient_round_button.h"
+#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/table_layout.h"
@@ -319,21 +319,20 @@ void GiftBox(
 			std::move(titleLabel)),
 		st::premiumGiftTitlePadding);
 
-	auto textLabel = object_ptr<Ui::FlatLabel>(box, st::premiumPreviewAbout);
-	tr::lng_premium_gift_about(
-		lt_user,
-		user->session().changes().peerFlagsValue(
-			user,
-			Data::PeerUpdate::Flag::Name
-		) | rpl::map([=] { return TextWithEntities{ user->firstName }; }),
-		Ui::Text::RichLangValue
-	) | rpl::map(
-		BoostsForGiftText({ user })
-	) | rpl::start_with_next([
-			raw = textLabel.data(),
-			session = &user->session()](const TextWithEntities &t) {
-		raw->setMarkedText(t, Core::MarkedTextContext{ .session = session });
-	}, textLabel->lifetime());
+	auto textLabel = Ui::CreateLabelWithCustomEmoji(
+		box,
+		tr::lng_premium_gift_about(
+			lt_user,
+			user->session().changes().peerFlagsValue(
+				user,
+				Data::PeerUpdate::Flag::Name
+			) | rpl::map([=] { return TextWithEntities{ user->firstName }; }),
+			Ui::Text::RichLangValue
+		) | rpl::map(
+			BoostsForGiftText({ user })
+		),
+		{ .session = &user->session() },
+		st::premiumPreviewAbout);
 	textLabel->setTextColorOverride(stTitle.textFg->c);
 	textLabel->resizeToWidth(available);
 	box->addRow(
@@ -536,14 +535,12 @@ void GiftsBox(
 		const auto label = box->addRow(
 			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
 				box,
-				object_ptr<Ui::FlatLabel>(box, st::premiumPreviewAbout)),
+				Ui::CreateLabelWithCustomEmoji(
+					box,
+					std::move(text),
+					{ .session = session },
+					st::premiumPreviewAbout)),
 			padding)->entity();
-		std::move(
-			text
-		) | rpl::start_with_next([=](const TextWithEntities &t) {
-			using namespace Core;
-			label->setMarkedText(t, MarkedTextContext{ .session = session });
-		}, label->lifetime());
 		label->setTextColorOverride(stTitle.textFg->c);
 		label->resizeToWidth(available);
 	}
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index 80e377e1e..ad1155b89 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/edit_peer_color_box.h" // AddLevelBadge.
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/application.h"
-#include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_channel.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
@@ -31,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "statistics/chart_widget.h"
 #include "ui/basic_click_handlers.h"
+#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/boxes/boost_box.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/animation_value_f.h"
@@ -334,23 +334,21 @@ void InnerWidget::fill() {
 			st::channelEarnLearnArrowMargins,
 			false));
 	const auto addAboutWithLearn = [&](const tr::phrase<lngtag_link> &text) {
-		auto label = object_ptr<Ui::FlatLabel>(
+		auto label = Ui::CreateLabelWithCustomEmoji(
 			container,
-			st::boxDividerLabel);
-		const auto raw = label.data();
-		text(
-			lt_link,
-			tr::lng_channel_earn_about_link(
-				lt_emoji,
-				rpl::single(arrow),
+			text(
+				lt_link,
+				tr::lng_channel_earn_about_link(
+					lt_emoji,
+					rpl::single(arrow),
+					Ui::Text::RichLangValue
+				) | rpl::map([](TextWithEntities text) {
+					return Ui::Text::Link(std::move(text), 1);
+				}),
 				Ui::Text::RichLangValue
-			) | rpl::map([](TextWithEntities text) {
-				return Ui::Text::Link(std::move(text), 1);
-			}),
-			Ui::Text::RichLangValue
-		) | rpl::start_with_next([=](const TextWithEntities &text) {
-			raw->setMarkedText(text, makeContext(raw));
-		}, label->lifetime());
+			),
+			{ .session = session },
+			st::boxDividerLabel);
 		label->setLink(1, std::make_shared<LambdaClickHandler>([=] {
 			_show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
 				box->setNoContentMargin(true);
@@ -454,17 +452,16 @@ void InnerWidget::fill() {
 					const auto l = box->addRow(
 						object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
 							content,
-							object_ptr<Ui::FlatLabel>(
+							Ui::CreateLabelWithCustomEmoji(
 								content,
+								tr::lng_channel_earn_learn_coin_title(
+									lt_emoji,
+									rpl::single(
+										Ui::Text::Link(bigCurrencyIcon, 1)),
+									Ui::Text::RichLangValue
+								),
+								{ .session = session },
 								st::boxTitle)))->entity();
-					tr::lng_channel_earn_learn_coin_title(
-						lt_emoji,
-						rpl::single(
-							Ui::Text::Link(bigCurrencyIcon, 1)),
-						Ui::Text::RichLangValue
-					) | rpl::start_with_next([=](TextWithEntities t) {
-						l->setMarkedText(std::move(t), makeContext(l));
-					}, l->lifetime());
 					const auto diamonds = l->lifetime().make_state<int>(0);
 					l->setLink(1, std::make_shared<LambdaClickHandler>([=] {
 						const auto count = (*diamonds);
@@ -480,25 +477,23 @@ void InnerWidget::fill() {
 				Ui::AddSkip(content);
 				{
 					const auto label = box->addRow(
-						object_ptr<Ui::FlatLabel>(
+						Ui::CreateLabelWithCustomEmoji(
 							content,
+							tr::lng_channel_earn_learn_coin_about(
+								lt_link,
+								tr::lng_channel_earn_about_link(
+									lt_emoji,
+									rpl::single(arrow),
+									Ui::Text::RichLangValue
+								) | rpl::map([](TextWithEntities text) {
+									return Ui::Text::Link(std::move(text), 1);
+								}),
+								Ui::Text::RichLangValue
+							),
+							{ .session = session },
 							st::channelEarnLearnDescription));
-					tr::lng_channel_earn_learn_coin_about(
-						lt_link,
-						tr::lng_channel_earn_about_link(
-							lt_emoji,
-							rpl::single(arrow),
-							Ui::Text::RichLangValue
-						) | rpl::map([](TextWithEntities text) {
-							return Ui::Text::Link(std::move(text), 1);
-						}),
-						Ui::Text::RichLangValue
-					) | rpl::start_with_next([=, l = label](
-							TextWithEntities t) {
-						l->setMarkedText(std::move(t), makeContext(l));
-						l->resizeToWidth(box->width()
-							- rect::m::sum::h(st::boxRowPadding));
-					}, label->lifetime());
+					label->resizeToWidth(box->width()
+						- rect::m::sum::h(st::boxRowPadding));
 					label->setLink(
 						1,
 						LearnMoreCurrencyLink(
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 153bb46bd..e917c3f07 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "boxes/premium_preview_box.h"
 #include "chat_helpers/compose/compose_show.h"
-#include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/components/sponsored_messages.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
@@ -25,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/label_with_custom_emoji.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
@@ -169,31 +169,23 @@ void AboutBox(
 				st::topicButtonArrow,
 				st::channelEarnLearnArrowMargins,
 				false));
-		const auto label = box->addRow(
-			object_ptr<Ui::FlatLabel>(
+		const auto available = box->width()
+			- rect::m::sum::h(st::boxRowPadding);
+		box->addRow(
+			Ui::CreateLabelWithCustomEmoji(
 				content,
-				st::channelEarnLearnDescription));
-		tr::lng_sponsored_revenued_footer_description(
-			lt_link,
-			tr::lng_channel_earn_about_link(
-				lt_emoji,
-				rpl::single(arrow),
-				Ui::Text::RichLangValue
-			) | rpl::map([=](TextWithEntities text) {
-				return Ui::Text::Link(std::move(text), kUrl.utf16());
-			}),
-			Ui::Text::RichLangValue
-		) | rpl::start_with_next([=, l = label](
-				TextWithEntities t) {
-			l->setMarkedText(
-				std::move(t),
-				Core::MarkedTextContext{
-					.session = session,
-					.customEmojiRepaint = [=] { l->update(); },
-				});
-			l->resizeToWidth(box->width()
-				- rect::m::sum::h(st::boxRowPadding));
-		}, label->lifetime());
+				tr::lng_sponsored_revenued_footer_description(
+					lt_link,
+					tr::lng_channel_earn_about_link(
+						lt_emoji,
+						rpl::single(arrow),
+						Ui::Text::RichLangValue
+					) | rpl::map([=](TextWithEntities text) {
+						return Ui::Text::Link(std::move(text), kUrl.utf16());
+					}),
+					Ui::Text::RichLangValue),
+				{ .session = session },
+				st::channelEarnLearnDescription))->resizeToWidth(available);
 	}
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
diff --git a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp b/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp
new file mode 100644
index 000000000..4502d6553
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp
@@ -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
+*/
+#include "ui/widgets/label_with_custom_emoji.h"
+
+#include "core/ui_integration.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_widgets.h"
+
+namespace Ui {
+
+object_ptr<Ui::FlatLabel> CreateLabelWithCustomEmoji(
+		QWidget *parent,
+		rpl::producer<TextWithEntities> &&text,
+		Core::MarkedTextContext context,
+		const style::FlatLabel &st) {
+	auto label = object_ptr<Ui::FlatLabel>(parent, st);
+	const auto raw = label.data();
+	if (!context.customEmojiRepaint) {
+		context.customEmojiRepaint = [=] { raw->update(); };
+	}
+	std::move(text) | rpl::start_with_next([=](const TextWithEntities &text) {
+		raw->setMarkedText(text, context);
+	}, label->lifetime());
+	return label;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h b/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h
new file mode 100644
index 000000000..f22e4e801
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h
@@ -0,0 +1,35 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "core/ui_integration.h" // Core::MarkedTextContext.
+
+template <typename Object>
+class object_ptr;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace style {
+struct FlatLabel;
+} // namespace style
+
+namespace Ui {
+class FlatLabel;
+} // namespace Ui
+
+namespace Ui {
+
+[[nodiscard]] object_ptr<Ui::FlatLabel> CreateLabelWithCustomEmoji(
+	QWidget *parent,
+	rpl::producer<TextWithEntities> &&text,
+	Core::MarkedTextContext context,
+	const style::FlatLabel &st);
+
+} // namespace Ui

From a3e593b747fff5e889e176bc3264c30b01caf998 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 19:32:07 +0400
Subject: [PATCH 297/596] Fix crash in scheduled messages tear-down.

---
 .../SourceFiles/data/components/scheduled_messages.cpp   | 9 ++++++++-
 .../SourceFiles/data/components/scheduled_messages.h     | 2 ++
 Telegram/SourceFiles/data/data_session.cpp               | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/components/scheduled_messages.cpp b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
index c7e2daddc..92e0da880 100644
--- a/Telegram/SourceFiles/data/components/scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
@@ -113,9 +113,16 @@ ScheduledMessages::ScheduledMessages(not_null<Main::Session*> session)
 }
 
 ScheduledMessages::~ScheduledMessages() {
-	for (const auto &request : _requests) {
+	Expects(_data.empty());
+	Expects(_requests.empty());
+}
+
+void ScheduledMessages::clear() {
+	_lifetime.destroy();
+	for (const auto &request : base::take(_requests)) {
 		_session->api().request(request.second.requestId).cancel();
 	}
+	base::take(_data);
 }
 
 void ScheduledMessages::clearOldRequests() {
diff --git a/Telegram/SourceFiles/data/components/scheduled_messages.h b/Telegram/SourceFiles/data/components/scheduled_messages.h
index f1c568d92..90d5b0415 100644
--- a/Telegram/SourceFiles/data/components/scheduled_messages.h
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.h
@@ -55,6 +55,8 @@ public:
 	[[nodiscard]] Data::MessagesSlice list(
 		not_null<const Data::ForumTopic*> topic) const;
 
+	void clear();
+
 private:
 	using OwnedItem = std::unique_ptr<HistoryItem, HistoryItem::Destroyer>;
 	struct List {
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index ed165a0c9..22cea37db 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/business/data_business_chatbots.h"
 #include "data/business/data_business_info.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/scheduled_messages.h"
 #include "data/stickers/data_stickers.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_bot_app.h"
@@ -394,6 +395,7 @@ void Session::clear() {
 
 	_histories->unloadAll();
 	_shortcutMessages = nullptr;
+	_session->scheduledMessages().clear();
 	_dependentMessages.clear();
 	base::take(_messages);
 	base::take(_nonChannelMessages);

From 849ce310c4a577e39b64e408c86f1eb07ad09654 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 12:42:08 +0400
Subject: [PATCH 298/596] Jump by keyboard between time input fields.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 2385fb30b..372543de6 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 2385fb30b5e13d3806e3aa6db489ef801e77b89b
+Subproject commit 372543de6e8f4f7a552634e620c50a1ec01b3979

From abcf55c4987cd494bd0ab95ca7288e7d48f26690 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 11:31:38 +0400
Subject: [PATCH 299/596] Check chat background read result.

---
 Telegram/SourceFiles/ui/chat/chat_theme.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index 1022f8e56..4979e5c4a 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -909,12 +909,17 @@ QImage PrepareImageForTiled(const QImage &prepared) {
 		const QString &path,
 		const QByteArray &content,
 		bool gzipSvg) {
-	return Images::Read({
+	auto result = Images::Read({
 		.path = path,
 		.content = content,
 		.maxSize = QSize(kMaxSize, kMaxSize),
 		.gzipSvg = gzipSvg,
 	}).image;
+	if (result.isNull()) {
+		result = QImage(1, 1, QImage::Format_ARGB32_Premultiplied);
+		result.fill(Qt::black);
+	}
+	return result;
 }
 
 QImage GenerateBackgroundImage(

From 49c9e08b6ce251d172cbe5afaaad5a76a69301e4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 12:49:10 +0400
Subject: [PATCH 300/596] Enforce video/audio extension by mime type.

---
 Telegram/SourceFiles/data/data_document.cpp | 22 +++++++++++++++++++--
 Telegram/SourceFiles/data/data_document.h   |  1 +
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 2bf1a0104..9c25a7861 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -484,13 +484,13 @@ void DocumentData::setattributes(
 			|| type == AnimatedDocument
 			|| type == RoundVideoDocument
 			|| isAnimation()) {
-			if (_nameType != Type::Video) {
+			if (!enforceNameType(Type::Video)) {
 				type = FileDocument;
 				_additional = nullptr;
 			}
 		}
 		if (type == SongDocument || type == VoiceDocument || isAudioFile()) {
-			if (_nameType != Type::Audio) {
+			if (!enforceNameType(Type::Audio)) {
 				type = FileDocument;
 				_additional = nullptr;
 			}
@@ -951,6 +951,24 @@ void DocumentData::setFileName(const QString &remoteFileName) {
 	_nameType = Core::DetectNameType(_filename);
 }
 
+bool DocumentData::enforceNameType(Core::NameType nameType) {
+	if (_nameType == nameType) {
+		return true;
+	}
+	const auto base = _filename.isEmpty() ? u"file"_q : _filename;
+	const auto mime = Core::MimeTypeForName(mimeString());
+	const auto patterns = mime.globPatterns();
+	for (const auto &pattern : mime.globPatterns()) {
+		const auto now = base + QString(pattern).replace('*', QString());
+		if (Core::DetectNameType(now) == nameType) {
+			_filename = now;
+			_nameType = nameType;
+			return true;
+		}
+	}
+	return false;
+}
+
 void DocumentData::setLoadedInMediaCacheLocation() {
 	_location = Core::FileLocation();
 	_flags |= Flag::LoadedInMediaCache;
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index 299a6caf1..47237b3c4 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -341,6 +341,7 @@ private:
 	void setMaybeSupportsStreaming(bool supports);
 	void setLoadedInMediaCacheLocation();
 	void setFileName(const QString &remoteFileName);
+	bool enforceNameType(Core::NameType nameType);
 
 	void finishLoad();
 	void handleLoaderUpdates();

From fe73bf905384712dcbbb03af3eceb359a7c09db0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 12:49:23 +0400
Subject: [PATCH 301/596] Fix ripples in channel comments buttons.

---
 .../history/view/history_view_message.cpp     | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 2a7ee708d..67f10c033 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1843,27 +1843,27 @@ void Message::clickHandlerPressedChanged(
 	Element::clickHandlerPressedChanged(handler, pressed);
 	if (!handler) {
 		return;
-	} else if (_rightAction) {
-		if (_rightAction->second && (handler == _rightAction->second->link)) {
-			const auto rightSize = rightActionSize();
-			Assert(rightSize != std::nullopt);
-			if (pressed) {
-				if (!_rightAction->second->ripple) {
-					// Create a ripple.
-					_rightAction->second->ripple
-						= std::make_unique<Ui::RippleAnimation>(
-							st::defaultRippleAnimation,
-							Ui::RippleAnimation::RoundRectMask(
-								Size(rightSize->width()),
-								rightSize->width() / 2),
-							[=] { repaint(); });
-				}
-				_rightAction->second->ripple->add(_rightAction->lastPoint);
-			} else if (_rightAction->second->ripple) {
-				_rightAction->second->ripple->lastStop();
+	} else if (_rightAction && (handler == _rightAction->link)) {
+		toggleRightActionRipple(pressed);
+	} else if (_rightAction
+		&& _rightAction->second
+		&& (handler == _rightAction->second->link)) {
+		const auto rightSize = rightActionSize();
+		Assert(rightSize != std::nullopt);
+		if (pressed) {
+			if (!_rightAction->second->ripple) {
+				// Create a ripple.
+				_rightAction->second->ripple
+					= std::make_unique<Ui::RippleAnimation>(
+						st::defaultRippleAnimation,
+						Ui::RippleAnimation::RoundRectMask(
+							Size(rightSize->width()),
+							rightSize->width() / 2),
+						[=] { repaint(); });
 			}
-		} else if (handler == _rightAction->link) {
-			toggleRightActionRipple(pressed);
+			_rightAction->second->ripple->add(_rightAction->lastPoint);
+		} else if (_rightAction->second->ripple) {
+			_rightAction->second->ripple->lastStop();
 		}
 	} else if (_comments && (handler == _comments->link)) {
 		toggleCommentsButtonRipple(pressed);

From a0d7d07543e926e382b247e89de18558b6a2ab9d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 20:15:32 +0400
Subject: [PATCH 302/596] Version 4.16.8.

- Fix in-app playing of some video and audio files.
- Fix crash on Linux opening chats with custom backgrounds.
- Fix crash on quit after using scheduled messages.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 1c4a9794d..734a63bc4 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.7.0" />
+    Version="4.16.8.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index a24bbed32..0ba1f8021 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 4,16,7,0
- PRODUCTVERSION 4,16,7,0
+ FILEVERSION 4,16,8,0
+ PRODUCTVERSION 4,16,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", "4.16.7.0"
+            VALUE "FileVersion", "4.16.8.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.7.0"
+            VALUE "ProductVersion", "4.16.8.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 96049776c..fa13de062 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 4,16,7,0
- PRODUCTVERSION 4,16,7,0
+ FILEVERSION 4,16,8,0
+ PRODUCTVERSION 4,16,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", "4.16.7.0"
+            VALUE "FileVersion", "4.16.8.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.7.0"
+            VALUE "ProductVersion", "4.16.8.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index c6f36ac7f..b27f5c045 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 = 4016007;
-constexpr auto AppVersionStr = "4.16.7";
+constexpr auto AppVersion = 4016008;
+constexpr auto AppVersionStr = "4.16.8";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 58add7e50..2b788edea 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016007
+AppVersion         4016008
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.7
-AppVersionStr      4.16.7
+AppVersionStrSmall 4.16.8
+AppVersionStr      4.16.8
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.16.7
+AppVersionOriginal 4.16.8
diff --git a/changelog.txt b/changelog.txt
index 6100f1afa..d6905d010 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+4.16.8 (16.04.24)
+
+- Fix in-app playing of some video and audio files.
+- Fix crash on Linux opening chats with custom backgrounds.
+- Fix crash on quit after using scheduled messages.
+
 4.16.7 (15.04.24)
 
 - Reimplement file open confirmations.

From ec95db094561ddc3a873993bab290bb022080dca Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 23:00:08 +0400
Subject: [PATCH 303/596] Revert "Replace mozjpeg with jpegli in Docker"

This reverts commit a1e2e3d011ad32413833a665447b23b955c2495e.
---
 Telegram/build/docker/centos_env/Dockerfile | 26 ++++++++++++++-------
 cmake                                       |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 28d1095d5..964684ab8 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -132,6 +132,19 @@ RUN git clone -b 1.0.7 --depth=1 {{ GIT }}/google/highway.git \
 	&& cd .. \
 	&& rm -rf highway
 
+FROM builder AS mozjpeg
+RUN git clone -b v4.1.4 --depth=1 {{ GIT }}/mozilla/mozjpeg.git \
+	&& cd mozjpeg \
+	&& cmake -GNinja -B build . \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr/local \
+		-DWITH_JPEG8=ON \
+		-DPNG_SUPPORTED=OFF \
+	&& cmake --build build --parallel \
+	&& DESTDIR="{{ LibrariesPath }}/mozjpeg-cache" cmake --install build \
+	&& cd .. \
+	&& rm -rf mozjpeg
+
 FROM builder AS opus
 RUN git clone -b v1.4 --depth=1 {{ GIT }}/xiph/opus.git \
 	&& cd opus \
@@ -252,14 +265,13 @@ COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
 
 RUN git clone -b v0.10.2 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 	&& cd libjxl \
-	&& git submodule update --init --recursive --depth=1 third_party/libjpeg-turbo \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \
 		-DBUILD_SHARED_LIBS=OFF \
 		-DBUILD_TESTING=OFF \
 		-DJPEGXL_ENABLE_DEVTOOLS=OFF \
 		-DJPEGXL_ENABLE_TOOLS=OFF \
-		-DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON \
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF \
 		-DJPEGXL_ENABLE_DOXYGEN=OFF \
 		-DJPEGXL_ENABLE_MANPAGES=OFF \
 		-DJPEGXL_ENABLE_BENCHMARK=OFF \
@@ -269,10 +281,7 @@ RUN git clone -b v0.10.2 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 		-DJPEGXL_ENABLE_OPENEXR=OFF \
 		-DJPEGXL_ENABLE_SKCMS=OFF \
 	&& cmake --build build --parallel \
-	&& export DESTDIR="{{ LibrariesPath }}/libjxl-cache" \
-	&& cmake --install build \
-	&& cp build/lib/libjpegli-static.a $DESTDIR/usr/local/lib64/libjpeg.a \
-	&& ar rcs $DESTDIR/usr/local/lib64/libjpeg.a build/lib/CMakeFiles/jpegli-libjpeg-obj.dir/jpegli/libjpeg_wrapper.cc.o \
+	&& DESTDIR="{{ LibrariesPath }}/libjxl-cache" cmake --install build \
 	&& cd .. \
 	&& rm -rf libjxl
 
@@ -695,7 +704,7 @@ RUN git clone -b 1.78.1 --depth=1 {{ GIT }}/GNOME/gobject-introspection.git \
 FROM patches AS qt
 COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
 COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
-COPY --link --from=libjxl {{ LibrariesPath }}/libjxl-cache /
+COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
 COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
 COPY --link --from=xcb-wm {{ LibrariesPath }}/xcb-wm-cache /
 COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
@@ -748,9 +757,9 @@ RUN git clone -b v2023.06.01 --depth=1 https://chromium.googlesource.com/breakpa
 	&& rm -rf breakpad
 
 FROM builder AS webrtc
+COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
 COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
 COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache /
-COPY --link --from=libjxl {{ LibrariesPath }}/libjxl-cache /
 COPY --link --from=ffmpeg {{ LibrariesPath }}/ffmpeg-cache /
 COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
 COPY --link --from=libXtst {{ LibrariesPath }}/libXtst-cache /
@@ -796,6 +805,7 @@ COPY --link --from=protobuf {{ LibrariesPath }}/protobuf-cache /
 COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
 COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
 COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
+COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
 COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
 COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
 COPY --link --from=libde265 {{ LibrariesPath }}/libde265-cache /
diff --git a/cmake b/cmake
index 621b01ec9..bf157ab03 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 621b01ec9bd7f953223147daf59ab4c850cb3c40
+Subproject commit bf157ab03f3d07c3822dcdd3e3f90a8e4ccb7d66

From 566b53ce9f7432fd14617727ea47d54d5b437c16 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 23:22:43 +0400
Subject: [PATCH 304/596] Revert "Clean remainings of mozjpeg in snapcraft.yml"

This reverts commit da1909cc1d88dd9be294ebddb12c24b623ba6319.
---
 snap/snapcraft.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c95d0ab94..0d79929de 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -154,6 +154,8 @@ parts:
     override-build: |
       craftctl default
       rm -rf "$CRAFT_PART_INSTALL/usr/share/icons"
+    stage:
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
     after:
       - ffmpeg
       - libjxl
@@ -207,6 +209,8 @@ parts:
         fi
       done
       GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
+    stage:
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
     after:
       - telegram
 
@@ -435,6 +439,8 @@ parts:
 
       cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
       DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
+    stage:
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
     prime:
       - -./usr/bin
       - -./usr/doc

From bb0280f09685325b917fbae2d42931f5b68a29a5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 23:22:55 +0400
Subject: [PATCH 305/596] Revert "Replace mozjpeg with jpegli in snap"

This reverts commit f57e2edf2af61a285ad70ebe7a63a7bac95ba4c6.
---
 snap/snapcraft.yaml | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 0d79929de..8a122ab95 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -131,7 +131,6 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
       - -DTDESKTOP_API_ID=611335
       - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
       - -DDESKTOP_APP_USE_PACKAGED_LAZY=ON
@@ -159,6 +158,7 @@ parts:
     after:
       - ffmpeg
       - libjxl
+      - mozjpeg
       - openal
       - protobuf
       - qt
@@ -238,6 +238,10 @@ parts:
       rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas"
       mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
       rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
+    stage:
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
+    after:
+      - mozjpeg
 
   libjxl:
     source: https://github.com/libjxl/libjxl.git
@@ -253,7 +257,7 @@ parts:
       - -DBUILD_TESTING=OFF
       - -DJPEGXL_ENABLE_DEVTOOLS=OFF
       - -DJPEGXL_ENABLE_TOOLS=OFF
-      - -DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON
+      - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
       - -DJPEGXL_ENABLE_DOXYGEN=OFF
       - -DJPEGXL_ENABLE_MANPAGES=OFF
       - -DJPEGXL_ENABLE_BENCHMARK=OFF
@@ -272,6 +276,27 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
       - -./usr/share
 
+  mozjpeg:
+    source: https://github.com/mozilla/mozjpeg.git
+    source-depth: 1
+    source-tag: v4.1.4
+    plugin: cmake
+    build-environment:
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
+    cmake-generator: Ninja
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DENABLE_STATIC=OFF
+      - -DWITH_JPEG8=ON
+      - -DPNG_SUPPORTED=OFF
+    prime:
+      - -./usr/bin
+      - -./usr/include
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
+      - -./usr/share
+
   openal:
     source: https://github.com/kcat/openal-soft.git
     source-depth: 1
@@ -433,9 +458,7 @@ parts:
         -confirm-license \
         -openssl-linked \
         -nomake examples \
-        -nomake tests \
-        -- \
-        -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
+        -nomake tests
 
       cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
       DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
@@ -456,7 +479,7 @@ parts:
       - -./usr/mkspecs
       - -./usr/modules
     after:
-      - libjxl
+      - mozjpeg
       - patches
 
   rnnoise:
@@ -536,11 +559,10 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
     prime:
       - -./usr/include
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
     after:
       - ffmpeg
-      - libjxl
+      - mozjpeg

From 78c8d0562b783403ffe772f149c6cb202c3e0196 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 23:23:11 +0400
Subject: [PATCH 306/596] Version 4.16.8: Fix build on Linux.

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

diff --git a/cmake b/cmake
index bf157ab03..4ec493812 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit bf157ab03f3d07c3822dcdd3e3f90a8e4ccb7d66
+Subproject commit 4ec493812d25de1eccfedccc49a23c15d032b118

From cb5fdac0da0cb063fe3978a4220eca16a328a17d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 9 Apr 2024 23:41:01 +0400
Subject: [PATCH 307/596] Replace mozjpeg with jpegli on Linux

---
 Telegram/build/docker/centos_env/Dockerfile | 31 +++++--------
 cmake                                       |  2 +-
 snap/snapcraft.yaml                         | 51 ++++++---------------
 3 files changed, 26 insertions(+), 58 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 964684ab8..16ae4b5d4 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin b8e22ca1511513024b22b5381153163ad3406a8c \
+	&& git fetch --depth=1 origin f81dfc6f7061d7f70c7e952cee9c1c2689f937a2 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
@@ -132,19 +132,6 @@ RUN git clone -b 1.0.7 --depth=1 {{ GIT }}/google/highway.git \
 	&& cd .. \
 	&& rm -rf highway
 
-FROM builder AS mozjpeg
-RUN git clone -b v4.1.4 --depth=1 {{ GIT }}/mozilla/mozjpeg.git \
-	&& cd mozjpeg \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr/local \
-		-DWITH_JPEG8=ON \
-		-DPNG_SUPPORTED=OFF \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/mozjpeg-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf mozjpeg
-
 FROM builder AS opus
 RUN git clone -b v1.4 --depth=1 {{ GIT }}/xiph/opus.git \
 	&& cd opus \
@@ -258,20 +245,22 @@ RUN git clone -b v1.17.6 --depth=1 {{ GIT }}/strukturag/libheif.git \
 	&& cd .. \
 	&& rm -rf libheif
 
-FROM builder AS libjxl
+FROM patches AS libjxl
 COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
 COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
 COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
 
 RUN git clone -b v0.10.2 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 	&& cd libjxl \
+	&& git apply ../patches/libjxl.patch \
+	&& git submodule update --init --recursive --depth=1 third_party/libjpeg-turbo \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \
 		-DBUILD_SHARED_LIBS=OFF \
 		-DBUILD_TESTING=OFF \
 		-DJPEGXL_ENABLE_DEVTOOLS=OFF \
 		-DJPEGXL_ENABLE_TOOLS=OFF \
-		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF \
+		-DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON \
 		-DJPEGXL_ENABLE_DOXYGEN=OFF \
 		-DJPEGXL_ENABLE_MANPAGES=OFF \
 		-DJPEGXL_ENABLE_BENCHMARK=OFF \
@@ -281,7 +270,10 @@ RUN git clone -b v0.10.2 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 		-DJPEGXL_ENABLE_OPENEXR=OFF \
 		-DJPEGXL_ENABLE_SKCMS=OFF \
 	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/libjxl-cache" cmake --install build \
+	&& export DESTDIR="{{ LibrariesPath }}/libjxl-cache" \
+	&& cmake --install build \
+	&& cp build/lib/libjpegli-static.a $DESTDIR/usr/local/lib64/libjpeg.a \
+	&& ar rcs $DESTDIR/usr/local/lib64/libjpeg.a build/lib/CMakeFiles/jpegli-libjpeg-obj.dir/jpegli/libjpeg_wrapper.cc.o \
 	&& cd .. \
 	&& rm -rf libjxl
 
@@ -704,7 +696,7 @@ RUN git clone -b 1.78.1 --depth=1 {{ GIT }}/GNOME/gobject-introspection.git \
 FROM patches AS qt
 COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
 COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
-COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
+COPY --link --from=libjxl {{ LibrariesPath }}/libjxl-cache /
 COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
 COPY --link --from=xcb-wm {{ LibrariesPath }}/xcb-wm-cache /
 COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
@@ -757,9 +749,9 @@ RUN git clone -b v2023.06.01 --depth=1 https://chromium.googlesource.com/breakpa
 	&& rm -rf breakpad
 
 FROM builder AS webrtc
-COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
 COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
 COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache /
+COPY --link --from=libjxl {{ LibrariesPath }}/libjxl-cache /
 COPY --link --from=ffmpeg {{ LibrariesPath }}/ffmpeg-cache /
 COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
 COPY --link --from=libXtst {{ LibrariesPath }}/libXtst-cache /
@@ -805,7 +797,6 @@ COPY --link --from=protobuf {{ LibrariesPath }}/protobuf-cache /
 COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
 COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
 COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
-COPY --link --from=mozjpeg {{ LibrariesPath }}/mozjpeg-cache /
 COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
 COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
 COPY --link --from=libde265 {{ LibrariesPath }}/libde265-cache /
diff --git a/cmake b/cmake
index 4ec493812..621b01ec9 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 4ec493812d25de1eccfedccc49a23c15d032b118
+Subproject commit 621b01ec9bd7f953223147daf59ab4c850cb3c40
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8a122ab95..af58384fb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -131,6 +131,7 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
       - -DTDESKTOP_API_ID=611335
       - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
       - -DDESKTOP_APP_USE_PACKAGED_LAZY=ON
@@ -153,12 +154,9 @@ parts:
     override-build: |
       craftctl default
       rm -rf "$CRAFT_PART_INSTALL/usr/share/icons"
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
     after:
       - ffmpeg
       - libjxl
-      - mozjpeg
       - openal
       - protobuf
       - qt
@@ -168,7 +166,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: b8e22ca1511513024b22b5381153163ad3406a8c
+    source-commit: f81dfc6f7061d7f70c7e952cee9c1c2689f937a2
     plugin: dump
     override-pull: |
       craftctl default
@@ -209,8 +207,6 @@ parts:
         fi
       done
       GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
     after:
       - telegram
 
@@ -238,10 +234,6 @@ parts:
       rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas"
       mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
       rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
-    after:
-      - mozjpeg
 
   libjxl:
     source: https://github.com/libjxl/libjxl.git
@@ -257,7 +249,7 @@ parts:
       - -DBUILD_TESTING=OFF
       - -DJPEGXL_ENABLE_DEVTOOLS=OFF
       - -DJPEGXL_ENABLE_TOOLS=OFF
-      - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+      - -DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON
       - -DJPEGXL_ENABLE_DOXYGEN=OFF
       - -DJPEGXL_ENABLE_MANPAGES=OFF
       - -DJPEGXL_ENABLE_BENCHMARK=OFF
@@ -266,6 +258,9 @@ parts:
       - -DJPEGXL_ENABLE_SJPEG=OFF
       - -DJPEGXL_ENABLE_OPENEXR=OFF
       - -DJPEGXL_ENABLE_SKCMS=OFF
+    override-pull: |
+      craftctl default
+      git apply $CRAFT_STAGE/patches/libjxl.patch
     stage:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libbrotli*
     prime:
@@ -275,27 +270,8 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
       - -./usr/share
-
-  mozjpeg:
-    source: https://github.com/mozilla/mozjpeg.git
-    source-depth: 1
-    source-tag: v4.1.4
-    plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    cmake-generator: Ninja
-    cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DENABLE_STATIC=OFF
-      - -DWITH_JPEG8=ON
-      - -DPNG_SUPPORTED=OFF
-    prime:
-      - -./usr/bin
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-      - -./usr/share
+    after:
+      - patches
 
   openal:
     source: https://github.com/kcat/openal-soft.git
@@ -458,12 +434,12 @@ parts:
         -confirm-license \
         -openssl-linked \
         -nomake examples \
-        -nomake tests
+        -nomake tests \
+        -- \
+        -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
 
       cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
       DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
     prime:
       - -./usr/bin
       - -./usr/doc
@@ -479,7 +455,7 @@ parts:
       - -./usr/mkspecs
       - -./usr/modules
     after:
-      - mozjpeg
+      - libjxl
       - patches
 
   rnnoise:
@@ -559,10 +535,11 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
     prime:
       - -./usr/include
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
     after:
       - ffmpeg
-      - mozjpeg
+      - libjxl

From 8d7845daa105b24de441ea695784ce983b1663b5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 18 Apr 2024 06:22:29 +0400
Subject: [PATCH 308/596] Use --shallow-submodules in Docker

---
 Telegram/build/docker/centos_env/Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 16ae4b5d4..2333305d7 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -77,7 +77,7 @@ RUN git clone -b v5.4.4 --depth=1 https://git.tukaani.org/xz.git \
 	&& rm -rf xz
 
 FROM builder AS protobuf
-RUN git clone -b v21.9 --depth=1 --recursive {{ GIT }}/protocolbuffers/protobuf.git \
+RUN git clone -b v21.9 --depth=1 --recursive --shallow-submodules {{ GIT }}/protocolbuffers/protobuf.git \
 	&& cd protobuf \
 	&& git init third_party/abseil-cpp \
 	&& cd third_party/abseil-cpp \
@@ -310,7 +310,7 @@ RUN git clone -b libxcb-1.16 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb.git \
 	&& rm -rf libxcb
 
 FROM builder AS xcb-wm
-RUN git clone -b xcb-util-wm-0.4.2 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/libxcb-wm.git \
+RUN git clone -b xcb-util-wm-0.4.2 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-wm.git \
 	&& cd libxcb-wm \
 	&& ./autogen.sh --enable-static \
 	&& make -j$(nproc) \
@@ -319,7 +319,7 @@ RUN git clone -b xcb-util-wm-0.4.2 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/l
 	&& rm -rf libxcb-wm
 
 FROM builder AS xcb-util
-RUN git clone -b xcb-util-0.4.1 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/libxcb-util.git \
+RUN git clone -b xcb-util-0.4.1 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-util.git \
 	&& cd libxcb-util \
 	&& ./autogen.sh --enable-static \
 	&& make -j$(nproc) \
@@ -330,7 +330,7 @@ RUN git clone -b xcb-util-0.4.1 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/libx
 FROM builder AS xcb-image
 COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
 
-RUN git clone -b xcb-util-image-0.4.1 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/libxcb-image.git \
+RUN git clone -b xcb-util-image-0.4.1 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-image.git \
 	&& cd libxcb-image \
 	&& ./autogen.sh --enable-static \
 	&& make -j$(nproc) \
@@ -339,7 +339,7 @@ RUN git clone -b xcb-util-image-0.4.1 --depth=1 --recursive {{ GIT_FREEDESKTOP }
 	&& rm -rf libxcb-image
 
 FROM builder AS xcb-keysyms
-RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/libxcb-keysyms.git \
+RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-keysyms.git \
 	&& cd libxcb-keysyms \
 	&& ./autogen.sh --enable-static \
 	&& make -j$(nproc) \
@@ -348,7 +348,7 @@ RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 --recursive {{ GIT_FREEDESKTOP
 	&& rm -rf libxcb-keysyms
 
 FROM builder AS xcb-render-util
-RUN git clone -b xcb-util-renderutil-0.3.10 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/libxcb-render-util.git \
+RUN git clone -b xcb-util-renderutil-0.3.10 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-render-util.git \
 	&& cd libxcb-render-util \
 	&& ./autogen.sh --enable-static \
 	&& make -j$(nproc) \
@@ -361,7 +361,7 @@ COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
 COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache /
 COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache /
 
-RUN git clone -b xcb-util-cursor-0.1.4 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/libxcb-cursor.git \
+RUN git clone -b xcb-util-cursor-0.1.4 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-cursor.git \
 	&& cd libxcb-cursor \
 	&& ./autogen.sh --enable-static \
 	&& make -j$(nproc) \

From 3510ca7184e791039a5c7807f4f4537756f7b050 Mon Sep 17 00:00:00 2001
From: Kolya <142352140+agl-1984@users.noreply.github.com>
Date: Thu, 18 Apr 2024 00:31:04 +0200
Subject: [PATCH 309/596] Don't use/link libsharpyuv in libavif

---
 Telegram/build/prepare/prepare.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index b2e59ef31..55a6cd795 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -812,7 +812,8 @@ mac:
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX \\
         -D BUILD_SHARED_LIBS=OFF \\
         -D AVIF_ENABLE_WERROR=OFF \\
-        -D AVIF_CODEC_DAV1D=ON
+        -D AVIF_CODEC_DAV1D=ON \\
+        -D CMAKE_DISABLE_FIND_PACKAGE_libsharpyuv=ON
     cmake --build . --config MinSizeRel $MAKE_THREADS_CNT
     cmake --install . --config MinSizeRel
 """)

From 01bfa467295684d6ca0943024ca848bddf7a1484 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 18 Apr 2024 04:02:40 +0300
Subject: [PATCH 310/596] Fixed display of default box for message schedule in
 correspond window.

---
 Telegram/SourceFiles/boxes/sticker_set_box.cpp             | 2 +-
 Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp   | 2 +-
 Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp     | 2 +-
 Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp | 2 +-
 .../view/controls/history_view_compose_controls.cpp        | 2 +-
 Telegram/SourceFiles/inline_bots/inline_results_inner.cpp  | 2 +-
 Telegram/SourceFiles/menu/menu_send.cpp                    | 7 +++----
 Telegram/SourceFiles/menu/menu_send.h                      | 3 ++-
 Telegram/SourceFiles/window/window_peer_menu.cpp           | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 88163356c..ac4555120 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -1032,7 +1032,7 @@ void StickerSetBox::Inner::contextMenuEvent(QContextMenuEvent *e) {
 			_menu.get(),
 			type,
 			SendMenu::DefaultSilentCallback(sendSelected),
-			SendMenu::DefaultScheduleCallback(this, type, sendSelected),
+			SendMenu::DefaultScheduleCallback(_show, type, sendSelected),
 			SendMenu::DefaultWhenOnlineCallback(sendSelected));
 
 		const auto show = _show;
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 9bc6e88f2..20f32f6e8 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -1379,7 +1379,7 @@ void FieldAutocomplete::Inner::contextMenuEvent(QContextMenuEvent *e) {
 		_menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(this, type, send),
+		SendMenu::DefaultScheduleCallback(_show, type, send),
 		SendMenu::DefaultWhenOnlineCallback(send));
 
 	if (!_menu->empty()) {
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 13cfda86d..72794de39 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -394,7 +394,7 @@ base::unique_qptr<Ui::PopupMenu> GifsListWidget::fillContextMenu(
 		menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(this, type, send),
+		SendMenu::DefaultScheduleCallback(_show, type, send),
 		SendMenu::DefaultWhenOnlineCallback(send),
 		icons);
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index a6a52f4be..42ea6b934 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -1654,7 +1654,7 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 		menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(this, type, send),
+		SendMenu::DefaultScheduleCallback(_show, type, send),
 		SendMenu::DefaultWhenOnlineCallback(send),
 		icons);
 
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 d47ee6ec1..dff29122c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2183,7 +2183,7 @@ void ComposeControls::initSendButton() {
 		_send.get(),
 		[=] { return sendButtonMenuType(); },
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(_wrap.get(), sendMenuType(), send),
+		SendMenu::DefaultScheduleCallback(_show, sendMenuType(), send),
 		SendMenu::DefaultWhenOnlineCallback(send));
 }
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index 0103789ec..5e45b3d4a 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -344,7 +344,7 @@ void Inner::contextMenuEvent(QContextMenuEvent *e) {
 		_menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(this, type, send),
+		SendMenu::DefaultScheduleCallback(_controller->uiShow(), type, send),
 		SendMenu::DefaultWhenOnlineCallback(send));
 
 	const auto item = _mosaic.itemAt(_selected);
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 02ab8ed4b..a31fcf103 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -34,12 +34,11 @@ Fn<void()> DefaultSilentCallback(Fn<void(Api::SendOptions)> send) {
 }
 
 Fn<void()> DefaultScheduleCallback(
-		not_null<Ui::RpWidget*> parent,
+		std::shared_ptr<Ui::Show> show,
 		Type type,
 		Fn<void(Api::SendOptions)> send) {
-	const auto weak = Ui::MakeWeak(parent);
-	return [=] {
-		Ui::show(
+	return [=, weak = Ui::MakeWeak(show->toastParent())] {
+		show->showBox(
 			HistoryView::PrepareScheduleBox(
 				weak,
 				type,
diff --git a/Telegram/SourceFiles/menu/menu_send.h b/Telegram/SourceFiles/menu/menu_send.h
index 79edc3840..03b7f7ec5 100644
--- a/Telegram/SourceFiles/menu/menu_send.h
+++ b/Telegram/SourceFiles/menu/menu_send.h
@@ -18,6 +18,7 @@ struct SendOptions;
 namespace Ui {
 class PopupMenu;
 class RpWidget;
+class Show;
 } // namespace Ui
 
 namespace Data {
@@ -41,7 +42,7 @@ enum class FillMenuResult {
 
 Fn<void()> DefaultSilentCallback(Fn<void(Api::SendOptions)> send);
 Fn<void()> DefaultScheduleCallback(
-	not_null<Ui::RpWidget*> parent,
+	std::shared_ptr<Ui::Show> show,
 	Type type,
 	Fn<void(Api::SendOptions)> send);
 Fn<void()> DefaultWhenOnlineCallback(Fn<void(Api::SendOptions)> send);
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 510902a15..2d3e2a663 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2046,7 +2046,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			state->menu.get(),
 			type,
 			SendMenu::DefaultSilentCallback(submit),
-			SendMenu::DefaultScheduleCallback(state->box, type, submit),
+			SendMenu::DefaultScheduleCallback(show, type, submit),
 			SendMenu::DefaultWhenOnlineCallback(submit));
 		const auto success = (result == SendMenu::FillMenuResult::Success);
 		if (showForwardOptions || success) {

From 4310c4978e8b68163b8b0d184a6cdd8011f3978a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 18 Apr 2024 22:21:13 +0400
Subject: [PATCH 311/596] Fix macOS packaged action

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

diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index 8ed4ffca1..d04b284de 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -49,7 +49,7 @@ jobs:
 
     env:
       GIT: "https://github.com"
-      OPENALDIR: "/usr/local/opt/openal-soft"
+      CMAKE_PREFIX_PATH: "/usr/local/opt/ffmpeg@6:/usr/local/opt/openal-soft"
       UPLOAD_ARTIFACT: "true"
       ONLY_CACHE: "false"
       MANUAL_CACHING: "1"
@@ -69,7 +69,7 @@ jobs:
         run: |
           brew update
           brew upgrade || true
-          brew install autoconf automake boost cmake ffmpeg openal-soft openssl opus ninja pkg-config python qt yasm xz
+          brew install autoconf automake boost cmake ffmpeg@6 openal-soft openssl opus ninja pkg-config python qt yasm xz
           sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
 
           xcodebuild -version > CACHE_KEY.txt

From 3d994b58a08c1b26dd845dbdba480a65dcd16b82 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 21 Apr 2024 01:20:59 +0400
Subject: [PATCH 312/596] ShowXDPOpenWithDialog -> UnsafeShowOpenWith

---
 Telegram/CMakeLists.txt                       |   2 -
 .../platform/linux/file_utilities_linux.cpp   | 119 ++++++++++++++++
 .../platform/linux/file_utilities_linux.h     |   6 -
 .../linux/linux_xdp_open_with_dialog.cpp      | 129 ------------------
 .../linux/linux_xdp_open_with_dialog.h        |  18 ---
 5 files changed, 119 insertions(+), 155 deletions(-)
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c99cd34b5..d0ea8561d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1202,8 +1202,6 @@ PRIVATE
     platform/linux/linux_wayland_integration_dummy.cpp
     platform/linux/linux_wayland_integration.cpp
     platform/linux/linux_wayland_integration.h
-    platform/linux/linux_xdp_open_with_dialog.cpp
-    platform/linux/linux_xdp_open_with_dialog.h
     platform/linux/file_utilities_linux.cpp
     platform/linux/file_utilities_linux.h
     platform/linux/launcher_linux.cpp
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index 2f9c0d9f9..d79e4778e 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -6,3 +6,122 @@ For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "platform/linux/file_utilities_linux.h"
+
+#include "base/platform/base_platform_info.h"
+#include "base/platform/linux/base_linux_xdp_utilities.h"
+#include "base/platform/linux/base_linux_xdg_activation_token.h"
+#include "base/random.h"
+
+#include <fcntl.h>
+#include <xdpopenuri/xdpopenuri.hpp>
+#include <xdprequest/xdprequest.hpp>
+
+namespace Platform {
+namespace File {
+namespace {
+
+using namespace gi::repository;
+using base::Platform::XdgActivationToken;
+
+} // namespace
+
+bool UnsafeShowOpenWith(const QString &filepath) {
+	auto proxy = XdpOpenURI::OpenURIProxy::new_for_bus_sync(
+		Gio::BusType::SESSION_,
+		Gio::DBusProxyFlags::NONE_,
+		base::Platform::XDP::kService,
+		base::Platform::XDP::kObjectPath,
+		nullptr);
+
+	if (!proxy) {
+		return false;
+	}
+
+	auto interface = XdpOpenURI::OpenURI(proxy);
+	if (interface.get_version() < 3) {
+		return false;
+	}
+
+	const auto fd = open(
+		QFile::encodeName(filepath).constData(),
+		O_RDONLY);
+
+	if (fd == -1) {
+		return false;
+	}
+
+	const auto fdGuard = gsl::finally([&] { close(fd); });
+
+	const auto handleToken = "tdesktop"
+		+ std::to_string(base::RandomValue<uint>());
+
+	std::string uniqueName = proxy.get_connection().get_unique_name();
+	uniqueName.erase(0, 1);
+	uniqueName.replace(uniqueName.find('.'), 1, 1, '_');
+
+	auto request = XdpRequest::Request(
+		XdpRequest::RequestProxy::new_sync(
+			proxy.get_connection(),
+			Gio::DBusProxyFlags::NONE_,
+			base::Platform::XDP::kService,
+			base::Platform::XDP::kObjectPath
+				+ std::string("/request/")
+				+ uniqueName
+				+ '/'
+				+ handleToken,
+			nullptr,
+			nullptr));
+
+	if (!request) {
+		return false;
+	}
+
+	auto loop = GLib::MainLoop::new_();
+
+	const auto signalId = request.signal_response().connect([=](
+			XdpRequest::Request,
+			guint,
+			GLib::Variant) mutable {
+		loop.quit();
+	});
+
+	const auto signalGuard = gsl::finally([&] {
+		request.disconnect(signalId);
+	});
+
+	auto result = interface.call_open_file_sync(
+		base::Platform::XDP::ParentWindowID(),
+		GLib::Variant::new_handle(0),
+		GLib::Variant::new_array({
+			GLib::Variant::new_dict_entry(
+				GLib::Variant::new_string("handle_token"),
+				GLib::Variant::new_variant(
+					GLib::Variant::new_string(handleToken))),
+			GLib::Variant::new_dict_entry(
+				GLib::Variant::new_string("activation_token"),
+				GLib::Variant::new_variant(
+					GLib::Variant::new_string(
+						XdgActivationToken().toStdString()))),
+			GLib::Variant::new_dict_entry(
+				GLib::Variant::new_string("ask"),
+				GLib::Variant::new_variant(
+					GLib::Variant::new_boolean(true))),
+		}),
+		Gio::UnixFDList::new_from_array((std::array{ fd }).data(), 1),
+		nullptr);
+
+	if (!result) {
+		return false;
+	}
+
+	QWidget window;
+	window.setAttribute(Qt::WA_DontShowOnScreen);
+	window.setWindowModality(Qt::ApplicationModal);
+	window.show();
+	loop.run();
+
+	return true;
+}
+
+} // namespace File
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
index baced1178..2054d3f32 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
@@ -9,8 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "platform/platform_file_utilities.h"
 
-#include "platform/linux/linux_xdp_open_with_dialog.h"
-
 namespace Platform {
 namespace File {
 
@@ -30,10 +28,6 @@ inline bool UnsafeShowOpenWithDropdown(const QString &filepath) {
 	return false;
 }
 
-inline bool UnsafeShowOpenWith(const QString &filepath) {
-	return internal::ShowXDPOpenWithDialog(filepath);
-}
-
 inline void UnsafeLaunch(const QString &filepath) {
 	return ::File::internal::UnsafeLaunchDefault(filepath);
 }
diff --git a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
deleted file mode 100644
index 9e409b900..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
+++ /dev/null
@@ -1,129 +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 "platform/linux/linux_xdp_open_with_dialog.h"
-
-#include "base/platform/base_platform_info.h"
-#include "base/platform/linux/base_linux_xdp_utilities.h"
-#include "base/platform/linux/base_linux_xdg_activation_token.h"
-#include "base/random.h"
-
-#include <fcntl.h>
-#include <xdpopenuri/xdpopenuri.hpp>
-#include <xdprequest/xdprequest.hpp>
-
-namespace Platform {
-namespace File {
-namespace internal {
-namespace {
-
-using namespace gi::repository;
-using base::Platform::XdgActivationToken;
-
-} // namespace
-
-bool ShowXDPOpenWithDialog(const QString &filepath) {
-	auto proxy = XdpOpenURI::OpenURIProxy::new_for_bus_sync(
-		Gio::BusType::SESSION_,
-		Gio::DBusProxyFlags::NONE_,
-		base::Platform::XDP::kService,
-		base::Platform::XDP::kObjectPath,
-		nullptr);
-
-	if (!proxy) {
-		return false;
-	}
-
-	auto interface = XdpOpenURI::OpenURI(proxy);
-	if (interface.get_version() < 3) {
-		return false;
-	}
-
-	const auto fd = open(
-		QFile::encodeName(filepath).constData(),
-		O_RDONLY);
-
-	if (fd == -1) {
-		return false;
-	}
-
-	const auto fdGuard = gsl::finally([&] { close(fd); });
-
-	const auto handleToken = "tdesktop"
-		+ std::to_string(base::RandomValue<uint>());
-
-	std::string uniqueName = proxy.get_connection().get_unique_name();
-	uniqueName.erase(0, 1);
-	uniqueName.replace(uniqueName.find('.'), 1, 1, '_');
-
-	auto request = XdpRequest::Request(
-		XdpRequest::RequestProxy::new_sync(
-			proxy.get_connection(),
-			Gio::DBusProxyFlags::NONE_,
-			base::Platform::XDP::kService,
-			base::Platform::XDP::kObjectPath
-				+ std::string("/request/")
-				+ uniqueName
-				+ '/'
-				+ handleToken,
-			nullptr,
-			nullptr));
-
-	if (!request) {
-		return false;
-	}
-
-	auto loop = GLib::MainLoop::new_();
-
-	const auto signalId = request.signal_response().connect([=](
-			XdpRequest::Request,
-			guint,
-			GLib::Variant) mutable {
-		loop.quit();
-	});
-
-	const auto signalGuard = gsl::finally([&] {
-		request.disconnect(signalId);
-	});
-
-	auto result = interface.call_open_file_sync(
-		base::Platform::XDP::ParentWindowID(),
-		GLib::Variant::new_handle(0),
-		GLib::Variant::new_array({
-			GLib::Variant::new_dict_entry(
-				GLib::Variant::new_string("handle_token"),
-				GLib::Variant::new_variant(
-					GLib::Variant::new_string(handleToken))),
-			GLib::Variant::new_dict_entry(
-				GLib::Variant::new_string("activation_token"),
-				GLib::Variant::new_variant(
-					GLib::Variant::new_string(
-						XdgActivationToken().toStdString()))),
-			GLib::Variant::new_dict_entry(
-				GLib::Variant::new_string("ask"),
-				GLib::Variant::new_variant(
-					GLib::Variant::new_boolean(true))),
-		}),
-		Gio::UnixFDList::new_from_array((std::array{ fd }).data(), 1),
-		nullptr);
-
-	if (!result) {
-		return false;
-	}
-
-	QWidget window;
-	window.setAttribute(Qt::WA_DontShowOnScreen);
-	window.setWindowModality(Qt::ApplicationModal);
-	window.show();
-	loop.run();
-
-	return true;
-}
-
-} // namespace internal
-} // namespace File
-} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.h b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.h
deleted file mode 100644
index a848baaf5..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-namespace Platform {
-namespace File {
-namespace internal {
-
-bool ShowXDPOpenWithDialog(const QString &filepath);
-
-} // namespace internal
-} // namespace File
-} // namespace Platform

From 9046b2cafbd54331a84890bf83a0d3de3bc86bf3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 21 Apr 2024 00:54:48 +0400
Subject: [PATCH 313/596] Stop using the plasma-shell protocol

Looks like this isn't really correct in combination with xdg-shell
---
 .gitmodules                                   |   3 -
 Telegram/CMakeLists.txt                       |  26 ---
 .../linux/linux_wayland_integration.cpp       | 150 ------------------
 .../linux/linux_wayland_integration.h         |  29 ----
 .../linux/linux_wayland_integration_dummy.cpp |  37 -----
 .../platform/linux/main_window_linux.cpp      |   7 -
 .../platform/linux/specific_linux.cpp         |   6 -
 Telegram/ThirdParty/plasma-wayland-protocols  |   1 -
 8 files changed, 259 deletions(-)
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_wayland_integration.h
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp
 delete mode 160000 Telegram/ThirdParty/plasma-wayland-protocols

diff --git a/.gitmodules b/.gitmodules
index f611a0acc..dfc92dbf1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,9 +82,6 @@
 [submodule "Telegram/ThirdParty/dispatch"]
 	path = Telegram/ThirdParty/dispatch
 	url = https://github.com/apple/swift-corelibs-libdispatch
-[submodule "Telegram/ThirdParty/plasma-wayland-protocols"]
-	path = Telegram/ThirdParty/plasma-wayland-protocols
-	url = https://github.com/KDE/plasma-wayland-protocols.git
 [submodule "Telegram/ThirdParty/wayland-protocols"]
 	path = Telegram/ThirdParty/wayland-protocols
 	url = https://github.com/gitlab-freedesktop-mirrors/wayland-protocols.git
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index d0ea8561d..baf77c58c 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1199,9 +1199,6 @@ PRIVATE
     payments/payments_checkout_process.h
     payments/payments_form.cpp
     payments/payments_form.h
-    platform/linux/linux_wayland_integration_dummy.cpp
-    platform/linux/linux_wayland_integration.cpp
-    platform/linux/linux_wayland_integration.h
     platform/linux/file_utilities_linux.cpp
     platform/linux/file_utilities_linux.h
     platform/linux/launcher_linux.cpp
@@ -1554,16 +1551,6 @@ if (NOT build_winstore)
     )
 endif()
 
-if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-    remove_target_sources(Telegram ${src_loc}
-        platform/linux/linux_wayland_integration.cpp
-    )
-else()
-    remove_target_sources(Telegram ${src_loc}
-        platform/linux/linux_wayland_integration_dummy.cpp
-    )
-endif()
-
 if (DESKTOP_APP_USE_PACKAGED)
     remove_target_sources(Telegram ${src_loc}
         platform/mac/mac_iconv_helper.c
@@ -1701,19 +1688,6 @@ else()
             desktop-app::external_xcb
         )
     endif()
-
-    if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-        qt_generate_wayland_protocol_client_sources(Telegram
-        FILES
-            ${third_party_loc}/wayland/protocol/wayland.xml
-            ${third_party_loc}/plasma-wayland-protocols/src/protocols/plasma-shell.xml
-        )
-
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::external_wayland_client
-        )
-    endif()
 endif()
 
 if (build_macstore)
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
deleted file mode 100644
index c1485dd8c..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ /dev/null
@@ -1,150 +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 "platform/linux/linux_wayland_integration.h"
-
-#include "base/platform/linux/base_linux_wayland_utilities.h"
-#include "base/qt_signal_producer.h"
-#include "base/flat_map.h"
-
-#include <QtGui/QGuiApplication>
-#include <QtGui/QWindow>
-#include <qpa/qplatformnativeinterface.h>
-#include <qpa/qplatformwindow_p.h>
-
-#include <qwayland-wayland.h>
-#include <qwayland-plasma-shell.h>
-
-using QWlApp = QNativeInterface::QWaylandApplication;
-using namespace QNativeInterface::Private;
-using namespace base::Platform::Wayland;
-
-namespace Platform {
-namespace internal {
-namespace {
-
-class PlasmaShell : public Global<QtWayland::org_kde_plasma_shell> {
-public:
-	using Global::Global;
-
-	using Surface = AutoDestroyer<QtWayland::org_kde_plasma_surface>;
-	base::flat_map<wl_surface*, Surface> surfaces;
-};
-
-} // namespace
-
-struct WaylandIntegration::Private
-		: public AutoDestroyer<QtWayland::wl_registry> {
-	Private(not_null<QWlApp*> native)
-	: AutoDestroyer(wl_display_get_registry(native->display()))
-	, display(native->display()) {
-		wl_display_roundtrip(display);
-	}
-
-	QtWayland::org_kde_plasma_surface plasmaSurface(QWindow *window);
-
-	const not_null<wl_display*> display;
-	std::optional<PlasmaShell> plasmaShell;
-
-protected:
-	void registry_global(
-			uint32_t name,
-			const QString &interface,
-			uint32_t version) override {
-		if (interface == qstr("org_kde_plasma_shell")) {
-			plasmaShell.emplace(object(), name, version);
-		}
-	}
-
-	void registry_global_remove(uint32_t name) override {
-		if (plasmaShell && name == plasmaShell->id()) {
-			plasmaShell = std::nullopt;
-		}
-	}
-};
-
-QtWayland::org_kde_plasma_surface WaylandIntegration::Private::plasmaSurface(
-		QWindow *window) {
-	if (!plasmaShell) {
-		return {};
-	}
-
-	const auto native = window->nativeInterface<QWaylandWindow>();
-	if (!native) {
-		return {};
-	}
-
-	const auto surface = native->surface();
-	if (!surface) {
-		return {};
-	}
-
-	const auto it = plasmaShell->surfaces.find(surface);
-	if (it != plasmaShell->surfaces.cend()) {
-		return it->second;
-	}
-
-	const auto plasmaSurface = plasmaShell->get_surface(surface);
-	if (!plasmaSurface) {
-		return {};
-	}
-
-	const auto result = plasmaShell->surfaces.emplace(surface, plasmaSurface);
-
-	base::qt_signal_producer(
-		native,
-		&QWaylandWindow::surfaceDestroyed
-	) | rpl::start_with_next([=] {
-		auto it = plasmaShell->surfaces.find(surface);
-		if (it != plasmaShell->surfaces.cend()) {
-			plasmaShell->surfaces.erase(it);
-		}
-	}, result.first->second.lifetime());
-
-	return result.first->second;
-}
-
-WaylandIntegration::WaylandIntegration()
-: _private(std::make_unique<Private>(qApp->nativeInterface<QWlApp>())) {
-}
-
-WaylandIntegration::~WaylandIntegration() = default;
-
-WaylandIntegration *WaylandIntegration::Instance() {
-	const auto native = qApp->nativeInterface<QWlApp>();
-	if (!native) return nullptr;
-	static std::optional<WaylandIntegration> instance;
-	if (instance && native->display() != instance->_private->display) {
-		instance.reset();
-	}
-	if (!instance) {
-		instance.emplace();
-		base::qt_signal_producer(
-			QGuiApplication::platformNativeInterface(),
-			&QObject::destroyed
-		) | rpl::start_with_next([] {
-			instance = std::nullopt;
-		}, instance->_private->lifetime());
-	}
-	return &*instance;
-}
-
-bool WaylandIntegration::skipTaskbarSupported() {
-	return _private->plasmaShell.has_value();
-}
-
-void WaylandIntegration::skipTaskbar(QWindow *window, bool skip) {
-	auto plasmaSurface = _private->plasmaSurface(window);
-	if (!plasmaSurface.isInitialized()) {
-		return;
-	}
-
-	plasmaSurface.set_skip_taskbar(skip);
-}
-
-} // namespace internal
-} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h
deleted file mode 100644
index bb74be0b3..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-namespace Platform {
-namespace internal {
-
-class WaylandIntegration {
-public:
-	WaylandIntegration();
-	~WaylandIntegration();
-
-	[[nodiscard]] static WaylandIntegration *Instance();
-
-	[[nodiscard]] bool skipTaskbarSupported();
-	void skipTaskbar(QWindow *window, bool skip);
-
-private:
-	struct Private;
-	const std::unique_ptr<Private> _private;
-};
-
-} // 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
deleted file mode 100644
index b4151306d..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp
+++ /dev/null
@@ -1,37 +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 "platform/linux/linux_wayland_integration.h"
-
-#include "base/platform/base_platform_info.h"
-
-namespace Platform {
-namespace internal {
-
-struct WaylandIntegration::Private {
-};
-
-WaylandIntegration::WaylandIntegration() {
-}
-
-WaylandIntegration::~WaylandIntegration() = default;
-
-WaylandIntegration *WaylandIntegration::Instance() {
-	if (!IsWayland()) return nullptr;
-	static WaylandIntegration instance;
-	return &instance;
-}
-
-bool WaylandIntegration::skipTaskbarSupported() {
-	return false;
-}
-
-void WaylandIntegration::skipTaskbar(QWindow *window, bool skip) {
-}
-
-} // namespace internal
-} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index c8218ca7d..ba73e3b3a 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "styles/style_window.h"
 #include "platform/linux/specific_linux.h"
-#include "platform/linux/linux_wayland_integration.h"
 #include "history/history.h"
 #include "history/history_widget.h"
 #include "history/history_inner_widget.h"
@@ -48,7 +47,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Platform {
 namespace {
 
-using internal::WaylandIntegration;
 using WorkMode = Core::Settings::WorkMode;
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -102,11 +100,6 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
 void SkipTaskbar(QWindow *window, bool skip) {
-	if (const auto integration = WaylandIntegration::Instance()) {
-		integration->skipTaskbar(window, skip);
-		return;
-	}
-
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 	if (IsX11()) {
 		XCBSkipTaskbar(window, skip);
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 29b887941..48c189ca2 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/linux/base_linux_dbus_utilities.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
 #include "ui/platform/ui_platform_window_title.h"
-#include "platform/linux/linux_wayland_integration.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "storage/localstorage.h"
@@ -53,7 +52,6 @@ namespace {
 using namespace gi::repository;
 namespace GObject = gi::repository::GObject;
 using namespace Platform;
-using Platform::internal::WaylandIntegration;
 
 void PortalAutostart(bool enabled, Fn<void(bool)> done) {
 	const auto executable = ExecutablePathForShortcuts();
@@ -563,10 +561,6 @@ bool TrayIconSupported() {
 }
 
 bool SkipTaskbarSupported() {
-	if (const auto integration = WaylandIntegration::Instance()) {
-		return integration->skipTaskbarSupported();
-	}
-
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 	if (IsX11()) {
 		return base::Platform::XCB::IsSupportedByWM(
diff --git a/Telegram/ThirdParty/plasma-wayland-protocols b/Telegram/ThirdParty/plasma-wayland-protocols
deleted file mode 160000
index 78fc6ee77..000000000
--- a/Telegram/ThirdParty/plasma-wayland-protocols
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 78fc6ee77334a147986f01c6d3c6e1b99af1a333

From 0ad18c81829c77da4ce115928db776d0d4723cb7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 21 Apr 2024 01:02:30 +0400
Subject: [PATCH 314/596] Get rid of direct Wayland usage

This should get rid of a very nasty vector of misbehaving and quite a lot of code which is boilerplate over Wayland protocols at the price of losing support of niche features

Most of things served by xcb code on X11 is served by portal code on Wayland, hopefully this tendention will continue and we will be fine just with glib which provides D-Bus and other basic APIs
---
 .github/workflows/linux.yml           | 1 -
 .gitmodules                           | 6 ------
 Telegram/ThirdParty/wayland           | 1 -
 Telegram/ThirdParty/wayland-protocols | 1 -
 Telegram/lib_base                     | 2 +-
 cmake                                 | 2 +-
 6 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 160000 Telegram/ThirdParty/wayland
 delete mode 160000 Telegram/ThirdParty/wayland-protocols

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 4eaf2ec22..8020e46c5 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -49,7 +49,6 @@ jobs:
         defines:
           - ""
           - "DESKTOP_APP_DISABLE_X11_INTEGRATION"
-          - "DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION"
 
     env:
       UPLOAD_ARTIFACT: "true"
diff --git a/.gitmodules b/.gitmodules
index dfc92dbf1..91f154826 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,9 +82,6 @@
 [submodule "Telegram/ThirdParty/dispatch"]
 	path = Telegram/ThirdParty/dispatch
 	url = https://github.com/apple/swift-corelibs-libdispatch
-[submodule "Telegram/ThirdParty/wayland-protocols"]
-	path = Telegram/ThirdParty/wayland-protocols
-	url = https://github.com/gitlab-freedesktop-mirrors/wayland-protocols.git
 [submodule "Telegram/ThirdParty/kimageformats"]
 	path = Telegram/ThirdParty/kimageformats
 	url = https://github.com/KDE/kimageformats.git
@@ -94,9 +91,6 @@
 [submodule "Telegram/ThirdParty/cld3"]
 	path = Telegram/ThirdParty/cld3
 	url = https://github.com/google/cld3.git
-[submodule "Telegram/ThirdParty/wayland"]
-	path = Telegram/ThirdParty/wayland
-	url = https://github.com/gitlab-freedesktop-mirrors/wayland.git
 [submodule "Telegram/ThirdParty/libprisma"]
 	path = Telegram/ThirdParty/libprisma
 	url = https://github.com/desktop-app/libprisma.git
diff --git a/Telegram/ThirdParty/wayland b/Telegram/ThirdParty/wayland
deleted file mode 160000
index b2649cb3e..000000000
--- a/Telegram/ThirdParty/wayland
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b2649cb3ee6bd70828a17e50beb16591e6066288
diff --git a/Telegram/ThirdParty/wayland-protocols b/Telegram/ThirdParty/wayland-protocols
deleted file mode 160000
index 4624cfaaf..000000000
--- a/Telegram/ThirdParty/wayland-protocols
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4624cfaaf563cd7be5e2e2087c8de6d3a48ea867
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 3d1ea724a..d5a6bfced 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 3d1ea724a80c3e3a431a88a653d24f4f418eaea8
+Subproject commit d5a6bfced0b1fa35c4f601816313d02e6ecb7cde
diff --git a/cmake b/cmake
index 621b01ec9..a428df544 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 621b01ec9bd7f953223147daf59ab4c850cb3c40
+Subproject commit a428df5440e76a726abc30924766ac7da0cb381c

From 8d2805f22619e1ba719583459d12afce0827d9c9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 23 Apr 2024 09:39:28 +0400
Subject: [PATCH 315/596] Set font weight in crash reporter

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

diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp
index 41bacf4ba..3c19013c9 100644
--- a/Telegram/SourceFiles/core/crash_report_window.cpp
+++ b/Telegram/SourceFiles/core/crash_report_window.cpp
@@ -100,6 +100,7 @@ PreLaunchWindow::~PreLaunchWindow() {
 PreLaunchLabel::PreLaunchLabel(QWidget *parent) : QLabel(parent) {
 	QFont labelFont(font());
 	labelFont.setFamily(style::internal::GetFontOverride(style::internal::FontSemibold));
+	labelFont.setWeight(QFont::DemiBold);
 	labelFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
 	setFont(labelFont);
 
@@ -163,6 +164,7 @@ PreLaunchButton::PreLaunchButton(QWidget *parent, bool confirm) : QPushButton(pa
 
 	QFont closeFont(font());
 	closeFont.setFamily(style::internal::GetFontOverride(style::internal::FontSemibold));
+	closeFont.setWeight(QFont::DemiBold);
 	closeFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
 	setFont(closeFont);
 
@@ -182,6 +184,7 @@ PreLaunchCheckbox::PreLaunchCheckbox(QWidget *parent) : QCheckBox(parent) {
 
 	QFont closeFont(font());
 	closeFont.setFamily(style::internal::GetFontOverride(style::internal::FontSemibold));
+	closeFont.setWeight(QFont::DemiBold);
 	closeFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
 	setFont(closeFont);
 

From bae9af1076e25517ff657efbbf3aad9839c0f29f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 23 Apr 2024 09:39:28 +0400
Subject: [PATCH 316/596] Switch crash reporter to system fonts

This should prevent nested crashes when loading custom fonts
---
 Telegram/SourceFiles/core/crash_report_window.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp
index 3c19013c9..b73c12aed 100644
--- a/Telegram/SourceFiles/core/crash_report_window.cpp
+++ b/Telegram/SourceFiles/core/crash_report_window.cpp
@@ -32,8 +32,6 @@ constexpr auto kDefaultProxyPort = 80;
 PreLaunchWindow *PreLaunchWindowInstance = nullptr;
 
 PreLaunchWindow::PreLaunchWindow(QString title) {
-	style::internal::StartFonts();
-
 	setWindowIcon(Window::CreateIcon());
 	setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
 
@@ -99,7 +97,6 @@ PreLaunchWindow::~PreLaunchWindow() {
 
 PreLaunchLabel::PreLaunchLabel(QWidget *parent) : QLabel(parent) {
 	QFont labelFont(font());
-	labelFont.setFamily(style::internal::GetFontOverride(style::internal::FontSemibold));
 	labelFont.setWeight(QFont::DemiBold);
 	labelFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
 	setFont(labelFont);
@@ -119,7 +116,6 @@ void PreLaunchLabel::setText(const QString &text) {
 
 PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(parent) {
 	QFont logFont(font());
-	logFont.setFamily(style::internal::GetFontOverride());
 	logFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
 	setFont(logFont);
 
@@ -140,7 +136,6 @@ PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(paren
 
 PreLaunchLog::PreLaunchLog(QWidget *parent) : QTextEdit(parent) {
 	QFont logFont(font());
-	logFont.setFamily(style::internal::GetFontOverride());
 	logFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
 	setFont(logFont);
 
@@ -163,7 +158,6 @@ PreLaunchButton::PreLaunchButton(QWidget *parent, bool confirm) : QPushButton(pa
 	setObjectName(confirm ? "confirm" : "cancel");
 
 	QFont closeFont(font());
-	closeFont.setFamily(style::internal::GetFontOverride(style::internal::FontSemibold));
 	closeFont.setWeight(QFont::DemiBold);
 	closeFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
 	setFont(closeFont);
@@ -183,7 +177,6 @@ PreLaunchCheckbox::PreLaunchCheckbox(QWidget *parent) : QCheckBox(parent) {
 	setCheckState(Qt::Checked);
 
 	QFont closeFont(font());
-	closeFont.setFamily(style::internal::GetFontOverride(style::internal::FontSemibold));
 	closeFont.setWeight(QFont::DemiBold);
 	closeFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
 	setFont(closeFont);

From 18f5521be5e8c230b589eb4317a2d7d8f421f8f0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 Apr 2024 19:06:22 +0400
Subject: [PATCH 317/596] Don't look for SDL when building on macOS.

---
 Telegram/build/prepare/prepare.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 55a6cd795..8a647d419 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -847,6 +847,7 @@ mac:
         -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX \\
         -D DISABLE_SSE=ON \\
+        -D ENABLE_SDL=OFF \\
         -D BUILD_SHARED_LIBS=OFF \\
         -D ENABLE_DECODER=ON \\
         -D ENABLE_ENCODER=OFF

From dc438cff23ab33ed9e83320b8d9f1369071cbbdc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 Apr 2024 19:10:44 +0400
Subject: [PATCH 318/596] Always export file_name in json.

---
 Telegram/SourceFiles/export/output/export_output_json.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index ed50aa5c8..67814e5b2 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -653,6 +653,7 @@ QByteArray SerializeMessage(
 		pushTTL();
 	}, [&](const Document &data) {
 		pushPath(data.file, "file");
+		push("file_name", data.name);
 		if (data.thumb.width > 0) {
 			pushPath(data.thumb.file, "thumbnail");
 		}
@@ -675,9 +676,7 @@ QByteArray SerializeMessage(
 			push("performer", data.songPerformer);
 			push("title", data.songTitle);
 		}
-		if (!data.isSticker) {
-			push("mime_type", data.mime);
-		}
+		push("mime_type", data.mime);
 		if (data.duration) {
 			push("duration_seconds", data.duration);
 		}

From 2f03b9aa299f3ec899668c9c937c1691c48398fd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Apr 2024 11:50:26 +0400
Subject: [PATCH 319/596] Make dialogs filter onfocused by default.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 149 ++++++++++--------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  10 +-
 .../window/window_session_controller.cpp      |   8 +-
 3 files changed, 89 insertions(+), 78 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 873b15324..b2b1a8fe1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -214,8 +214,8 @@ Widget::Widget(
 		st::dialogsMenuToggle),
 	.under = object_ptr<Ui::AbstractButton>(_searchControls),
 })
-, _searchForNarrowFilters(_searchControls, st::dialogsSearchForNarrowFilters)
-, _filter(_searchControls, st::dialogsFilter, tr::lng_dlg_filter())
+, _searchForNarrowLayout(_searchControls, st::dialogsSearchForNarrowFilters)
+, _search(_searchControls, st::dialogsFilter, tr::lng_dlg_filter())
 , _chooseFromUser(
 	_searchControls,
 	object_ptr<Ui::IconButton>(this, st::dialogsSearchFrom))
@@ -321,7 +321,7 @@ Widget::Widget(
 	}, lifetime());
 	_inner->refreshHashtagsRequests(
 	) | rpl::start_with_next([=] {
-		filterCursorMoved();
+		searchCursorMoved();
 	}, lifetime());
 	_inner->cancelSearchFromUserRequests(
 	) | rpl::start_with_next([=] {
@@ -330,7 +330,7 @@ Widget::Widget(
 			: _searchInChat.sublist()
 			? Key(session().data().history(session().user()))
 			: _searchInChat, nullptr);
-		applyFilterUpdate(true);
+		applySearchUpdate(true);
 	}, lifetime());
 	_inner->chosenRow(
 	) | rpl::start_with_next([=](const ChosenRow &row) {
@@ -353,17 +353,17 @@ Widget::Widget(
 		Ui::PostponeCall(this, [=] { listScrollUpdated(); });
 	}, lifetime());
 
-	_filter->changes(
+	_search->changes(
 	) | rpl::start_with_next([=] {
-		applyFilterUpdate();
-	}, _filter->lifetime());
-	_filter->submits(
-	) | rpl::start_with_next([=] { submit(); }, _filter->lifetime());
+		applySearchUpdate();
+	}, _search->lifetime());
+	_search->submits(
+	) | rpl::start_with_next([=] { submit(); }, _search->lifetime());
 	QObject::connect(
-		_filter->rawTextEdit().get(),
+		_search->rawTextEdit().get(),
 		&QTextEdit::cursorPositionChanged,
 		this,
-		[=] { filterCursorMoved(); },
+		[=] { searchCursorMoved(); },
 		Qt::QueuedConnection); // So getLastText() works already.
 
 	if (!Core::UpdaterDisabled()) {
@@ -401,8 +401,8 @@ Widget::Widget(
 		setupStories();
 	}
 
-	_searchForNarrowFilters->setClickedCallback([=] {
-		_filter->setFocusFast();
+	_searchForNarrowLayout->setClickedCallback([=] {
+		_search->setFocusFast();
 		if (_childList) {
 			controller->closeForum();
 		}
@@ -440,8 +440,8 @@ Widget::Widget(
 		loadMoreBlockedByDate();
 	}, lifetime());
 
-	_filter->setFocusPolicy(Qt::StrongFocus);
-	_filter->customUpDown(true);
+	_search->setFocusPolicy(Qt::StrongFocus);
+	_search->customUpDown(true);
 
 	updateJumpToDateVisibility(true);
 	updateSearchFromVisibility(true);
@@ -492,7 +492,7 @@ Widget::Widget(
 		) | rpl::start_with_next([=](float64 shown) {
 			const auto color = (shown > 0.) ? &st::dialogsRippleBg : nullptr;
 			_mainMenu.toggle->setRippleColorOverride(color);
-			_searchForNarrowFilters->setRippleColorOverride(color);
+			_searchForNarrowLayout->setRippleColorOverride(color);
 		}, lifetime());
 
 		setupMoreChatsBar();
@@ -806,7 +806,7 @@ void Widget::setupMainMenuToggle() {
 		const auto filtersHidden = !controller()->filtersWidth();
 		_mainMenu.toggle->setVisible(filtersHidden);
 		_mainMenu.under->setVisible(filtersHidden);
-		_searchForNarrowFilters->setVisible(!filtersHidden);
+		_searchForNarrowLayout->setVisible(!filtersHidden);
 		updateControlsGeometry();
 	}, lifetime());
 
@@ -1014,7 +1014,7 @@ void Widget::updateControlsVisibility(bool fast) {
 	updateLoadMoreChatsVisibility();
 	_scroll->show();
 	updateStoriesVisibility();
-	if ((_openedFolder || _openedForum) && _filter->hasFocus()) {
+	if ((_openedFolder || _openedForum) && _search->hasFocus()) {
 		setInnerFocus();
 	}
 	if (_updateTelegram) {
@@ -1039,9 +1039,6 @@ void Widget::updateControlsVisibility(bool fast) {
 			_forumReportBar->show();
 		}
 	} else {
-		if (hasFocus() && !_childList) {
-			_filter->setFocusFast();
-		}
 		updateLockUnlockVisibility();
 		updateJumpToDateVisibility(fast);
 		updateSearchFromVisibility(fast);
@@ -1056,7 +1053,7 @@ void Widget::updateControlsVisibility(bool fast) {
 	if (_hideChildListCanvas) {
 		_hideChildListCanvas->show();
 	}
-	if (_childList && _filter->hasFocus()) {
+	if (_childList && _search->hasFocus()) {
 		setInnerFocus();
 	}
 	updateLockUnlockPosition();
@@ -1069,7 +1066,7 @@ void Widget::updateLockUnlockPosition() {
 	const auto stories = (_stories && !_stories->isHidden())
 		? _stories->collapsedGeometryCurrent()
 		: Stories::List::CollapsedGeometry();
-	const auto simple = _filter->x() + _filter->width();
+	const auto simple = _search->x() + _search->width();
 	const auto right = stories.geometry.isEmpty()
 		? simple
 		: anim::interpolate(stories.geometry.x(), simple, stories.expanded);
@@ -1215,7 +1212,7 @@ void Widget::refreshTopBars() {
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->searchQuery(
 			) | rpl::start_with_next([=](QString query) {
-				applyFilterUpdate();
+				applySearchUpdate();
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->jumpToDateRequest(
 			) | rpl::start_with_next([=] {
@@ -1381,9 +1378,12 @@ void Widget::checkUpdateStatus() {
 void Widget::setInnerFocus() {
 	if (_childList) {
 		_childList->setInnerFocus();
-	} else if (!_openedFolder && !_openedForum) {
-		_filter->setFocus();
-	} else if (!_subsectionTopBar->searchSetFocus()) {
+	} else if ((_openedFolder || _openedForum)
+		&& _subsectionTopBar->searchSetFocus()) {
+		return;
+	} else if (!_search->getLastText().isEmpty() || _searchInChat) {
+		_search->setFocus();
+	} else {
 		setFocus();
 	}
 }
@@ -1514,7 +1514,7 @@ void Widget::updateStoriesVisibility() {
 		|| _openedForum
 		|| !_widthAnimationCache.isNull()
 		|| _childList
-		|| !_filter->getLastText().isEmpty()
+		|| !_search->getLastText().isEmpty()
 		|| _searchInChat
 		|| _stories->empty();
 	if (_stories->isHidden() != hidden) {
@@ -1631,7 +1631,7 @@ void Widget::slideFinished() {
 	_shownProgressValue = 1.;
 	updateControlsVisibility(true);
 	if ((!_subsectionTopBar || !_subsectionTopBar->searchHasFocus())
-		&& !_filter->hasFocus()) {
+		&& !_search->hasFocus()) {
 		controller()->widget()->setInnerFocus();
 	}
 }
@@ -1963,7 +1963,7 @@ void Widget::searchMessages(QString query, Key inChat) {
 			setSearchInChat(inChat, nullptr, tags);
 		}
 		setSearchQuery(query);
-		applyFilterUpdate(true);
+		applySearchUpdate(true);
 		_searchTimer.cancel();
 		searchMessages();
 
@@ -2433,7 +2433,7 @@ void Widget::listScrollUpdated() {
 	_scrollToTop->update();
 }
 
-void Widget::applyFilterUpdate(bool force) {
+void Widget::applySearchUpdate(bool force) {
 	if (_showAnimation && !force) {
 		return;
 	}
@@ -2462,13 +2462,13 @@ void Widget::applyFilterUpdate(bool force) {
 		|| _searchFromAuthor
 		|| !_searchTags.empty()) {
 		auto switchToChooseFrom = HistoryView::SwitchToChooseFromQuery();
-		if (_lastFilterText != switchToChooseFrom
-			&& switchToChooseFrom.startsWith(_lastFilterText)
+		if (_lastSearchText != switchToChooseFrom
+			&& switchToChooseFrom.startsWith(_lastSearchText)
 			&& filterText == switchToChooseFrom) {
 			showSearchFrom();
 		}
 	}
-	_lastFilterText = filterText;
+	_lastSearchText = filterText;
 }
 
 void Widget::showForum(
@@ -2574,7 +2574,7 @@ void Widget::closeChildList(anim::type animated) {
 	_childListShown = 0.;
 	if (hasFocus()) {
 		setInnerFocus();
-		_filter->finishAnimating();
+		_search->finishAnimating();
 	}
 	if (animated == anim::type::normal) {
 		_hideChildListCanvas->hide();
@@ -2673,7 +2673,7 @@ bool Widget::setSearchInChat(
 			clearSearchCache();
 			_searchTags = std::move(list);
 			if (_searchTags.empty()) {
-				applyFilterUpdate(true);
+				applySearchUpdate(true);
 			} else {
 				searchMessages();
 			}
@@ -2684,10 +2684,14 @@ bool Widget::setSearchInChat(
 			_openedForum && _searchInChat);
 	}
 	if (_searchFromAuthor
-		&& _lastFilterText == HistoryView::SwitchToChooseFromQuery()) {
+		&& _lastSearchText == HistoryView::SwitchToChooseFromQuery()) {
 		cancelSearch();
 	}
-	_filter->setFocus();
+	if (_searchInChat) {
+		_search->setFocus();
+	} else {
+		setFocus();
+	}
 	return true;
 }
 
@@ -2735,18 +2739,18 @@ void Widget::showSearchFrom() {
 				} else if (const auto strong = weak.get()) {
 					setSearchInChat(strong, from);
 				}
-				applyFilterUpdate(true);
+				applySearchUpdate(true);
 			}),
-			crl::guard(this, [=] { _filter->setFocus(); }));
+			crl::guard(this, [=] { _search->setFocus(); }));
 		if (box) {
 			controller()->show(std::move(box));
 		}
 	}
 }
 
-void Widget::filterCursorMoved() {
-	const auto to = _filter->textCursor().position();
-	const auto text = _filter->getLastText();
+void Widget::searchCursorMoved() {
+	const auto to = _search->textCursor().position();
+	const auto text = _search->getLastText();
 	auto hashtag = QStringView();
 	for (int start = to; start > 0;) {
 		--start;
@@ -2765,8 +2769,8 @@ void Widget::filterCursorMoved() {
 }
 
 void Widget::completeHashtag(QString tag) {
-	const auto t = _filter->getLastText();
-	auto cur = _filter->textCursor().position();
+	const auto t = _search->getLastText();
+	auto cur = _search->textCursor().position();
 	auto hashtag = QString();
 	for (int start = cur; start > 0;) {
 		--start;
@@ -2781,9 +2785,9 @@ void Widget::completeHashtag(QString tag) {
 				}
 				if (cur - start - 1 == tag.size() && cur < t.size() && t.at(cur) == ' ') ++cur;
 				hashtag = t.mid(0, start + 1) + tag + ' ' + t.mid(cur);
-				_filter->setText(hashtag);
-				_filter->setCursorPosition(start + 1 + tag.size() + 1);
-				applyFilterUpdate(true);
+				_search->setText(hashtag);
+				_search->setCursorPosition(start + 1 + tag.size() + 1);
+				applySearchUpdate(true);
 				return;
 			}
 			break;
@@ -2791,9 +2795,9 @@ void Widget::completeHashtag(QString tag) {
 			break;
 		}
 	}
-	_filter->setText(t.mid(0, cur) + '#' + tag + ' ' + t.mid(cur));
-	_filter->setCursorPosition(cur + 1 + tag.size() + 1);
-	applyFilterUpdate(true);
+	_search->setText(t.mid(0, cur) + '#' + tag + ' ' + t.mid(cur));
+	_search->setCursorPosition(cur + 1 + tag.size() + 1);
+	applySearchUpdate(true);
 }
 
 void Widget::resizeEvent(QResizeEvent *e) {
@@ -2809,7 +2813,7 @@ void Widget::updateLockUnlockVisibility(anim::type animated) {
 		|| _openedForum
 		|| !_widthAnimationCache.isNull()
 		|| _childList
-		|| !_filter->getLastText().isEmpty()
+		|| !_search->getLastText().isEmpty()
 		|| _searchInChat;
 	if (_lockUnlock->toggled() == hidden) {
 		const auto stories = _stories && !_stories->empty();
@@ -2842,7 +2846,7 @@ void Widget::updateJumpToDateVisibility(bool fast) {
 	}
 
 	_jumpToDate->toggle(
-		(_searchInChat && _filter->getLastText().isEmpty()),
+		(_searchInChat && _search->getLastText().isEmpty()),
 		fast ? anim::type::instant : anim::type::normal);
 }
 
@@ -2864,7 +2868,7 @@ void Widget::updateSearchFromVisibility(bool fast) {
 		if (visible) {
 			additional.setRight(_chooseFromUser->width());
 		}
-		_filter->setAdditionalMargins(additional);
+		_search->setAdditionalMargins(additional);
 	}
 }
 
@@ -2898,9 +2902,9 @@ void Widget::updateControlsGeometry() {
 			narrowRatio);
 	}
 
-	auto filterTop = (filterAreaHeight - _filter->height()) / 2;
+	auto filterTop = (filterAreaHeight - _search->height()) / 2;
 	filterLeft = anim::interpolate(filterLeft, _narrowWidth, narrowRatio);
-	_filter->setGeometryToLeft(filterLeft, filterTop, filterWidth, _filter->height());
+	_search->setGeometryToLeft(filterLeft, filterTop, filterWidth, _search->height());
 
 	auto mainMenuLeft = anim::interpolate(
 		st::dialogsFilterPadding.x(),
@@ -2915,15 +2919,15 @@ void Widget::updateControlsGeometry() {
 			+ _mainMenu.toggle->height()
 			+ st::dialogsFilterPadding.y());
 	const auto searchLeft = anim::interpolate(
-		-_searchForNarrowFilters->width(),
-		(_narrowWidth - _searchForNarrowFilters->width()) / 2,
+		-_searchForNarrowLayout->width(),
+		(_narrowWidth - _searchForNarrowLayout->width()) / 2,
 		narrowRatio);
-	_searchForNarrowFilters->moveToLeft(searchLeft, st::dialogsFilterPadding.y());
+	_searchForNarrowLayout->moveToLeft(searchLeft, st::dialogsFilterPadding.y());
 
 	auto right = filterLeft + filterWidth;
-	_cancelSearch->moveToLeft(right - _cancelSearch->width(), _filter->y());
-	right -= _jumpToDate->width(); _jumpToDate->moveToLeft(right, _filter->y());
-	right -= _chooseFromUser->width(); _chooseFromUser->moveToLeft(right, _filter->y());
+	_cancelSearch->moveToLeft(right - _cancelSearch->width(), _search->y());
+	right -= _jumpToDate->width(); _jumpToDate->moveToLeft(right, _search->y());
+	right -= _chooseFromUser->width(); _chooseFromUser->moveToLeft(right, _search->y());
 
 	const auto barw = width();
 	const auto expandedStoriesTop = filterAreaTop + filterAreaHeight;
@@ -3066,6 +3070,14 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		_inner->selectSkipPage(_scroll->height(), 1);
 	} else if (e->key() == Qt::Key_PageUp) {
 		_inner->selectSkipPage(_scroll->height(), -1);
+	} else if (!(e->modifiers() & ~Qt::ShiftModifier)
+		&& e->key() != Qt::Key_Shift
+		&& !_openedFolder
+		&& !_openedForum
+		&& _search->isVisible()
+		&& !e->text().isEmpty()) {
+		_search->setFocusFast();
+		QCoreApplication::sendEvent(_search->rawTextEdit(), e);
 	} else {
 		e->ignore();
 	}
@@ -3132,14 +3144,14 @@ Data::ForumTopic *Widget::searchInTopic() const {
 QString Widget::currentSearchQuery() const {
 	return _subsectionTopBar
 		? _subsectionTopBar->searchQueryCurrent()
-		: _filter->getLastText();
+		: _search->getLastText();
 }
 
 void Widget::clearSearchField() {
 	if (_subsectionTopBar) {
 		_subsectionTopBar->searchClear();
 	} else {
-		_filter->clear();
+		_search->clear();
 	}
 }
 
@@ -3147,7 +3159,7 @@ void Widget::setSearchQuery(const QString &query) {
 	if (_subsectionTopBar) {
 		_subsectionTopBar->searchSetText(query);
 	} else {
-		_filter->setText(query);
+		_search->setText(query);
 	}
 }
 
@@ -3176,7 +3188,10 @@ bool Widget::cancelSearch() {
 	_lastSearchId = _lastSearchMigratedId = 0;
 	_inner->clearFilter();
 	clearSearchField();
-	applyFilterUpdate();
+	applySearchUpdate();
+	if (!_searchInChat && _search->hasFocus()) {
+		setFocus();
+	}
 	return clearingQuery || clearingInChat;
 }
 
@@ -3193,7 +3208,7 @@ void Widget::cancelSearchInChat() {
 		}
 		setSearchInChat(Key());
 	}
-	applyFilterUpdate(true);
+	applySearchUpdate(true);
 	if (!isOneColumn) {
 		controller()->content()->dialogsCancelled();
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index fc7264376..b3a53ee17 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -145,7 +145,7 @@ private:
 	void chosenRow(const ChosenRow &row);
 	void listScrollUpdated();
 	void cancelSearchInChat();
-	void filterCursorMoved();
+	void searchCursorMoved();
 	void completeHashtag(QString tag);
 
 	[[nodiscard]] QString currentSearchQuery() const;
@@ -223,7 +223,7 @@ private:
 	void closeChildList(anim::type animated);
 
 	void fullSearchRefreshOn(rpl::producer<> events);
-	void applyFilterUpdate(bool force = false);
+	void applySearchUpdate(bool force = false);
 	void refreshLoadMoreButton(bool mayBlock, bool isBlocked);
 	void loadMoreBlockedByDate();
 
@@ -255,8 +255,8 @@ private:
 		object_ptr<Ui::IconButton> toggle;
 		object_ptr<Ui::AbstractButton> under;
 	} _mainMenu;
-	object_ptr<Ui::IconButton> _searchForNarrowFilters;
-	object_ptr<Ui::InputField> _filter;
+	object_ptr<Ui::IconButton> _searchForNarrowLayout;
+	object_ptr<Ui::InputField> _search;
 	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _chooseFromUser;
 	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _jumpToDate;
 	object_ptr<Ui::CrossButton> _cancelSearch;
@@ -294,7 +294,7 @@ private:
 	PeerData *_searchFromAuthor = nullptr;
 	std::vector<Data::ReactionId> _searchTags;
 	rpl::lifetime _searchTagsLifetime;
-	QString _lastFilterText;
+	QString _lastSearchText;
 
 	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
 	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsHidden;
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 833ff1a96..581665aee 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1893,12 +1893,8 @@ int SessionController::minimalThreeColumnWidth() const {
 }
 
 bool SessionController::forceWideDialogs() const {
-	if (_dialogsListDisplayForced.current()) {
-		return true;
-	} else if (_dialogsListFocused.current()) {
-		return true;
-	}
-	return !content()->isMainSectionShown();
+	return _dialogsListDisplayForced.current()
+		|| _dialogsListFocused.current();
 }
 
 auto SessionController::computeColumnLayout() const -> ColumnLayout {

From 39658ffe5269a652fbf1f650a2dd08b43d68e0c0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Apr 2024 12:13:25 +0400
Subject: [PATCH 320/596] Allow narrow chats width without main section.

---
 .../dialogs/dialogs_inner_widget.cpp          |  5 ----
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 18 +++++++++--
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  1 +
 Telegram/SourceFiles/mainwidget.cpp           | 30 ++++---------------
 .../window/window_lock_widgets.cpp            |  3 --
 .../window/window_session_controller.cpp      |  5 ----
 .../window/window_session_controller.h        | 25 +++++-----------
 7 files changed, 30 insertions(+), 57 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 0da825209..542d41118 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -2871,8 +2871,6 @@ void InnerWidget::refresh(bool toTop) {
 		jumpToTop();
 		preloadRowsData();
 	}
-	_controller->setDialogsListDisplayForced(
-		_searchInChat || !_filter.isEmpty());
 	update();
 }
 
@@ -3060,9 +3058,6 @@ void InnerWidget::searchInChat(
 		_searchInChatUserpic = {};
 	}
 	moveCancelSearchButtons();
-
-	_controller->setDialogsListDisplayForced(
-		_searchInChat || !_filter.isEmpty());
 }
 
 auto InnerWidget::searchTagsChanges() const
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index b2b1a8fe1..340a29471 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -357,8 +357,14 @@ Widget::Widget(
 	) | rpl::start_with_next([=] {
 		applySearchUpdate();
 	}, _search->lifetime());
+
+	_search->focusedChanges() | rpl::start_with_next([=](bool focused) {
+		updateForceDisplayWide();
+	}, _search->lifetime());
+
 	_search->submits(
 	) | rpl::start_with_next([=] { submit(); }, _search->lifetime());
+
 	QObject::connect(
 		_search->rawTextEdit().get(),
 		&QTextEdit::cursorPositionChanged,
@@ -2469,6 +2475,13 @@ void Widget::applySearchUpdate(bool force) {
 		}
 	}
 	_lastSearchText = filterText;
+	updateForceDisplayWide();
+}
+
+void Widget::updateForceDisplayWide() {
+	controller()->setChatsForceDisplayWide(_search->hasFocus()
+		|| !_search->getLastText().isEmpty()
+		|| _searchInChat);
 }
 
 void Widget::showForum(
@@ -2687,11 +2700,12 @@ bool Widget::setSearchInChat(
 		&& _lastSearchText == HistoryView::SwitchToChooseFromQuery()) {
 		cancelSearch();
 	}
-	if (_searchInChat) {
+	if (_searchInChat || !_search->getLastText().isEmpty()) {
 		_search->setFocus();
 	} else {
 		setFocus();
 	}
+	updateForceDisplayWide();
 	return true;
 }
 
@@ -3209,7 +3223,7 @@ void Widget::cancelSearchInChat() {
 		setSearchInChat(Key());
 	}
 	applySearchUpdate(true);
-	if (!isOneColumn) {
+	if (!isOneColumn && _search->getLastText().isEmpty()) {
 		controller()->content()->dialogsCancelled();
 	}
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index b3a53ee17..6686995f3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -233,6 +233,7 @@ private:
 		mtpRequestId requestId);
 	void peopleFailed(const MTP::Error &error, mtpRequestId requestId);
 
+	void updateForceDisplayWide();
 	void scrollToDefault(bool verytop = false);
 	void scrollToDefaultChecked(bool verytop = false);
 	void setupScrollUpButton();
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index c1a6e1b2e..c60927950 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -296,11 +296,11 @@ MainWidget::MainWidget(
 		_player->finishAnimating();
 	}
 
-	rpl::merge(
-		_controller->dialogsListFocusedChanges(),
-		_controller->dialogsListDisplayForcedChanges()
+	_controller->chatsForceDisplayWideChanges(
 	) | rpl::start_with_next([=] {
-		updateDialogsWidthAnimated();
+		crl::on_main(this, [=] {
+			updateDialogsWidthAnimated();
+		});
 	}, lifetime());
 
 	rpl::merge(
@@ -1315,7 +1315,6 @@ void MainWidget::showHistory(
 		}
 	}
 
-	_controller->setDialogsListFocused(false);
 	_a_dialogsWidth.stop();
 
 	using Way = SectionShow::Way;
@@ -1708,7 +1707,6 @@ void MainWidget::showNewSection(
 		_controller->window().hideSettingsAndLayer();
 	}
 
-	_controller->setDialogsListFocused(false);
 	_a_dialogsWidth.stop();
 
 	auto mainSectionTop = getMainSectionTop();
@@ -2626,23 +2624,7 @@ bool MainWidget::eventFilter(QObject *o, QEvent *e) {
 	const auto widget = o->isWidgetType()
 		? static_cast<QWidget*>(o)
 		: nullptr;
-	if (e->type() == QEvent::FocusIn) {
-		if (widget && (widget->window() == window())) {
-			if (_history == widget || _history->isAncestorOf(widget)
-				|| (_mainSection
-					&& (_mainSection == widget
-						|| _mainSection->isAncestorOf(widget)))
-				|| (_thirdSection
-					&& (_thirdSection == widget
-						|| _thirdSection->isAncestorOf(widget)))) {
-				_controller->setDialogsListFocused(false);
-			} else if (_dialogs
-				&& (_dialogs == widget
-					|| _dialogs->isAncestorOf(widget))) {
-				_controller->setDialogsListFocused(true);
-			}
-		}
-	} else if (e->type() == QEvent::MouseButtonPress) {
+	if (e->type() == QEvent::MouseButtonPress) {
 		if (widget && (widget->window() == window())) {
 			const auto event = static_cast<QMouseEvent*>(e);
 			if (event->button() == Qt::BackButton) {
@@ -2749,7 +2731,7 @@ void MainWidget::updateWindowAdaptiveLayout() {
 
 	auto useSmallColumnWidth = !isOneColumn()
 		&& !dialogsWidthRatio
-		&& !_controller->forceWideDialogs();
+		&& !_controller->chatsForceDisplayWide();
 	_dialogsWidth = !_dialogs
 		? 0
 		: useSmallColumnWidth
diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp
index 813db805b..58f4881fa 100644
--- a/Telegram/SourceFiles/window/window_lock_widgets.cpp
+++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp
@@ -41,9 +41,6 @@ not_null<Controller*> LockWidget::window() const {
 }
 
 void LockWidget::setInnerFocus() {
-	if (const auto controller = _window->sessionController()) {
-		controller->setDialogsListFocused(false);
-	}
 	setFocus();
 }
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 581665aee..7b47da42d 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1892,11 +1892,6 @@ int SessionController::minimalThreeColumnWidth() const {
 		+ st::columnMinimalWidthThird;
 }
 
-bool SessionController::forceWideDialogs() const {
-	return _dialogsListDisplayForced.current()
-		|| _dialogsListFocused.current();
-}
-
 auto SessionController::computeColumnLayout() const -> ColumnLayout {
 	auto layout = Adaptive::WindowLayout::OneColumn;
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 293dda20c..241567b5e 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -423,7 +423,6 @@ public:
 	};
 	[[nodiscard]] ColumnLayout computeColumnLayout() const;
 	int dialogsSmallColumnWidth() const;
-	bool forceWideDialogs() const;
 	void updateColumnLayout() const;
 	bool canShowThirdSection() const;
 	bool canShowThirdSectionWithoutResize() const;
@@ -516,24 +515,15 @@ public:
 		std::optional<bool> show = std::nullopt) const;
 	void finishChatThemeEdit(not_null<PeerData*> peer);
 
-	[[nodiscard]] bool dialogsListFocused() const {
-		return _dialogsListFocused.current();
+	[[nodiscard]] bool chatsForceDisplayWide() const {
+		return _chatsForceDisplayWide.current();
 	}
-	[[nodiscard]] rpl::producer<bool> dialogsListFocusedChanges() const {
-		return _dialogsListFocused.changes();
-	}
-	void setDialogsListFocused(bool value) {
-		_dialogsListFocused = value;
-	}
-	[[nodiscard]] bool dialogsListDisplayForced() const {
-		return _dialogsListDisplayForced.current();
-	}
-	[[nodiscard]] auto dialogsListDisplayForcedChanges() const
+	[[nodiscard]] auto chatsForceDisplayWideChanges() const
 	-> rpl::producer<bool> {
-		return _dialogsListDisplayForced.changes();
+		return _chatsForceDisplayWide.changes();
 	}
-	void setDialogsListDisplayForced(bool value) {
-		_dialogsListDisplayForced = value;
+	void setChatsForceDisplayWide(bool value) {
+		_chatsForceDisplayWide = value;
 	}
 
 	not_null<SessionController*> parentController() override {
@@ -688,8 +678,7 @@ private:
 	rpl::variable<Dialogs::Key> _searchInChat;
 	rpl::variable<Dialogs::RowDescriptor> _activeChatEntry;
 	rpl::lifetime _activeHistoryLifetime;
-	rpl::variable<bool> _dialogsListFocused = false;
-	rpl::variable<bool> _dialogsListDisplayForced = false;
+	rpl::variable<bool> _chatsForceDisplayWide = false;
 	std::deque<Dialogs::RowDescriptor> _chatEntryHistory;
 	int _chatEntryHistoryPosition = -1;
 	bool _filtersActivated = false;

From 11e4c459695488f98fc2ee4915a1c0ce91dba310 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Apr 2024 15:52:45 +0400
Subject: [PATCH 321/596] Don't collapse chats list on window unfocus.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 22 +++++++++++++------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 ++
 Telegram/SourceFiles/mainwidget.cpp           |  6 ++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 340a29471..e0afa642e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -358,8 +358,11 @@ Widget::Widget(
 		applySearchUpdate();
 	}, _search->lifetime());
 
-	_search->focusedChanges() | rpl::start_with_next([=](bool focused) {
-		updateForceDisplayWide();
+	_search->focusedChanges(
+	) | rpl::start_with_next([=](bool focused) {
+		if (focused) {
+			updateHasFocus(_search.data());
+		}
 	}, _search->lifetime());
 
 	_search->submits(
@@ -1020,7 +1023,7 @@ void Widget::updateControlsVisibility(bool fast) {
 	updateLoadMoreChatsVisibility();
 	_scroll->show();
 	updateStoriesVisibility();
-	if ((_openedFolder || _openedForum) && _search->hasFocus()) {
+	if ((_openedFolder || _openedForum) && _searchHasFocus.current()) {
 		setInnerFocus();
 	}
 	if (_updateTelegram) {
@@ -1059,7 +1062,7 @@ void Widget::updateControlsVisibility(bool fast) {
 	if (_hideChildListCanvas) {
 		_hideChildListCanvas->show();
 	}
-	if (_childList && _search->hasFocus()) {
+	if (_childList && _searchHasFocus.current()) {
 		setInnerFocus();
 	}
 	updateLockUnlockPosition();
@@ -1081,6 +1084,11 @@ void Widget::updateLockUnlockPosition() {
 		st::dialogsFilterPadding.y());
 }
 
+void Widget::updateHasFocus(not_null<QWidget*> focused) {
+	_searchHasFocus = (focused == _search.data());
+	updateForceDisplayWide();
+}
+
 void Widget::changeOpenedSubsection(
 		FnMut<void()> change,
 		bool fromRight,
@@ -1637,7 +1645,7 @@ void Widget::slideFinished() {
 	_shownProgressValue = 1.;
 	updateControlsVisibility(true);
 	if ((!_subsectionTopBar || !_subsectionTopBar->searchHasFocus())
-		&& !_search->hasFocus()) {
+		&& !_searchHasFocus.current()) {
 		controller()->widget()->setInnerFocus();
 	}
 }
@@ -2479,7 +2487,7 @@ void Widget::applySearchUpdate(bool force) {
 }
 
 void Widget::updateForceDisplayWide() {
-	controller()->setChatsForceDisplayWide(_search->hasFocus()
+	controller()->setChatsForceDisplayWide(_searchHasFocus.current()
 		|| !_search->getLastText().isEmpty()
 		|| _searchInChat);
 }
@@ -3203,7 +3211,7 @@ bool Widget::cancelSearch() {
 	_inner->clearFilter();
 	clearSearchField();
 	applySearchUpdate();
-	if (!_searchInChat && _search->hasFocus()) {
+	if (!_searchInChat && _searchHasFocus.current()) {
 		setFocus();
 	}
 	return clearingQuery || clearingInChat;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 6686995f3..f3ebbd715 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -123,6 +123,7 @@ public:
 
 	[[nodiscard]] RowDescriptor resolveChatNext(RowDescriptor from = {}) const;
 	[[nodiscard]] RowDescriptor resolveChatPrevious(RowDescriptor from = {}) const;
+	void updateHasFocus(not_null<QWidget*> focused);
 
 	// Float player interface.
 	bool floatPlayerHandleWheelEvent(QEvent *e) override;
@@ -296,6 +297,7 @@ private:
 	std::vector<Data::ReactionId> _searchTags;
 	rpl::lifetime _searchTagsLifetime;
 	QString _lastSearchText;
+	rpl::variable<bool> _searchHasFocus = false;
 
 	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
 	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsHidden;
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index c60927950..debb7490f 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -2624,7 +2624,11 @@ bool MainWidget::eventFilter(QObject *o, QEvent *e) {
 	const auto widget = o->isWidgetType()
 		? static_cast<QWidget*>(o)
 		: nullptr;
-	if (e->type() == QEvent::MouseButtonPress) {
+	if (e->type() == QEvent::FocusIn) {
+		if (widget && _dialogs && widget->window() == window()) {
+			_dialogs->updateHasFocus(widget);
+		}
+	} else if (e->type() == QEvent::MouseButtonPress) {
 		if (widget && (widget->window() == window())) {
 			const auto event = static_cast<QMouseEvent*>(e);
 			if (event->button() == Qt::BackButton) {

From 18598f8dcaaa28fcaf74fdc8a488df4be6c82aee Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Apr 2024 19:04:18 +0400
Subject: [PATCH 322/596] Initial version of top peers.

---
 Telegram/CMakeLists.txt                       |  26 +-
 Telegram/SourceFiles/api/api_updates.cpp      |   6 +
 .../data/components/recent_peers.cpp          |  18 ++
 .../data/components/recent_peers.h            |  26 ++
 .../SourceFiles/data/components/top_peers.cpp | 157 +++++++++
 .../SourceFiles/data/components/top_peers.h   |  51 +++
 Telegram/SourceFiles/dialogs/dialogs.style    |   6 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  55 +++-
 Telegram/SourceFiles/dialogs/dialogs_widget.h |   5 +-
 .../dialogs/ui/dialogs_stories_list.cpp       |  12 +-
 .../dialogs/ui/dialogs_stories_list.h         |   6 +-
 .../dialogs/ui/dialogs_suggestions.cpp        |  77 +++++
 .../dialogs/ui/dialogs_suggestions.h          |  59 ++++
 .../dialogs/ui/top_peers_strip.cpp            | 302 ++++++++++++++++++
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |  93 ++++++
 Telegram/SourceFiles/history/history.cpp      |   7 +-
 Telegram/SourceFiles/main/main_session.cpp    |   3 +
 Telegram/SourceFiles/main/main_session.h      |  10 +
 .../SourceFiles/mtproto/mtproto_config.cpp    |  13 +-
 Telegram/SourceFiles/mtproto/mtproto_config.h |   1 +
 Telegram/cmake/td_ui.cmake                    |   2 +
 21 files changed, 908 insertions(+), 27 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/components/recent_peers.cpp
 create mode 100644 Telegram/SourceFiles/data/components/recent_peers.h
 create mode 100644 Telegram/SourceFiles/data/components/top_peers.cpp
 create mode 100644 Telegram/SourceFiles/data/components/top_peers.h
 create mode 100644 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
 create mode 100644 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
 create mode 100644 Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
 create mode 100644 Telegram/SourceFiles/dialogs/ui/top_peers_strip.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index baf77c58c..0ffd19f99 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -460,10 +460,14 @@ PRIVATE
     data/business/data_business_info.h
     data/business/data_shortcut_messages.cpp
     data/business/data_shortcut_messages.h
+    data/components/recent_peers.cpp
+    data/components/recent_peers.h
     data/components/scheduled_messages.cpp
     data/components/scheduled_messages.h
     data/components/sponsored_messages.cpp
     data/components/sponsored_messages.h
+    data/components/top_peers.cpp
+    data/components/top_peers.h
     data/notify/data_notify_settings.cpp
     data/notify/data_notify_settings.h
     data/notify/data_peer_notify_settings.cpp
@@ -608,6 +612,18 @@ PRIVATE
     data/data_wall_paper.h
     data/data_web_page.cpp
     data/data_web_page.h
+    dialogs/ui/dialogs_layout.cpp
+    dialogs/ui/dialogs_layout.h
+    dialogs/ui/dialogs_message_view.cpp
+    dialogs/ui/dialogs_message_view.h
+    dialogs/ui/dialogs_stories_content.cpp
+    dialogs/ui/dialogs_stories_content.h
+    dialogs/ui/dialogs_suggestions.cpp
+    dialogs/ui/dialogs_suggestions.h
+    dialogs/ui/dialogs_topics_view.cpp
+    dialogs/ui/dialogs_topics_view.h
+    dialogs/ui/dialogs_video_userpic.cpp
+    dialogs/ui/dialogs_video_userpic.h
     dialogs/dialogs_entry.cpp
     dialogs/dialogs_entry.h
     dialogs/dialogs_indexed_list.cpp
@@ -630,16 +646,6 @@ PRIVATE
     dialogs/dialogs_search_tags.h
     dialogs/dialogs_widget.cpp
     dialogs/dialogs_widget.h
-    dialogs/ui/dialogs_layout.cpp
-    dialogs/ui/dialogs_layout.h
-    dialogs/ui/dialogs_message_view.cpp
-    dialogs/ui/dialogs_message_view.h
-    dialogs/ui/dialogs_stories_content.cpp
-    dialogs/ui/dialogs_stories_content.h
-    dialogs/ui/dialogs_topics_view.cpp
-    dialogs/ui/dialogs_topics_view.h
-    dialogs/ui/dialogs_video_userpic.cpp
-    dialogs/ui/dialogs_video_userpic.h
     editor/color_picker.cpp
     editor/color_picker.h
     editor/controllers/controllers.h
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 9918ec7a9..314e6c862 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 "mtproto/mtproto_dc_options.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/scheduled_messages.h"
+#include "data/components/top_peers.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_saved_messages.h"
@@ -1577,6 +1578,11 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 					} else {
 						if (existing) {
 							existing->destroy();
+						} else {
+							// Not the server-side date, but close enough.
+							session().topPeers().increment(
+								local->history()->peer,
+								local->date());
 						}
 						local->setRealId(d.vid().v);
 					}
diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
new file mode 100644
index 000000000..32fc0ad42
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -0,0 +1,18 @@
+/*
+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/components/recent_peers.h"
+
+namespace Data {
+
+RecentPeers::RecentPeers(not_null<Main::Session*> session)
+: _session(session) {
+}
+
+RecentPeers::~RecentPeers() = default;
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/recent_peers.h b/Telegram/SourceFiles/data/components/recent_peers.h
new file mode 100644
index 000000000..e3a648b47
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/recent_peers.h
@@ -0,0 +1,26 @@
+/*
+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 Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+class RecentPeers final {
+public:
+	explicit RecentPeers(not_null<Main::Session*> session);
+	~RecentPeers();
+
+private:
+	const not_null<Main::Session*> _session;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
new file mode 100644
index 000000000..253c716f3
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -0,0 +1,157 @@
+/*
+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/components/top_peers.h"
+
+#include "api/api_hash.h"
+#include "apiwrap.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "main/main_session.h"
+#include "mtproto/mtproto_config.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kLimit = 32;
+constexpr auto kRequestTimeLimit = 10 * crl::time(1000);
+
+[[nodiscard]] float64 RatingDelta(TimeId now, TimeId was, int decay) {
+	return std::exp((now - was) * 1. / decay);
+}
+
+} // namespace
+
+TopPeers::TopPeers(not_null<Main::Session*> session)
+: _session(session) {
+	using namespace rpl::mappers;
+	crl::on_main(session, [=] {
+		_session->data().chatsListLoadedEvents(
+		) | rpl::filter(_1 == nullptr) | rpl::start_with_next([=] {
+			crl::on_main(_session, [=] {
+				request();
+			});
+		}, _session->lifetime());
+	});
+}
+
+TopPeers::~TopPeers() = default;
+
+std::vector<not_null<PeerData*>> TopPeers::list() const {
+	return _list
+		| ranges::view::transform(&TopPeer::peer)
+		| ranges::to_vector;
+}
+
+bool TopPeers::disabled() const {
+	return _disabled;
+}
+
+rpl::producer<> TopPeers::updates() const {
+	return _updates.events();
+}
+
+void TopPeers::increment(not_null<PeerData*> peer, TimeId date) {
+	if (date <= _lastReceivedDate) {
+		return;
+	}
+	if (const auto user = peer->asUser(); user && !user->isBot()) {
+		auto changed = false;
+		auto i = ranges::find(_list, peer, &TopPeer::peer);
+		if (i == end(_list)) {
+			_list.push_back({ .peer = peer });
+			i = end(_list) - 1;
+			changed = true;
+		}
+		const auto &config = peer->session().mtp().config();
+		const auto decay = config.values().ratingDecay;
+		i->rating += RatingDelta(date, _lastReceivedDate, decay);
+		for (; i != begin(_list); --i) {
+			if (i->rating >= (i - 1)->rating) {
+				changed = true;
+				std::swap(*i, *(i - 1));
+			} else {
+				break;
+			}
+		}
+		if (changed) {
+			_updates.fire({});
+		}
+	}
+}
+
+void TopPeers::reload() {
+	if (_requestId
+		|| (_lastReceived
+			&& _lastReceived + kRequestTimeLimit > crl::now())) {
+		return;
+	}
+	request();
+}
+
+void TopPeers::request() {
+	if (_requestId) {
+		return;
+	}
+
+	_requestId = _session->api().request(MTPcontacts_GetTopPeers(
+		MTP_flags(MTPcontacts_GetTopPeers::Flag::f_correspondents),
+		MTP_int(0),
+		MTP_int(kLimit),
+		MTP_long(countHash())
+	)).done([=](const MTPcontacts_TopPeers &result, const MTP::Response &response) {
+		_lastReceivedDate = TimeId(response.outerMsgId >> 32);
+		_lastReceived = crl::now();
+		_requestId = 0;
+
+		result.match([&](const MTPDcontacts_topPeers &data) {
+			_disabled = false;
+			const auto owner = &_session->data();
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+			for (const auto &category : data.vcategories().v) {
+				const auto &data = category.data();
+				data.vcategory().match(
+					[&](const MTPDtopPeerCategoryCorrespondents &) {
+					_list = ranges::views::all(
+						data.vpeers().v
+					) | ranges::views::transform([&](const MTPTopPeer &top) {
+						return TopPeer{
+							owner->peer(peerFromMTP(top.data().vpeer())),
+							top.data().vrating().v,
+						};
+					}) | ranges::to_vector;
+				}, [](const auto &) {
+					LOG(("API Error: Unexpected top peer category."));
+				});
+			}
+			_updates.fire({});
+		}, [&](const MTPDcontacts_topPeersDisabled &) {
+			if (!_disabled) {
+				_list.clear();
+				_disabled = true;
+				_updates.fire({});
+			}
+		}, [](const MTPDcontacts_topPeersNotModified &) {
+		});
+	}).fail([=] {
+		_lastReceived = crl::now();
+		_requestId = 0;
+	}).send();
+}
+
+uint64 TopPeers::countHash() const {
+	using namespace Api;
+	auto hash = HashInit();
+	for (const auto &top : _list) {
+		HashUpdate(hash, peerToUser(top.peer->id).bare);
+	}
+	return HashFinalize(hash);
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/top_peers.h b/Telegram/SourceFiles/data/components/top_peers.h
new file mode 100644
index 000000000..b5107381c
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/top_peers.h
@@ -0,0 +1,51 @@
+/*
+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 Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+class TopPeers final {
+public:
+	explicit TopPeers(not_null<Main::Session*> session);
+	~TopPeers();
+
+	[[nodiscard]] std::vector<not_null<PeerData*>> list() const;
+	[[nodiscard]] bool disabled() const;
+	[[nodiscard]] rpl::producer<> updates() const;
+
+	void increment(not_null<PeerData*> peer, TimeId date);
+	void reload();
+
+private:
+	struct TopPeer {
+		not_null<PeerData*> peer;
+		float64 rating = 0.;
+	};
+
+	void request();
+	[[nodiscard]] uint64 countHash() const;
+
+	const not_null<Main::Session*> _session;
+
+	std::vector<TopPeer> _list;
+	rpl::event_stream<> _updates;
+	crl::time _lastReceived = 0;
+	TimeId _lastReceivedDate = 0;
+
+	mtpRequestId _requestId = 0;
+
+	bool _disabled = false;
+	bool _received = false;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 224417f20..d0d340b09 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -591,6 +591,11 @@ dialogsStoriesFull: DialogsStories {
 		font: font(11px);
 	}
 }
+topPeers: DialogsStories(dialogsStoriesFull) {
+	photo: 46px;
+	photoLeft: 10px;
+	photoTop: 8px;
+}
 
 dialogsStoriesList: DialogsStoriesList {
 	small: dialogsStories;
@@ -633,3 +638,4 @@ dialogsSearchTagArrowPadding: margins(-6px, 3px, 0px, 0px);
 dialogsSearchTagPromoLeft: 6px;
 dialogsSearchTagPromoRight: 1px;
 dialogsSearchTagPromoSkip: 6px;
+
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e0afa642e..f60781b44 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/options.h"
 #include "dialogs/ui/dialogs_stories_content.h"
 #include "dialogs/ui/dialogs_stories_list.h"
+#include "dialogs/ui/dialogs_suggestions.h"
 #include "dialogs/dialogs_inner_widget.h"
 #include "dialogs/dialogs_search_from_controllers.h"
 #include "dialogs/dialogs_key.h"
@@ -1021,7 +1022,10 @@ void Widget::fullSearchRefreshOn(rpl::producer<> events) {
 
 void Widget::updateControlsVisibility(bool fast) {
 	updateLoadMoreChatsVisibility();
-	_scroll->show();
+	_scroll->setVisible(!_suggestions);
+	if (_suggestions) {
+		_suggestions->show();
+	}
 	updateStoriesVisibility();
 	if ((_openedFolder || _openedForum) && _searchHasFocus.current()) {
 		setInnerFocus();
@@ -1085,8 +1089,36 @@ void Widget::updateLockUnlockPosition() {
 }
 
 void Widget::updateHasFocus(not_null<QWidget*> focused) {
-	_searchHasFocus = (focused == _search.data());
-	updateForceDisplayWide();
+	const auto has = (focused == _search.data());
+	if (_searchHasFocus.current() != has) {
+		_searchHasFocus = (focused == _search.data());
+		updateStoriesVisibility();
+		updateForceDisplayWide();
+		updateSuggestions(anim::type::normal);
+	}
+}
+
+void Widget::updateSuggestions(anim::type animated) {
+	const auto suggest = _searchHasFocus.current()
+		&& !_searchInChat
+		&& (_inner->state() == WidgetState::Default);
+	if (!suggest && _suggestions) {
+		_suggestions = nullptr;
+		_scroll->show();
+	} else if (suggest && !_suggestions) {
+		_suggestions = std::make_unique<Suggestions>(
+			this,
+			rpl::single(TopPeersContent(&session())));
+
+		_suggestions->topPeerChosen(
+		) | rpl::start_with_next([=](PeerId id) {
+			controller()->showPeerHistory(id);
+		}, _suggestions->lifetime());
+
+		_suggestions->show();
+		_scroll->hide();
+		updateControlsGeometry();
+	}
 }
 
 void Widget::changeOpenedSubsection(
@@ -1513,7 +1545,10 @@ void Widget::startWidthAnimation() {
 void Widget::stopWidthAnimation() {
 	_widthAnimationCache = QPixmap();
 	if (!_showAnimation) {
-		_scroll->show();
+		_scroll->setVisible(!_suggestions);
+		if (_suggestions) {
+			_suggestions->show();
+		}
 	}
 	updateStoriesVisibility();
 	update();
@@ -1528,6 +1563,7 @@ void Widget::updateStoriesVisibility() {
 		|| _openedForum
 		|| !_widthAnimationCache.isNull()
 		|| _childList
+		|| _searchHasFocus.current()
 		|| !_search->getLastText().isEmpty()
 		|| _searchInChat
 		|| _stories->empty();
@@ -2460,6 +2496,7 @@ void Widget::applySearchUpdate(bool force) {
 		clearSearchCache();
 	}
 	_cancelSearch->toggle(!filterText.isEmpty(), anim::type::normal);
+	updateSuggestions(anim::type::instant);
 	updateLoadMoreChatsVisibility();
 	updateJumpToDateVisibility();
 	updateLockUnlockPosition();
@@ -2675,6 +2712,7 @@ bool Widget::setSearchInChat(
 	if (searchInPeerUpdated) {
 		_searchInChat = chat;
 		controller()->setSearchInChat(_searchInChat);
+		updateSuggestions(anim::type::instant);
 		updateJumpToDateVisibility();
 		updateStoriesVisibility();
 	}
@@ -3041,6 +3079,14 @@ void Widget::updateControlsGeometry() {
 	};
 	_updateScrollGeometryCached();
 
+	if (_suggestions) {
+		_suggestions->setGeometry(
+			0,
+			expandedStoriesTop,
+			scrollWidth,
+			height() - expandedStoriesTop - bottomSkip);
+	}
+
 	_inner->resize(scrollWidth, _inner->height());
 	_inner->setNarrowRatio(narrowRatio);
 	if (newScrollTop != wasScrollTop) {
@@ -3097,6 +3143,7 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		&& !_openedFolder
 		&& !_openedForum
 		&& _search->isVisible()
+		&& !_search->hasFocus()
 		&& !e->text().isEmpty()) {
 		_search->setFocusFast();
 		QCoreApplication::sendEvent(_search->rawTextEdit(), e);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index f3ebbd715..f3b54aa49 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -75,6 +75,7 @@ class Key;
 struct ChosenRow;
 class InnerWidget;
 enum class SearchRequestType;
+class Suggestions;
 
 class Widget final : public Window::AbstractSectionWidget {
 public:
@@ -242,6 +243,7 @@ private:
 	void startScrollUpButtonAnimation(bool shown);
 	void updateScrollUpPosition();
 	void updateLockUnlockPosition();
+	void updateSuggestions(anim::type animated);
 
 	MTP::Sender _api;
 
@@ -273,6 +275,7 @@ private:
 
 	object_ptr<Ui::ElasticScroll> _scroll;
 	QPointer<InnerWidget> _inner;
+	std::unique_ptr<Suggestions> _suggestions;
 	class BottomButton;
 	object_ptr<BottomButton> _updateTelegram = { nullptr };
 	object_ptr<BottomButton> _loadMoreChats = { nullptr };
@@ -291,7 +294,7 @@ private:
 
 	Data::Folder *_openedFolder = nullptr;
 	Data::Forum *_openedForum = nullptr;
-	Dialogs::Key _searchInChat;
+	Key _searchInChat;
 	History *_searchInMigrated = nullptr;
 	PeerData *_searchFromAuthor = nullptr;
 	std::vector<Data::ReactionId> _searchTags;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index f615f4fb3..1e4a4cd5d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -184,9 +184,9 @@ rpl::producer<bool> List::toggleExpandedRequests() const {
 	return _toggleExpandedRequests.events();
 }
 
-rpl::producer<> List::entered() const {
-	return _entered.events();
-}
+//rpl::producer<> List::entered() const {
+//	return _entered.events();
+//}
 
 rpl::producer<> List::loadMoreRequests() const {
 	return _loadMoreRequests.events();
@@ -217,9 +217,9 @@ void List::requestExpanded(bool expanded) {
 	_toggleExpandedRequests.fire_copy(_expanded);
 }
 
-void List::enterEventHook(QEnterEvent *e) {
-	_entered.fire({});
-}
+//void List::enterEventHook(QEnterEvent *e) {
+	//_entered.fire({});
+//}
 
 void List::resizeEvent(QResizeEvent *e) {
 	updateScrollMax();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 869767745..303938957 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -94,7 +94,7 @@ public:
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
 	[[nodiscard]] rpl::producer<ShowMenuRequest> showMenuRequests() const;
 	[[nodiscard]] rpl::producer<bool> toggleExpandedRequests() const;
-	[[nodiscard]] rpl::producer<> entered() const;
+	//[[nodiscard]] rpl::producer<> entered() const;
 	[[nodiscard]] rpl::producer<> loadMoreRequests() const;
 
 	[[nodiscard]] auto verticalScrollEvents() const
@@ -123,7 +123,7 @@ private:
 	};
 
 	void showContent(Content &&content);
-	void enterEventHook(QEnterEvent *e) override;
+	//void enterEventHook(QEnterEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 	void wheelEvent(QWheelEvent *e) override;
@@ -173,7 +173,7 @@ private:
 	rpl::event_stream<uint64> _clicks;
 	rpl::event_stream<ShowMenuRequest> _showMenuRequests;
 	rpl::event_stream<bool> _toggleExpandedRequests;
-	rpl::event_stream<> _entered;
+	//rpl::event_stream<> _entered;
 	rpl::event_stream<> _loadMoreRequests;
 	rpl::event_stream<> _collapsedGeometryChanged;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
new file mode 100644
index 000000000..9c9e90bc4
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -0,0 +1,77 @@
+/*
+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 "dialogs/ui/dialogs_suggestions.h"
+
+#include "data/components/top_peers.h"
+#include "data/data_user.h"
+#include "main/main_session.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/dynamic_thumbnails.h"
+#include "styles/style_layers.h"
+
+namespace Dialogs {
+
+Suggestions::Suggestions(
+	not_null<QWidget*> parent,
+	rpl::producer<TopPeersList> topPeers)
+: RpWidget(parent)
+, _scroll(std::make_unique<Ui::ElasticScroll>(this))
+, _content(_scroll->setOwnedWidget(object_ptr<Ui::VerticalLayout>(this)))
+, _topPeersWrap(_content->add(object_ptr<Ui::SlideWrap<TopPeersStrip>>(
+	this,
+	object_ptr<TopPeersStrip>(this, std::move(topPeers)))))
+, _topPeers(_topPeersWrap->entity())
+, _divider(_content->add(setupDivider())) {
+	_topPeers->emptyValue() | rpl::start_with_next([=](bool empty) {
+		_topPeersWrap->toggle(!empty, anim::type::instant);
+	}, _topPeers->lifetime());
+
+	_topPeers->clicks() | rpl::start_with_next([=](uint64 peerIdRaw) {
+		_topPeerChosen.fire(PeerId(peerIdRaw));
+	}, _topPeers->lifetime());
+}
+
+Suggestions::~Suggestions() = default;
+
+void Suggestions::paintEvent(QPaintEvent *e) {
+	QPainter(this).fillRect(e->rect(), st::windowBg);
+}
+
+void Suggestions::resizeEvent(QResizeEvent *e) {
+	_scroll->setGeometry(rect());
+	_content->resizeToWidth(width());
+}
+
+object_ptr<Ui::RpWidget> Suggestions::setupDivider() {
+	auto result = object_ptr<Ui::DividerLabel>(
+		this,
+		object_ptr<Ui::FlatLabel>(
+			this,
+			rpl::single(u"Recent"_q),
+			st::boxDividerLabel),
+		st::defaultBoxDividerLabelPadding);
+
+	return result;
+}
+
+TopPeersList TopPeersContent(not_null<Main::Session*> session) {
+	auto result = TopPeersList();
+	for (const auto &peer : session->topPeers().list()) {
+		result.entries.push_back(TopPeersEntry{
+			.id = peer->id.value,
+			.name = peer->shortName(),
+			.userpic = Ui::MakeUserpicThumbnail(peer),
+		});
+	}
+	return result;
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
new file mode 100644
index 000000000..10622576a
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -0,0 +1,59 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+#include "dialogs/ui/top_peers_strip.h"
+#include "ui/rp_widget.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class ElasticScroll;
+class VerticalLayout;
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
+
+namespace Dialogs {
+
+class Suggestions final : public Ui::RpWidget {
+public:
+	Suggestions(
+		not_null<QWidget*> parent,
+		rpl::producer<TopPeersList> topPeers);
+	~Suggestions();
+
+	[[nodiscard]] rpl::producer<PeerId> topPeerChosen() const {
+		return _topPeerChosen.events();
+	}
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+
+	[[nodiscard]] object_ptr<Ui::RpWidget> setupDivider();
+
+	void updateControlsGeometry();
+
+	const std::unique_ptr<Ui::ElasticScroll> _scroll;
+	const not_null<Ui::VerticalLayout*> _content;
+	const not_null<Ui::SlideWrap<TopPeersStrip>*> _topPeersWrap;
+	const not_null<TopPeersStrip*> _topPeers;
+	const not_null<Ui::RpWidget*> _divider;
+
+	rpl::event_stream<PeerId> _topPeerChosen;
+
+};
+
+[[nodiscard]] TopPeersList TopPeersContent(
+	not_null<Main::Session*> session);
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
new file mode 100644
index 000000000..65adee797
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -0,0 +1,302 @@
+/*
+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 "dialogs/ui/top_peers_strip.h"
+
+#include "ui/text/text.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/dynamic_image.h"
+#include "ui/painter.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_widgets.h"
+
+#include <QtWidgets/QApplication>
+
+namespace Dialogs {
+
+struct TopPeersStrip::Entry {
+	uint64 id = 0;
+	Ui::Text::String name;
+	std::shared_ptr<Ui::DynamicImage> userpic;
+	bool subscribed = false;
+};
+
+TopPeersStrip::TopPeersStrip(
+	not_null<QWidget*> parent,
+	rpl::producer<TopPeersList> content)
+: RpWidget(parent) {
+	resize(0, st::topPeers.height);
+
+	std::move(content) | rpl::start_with_next([=](const TopPeersList &list) {
+		apply(list);
+	}, lifetime());
+
+	setMouseTracking(true);
+}
+
+TopPeersStrip::~TopPeersStrip() = default;
+
+void TopPeersStrip::resizeEvent(QResizeEvent *e) {
+	updateScrollMax();
+}
+
+void TopPeersStrip::wheelEvent(QWheelEvent *e) {
+	const auto phase = e->phase();
+	const auto fullDelta = e->pixelDelta().isNull()
+		? e->angleDelta()
+		: e->pixelDelta();
+	if (phase == Qt::ScrollBegin || phase == Qt::ScrollEnd) {
+		_scrollingLock = Qt::Orientation();
+		if (fullDelta.isNull()) {
+			return;
+		}
+	}
+	const auto vertical = qAbs(fullDelta.x()) < qAbs(fullDelta.y());
+	if (_scrollingLock == Qt::Orientation() && phase != Qt::NoScrollPhase) {
+		_scrollingLock = vertical ? Qt::Vertical : Qt::Horizontal;
+	}
+	if (_scrollingLock == Qt::Vertical || (vertical && !_scrollLeftMax)) {
+		_verticalScrollEvents.fire(e);
+		return;
+	}
+	const auto delta = vertical
+		? fullDelta.y()
+		: ((style::RightToLeft() ? -1 : 1) * fullDelta.x());
+
+	const auto now = _scrollLeft;
+	const auto used = now - delta;
+	const auto next = std::clamp(used, 0, _scrollLeftMax);
+	if (next != now) {
+		_scrollLeft = next;
+		updateSelected();
+		update();
+	}
+	e->accept();
+}
+
+void TopPeersStrip::mousePressEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+	_lastMousePosition = e->globalPos();
+	updateSelected();
+
+	_mouseDownPosition = _lastMousePosition;
+	_pressed = _selected;
+}
+
+void TopPeersStrip::mouseMoveEvent(QMouseEvent *e) {
+	_lastMousePosition = e->globalPos();
+	updateSelected();
+
+	if (!_dragging && _mouseDownPosition) {
+		if ((_lastMousePosition - *_mouseDownPosition).manhattanLength()
+			>= QApplication::startDragDistance()) {
+			_dragging = true;
+			_startDraggingLeft = _scrollLeft;
+		}
+	}
+	checkDragging();
+}
+
+void TopPeersStrip::checkDragging() {
+	if (_dragging) {
+		const auto sign = (style::RightToLeft() ? -1 : 1);
+		const auto newLeft = std::clamp(
+			(sign * (_mouseDownPosition->x() - _lastMousePosition.x())
+				+ _startDraggingLeft),
+			0,
+			_scrollLeftMax);
+		if (newLeft != _scrollLeft) {
+			_scrollLeft = newLeft;
+			update();
+		}
+	}
+}
+
+void TopPeersStrip::mouseReleaseEvent(QMouseEvent *e) {
+	_lastMousePosition = e->globalPos();
+	const auto guard = gsl::finally([&] {
+		_mouseDownPosition = std::nullopt;
+	});
+
+	const auto pressed = std::exchange(_pressed, -1);
+	if (finishDragging()) {
+		return;
+	}
+	updateSelected();
+	if (_selected == pressed) {
+		if (_selected < _entries.size()) {
+			_clicks.fire_copy(_entries[_selected].id);
+		}
+	}
+}
+
+void TopPeersStrip::updateScrollMax() {
+	const auto &st = st::topPeers;
+	const auto single = st.photoLeft * 2 + st.photo;
+	const auto widthFull = int(_entries.size()) * single;
+	_scrollLeftMax = std::max(widthFull - width(), 0);
+	_scrollLeft = std::clamp(_scrollLeft, 0, _scrollLeftMax);
+	update();
+}
+
+bool TopPeersStrip::empty() const {
+	return _empty.current();
+}
+
+rpl::producer<bool> TopPeersStrip::emptyValue() const {
+	return _empty.value();
+}
+
+rpl::producer<uint64> TopPeersStrip::clicks() const {
+	return _clicks.events();
+}
+
+auto TopPeersStrip::showMenuRequests() const
+-> rpl::producer<ShowTopPeerMenuRequest> {
+	return _showMenuRequests.events();
+}
+
+void TopPeersStrip::apply(const TopPeersList &list) {
+	auto now = std::vector<Entry>();
+
+	if (list.entries.empty()) {
+		_empty = true;
+	}
+	for (const auto &entry : list.entries) {
+		const auto i = ranges::find(_entries, entry.id, &Entry::id);
+		if (i != end(_entries)) {
+			now.push_back(base::take(*i));
+		} else {
+			now.push_back({ .id = entry.id });
+		}
+		apply(now.back(), entry);
+	}
+	for (auto &entry : _entries) {
+		if (entry.subscribed) {
+			entry.userpic->subscribeToUpdates(nullptr);
+			entry.subscribed = 0;
+		}
+	}
+	_entries = std::move(now);
+	if (!_entries.empty()) {
+		_empty = false;
+	}
+	update();
+}
+
+void TopPeersStrip::apply(Entry &entry, const TopPeersEntry &data) {
+	Expects(entry.id == data.id);
+	Expects(data.userpic != nullptr);
+
+	if (entry.name.toString() != data.name) {
+		entry.name.setText(st::topPeers.nameStyle, data.name);
+	}
+	if (entry.userpic.get() != data.userpic.get()) {
+		if (entry.subscribed) {
+			entry.userpic->subscribeToUpdates(nullptr);
+			entry.subscribed = 0;
+		}
+		entry.userpic = data.userpic;
+	}
+}
+
+void TopPeersStrip::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+	auto x = -_scrollLeft;
+	const auto &st = st::topPeers;
+	const auto line = st.lineTwice / 2;
+	const auto single = st.photoLeft * 2 + st.photo;
+	for (auto &entry : _entries) {
+		if (!entry.subscribed) {
+			entry.userpic->subscribeToUpdates([=] {
+				update();
+			});
+			entry.subscribed = 1;
+		}
+		const auto image = entry.userpic->image(st.photo);
+		p.drawImage(
+			QRect(x + st.photoLeft, st.photoTop, st.photo, st.photo),
+			image);
+
+		const auto nameLeft = x + st.nameLeft;
+		entry.name.drawElided(p, nameLeft, st.nameTop, single, 1, style::al_top);
+
+		x += single;
+	}
+}
+
+void TopPeersStrip::contextMenuEvent(QContextMenuEvent *e) {
+	_menu = nullptr;
+
+	if (e->reason() == QContextMenuEvent::Mouse) {
+		_lastMousePosition = e->globalPos();
+		updateSelected();
+	}
+	if (_selected < 0 || _entries.empty()) {
+		return;
+	}
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::popupMenuWithIcons);
+	_showMenuRequests.fire({
+		_entries[_selected].id,
+		Ui::Menu::CreateAddActionCallback(_menu),
+	});
+	if (_menu->empty()) {
+		_menu = nullptr;
+		return;
+	}
+	const auto updateAfterMenuDestroyed = [=] {
+		const auto globalPosition = QCursor::pos();
+		if (rect().contains(mapFromGlobal(globalPosition))) {
+			_lastMousePosition = globalPosition;
+			updateSelected();
+		}
+	};
+	QObject::connect(
+		_menu.get(),
+		&QObject::destroyed,
+		crl::guard(&_menuGuard, updateAfterMenuDestroyed));
+	_menu->popup(e->globalPos());
+	e->accept();
+}
+
+bool TopPeersStrip::finishDragging() {
+	if (!_dragging) {
+		return false;
+	}
+	checkDragging();
+	_dragging = false;
+	updateSelected();
+	return true;
+}
+
+void TopPeersStrip::updateSelected() {
+	if (_pressed >= 0) {
+		return;
+	}
+	const auto &st = st::topPeers;
+	const auto p = mapFromGlobal(_lastMousePosition);
+	const auto x = p.x();
+	const auto single = st.photoLeft * 2 + st.photo;
+	const auto index = (x - _scrollLeft) / single;
+	const auto selected = (index < 0 || index >= _entries.size())
+		? -1
+		: index;
+	if (_selected != selected) {
+		const auto over = (selected >= 0);
+		if (over != (_selected >= 0)) {
+			setCursor(over ? style::cur_pointer : style::cur_default);
+		}
+		_selected = selected;
+	}
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
new file mode 100644
index 000000000..551b82480
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.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 "base/weak_ptr.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/rp_widget.h"
+
+namespace Ui {
+class DynamicImage;
+} // namespace Ui
+
+namespace Dialogs {
+
+struct TopPeersEntry {
+	uint64 id = 0;
+	QString name;
+	std::shared_ptr<Ui::DynamicImage> userpic;
+	uint32 badge : 30 = 0;
+	uint32 muted : 1 = 0;
+	uint32 online : 1 = 0;
+};
+
+struct TopPeersList {
+	std::vector<TopPeersEntry> entries;
+};
+
+struct ShowTopPeerMenuRequest {
+	uint64 id = 0;
+	Ui::Menu::MenuCallback callback;
+};
+
+class TopPeersStrip final : public Ui::RpWidget {
+public:
+	TopPeersStrip(
+		not_null<QWidget*> parent,
+		rpl::producer<TopPeersList> content);
+	~TopPeersStrip();
+
+	[[nodiscard]] bool empty() const;
+	[[nodiscard]] rpl::producer<bool> emptyValue() const;
+	[[nodiscard]] rpl::producer<uint64> clicks() const;
+	[[nodiscard]] auto showMenuRequests() const
+		-> rpl::producer<ShowTopPeerMenuRequest>;
+
+private:
+	struct Entry;
+
+	void resizeEvent(QResizeEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+
+	void updateScrollMax();
+	void updateSelected();
+	void checkDragging();
+	bool finishDragging();
+
+	void apply(const TopPeersList &list);
+	void apply(Entry &entry, const TopPeersEntry &data);
+
+	std::vector<Entry> _entries;
+	rpl::variable<bool> _empty = true;
+
+	rpl::event_stream<uint64> _clicks;
+	rpl::event_stream<ShowTopPeerMenuRequest> _showMenuRequests;
+	rpl::event_stream<not_null<QWheelEvent*>> _verticalScrollEvents;
+
+	QPoint _lastMousePosition;
+	std::optional<QPoint> _mouseDownPosition;
+	int _startDraggingLeft = 0;
+	int _scrollLeft = 0;
+	int _scrollLeftMax = 0;
+	bool _dragging = false;
+	Qt::Orientation _scrollingLock = {};
+
+	int _selected = -1;
+	int _pressed = -1;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	base::has_weak_ptr _menuGuard;
+
+};
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index c269dba39..94454a586 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
+#include "data/components/top_peers.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_drafts.h"
@@ -429,9 +430,13 @@ not_null<HistoryItem*> History::createItem(
 		}
 		return result;
 	}
-	return message.match([&](const auto &data) {
+	const auto result = message.match([&](const auto &data) {
 		return makeMessage(id, data, localFlags);
 	});
+	if (result->out() && result->isRegular()) {
+		session().topPeers().increment(peer, result->date());
+	}
+	return result;
 }
 
 std::vector<not_null<HistoryItem*>> History::createItems(
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index d0785b2bd..74b983062 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -28,8 +28,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/file_upload.h"
 #include "storage/storage_account.h"
 #include "storage/storage_facade.h"
+#include "data/components/recent_peers.h"
 #include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
+#include "data/components/top_peers.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_user.h"
@@ -100,6 +102,7 @@ Session::Session(
 , _attachWebView(std::make_unique<InlineBots::AttachWebView>(this))
 , _scheduledMessages(std::make_unique<Data::ScheduledMessages>(this))
 , _sponsoredMessages(std::make_unique<Data::SponsoredMessages>(this))
+, _topPeers(std::make_unique<Data::TopPeers>(this))
 , _supportHelper(Support::Helper::Create(this))
 , _saveSettingsTimer([=] { saveSettings(); }) {
 	Expects(_settings != nullptr);
diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h
index 4249f888f..717df1751 100644
--- a/Telegram/SourceFiles/main/main_session.h
+++ b/Telegram/SourceFiles/main/main_session.h
@@ -31,8 +31,10 @@ class Templates;
 namespace Data {
 class Session;
 class Changes;
+class RecentPeers;
 class ScheduledMessages;
 class SponsoredMessages;
+class TopPeers;
 } // namespace Data
 
 namespace Storage {
@@ -106,12 +108,18 @@ public:
 	[[nodiscard]] Data::Changes &changes() const {
 		return *_changes;
 	}
+	[[nodiscard]] Data::RecentPeers &recentPeers() const {
+		return *_recentPeers;
+	}
 	[[nodiscard]] Data::SponsoredMessages &sponsoredMessages() const {
 		return *_sponsoredMessages;
 	}
 	[[nodiscard]] Data::ScheduledMessages &scheduledMessages() const {
 		return *_scheduledMessages;
 	}
+	[[nodiscard]] Data::TopPeers &topPeers() const {
+		return *_topPeers;
+	}
 	[[nodiscard]] Api::Updates &updates() const {
 		return *_updates;
 	}
@@ -232,8 +240,10 @@ private:
 	const std::unique_ptr<Stickers::GiftBoxPack> _giftBoxStickersPacks;
 	const std::unique_ptr<SendAsPeers> _sendAsPeers;
 	const std::unique_ptr<InlineBots::AttachWebView> _attachWebView;
+	const std::unique_ptr<Data::RecentPeers> _recentPeers;
 	const std::unique_ptr<Data::ScheduledMessages> _scheduledMessages;
 	const std::unique_ptr<Data::SponsoredMessages> _sponsoredMessages;
+	const std::unique_ptr<Data::TopPeers> _topPeers;
 
 	const std::unique_ptr<Support::Helper> _supportHelper;
 
diff --git a/Telegram/SourceFiles/mtproto/mtproto_config.cpp b/Telegram/SourceFiles/mtproto/mtproto_config.cpp
index 4986f7190..454339f49 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_config.cpp
+++ b/Telegram/SourceFiles/mtproto/mtproto_config.cpp
@@ -45,7 +45,8 @@ QByteArray Config::serialize() const {
 		+ Serialize::stringSize(_fields.txtDomainString)
 		+ 3 * sizeof(qint32)
 		+ Serialize::stringSize(_fields.reactionDefaultEmoji)
-		+ sizeof(quint64);
+		+ sizeof(quint64)
+		+ sizeof(qint32);
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -89,7 +90,8 @@ QByteArray Config::serialize() const {
 			<< qint32(_fields.blockedMode ? 1 : 0)
 			<< qint32(_fields.captionLengthMax)
 			<< _fields.reactionDefaultEmoji
-			<< quint64(_fields.reactionDefaultCustom);
+			<< quint64(_fields.reactionDefaultCustom)
+			<< qint32(_fields.ratingDecay);
 	}
 	return result;
 }
@@ -185,6 +187,9 @@ std::unique_ptr<Config> Config::FromSerialized(const QByteArray &serialized) {
 		read(raw->_fields.reactionDefaultEmoji);
 		read(raw->_fields.reactionDefaultCustom);
 	}
+	if (!stream.atEnd()) {
+		read(raw->_fields.ratingDecay);
+	}
 
 	if (stream.status() != QDataStream::Ok
 		|| !raw->_dcOptions.constructFromSerialized(dcOptionsSerialized)) {
@@ -249,6 +254,10 @@ void Config::apply(const MTPDconfig &data) {
 		});
 	}
 	_fields.autologinToken = qs(data.vautologin_token().value_or_empty());
+	_fields.ratingDecay = data.vrating_e_decay().v;
+	if (_fields.ratingDecay <= 0) {
+		_fields.ratingDecay = ConfigFields().ratingDecay;
+	}
 
 	if (data.vdc_options().v.empty()) {
 		LOG(("MTP Error: config with empty dc_options received!"));
diff --git a/Telegram/SourceFiles/mtproto/mtproto_config.h b/Telegram/SourceFiles/mtproto/mtproto_config.h
index fc2ed1c17..8a4db80df 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_config.h
+++ b/Telegram/SourceFiles/mtproto/mtproto_config.h
@@ -39,6 +39,7 @@ struct ConfigFields {
 	QString txtDomainString;
 	bool blockedMode = false;
 	int captionLengthMax = 1024;
+	int ratingDecay = 2419200;
 	QString reactionDefaultEmoji = ConfigDefaultReactionEmoji();
 	uint64 reactionDefaultCustom;
 	QString autologinToken;
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 65bbc1eaa..5c0d6e173 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -87,6 +87,8 @@ PRIVATE
     dialogs/dialogs_three_state_icon.h
     dialogs/ui/dialogs_stories_list.cpp
     dialogs/ui/dialogs_stories_list.h
+    dialogs/ui/top_peers_strip.cpp
+    dialogs/ui/top_peers_strip.h
 
     editor/controllers/undo_controller.cpp
     editor/controllers/undo_controller.h

From b259c566b7ead259624cbc915c12582bbb8d4e0a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 11:49:18 +0400
Subject: [PATCH 323/596] Top peer unread badges and online indicators.

---
 Telegram/Resources/langs/lang.strings         |   8 +
 Telegram/SourceFiles/dialogs/dialogs.style    |  10 +
 .../dialogs/ui/dialogs_suggestions.cpp        |  43 +++-
 .../dialogs/ui/top_peers_strip.cpp            | 191 ++++++++++++++++--
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |   5 +-
 5 files changed, 229 insertions(+), 28 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f3be3dc3d..f6c4e47a5 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5087,6 +5087,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_limit_upload_increase_speed" = "by **{percent}**";
 "lng_limit_upload_subscribe_link" = "Telegram Premium";
 
+"lng_recent_title" = "Recent";
+"lng_recent_clear" = "Clear";
+"lng_recent_clear_sure" = "Do you want to clear your search history?";
+"lng_recent_remove" = "Remove from Recent";
+"lng_recent_hide_top" = "Hide all";
+"lng_recent_hide_sure" = "Are you sure you want to hide frequent contacts list?\n\nYou can always return this list in Settings > Privacy > Suggest Frequent Contacts.";
+"lng_recent_hide_button" = "Hide";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index d0d340b09..8d219e71c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -595,6 +595,7 @@ topPeers: DialogsStories(dialogsStoriesFull) {
 	photo: 46px;
 	photoLeft: 10px;
 	photoTop: 8px;
+	nameLeft: 4px;
 }
 
 dialogsStoriesList: DialogsStoriesList {
@@ -628,6 +629,15 @@ dialogsStoriesTooltipHide: IconButton(defaultIconButton) {
 searchedBarHeight: 32px;
 searchedBarFont: normalFont;
 searchedBarPosition: point(17px, 7px);
+searchedBarLabel: FlatLabel(defaultFlatLabel) {
+	textFg: searchedBarFg;
+	margin: margins(17px, 7px, 17px, 7px);
+}
+searchedBarLink: LinkButton(defaultLinkButton) {
+	color: searchedBarFg;
+	overColor: searchedBarFg;
+	padding: margins(17px, 7px, 17px, 7px);
+}
 
 dialogsSearchTagSkip: point(8px, 4px);
 dialogsSearchTagBottom: 10px;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 9c9e90bc4..53ef01cd1 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -9,12 +9,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/components/top_peers.h"
 #include "data/data_user.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/dynamic_thumbnails.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
 
 namespace Dialogs {
@@ -51,27 +54,45 @@ void Suggestions::resizeEvent(QResizeEvent *e) {
 }
 
 object_ptr<Ui::RpWidget> Suggestions::setupDivider() {
-	auto result = object_ptr<Ui::DividerLabel>(
+	auto result = object_ptr<Ui::FixedHeightWidget>(
 		this,
-		object_ptr<Ui::FlatLabel>(
-			this,
-			rpl::single(u"Recent"_q),
-			st::boxDividerLabel),
-		st::defaultBoxDividerLabelPadding);
-
+		st::searchedBarHeight);
+	const auto raw = result.data();
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		tr::lng_recent_title(),
+		st::searchedBarLabel);
+	const auto clear = Ui::CreateChild<Ui::LinkButton>(
+		raw,
+		tr::lng_recent_clear(tr::now),
+		st::searchedBarLink);
+	rpl::combine(
+		raw->sizeValue(),
+		clear->widthValue()
+	) | rpl::start_with_next([=](QSize size, int width) {
+		const auto x = st::searchedBarPosition.x();
+		const auto y = st::searchedBarPosition.y();
+		clear->moveToRight(0, 0, size.width());
+		label->resizeToWidth(size.width() - x - width);
+		label->moveToLeft(x, y, size.width());
+	}, raw->lifetime());
+	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		QPainter(raw).fillRect(clip, st::searchedBarBg);
+	}, raw->lifetime());
 	return result;
 }
 
 TopPeersList TopPeersContent(not_null<Main::Session*> session) {
-	auto result = TopPeersList();
-	for (const auto &peer : session->topPeers().list()) {
-		result.entries.push_back(TopPeersEntry{
+	auto base = TopPeersList();
+	const auto top = session->topPeers().list();
+	for (const auto &peer : top) {
+		base.entries.push_back(TopPeersEntry{
 			.id = peer->id.value,
 			.name = peer->shortName(),
 			.userpic = Ui::MakeUserpicThumbnail(peer),
 		});
 	}
-	return result;
+	return base;
 }
 
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 65adee797..12726cee6 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -7,11 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/ui/top_peers_strip.h"
 
+#include "ui/effects/ripple_animation.h"
 #include "ui/text/text.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/dynamic_image.h"
 #include "ui/painter.h"
+#include "ui/unread_badge_paint.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_widgets.h"
 
@@ -23,7 +25,16 @@ struct TopPeersStrip::Entry {
 	uint64 id = 0;
 	Ui::Text::String name;
 	std::shared_ptr<Ui::DynamicImage> userpic;
-	bool subscribed = false;
+	std::unique_ptr<Ui::RippleAnimation> ripple;
+	Ui::Animations::Simple onlineShown;
+	QImage userpicFrame;
+	float64 userpicFrameOnline = 0.;
+	QString badgeString;
+	uint32 badge : 28 = 0;
+	uint32 userpicFrameDirty : 1 = 0;
+	uint32 subscribed : 1 = 0;
+	uint32 online : 1 = 0;
+	uint32 muted : 1 = 0;
 };
 
 TopPeersStrip::TopPeersStrip(
@@ -39,7 +50,9 @@ TopPeersStrip::TopPeersStrip(
 	setMouseTracking(true);
 }
 
-TopPeersStrip::~TopPeersStrip() = default;
+TopPeersStrip::~TopPeersStrip() {
+	unsubscribeUserpics(true);
+}
 
 void TopPeersStrip::resizeEvent(QResizeEvent *e) {
 	updateScrollMax();
@@ -73,6 +86,7 @@ void TopPeersStrip::wheelEvent(QWheelEvent *e) {
 	const auto next = std::clamp(used, 0, _scrollLeftMax);
 	if (next != now) {
 		_scrollLeft = next;
+		unsubscribeUserpics();
 		updateSelected();
 		update();
 	}
@@ -114,11 +128,45 @@ void TopPeersStrip::checkDragging() {
 			_scrollLeftMax);
 		if (newLeft != _scrollLeft) {
 			_scrollLeft = newLeft;
+			unsubscribeUserpics();
 			update();
 		}
 	}
 }
 
+void TopPeersStrip::unsubscribeUserpics(bool all) {
+	const auto &st = st::topPeers;
+	const auto single = st.photoLeft * 2 + st.photo;
+	auto x = -_scrollLeft;
+	for (auto &entry : _entries) {
+		if (all || x + single <= 0 || x >= width()) {
+			if (entry.subscribed) {
+				entry.userpic->subscribeToUpdates(nullptr);
+				entry.subscribed = false;
+			}
+			entry.userpicFrame = QImage();
+			entry.onlineShown.stop();
+			entry.ripple = nullptr;
+		}
+		x += single;
+	}
+}
+
+void TopPeersStrip::subscribeUserpic(Entry &entry) {
+	const auto raw = entry.userpic.get();
+	entry.userpic->subscribeToUpdates([=] {
+		const auto i = ranges::find(
+			_entries,
+			raw,
+			[&](const Entry &entry) { return entry.userpic.get(); });
+		if (i != end(_entries)) {
+			i->userpicFrameDirty = 1;
+		}
+		update();
+	});
+	entry.subscribed = true;
+}
+
 void TopPeersStrip::mouseReleaseEvent(QMouseEvent *e) {
 	_lastMousePosition = e->globalPos();
 	const auto guard = gsl::finally([&] {
@@ -143,6 +191,7 @@ void TopPeersStrip::updateScrollMax() {
 	const auto widthFull = int(_entries.size()) * single;
 	_scrollLeftMax = std::max(widthFull - width(), 0);
 	_scrollLeft = std::clamp(_scrollLeft, 0, _scrollLeftMax);
+	unsubscribeUserpics();
 	update();
 }
 
@@ -181,10 +230,11 @@ void TopPeersStrip::apply(const TopPeersList &list) {
 	for (auto &entry : _entries) {
 		if (entry.subscribed) {
 			entry.userpic->subscribeToUpdates(nullptr);
-			entry.subscribed = 0;
+			entry.subscribed = false;
 		}
 	}
 	_entries = std::move(now);
+	unsubscribeUserpics();
 	if (!_entries.empty()) {
 		_empty = false;
 	}
@@ -201,37 +251,146 @@ void TopPeersStrip::apply(Entry &entry, const TopPeersEntry &data) {
 	if (entry.userpic.get() != data.userpic.get()) {
 		if (entry.subscribed) {
 			entry.userpic->subscribeToUpdates(nullptr);
-			entry.subscribed = 0;
 		}
 		entry.userpic = data.userpic;
+		if (entry.subscribed) {
+			subscribeUserpic(entry);
+		}
+	}
+	if (entry.online != data.online) {
+		entry.online = data.online;
+		if (!entry.subscribed) {
+			entry.onlineShown.stop();
+		} else {
+			entry.onlineShown.start(
+				[=] { update(); },
+				entry.online ? 0. : 1.,
+				entry.online ? 1. : 0.,
+				st::dialogsOnlineBadgeDuration);
+		}
+	}
+	if (entry.badge != data.badge) {
+		entry.badge = data.badge;
+		entry.badgeString = QString();
+		entry.userpicFrameDirty = 1;
+	}
+	if (entry.muted != data.muted) {
+		entry.muted = data.muted;
+		if (entry.badge) {
+			entry.userpicFrameDirty = 1;
+		}
 	}
 }
 
 void TopPeersStrip::paintEvent(QPaintEvent *e) {
 	auto p = Painter(this);
-	auto x = -_scrollLeft;
 	const auto &st = st::topPeers;
 	const auto line = st.lineTwice / 2;
 	const auto single = st.photoLeft * 2 + st.photo;
-	for (auto &entry : _entries) {
+
+	const auto from = std::min(_scrollLeft / single, int(_entries.size()));
+	const auto till = std::max(
+		(_scrollLeft + width() + single - 1) / single + 1,
+		from);
+
+	auto x = -_scrollLeft + from * single;
+	for (auto i = from; i != till; ++i) {
+		auto &entry = _entries[i];
 		if (!entry.subscribed) {
-			entry.userpic->subscribeToUpdates([=] {
-				update();
-			});
-			entry.subscribed = 1;
+			subscribeUserpic(entry);
 		}
-		const auto image = entry.userpic->image(st.photo);
-		p.drawImage(
-			QRect(x + st.photoLeft, st.photoTop, st.photo, st.photo),
-			image);
+		paintUserpic(p, i, x);
 
 		const auto nameLeft = x + st.nameLeft;
-		entry.name.drawElided(p, nameLeft, st.nameTop, single, 1, style::al_top);
-
+		const auto nameWidth = single - 2 * st.nameLeft;
+		entry.name.drawElided(
+			p,
+			nameLeft,
+			st.nameTop,
+			nameWidth,
+			1,
+			style::al_top);
 		x += single;
 	}
 }
 
+void TopPeersStrip::paintUserpic(Painter &p, int index, int x) {
+	Expects(index >= 0 && index < _entries.size());
+
+	auto &entry = _entries[index];
+	const auto &st = st::topPeers;
+	const auto size = st.photo;
+	const auto rect = QRect(x + st.photoLeft, st.photoTop, size, size);
+
+	const auto online = entry.onlineShown.value(entry.online ? 1. : 0.);
+	const auto useFrame = !entry.userpicFrame.isNull()
+		&& !entry.userpicFrameDirty
+		&& (entry.userpicFrameOnline == online);
+	if (useFrame) {
+		p.drawImage(rect, entry.userpicFrame);
+		return;
+	}
+	const auto simple = entry.userpic->image(size);
+	const auto ratio = style::DevicePixelRatio();
+	const auto renderFrame = (online > 0) || entry.badge;
+	if (!renderFrame) {
+		entry.userpicFrame = QImage();
+		p.drawImage(rect, simple);
+		return;
+	} else if (entry.userpicFrame.size() != QSize(size, size) * ratio) {
+		entry.userpicFrame = QImage(
+			QSize(size, size) * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		entry.userpicFrame.setDevicePixelRatio(ratio);
+	}
+	entry.userpicFrame.fill(Qt::transparent);
+	entry.userpicFrameDirty = 0;
+	entry.userpicFrameOnline = online;
+
+	auto q = QPainter(&entry.userpicFrame);
+	const auto inner = QRect(0, 0, size, size);
+	q.drawImage(inner, simple);
+
+	auto hq = PainterHighQualityEnabler(p);
+
+	if (online > 0) {
+		q.setCompositionMode(QPainter::CompositionMode_Source);
+		const auto onlineSize = st::dialogsOnlineBadgeSize;
+		const auto stroke = st::dialogsOnlineBadgeStroke;
+		const auto skip = st::dialogsOnlineBadgeSkip;
+		const auto shrink = (onlineSize / 2) * (1. - online);
+
+		auto pen = QPen(Qt::transparent);
+		pen.setWidthF(stroke * online);
+		q.setPen(pen);
+		q.setBrush(st::dialogsOnlineBadgeFg);
+		q.drawEllipse(QRectF(
+			size - skip.x() - onlineSize,
+			size - skip.y() - onlineSize,
+			onlineSize,
+			onlineSize
+		).marginsRemoved({ shrink, shrink, shrink, shrink }));
+		q.setCompositionMode(QPainter::CompositionMode_SourceOver);
+	}
+
+	if (entry.badge) {
+		if (entry.badgeString.isEmpty()) {
+			entry.badgeString = (entry.badge < 1000)
+				? QString::number(entry.badge)
+				: (QString::number(entry.badge / 1000) + 'K');
+		}
+		auto st = Ui::UnreadBadgeStyle();
+		st.selected = (_selected == index);
+		st.muted = entry.muted;
+		const auto &counter = entry.badgeString;
+		const auto badge = PaintUnreadBadge(q, counter, size, 0, st);
+	}
+
+	q.end();
+
+	p.drawImage(rect, entry.userpicFrame);
+}
+
 void TopPeersStrip::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = nullptr;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 551b82480..9875fc4b2 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -21,7 +21,7 @@ struct TopPeersEntry {
 	uint64 id = 0;
 	QString name;
 	std::shared_ptr<Ui::DynamicImage> userpic;
-	uint32 badge : 30 = 0;
+	uint32 badge : 28 = 0;
 	uint32 muted : 1 = 0;
 	uint32 online : 1 = 0;
 };
@@ -63,6 +63,9 @@ private:
 	void updateSelected();
 	void checkDragging();
 	bool finishDragging();
+	void subscribeUserpic(Entry &entry);
+	void unsubscribeUserpics(bool all = false);
+	void paintUserpic(Painter &p, int index, int x);
 
 	void apply(const TopPeersList &list);
 	void apply(Entry &entry, const TopPeersEntry &data);

From 56e28feb0006cd070f437015e09f69f9908fb1d2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 12:41:32 +0400
Subject: [PATCH 324/596] Top peer realtime badges.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   2 +-
 .../dialogs/ui/dialogs_suggestions.cpp        | 156 ++++++++++++++++--
 .../dialogs/ui/dialogs_suggestions.h          |   2 +-
 .../dialogs/ui/top_peers_strip.cpp            |   2 +-
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |   1 +
 .../SourceFiles/ui/dynamic_thumbnails.cpp     |  61 ++++++-
 Telegram/SourceFiles/ui/dynamic_thumbnails.h  |   1 +
 7 files changed, 205 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index f60781b44..82cec9097 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1108,7 +1108,7 @@ void Widget::updateSuggestions(anim::type animated) {
 	} else if (suggest && !_suggestions) {
 		_suggestions = std::make_unique<Suggestions>(
 			this,
-			rpl::single(TopPeersContent(&session())));
+			TopPeersContent(&session()));
 
 		_suggestions->topPeerChosen(
 		) | rpl::start_with_next([=](PeerId id) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 53ef01cd1..7e312c602 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -7,8 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/ui/dialogs_suggestions.h"
 
+#include "base/unixtime.h"
 #include "data/components/top_peers.h"
+#include "data/data_changes.h"
+#include "data/data_peer_values.h"
+#include "data/data_session.h"
 #include "data/data_user.h"
+#include "history/history.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/widgets/buttons.h"
@@ -82,17 +87,146 @@ object_ptr<Ui::RpWidget> Suggestions::setupDivider() {
 	return result;
 }
 
-TopPeersList TopPeersContent(not_null<Main::Session*> session) {
-	auto base = TopPeersList();
-	const auto top = session->topPeers().list();
-	for (const auto &peer : top) {
-		base.entries.push_back(TopPeersEntry{
-			.id = peer->id.value,
-			.name = peer->shortName(),
-			.userpic = Ui::MakeUserpicThumbnail(peer),
-		});
-	}
-	return base;
+rpl::producer<TopPeersList> TopPeersContent(
+		not_null<Main::Session*> session) {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		struct Entry {
+			not_null<History*> history;
+			int index = 0;
+		};
+		struct State {
+			TopPeersList data;
+			base::flat_map<not_null<PeerData*>, Entry> indices;
+			base::has_weak_ptr guard;
+			bool scheduled = true;
+		};
+		auto state = lifetime.make_state<State>();
+		const auto top = session->topPeers().list();
+		auto &entries = state->data.entries;
+		auto &indices = state->indices;
+		entries.reserve(top.size());
+		indices.reserve(top.size());
+		const auto now = base::unixtime::now();
+		for (const auto &peer : top) {
+			const auto user = peer->asUser();
+			const auto self = user && user->isSelf();
+			const auto history = peer->owner().history(peer);
+			const auto badges = history->chatListBadgesState();
+			entries.push_back({
+				.id = peer->id.value,
+				.name = (self
+					? tr::lng_saved_messages(tr::now)
+					: peer->shortName()),
+				.userpic = (self
+					? Ui::MakeSavedMessagesThumbnail()
+					: Ui::MakeUserpicThumbnail(peer)),
+				.badge = uint32(badges.unreadCounter),
+				.unread = badges.unread,
+				.muted = !self && history->muted(),
+				.online = user && !self && Data::IsUserOnline(user, now),
+			});
+			if (entries.back().online) {
+				user->owner().watchForOffline(user, now);
+			}
+			indices.emplace(peer, Entry{
+				.history = peer->owner().history(peer),
+				.index = int(entries.size()) - 1,
+			});
+		}
+
+		const auto push = [=] {
+			if (!state->scheduled) {
+				return;
+			}
+			state->scheduled = false;
+			consumer.put_next_copy(state->data);
+		};
+		const auto schedule = [=] {
+			if (state->scheduled) {
+				return;
+			}
+			state->scheduled = true;
+			crl::on_main(&state->guard, push);
+		};
+
+		using Flag = Data::PeerUpdate::Flag;
+		session->changes().peerUpdates(
+			Flag::Name
+			| Flag::Photo
+			| Flag::Notifications
+			| Flag::OnlineStatus
+		) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+			const auto peer = update.peer;
+			if (peer->isSelf()) {
+				return;
+			}
+			const auto i = state->indices.find(peer);
+			if (i == end(state->indices)) {
+				return;
+			}
+			auto changed = false;
+			auto &entry = state->data.entries[i->second.index];
+			const auto flags = update.flags;
+			if (flags & Flag::Name) {
+				const auto now = peer->shortName();
+				if (entry.name != now) {
+					entry.name = now;
+					changed = true;
+				}
+			}
+			if (flags & Flag::Photo) {
+				entry.userpic = Ui::MakeUserpicThumbnail(peer);
+				changed = true;
+			}
+			if (flags & Flag::Notifications) {
+				const auto now = i->second.history->muted();
+				if (entry.muted != now) {
+					entry.muted = now;
+					changed = true;
+				}
+			}
+			if (flags & Flag::OnlineStatus) {
+				if (const auto user = peer->asUser()) {
+					const auto now = base::unixtime::now();
+					const auto value = Data::IsUserOnline(user, now);
+					if (entry.online != value) {
+						entry.online = value;
+						changed = true;
+						if (value) {
+							user->owner().watchForOffline(user, now);
+						}
+					}
+				}
+			}
+			if (changed) {
+				schedule();
+			}
+		}, lifetime);
+
+		session->data().unreadBadgeChanges(
+		) | rpl::start_with_next([=] {
+			auto changed = false;
+			auto &entries = state->data.entries;
+			for (const auto &[peer, data] : state->indices) {
+				const auto badges = data.history->chatListBadgesState();
+				auto &entry = entries[data.index];
+				if (entry.badge != badges.unreadCounter
+					|| entry.unread != badges.unread) {
+					entry.badge = badges.unreadCounter;
+					entry.unread = badges.unread;
+					changed = true;
+				}
+			}
+			if (changed) {
+				schedule();
+			}
+		}, lifetime);
+
+		push();
+		return lifetime;
+	};
 }
 
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 10622576a..ada2d4be0 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -53,7 +53,7 @@ private:
 
 };
 
-[[nodiscard]] TopPeersList TopPeersContent(
+[[nodiscard]] rpl::producer<TopPeersList> TopPeersContent(
 	not_null<Main::Session*> session);
 
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 12726cee6..02ace8a02 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -445,7 +445,7 @@ void TopPeersStrip::updateSelected() {
 	const auto p = mapFromGlobal(_lastMousePosition);
 	const auto x = p.x();
 	const auto single = st.photoLeft * 2 + st.photo;
-	const auto index = (x - _scrollLeft) / single;
+	const auto index = (_scrollLeft + x) / single;
 	const auto selected = (index < 0 || index >= _entries.size())
 		? -1
 		: index;
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 9875fc4b2..1662aa88b 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -22,6 +22,7 @@ struct TopPeersEntry {
 	QString name;
 	std::shared_ptr<Ui::DynamicImage> userpic;
 	uint32 badge : 28 = 0;
+	uint32 unread : 1 = 0;
 	uint32 muted : 1 = 0;
 	uint32 online : 1 = 0;
 };
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
index 847e7d5de..fb977e6d7 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo_media.h"
 #include "data/data_story.h"
 #include "main/main_session.h"
+#include "ui/empty_userpic.h"
 #include "ui/dynamic_image.h"
 #include "ui/painter.h"
 #include "ui/userpic_view.h"
@@ -39,6 +40,7 @@ private:
 		Ui::PeerUserpicView view;
 		Fn<void()> callback;
 		InMemoryKey key;
+		int paletteVersion = 0;
 		rpl::lifetime photoLifetime;
 		rpl::lifetime downloadLifetime;
 	};
@@ -117,6 +119,17 @@ private:
 
 };
 
+class SavedMessagesUserpic final : public DynamicImage {
+public:
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	QImage _frame;
+	int _paletteVersion = 0;
+
+};
+
 PeerUserpic::PeerUserpic(not_null<PeerData*> peer, bool forceRound)
 : _peer(peer)
 , _forceRound(forceRound) {
@@ -127,13 +140,21 @@ QImage PeerUserpic::image(int size) {
 
 	const auto good = (_frame.width() == size * _frame.devicePixelRatio());
 	const auto key = _peer->userpicUniqueKey(_subscribed->view);
-	if (!good || (_subscribed->key != key && !waitingUserpicLoad())) {
-		const auto ratio = style::DevicePixelRatio();
+	const auto paletteVersion = style::PaletteVersion();
+	if (!good
+		|| (_subscribed->paletteVersion != paletteVersion
+			&& _peer->useEmptyUserpic(_subscribed->view))
+		|| (_subscribed->key != key && !waitingUserpicLoad())) {
 		_subscribed->key = key;
-		_frame = QImage(
-			QSize(size, size) * ratio,
-			QImage::Format_ARGB32_Premultiplied);
-		_frame.setDevicePixelRatio(ratio);
+		_subscribed->paletteVersion = paletteVersion;
+
+		const auto ratio = style::DevicePixelRatio();
+		if (!good) {
+			_frame = QImage(
+				QSize(size, size) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_frame.setDevicePixelRatio(ratio);
+		}
 		_frame.fill(Qt::transparent);
 
 		auto p = Painter(&_frame);
@@ -313,6 +334,30 @@ QImage EmptyThumbnail::image(int size) {
 void EmptyThumbnail::subscribeToUpdates(Fn<void()> callback) {
 }
 
+QImage SavedMessagesUserpic::image(int size) {
+	const auto good = (_frame.width() == size * _frame.devicePixelRatio());
+	const auto paletteVersion = style::PaletteVersion();
+	if (!good || _paletteVersion != paletteVersion) {
+		_paletteVersion = paletteVersion;
+
+		const auto ratio = style::DevicePixelRatio();
+		if (!good) {
+			_frame = QImage(
+				QSize(size, size) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_frame.setDevicePixelRatio(ratio);
+		}
+		_frame.fill(Qt::transparent);
+
+		auto p = Painter(&_frame);
+		Ui::EmptyUserpic::PaintSavedMessages(p, 0, 0, size, size);
+	}
+	return _frame;
+}
+
+void SavedMessagesUserpic::subscribeToUpdates(Fn<void()> callback) {
+}
+
 } // namespace
 
 std::shared_ptr<DynamicImage> MakeUserpicThumbnail(
@@ -321,6 +366,10 @@ std::shared_ptr<DynamicImage> MakeUserpicThumbnail(
 	return std::make_shared<PeerUserpic>(peer, forceRound);
 }
 
+std::shared_ptr<DynamicImage> MakeSavedMessagesThumbnail() {
+	return std::make_shared<SavedMessagesUserpic>();
+}
+
 std::shared_ptr<DynamicImage> MakeStoryThumbnail(
 		not_null<Data::Story*> story) {
 	using Result = std::shared_ptr<DynamicImage>;
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.h b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
index cbf3cb235..ad8556d5d 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.h
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
@@ -20,6 +20,7 @@ class DynamicImage;
 [[nodiscard]] std::shared_ptr<DynamicImage> MakeUserpicThumbnail(
 	not_null<PeerData*> peer,
 	bool forceRound = false);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeSavedMessagesThumbnail();
 [[nodiscard]] std::shared_ptr<DynamicImage> MakeStoryThumbnail(
 	not_null<Data::Story*> story);
 

From 19ae76d8de4a492a7cacb71ebca174a09006a849 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 13:12:57 +0400
Subject: [PATCH 325/596] Top peers context menu.

---
 .../SourceFiles/data/components/top_peers.cpp | 13 +++++
 .../SourceFiles/data/components/top_peers.h   |  1 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 35 +++++++-----
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 +-
 .../dialogs/ui/dialogs_suggestions.cpp        | 54 +++++++++++++++++++
 .../dialogs/ui/dialogs_suggestions.h          |  5 ++
 .../dialogs/ui/top_peers_strip.cpp            | 31 +++++++++--
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |  3 ++
 8 files changed, 126 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
index 253c716f3..7d41f2399 100644
--- a/Telegram/SourceFiles/data/components/top_peers.cpp
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -56,6 +56,19 @@ rpl::producer<> TopPeers::updates() const {
 	return _updates.events();
 }
 
+void TopPeers::remove(not_null<PeerData*> peer) {
+	const auto i = ranges::find(_list, peer, &TopPeer::peer);
+	if (i != end(_list)) {
+		_list.erase(i);
+		_updates.fire({});
+	}
+
+	_requestId = _session->api().request(MTPcontacts_ResetTopPeerRating(
+		MTP_topPeerCategoryCorrespondents(),
+		peer->input
+	)).send();
+}
+
 void TopPeers::increment(not_null<PeerData*> peer, TimeId date) {
 	if (date <= _lastReceivedDate) {
 		return;
diff --git a/Telegram/SourceFiles/data/components/top_peers.h b/Telegram/SourceFiles/data/components/top_peers.h
index b5107381c..67e69261a 100644
--- a/Telegram/SourceFiles/data/components/top_peers.h
+++ b/Telegram/SourceFiles/data/components/top_peers.h
@@ -22,6 +22,7 @@ public:
 	[[nodiscard]] bool disabled() const;
 	[[nodiscard]] rpl::producer<> updates() const;
 
+	void remove(not_null<PeerData*> peer);
 	void increment(not_null<PeerData*> peer, TimeId date);
 	void reload();
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 82cec9097..231bba6b1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1027,7 +1027,7 @@ void Widget::updateControlsVisibility(bool fast) {
 		_suggestions->show();
 	}
 	updateStoriesVisibility();
-	if ((_openedFolder || _openedForum) && _searchHasFocus.current()) {
+	if ((_openedFolder || _openedForum) && _searchHasFocus) {
 		setInnerFocus();
 	}
 	if (_updateTelegram) {
@@ -1066,7 +1066,7 @@ void Widget::updateControlsVisibility(bool fast) {
 	if (_hideChildListCanvas) {
 		_hideChildListCanvas->show();
 	}
-	if (_childList && _searchHasFocus.current()) {
+	if (_childList && _searchHasFocus) {
 		setInnerFocus();
 	}
 	updateLockUnlockPosition();
@@ -1090,16 +1090,26 @@ void Widget::updateLockUnlockPosition() {
 
 void Widget::updateHasFocus(not_null<QWidget*> focused) {
 	const auto has = (focused == _search.data());
-	if (_searchHasFocus.current() != has) {
-		_searchHasFocus = (focused == _search.data());
-		updateStoriesVisibility();
-		updateForceDisplayWide();
-		updateSuggestions(anim::type::normal);
+	if (_searchHasFocus != has) {
+		_searchHasFocus = has;
+		const auto update = [=] {
+			updateStoriesVisibility();
+			updateForceDisplayWide();
+			updateSuggestions(anim::type::normal);
+		};
+		if (has) {
+			update();
+		} else {
+			// Search field may loose focus from the destructor of some
+			// widget, in that case we don't want to destroy _suggestions
+			// syncrhonously, because it may lead to a crash.
+			crl::on_main(this, update);
+		}
 	}
 }
 
 void Widget::updateSuggestions(anim::type animated) {
-	const auto suggest = _searchHasFocus.current()
+	const auto suggest = _searchHasFocus
 		&& !_searchInChat
 		&& (_inner->state() == WidgetState::Default);
 	if (!suggest && _suggestions) {
@@ -1108,6 +1118,7 @@ void Widget::updateSuggestions(anim::type animated) {
 	} else if (suggest && !_suggestions) {
 		_suggestions = std::make_unique<Suggestions>(
 			this,
+			controller(),
 			TopPeersContent(&session()));
 
 		_suggestions->topPeerChosen(
@@ -1563,7 +1574,7 @@ void Widget::updateStoriesVisibility() {
 		|| _openedForum
 		|| !_widthAnimationCache.isNull()
 		|| _childList
-		|| _searchHasFocus.current()
+		|| _searchHasFocus
 		|| !_search->getLastText().isEmpty()
 		|| _searchInChat
 		|| _stories->empty();
@@ -1681,7 +1692,7 @@ void Widget::slideFinished() {
 	_shownProgressValue = 1.;
 	updateControlsVisibility(true);
 	if ((!_subsectionTopBar || !_subsectionTopBar->searchHasFocus())
-		&& !_searchHasFocus.current()) {
+		&& !_searchHasFocus) {
 		controller()->widget()->setInnerFocus();
 	}
 }
@@ -2524,7 +2535,7 @@ void Widget::applySearchUpdate(bool force) {
 }
 
 void Widget::updateForceDisplayWide() {
-	controller()->setChatsForceDisplayWide(_searchHasFocus.current()
+	controller()->setChatsForceDisplayWide(_searchHasFocus
 		|| !_search->getLastText().isEmpty()
 		|| _searchInChat);
 }
@@ -3258,7 +3269,7 @@ bool Widget::cancelSearch() {
 	_inner->clearFilter();
 	clearSearchField();
 	applySearchUpdate();
-	if (!_searchInChat && _searchHasFocus.current()) {
+	if (!_searchInChat && _searchHasFocus) {
 		setFocus();
 	}
 	return clearingQuery || clearingInChat;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index f3b54aa49..6ebd6ab50 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -300,7 +300,7 @@ private:
 	std::vector<Data::ReactionId> _searchTags;
 	rpl::lifetime _searchTagsLifetime;
 	QString _lastSearchText;
-	rpl::variable<bool> _searchHasFocus = false;
+	bool _searchHasFocus = false;
 
 	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
 	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsHidden;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 7e312c602..62e63d554 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -22,13 +22,55 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/dynamic_thumbnails.h"
+#include "window/window_session_controller.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 
 namespace Dialogs {
+namespace {
+
+void FillTopPeerMenu(
+		not_null<Window::SessionController*> controller,
+		const ShowTopPeerMenuRequest &request,
+		Fn<void(not_null<PeerData*>)> remove) {
+	const auto owner = &controller->session().data();
+	const auto peer = owner->peer(PeerId(request.id));
+	const auto &add = request.callback;
+	const auto group = peer->isMegagroup();
+	const auto channel = peer->isChannel();
+
+	const auto showHistoryText = group
+		? tr::lng_context_open_group(tr::now)
+		: channel
+		? tr::lng_context_open_channel(tr::now)
+		: tr::lng_profile_send_message(tr::now);
+	add(showHistoryText, [=] {
+		controller->showPeerHistory(peer);
+	}, channel ? &st::menuIconChannel : &st::menuIconChatBubble);
+
+	const auto viewProfileText = group
+		? tr::lng_context_view_group(tr::now)
+		: channel
+		? tr::lng_context_view_channel(tr::now)
+		: tr::lng_context_view_profile(tr::now);
+	add(viewProfileText, [=] {
+		controller->showPeerInfo(peer);
+	}, channel ? &st::menuIconInfo : &st::menuIconProfile);
+
+	add({
+		.text = tr::lng_recent_remove(tr::now),
+		.handler = [=] { remove(peer); },
+		.icon = &st::menuIconDeleteAttention,
+		.isAttention = true,
+	});
+}
+
+} // namespace
 
 Suggestions::Suggestions(
 	not_null<QWidget*> parent,
+	not_null<Window::SessionController*> controller,
 	rpl::producer<TopPeersList> topPeers)
 : RpWidget(parent)
 , _scroll(std::make_unique<Ui::ElasticScroll>(this))
@@ -45,6 +87,15 @@ Suggestions::Suggestions(
 	_topPeers->clicks() | rpl::start_with_next([=](uint64 peerIdRaw) {
 		_topPeerChosen.fire(PeerId(peerIdRaw));
 	}, _topPeers->lifetime());
+
+	_topPeers->showMenuRequests(
+	) | rpl::start_with_next([=](const ShowTopPeerMenuRequest &request) {
+		const auto remove = crl::guard(this, [=](not_null<PeerData*> peer) {
+			peer->session().topPeers().remove(peer);
+			_topPeers->removeLocally(peer->id.value);
+		});
+		FillTopPeerMenu(controller, request, remove);
+	}, _topPeers->lifetime());
 }
 
 Suggestions::~Suggestions() = default;
@@ -111,6 +162,9 @@ rpl::producer<TopPeersList> TopPeersContent(
 		const auto now = base::unixtime::now();
 		for (const auto &peer : top) {
 			const auto user = peer->asUser();
+			if (user->isInaccessible()) {
+				continue;
+			}
 			const auto self = user && user->isSelf();
 			const auto history = peer->owner().history(peer);
 			const auto badges = history->chatListBadgesState();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index ada2d4be0..f40455f17 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -22,12 +22,17 @@ template <typename Widget>
 class SlideWrap;
 } // namespace Ui
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Dialogs {
 
 class Suggestions final : public Ui::RpWidget {
 public:
 	Suggestions(
 		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller,
 		rpl::producer<TopPeersList> topPeers);
 	~Suggestions();
 
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 02ace8a02..03e7cd09e 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -212,13 +212,29 @@ auto TopPeersStrip::showMenuRequests() const
 	return _showMenuRequests.events();
 }
 
+void TopPeersStrip::removeLocally(uint64 id) {
+	_removed.emplace(id);
+	const auto i = ranges::find(_entries, id, &Entry::id);
+	if (i == end(_entries)) {
+		return;
+	} else if (i->subscribed) {
+		i->userpic->subscribeToUpdates(nullptr);
+	}
+	_entries.erase(i);
+	updateScrollMax();
+	if (_entries.empty()) {
+		_empty = true;
+	}
+	update();
+}
+
 void TopPeersStrip::apply(const TopPeersList &list) {
 	auto now = std::vector<Entry>();
 
-	if (list.entries.empty()) {
-		_empty = true;
-	}
 	for (const auto &entry : list.entries) {
+		if (_removed.contains(entry.id)) {
+			continue;
+		}
 		const auto i = ranges::find(_entries, entry.id, &Entry::id);
 		if (i != end(_entries)) {
 			now.push_back(base::take(*i));
@@ -227,6 +243,9 @@ void TopPeersStrip::apply(const TopPeersList &list) {
 		}
 		apply(now.back(), entry);
 	}
+	if (now.empty()) {
+		_empty = true;
+	}
 	for (auto &entry : _entries) {
 		if (entry.subscribed) {
 			entry.userpic->subscribeToUpdates(nullptr);
@@ -234,6 +253,7 @@ void TopPeersStrip::apply(const TopPeersList &list) {
 		}
 	}
 	_entries = std::move(now);
+	updateScrollMax();
 	unsubscribeUserpics();
 	if (!_entries.empty()) {
 		_empty = false;
@@ -289,9 +309,10 @@ void TopPeersStrip::paintEvent(QPaintEvent *e) {
 	const auto single = st.photoLeft * 2 + st.photo;
 
 	const auto from = std::min(_scrollLeft / single, int(_entries.size()));
-	const auto till = std::max(
+	const auto till = std::clamp(
 		(_scrollLeft + width() + single - 1) / single + 1,
-		from);
+		from,
+		int(_entries.size()));
 
 	auto x = -_scrollLeft + from * single;
 	for (auto i = from; i != till; ++i) {
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 1662aa88b..5eac0ae03 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -49,6 +49,8 @@ public:
 	[[nodiscard]] auto showMenuRequests() const
 		-> rpl::producer<ShowTopPeerMenuRequest>;
 
+	void removeLocally(uint64 id);
+
 private:
 	struct Entry;
 
@@ -73,6 +75,7 @@ private:
 
 	std::vector<Entry> _entries;
 	rpl::variable<bool> _empty = true;
+	base::flat_set<uint64> _removed;
 
 	rpl::event_stream<uint64> _clicks;
 	rpl::event_stream<ShowTopPeerMenuRequest> _showMenuRequests;

From a6c1def6fe630f7b3ee836f5e7a6b3e4085dbb65 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 13:36:41 +0400
Subject: [PATCH 326/596] Add ripples to top peers.

---
 Telegram/SourceFiles/dialogs/dialogs.style    |  4 +-
 .../dialogs/ui/top_peers_strip.cpp            | 94 +++++++++++++++++--
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |  6 +-
 3 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 8d219e71c..3f4fffe0a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -595,8 +595,10 @@ topPeers: DialogsStories(dialogsStoriesFull) {
 	photo: 46px;
 	photoLeft: 10px;
 	photoTop: 8px;
-	nameLeft: 4px;
+	nameLeft: 6px;
 }
+topPeersRadius: 4px;
+topPeersMargin: margins(3px, 3px, 3px, 4px);
 
 dialogsStoriesList: DialogsStoriesList {
 	small: dialogsStories;
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 03e7cd09e..2c8e53d36 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -40,7 +40,8 @@ struct TopPeersStrip::Entry {
 TopPeersStrip::TopPeersStrip(
 	not_null<QWidget*> parent,
 	rpl::producer<TopPeersList> content)
-: RpWidget(parent) {
+: RpWidget(parent)
+, _selection(st::topPeersRadius, st::windowBgOver) {
 	resize(0, st::topPeers.height);
 
 	std::move(content) | rpl::start_with_next([=](const TopPeersList &list) {
@@ -102,6 +103,23 @@ void TopPeersStrip::mousePressEvent(QMouseEvent *e) {
 
 	_mouseDownPosition = _lastMousePosition;
 	_pressed = _selected;
+
+	if (_selected >= 0) {
+		Assert(_selected < _entries.size());
+		auto &entry = _entries[_selected];
+		if (!entry.ripple) {
+			entry.ripple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				Ui::RippleAnimation::RoundRectMask(
+					innerRounded().size(),
+					st::topPeersRadius),
+				[=] { update(); });
+		}
+		const auto single = outer().width();
+		entry.ripple->add(e->pos() - QPoint(
+			_selected * single - _scrollLeft + st::topPeersMargin.left(),
+			st::topPeersMargin.top()));
+	}
 }
 
 void TopPeersStrip::mouseMoveEvent(QMouseEvent *e) {
@@ -174,14 +192,20 @@ void TopPeersStrip::mouseReleaseEvent(QMouseEvent *e) {
 	});
 
 	const auto pressed = std::exchange(_pressed, -1);
+	if (pressed >= 0) {
+		Assert(pressed < _entries.size());
+		auto &entry = _entries[pressed];
+		if (entry.ripple) {
+			entry.ripple->lastStop();
+		}
+	}
 	if (finishDragging()) {
 		return;
 	}
 	updateSelected();
-	if (_selected == pressed) {
-		if (_selected < _entries.size()) {
-			_clicks.fire_copy(_entries[_selected].id);
-		}
+	if (_selected >= 0 && _selected == pressed) {
+		Assert(_selected < _entries.size());
+		_clicks.fire_copy(_entries[_selected].id);
 	}
 }
 
@@ -220,7 +244,14 @@ void TopPeersStrip::removeLocally(uint64 id) {
 	} else if (i->subscribed) {
 		i->userpic->subscribeToUpdates(nullptr);
 	}
+	const auto index = int(i - begin(_entries));
 	_entries.erase(i);
+	if (_selected > index) {
+		--_selected;
+	}
+	if (_pressed > index) {
+		--_pressed;
+	}
 	updateScrollMax();
 	if (_entries.empty()) {
 		_empty = true;
@@ -231,6 +262,8 @@ void TopPeersStrip::removeLocally(uint64 id) {
 void TopPeersStrip::apply(const TopPeersList &list) {
 	auto now = std::vector<Entry>();
 
+	auto selectedId = (_selected >= 0) ? _entries[_selected].id : 0;
+	auto pressedId = (_pressed >= 0) ? _entries[_pressed].id : 0;
 	for (const auto &entry : list.entries) {
 		if (_removed.contains(entry.id)) {
 			continue;
@@ -253,6 +286,18 @@ void TopPeersStrip::apply(const TopPeersList &list) {
 		}
 	}
 	_entries = std::move(now);
+	if (selectedId) {
+		const auto i = ranges::find(_entries, selectedId, &Entry::id);
+		if (i != end(_entries)) {
+			_selected = int(i - begin(_entries));
+		}
+	}
+	if (pressedId) {
+		const auto i = ranges::find(_entries, pressedId, &Entry::id);
+		if (i != end(_entries)) {
+			_pressed = int(i - begin(_entries));
+		}
+	}
 	updateScrollMax();
 	unsubscribeUserpics();
 	if (!_entries.empty()) {
@@ -302,10 +347,19 @@ void TopPeersStrip::apply(Entry &entry, const TopPeersEntry &data) {
 	}
 }
 
+QRect TopPeersStrip::outer() const {
+	const auto &st = st::topPeers;
+	const auto single = st.photoLeft * 2 + st.photo;
+	return QRect(0, 0, single, height());
+}
+
+QRect TopPeersStrip::innerRounded() const {
+	return outer().marginsRemoved(st::topPeersMargin);
+}
+
 void TopPeersStrip::paintEvent(QPaintEvent *e) {
 	auto p = Painter(this);
 	const auto &st = st::topPeers;
-	const auto line = st.lineTwice / 2;
 	const auto single = st.photoLeft * 2 + st.photo;
 
 	const auto from = std::min(_scrollLeft / single, int(_entries.size()));
@@ -315,12 +369,28 @@ void TopPeersStrip::paintEvent(QPaintEvent *e) {
 		int(_entries.size()));
 
 	auto x = -_scrollLeft + from * single;
+	const auto highlighted = (_pressed >= 0) ? _pressed : _selected;
 	for (auto i = from; i != till; ++i) {
 		auto &entry = _entries[i];
+		const auto selected = (i == highlighted);
+		if (selected) {
+			_selection.paint(p, innerRounded().translated(x, 0));
+		}
+		if (entry.ripple) {
+			entry.ripple->paint(
+				p,
+				x + st::topPeersMargin.left(),
+				st::topPeersMargin.top(),
+				width());
+			if (entry.ripple->empty()) {
+				entry.ripple = nullptr;
+			}
+		}
+
 		if (!entry.subscribed) {
 			subscribeUserpic(entry);
 		}
-		paintUserpic(p, i, x);
+		paintUserpic(p, x, i, selected);
 
 		const auto nameLeft = x + st.nameLeft;
 		const auto nameWidth = single - 2 * st.nameLeft;
@@ -335,7 +405,11 @@ void TopPeersStrip::paintEvent(QPaintEvent *e) {
 	}
 }
 
-void TopPeersStrip::paintUserpic(Painter &p, int index, int x) {
+void TopPeersStrip::paintUserpic(
+		Painter &p,
+		int x,
+		int index,
+		bool selected) {
 	Expects(index >= 0 && index < _entries.size());
 
 	auto &entry = _entries[index];
@@ -401,7 +475,7 @@ void TopPeersStrip::paintUserpic(Painter &p, int index, int x) {
 				: (QString::number(entry.badge / 1000) + 'K');
 		}
 		auto st = Ui::UnreadBadgeStyle();
-		st.selected = (_selected == index);
+		st.selected = selected;
 		st.muted = entry.muted;
 		const auto &counter = entry.badgeString;
 		const auto badge = PaintUnreadBadge(q, counter, size, 0, st);
@@ -422,6 +496,7 @@ void TopPeersStrip::contextMenuEvent(QContextMenuEvent *e) {
 	if (_selected < 0 || _entries.empty()) {
 		return;
 	}
+	Assert(_selected < _entries.size());
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
 		st::popupMenuWithIcons);
@@ -476,6 +551,7 @@ void TopPeersStrip::updateSelected() {
 			setCursor(over ? style::cur_pointer : style::cur_default);
 		}
 		_selected = selected;
+		update();
 	}
 }
 
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 5eac0ae03..0eead5cc5 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/weak_ptr.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/round_rect.h"
 #include "ui/rp_widget.h"
 
 namespace Ui {
@@ -68,8 +69,10 @@ private:
 	bool finishDragging();
 	void subscribeUserpic(Entry &entry);
 	void unsubscribeUserpics(bool all = false);
-	void paintUserpic(Painter &p, int index, int x);
+	void paintUserpic(Painter &p, int x, int index, bool selected);
 
+	[[nodiscard]] QRect outer() const;
+	[[nodiscard]] QRect innerRounded() const;
 	void apply(const TopPeersList &list);
 	void apply(Entry &entry, const TopPeersEntry &data);
 
@@ -92,6 +95,7 @@ private:
 	int _selected = -1;
 	int _pressed = -1;
 
+	Ui::RoundRect _selection;
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	base::has_weak_ptr _menuGuard;
 

From e1c21b908c3da7cc8bb70d404968df59644d0558 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 13:55:38 +0400
Subject: [PATCH 327/596] Add keyboard navigation to top peers.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 32 ++++++-
 .../dialogs/ui/dialogs_suggestions.cpp        | 37 +++++++++
 .../dialogs/ui/dialogs_suggestions.h          |  6 ++
 .../dialogs/ui/top_peers_strip.cpp            | 83 ++++++++++++++++++-
 .../SourceFiles/dialogs/ui/top_peers_strip.h  | 11 +++
 5 files changed, 162 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 231bba6b1..98956f32f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1720,7 +1720,10 @@ void Widget::escape() {
 }
 
 void Widget::submit() {
-	if (_inner->chooseRow()) {
+	if (_suggestions) {
+		_suggestions->chooseRow();
+		return;
+	} else if (_inner->chooseRow()) {
 		return;
 	}
 	const auto state = _inner->state();
@@ -3142,13 +3145,34 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
 		submit();
 	} else if (e->key() == Qt::Key_Down) {
-		_inner->selectSkip(1);
+		if (_suggestions) {
+			_suggestions->selectSkip(1);
+		} else {
+			_inner->selectSkip(1);
+		}
 	} else if (e->key() == Qt::Key_Up) {
+		if (_suggestions) {
+			_suggestions->selectSkip(-1);
+		} else {
+			_inner->selectSkip(-1);
+		}
 		_inner->selectSkip(-1);
+	} else if (e->key() == Qt::Key_Left && _suggestions) {
+		_suggestions->selectLeft();
+	} else if (e->key() == Qt::Key_Right && _suggestions) {
+		_suggestions->selectRight();
 	} else if (e->key() == Qt::Key_PageDown) {
-		_inner->selectSkipPage(_scroll->height(), 1);
+		if (_suggestions) {
+			_suggestions->selectSkipPage(_scroll->height(), 1);
+		} else {
+			_inner->selectSkipPage(_scroll->height(), 1);
+		}
 	} else if (e->key() == Qt::Key_PageUp) {
-		_inner->selectSkipPage(_scroll->height(), -1);
+		if (_suggestions) {
+			_suggestions->selectSkipPage(_scroll->height(), -1);
+		} else {
+			_inner->selectSkipPage(_scroll->height(), -1);
+		}
 	} else if (!(e->modifiers() & ~Qt::ShiftModifier)
 		&& e->key() != Qt::Key_Shift
 		&& !_openedFolder
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 62e63d554..b62c662c4 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -100,6 +100,43 @@ Suggestions::Suggestions(
 
 Suggestions::~Suggestions() = default;
 
+void Suggestions::selectSkip(int delta) {
+	if (!delta) {
+		return;
+	} else if (delta > 0) {
+		const auto hasRecent = false;
+		if (hasRecent && (_topPeers->selectedByKeyboard() || delta > 1)) {
+			_topPeers->deselectByKeyboard();
+		} else {
+			_topPeers->selectByKeyboard(0);
+		}
+	} else {
+		if (_topPeers->selectedByKeyboard()) {
+			_topPeers->deselectByKeyboard();
+		}
+	}
+}
+
+void Suggestions::selectSkipPage(int height, int direction) {
+	if (_topPeers->selectedByKeyboard()) {
+		_topPeers->deselectByKeyboard();
+	}
+}
+
+void Suggestions::chooseRow() {
+	if (_topPeers->chooseRow()) {
+		return;
+	}
+}
+
+void Suggestions::selectLeft() {
+	_topPeers->selectLeft();
+}
+
+void Suggestions::selectRight() {
+	_topPeers->selectRight();
+}
+
 void Suggestions::paintEvent(QPaintEvent *e) {
 	QPainter(this).fillRect(e->rect(), st::windowBg);
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index f40455f17..aa6491f42 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -36,6 +36,12 @@ public:
 		rpl::producer<TopPeersList> topPeers);
 	~Suggestions();
 
+	void selectSkip(int delta);
+	void selectSkipPage(int height, int direction);
+	void selectLeft();
+	void selectRight();
+	void chooseRow();
+
 	[[nodiscard]] rpl::producer<PeerId> topPeerChosen() const {
 		return _topPeerChosen.events();
 	}
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 2c8e53d36..74756f53c 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -94,6 +94,11 @@ void TopPeersStrip::wheelEvent(QWheelEvent *e) {
 	e->accept();
 }
 
+void TopPeersStrip::leaveEventHook(QEvent *e) {
+	setSelected(-1);
+	_selectionByKeyboard = false;
+}
+
 void TopPeersStrip::mousePressEvent(QMouseEvent *e) {
 	if (e->button() != Qt::LeftButton) {
 		return;
@@ -123,7 +128,11 @@ void TopPeersStrip::mousePressEvent(QMouseEvent *e) {
 }
 
 void TopPeersStrip::mouseMoveEvent(QMouseEvent *e) {
+	if (_lastMousePosition == e->globalPos() && _selectionByKeyboard) {
+		return;
+	}
 	_lastMousePosition = e->globalPos();
+	_selectionByKeyboard = false;
 	updateSelected();
 
 	if (!_dragging && _mouseDownPosition) {
@@ -259,6 +268,58 @@ void TopPeersStrip::removeLocally(uint64 id) {
 	update();
 }
 
+bool TopPeersStrip::selectedByKeyboard() const {
+	return _selectionByKeyboard && _selected >= 0;
+}
+
+void TopPeersStrip::selectByKeyboard(int delta) {
+	if (_entries.empty()) {
+		return;
+	}
+	_selectionByKeyboard = true;
+	if (!delta) {
+		if (_selected < 0) {
+			setSelected(0);
+			scrollToSelected();
+		}
+		return;
+	}
+	setSelected(std::clamp(_selected + delta, 0, int(_entries.size()) - 1));
+	scrollToSelected();
+}
+
+void TopPeersStrip::deselectByKeyboard() {
+	if (_selectionByKeyboard) {
+		_selectionByKeyboard = false;
+		setSelected(-1);
+	}
+}
+
+void TopPeersStrip::selectLeft() {
+	if (_selected > 0) {
+		_selectionByKeyboard = true;
+		setSelected(_selected - 1);
+		scrollToSelected();
+	}
+}
+
+void TopPeersStrip::selectRight() {
+	if (_selected + 1 < _entries.size()) {
+		_selectionByKeyboard = true;
+		setSelected(_selected + 1);
+		scrollToSelected();
+	}
+}
+
+bool TopPeersStrip::chooseRow() {
+	if (_selected >= 0) {
+		Assert(_selected < _entries.size());
+		_clicks.fire_copy(_entries[_selected].id);
+		return true;
+	}
+	return false;
+}
+
 void TopPeersStrip::apply(const TopPeersList &list) {
 	auto now = std::vector<Entry>();
 
@@ -542,9 +603,10 @@ void TopPeersStrip::updateSelected() {
 	const auto x = p.x();
 	const auto single = st.photoLeft * 2 + st.photo;
 	const auto index = (_scrollLeft + x) / single;
-	const auto selected = (index < 0 || index >= _entries.size())
-		? -1
-		: index;
+	setSelected((index < 0 || index >= _entries.size()) ? -1 : index);
+}
+
+void TopPeersStrip::setSelected(int selected) {
 	if (_selected != selected) {
 		const auto over = (selected >= 0);
 		if (over != (_selected >= 0)) {
@@ -555,4 +617,19 @@ void TopPeersStrip::updateSelected() {
 	}
 }
 
+void TopPeersStrip::scrollToSelected() {
+	if (_selected < 0) {
+		return;
+	}
+	const auto &st = st::topPeers;
+	const auto single = st.photoLeft * 2 + st.photo;
+	const auto left = _selected * single;
+	const auto right = left + single;
+	if (_scrollLeft > left) {
+		_scrollLeft = std::clamp(left, 0, _scrollLeftMax);
+	} else if (_scrollLeft + width() < right) {
+		_scrollLeft = std::clamp(right - width(), 0, _scrollLeftMax);
+	}
+}
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 0eead5cc5..5a4c9c2b1 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -52,6 +52,13 @@ public:
 
 	void removeLocally(uint64 id);
 
+	[[nodiscard]] bool selectedByKeyboard() const;
+	void selectByKeyboard(int delta);
+	void selectLeft();
+	void selectRight();
+	void deselectByKeyboard();
+	bool chooseRow();
+
 private:
 	struct Entry;
 
@@ -62,9 +69,12 @@ private:
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
 	void contextMenuEvent(QContextMenuEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
 
 	void updateScrollMax();
 	void updateSelected();
+	void setSelected(int selected);
+	void scrollToSelected();
 	void checkDragging();
 	bool finishDragging();
 	void subscribeUserpic(Entry &entry);
@@ -94,6 +104,7 @@ private:
 
 	int _selected = -1;
 	int _pressed = -1;
+	bool _selectionByKeyboard = false;
 
 	Ui::RoundRect _selection;
 	base::unique_qptr<Ui::PopupMenu> _menu;

From c11f4efc5cb611c8a420829aff34969a17908cb2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 16:32:58 +0400
Subject: [PATCH 328/596] Support disabling top peers completely.

---
 Telegram/Resources/langs/lang.strings         |  3 ++
 .../SourceFiles/data/components/top_peers.cpp | 23 +++++++++-
 .../SourceFiles/data/components/top_peers.h   |  1 +
 .../dialogs/ui/dialogs_suggestions.cpp        | 44 ++++++++++++++-----
 .../dialogs/ui/top_peers_strip.cpp            | 12 +++++
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |  3 +-
 .../admin_log/history_admin_log_item.cpp      | 20 +++------
 Telegram/SourceFiles/history/history.cpp      | 20 ++++++---
 Telegram/SourceFiles/history/history.h        |  3 +-
 .../settings/settings_privacy_security.cpp    | 31 +++++++++++++
 10 files changed, 125 insertions(+), 35 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f6c4e47a5..36c2c9393 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -730,6 +730,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_angle_backend_d3d11on12" = "D3D11on12";
 "lng_settings_angle_backend_opengl" = "OpenGL";
 "lng_settings_angle_backend_disabled" = "Disabled";
+"lng_settings_top_peers_title" = "Frequent contacts";
+"lng_settings_top_peers_suggest" = "Suggest frequent contacts";
+"lng_settings_top_peers_about" = "Display people you message frequently at the top of the search section for quick access.";
 "lng_settings_sensitive_title" = "Sensitive content";
 "lng_settings_sensitive_disable_filtering" = "Disable filtering";
 "lng_settings_sensitive_about" = "Display sensitive media in public channels on all your Telegram devices.";
diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
index 7d41f2399..8e6149259 100644
--- a/Telegram/SourceFiles/data/components/top_peers.cpp
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -70,7 +70,7 @@ void TopPeers::remove(not_null<PeerData*> peer) {
 }
 
 void TopPeers::increment(not_null<PeerData*> peer, TimeId date) {
-	if (date <= _lastReceivedDate) {
+	if (_disabled || date <= _lastReceivedDate) {
 		return;
 	}
 	if (const auto user = peer->asUser(); user && !user->isBot()) {
@@ -107,6 +107,27 @@ void TopPeers::reload() {
 	request();
 }
 
+void TopPeers::toggleDisabled(bool disabled) {
+	if (disabled) {
+		if (!_disabled || !_list.empty()) {
+			_disabled = true;
+			_list.clear();
+			_updates.fire({});
+		}
+	} else if (_disabled) {
+		_disabled = false;
+		_updates.fire({});
+	}
+
+	_session->api().request(MTPcontacts_ToggleTopPeers(
+		MTP_bool(!disabled)
+	)).done([=] {
+		if (!_disabled) {
+			request();
+		}
+	}).send();
+}
+
 void TopPeers::request() {
 	if (_requestId) {
 		return;
diff --git a/Telegram/SourceFiles/data/components/top_peers.h b/Telegram/SourceFiles/data/components/top_peers.h
index 67e69261a..da44a0c6c 100644
--- a/Telegram/SourceFiles/data/components/top_peers.h
+++ b/Telegram/SourceFiles/data/components/top_peers.h
@@ -25,6 +25,7 @@ public:
 	void remove(not_null<PeerData*> peer);
 	void increment(not_null<PeerData*> peer, TimeId date);
 	void reload();
+	void toggleDisabled(bool disabled);
 
 private:
 	struct TopPeer {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index b62c662c4..ad5bce8d0 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/labels.h"
@@ -23,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "ui/dynamic_thumbnails.h"
 #include "window/window_session_controller.h"
+#include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
@@ -33,13 +35,23 @@ namespace {
 void FillTopPeerMenu(
 		not_null<Window::SessionController*> controller,
 		const ShowTopPeerMenuRequest &request,
-		Fn<void(not_null<PeerData*>)> remove) {
+		Fn<void(not_null<PeerData*>)> remove,
+		Fn<void()> hideAll) {
 	const auto owner = &controller->session().data();
 	const auto peer = owner->peer(PeerId(request.id));
 	const auto &add = request.callback;
 	const auto group = peer->isMegagroup();
 	const auto channel = peer->isChannel();
 
+	add({
+		.text = tr::lng_recent_remove(tr::now),
+		.handler = [=] { remove(peer); },
+		.icon = &st::menuIconDeleteAttention,
+		.isAttention = true,
+	});
+
+	add({ .separatorSt = &st::expandedMenuSeparator });
+
 	const auto showHistoryText = group
 		? tr::lng_context_open_group(tr::now)
 		: channel
@@ -58,12 +70,14 @@ void FillTopPeerMenu(
 		controller->showPeerInfo(peer);
 	}, channel ? &st::menuIconInfo : &st::menuIconProfile);
 
-	add({
-		.text = tr::lng_recent_remove(tr::now),
-		.handler = [=] { remove(peer); },
-		.icon = &st::menuIconDeleteAttention,
-		.isAttention = true,
-	});
+	add({ .separatorSt = &st::expandedMenuSeparator });
+
+	add(tr::lng_recent_hide_top(tr::now), [=] {
+		controller->show(Ui::MakeConfirmBox({
+			.text = tr::lng_recent_hide_sure(),
+			.confirmed = [=](Fn<void()> close) { hideAll(); close(); }
+		}));
+	}, &st::menuIconCancel);
 }
 
 } // namespace
@@ -90,11 +104,21 @@ Suggestions::Suggestions(
 
 	_topPeers->showMenuRequests(
 	) | rpl::start_with_next([=](const ShowTopPeerMenuRequest &request) {
-		const auto remove = crl::guard(this, [=](not_null<PeerData*> peer) {
+		const auto weak = Ui::MakeWeak(this);
+		const auto remove = [=](not_null<PeerData*> peer) {
 			peer->session().topPeers().remove(peer);
-			_topPeers->removeLocally(peer->id.value);
+			if (weak) {
+				_topPeers->removeLocally(peer->id.value);
+			}
+		};
+		const auto session = &controller->session();
+		const auto hideAll = crl::guard(session, [=] {
+			session->topPeers().toggleDisabled(true);
+			if (weak) {
+				_topPeers->removeLocally();
+			}
 		});
-		FillTopPeerMenu(controller, request, remove);
+		FillTopPeerMenu(controller, request, remove, hideAll);
 	}, _topPeers->lifetime());
 }
 
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 74756f53c..01771f9e0 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -246,6 +246,15 @@ auto TopPeersStrip::showMenuRequests() const
 }
 
 void TopPeersStrip::removeLocally(uint64 id) {
+	if (!id) {
+		unsubscribeUserpics(true);
+		setSelected(-1);
+		_pressed = -1;
+		_entries.clear();
+		_hiddenLocally = true;
+		_empty = true;
+		return;
+	}
 	_removed.emplace(id);
 	const auto i = ranges::find(_entries, id, &Entry::id);
 	if (i == end(_entries)) {
@@ -321,6 +330,9 @@ bool TopPeersStrip::chooseRow() {
 }
 
 void TopPeersStrip::apply(const TopPeersList &list) {
+	if (_hiddenLocally) {
+		return;
+	}
 	auto now = std::vector<Entry>();
 
 	auto selectedId = (_selected >= 0) ? _entries[_selected].id : 0;
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 5a4c9c2b1..84584e56d 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -50,7 +50,7 @@ public:
 	[[nodiscard]] auto showMenuRequests() const
 		-> rpl::producer<ShowTopPeerMenuRequest>;
 
-	void removeLocally(uint64 id);
+	void removeLocally(uint64 id = 0);
 
 	[[nodiscard]] bool selectedByKeyboard() const;
 	void selectByKeyboard(int delta);
@@ -105,6 +105,7 @@ private:
 	int _selected = -1;
 	int _pressed = -1;
 	bool _selectionByKeyboard = false;
+	bool _hiddenLocally = false;
 
 	Ui::RoundRect _selection;
 	base::unique_qptr<Ui::PopupMenu> _menu;
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 53e0926e0..72d797460 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -953,13 +953,11 @@ void GenerateItems(
 					Ui::Text::WithEntities);
 			addSimpleServiceMessage(text, realId);
 
-			const auto detachExistingItem = false;
 			addPart(
 				history->createItem(
 					history->nextNonHistoryEntryId(),
 					PrepareLogMessage(action.vmessage(), date),
-					MessageFlag::AdminLogEntry,
-					detachExistingItem),
+					MessageFlag::AdminLogEntry),
 				ExtractSentDate(action.vmessage()),
 				realId);
 		}, [&](const auto &) {
@@ -1008,12 +1006,10 @@ void GenerateItems(
 				Ui::Text::WithEntities);
 		addSimpleServiceMessage(text, realId);
 
-		const auto detachExistingItem = false;
 		const auto body = history->createItem(
 			history->nextNonHistoryEntryId(),
 			PrepareLogMessage(action.vnew_message(), date),
-			MessageFlag::AdminLogEntry,
-			detachExistingItem);
+			MessageFlag::AdminLogEntry);
 		if (oldValue.text.isEmpty()) {
 			oldValue = PrepareText(
 				QString(),
@@ -1038,13 +1034,11 @@ void GenerateItems(
 			Ui::Text::WithEntities);
 		addSimpleServiceMessage(text, realId);
 
-		const auto detachExistingItem = false;
 		addPart(
 			history->createItem(
 				history->nextNonHistoryEntryId(),
 				PrepareLogMessage(action.vmessage(), date),
-				MessageFlag::AdminLogEntry,
-				detachExistingItem),
+				MessageFlag::AdminLogEntry),
 			ExtractSentDate(action.vmessage()),
 			realId);
 	};
@@ -1218,13 +1212,11 @@ void GenerateItems(
 			Ui::Text::WithEntities);
 		addSimpleServiceMessage(text, realId);
 
-		const auto detachExistingItem = false;
 		addPart(
 			history->createItem(
 				history->nextNonHistoryEntryId(),
 				PrepareLogMessage(action.vmessage(), date),
-				MessageFlag::AdminLogEntry,
-				detachExistingItem),
+				MessageFlag::AdminLogEntry),
 			ExtractSentDate(action.vmessage()),
 			realId);
 	};
@@ -1604,13 +1596,11 @@ void GenerateItems(
 			Ui::Text::WithEntities);
 		addSimpleServiceMessage(text, realId);
 
-		const auto detachExistingItem = false;
 		addPart(
 			history->createItem(
 				history->nextNonHistoryEntryId(),
 				PrepareLogMessage(data.vmessage(), date),
-				MessageFlag::AdminLogEntry,
-				detachExistingItem),
+				MessageFlag::AdminLogEntry),
 			ExtractSentDate(data.vmessage()),
 			realId);
 	};
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 94454a586..dca53737d 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -423,7 +423,8 @@ not_null<HistoryItem*> History::createItem(
 		MsgId id,
 		const MTPMessage &message,
 		MessageFlags localFlags,
-		bool detachExistingItem) {
+		bool detachExistingItem,
+		bool newMessage) {
 	if (const auto result = owner().message(peer, id)) {
 		if (detachExistingItem) {
 			result->removeMainView();
@@ -433,7 +434,7 @@ not_null<HistoryItem*> History::createItem(
 	const auto result = message.match([&](const auto &data) {
 		return makeMessage(id, data, localFlags);
 	});
-	if (result->out() && result->isRegular()) {
+	if (newMessage && result->out() && result->isRegular()) {
 		session().topPeers().increment(peer, result->date());
 	}
 	return result;
@@ -461,16 +462,21 @@ not_null<HistoryItem*> History::addNewMessage(
 		const MTPMessage &message,
 		MessageFlags localFlags,
 		NewMessageType type) {
-	const auto detachExisting = (type == NewMessageType::Unread);
-	const auto item = createItem(id, message, localFlags, detachExisting);
+	const auto newMessage = (type == NewMessageType::Unread);
+	const auto detachExisting = newMessage;
+	const auto item = createItem(
+		id,
+		message,
+		localFlags,
+		detachExisting,
+		newMessage);
 	if (type == NewMessageType::Existing || item->mainView()) {
 		return item;
 	}
-	const auto unread = (type == NewMessageType::Unread);
-	if (unread && item->isHistoryEntry()) {
+	if (newMessage && item->isHistoryEntry()) {
 		applyMessageChanges(item, message);
 	}
-	return addNewItem(item, unread);
+	return addNewItem(item, newMessage);
 }
 
 not_null<HistoryItem*> History::insertItem(
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 4a4ad8ddc..e00c23b8d 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -185,7 +185,8 @@ public:
 		MsgId id,
 		const MTPMessage &message,
 		MessageFlags localFlags,
-		bool detachExistingItem);
+		bool detachExistingItem = false,
+		bool newMessage = false);
 	std::vector<not_null<HistoryItem*>> createItems(
 		const QVector<MTPMessage> &data);
 
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 4849719ff..66a26632b 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -44,6 +44,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_instance.h"
 #include "core/update_checker.h"
 #include "lang/lang_keys.h"
+#include "data/components/top_peers.h"
 #include "data/data_session.h"
 #include "data/data_chat.h"
 #include "data/data_channel.h"
@@ -546,6 +547,35 @@ void SetupCloudPassword(
 	session->api().cloudPassword().reload();
 }
 
+void SetupTopPeers(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container) {
+	Ui::AddSkip(container);
+	Ui::AddSubsectionTitle(container, tr::lng_settings_top_peers_title());
+
+	const auto session = &controller->session();
+
+	container->add(object_ptr<Button>(
+		container,
+		tr::lng_settings_top_peers_suggest(),
+		st::settingsButtonNoIcon
+	))->toggleOn(rpl::single(
+		rpl::empty
+	) | rpl::then(
+		session->topPeers().updates()
+	) | rpl::map([=] {
+		return !session->topPeers().disabled();
+	}))->toggledChanges(
+	) | rpl::filter([=](bool enabled) {
+		return enabled == session->topPeers().disabled();
+	}) | rpl::start_with_next([=](bool enabled) {
+		session->topPeers().toggleDisabled(!enabled);
+	}, container->lifetime());
+
+	Ui::AddSkip(container);
+	Ui::AddDividerText(container, tr::lng_settings_top_peers_about());
+}
+
 void SetupSensitiveContent(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container,
@@ -1065,6 +1095,7 @@ void PrivacySecurity::setupContent(
 
 	SetupSecurity(controller, content, trigger(), showOtherMethod());
 	SetupPrivacy(controller, content, trigger());
+	SetupTopPeers(controller, content);
 #if !defined OS_MAC_STORE && !defined OS_WIN_STORE
 	SetupSensitiveContent(controller, content, trigger());
 #else // !OS_MAC_STORE && !OS_WIN_STORE

From 4cdd93902805f14ac161cd9e64ce6a31e8c777b6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 17:46:19 +0400
Subject: [PATCH 329/596] Cache topPeers locally.

---
 .../SourceFiles/core/core_settings_proxy.cpp  | 17 ++--
 .../SourceFiles/data/components/top_peers.cpp | 89 ++++++++++++++++++-
 .../SourceFiles/data/components/top_peers.h   |  3 +
 Telegram/SourceFiles/main/main_account.cpp    |  1 +
 .../SourceFiles/storage/serialize_common.cpp  | 19 ++++
 .../SourceFiles/storage/serialize_common.h    | 64 +++++++++++++
 .../SourceFiles/storage/serialize_peer.cpp    |  4 +
 .../SourceFiles/storage/storage_account.cpp   | 89 ++++++++++++++++++-
 .../SourceFiles/storage/storage_account.h     |  8 ++
 9 files changed, 280 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings_proxy.cpp b/Telegram/SourceFiles/core/core_settings_proxy.cpp
index b219f4fca..1807aa2ef 100644
--- a/Telegram/SourceFiles/core/core_settings_proxy.cpp
+++ b/Telegram/SourceFiles/core/core_settings_proxy.cpp
@@ -95,9 +95,6 @@ SettingsProxy::SettingsProxy()
 }
 
 QByteArray SettingsProxy::serialize() const {
-	auto result = QByteArray();
-	auto stream = QDataStream(&result, QIODevice::WriteOnly);
-
 	const auto serializedSelected = SerializeProxyData(_selected);
 	const auto serializedList = ranges::views::all(
 		_list
@@ -111,9 +108,7 @@ QByteArray SettingsProxy::serialize() const {
 			0,
 			ranges::plus(),
 			&Serialize::bytearraySize);
-	result.reserve(size);
-
-	stream.setVersion(QDataStream::Qt_5_1);
+	auto stream = Serialize::ByteArrayWriter(size);
 	stream
 		<< qint32(_tryIPv6 ? 1 : 0)
 		<< qint32(_useProxyForCalls ? 1 : 0)
@@ -123,9 +118,7 @@ QByteArray SettingsProxy::serialize() const {
 	for (const auto &i : serializedList) {
 		stream << i;
 	}
-
-	stream.device()->close();
-	return result;
+	return std::move(stream).result();
 }
 
 bool SettingsProxy::setFromSerialized(const QByteArray &serialized) {
@@ -133,7 +126,7 @@ bool SettingsProxy::setFromSerialized(const QByteArray &serialized) {
 		return true;
 	}
 
-	auto stream = QDataStream(serialized);
+	auto stream = Serialize::ByteArrayReader(serialized);
 
 	auto tryIPv6 = qint32(_tryIPv6 ? 1 : 0);
 	auto useProxyForCalls = qint32(_useProxyForCalls ? 1 : 0);
@@ -148,7 +141,7 @@ bool SettingsProxy::setFromSerialized(const QByteArray &serialized) {
 			>> settings
 			>> selectedProxy
 			>> listCount;
-		if (stream.status() == QDataStream::Ok) {
+		if (stream.ok()) {
 			for (auto i = 0; i != listCount; ++i) {
 				QByteArray data;
 				stream >> data;
@@ -157,7 +150,7 @@ bool SettingsProxy::setFromSerialized(const QByteArray &serialized) {
 		}
 	}
 
-	if (stream.status() != QDataStream::Ok) {
+	if (!stream.ok()) {
 		LOG(("App Error: "
 			"Bad data for Core::SettingsProxy::setFromSerialized()"));
 		return false;
diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
index 8e6149259..8a06b427b 100644
--- a/Telegram/SourceFiles/data/components/top_peers.cpp
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -14,6 +14,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "main/main_session.h"
 #include "mtproto/mtproto_config.h"
+#include "storage/serialize_common.h"
+#include "storage/serialize_peer.h"
+#include "storage/storage_account.h"
 
 namespace Data {
 namespace {
@@ -25,6 +28,19 @@ constexpr auto kRequestTimeLimit = 10 * crl::time(1000);
 	return std::exp((now - was) * 1. / decay);
 }
 
+[[nodiscard]] quint64 SerializeRating(float64 rating) {
+	return quint64(
+		base::SafeRound(std::clamp(rating, 0., 1'000'000.) * 1'000'000.));
+}
+
+[[nodiscard]] float64 DeserializeRating(quint64 rating) {
+	return std::clamp(
+		rating,
+		quint64(),
+		quint64(1'000'000'000'000ULL)
+	) / 1'000'000.;
+}
+
 } // namespace
 
 TopPeers::TopPeers(not_null<Main::Session*> session)
@@ -43,12 +59,16 @@ TopPeers::TopPeers(not_null<Main::Session*> session)
 TopPeers::~TopPeers() = default;
 
 std::vector<not_null<PeerData*>> TopPeers::list() const {
+	_session->local().readSearchSuggestions();
+
 	return _list
 		| ranges::view::transform(&TopPeer::peer)
 		| ranges::to_vector;
 }
 
 bool TopPeers::disabled() const {
+	_session->local().readSearchSuggestions();
+
 	return _disabled;
 }
 
@@ -67,9 +87,13 @@ void TopPeers::remove(not_null<PeerData*> peer) {
 		MTP_topPeerCategoryCorrespondents(),
 		peer->input
 	)).send();
+
+	_session->local().writeSearchSuggestionsDelayed();
 }
 
 void TopPeers::increment(not_null<PeerData*> peer, TimeId date) {
+	_session->local().readSearchSuggestions();
+
 	if (_disabled || date <= _lastReceivedDate) {
 		return;
 	}
@@ -95,6 +119,8 @@ void TopPeers::increment(not_null<PeerData*> peer, TimeId date) {
 		if (changed) {
 			_updates.fire({});
 		}
+
+		_session->local().writeSearchSuggestionsDelayed();
 	}
 }
 
@@ -108,6 +134,8 @@ void TopPeers::reload() {
 }
 
 void TopPeers::toggleDisabled(bool disabled) {
+	_session->local().readSearchSuggestions();
+
 	if (disabled) {
 		if (!_disabled || !_list.empty()) {
 			_disabled = true;
@@ -126,6 +154,8 @@ void TopPeers::toggleDisabled(bool disabled) {
 			request();
 		}
 	}).send();
+
+	_session->local().writeSearchSuggestionsDelayed();
 }
 
 void TopPeers::request() {
@@ -182,10 +212,67 @@ void TopPeers::request() {
 uint64 TopPeers::countHash() const {
 	using namespace Api;
 	auto hash = HashInit();
-	for (const auto &top : _list) {
+	for (const auto &top : _list | ranges::views::take(kLimit)) {
 		HashUpdate(hash, peerToUser(top.peer->id).bare);
 	}
 	return HashFinalize(hash);
 }
 
+QByteArray TopPeers::serialize() const {
+	_session->local().readSearchSuggestions();
+
+	if (!_disabled && _list.empty()) {
+		return {};
+	}
+	auto size = 3 * sizeof(quint32); // AppVersion, disabled, count
+	const auto count = std::min(int(_list.size()), kLimit);
+	auto &&list = _list | ranges::views::take(count);
+	for (const auto &top : list) {
+		size += Serialize::peerSize(top.peer) + sizeof(quint64);
+	}
+	auto stream = Serialize::ByteArrayWriter(size);
+	stream
+		<< quint32(AppVersion)
+		<< quint32(_disabled ? 1 : 0)
+		<< quint32(_list.size());
+	for (const auto &top : list) {
+		Serialize::writePeer(stream, top.peer);
+		stream << SerializeRating(top.rating);
+	}
+	return std::move(stream).result();
+}
+
+void TopPeers::applyLocal(QByteArray serialized) {
+	if (_lastReceived || serialized.isEmpty()) {
+		return;
+	}
+	auto stream = Serialize::ByteArrayReader(serialized);
+	auto streamAppVersion = quint32();
+	auto disabled = quint32();
+	auto count = quint32();
+	stream >> streamAppVersion >> disabled >> count;
+	if (!stream.ok()) {
+		return;
+	}
+	_list.reserve(count);
+	for (auto i = 0; i != int(count); ++i) {
+		auto rating = quint64();
+		const auto peer = Serialize::readPeer(
+			_session,
+			streamAppVersion,
+			stream);
+		stream >> rating;
+		if (stream.ok() && peer) {
+			_list.push_back({
+				.peer = peer,
+				.rating = DeserializeRating(rating),
+			});
+		} else {
+			_list.clear();
+			return;
+		}
+	}
+	_disabled = (disabled == 1);
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/top_peers.h b/Telegram/SourceFiles/data/components/top_peers.h
index da44a0c6c..051964066 100644
--- a/Telegram/SourceFiles/data/components/top_peers.h
+++ b/Telegram/SourceFiles/data/components/top_peers.h
@@ -27,6 +27,9 @@ public:
 	void reload();
 	void toggleDisabled(bool disabled);
 
+	[[nodiscard]] QByteArray serialize() const;
+	void applyLocal(QByteArray serialized);
+
 private:
 	struct TopPeer {
 		not_null<PeerData*> peer;
diff --git a/Telegram/SourceFiles/main/main_account.cpp b/Telegram/SourceFiles/main/main_account.cpp
index 90a6a897e..9e366ca54 100644
--- a/Telegram/SourceFiles/main/main_account.cpp
+++ b/Telegram/SourceFiles/main/main_account.cpp
@@ -53,6 +53,7 @@ Account::Account(not_null<Domain*> domain, const QString &dataName, int index)
 Account::~Account() {
 	if (const auto session = maybeSession()) {
 		session->saveSettingsNowIfNeeded();
+		_local->writeSearchSuggestionsIfNeeded();
 	}
 	destroySession(DestroyReason::Quitting);
 }
diff --git a/Telegram/SourceFiles/storage/serialize_common.cpp b/Telegram/SourceFiles/storage/serialize_common.cpp
index d3f7ec8ad..3267ee1ee 100644
--- a/Telegram/SourceFiles/storage/serialize_common.cpp
+++ b/Telegram/SourceFiles/storage/serialize_common.cpp
@@ -9,6 +9,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Serialize {
 
+ByteArrayWriter::ByteArrayWriter(int expectedSize)
+: _stream(&_result, QIODevice::WriteOnly) {
+	if (expectedSize) {
+		_result.reserve(expectedSize);
+	}
+	_stream.setVersion(QDataStream::Qt_5_1);
+}
+
+QByteArray ByteArrayWriter::result() && {
+	_stream.device()->close();
+	return std::move(_result);
+}
+
+ByteArrayReader::ByteArrayReader(QByteArray data)
+: _data(std::move(data))
+, _stream(&_data, QIODevice::ReadOnly) {
+	_stream.setVersion(QDataStream::Qt_5_1);
+}
+
 void writeColor(QDataStream &stream, const QColor &color) {
 	stream << (quint32(uchar(color.red()))
 		| (quint32(uchar(color.green())) << 8)
diff --git a/Telegram/SourceFiles/storage/serialize_common.h b/Telegram/SourceFiles/storage/serialize_common.h
index fcf017185..c56081ab2 100644
--- a/Telegram/SourceFiles/storage/serialize_common.h
+++ b/Telegram/SourceFiles/storage/serialize_common.h
@@ -14,6 +14,70 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Serialize {
 
+class ByteArrayWriter final {
+public:
+	explicit ByteArrayWriter(int expectedSize = 0);
+
+	[[nodiscard]] QDataStream &underlying() {
+		return _stream;
+	}
+	[[nodiscard]] operator QDataStream &() {
+		return _stream;
+	}
+	[[nodiscard]] QByteArray result() &&;
+
+private:
+	QByteArray _result;
+	QDataStream _stream;
+
+};
+
+template <typename T>
+inline ByteArrayWriter &operator<<(ByteArrayWriter &stream, const T &data) {
+	stream.underlying() << data;
+	return stream;
+}
+
+class ByteArrayReader final {
+public:
+	explicit ByteArrayReader(QByteArray data);
+
+	[[nodiscard]] QDataStream &underlying() {
+		return _stream;
+	}
+	[[nodiscard]] operator QDataStream &() {
+		return _stream;
+	}
+
+	[[nodiscard]] bool atEnd() const {
+		return _stream.atEnd();
+	}
+	[[nodiscard]] bool status() const {
+		return _stream.status();
+	}
+	[[nodiscard]] bool ok() const {
+		return _stream.status() == QDataStream::Ok;
+	}
+
+private:
+	QByteArray _data;
+	QDataStream _stream;
+
+};
+
+template <typename T>
+inline ByteArrayReader &operator>>(ByteArrayReader &stream, T &data) {
+	if (!stream.ok()) {
+		data = T();
+	} else {
+		stream.underlying() >> data;
+		if (!stream.ok()) {
+			data = T();
+		}
+	}
+	return stream;
+}
+
 inline int stringSize(const QString &str) {
 	return sizeof(quint32) + str.size() * sizeof(ushort);
 }
diff --git a/Telegram/SourceFiles/storage/serialize_peer.cpp b/Telegram/SourceFiles/storage/serialize_peer.cpp
index 861bebdc9..96e9daec0 100644
--- a/Telegram/SourceFiles/storage/serialize_peer.cpp
+++ b/Telegram/SourceFiles/storage/serialize_peer.cpp
@@ -118,12 +118,16 @@ uint32 peerSize(not_null<PeerData*> peer) {
 		+ imageLocationSize(peer->userpicLocation())
 		+ sizeof(qint32); // userpic has video
 	if (const auto user = peer->asUser()) {
+		const auto botInlinePlaceholder = user->isBot()
+			? user->botInfo->inlinePlaceholder
+			: QString();
 		result += stringSize(user->firstName)
 			+ stringSize(user->lastName)
 			+ stringSize(user->phone())
 			+ stringSize(user->username())
 			+ sizeof(quint64) // access
 			+ sizeof(qint32) // flags
+			+ stringSize(botInlinePlaceholder)
 			+ sizeof(quint32) // lastseen
 			+ sizeof(qint32) // contact
 			+ sizeof(qint32); // botInfoVersion
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index e3c2e69c4..6796179bd 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/file_location.h"
+#include "data/components/top_peers.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_session.h"
 #include "data/data_document.h"
@@ -42,6 +43,7 @@ using namespace details;
 using Database = Cache::Database;
 
 constexpr auto kDelayedWriteTimeout = crl::time(1000);
+constexpr auto kWriteSearchSuggestionsDelay = 5 * crl::time(1000);
 
 constexpr auto kStickersVersionTag = quint32(-1);
 constexpr auto kStickersSerializeVersion = 4;
@@ -87,6 +89,7 @@ enum { // Local Storage Keys
 	lskSelfSerialized = 0x15, // serialized self
 	lskMasksKeys = 0x16, // no data
 	lskCustomEmojiKeys = 0x17, // no data
+	lskSearchSuggestions = 0x18, // no data
 };
 
 auto EmptyMessageDraftSources()
@@ -137,10 +140,13 @@ Account::Account(not_null<Main::Account*> owner, const QString &dataName)
 , _cacheTotalTimeLimit(Database::Settings().totalTimeLimit)
 , _cacheBigFileTotalTimeLimit(Database::Settings().totalTimeLimit)
 , _writeMapTimer([=] { writeMap(); })
-, _writeLocationsTimer([=] { writeLocations(); }) {
+, _writeLocationsTimer([=] { writeLocations(); })
+, _writeSearchSuggestionsTimer([=] { writeSearchSuggestions(); }) {
 }
 
 Account::~Account() {
+	Expects(!_writeSearchSuggestionsTimer.isActive());
+
 	if (_localKey && _mapChanged) {
 		writeMap();
 	}
@@ -209,6 +215,7 @@ base::flat_set<QString> Account::collectGoodNames() const {
 		_installedCustomEmojiKey,
 		_featuredCustomEmojiKey,
 		_archivedCustomEmojiKey,
+		_searchSuggestionsKey,
 	};
 	auto result = base::flat_set<QString>{
 		"map0",
@@ -294,6 +301,7 @@ Account::ReadMapResult Account::readMapWith(
 	quint64 savedGifsKey = 0;
 	quint64 legacyBackgroundKeyDay = 0, legacyBackgroundKeyNight = 0;
 	quint64 userSettingsKey = 0, recentHashtagsAndBotsKey = 0, exportSettingsKey = 0;
+	quint64 searchSuggestionsKey = 0;
 	while (!map.stream.atEnd()) {
 		quint32 keyType;
 		map.stream >> keyType;
@@ -399,6 +407,9 @@ Account::ReadMapResult Account::readMapWith(
 				>> featuredCustomEmojiKey
 				>> archivedCustomEmojiKey;
 		} break;
+		case lskSearchSuggestions: {
+			map.stream >> searchSuggestionsKey;
+		} break;
 		default:
 			LOG(("App Error: unknown key type in encrypted map: %1").arg(keyType));
 			return ReadMapResult::Failed;
@@ -434,6 +445,7 @@ Account::ReadMapResult Account::readMapWith(
 	_settingsKey = userSettingsKey;
 	_recentHashtagsAndBotsKey = recentHashtagsAndBotsKey;
 	_exportSettingsKey = exportSettingsKey;
+	_searchSuggestionsKey = searchSuggestionsKey;
 	_oldMapVersion = mapData.version;
 
 	if (_oldMapVersion < AppVersion) {
@@ -539,6 +551,7 @@ void Account::writeMap() {
 	if (_installedCustomEmojiKey || _featuredCustomEmojiKey || _archivedCustomEmojiKey) {
 		mapSize += sizeof(quint32) + 3 * sizeof(quint64);
 	}
+	if (_searchSuggestionsKey) mapSize += sizeof(quint32) + sizeof(quint64);
 
 	EncryptedDescriptor mapData(mapSize);
 	if (!self.isEmpty()) {
@@ -598,12 +611,18 @@ void Account::writeMap() {
 			<< quint64(_featuredCustomEmojiKey)
 			<< quint64(_archivedCustomEmojiKey);
 	}
+	if (_searchSuggestionsKey) {
+		mapData.stream << quint32(lskSearchSuggestions);
+		mapData.stream << quint64(_searchSuggestionsKey);
+	}
 	map.writeEncrypted(mapData, _localKey);
 
 	_mapChanged = false;
 }
 
 void Account::reset() {
+	_writeSearchSuggestionsTimer.cancel();
+
 	auto names = collectGoodNames();
 	_draftsMap.clear();
 	_draftCursorsMap.clear();
@@ -624,6 +643,7 @@ void Account::reset() {
 	_archivedCustomEmojiKey = 0;
 	_legacyBackgroundKeyDay = _legacyBackgroundKeyNight = 0;
 	_settingsKey = _recentHashtagsAndBotsKey = _exportSettingsKey = 0;
+	_searchSuggestionsKey = 0;
 	_oldMapVersion = 0;
 	_fileLocations.clear();
 	_fileLocationPairs.clear();
@@ -2842,6 +2862,73 @@ Export::Settings Account::readExportSettings() {
 		: Export::Settings();
 }
 
+void Account::writeSearchSuggestionsDelayed() {
+	Expects(_owner->sessionExists());
+
+	if (!_writeSearchSuggestionsTimer.isActive()) {
+		_writeSearchSuggestionsTimer.callOnce(kWriteSearchSuggestionsDelay);
+	}
+}
+
+void Account::writeSearchSuggestionsIfNeeded() {
+	if (_writeSearchSuggestionsTimer.isActive()) {
+		_writeSearchSuggestionsTimer.cancel();
+		writeSearchSuggestions();
+	}
+}
+
+void Account::writeSearchSuggestions() {
+	Expects(_owner->sessionExists());
+
+	const auto top = _owner->session().topPeers().serialize();
+	const auto recent = QByteArray();// _owner->session().recentPeers().serialize();
+	if (top.isEmpty() && recent.isEmpty()) {
+		if (_searchSuggestionsKey) {
+			ClearKey(_searchSuggestionsKey, _basePath);
+			_searchSuggestionsKey = 0;
+			writeMapDelayed();
+		}
+		return;
+	}
+	if (!_searchSuggestionsKey) {
+		_searchSuggestionsKey = GenerateKey(_basePath);
+		writeMapQueued();
+	}
+	quint32 size = Serialize::bytearraySize(top)
+		+ Serialize::bytearraySize(recent);
+	EncryptedDescriptor data(size);
+	data.stream << top << recent;
+
+	FileWriteDescriptor file(_searchSuggestionsKey, _basePath);
+	file.writeEncrypted(data, _localKey);
+}
+
+void Account::readSearchSuggestions() {
+	if (_searchSuggestionsRead) {
+		return;
+	}
+	_searchSuggestionsRead = true;
+	if (!_searchSuggestionsKey) {
+		return;
+	}
+
+	FileReadDescriptor suggestions;
+	if (!ReadEncryptedFile(suggestions, _searchSuggestionsKey, _basePath, _localKey)) {
+		ClearKey(_searchSuggestionsKey, _basePath);
+		_searchSuggestionsKey = 0;
+		writeMapDelayed();
+		return;
+	}
+
+	auto top = QByteArray();
+	auto recent = QByteArray();
+	suggestions.stream >> top >> recent;
+	if (CheckStreamStatus(suggestions.stream)) {
+		_owner->session().topPeers().applyLocal(top);
+		//_owner->session().recentPeers().applyLocal(recent);
+	}
+}
+
 void Account::writeSelf() {
 	writeMapDelayed();
 }
diff --git a/Telegram/SourceFiles/storage/storage_account.h b/Telegram/SourceFiles/storage/storage_account.h
index ade41f10c..b22dd4cbb 100644
--- a/Telegram/SourceFiles/storage/storage_account.h
+++ b/Telegram/SourceFiles/storage/storage_account.h
@@ -148,6 +148,11 @@ public:
 	void writeExportSettings(const Export::Settings &settings);
 	[[nodiscard]] Export::Settings readExportSettings();
 
+	void writeSearchSuggestionsDelayed();
+	void writeSearchSuggestionsIfNeeded();
+	void writeSearchSuggestions();
+	void readSearchSuggestions();
+
 	void writeSelf();
 
 	// Read self is special, it can't get session from account, because
@@ -291,6 +296,7 @@ private:
 	FileKey _installedCustomEmojiKey = 0;
 	FileKey _featuredCustomEmojiKey = 0;
 	FileKey _archivedCustomEmojiKey = 0;
+	FileKey _searchSuggestionsKey = 0;
 
 	qint64 _cacheTotalSizeLimit = 0;
 	qint64 _cacheBigFileTotalSizeLimit = 0;
@@ -301,11 +307,13 @@ private:
 	bool _trustedBotsRead = false;
 	bool _readingUserSettings = false;
 	bool _recentHashtagsAndBotsWereRead = false;
+	bool _searchSuggestionsRead = false;
 
 	int _oldMapVersion = 0;
 
 	base::Timer _writeMapTimer;
 	base::Timer _writeLocationsTimer;
+	base::Timer _writeSearchSuggestionsTimer;
 	bool _mapChanged = false;
 	bool _locationsChanged = false;
 

From 3dbadeb23282b98080e20135aa688dafdb051394 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 18:05:51 +0400
Subject: [PATCH 330/596] Allow opening top peers in a new window.

---
 Telegram/Resources/langs/lang.strings         |  4 +--
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  8 ++++-
 .../dialogs/ui/dialogs_suggestions.cpp        | 32 +++++++++++++------
 .../dialogs/ui/dialogs_suggestions.h          |  2 --
 Telegram/SourceFiles/ui/menu_icons.style      |  1 +
 .../SourceFiles/window/window_peer_menu.cpp   |  4 ++-
 6 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 36c2c9393..606f8bc2a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5094,8 +5094,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_recent_clear" = "Clear";
 "lng_recent_clear_sure" = "Do you want to clear your search history?";
 "lng_recent_remove" = "Remove from Recent";
-"lng_recent_hide_top" = "Hide all";
-"lng_recent_hide_sure" = "Are you sure you want to hide frequent contacts list?\n\nYou can always return this list in Settings > Privacy > Suggest Frequent Contacts.";
+"lng_recent_hide_top" = "Remove all & Disable";
+"lng_recent_hide_sure" = "Are you sure you want to clear and disable frequent contacts list?\n\nYou can always turn this feature back on in Settings > Privacy > Suggest Frequent Contacts.";
 "lng_recent_hide_button" = "Hide";
 
 // Wnd specific
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 98956f32f..3e2b7a9ed 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/dialogs_widget.h"
 
+#include "base/qt/qt_key_modifiers.h"
 #include "base/options.h"
 #include "dialogs/ui/dialogs_stories_content.h"
 #include "dialogs/ui/dialogs_stories_list.h"
@@ -1123,7 +1124,12 @@ void Widget::updateSuggestions(anim::type animated) {
 
 		_suggestions->topPeerChosen(
 		) | rpl::start_with_next([=](PeerId id) {
-			controller()->showPeerHistory(id);
+			const auto peer = session().data().peer(id);
+			if (base::IsCtrlPressed()) {
+				controller()->showInNewWindow(peer);
+			} else {
+				controller()->showPeerHistory(peer);
+			}
 		}, _suggestions->lifetime());
 
 		_suggestions->show();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index ad5bce8d0..24c453ad3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -22,8 +22,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/labels.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
+#include "ui/delayed_activation.h"
 #include "ui/dynamic_thumbnails.h"
 #include "window/window_session_controller.h"
+#include "window/window_peer_menu.h"
 #include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
@@ -43,14 +45,11 @@ void FillTopPeerMenu(
 	const auto group = peer->isMegagroup();
 	const auto channel = peer->isChannel();
 
-	add({
-		.text = tr::lng_recent_remove(tr::now),
-		.handler = [=] { remove(peer); },
-		.icon = &st::menuIconDeleteAttention,
-		.isAttention = true,
-	});
-
-	add({ .separatorSt = &st::expandedMenuSeparator });
+	add(tr::lng_context_new_window(tr::now), [=] {
+		Ui::PreventDelayedActivation();
+		controller->showInNewWindow(peer);
+	}, &st::menuIconNewWindow);
+	Window::AddSeparatorAndShiftUp(add);
 
 	const auto showHistoryText = group
 		? tr::lng_context_open_group(tr::now)
@@ -72,12 +71,25 @@ void FillTopPeerMenu(
 
 	add({ .separatorSt = &st::expandedMenuSeparator });
 
-	add(tr::lng_recent_hide_top(tr::now), [=] {
+	add({
+		.text = tr::lng_recent_remove(tr::now),
+		.handler = [=] { remove(peer); },
+		.icon = &st::menuIconDeleteAttention,
+		.isAttention = true,
+	});
+
+	const auto hideAllConfirmed = [=] {
 		controller->show(Ui::MakeConfirmBox({
 			.text = tr::lng_recent_hide_sure(),
 			.confirmed = [=](Fn<void()> close) { hideAll(); close(); }
 		}));
-	}, &st::menuIconCancel);
+	};
+	add({
+		.text = tr::lng_recent_hide_top(tr::now).replace('&', u"&&"_q),
+		.handler = hideAllConfirmed,
+		.icon = &st::menuIconCancelAttention,
+		.isAttention = true,
+	});
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index aa6491f42..dcc2a35a0 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -52,8 +52,6 @@ private:
 
 	[[nodiscard]] object_ptr<Ui::RpWidget> setupDivider();
 
-	void updateControlsGeometry();
-
 	const std::unique_ptr<Ui::ElasticScroll> _scroll;
 	const not_null<Ui::VerticalLayout*> _content;
 	const not_null<Ui::SlideWrap<TopPeersStrip>*> _topPeersWrap;
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 4ec165b62..38625f769 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -192,6 +192,7 @@ menuIconDisableAttention: icon {{ "menu/disable", menuIconAttentionColor }};
 menuIconReportAttention: icon {{ "menu/report", menuIconAttentionColor }};
 menuIconRestoreAttention: icon {{ "menu/restore", menuIconAttentionColor }};
 menuIconTagRemoveAttention: icon {{ "menu/tag_remove", menuIconAttentionColor }};
+menuIconCancelAttention: icon {{ "menu/cancel", menuIconAttentionColor }};
 
 menuIconBlockSettings: icon {{ "menu/block", windowBgActive }};
 menuIconInviteSettings: icon {{ "menu/invite", windowBgActive }};
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 2d3e2a663..6860d3b0a 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2608,7 +2608,9 @@ void MarkAsReadThread(not_null<Data::Thread*> thread) {
 }
 
 void AddSeparatorAndShiftUp(const PeerMenuCallback &addAction) {
-	addAction({ .isSeparator = true });
+	addAction({
+		.separatorSt = &st::popupMenuExpandedSeparator.menu.separator,
+	});
 
 	const auto &st = st::popupMenuExpandedSeparator.menu;
 	const auto shift = st::popupMenuExpandedSeparator.scrollPadding.top()

From e24ab4f1abf01de8523631779db2a4d4c474ee14 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 18:15:40 +0400
Subject: [PATCH 331/596] Allow saving emoji to files in debug builds.

---
 .../SourceFiles/history/history_inner_widget.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index b450b3f43..27b54f79d 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/history_inner_widget.h"
 
+#include "chat_helpers/stickers_emoji_pack.h"
 #include "core/file_utilities.h"
 #include "core/click_handler_types.h"
 #include "history/history_item_helpers.h"
@@ -32,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/message_sending_animation_controller.h"
 #include "ui/effects/reaction_fly_animation.h"
 #include "ui/text/text_options.h"
+#include "ui/text/text_isolated_emoji.h"
 #include "ui/boxes/report_box.h"
 #include "ui/layers/generic_box.h"
 #include "ui/controls/delete_message_context_action.h"
@@ -2249,6 +2251,20 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 	};
 
+#ifdef _DEBUG // Sometimes we need to save emoji to files.
+	if (const auto item = _dragStateItem) {
+		const auto emojiStickers = &session->emojiStickersPack();
+		if (const auto view = item->media() ? nullptr : item->mainView()) {
+			if (const auto isolated = view->isolatedEmoji()) {
+				if (const auto sticker = emojiStickers->stickerForEmoji(
+						isolated)) {
+					addDocumentActions(sticker.document, item);
+				}
+			}
+		}
+	}
+#endif
+
 	const auto asGroup = !Element::Moused()
 		|| (Element::Moused() != Element::Hovered())
 		|| (Element::Moused()->pointState(

From 2e0529bd9a6b93b31c176c507db9bdfa92cf61e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 Apr 2024 18:30:14 +0400
Subject: [PATCH 332/596] Add data component for RecentPeers.

---
 .../data/components/recent_peers.cpp          | 104 ++++++++++++++++++
 .../data/components/recent_peers.h            |  13 +++
 .../SourceFiles/data/components/top_peers.cpp |   7 +-
 .../SourceFiles/storage/storage_account.cpp   |   5 +-
 4 files changed, 126 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
index 32fc0ad42..1c1957873 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.cpp
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -7,7 +7,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/components/recent_peers.h"
 
+#include "main/main_session.h"
+#include "storage/serialize_common.h"
+#include "storage/serialize_peer.h"
+#include "storage/storage_account.h"
+
 namespace Data {
+namespace {
+
+constexpr auto kLimit = 48;
+
+} // namespace
 
 RecentPeers::RecentPeers(not_null<Main::Session*> session)
 : _session(session) {
@@ -15,4 +25,98 @@ RecentPeers::RecentPeers(not_null<Main::Session*> session)
 
 RecentPeers::~RecentPeers() = default;
 
+const std::vector<not_null<PeerData*>> &RecentPeers::list() const {
+	_session->local().readSearchSuggestions();
+
+	return _list;
+}
+
+rpl::producer<> RecentPeers::updates() const {
+	return _updates.events();
+}
+
+void RecentPeers::remove(not_null<PeerData*> peer) {
+	const auto i = ranges::find(_list, peer);
+	if (i != end(_list)) {
+		_list.erase(i);
+		_updates.fire({});
+	}
+	_session->local().writeSearchSuggestionsDelayed();
+}
+
+void RecentPeers::bump(not_null<PeerData*> peer) {
+	_session->local().readSearchSuggestions();
+
+	if (!_list.empty() && _list.front() == peer) {
+		return;
+	}
+	auto i = ranges::find(_list, peer);
+	if (i == end(_list)) {
+		_list.push_back(peer);
+		i = end(_list) - 1;
+	}
+	ranges::rotate(begin(_list), i, i + 1);
+	_updates.fire({});
+
+	_session->local().writeSearchSuggestionsDelayed();
+}
+
+void RecentPeers::clear() {
+	_session->local().readSearchSuggestions();
+
+	_list.clear();
+	_updates.fire({});
+
+	_session->local().writeSearchSuggestionsDelayed();
+}
+
+QByteArray RecentPeers::serialize() const {
+	_session->local().readSearchSuggestions();
+
+	if (_list.empty()) {
+		return {};
+	}
+	auto size = 2 * sizeof(quint32); // AppVersion, count
+	const auto count = std::min(int(_list.size()), kLimit);
+	auto &&list = _list | ranges::views::take(count);
+	for (const auto &peer : list) {
+		size += Serialize::peerSize(peer);
+	}
+	auto stream = Serialize::ByteArrayWriter(size);
+	stream
+		<< quint32(AppVersion)
+		<< quint32(_list.size());
+	for (const auto &peer : list) {
+		Serialize::writePeer(stream, peer);
+	}
+	return std::move(stream).result();
+}
+
+void RecentPeers::applyLocal(QByteArray serialized) {
+	_list.clear();
+	if (serialized.isEmpty()) {
+		return;
+	}
+	auto stream = Serialize::ByteArrayReader(serialized);
+	auto streamAppVersion = quint32();
+	auto count = quint32();
+	stream >> streamAppVersion >> count;
+	if (!stream.ok()) {
+		return;
+	}
+	_list.reserve(count);
+	for (auto i = 0; i != int(count); ++i) {
+		const auto peer = Serialize::readPeer(
+			_session,
+			streamAppVersion,
+			stream);
+		if (stream.ok() && peer) {
+			_list.push_back(peer);
+		} else {
+			_list.clear();
+			return;
+		}
+	}
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/recent_peers.h b/Telegram/SourceFiles/data/components/recent_peers.h
index e3a648b47..e30942720 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.h
+++ b/Telegram/SourceFiles/data/components/recent_peers.h
@@ -18,9 +18,22 @@ public:
 	explicit RecentPeers(not_null<Main::Session*> session);
 	~RecentPeers();
 
+	[[nodiscard]] const std::vector<not_null<PeerData*>> &list() const;
+	[[nodiscard]] rpl::producer<> updates() const;
+
+	void remove(not_null<PeerData*> peer);
+	void bump(not_null<PeerData*> peer);
+	void clear();
+
+	[[nodiscard]] QByteArray serialize() const;
+	void applyLocal(QByteArray serialized);
+
 private:
 	const not_null<Main::Session*> _session;
 
+	std::vector<not_null<PeerData*>> _list;
+	rpl::event_stream<> _updates;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
index 8a06b427b..03f4416f8 100644
--- a/Telegram/SourceFiles/data/components/top_peers.cpp
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -243,7 +243,12 @@ QByteArray TopPeers::serialize() const {
 }
 
 void TopPeers::applyLocal(QByteArray serialized) {
-	if (_lastReceived || serialized.isEmpty()) {
+	if (_lastReceived) {
+		return;
+	}
+	_list.clear();
+	_disabled = false;
+	if (serialized.isEmpty()) {
 		return;
 	}
 	auto stream = Serialize::ByteArrayReader(serialized);
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index 6796179bd..22484f65b 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/file_location.h"
+#include "data/components/recent_peers.h"
 #include "data/components/top_peers.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_session.h"
@@ -2881,7 +2882,7 @@ void Account::writeSearchSuggestions() {
 	Expects(_owner->sessionExists());
 
 	const auto top = _owner->session().topPeers().serialize();
-	const auto recent = QByteArray();// _owner->session().recentPeers().serialize();
+	const auto recent = _owner->session().recentPeers().serialize();
 	if (top.isEmpty() && recent.isEmpty()) {
 		if (_searchSuggestionsKey) {
 			ClearKey(_searchSuggestionsKey, _basePath);
@@ -2925,7 +2926,7 @@ void Account::readSearchSuggestions() {
 	suggestions.stream >> top >> recent;
 	if (CheckStreamStatus(suggestions.stream)) {
 		_owner->session().topPeers().applyLocal(top);
-		//_owner->session().recentPeers().applyLocal(recent);
+		_owner->session().recentPeers().applyLocal(recent);
 	}
 }
 

From 2a6ff9203b771301276eae52b7390e9e688b2d97 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 Apr 2024 12:25:37 +0400
Subject: [PATCH 333/596] Implement basic recent search results.

---
 Telegram/Resources/animations/search.tgs      | Bin 0 -> 13483 bytes
 Telegram/Resources/langs/lang.strings         |   2 +
 .../Resources/qrc/telegram/animations.qrc     |   1 +
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   9 +-
 Telegram/SourceFiles/boxes/peer_list_box.h    |   2 +
 .../SourceFiles/data/components/top_peers.cpp |  25 +-
 .../SourceFiles/data/components/top_peers.h   |   1 +
 Telegram/SourceFiles/dialogs/dialogs.style    |  24 ++
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  17 +-
 .../dialogs/ui/dialogs_suggestions.cpp        | 377 ++++++++++++++++--
 .../dialogs/ui/dialogs_suggestions.h          |  29 +-
 .../dialogs/ui/top_peers_strip.cpp            |  21 +-
 Telegram/SourceFiles/main/main_session.cpp    |   1 +
 .../SourceFiles/ui/unread_badge_paint.cpp     |   4 +-
 14 files changed, 456 insertions(+), 57 deletions(-)
 create mode 100644 Telegram/Resources/animations/search.tgs

diff --git a/Telegram/Resources/animations/search.tgs b/Telegram/Resources/animations/search.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..db635fb57e75535b8902407baef878325790f0fd
GIT binary patch
literal 13483
zcmZ{qQ*bX#^XFqHC${aJ*yb;`ZQHhO+qQ9H+qTUUXP@W&zq?y|v2!u={q%I#%*9k!
zbxjjQK>__cKtQj3E@MeJ8+WSUF5Ia5KTLc#?$E40fV#d}&1o;BSDpW6^cGaj#$rSP
z!+p?w(!VfY^(Gv`GBIaVBqt{-s!*fNW?v_!qb9*Y1R?eBVfb}@eBa#Ph_7#b9p8*{
zZ*Hh=v%2+pcYVx9oZJkqb`hM<V!V@p`n+D>h|{Pz{pI`l`i$^>(!1I9`M#SB%e(FK
zdwqBdb0fGVAn;rJyt^Lk`ny|E(Pp>nh@<>|m$UP<xO>AVKfXPy$LI6aln+C2`}2NB
z$9s0+`}&#M_4HNe#-I6_`s4odc0C$Kz{me7*5~m#GV528_jP@P^WAYu@GUvq$L^*l
zPR0*F(>hiz>amE4i*XlrxuI}zHs`(I;9l~;U5#ic_(==QEeK%v+`Iq!S`AzBasGR=
z&3>^Pc59KJx9I-bfB4Z=JL;39976q#x?yfiVp3J&x%k<fV58iy{;KLJvnz^2=CfP_
zgREEKWM{5;C*^JHn^*(gSTK&l$A4?}1>V9|3%|gEQ*kb8KHoaOF4iI>{*4}N^&a-*
zStE_26$jzl`*Hu#=I8S#+ynpn{QKjBfE50iH|9F+BQEY&AG^m{pLh4+JK3~ImAUl-
zH%^PKNR<pK6W4j5!Yg**f-3BO#0fIX4^yrTQ914O3%}oi;>~d1&)xlDtgiPcm^6m~
zKzwL1MpeX;mHErib>RHkqB9FRDFP4A=hLNX<M2xrDQ-`0_lBSU`{8)AtZR4osPO0R
zda}>=SmC(9_SX&S%><93mRUck7%9G!O*Bjst?{g^K5AvLMdko4ML<+JG+77qE*D)^
zjCqi&yXZT;)~Q{XOYvN@G`5k1>llq0UJKhLB{FU0zMq%t+7;DSw3HdlXrR^oZ04ZO
zc}Na)4I_)uCuEB&+SwYmRk=U^n(5-|7#cciabDs4mPBm>#0P8^r>@2B9*t9Xq`L9b
z^8L^J1M5lRryZG%aKn6mtLD(9F3>wuqZ5g+l+vG{0~(vLwcnyvK4+Yom8ynWt{!U3
zA`ArK!mqc^;;rd_)({<v!mf(*u<Gietwy~ZJ$uK|khx3lY4^%TZ!wU|`eG(PQoM^-
z<H=v|^<L%1&HX;VuP5t%jn-$v+JrZMi4<Bttxj8>Fjb3X!8-`j1mUom$Z-F{tY}e`
zdmU?DNg%Y6VWC}ny(IV13o(NOL$L8)fDzU<Y*8akQErCdIST$ICPk6$$yRzVl7@&Q
z`VhhKfh=9LdVtl%Hfx=1k@F<;-b9uuK?Ym1Pyq0|(?L!EQEtU_p(yr7SG4Ade{wXY
zGR{B+m122Mau&Pd-gv3*pgWwS|H{@&A}b@>B>y=^zR?=QJLdKFf_jP!^@``3>&esY
zJKvqXs*|W71OMaCSRo`|qxj@$Nh4uBv9g#e4gQG{^N3;@YSoAzy*sdWP}&~!6wTHt
z7NrWavz}u?mJ#|H_6+H3jIEq3e)IHLWo>1pwxdo}+!n?D{w7MkNL<99$5(jL5hc^L
zvM5`g6KdRU3w^z!Yojj0a{1~eFK7mfci(8ckk{*6YF`Ln*2;D`^3u#okK<w@&k_z$
z8T=`nxl$|9oK!7Xs2No?0+d?b^%5n`bQBW$5Q?S~pn{*5b?0}qe8wKCj&|wYpqDq?
z$_H>Po{VET=vmRZlH(LCam0X=x*R#q9>-4JuiN8Y)*mTSU4&?BIoi;R1u;4{>>GwN
zXcoo%@zeR}5an#1|BC(+O(Fy4#4IrxmsoCK!6%O*Z;do&UWPR;nR~pI4xZZoYsb&y
z{rx@Iu+dHIv%r?QBzgSoQm3cqHo4lXg-`M8shS57xJp~Hyl%ljhB|?5eN0Z~M_Fpx
zv=#5W1Zk>zTc9i73K#X^cauH)!UFD`?zMK+mL|<#GMgR)+w)$m910N$v2tO4S4rql
zelB47Lll4K#{8GApBS=>_G@M!G+qZHI$Xh*4yYzGAY(oc*Cbd&l`CSJ*EbW(OtQJ%
zn{P;rPu3ho?{Tsr_vXQTWl~ino(O)EijZY<^KpP?RA$cCQyZY9JEZJ%`%t-Vd^iZH
zqffKxhqZ@|X#XQ5Y?T~|Lg-SZDWU-_SFMj?h9Ux($?6wbD87M?f(kNLsrHXu`fdb@
z*q}=@4nj}<uq22%CN2N<Xnd|Myo+9m=?S<im-P7_P#L+mu^fUGN*3nE7#AX)-K96S
z@xqcap$^5bh1iiXGZSQzuQ@sP^9N>WLMJM}2_~Z{XvEWobYgD|aGK)L!Ld7g$!s5&
zOi;VC4grsiUw^>4t^v8NSV`@K*GA=phNeMhP6@H(j{!<r(e~jyNvwssi^N#wC`@QC
z3u2j)*%>Y=5k{AV8!|W^lZ_m=><c}a$M>a+OW)sq-`_v~%s=;i-}ik#_xx=sGfX>%
zE?;DLQ5=eWv~ZzMz-3;_*)w+w4FI(OeynZz4(jZ^a&jeBqfW~u`PG@7)u$<uEmR)!
zW6cchlK^YaySRlRg>fjQAxZW6A>-D=O+<6mF+zf@-;dOA_YEq-YQK#-G3`CI;V{vb
zoV&|evF$8NtxR^gJLePkhet@2b@@(*43U`NSDNG#t}6Q_Si>?AeWH~yD_$N7BjGfH
zLBaI{Is!z_?*)i>UQj^LT+;a}A_B*}cH}3ti>!$g5_{7ciI{_vawtc-{`~5(SEXhQ
zhN7urV(-(PSu)k-^+Bg(sdIP0lee%{WV@BOw)HBRx@5Zuf5j%Lft7tTe@oYQT(Wr}
z%9g(g+-EghL1_u3xs5DDnq4J2Z<wSV+t)i69vqI4y6g7KreUk-)^7W#Wc|=na&%mR
zsg}0%lqLsRwx23lf0m1`ro%DCz8OKyBC;O6nP-?M1_zmXpAm?DbsTf&i6-OS!N1Sd
zoZfMZCRLFbY_U#>FNc9bjwIbRg5i&4>yQb81t>OLM>arQGE|ADqNKVN8oC#z-*(Hy
z0GjJ$o%Z0FweZ#}&WpjiFf&Z{pid`b=)sdGdJ$%1(HO;%Q)#FZ>-6WdD<oB6=oHEI
z?qRsgWp;|AcM9Zo-W@g0=r)TKJR@EuXwC?5=|4~%a75<jC;>UBjPadzBHkX<B|W8D
zFjnnkctf$IR-_1OIvk$>6R+YvV}YhnC^+_HKx04R>-;;d*@m<5WK_G)aDP$;2|xm^
zPn;C#YEKnQL)!r{v2IZ$cDQhtD)?oi*_#f|{!qIQtlNfU2DBI&>Uu=3T*Odj4${OU
zWzkUncbBrcOufZ6jV?O`T!rG2lyQTF_IC=iH@vy<LY+!(2*N>*{Ahx9g!yQgYJJwW
zW+N<yhbZe`S0Q_(tK>an{wxk64v_{bC|Q>+guun9CAj{OCZ#|n60R4p(OYeC`+zPt
zlt2^}I-F|}`;6$9aDitLdnzX=1w?8j?Xn7C+BhjNH)52nF6p}`nvI-f$B4Z|lE-q=
zMzuVso3}vdo`J(NP%w(3r$)(^99iX^(oyD=Pl2Kcp#<y`D(=LS6RI9l9vKY`%vnV~
zhRaf_zYMcVz8txfd>BUka?B+rw<?Yvl?%L*^o{h>DQI6<S<_L2>%BuK%k#_g;qFJv
zNL`XF>lUqrS5^jP`_B!3*B)3X98z@Cl6B2K$}gXIPM>HSEGxskY?0jN+ACoOOHe~|
zC?Hg9b);=`taK+rf4nSQi#kgud#u)C1{#})GZo8mZX@VQV2>Tcy(36PR36%meuQy~
z)?LW>h=C;H+8|>}f`d97O<sZWemNA;c?~=$K=W5aYnFIV`x6m#(r~>!%@+%h2o$?l
z<3Rt-ni7rXCN3f3+_eE=VnqXpm9Unt-4_D}95|4B;BI&;EIR7-3nB1QTZ+>z%F#n+
zF`HxzUTw%x(Yr0%C~3XdqztxvTsKM4xugMby7B)AHfaf3UO<8Lp}xmjC;T>a-HDT8
z#iI?9VDPhhM6qnAi2gA9Z_?koLWOnc8cdw-g97^f_crb+@DT&Ckg{aChiBmf6O~e7
z*V3lsRWgSa0P0D1Q_pF$)gkALMEvXaH}T_UxOXj1hMsR#SvVSYX_vypcwP+Vo<H9O
zk7QCq>x>`F8A=ILSGU4?#>^jGx>*OjK(P70CZz3#kk3|Q3{CT~m>hkK>LZI)L>Jaq
z^m5`Ta^g&o6jW?^JGQuRqgCAATU_6B$aT=fE}@Go2YLA|XWrPdNqdbuj7+HBTY^y;
zI`je=u;2w^c%^9hgLfK8jW6+h(TlMne)rz&UKju*kcn_%k)+S<5~6{NoAFyg<tE`0
zn);h{i_?`h6`cgzRPQ418eHP7`W4~P&w!(P*F|LDY#h;WrR@qQ+br02S_X>Gw1)fc
zmrDFWq$c~1kjd<!x7uXsxK5KiL)$@sG_Td0f#!^(+J&x5=*HS*H2Y`j6Pp8r!rLTh
zj*^@4S<~xR$O8WGaTC)9`OM!;#=Ye#bT%eOSZY`=I(^?fq~OgKqJbR)sm8(kkDsgi
zhmyudq?2pE28LwH3aPS)HN{iMQV3pU`RfW(lM6_j^S3vN59K|u9Jtie1eU1~^n<36
zwQIV;Ak>~Qt6laAkk#T3_?rLfM+I9RO%~5+=X&V_Nd#TnK&Xq1s2O$lp;0$h`BP1y
zKf^L|q0F<bOxrM6soa^b%w=x3T=SM(;}K?|B04EqSfZ&i8%N{Os{$U2fQv~KO}`co
zd}N<~D;^arxNOWNuGW6I>}n1@<Mi4V&MnfT92;aM9!2$AwGbc;Ps*0c6`F&8mT?kq
zsplHq1E<^~FbUg!lzL<*k#-bl#j4+99+HkqFF4E6?GBu9rtO~<8IP;(|Jf^HH)6n}
z0$m}lz!-~>skCs!MPCz!>1<2>MR_pxQC~3J=n}d!FlyroE7pB^M%PS#2G3E<dxXAV
zo1|6B?TFVA5<}t`g?hkG%r4M6a^zamtU>w;23cTFg7~1L@lCIRI-V-G_bAAhu+EH$
zeTP8I@5;kWI*v#!K#G2~QE&>#4a<HaB&_8FJ4l(#&^6>D+6E81k3L%PmFzq}i*%D6
zHKyj0p_&%)RbfXmWP%I=QGMWXMz9W+F4yh3=eqZX@`;e<vGd#p|G-G^b)$k6sqjCC
z9F8ah+DG$M4r9~W7rPeOfm&@Dtd!_1m*84tscL$xZgTpgSrvE%0AB}Qtg(HuvU%Z-
z?x2pQr--ifaRVlOWZyhre<`fEV9dPW-{t4C-r@89x4?3iS0UhxNLIvB^g>Wh;Xo|R
zt{mWQ!c=;u-E=7sVsbbYK_)8Lk1E0Pj!8(*S?F@D2e2V%;s+G*fqfF@&VKD<1*ivz
z2b+W!lhch_a|~hT`B8Xy0@U_gE%?LfkB-tEBr<QoDp$AZ1faV!c;FV(oQr-NxLgHV
z;S5Irfif5|AyfpaF-3C{T(Qz_JTk;`7ZfG3QH$vJD@^?n(G?m+0t$_k1*-_i_yTDN
zuf>i&EAAN(_!6mw&%4#gI7(gZZ1E*Jv?%uhf=GghAOSk2LX1j#ooUJi$KYmQz16gu
zdiM&!9wA(i$ubJ{2agH~BvR*#-!s8~MC6zTl5{`ThZ3yoQ_x;Sl-(w)^}|N6Lz?9e
z&G_1<M!$Ib2#U$JoK{@S_8M_7j%FI+Vjsrx82$+A%=`i#M_&(CBRAmHn#`Z(z@1Se
zsj=g5RG0Cvjlxhmp7y?m!?D?O>|dDc4RT9XB}<cHsgeEuP5QWW&Qv_%i_*J4_Lsgy
z5W<{(p&{iQoh-)pTE>h}3WIbvi7YITmPG25WJ?&mczoY$YU4D>A{moBVw@4P!k?rv
z<yvyjE@6c5rig(l0)M_Xr+crJ%5fw06(++tg8zF&f(e$%wJPz^o6g@xq!ErJAEGrG
zBoFzW8ZFp&TGPK5n+_;ro5#NiurB=v8<{;Zz5pYwa|?fFn?ut*6iY9IxPwzK@}9h*
zN(Q6NUX=ECqLX!z<TwQoZ$P>z1|n(O19~o=z+io&@Y!9tBh-np@`C9RlqF#a|2}e-
z*paeY{3y!6y8(zAcdnA$iryL+o$yshA@DRFk?yHu-OB0YI8<NabB5wLiq{^?+QrH}
zRt<Q%@8P*#3PKnX`xQ=5bhs82Z}HH4G&@2&K)9IkPY95!s5a*jT8JcR24G*uKmhN^
zOcJ}Y0l<jNv3&9gVRQ5ZA=@hCz%`Sv%FfuOA1V*0_nU3@_a`a^BfqDsnaoJ+yO!{1
zM2IZO>Vz|2C8@pi6nN$%|DIy~EGsQ~tmfCwybRo@NYK4$*=N4atD!ib*>{iiyvw(4
z7Mqe8i5cFi_rqyX64R(nf&)fNBv7`yg;q`1#Rr1fRr3%A(Lb*r<aDbUH<O}p$FUB~
z&}tLWZ4y<_1TpOt+e*`_D?5a9!fbe3-uiDtTv7IUNox%XaLxhW0Sz+xLG8x9j&{2p
z-lpiNTWfg~lL_JhNSy43u36sou}9WalFMT^-hLuVuac{tGb1jE9zowMg%9z$Wq0zz
z9lR3IOICRyYkV6$FWFn=%j=vkP6{~n+beS!&Ce^tXBleGe{23(2JdIlAf!Ce*HTI%
z!srp_L3C3#Lg)C)9F!Tx2P%2(?f9YrpbOQc68cDYNBt5{x#l6GohMM{f_?`^IJXdM
z>s|$DP19<7{~!`7t=4J5w&<=%y^DldPQgacnZVTDB)z8d-KKGd4LG}r$)S0s{Uwj5
z&0=qhgq|n#{&q@77_(FOcv;ar*fs}pa0+qaz!CQ8hP$)YWXvX6138etmIW?E$~deX
zR~Qos6fu&W&qZ=T9ZR$L%IbR3x%y;Q>D&#xHg5~|{8sU{2I(w3xp_=HRHn4R!PC>~
zo`b&)&f$l>@3~8xz-!W&i47aIF*^Ue-CDB;S7U)frIR$NNRA!&_g6i-Ve^+NJMSZs
z%V5|MS9@);Xf-Ic_~g=Bt;RKRS~emsA_N8BYNco8FkZTk(CP(^xOvL%%J36iPOViK
zh`LPV+DypC6jl=7pNkwsBWSrqo-R?vD%|dVIkx@zx<^3keYj53Yh$s@WJsA|zGI-*
zALdZPK9$5-Uv1OD>)mWDDFj8~gM@w!N8*dN!W?x)@5+z9w`(*%OS$=IBf#hL`w8&j
zxG?qRP}H7h<jrW8Wz}@Tjyj=u|C1)dTDwOVqqhtMA-Z7gi4)WW;wF}8u<4m&BxVH0
z4P8a=fPWkIU1pU%>XJulax{ZO7ACKye|ScOp7u9f3b$8J_*9PHqEB~$fm7A5cV{-Y
zfd5vr8sW37W88^X%>!uKTH@SUz|6=d!W}$-00x*)$}ZvlW#(=@b;WQDQarX<Lh;ox
z92za%Sz0{PU-N@0j(Dfkpj@>nb3!8qNM3+nNeVJRn^PW-j;<5V2r}EaI(Z2O(on3|
zy>|KC1FqHrj6&!~?}rq34W-rq$_azF&M0H$Yv1Ap(#1r)d+HC+VO%)buXSdB9vi6l
z!>ZAZ=3Hw7h5{fN4kV9VT8-%(v!W<viMB;dCnogYF$tJ+_c6=~%Y?DC7`V?Ao9RL{
z8{t=Al~ED#+2pZTz5<7rQNhZLr~p7v@^dW(ux17YQ0#YW=&XOiV!ss7{fFZfGEEaM
z#{v!lXj;V0og0)(MtEf!?+x=zr=7z9Mow<uP{1uuqTl|&Wy%0##xmPt54+)s7z@NT
zXZVHF1xFj(S)RIj&;D@+KZaBqM$T>C!K3-0>@7~q$@{ybn^Xr{o+f7@Jnz%<wEN#R
zOJmHHeKAjk?y{8Qp#;^mniQcx=$8{~das}T>%o=^tI`y5mPF@IZ=bl0Ncb-Y11QPD
z(Zt8LR^lPjGadv#ZJZ+(S!n2F6(azTLn~1bGbKE`3e?+opA!dE{MU0-3h1ljnJRzr
zQD;_kIqds|SaQ7A31l+DYBhnO2XI;}5*9zlgFW{H)4s17xA^Iq6hqeS)iU#rE#7G)
zrJrx|0gP;58fI~OE+~=iW++%bld;Ghlz~3@+I>Zj@R-nS{#330M)Ei?@SwhhQQN0F
z$U6O2{92rk4N)L}i&09Zv#ll&+wb;`<JMx1XbVJ;<8)6CBu{;PR(?uR2qe&)5d<fo
zzZ}1bYd1wnxfMv&^t_ZhcRaYvv^>wZ%=Cahu6HtPBi~(|JbiCldmFbS1Y3{_MPO&2
z;h<4vj6)X;qQGNp7`L$%EUBbpD@Dg~F%C@Ze#dZU9H5$UR}h0};6S*~Z-az7A;|BZ
zFnx@oC_Y4g?OmK~@=XTcCa<NH%)TLW0O75upIghriR9TbYSa(~lJLQj*`HpOlGf`<
z0e#Sbz@WnHH*h++8}fgz+!YaDY(TDK{_*~!Be#XtADO)-n^-VmP(ge(F%{MpttSN0
zG??K(CJDVh60pw(K69fKz*_xF1I6@Xg}`{O_O||tV?eES;(R1{rC1s3Nzi~O95)*G
zm2{Z+-jy%H-dHVbZN!;#L2{;~9F0)39Vik>V<)^<h6)yw7Q8-tzAjFdgIp;s&6ow_
zi^qAxI5Uj?biCFBaghqs)~FI>v?e`}?^u!(+$1ejIbxvk$SFIS*bg46cM`Bcm&CK*
z=)%sM@ZSGiNjHtW0G_G%RsyK6WVqvjW-^A1QcX4M*8^H=qmP`VjZ8v{ybR_kOKwz=
z))A1NK9EyY)k|2;dl8f4I+tU2%uX2e!K>=fZs@Fz4}(C>?5YcL7dpCc%zebP(OWfu
za=6PD2PyGMbFm#WLRuLUFg9gERJhFB&CT|sES=JjH2ms%`xMUR$rRRutEnA+3(Gys
z_uOY(E(EQN>d@aRZt`$C`{)GBDJ0c;YPz8NwCLz3{W`03`-YZH%L}i!!o$@=BUm#t
z4mK(4Nh4Vu&&~WwkO?zN=mg3)LIK4i_yn82o^~H6smKqNq5|vJDgo?})5U`&^^)Hv
zA&F%e?Q~LTUsOAw2VaXd{qD6aS$%lkH6d*+TWr^c8-3}{9n^N~jSmqI?wSS5dwI(1
zBns<wJ@+NgF%cfQ<*{5&IPL{_for%5sz0p`*SCt@c`xx^%igCj2l?3AruVRa2D5ni
zw)_Dpk>#ksir-`+b|WR>4Ykk>$EZQeW}IS94piBB$K~o*z^kL~cPYZbk2jy@lQNf@
zVwH+10(Gp{FyyU)L~OS+vUo`^WX_Uln&R8;!{|5E(eJN?h;dY+wTIR@BUcOP=`gYH
z9&r6a`B+jnNotDno+t>!PbpPG7&P%bNj5UIyGT#upJpcKi+Q2c-^ZD?_Z=dNrF8rI
zCABktei-Jfr1w&&3$?eXj+*;aI@gBL-qT}uAv%LpM~&rqY1WrkCPssVTjr+AiY?*$
z;<&{3&03b=dG00273cTp#p}s^a5g=I+r#VY{()EuX_wZS+4aeH)w*ous(qURd$o3e
zUyZ{aRG1zKQ~*uyJ<I(#juF0mAGB>0HlafQgROyZ9}S2fx#~9Y*=RY+c(Wf|Yr|NV
z$puNmF0M~73y(;5L>_at3MR#azAtXhaNZZ@R;qMs?b0v&sO-Qhcj5Gd-#{`&t=$6o
zlL~dg0nO#ZuIWZ*OUanHIA3y`Kq48)tvi}W+3qR?T;qSf<fa<{0X@fVqQ#m4rpW}I
zjBnA7`;~ZMNg6@7X|SD|a&lI1f|kb3siX%0rQ*CI!^qG!HYx=<{8bd=V*cB&yEjJj
z+2nSSFU>%{s3HD^9xypAs-vIm%oH<BMvFvAM-w9!BW5(lCcj+`opkeHh|K{p{=`hm
zkq&qz4njeL@U@l3@nCebAvLxF;{n(j7j+KDmkWSCCSj4G2t0{)wnq#r>lcCAHU=rj
z!&2^zn43trSKHk59vLfe&F7F05YyKVswzd4`3QpMM1(cR3cePm<Q8C!PF)1T1GTW}
zE-TuPR3#Qv7!S?vyy^royo}n)2cRb?>9~OqSJ6V&kNfjXcj6>N^H3s>4CnhlPY1ym
z?_()74-`iB3;F1Cyf9I~@4^#IQZrU-ucoXCsao_#F)~+Q<9+7?_$Uu9&|q!`XEM~<
zJf5+aYyQa)=K8iW8+bAS_KVy*icD*1g(I|2-8;pWT(>?x`-xs5()PFl$0osJ<W;{Z
z6Q>tC{)pE+iHg?6#~nl8$oqC~9v1R4O6-}N0lt0G2ST3VbFYccuY%J88d`^_kXOuy
zYZox8T=%;pK<UpHF{j?0wj3OmB>GM7Ag7r&6o%p-eRyJY;w((q`)u1Bkq7Y?r|@HW
z+cMnSGmNqW3<I1T#<AnItdC(jdo<wqI^5B$r!pMb*yXE%s5$F_V)L!Z!=KD*R&2>6
z^oH<`iTNnC#$EVIP9m&~^_WLFW~YA-scgU+QRjBOwvs;&`J7@_-mbgD$hwM7mcLkV
zlz%L?{mS!wE&I5=C9wNWuC1VenRO~8bjBGUBQsJkcL8k5NbYsB;9#dFpIFLbjLbl5
z?+rs`UwMN5fZV`MvcRCkN7lJ@x6>=R2_jT5F{H0q9=~f%k(WHDQaQC9X|;X!E+`Pa
zKBI_(M_)%230({*Aa&GuZaBU+ixNAGXWx#uA=#2#Yua5Q|4KIeo1khV9YH&4ODUst
zASE}PlGCByG74J}e}*h*iI@EYtVe1OrVI*3Da*>`B7sbIaWBQ|TQSP;{CfNrr)Mj9
zm*a)(l+?99oij>{8|%p%c@;sS%x-qk{k~XvNDo_{^IM`3DJGqitZx5@^|LSZr;l{B
zP><wucRKi|@5BA)b!=Mi3B+HUf>X^c)?sR#5eTS`k6Z0@au+`xSF_32GesLXf`LDT
zyzdaVMq8jcjJk`m-ZzfKbC!z$y81f*(;y{o<xRG~Wvrkqgy@=w4QAbcn5vFbk}sF9
za`@?T{c-`dnIf^?xFVwpgW>!E{F+P%e8fY}O<pI;oUqZKjwTJAMviqtNs!536N!by
z5u5oHDIa+dlE{HQ6-`(iJKqRVp?AX4rV5NIDbtsN__7Zf^TppLaX3foBKGvg+&5lH
zfqN@5B|9;b+XPc1cUePLBm@ML#@-OjM6EaYmy8BF=>hj}Wf@X88EAlFZ3>l7Jj3v>
zB|%VALWHV=T0+@0eQP1S!FLY;uCOxRVkl)m^C7QA`5zMT*NWnGKi;2~hFO5@MCS<l
ztA(v+!ZhYnoj;YX&cZ>89bBFX-IJQsYWQZ-Wjd^5iB*&7(w21kDK%DQEk(A8p6=`k
zMYS~^wq_(FoClwS0db?%E~9LB0eGY^-g_3|)aad)HddoCcLRm22x%U?O>x?jWeZ<A
zv20}LeLvCp`@GG9#gMTxWeCfaSR0^jjgbrae0cB7O1YB&7cc=v?sTz+0EF37JkEU$
z_wur~*h~7I%}v+-K*jlUGLcX|jCOJxnc&AQPY?U7eJ`t5O>!tB9Fm=G<jfKE=n=P7
zR(lLeONCZLqUgeV=%vE~{#Be+VPBi3KGlzqGvs#j6yc*C`0<mR%meyQmjn40-)QtL
z*lXW!AM^=*-LHp(D*n6NHfUo}^e#$AJkC~?<rVV~OFUxq=xKX5!8`KNten*}t#3`4
z4`{hTZwAJ<HHZ&cMM3?d_aRw&jUPG5NoKG=Xfqu?seoN75PF#c53GFjO9MzAmcHw!
zC|tK^>LhaKp@*vN5tX9S*=M_8mn|I6RkD?M(<@esiq%wd+#3a2hHXg`MTrujZ@yj6
z9VZ*BdNvZQ5Mlp}R`tqqR7DZZ%Gf|uI0y!N7K;?g*ghHz7ZGo&?#Z3G*`t?2h`>PU
zdF_Q3z7f=Ma;-RXIgD}rXN=8XoG*1{kT{(N`H+yPBUFNHR4fe?P(II~tQ<G)kaUDv
zCV<EYYndBQXN!EWXahGcyj1HB_HlGG>+3rAj5RGC3htI<t&FS39>pRslxz>BHN<E^
z_b&6ENHIwQk-1XOl9Rt)POKliuSjiN$n3NA&upWma-S&g77k)w`G!tsCU~pNabaIP
z_@Y(r1&~ZQ@)U@(Bri~ZgA0FSK*ipRj>7hjkYq*D@@&BkULf3@Ubf%t`HteiEYK#}
z!HkD^4eU{TJ9l2K!s-%zWEV3mnY8loov^L0N9*2mr5l2OvSrNl6b^5Xt^n0f$0rW1
zx_54A2*tx_EXQcL4C-ch1=N{(DsHuu4P!W6c$|{*d~2e6_>!IfO<mt8U1Dxl?$7l8
z)HDt|U#(#w--b+HYE9uBnrtD`!Hn{DLwe0@Pb24Kp9(=XccRbp_2-~sPuef>D&5{=
z`-<?w-Y(^jV;D6XBgBl09l<eTWW#NmOd4&aJbaPL=yh6f-bIhvNE<5ZN(#`sFRs>C
zB}j>Bv~^O;UT~o3l65MegEolNGEn<i*Ak!c4pr>s;+2her97}$7fLr(!zq*VdY_xX
zdw>JJ#;b_?WyekVQA|J94XC>;_ohU@sSjT=dEo-pj>+wo!`ag4c#ANSq3O@#dTN=7
zGYYb!iPI%Ue?4$8UqRN1*ouWfkSzH%O`h`DevWegP+I4>6^(GuEy^9aIeshotCeDz
z{5o?#{Dhp9b?GQHjG2j}H8TdelXY8LF^RIDjJ<8(s@5+RaS^q=dm$x$7`6Cx5R5iO
zI0Ur$qerq&{DXJ>6imS$bh`~)VYesnidN_|{H9&7T-=#ohqA^?TA{;NrIsI1QQ>q4
zmpH0A@6>vhq2No+kT*GbI&zfQ-ak!=p`EPDt|dsdBeE5%NG<Od`;<0*#PDysL+SQM
z>zC<wWubz;jKH<qTl7N7KW$4KOC`cHYXpuX&SU4tuPn}TJ*Kx_kx6ryba}y@sJr-N
z0~N2NOMomnp>^XS041dHA!YI_6JCgC5j{re!HC(aZmjI+;n9)TiM_Yt@Z|meYq1Zz
z8_SIlE<uc0BdYje1oiOxE0qW*ZqS2f`pMB=QfFnVXwKF`;|7wW<6yOX4=v=ga3(11
zYR39LSCww+WCmAlzSnc3a;=|^Zt7+VPithZ+KGt=QMY$=+A#-<CwGvT+$1<BhWQNR
zct5co=qV*MvcPx12WAJ1U!?6rop{6I`R<rn6z$x#*07wi05f$a(t=MMFOC1MTyZmD
zBUQtC7d3)g4G^1o_ckm|tu2q<enb6%FGY2G)<9%lEC*d4ij61G!R?d8u>~IX`WPmM
z&(t!B?BuCv7Coi89O?cdk*u2gAdH>*K0HmgK?r;GT`1a4J;<o?UOEh}Qh*V)y)<}i
z#UDlnbPiKn5u9xZQzHWjU=}CxC)bz~5|c3rw~i%5=87X%67-qkL@j2YP3(2*&MjB*
zlCjOSI>VY^v`f==ZnurAN{_$RTi`6?Up)K?BYJ#1-=E+6r+Rf_XmuIsmaR>h*VU%n
zRqHeVk=A7J-zN_?DiWQMpXvz&G!I6izSU!KXm1U~{HjNz|370#$N%2;X#Ph{RsQ41
z2u=N;=yb4uq8}VZeZ4*VG-B#%@0aW7dpiS@RpS?66g34UX(TMbscHyI(2AS6!2Smi
z`ne$gi|0}xR4tV;=^mmYu{&z<3uuCpgR=38+~8C?n|bfiJ5t&Q-sd|~6k#vbaY-+z
zQ@x+c7W}uvv}DXTEu;;OT$przp0WZPj7Ap7Jqkl&RLDgGI{cW|g6}%`@vZ|DqltIt
zf6QqJCBVTd{0Y$zi$MaF1>#|#9IyQeo!AB~=D|;gC{ZuoraC@6M{lC;C8-O2MVIQr
z-_aEMh%eMcz9P%}c2o>w?QFv9_9SUm67IbX_$Qztg%XnZ*l=z&#k>*}=edZF=Y-Kz
zF+e-ZTFbVjL!5es3=v$<NPC^i<gN}At*Ye!<IMDay1T)fr|I`O7{3^#^Q<Cf073BG
zr#2w#I>!M0OMgrTAS8ag8u^+-N{Xn*cALGwQFMMarC-4|e7jQ8e69VxNhnJ-QPn>b
zCC6AGdoZV4e3QkusK9BZa~*2R2(K)<ZGk0L6NQ<L<)yThR8f}ySGFpmkEfQdaSln$
zh-ygV^Plo+QprNCZ{WSPNN%liDd=5}c-P?EFDrDR>L~!zo99^bp%wKRKB+~2N6zb|
zX$+s$VSb?%{b>Gvr!n^fzpl&wLTl~|d{LYGhS|^){P=&3Zwmjhgy7Wv<5pDV=<`ni
zrp`YB502p1eSp3Uey)6&c9v*rfvM6Z`lC#T7;IIQ!O9i*Dn+#ZKH^t3u%F01J)}>X
zKtIvDI;ihuZuS4bGr|gI`F|0E<W(z6JG@f-AT4^xu12m_lz!A~(4`vmJ>?SVL%4Q2
zT^(+Jb{xn*QWQKiN;r)Q=*Q*y6#aNk>~9m&#!s|s8%}7K-anaa;ek!EC6q#OUW7{x
zNEO3=*=o-x@2M1Aes?hI9sVd>Eyc>^-<r4sMU}W6`Uzp#91v~CAbx$Q=Y(C6)>~Hm
z_{!dQD<eRpCk_I$ZjxUg#w0(K0f!n#u*3Ii^dLw3V4t?LM_)I<sC%Q6-dr2=&4KaE
zXTH&~Voj^P<T@#8bG%oG?(>a8GRc_wS=j+9mB?%Sk{R&eM^5-7+A7E1rJ<I91k3Dv
zZ<o+kS&R)Pl@p7{77_v1RH5VXh%lENxC}MFDpONWKe}fQ+||o)Sch8$j3bKb0$s9k
zU*{BoBN=U-qVUGeY8WqPb}dzNHxG3+{{{mVwn>xmQEMy*d}g+kPB(upEzumLB|f3f
zGJxtYOXg$z<s<@3RfY;BC_{-Dh^ruA*@O&Uy0U7MpkDw?ZD&U`g-L>$_TtD?%R^iA
zwNn2SYk*bW{5ZJa%R~$M_r_gaODQVRQGG7xG}L8kIMWhVSu1}7WEtHZ_?|U~4zY>u
z&!)o4>`4qTm8&|aZI87x^MqU71Vfx!MntxP>GqM`MoqS~ZHhu>inzu0jRf`^Q%thS
z#5zkyP&CY@L0Y`{^Tc}SGuvsCrC}myqw)+};Ro5nth0&}a}RdX2JpZTrOqFTD8_2g
z6isPrtY*wXJPrlH9M4k#Kj!=&Pl)!Lct_s3-^vd?o`bb_vb={52_jelU}8zW7Xe8&
zlcpRNiBq%1Zs71j155PbgaIR~i=u9#3uH`~VvEZ&IhGaD75Qd%mNMVhtSdTlDCTu}
z(&dgdp&vYG723t#_^=W*Ium{MiPJ>6+b4HgY+<{NoS#D{cc+-UleIfJYz0t`s)tl$
z2nY^5CCW#}j3uEdJ;&rrlWBa*p<L#|cxB*vW33qt__<rHoH2-2nRp-N^3$;{QwZre
zMYL<uHF%+6TL$jhJn%23Xop55tE}j3mzHl<aP!%2eFe>&tuhGDFtoALHd?q*%1trd
zw#!%5b1OKDEom9?41=zk=1@C@tUO7hjo3KPe@>=AvwXrBW<8o49@7gij`TX<usbp#
zz<UHk;{N*iyrvEfsk6&z#?RQj)%|?^@_T*s`(Xch+x^<)zh0OQtCeMCqrv{Piw$nb
zKy(n#S5W%gtjH;vQu$&O{#O=kOTm<I$S5+`t<igD9dUj2G21b(FH1HOcS`kD_t|j!
z;^e+^FkdOs(7zV9ZMkmPcv`o9Az?rN@&h8dPki_MiAlwjGa08etJ))$I@dj=WR12R
zz1L?u6{7^4QdG%|%{BWtHEL4yJh6$DHLTN#0h=$=BKUKHK<u^K$V^*XaUN<VVVP-p
zoA`RJp<5ojgjg7wc&Ml2>ynz%3h?{9O%As4RvE=%=B!J%WUwlkRwuK}4z6%+@U(fG
z!EUG!(Eu&1lZ%?rS!;)qZMa`O!D0d{;`$0w?K+;rk=Te8-iq{_Q8;=2yngL(&hGa4
z(4H*gX0O^&3@_Q@<-5WB`T)d2Rcu?9Zx*xhwTjse_rD0Bz|N7puLt=O9It#j=lC?`
z^`s4Bzc7&e^Km>FKAG8OX|4<7g-Y<E^Zw;;o0PRtGt2VDkD+Rc&@CCNvg;xtbLpO#
zYMkzq5qzBd!+9ygixZ>Q(z|k$cz5>lHd;r(=jZ)8rB9M`Mfmn`y`T0Yl5*?&{cwJn
zH>|vhe;bgc!>1^Y&bcseu{`qomRMzlwbCii)~2%+@PiW}sc2SREPBuP!)y8ETg~j-
z^D|Ai26rlQB<s;Ucw4;$2xnu%g<&;J(fS)>cS)JGhFs8ECf=sWm~Uns^z?{tjRjwk
zlTD@$!OJbveqx&SbZcC>GFQ*4&E9P3Et_5x|6Jm7j$UAz2gaZH84d&Crr??B+X3Le
z_RY|`#usg_+}MlqN?o`_A8z%^c)};>!bm(pdh5ES;h1Cq+|p)?iJO1-d1o(vCZLFk
zWRhL)9jyO#DZ~1`Fx|o3R{DDr4Jb*hdsKE6X%{^2Ew)U<b!;?NLn?(T`j4*VkjHsj
zL`COrX`XH8uIUVH>})EgJxP<Qbe|OBP=9e#S*y|1P&m$Pjp~S(<p{GCvu>s}6tlG5
z36iT+Qm_<lfw_}lW?a59)qNveFpqKRP>*qQ@*7kd7U2bisS?chtMi`%)W;NMjRC50
ze(T~}bv&{yYm>$@Q>GrSB=`^N`*dI-Pji*P&v}nBsYQB=IN07TjSn9cwpI-5+GJ}S
zXpdyS6b+f;uY}onE`+2A5~Xjf1Z;(%HQ4h8yDEJzh+L(r+wypPrpMTkZc{c(pNiEE
z^oISRl!0R>6Levlwhu*<wBEIDl+>+phIMB<BGYHktPerR=qXJmKdHL4Bey#mwl}=2
zr$m{*skUjR^yJ^Og$jhf*ryfVk>{XII@#T-bC`UL!cOfP=g1fl(nR@YOc@Pz+@7i)
zdj_cLr#9fUR!V({t(3x3s$~jHt7RHyH&}q@q55X?FR0nb*ynRh>~0(jRE?S>!!51<
zS+KK~*Q%veW2XNPdDD%UZZWY<FJfjHkZCbbrDsy-+SgkMbFIS_;9IL|HEm=ruT)2?
z*-Tqn{fAOcD{D0VrCc*B*@pMAwIw+tYp%Z7hVz5g2C5}KBc&?UGY+RZc`_@dC8cRg
z3stEm&CHbh$`TE_|Dgx%7M7}i$%$5`!^C2utbwIQcXXlIb#ejj1H?SR#Po!zhBV?A
zchYN58_{KfDJyGLg@(-Zg!}SRb?N^mOG{Oyrp!!=j7-bPC1p7y%ghvF^J!PGny9jD
z3(v{cQq+4|qb7XI{~W)(P@QVp!a|dz^6zE-OLj{O+R;KZ6cw;z_?{mx2GM`K=7*dl
z@mV;2QJ6GwqNZUw#2C-v3E0}+5LVOCf$tysg57FV|Amh4zS19!7`Lz!f}yQDLgLsF
zE*(9)%4N?$Xv|e@3P6oY(5;vegJVEmrA*UB>k<^4GuQtewwCG6CjDI-+=pYqNwWl@
zF@PSJ>=w3Htdh77;@GZQfnVc2xlQPOIM7Y%FQSaWIlGgxYh*-<{7WHCLV;0m$Gk9Z
zy(TcpRr%PA_joiBU#JivtMe{9q;6eZHX?M%XUrzW)lXF|GhOEw)f*PH;6?%fW&A>f
z(4@z&GNFm46;J^f$+m^H5o0kp%Dw~X4Ji(9W-A{NQ8bw&`;~x(1CC{+-h-?vgtXv!
z77bZ8KyU`?Dd&UL*;wFm5Mq>+)O2cNNYik!SuQQxE`|d`NBuoce%v(a0RbRtCeF%;
zk+e8t(RNt~W3w^@Kp7u!th7tah)si~luz=eEbKQ4&lbxZYl||Q5bGN0zj3jZo-?en
z#JG%BX_>%O`M}lhvoEB#E3v3QjmfVn>heT+V3v*(3TFkf)_P~sZbRT;OPwSf>a7W!
z@E0=ze&RQ;GRH`thgA7!QudJTvHcXJ2{wI>t$j9{!%}2a$i}cWixaz=$JqOR{QPKG
K8j?pqfc_WVBv<$V

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 606f8bc2a..6215ec9fe 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5094,9 +5094,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_recent_clear" = "Clear";
 "lng_recent_clear_sure" = "Do you want to clear your search history?";
 "lng_recent_remove" = "Remove from Recent";
+"lng_recent_clear_all" = "Clear all";
 "lng_recent_hide_top" = "Remove all & Disable";
 "lng_recent_hide_sure" = "Are you sure you want to clear and disable frequent contacts list?\n\nYou can always turn this feature back on in Settings > Privacy > Suggest Frequent Contacts.";
 "lng_recent_hide_button" = "Hide";
+"lng_recent_none" = "Recent search results\nwill appear here.";
 
 // Wnd specific
 
diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc
index 5b72c461f..3322b1387 100644
--- a/Telegram/Resources/qrc/telegram/animations.qrc
+++ b/Telegram/Resources/qrc/telegram/animations.qrc
@@ -24,5 +24,6 @@
     <file alias="chat_link.tgs">../../animations/chat_link.tgs</file>
     <file alias="collectible_username.tgs">../../animations/collectible_username.tgs</file>
     <file alias="collectible_phone.tgs">../../animations/collectible_phone.tgs</file>
+    <file alias="search.tgs">../../animations/search.tgs</file>
   </qresource>
 </RCC>
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index bda06d535..777773f0b 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -734,6 +734,10 @@ auto PeerListRow::generateNameWords() const
 	return peer()->nameWords();
 }
 
+QPoint PeerListRow::computeNamePosition(
+		const style::PeerListItem &st) const {
+	return st.namePosition;
+}
 
 void PeerListRow::invalidatePixmapsCache() {
 	if (_checkbox) {
@@ -1745,8 +1749,9 @@ crl::time PeerListContent::paintRow(
 		? QMargins()
 		: row->rightActionMargins();
 	const auto &name = row->name();
-	const auto namex = _st.item.namePosition.x();
-	const auto namey = _st.item.namePosition.y();
+	const auto namePosition = row->computeNamePosition(_st.item);
+	const auto namex = namePosition.x();
+	const auto namey = namePosition.y();
 	auto namew = outerWidth - namex - skipRight;
 	if (!rightActionSize.isEmpty()
 		&& (namey < rightActionMargins.top() + rightActionSize.height())
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index ea7f73b67..010c63598 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -100,6 +100,8 @@ public:
 		-> const base::flat_set<QChar> &;
 	[[nodiscard]] virtual auto generateNameWords() const
 		-> const base::flat_set<QString> &;
+	[[nodiscard]] virtual QPoint computeNamePosition(
+		const style::PeerListItem &st) const;
 
 	virtual void preloadUserpic();
 
diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
index 03f4416f8..318a739b5 100644
--- a/Telegram/SourceFiles/data/components/top_peers.cpp
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -80,15 +80,13 @@ void TopPeers::remove(not_null<PeerData*> peer) {
 	const auto i = ranges::find(_list, peer, &TopPeer::peer);
 	if (i != end(_list)) {
 		_list.erase(i);
-		_updates.fire({});
+		updated();
 	}
 
 	_requestId = _session->api().request(MTPcontacts_ResetTopPeerRating(
 		MTP_topPeerCategoryCorrespondents(),
 		peer->input
 	)).send();
-
-	_session->local().writeSearchSuggestionsDelayed();
 }
 
 void TopPeers::increment(not_null<PeerData*> peer, TimeId date) {
@@ -117,10 +115,10 @@ void TopPeers::increment(not_null<PeerData*> peer, TimeId date) {
 			}
 		}
 		if (changed) {
-			_updates.fire({});
+			updated();
+		} else {
+			_session->local().writeSearchSuggestionsDelayed();
 		}
-
-		_session->local().writeSearchSuggestionsDelayed();
 	}
 }
 
@@ -140,11 +138,11 @@ void TopPeers::toggleDisabled(bool disabled) {
 		if (!_disabled || !_list.empty()) {
 			_disabled = true;
 			_list.clear();
-			_updates.fire({});
+			updated();
 		}
 	} else if (_disabled) {
 		_disabled = false;
-		_updates.fire({});
+		updated();
 	}
 
 	_session->api().request(MTPcontacts_ToggleTopPeers(
@@ -154,8 +152,6 @@ void TopPeers::toggleDisabled(bool disabled) {
 			request();
 		}
 	}).send();
-
-	_session->local().writeSearchSuggestionsDelayed();
 }
 
 void TopPeers::request() {
@@ -194,12 +190,12 @@ void TopPeers::request() {
 					LOG(("API Error: Unexpected top peer category."));
 				});
 			}
-			_updates.fire({});
+			updated();
 		}, [&](const MTPDcontacts_topPeersDisabled &) {
 			if (!_disabled) {
 				_list.clear();
 				_disabled = true;
-				_updates.fire({});
+				updated();
 			}
 		}, [](const MTPDcontacts_topPeersNotModified &) {
 		});
@@ -218,6 +214,11 @@ uint64 TopPeers::countHash() const {
 	return HashFinalize(hash);
 }
 
+void TopPeers::updated() {
+	_updates.fire({});
+	_session->local().writeSearchSuggestionsDelayed();
+}
+
 QByteArray TopPeers::serialize() const {
 	_session->local().readSearchSuggestions();
 
diff --git a/Telegram/SourceFiles/data/components/top_peers.h b/Telegram/SourceFiles/data/components/top_peers.h
index 051964066..5f1250b53 100644
--- a/Telegram/SourceFiles/data/components/top_peers.h
+++ b/Telegram/SourceFiles/data/components/top_peers.h
@@ -38,6 +38,7 @@ private:
 
 	void request();
 	[[nodiscard]] uint64 countHash() const;
+	void updated();
 
 	const not_null<Main::Session*> _session;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 3f4fffe0a..7796afb4e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -600,6 +600,30 @@ topPeers: DialogsStories(dialogsStoriesFull) {
 topPeersRadius: 4px;
 topPeersMargin: margins(3px, 3px, 3px, 4px);
 
+recentPeersEmptySize: 100px;
+recentPeersEmptyMargin: margins(10px, 10px, 10px, 10px);
+recentPeersEmptySkip: 10px;
+recentPeersItem: PeerListItem(defaultPeerListItem) {
+	height: 56px;
+	photoSize: 42px;
+	photoPosition: point(10px, 7px);
+	namePosition: point(64px, 9px);
+	statusPosition: point(64px, 30px);
+	button: OutlineButton(defaultPeerListButton) {
+		textBg: contactsBg;
+		textBgOver: contactsBgOver;
+		ripple: defaultRippleAnimation;
+	}
+	statusFg: contactsStatusFg;
+	statusFgOver: contactsStatusFgOver;
+	statusFgActive: contactsStatusFgOnline;
+}
+recentPeersList: PeerList(defaultPeerList) {
+	padding: margins(0px, 4px, 0px, 4px);
+	item: recentPeersItem;
+}
+recentPeersSpecialNamePosition: point(64px, 19px);
+
 dialogsStoriesList: DialogsStoriesList {
 	small: dialogsStories;
 	full: dialogsStoriesFull;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 3e2b7a9ed..e5746bc5c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -58,6 +58,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_media_prepare.h"
 #include "storage/storage_account.h"
 #include "storage/storage_domain.h"
+#include "data/components/recent_peers.h"
 #include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -514,6 +515,12 @@ Widget::Widget(
 void Widget::chosenRow(const ChosenRow &row) {
 	storiesToggleExplicitExpand(false);
 
+	if (!_search->getLastText().isEmpty()) {
+		if (const auto history = row.key.history()) {
+			session().recentPeers().bump(history->peer);
+		}
+	}
+
 	const auto history = row.key.history();
 	const auto topicJump = history
 		? history->peer->forumTopicFor(row.message.fullId.msg)
@@ -1120,11 +1127,13 @@ void Widget::updateSuggestions(anim::type animated) {
 		_suggestions = std::make_unique<Suggestions>(
 			this,
 			controller(),
-			TopPeersContent(&session()));
+			TopPeersContent(&session()),
+			RecentPeersContent(&session()));
 
-		_suggestions->topPeerChosen(
-		) | rpl::start_with_next([=](PeerId id) {
-			const auto peer = session().data().peer(id);
+		rpl::merge(
+			_suggestions->topPeerChosen(),
+			_suggestions->recentPeerChosen()
+		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
 			if (base::IsCtrlPressed()) {
 				controller()->showInNewWindow(peer);
 			} else {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 24c453ad3..6a7dde299 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -8,6 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/dialogs_suggestions.h"
 
 #include "base/unixtime.h"
+#include "boxes/peer_list_box.h"
+#include "data/components/recent_peers.h"
 #include "data/components/top_peers.h"
 #include "data/data_changes.h"
 #include "data/data_peer_values.h"
@@ -15,7 +17,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
 #include "main/main_session.h"
+#include "settings/settings_common.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/elastic_scroll.h"
@@ -24,16 +28,83 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "ui/delayed_activation.h"
 #include "ui/dynamic_thumbnails.h"
+#include "ui/painter.h"
+#include "ui/unread_badge_paint.h"
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
 #include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_window.h"
 
 namespace Dialogs {
 namespace {
 
+class RecentRow final : public PeerListRow {
+public:
+	explicit RecentRow(not_null<PeerData*> peer);
+
+	bool refreshBadge();
+
+	QSize rightActionSize() const override;
+	QMargins rightActionMargins() const override;
+	void rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) override;
+	bool rightActionDisabled() const override;
+
+	QPoint computeNamePosition(const style::PeerListItem &st) const override;
+
+private:
+	const not_null<History*> _history;
+	QString _badgeString;
+	QSize _badgeSize;
+	uint32 _counter : 30 = 0;
+	uint32 _unread : 1 = 0;
+	uint32 _muted : 1 = 0;
+
+};
+
+class RecentsController final : public PeerListController {
+public:
+	RecentsController(
+		not_null<Main::Session*> session,
+		RecentPeersList list);
+
+	[[nodiscard]] rpl::producer<int> count() const {
+		return _count.value();
+	}
+	[[nodiscard]] rpl::producer<not_null<PeerData*>> chosen() const {
+		return _chosen.events();
+	}
+
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+	Main::Session &session() const override;
+
+	QString savedMessagesChatStatus() const override;
+
+private:
+	void setupDivider();
+	void subscribeToEvents();
+
+	const not_null<Main::Session*> _session;
+	RecentPeersList _recent;
+	rpl::variable<int> _count;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	rpl::event_stream<not_null<PeerData*>> _chosen;
+	rpl::lifetime _lifetime;
+
+};
+
 void FillTopPeerMenu(
 		not_null<Window::SessionController*> controller,
 		const ShowTopPeerMenuRequest &request,
@@ -92,12 +163,210 @@ void FillTopPeerMenu(
 	});
 }
 
+RecentRow::RecentRow(not_null<PeerData*> peer)
+: PeerListRow(peer)
+, _history(peer->owner().history(peer)) {
+	if (peer->isSelf() || peer->isRepliesChat()) {
+		setCustomStatus(u" "_q);
+	}
+	refreshBadge();
+}
+
+bool RecentRow::refreshBadge() {
+	if (_history->peer->isSelf()) {
+		return false;
+	}
+	auto result = false;
+	const auto muted = _history->muted() ? 1 : 0;
+	if (_muted != muted) {
+		_muted = muted;
+		if (_counter || _unread) {
+			result = true;
+		}
+	}
+	const auto badges = _history->chatListBadgesState();
+	const auto unread = badges.unread ? 1 : 0;
+	if (_counter != badges.unreadCounter || _unread != unread) {
+		_counter = badges.unreadCounter;
+		_unread = unread;
+		result = true;
+
+		_badgeString = !_counter
+			? (_unread ? u" "_q : QString())
+			: (_counter < 1000)
+			? QString::number(_counter)
+			: (QString::number(_counter / 1000) + 'K');
+		if (_badgeString.isEmpty()) {
+			_badgeSize = QSize();
+		} else {
+			auto st = Ui::UnreadBadgeStyle();
+			const auto unreadRectHeight = st.size;
+			const auto unreadWidth = st.font->width(_badgeString);
+			_badgeSize = QSize(
+				std::max(unreadWidth + 2 * st.padding, unreadRectHeight),
+				unreadRectHeight);
+		}
+	}
+	return result;
+}
+
+QSize RecentRow::rightActionSize() const {
+	return _badgeSize;
+}
+
+QMargins RecentRow::rightActionMargins() const {
+	if (_badgeSize.isEmpty()) {
+		return {};
+	}
+	const auto x = st::recentPeersItem.photoPosition.x();
+	const auto y = (st::recentPeersItem.height - _badgeSize.height()) / 2;
+	return QMargins(x, y, x, y);
+}
+
+void RecentRow::rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) {
+	if (!_counter && !_unread) {
+		return;
+	} else if (_badgeString.isEmpty()) {
+		_badgeString = !_counter
+			? u" "_q
+			: (_counter < 1000)
+			? QString::number(_counter)
+			: (QString::number(_counter / 1000) + 'K');
+	}
+	auto st = Ui::UnreadBadgeStyle();
+	st.selected = selected;
+	st.muted = _muted;
+	const auto &counter = _badgeString;
+	PaintUnreadBadge(p, counter, x + _badgeSize.width(), y, st);
+}
+
+bool RecentRow::rightActionDisabled() const {
+	return true;
+}
+
+QPoint RecentRow::computeNamePosition(const style::PeerListItem &st) const {
+	return (peer()->isSelf() || peer()->isRepliesChat())
+		? st::recentPeersSpecialNamePosition
+		: st.namePosition;
+}
+
+RecentsController::RecentsController(
+	not_null<Main::Session*> session,
+	RecentPeersList list)
+: _session(session)
+, _recent(std::move(list)) {
+}
+
+void RecentsController::prepare() {
+	setupDivider();
+
+	for (const auto &peer : _recent.list) {
+		delegate()->peerListAppendRow(std::make_unique<RecentRow>(peer));
+	}
+	delegate()->peerListRefreshRows();
+	_count = _recent.list.size();
+
+	subscribeToEvents();
+}
+
+void RecentsController::rowClicked(not_null<PeerListRow*> row) {
+	_chosen.fire(row->peer());
+}
+
+base::unique_qptr<Ui::PopupMenu> RecentsController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	return nullptr;
+}
+
+Main::Session &RecentsController::session() const {
+	return *_session;
+}
+
+QString RecentsController::savedMessagesChatStatus() const {
+	return tr::lng_saved_forward_here(tr::now);
+}
+
+void RecentsController::setupDivider() {
+	auto result = object_ptr<Ui::FixedHeightWidget>(
+		(QWidget*)nullptr,
+		st::searchedBarHeight);
+	const auto raw = result.data();
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		tr::lng_recent_title(),
+		st::searchedBarLabel);
+	const auto clear = Ui::CreateChild<Ui::LinkButton>(
+		raw,
+		tr::lng_recent_clear(tr::now),
+		st::searchedBarLink);
+	rpl::combine(
+		raw->sizeValue(),
+		clear->widthValue()
+	) | rpl::start_with_next([=](QSize size, int width) {
+		const auto x = st::searchedBarPosition.x();
+		const auto y = st::searchedBarPosition.y();
+		clear->moveToRight(0, 0, size.width());
+		label->resizeToWidth(size.width() - x - width);
+		label->moveToLeft(x, y, size.width());
+	}, raw->lifetime());
+	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		QPainter(raw).fillRect(clip, st::searchedBarBg);
+	}, raw->lifetime());
+
+	delegate()->peerListSetAboveWidget(std::move(result));
+}
+
+void RecentsController::subscribeToEvents() {
+	using Flag = Data::PeerUpdate::Flag;
+	_session->changes().peerUpdates(
+		Flag::Notifications
+		| Flag::OnlineStatus
+	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		const auto peer = update.peer;
+		if (peer->isSelf()) {
+			return;
+		}
+		auto refreshed = false;
+		const auto row = delegate()->peerListFindRow(update.peer->id.value);
+		if (!row) {
+			return;
+		} else if (update.flags & Flag::Notifications) {
+			refreshed = static_cast<RecentRow*>(row)->refreshBadge();
+		}
+		if (!peer->isRepliesChat() && (update.flags & Flag::OnlineStatus)) {
+			row->clearCustomStatus();
+			refreshed = true;
+		}
+		if (refreshed) {
+			delegate()->peerListUpdateRow(row);
+		}
+	}, _lifetime);
+
+	_session->data().unreadBadgeChanges(
+	) | rpl::start_with_next([=] {
+		for (auto i = 0; i != _count.current(); ++i) {
+			const auto row = delegate()->peerListRowAt(i);
+			if (static_cast<RecentRow*>(row.get())->refreshBadge()) {
+				delegate()->peerListUpdateRow(row);
+			}
+		}
+	}, _lifetime);
+}
+
 } // namespace
 
 Suggestions::Suggestions(
 	not_null<QWidget*> parent,
 	not_null<Window::SessionController*> controller,
-	rpl::producer<TopPeersList> topPeers)
+	rpl::producer<TopPeersList> topPeers,
+	RecentPeersList recentPeers)
 : RpWidget(parent)
 , _scroll(std::make_unique<Ui::ElasticScroll>(this))
 , _content(_scroll->setOwnedWidget(object_ptr<Ui::VerticalLayout>(this)))
@@ -105,13 +374,22 @@ Suggestions::Suggestions(
 	this,
 	object_ptr<TopPeersStrip>(this, std::move(topPeers)))))
 , _topPeers(_topPeersWrap->entity())
-, _divider(_content->add(setupDivider())) {
+, _recentPeers(
+	_content->add(
+		setupRecentPeers(controller, std::move(recentPeers))))
+, _emptyRecent(_content->add(setupEmptyRecent(controller))) {
+	_recentCount.value() | rpl::start_with_next([=](int count) {
+		_recentPeers->toggle(count > 0, anim::type::instant);
+		_emptyRecent->toggle(count == 0, anim::type::instant);
+	}, _recentPeers->lifetime());
+
 	_topPeers->emptyValue() | rpl::start_with_next([=](bool empty) {
 		_topPeersWrap->toggle(!empty, anim::type::instant);
 	}, _topPeers->lifetime());
 
 	_topPeers->clicks() | rpl::start_with_next([=](uint64 peerIdRaw) {
-		_topPeerChosen.fire(PeerId(peerIdRaw));
+		const auto peerId = PeerId(peerIdRaw);
+		_topPeerChosen.fire(controller->session().data().peer(peerId));
 	}, _topPeers->lifetime());
 
 	_topPeers->showMenuRequests(
@@ -178,36 +456,79 @@ void Suggestions::paintEvent(QPaintEvent *e) {
 }
 
 void Suggestions::resizeEvent(QResizeEvent *e) {
-	_scroll->setGeometry(rect());
-	_content->resizeToWidth(width());
+	const auto w = std::max(width(), st::columnMinimalWidthLeft);
+	_scroll->setGeometry(0, 0, w, height());
+	_content->resizeToWidth(w);
 }
 
-object_ptr<Ui::RpWidget> Suggestions::setupDivider() {
-	auto result = object_ptr<Ui::FixedHeightWidget>(
-		this,
-		st::searchedBarHeight);
-	const auto raw = result.data();
+object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
+		not_null<Window::SessionController*> window,
+		RecentPeersList recentPeers) {
+	auto &lifetime = _content->lifetime();
+	const auto delegate = lifetime.make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto controller = lifetime.make_state<RecentsController>(
+		&window->session(),
+		std::move(recentPeers));
+	controller->setStyleOverrides(&st::recentPeersList);
+
+	_recentCount = controller->count();
+
+	controller->chosen(
+	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		window->session().recentPeers().bump(peer);
+		_recentPeerChosen.fire_copy(peer);
+	}, lifetime);
+
+	auto content = object_ptr<PeerListContent>(_content, controller);
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	return object_ptr<Ui::SlideWrap<>>(this, std::move(content));
+}
+
+object_ptr<Ui::SlideWrap<>> Suggestions::setupEmptyRecent(
+		not_null<Window::SessionController*> window) {
+	auto content = object_ptr<Ui::RpWidget>(_content);
+	const auto raw = content.data();
+
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		raw,
-		tr::lng_recent_title(),
-		st::searchedBarLabel);
-	const auto clear = Ui::CreateChild<Ui::LinkButton>(
+		tr::lng_recent_none(),
+		st::defaultPeerListAbout);
+	const auto size = st::recentPeersEmptySize;
+	const auto [widget, animate] = Settings::CreateLottieIcon(
 		raw,
-		tr::lng_recent_clear(tr::now),
-		st::searchedBarLink);
-	rpl::combine(
-		raw->sizeValue(),
-		clear->widthValue()
-	) | rpl::start_with_next([=](QSize size, int width) {
-		const auto x = st::searchedBarPosition.x();
-		const auto y = st::searchedBarPosition.y();
-		clear->moveToRight(0, 0, size.width());
-		label->resizeToWidth(size.width() - x - width);
-		label->moveToLeft(x, y, size.width());
+		{
+			.name = u"search"_q,
+			.sizeOverride = { size, size },
+		},
+		st::recentPeersEmptyMargin);
+	const auto icon = widget.data();
+
+	_scroll->heightValue() | rpl::start_with_next([=](int height) {
+		raw->resize(raw->width(), height - st::topPeers.height);
 	}, raw->lifetime());
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
-		QPainter(raw).fillRect(clip, st::searchedBarBg);
+
+	raw->sizeValue() | rpl::start_with_next([=](QSize size) {
+		const auto x = (size.width() - icon->width()) / 2;
+		const auto y = (size.height() - icon->height()) / 3;
+		icon->move(x, y);
+		label->move(
+			(size.width() - label->width()) / 2,
+			y + icon->height() + st::recentPeersEmptySkip);
 	}, raw->lifetime());
+
+	auto result = object_ptr<Ui::SlideWrap<>>(_content, std::move(content));
+	result->toggle(false, anim::type::instant);
+
+	result->toggledValue() | rpl::filter([=](bool shown) {
+		return shown && window->session().data().chatsListLoaded();
+	}) | rpl::start_with_next([=] {
+		animate(anim::repeat::once);
+	}, raw->lifetime());
+
 	return result;
 }
 
@@ -356,4 +677,8 @@ rpl::producer<TopPeersList> TopPeersContent(
 	};
 }
 
+RecentPeersList RecentPeersContent(not_null<Main::Session*> session) {
+	return RecentPeersList{ session->recentPeers().list() };
+}
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index dcc2a35a0..3ddd00f72 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -28,12 +28,17 @@ class SessionController;
 
 namespace Dialogs {
 
+struct RecentPeersList {
+	std::vector<not_null<PeerData*>> list;
+};
+
 class Suggestions final : public Ui::RpWidget {
 public:
 	Suggestions(
 		not_null<QWidget*> parent,
 		not_null<Window::SessionController*> controller,
-		rpl::producer<TopPeersList> topPeers);
+		rpl::producer<TopPeersList> topPeers,
+		RecentPeersList recentPeers);
 	~Suggestions();
 
 	void selectSkip(int delta);
@@ -42,27 +47,41 @@ public:
 	void selectRight();
 	void chooseRow();
 
-	[[nodiscard]] rpl::producer<PeerId> topPeerChosen() const {
+	[[nodiscard]] rpl::producer<not_null<PeerData*>> topPeerChosen() const {
 		return _topPeerChosen.events();
 	}
+	[[nodiscard]] rpl::producer<not_null<PeerData*>> recentPeerChosen() const {
+		return _recentPeerChosen.events();
+	}
 
 private:
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 
-	[[nodiscard]] object_ptr<Ui::RpWidget> setupDivider();
+	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupRecentPeers(
+		not_null<Window::SessionController*> window,
+		RecentPeersList recentPeers);
+	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupEmptyRecent(
+		not_null<Window::SessionController*> window);
 
 	const std::unique_ptr<Ui::ElasticScroll> _scroll;
 	const not_null<Ui::VerticalLayout*> _content;
 	const not_null<Ui::SlideWrap<TopPeersStrip>*> _topPeersWrap;
 	const not_null<TopPeersStrip*> _topPeers;
-	const not_null<Ui::RpWidget*> _divider;
 
-	rpl::event_stream<PeerId> _topPeerChosen;
+	rpl::variable<int> _recentCount;
+	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recentPeers;
+	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyRecent;
+
+	rpl::event_stream<not_null<PeerData*>> _topPeerChosen;
+	rpl::event_stream<not_null<PeerData*>> _recentPeerChosen;
 
 };
 
 [[nodiscard]] rpl::producer<TopPeersList> TopPeersContent(
 	not_null<Main::Session*> session);
 
+[[nodiscard]] RecentPeersList RecentPeersContent(
+	not_null<Main::Session*> session);
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 01771f9e0..3f5104547 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -30,9 +30,10 @@ struct TopPeersStrip::Entry {
 	QImage userpicFrame;
 	float64 userpicFrameOnline = 0.;
 	QString badgeString;
-	uint32 badge : 28 = 0;
+	uint32 badge : 27 = 0;
 	uint32 userpicFrameDirty : 1 = 0;
 	uint32 subscribed : 1 = 0;
+	uint32 unread : 1 = 0;
 	uint32 online : 1 = 0;
 	uint32 muted : 1 = 0;
 };
@@ -412,9 +413,15 @@ void TopPeersStrip::apply(Entry &entry, const TopPeersEntry &data) {
 		entry.badgeString = QString();
 		entry.userpicFrameDirty = 1;
 	}
+	if (entry.unread != data.unread) {
+		entry.unread = data.unread;
+		if (!entry.badge) {
+			entry.userpicFrameDirty = 1;
+		}
+	}
 	if (entry.muted != data.muted) {
 		entry.muted = data.muted;
-		if (entry.badge) {
+		if (entry.badge || entry.unread) {
 			entry.userpicFrameDirty = 1;
 		}
 	}
@@ -500,7 +507,7 @@ void TopPeersStrip::paintUserpic(
 	}
 	const auto simple = entry.userpic->image(size);
 	const auto ratio = style::DevicePixelRatio();
-	const auto renderFrame = (online > 0) || entry.badge;
+	const auto renderFrame = (online > 0) || entry.badge || entry.unread;
 	if (!renderFrame) {
 		entry.userpicFrame = QImage();
 		p.drawImage(rect, simple);
@@ -541,9 +548,11 @@ void TopPeersStrip::paintUserpic(
 		q.setCompositionMode(QPainter::CompositionMode_SourceOver);
 	}
 
-	if (entry.badge) {
+	if (entry.badge || entry.unread) {
 		if (entry.badgeString.isEmpty()) {
-			entry.badgeString = (entry.badge < 1000)
+			entry.badgeString = !entry.badge
+				? u" "_q
+				: (entry.badge < 1000)
 				? QString::number(entry.badge)
 				: (QString::number(entry.badge / 1000) + 'K');
 		}
@@ -551,7 +560,7 @@ void TopPeersStrip::paintUserpic(
 		st.selected = selected;
 		st.muted = entry.muted;
 		const auto &counter = entry.badgeString;
-		const auto badge = PaintUnreadBadge(q, counter, size, 0, st);
+		PaintUnreadBadge(q, counter, size, 0, st);
 	}
 
 	q.end();
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index 74b983062..f6229af6b 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -100,6 +100,7 @@ Session::Session(
 , _giftBoxStickersPacks(std::make_unique<Stickers::GiftBoxPack>(this))
 , _sendAsPeers(std::make_unique<SendAsPeers>(this))
 , _attachWebView(std::make_unique<InlineBots::AttachWebView>(this))
+, _recentPeers(std::make_unique<Data::RecentPeers>(this))
 , _scheduledMessages(std::make_unique<Data::ScheduledMessages>(this))
 , _sponsoredMessages(std::make_unique<Data::SponsoredMessages>(this))
 , _topPeers(std::make_unique<Data::TopPeers>(this))
diff --git a/Telegram/SourceFiles/ui/unread_badge_paint.cpp b/Telegram/SourceFiles/ui/unread_badge_paint.cpp
index 758d48dae..d6b150a08 100644
--- a/Telegram/SourceFiles/ui/unread_badge_paint.cpp
+++ b/Telegram/SourceFiles/ui/unread_badge_paint.cpp
@@ -79,8 +79,8 @@ void CreateCircleMask(UnreadBadgeSizeData *data, int size) {
 }
 
 [[nodiscard]] QString ComputeUnreadBadgeText(
-	const QString &unreadCount,
-	int allowDigits) {
+		const QString &unreadCount,
+		int allowDigits) {
 	return (allowDigits > 0) && (unreadCount.size() > allowDigits + 1)
 		? u".."_q + unreadCount.mid(unreadCount.size() - allowDigits)
 		: unreadCount;

From 051ca51d3b7a401aa5991e3994d079f2408bccda Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 Apr 2024 15:37:14 +0400
Subject: [PATCH 334/596] Allow clearing search results.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   8 +-
 Telegram/SourceFiles/dialogs/dialogs_widget.h |   1 +
 .../dialogs/ui/dialogs_suggestions.cpp        | 137 ++++++++++++++----
 Telegram/SourceFiles/mainwidget.cpp           |  23 ++-
 Telegram/SourceFiles/mainwidget.h             |   8 +-
 5 files changed, 141 insertions(+), 36 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e5746bc5c..90adb1f50 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1453,13 +1453,19 @@ void Widget::setInnerFocus() {
 	} else if ((_openedFolder || _openedForum)
 		&& _subsectionTopBar->searchSetFocus()) {
 		return;
-	} else if (!_search->getLastText().isEmpty() || _searchInChat) {
+	} else if (!_search->getLastText().isEmpty()
+		|| _searchInChat
+		|| _searchHasFocus) {
 		_search->setFocus();
 	} else {
 		setFocus();
 	}
 }
 
+bool Widget::searchHasFocus() const {
+	return _searchHasFocus;
+}
+
 void Widget::jumpToTop(bool belowPinned) {
 	if (session().supportMode()) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 6ebd6ab50..b0f892e2d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -100,6 +100,7 @@ public:
 		const Window::SectionShow &params);
 	void searchInChat(Key chat);
 	void setInnerFocus();
+	[[nodiscard]] bool searchHasFocus() const;
 
 	void jumpToTop(bool belowPinned = false);
 	void raiseWithTooltip();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 6a7dde299..bcc90575a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -21,9 +21,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "settings/settings_common.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/delayed_activation.h"
@@ -70,10 +72,12 @@ private:
 
 };
 
-class RecentsController final : public PeerListController {
+class RecentsController final
+	: public PeerListController
+	, public base::has_weak_ptr {
 public:
 	RecentsController(
-		not_null<Main::Session*> session,
+		not_null<Window::SessionController*> window,
 		RecentPeersList list);
 
 	[[nodiscard]] rpl::producer<int> count() const {
@@ -95,8 +99,9 @@ public:
 private:
 	void setupDivider();
 	void subscribeToEvents();
+	[[nodiscard]] Fn<void()> removeAllCallback();
 
-	const not_null<Main::Session*> _session;
+	const not_null<Window::SessionController*> _window;
 	RecentPeersList _recent;
 	rpl::variable<int> _count;
 	base::unique_qptr<Ui::PopupMenu> _menu;
@@ -105,14 +110,33 @@ private:
 
 };
 
-void FillTopPeerMenu(
+struct EntryMenuDescriptor {
+	not_null<Window::SessionController*> controller;
+	not_null<PeerData*> peer;
+	QString removeOneText;
+	Fn<void()> removeOne;
+	QString removeAllText;
+	QString removeAllConfirm;
+	Fn<void()> removeAll;
+};
+
+[[nodiscard]] Fn<void()> RemoveAllConfirm(
 		not_null<Window::SessionController*> controller,
-		const ShowTopPeerMenuRequest &request,
-		Fn<void(not_null<PeerData*>)> remove,
-		Fn<void()> hideAll) {
-	const auto owner = &controller->session().data();
-	const auto peer = owner->peer(PeerId(request.id));
-	const auto &add = request.callback;
+		QString removeAllConfirm,
+		Fn<void()> removeAll) {
+	return [=] {
+		controller->show(Ui::MakeConfirmBox({
+			.text = removeAllConfirm,
+			.confirmed = [=](Fn<void()> close) { removeAll(); close(); }
+		}));
+	};
+}
+
+void FillEntryMenu(
+		const Ui::Menu::MenuCallback &add,
+		EntryMenuDescriptor &&descriptor) {
+	const auto peer = descriptor.peer;
+	const auto controller = descriptor.controller;
 	const auto group = peer->isMegagroup();
 	const auto channel = peer->isChannel();
 
@@ -143,21 +167,18 @@ void FillTopPeerMenu(
 	add({ .separatorSt = &st::expandedMenuSeparator });
 
 	add({
-		.text = tr::lng_recent_remove(tr::now),
-		.handler = [=] { remove(peer); },
+		.text = descriptor.removeOneText,
+		.handler = descriptor.removeOne,
 		.icon = &st::menuIconDeleteAttention,
 		.isAttention = true,
 	});
 
-	const auto hideAllConfirmed = [=] {
-		controller->show(Ui::MakeConfirmBox({
-			.text = tr::lng_recent_hide_sure(),
-			.confirmed = [=](Fn<void()> close) { hideAll(); close(); }
-		}));
-	};
 	add({
-		.text = tr::lng_recent_hide_top(tr::now).replace('&', u"&&"_q),
-		.handler = hideAllConfirmed,
+		.text = descriptor.removeAllText,
+		.handler = RemoveAllConfirm(
+			descriptor.controller,
+			descriptor.removeAllConfirm,
+			descriptor.removeAll),
 		.icon = &st::menuIconCancelAttention,
 		.isAttention = true,
 	});
@@ -257,9 +278,9 @@ QPoint RecentRow::computeNamePosition(const style::PeerListItem &st) const {
 }
 
 RecentsController::RecentsController(
-	not_null<Main::Session*> session,
+	not_null<Window::SessionController*> window,
 	RecentPeersList list)
-: _session(session)
+: _window(window)
 , _recent(std::move(list)) {
 }
 
@@ -279,14 +300,55 @@ void RecentsController::rowClicked(not_null<PeerListRow*> row) {
 	_chosen.fire(row->peer());
 }
 
+Fn<void()> RecentsController::removeAllCallback() {
+	const auto weak = base::make_weak(this);
+	const auto session = &_window->session();
+	return crl::guard(session, [=] {
+		if (weak) {
+			_count = 0;
+			while (delegate()->peerListFullRowsCount() > 0) {
+				delegate()->peerListRemoveRow(delegate()->peerListRowAt(0));
+			}
+			delegate()->peerListRefreshRows();
+		}
+		session->recentPeers().clear();
+	});
+}
+
 base::unique_qptr<Ui::PopupMenu> RecentsController::rowContextMenu(
 		QWidget *parent,
 		not_null<PeerListRow*> row) {
-	return nullptr;
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	const auto peer = row->peer();
+	const auto weak = base::make_weak(this);
+	const auto session = &_window->session();
+	const auto removeOne = crl::guard(session, [=] {
+		if (weak) {
+			const auto rowId = peer->id.value;
+			if (const auto row = delegate()->peerListFindRow(rowId)) {
+				_count = std::max(0, _count.current() - 1);
+				delegate()->peerListRemoveRow(row);
+				delegate()->peerListRefreshRows();
+			}
+		}
+		session->recentPeers().remove(peer);
+	});
+	FillEntryMenu(Ui::Menu::CreateAddActionCallback(result), {
+		.controller = _window,
+		.peer = peer,
+		.removeOneText = tr::lng_recent_remove(tr::now),
+		.removeOne = removeOne,
+		.removeAllText = tr::lng_recent_clear_all(tr::now),
+		.removeAllConfirm = tr::lng_recent_clear_sure(tr::now),
+		.removeAll = removeAllCallback(),
+	});
+	return result;
 }
 
 Main::Session &RecentsController::session() const {
-	return *_session;
+	return _window->session();
 }
 
 QString RecentsController::savedMessagesChatStatus() const {
@@ -306,6 +368,10 @@ void RecentsController::setupDivider() {
 		raw,
 		tr::lng_recent_clear(tr::now),
 		st::searchedBarLink);
+	clear->setClickedCallback(RemoveAllConfirm(
+		_window,
+		tr::lng_recent_clear_sure(tr::now),
+		removeAllCallback()));
 	rpl::combine(
 		raw->sizeValue(),
 		clear->widthValue()
@@ -325,7 +391,7 @@ void RecentsController::setupDivider() {
 
 void RecentsController::subscribeToEvents() {
 	using Flag = Data::PeerUpdate::Flag;
-	_session->changes().peerUpdates(
+	session().changes().peerUpdates(
 		Flag::Notifications
 		| Flag::OnlineStatus
 	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
@@ -349,7 +415,7 @@ void RecentsController::subscribeToEvents() {
 		}
 	}, _lifetime);
 
-	_session->data().unreadBadgeChanges(
+	session().data().unreadBadgeChanges(
 	) | rpl::start_with_next([=] {
 		for (auto i = 0; i != _count.current(); ++i) {
 			const auto row = delegate()->peerListRowAt(i);
@@ -395,20 +461,31 @@ Suggestions::Suggestions(
 	_topPeers->showMenuRequests(
 	) | rpl::start_with_next([=](const ShowTopPeerMenuRequest &request) {
 		const auto weak = Ui::MakeWeak(this);
-		const auto remove = [=](not_null<PeerData*> peer) {
+		const auto owner = &controller->session().data();
+		const auto peer = owner->peer(PeerId(request.id));
+		const auto removeOne = [=] {
 			peer->session().topPeers().remove(peer);
 			if (weak) {
 				_topPeers->removeLocally(peer->id.value);
 			}
 		};
 		const auto session = &controller->session();
-		const auto hideAll = crl::guard(session, [=] {
+		const auto removeAll = crl::guard(session, [=] {
 			session->topPeers().toggleDisabled(true);
 			if (weak) {
 				_topPeers->removeLocally();
 			}
 		});
-		FillTopPeerMenu(controller, request, remove, hideAll);
+		FillEntryMenu(request.callback, {
+			.controller = controller,
+			.peer = peer,
+			.removeOneText = tr::lng_recent_remove(tr::now),
+			.removeOne = removeOne,
+			.removeAllText = tr::lng_recent_hide_top(
+				tr::now).replace('&', u"&&"_q),
+			.removeAllConfirm = tr::lng_recent_hide_sure(tr::now),
+			.removeAll = removeAll,
+		});
 	}, _topPeers->lifetime());
 }
 
@@ -469,7 +546,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 		PeerListContentDelegateSimple
 	>();
 	const auto controller = lifetime.make_state<RecentsController>(
-		&window->session(),
+		window,
 		std::move(recentPeers));
 	controller->setStyleOverrides(&st::recentPeersList);
 
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index debb7490f..23d3bca8d 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1167,7 +1167,9 @@ Image *MainWidget::newBackgroundThumb() {
 }
 
 void MainWidget::setInnerFocus() {
-	if (_hider || !_history->peer()) {
+	if (_dialogs && _dialogs->searchHasFocus()) {
+		_dialogs->setInnerFocus();
+	} else if (_hider || !_history->peer()) {
 		if (!_hider && _mainSection) {
 			_mainSection->setInnerFocus();
 		} else if (!_hider && _thirdSection) {
@@ -2620,12 +2622,29 @@ void MainWidget::returnTabbedSelector() {
 	}
 }
 
+bool MainWidget::relevantForDialogsFocus(not_null<QWidget*> widget) const {
+	if (!_dialogs || widget->window() != window()) {
+		return false;
+	}
+	while (true) {
+		if (widget.get() == this) {
+			return true;
+		}
+		const auto parent = widget->parentWidget();
+		if (!parent) {
+			return false;
+		}
+		widget = parent;
+	}
+	Unexpected("Should never be here.");
+}
+
 bool MainWidget::eventFilter(QObject *o, QEvent *e) {
 	const auto widget = o->isWidgetType()
 		? static_cast<QWidget*>(o)
 		: nullptr;
 	if (e->type() == QEvent::FocusIn) {
-		if (widget && _dialogs && widget->window() == window()) {
+		if (widget && relevantForDialogsFocus(widget)) {
 			_dialogs->updateHasFocus(widget);
 		}
 	} else if (e->type() == QEvent::MouseButtonPress) {
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 809086765..aab9239ef 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -108,7 +108,7 @@ class ItemBase;
 } // namespace Layout
 } // namespace InlineBots
 
-class MainWidget
+class MainWidget final
 	: public Ui::RpWidget
 	, private Media::Player::FloatDelegate {
 public:
@@ -236,12 +236,14 @@ public:
 
 	void dialogsCancelled();
 
-protected:
+private:
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 	bool eventFilter(QObject *o, QEvent *e) override;
 
-private:
+	[[nodiscard]] bool relevantForDialogsFocus(
+		not_null<QWidget*> widget) const;
+
 	void showFinished();
 	void handleAdaptiveLayoutUpdate();
 	void updateWindowAdaptiveLayout();

From 19f5d95a3c52897064088d7b30b8662ee266507c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 Apr 2024 16:30:46 +0400
Subject: [PATCH 335/596] Implement keyboard navigation for recent peers.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  25 ++---
 .../dialogs/ui/dialogs_suggestions.cpp        | 103 +++++++++++++-----
 .../dialogs/ui/dialogs_suggestions.h          |  13 ++-
 .../dialogs/ui/top_peers_strip.cpp            |  37 +++----
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |   4 +-
 5 files changed, 110 insertions(+), 72 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 90adb1f50..e2c43a20a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3165,32 +3165,25 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		//}
 	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
 		submit();
+	} else if (_suggestions
+		&& (e->key() == Qt::Key_Down
+			|| e->key() == Qt::Key_Up
+			|| e->key() == Qt::Key_Left
+			|| e->key() == Qt::Key_Right)) {
+		_suggestions->selectJump(Qt::Key(e->key()));
 	} else if (e->key() == Qt::Key_Down) {
-		if (_suggestions) {
-			_suggestions->selectSkip(1);
-		} else {
-			_inner->selectSkip(1);
-		}
+		_inner->selectSkip(1);
 	} else if (e->key() == Qt::Key_Up) {
-		if (_suggestions) {
-			_suggestions->selectSkip(-1);
-		} else {
-			_inner->selectSkip(-1);
-		}
 		_inner->selectSkip(-1);
-	} else if (e->key() == Qt::Key_Left && _suggestions) {
-		_suggestions->selectLeft();
-	} else if (e->key() == Qt::Key_Right && _suggestions) {
-		_suggestions->selectRight();
 	} else if (e->key() == Qt::Key_PageDown) {
 		if (_suggestions) {
-			_suggestions->selectSkipPage(_scroll->height(), 1);
+			_suggestions->selectJump(Qt::Key_Down, _scroll->height());
 		} else {
 			_inner->selectSkipPage(_scroll->height(), 1);
 		}
 	} else if (e->key() == Qt::Key_PageUp) {
 		if (_suggestions) {
-			_suggestions->selectSkipPage(_scroll->height(), -1);
+			_suggestions->selectJump(Qt::Key_Up, _scroll->height());
 		} else {
 			_inner->selectSkipPage(_scroll->height(), -1);
 		}
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index bcc90575a..b3af39435 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -491,43 +491,60 @@ Suggestions::Suggestions(
 
 Suggestions::~Suggestions() = default;
 
-void Suggestions::selectSkip(int delta) {
-	if (!delta) {
-		return;
-	} else if (delta > 0) {
-		const auto hasRecent = false;
-		if (hasRecent && (_topPeers->selectedByKeyboard() || delta > 1)) {
+void Suggestions::selectJump(Qt::Key direction, int pageSize) {
+	const auto recentHasSelection = [=] {
+		return _recentSelectJump(Qt::Key(), 0) == JumpResult::Applied;
+	};
+	if (pageSize) {
+		if (direction == Qt::Key_Down || direction == Qt::Key_Up) {
 			_topPeers->deselectByKeyboard();
+			if (!recentHasSelection()) {
+				if (direction == Qt::Key_Down) {
+					_recentSelectJump(direction, 0);
+				} else {
+					return;
+				}
+			}
+			if (_recentSelectJump(direction, pageSize) == JumpResult::AppliedAndOut) {
+				if (direction == Qt::Key_Up) {
+					_scroll->scrollTo(0);
+				}
+			}
+		}
+	} else if (direction == Qt::Key_Up) {
+		if (_recentSelectJump(direction, pageSize)
+			== JumpResult::AppliedAndOut) {
+			_topPeers->selectByKeyboard(Qt::Key());
+			_scroll->scrollTo(0);
 		} else {
-			_topPeers->selectByKeyboard(0);
-		}
-	} else {
-		if (_topPeers->selectedByKeyboard()) {
 			_topPeers->deselectByKeyboard();
 		}
-	}
-}
-
-void Suggestions::selectSkipPage(int height, int direction) {
-	if (_topPeers->selectedByKeyboard()) {
-		_topPeers->deselectByKeyboard();
+	} else if (direction == Qt::Key_Down) {
+		if (_topPeers->selectedByKeyboard()) {
+			if (_recentCount.current() > 0) {
+				_topPeers->deselectByKeyboard();
+				_recentSelectJump(direction, pageSize);
+			}
+		} else if (!_topPeersWrap->toggled() || recentHasSelection()) {
+			_recentSelectJump(direction, pageSize);
+		} else {
+			_topPeers->selectByKeyboard(Qt::Key());
+			_scroll->scrollTo(0);
+		}
+	} else if (direction == Qt::Key_Left || direction == Qt::Key_Right) {
+		if (!recentHasSelection()) {
+			_topPeers->selectByKeyboard(direction);
+			_scroll->scrollTo(0);
+		}
 	}
 }
 
 void Suggestions::chooseRow() {
-	if (_topPeers->chooseRow()) {
-		return;
+	if (!_topPeers->chooseRow()) {
+		_recentPeersChoose();
 	}
 }
 
-void Suggestions::selectLeft() {
-	_topPeers->selectLeft();
-}
-
-void Suggestions::selectRight() {
-	_topPeers->selectRight();
-}
-
 void Suggestions::paintEvent(QPaintEvent *e) {
 	QPainter(this).fillRect(e->rect(), st::windowBg);
 }
@@ -559,7 +576,39 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 	}, lifetime);
 
 	auto content = object_ptr<PeerListContent>(_content, controller);
-	delegate->setContent(content);
+
+	const auto raw = content.data();
+	_recentPeersChoose = [=] {
+		return raw->submitted();
+	};
+	_recentSelectJump = [raw](Qt::Key direction, int pageSize) {
+		const auto had = raw->hasSelection();
+		if (direction == Qt::Key()) {
+			return had ? JumpResult::Applied : JumpResult::NotApplied;
+		} else if (direction == Qt::Key_Up && !had) {
+			return JumpResult::NotApplied;
+		} else if (direction == Qt::Key_Down || direction == Qt::Key_Up) {
+			const auto delta = (direction == Qt::Key_Down) ? 1 : -1;
+			if (pageSize > 0) {
+				raw->selectSkipPage(pageSize, delta);
+			} else {
+				raw->selectSkip(delta);
+			}
+			return raw->hasSelection()
+				? JumpResult::Applied
+				: had
+				? JumpResult::AppliedAndOut
+				: JumpResult::NotApplied;
+		}
+		return JumpResult::NotApplied;
+	};
+	raw->scrollToRequests(
+	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+		const auto add = _topPeersWrap->toggled() ? _topPeers->height() : 0;
+		_scroll->scrollToY(request.ymin + add, request.ymax + add);
+	}, lifetime);
+
+	delegate->setContent(raw);
 	controller->setDelegate(delegate);
 
 	return object_ptr<Ui::SlideWrap<>>(this, std::move(content));
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 3ddd00f72..b960eddaf 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -41,10 +41,7 @@ public:
 		RecentPeersList recentPeers);
 	~Suggestions();
 
-	void selectSkip(int delta);
-	void selectSkipPage(int height, int direction);
-	void selectLeft();
-	void selectRight();
+	void selectJump(Qt::Key direction, int pageSize = 0);
 	void chooseRow();
 
 	[[nodiscard]] rpl::producer<not_null<PeerData*>> topPeerChosen() const {
@@ -55,6 +52,12 @@ public:
 	}
 
 private:
+	enum class JumpResult {
+		NotApplied,
+		Applied,
+		AppliedAndOut,
+	};
+
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 
@@ -70,6 +73,8 @@ private:
 	const not_null<TopPeersStrip*> _topPeers;
 
 	rpl::variable<int> _recentCount;
+	Fn<bool()> _recentPeersChoose;
+	Fn<JumpResult(Qt::Key, int)> _recentSelectJump;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recentPeers;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyRecent;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 3f5104547..4797b7abb 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -282,20 +282,29 @@ bool TopPeersStrip::selectedByKeyboard() const {
 	return _selectionByKeyboard && _selected >= 0;
 }
 
-void TopPeersStrip::selectByKeyboard(int delta) {
+void TopPeersStrip::selectByKeyboard(Qt::Key direction) {
 	if (_entries.empty()) {
 		return;
 	}
-	_selectionByKeyboard = true;
-	if (!delta) {
+	if (direction == Qt::Key()) {
+		_selectionByKeyboard = true;
 		if (_selected < 0) {
 			setSelected(0);
 			scrollToSelected();
 		}
-		return;
+	} else if (direction == Qt::Key_Left) {
+		if (_selected > 0) {
+			_selectionByKeyboard = true;
+			setSelected(_selected - 1);
+			scrollToSelected();
+		}
+	} else if (direction == Qt::Key_Right) {
+		if (_selected + 1 < _entries.size()) {
+			_selectionByKeyboard = true;
+			setSelected(_selected + 1);
+			scrollToSelected();
+		}
 	}
-	setSelected(std::clamp(_selected + delta, 0, int(_entries.size()) - 1));
-	scrollToSelected();
 }
 
 void TopPeersStrip::deselectByKeyboard() {
@@ -305,22 +314,6 @@ void TopPeersStrip::deselectByKeyboard() {
 	}
 }
 
-void TopPeersStrip::selectLeft() {
-	if (_selected > 0) {
-		_selectionByKeyboard = true;
-		setSelected(_selected - 1);
-		scrollToSelected();
-	}
-}
-
-void TopPeersStrip::selectRight() {
-	if (_selected + 1 < _entries.size()) {
-		_selectionByKeyboard = true;
-		setSelected(_selected + 1);
-		scrollToSelected();
-	}
-}
-
 bool TopPeersStrip::chooseRow() {
 	if (_selected >= 0) {
 		Assert(_selected < _entries.size());
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 84584e56d..c3330e40d 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -53,9 +53,7 @@ public:
 	void removeLocally(uint64 id = 0);
 
 	[[nodiscard]] bool selectedByKeyboard() const;
-	void selectByKeyboard(int delta);
-	void selectLeft();
-	void selectRight();
+	void selectByKeyboard(Qt::Key direction);
 	void deselectByKeyboard();
 	bool chooseRow();
 

From 0180fe9468afb737bf516ca42633723de6db229a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 Apr 2024 19:18:07 +0400
Subject: [PATCH 336/596] Animate search suggestions.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 76 ++++++++++++++-----
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 +
 .../dialogs/ui/dialogs_suggestions.cpp        | 55 +++++++++++++-
 .../dialogs/ui/dialogs_suggestions.h          | 10 +++
 4 files changed, 122 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e2c43a20a..411b46e75 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1030,10 +1030,7 @@ void Widget::fullSearchRefreshOn(rpl::producer<> events) {
 
 void Widget::updateControlsVisibility(bool fast) {
 	updateLoadMoreChatsVisibility();
-	_scroll->setVisible(!_suggestions);
-	if (_suggestions) {
-		_suggestions->show();
-	}
+	_scroll->setVisible(!_suggestions && _hidingSuggestions.empty());
 	updateStoriesVisibility();
 	if ((_openedFolder || _openedForum) && _searchHasFocus) {
 		setInnerFocus();
@@ -1120,10 +1117,32 @@ void Widget::updateSuggestions(anim::type animated) {
 	const auto suggest = _searchHasFocus
 		&& !_searchInChat
 		&& (_inner->state() == WidgetState::Default);
+	if (anim::Disabled() || !session().data().chatsListLoaded()) {
+		animated = anim::type::instant;
+	}
 	if (!suggest && _suggestions) {
-		_suggestions = nullptr;
-		_scroll->show();
+		if (animated == anim::type::normal) {
+			startWidthAnimation();
+			_suggestions->hide(animated, [=, raw = _suggestions.get()] {
+				stopWidthAnimation();
+				_hidingSuggestions.erase(
+					ranges::remove(
+						_hidingSuggestions,
+						raw,
+						&std::unique_ptr<Suggestions>::get),
+					end(_hidingSuggestions));
+				updateControlsVisibility();
+			});
+			_hidingSuggestions.push_back(std::move(_suggestions));
+		} else {
+			_suggestions = nullptr;
+			_hidingSuggestions.clear();
+			_scroll->show();
+		}
 	} else if (suggest && !_suggestions) {
+		if (animated == anim::type::normal) {
+			startWidthAnimation();
+		}
 		_suggestions = std::make_unique<Suggestions>(
 			this,
 			controller(),
@@ -1141,9 +1160,12 @@ void Widget::updateSuggestions(anim::type animated) {
 			}
 		}, _suggestions->lifetime());
 
-		_suggestions->show();
-		_scroll->hide();
 		updateControlsGeometry();
+
+		_suggestions->show(animated, [=] {
+			stopWidthAnimation();
+		});
+		_scroll->hide();
 	}
 }
 
@@ -1542,18 +1564,15 @@ void Widget::scrollToDefault(bool verytop) {
 		anim::sineInOut);
 }
 
-void Widget::startWidthAnimation() {
-	if (!_widthAnimationCache.isNull()) {
-		return;
-	}
+[[nodiscard]] QPixmap Widget::grabNonNarrowScrollFrame() {
 	auto scrollGeometry = _scroll->geometry();
 	auto grabGeometry = QRect(
 		scrollGeometry.x(),
 		scrollGeometry.y(),
-		st::columnMinimalWidthLeft,
+		std::max(scrollGeometry.width(), st::columnMinimalWidthLeft),
 		scrollGeometry.height());
 	_scroll->setGeometry(grabGeometry);
-	_inner->resize(st::columnMinimalWidthLeft, _inner->height());
+	_inner->resize(grabGeometry.width(), _inner->height());
 	_inner->setNarrowRatio(0.);
 	Ui::SendPendingMoveResizeEvents(_scroll);
 	auto image = QImage(
@@ -1565,11 +1584,18 @@ void Widget::startWidthAnimation() {
 		QPainter p(&image);
 		Ui::RenderWidget(p, _scroll);
 	}
-	_widthAnimationCache = Ui::PixmapFromImage(std::move(image));
 	if (scrollGeometry != grabGeometry) {
 		_scroll->setGeometry(scrollGeometry);
 		updateControlsGeometry();
 	}
+	return Ui::PixmapFromImage(std::move(image));
+}
+
+void Widget::startWidthAnimation() {
+	if (!_widthAnimationCache.isNull()) {
+		return;
+	}
+	_widthAnimationCache = grabNonNarrowScrollFrame();
 	_scroll->hide();
 	updateStoriesVisibility();
 }
@@ -1578,9 +1604,6 @@ void Widget::stopWidthAnimation() {
 	_widthAnimationCache = QPixmap();
 	if (!_showAnimation) {
 		_scroll->setVisible(!_suggestions);
-		if (_suggestions) {
-			_suggestions->show();
-		}
 	}
 	updateStoriesVisibility();
 	update();
@@ -3226,7 +3249,15 @@ void Widget::paintEvent(QPaintEvent *e) {
 
 	auto belowTop = _scroll->y() + _scroll->height();
 	if (!_widthAnimationCache.isNull()) {
-		p.drawPixmapLeft(0, _scroll->y(), width(), _widthAnimationCache);
+		const auto suggestionsShown = _suggestions
+			? _suggestions->shownOpacity()
+			: !_hidingSuggestions.empty()
+			? _hidingSuggestions.back()->shownOpacity()
+			: 0.;
+		const auto suggestionsSkip = suggestionsShown
+			* (st::topPeers.height + st::searchedBarHeight);
+		const auto top = _scroll->y() + suggestionsSkip;
+		p.drawPixmapLeft(0, top, width(), _widthAnimationCache);
 		belowTop = _scroll->y()
 			+ (_widthAnimationCache.height() / style::DevicePixelRatio());
 	}
@@ -3302,12 +3333,17 @@ bool Widget::cancelSearch() {
 		setFocus();
 		clearingInChat = true;
 	}
+	const auto clearSearchFocus = !_searchInChat && _searchHasFocus;
+	if (!_suggestions && clearSearchFocus) {
+		// Don't create suggestions in unfocus case.
+		setFocus();
+	}
 	_lastSearchPeer = nullptr;
 	_lastSearchId = _lastSearchMigratedId = 0;
 	_inner->clearFilter();
 	clearSearchField();
 	applySearchUpdate();
-	if (!_searchInChat && _searchHasFocus) {
+	if (_suggestions && clearSearchFocus) {
 		setFocus();
 	}
 	return clearingQuery || clearingInChat;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index b0f892e2d..2cb979d53 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -105,6 +105,7 @@ public:
 	void jumpToTop(bool belowPinned = false);
 	void raiseWithTooltip();
 
+	[[nodiscard]] QPixmap grabNonNarrowScrollFrame();
 	void startWidthAnimation();
 	void stopWidthAnimation();
 
@@ -277,6 +278,7 @@ private:
 	object_ptr<Ui::ElasticScroll> _scroll;
 	QPointer<InnerWidget> _inner;
 	std::unique_ptr<Suggestions> _suggestions;
+	std::vector<std::unique_ptr<Suggestions>> _hidingSuggestions;
 	class BottomButton;
 	object_ptr<BottomButton> _updateTelegram = { nullptr };
 	object_ptr<BottomButton> _loadMoreChats = { nullptr };
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index b3af39435..033cdc7c9 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -545,8 +545,61 @@ void Suggestions::chooseRow() {
 	}
 }
 
+void Suggestions::show(anim::type animated, Fn<void()> finish) {
+	RpWidget::show();
+
+	_hidden = false;
+	if (animated == anim::type::instant) {
+		_shownAnimation.stop();
+		_scroll->show();
+	} else {
+		_shownAnimation.start([=] {
+			update();
+			if (!_shownAnimation.animating() && finish) {
+				finish();
+				_cache = QPixmap();
+				_scroll->show();
+			}
+		}, 0., 1., st::slideDuration, anim::easeOutQuint);
+		_cache = Ui::GrabWidget(_scroll.get());
+		_scroll->hide();
+	}
+}
+
+void Suggestions::hide(anim::type animated, Fn<void()> finish) {
+	_hidden = true;
+	if (isHidden()) {
+		return;
+	} else if (animated == anim::type::instant) {
+		RpWidget::hide();
+	} else {
+		_shownAnimation.start([=] {
+			update();
+			if (!_shownAnimation.animating() && finish) {
+				finish();
+			}
+		}, 1., 0., st::slideDuration, anim::easeOutQuint);
+		_cache = Ui::GrabWidget(_scroll.get());
+		_scroll->hide();
+	}
+}
+
+float64 Suggestions::shownOpacity() const {
+	return _shownAnimation.value(_hidden ? 0. : 1.);
+}
+
 void Suggestions::paintEvent(QPaintEvent *e) {
-	QPainter(this).fillRect(e->rect(), st::windowBg);
+	const auto opacity = shownOpacity();
+	auto color = st::windowBg->c;
+	color.setAlphaF(color.alphaF() * opacity);
+
+	auto p = QPainter(this);
+	p.fillRect(e->rect(), color);
+	if (_scroll->isHidden()) {
+		const auto slide = st::topPeers.height + st::searchedBarHeight;
+		p.setOpacity(opacity);
+		p.drawPixmap(0, (opacity - 1.) * slide, _cache);
+	}
 }
 
 void Suggestions::resizeEvent(QResizeEvent *e) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index b960eddaf..b6be97e26 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/object_ptr.h"
 #include "dialogs/ui/top_peers_strip.h"
+#include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 
 namespace Main {
@@ -44,6 +45,10 @@ public:
 	void selectJump(Qt::Key direction, int pageSize = 0);
 	void chooseRow();
 
+	void show(anim::type animated, Fn<void()> finish);
+	void hide(anim::type animated, Fn<void()> finish);
+	[[nodiscard]] float64 shownOpacity() const;
+
 	[[nodiscard]] rpl::producer<not_null<PeerData*>> topPeerChosen() const {
 		return _topPeerChosen.events();
 	}
@@ -81,6 +86,11 @@ private:
 	rpl::event_stream<not_null<PeerData*>> _topPeerChosen;
 	rpl::event_stream<not_null<PeerData*>> _recentPeerChosen;
 
+	Ui::Animations::Simple _shownAnimation;
+	Fn<void()> _showFinished;
+	bool _hidden = false;
+	QPixmap _cache;
+
 };
 
 [[nodiscard]] rpl::producer<TopPeersList> TopPeersContent(

From 360366ba9e7554ff118b3da13e30adf9aa87d032 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Apr 2024 14:48:44 +0400
Subject: [PATCH 337/596] Fix opening forums from recent peers.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 411b46e75..bd15556eb 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1153,11 +1153,10 @@ void Widget::updateSuggestions(anim::type animated) {
 			_suggestions->topPeerChosen(),
 			_suggestions->recentPeerChosen()
 		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
-			if (base::IsCtrlPressed()) {
-				controller()->showInNewWindow(peer);
-			} else {
-				controller()->showPeerHistory(peer);
-			}
+			chosenRow({
+				.key = peer->owner().history(peer),
+				.newWindow = base::IsCtrlPressed(),
+			});
 		}, _suggestions->lifetime());
 
 		updateControlsGeometry();

From a0a9de1d188ea6d8970f543ecb234f0bfd3aa83e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Apr 2024 14:48:57 +0400
Subject: [PATCH 338/596] Cancel search on switching folders.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index bd15556eb..c272fd1b9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -655,6 +655,9 @@ void Widget::setupMoreChatsBar() {
 	controller()->activeChatsFilter(
 	) | rpl::start_with_next([=](FilterId id) {
 		storiesToggleExplicitExpand(false);
+		if (!_searchInChat) {
+			cancelSearch();
+		}
 
 		if (!id) {
 			_moreChatsBar = nullptr;
@@ -3345,7 +3348,7 @@ bool Widget::cancelSearch() {
 	if (_suggestions && clearSearchFocus) {
 		setFocus();
 	}
-	return clearingQuery || clearingInChat;
+	return clearingQuery || clearingInChat || clearSearchFocus;
 }
 
 void Widget::cancelSearchInChat() {

From 74a7e7d1b417c3fbea88226b1b2cf27b6d1dca14 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Apr 2024 17:07:22 +0400
Subject: [PATCH 339/596] Fix non-intentional chats list search focus.

---
 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 e36501a74..418e38e60 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1836,7 +1836,8 @@ void HistoryWidget::setInnerFocus() {
 			_composeSearch->setInnerFocus();
 		} else if (_chooseTheme && _chooseTheme->shouldBeShown()) {
 			_chooseTheme->setFocus();
-		} else if (_nonEmptySelection
+		} else if (_showAnimation
+			|| _nonEmptySelection
 			|| (_list && _list->wasSelectedText())
 			|| isRecording()
 			|| isBotStart()

From 7387dfdd9c97265209b533961c795d92f310b245 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Apr 2024 17:54:00 +0400
Subject: [PATCH 340/596] Don't create top/recent peers unnecessary.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 41 +++++++++++--------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 +
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index c272fd1b9..e5676f3bc 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -361,13 +361,6 @@ Widget::Widget(
 		applySearchUpdate();
 	}, _search->lifetime());
 
-	_search->focusedChanges(
-	) | rpl::start_with_next([=](bool focused) {
-		if (focused) {
-			updateHasFocus(_search.data());
-		}
-	}, _search->lifetime());
-
 	_search->submits(
 	) | rpl::start_with_next([=] { submit(); }, _search->lifetime());
 
@@ -1097,25 +1090,29 @@ void Widget::updateLockUnlockPosition() {
 }
 
 void Widget::updateHasFocus(not_null<QWidget*> focused) {
-	const auto has = (focused == _search.data());
+	const auto has = (focused == _search.data())
+		|| (focused == _search->rawTextEdit());
 	if (_searchHasFocus != has) {
 		_searchHasFocus = has;
-		const auto update = [=] {
-			updateStoriesVisibility();
-			updateForceDisplayWide();
-			updateSuggestions(anim::type::normal);
-		};
-		if (has) {
-			update();
+		if (_postponeProcessSearchFocusChange) {
+			return;
+		} else if (has) {
+			processSearchFocusChange();
 		} else {
 			// Search field may loose focus from the destructor of some
 			// widget, in that case we don't want to destroy _suggestions
-			// syncrhonously, because it may lead to a crash.
-			crl::on_main(this, update);
+			// synchronously, because it may lead to a crash.
+			crl::on_main(this, [=] { processSearchFocusChange(); });
 		}
 	}
 }
 
+void Widget::processSearchFocusChange() {
+	updateStoriesVisibility();
+	updateForceDisplayWide();
+	updateSuggestions(anim::type::normal);
+}
+
 void Widget::updateSuggestions(anim::type animated) {
 	const auto suggest = _searchHasFocus
 		&& !_searchInChat
@@ -2556,7 +2553,9 @@ void Widget::applySearchUpdate(bool force) {
 		clearSearchCache();
 	}
 	_cancelSearch->toggle(!filterText.isEmpty(), anim::type::normal);
-	updateSuggestions(anim::type::instant);
+	if (!_postponeProcessSearchFocusChange) {
+		updateSuggestions(anim::type::instant);
+	}
 	updateLoadMoreChatsVisibility();
 	updateJumpToDateVisibility();
 	updateLockUnlockPosition();
@@ -3219,8 +3218,14 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		&& _search->isVisible()
 		&& !_search->hasFocus()
 		&& !e->text().isEmpty()) {
+		// This delay in search focus processing allows us not to create
+		// _suggestions in case the event inserts some non-whitespace search
+		// query while still show _suggestions animated, if it is a space.
+		_postponeProcessSearchFocusChange = true;
 		_search->setFocusFast();
 		QCoreApplication::sendEvent(_search->rawTextEdit(), e);
+		_postponeProcessSearchFocusChange = false;
+		processSearchFocusChange();
 	} else {
 		e->ignore();
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 2cb979d53..84faf7576 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -246,6 +246,7 @@ private:
 	void updateScrollUpPosition();
 	void updateLockUnlockPosition();
 	void updateSuggestions(anim::type animated);
+	void processSearchFocusChange();
 
 	MTP::Sender _api;
 
@@ -315,6 +316,7 @@ private:
 	int _storiesExplicitExpandScrollTop = 0;
 	int _aboveScrollAdded = 0;
 	bool _storiesExplicitExpand = false;
+	bool _postponeProcessSearchFocusChange = false;
 
 	base::Timer _searchTimer;
 

From ac15990b48831c27f45ad8e5583f028f01f6a232 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 10 Apr 2024 23:16:46 +0400
Subject: [PATCH 341/596] Update API scheme to layer178, ads broke build.

---
 .../SourceFiles/api/api_chat_participants.cpp |  5 ++-
 .../boxes/peers/edit_peer_reactions.cpp       |  4 ++-
 .../SourceFiles/data/data_file_origin.cpp     |  2 ++
 Telegram/SourceFiles/data/data_session.cpp    |  4 ++-
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 33 ++++++++++++-------
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
index 745e0b883..a7d3d9f64 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.cpp
+++ b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -730,8 +730,11 @@ void ChatParticipants::loadSimilarChannels(not_null<ChannelData*> channel) {
 			return;
 		}
 	}
+	using Flag = MTPchannels_GetChannelRecommendations::Flag;
 	_similar[channel].requestId = _api.request(
-		MTPchannels_GetChannelRecommendations(channel->inputChannel)
+		MTPchannels_GetChannelRecommendations(
+			MTP_flags(Flag::f_channel),
+			channel->inputChannel)
 	).done([=](const MTPmessages_Chats &result) {
 		auto &similar = _similar[channel];
 		similar.requestId = 0;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
index fddad6fc0..71430ace0 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
@@ -792,8 +792,10 @@ void SaveAllowedReactions(
 		? MTP_chatReactionsNone()
 		: MTP_chatReactionsSome(MTP_vector<MTPReaction>(ids));
 	peer->session().api().request(MTPmessages_SetChatAvailableReactions(
+		MTP_flags(0),
 		peer->input,
-		updated
+		updated,
+		MTP_int(0) // reactions_limit
 	)).done([=](const MTPUpdates &result) {
 		peer->session().api().applyUpdates(result);
 		if (const auto chat = peer->asChat()) {
diff --git a/Telegram/SourceFiles/data/data_file_origin.cpp b/Telegram/SourceFiles/data/data_file_origin.cpp
index 739873c3d..c97d98a1a 100644
--- a/Telegram/SourceFiles/data/data_file_origin.cpp
+++ b/Telegram/SourceFiles/data/data_file_origin.cpp
@@ -57,6 +57,8 @@ struct FileReferenceAccumulator {
 			push(data.vstory());
 		}, [&](const MTPDwebPageAttributeTheme &data) {
 			push(data.vdocuments());
+		}, [&](const MTPDwebPageAttributeStickerSet &data) {
+			push(data.vstickers());
 		});
 	}
 	void push(const MTPWebPage &data) {
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 22cea37db..6d6bb4404 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -3478,7 +3478,9 @@ void Session::webpageApplyFields(
 				const auto result = attribute.match([&](
 						const MTPDwebPageAttributeTheme &data) {
 					return lookupInAttribute(data);
-				}, [&](const MTPDwebPageAttributeStory &data) {
+				}, [](const MTPDwebPageAttributeStory &) {
+					return (DocumentData*)nullptr;
+				}, [](const MTPDwebPageAttributeStickerSet &) {
 					return (DocumentData*)nullptr;
 				});
 				if (result) {
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 6c0a8f7c7..b55127064 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -100,8 +100,8 @@ chatForbidden#6592a1a7 id:long title:string = Chat;
 channel#aadfc8f 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 fake:flags.25?true gigagroup:flags.26?true noforwards:flags.27?true join_to_send:flags.28?true join_request:flags.29?true forum:flags.30?true flags2:# stories_hidden:flags2.1?true stories_hidden_min:flags2.2?true stories_unavailable:flags2.3?true id:long access_hash:flags.13?long title:string username:flags.6?string photo:ChatPhoto date: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 usernames:flags2.0?Vector<Username> stories_max_id:flags2.4?int color:flags2.7?PeerColor profile_color:flags2.8?PeerColor emoji_status:flags2.9?EmojiStatus level:flags2.10?int = Chat;
 channelForbidden#17d493d5 flags:# broadcast:flags.5?true megagroup:flags.8?true id:long access_hash:long title:string until_date:flags.16?int = Chat;
 
-chatFull#c9d31138 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true translations_disabled:flags.19?true id:long about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:flags.13?ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int call:flags.12?InputGroupCall ttl_period:flags.14?int groupcall_default_join_as:flags.15?Peer theme_emoticon:flags.16?string requests_pending:flags.17?int recent_requesters:flags.17?Vector<long> available_reactions:flags.18?ChatReactions = ChatFull;
-channelFull#44c054a7 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 flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true restricted_sponsored:flags2.11?true can_view_revenue:flags2.12?true id:long 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:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long 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?long 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 ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet = ChatFull;
+chatFull#2633421b flags:# can_set_username:flags.7?true has_scheduled:flags.8?true translations_disabled:flags.19?true id:long about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:flags.13?ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int call:flags.12?InputGroupCall ttl_period:flags.14?int groupcall_default_join_as:flags.15?Peer theme_emoticon:flags.16?string requests_pending:flags.17?int recent_requesters:flags.17?Vector<long> available_reactions:flags.18?ChatReactions reactions_limit:flags.20?int = ChatFull;
+channelFull#bbab348d 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 flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true restricted_sponsored:flags2.11?true can_view_revenue:flags2.12?true id:long 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:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long 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?long 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 ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions reactions_limit:flags2.13?int stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet = ChatFull;
 
 chatParticipant#c02d4007 user_id:long inviter_id:long date:int = ChatParticipant;
 chatParticipantCreator#e46bcee4 user_id:long = ChatParticipant;
@@ -228,7 +228,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#cc997720 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int = UserFull;
+userFull#cc997720 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -412,6 +412,7 @@ updateBotBusinessConnect#8ae5c97a connection:BotBusinessConnection qts:int = Upd
 updateBotNewBusinessMessage#9ddb347c flags:# connection_id:string message:Message reply_to_message:flags.0?Message qts:int = Update;
 updateBotEditBusinessMessage#7df587c flags:# connection_id:string message:Message reply_to_message:flags.0?Message qts:int = Update;
 updateBotDeleteBusinessMessage#a02a982e connection_id:string peer:Peer messages:Vector<int> qts:int = Update;
+updateNewStoryReaction#1824e40b story_id:int peer:Peer reaction:Reaction = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -1171,7 +1172,7 @@ inputWallPaperNoFile#967a462e id:long = InputWallPaper;
 account.wallPapersNotModified#1c199183 = account.WallPapers;
 account.wallPapers#cdc3858c hash:long wallpapers:Vector<WallPaper> = account.WallPapers;
 
-codeSettings#ad253d78 flags:# allow_flashcall:flags.0?true current_number:flags.1?true allow_app_hash:flags.4?true allow_missed_call:flags.5?true allow_firebase:flags.7?true logout_tokens:flags.6?Vector<bytes> token:flags.8?string app_sandbox:flags.8?Bool = CodeSettings;
+codeSettings#ad253d78 flags:# allow_flashcall:flags.0?true current_number:flags.1?true allow_app_hash:flags.4?true allow_missed_call:flags.5?true allow_firebase:flags.7?true unknown_number:flags.9?true logout_tokens:flags.6?Vector<bytes> token:flags.8?string app_sandbox:flags.8?Bool = CodeSettings;
 
 wallPaperSettings#372efcd0 flags:# blur:flags.1?true motion:flags.2?true background_color:flags.0?int second_background_color:flags.4?int third_background_color:flags.5?int fourth_background_color:flags.6?int intensity:flags.3?int rotation:flags.4?int emoticon:flags.7?string = WallPaperSettings;
 
@@ -1236,6 +1237,7 @@ themeSettings#fa58b6d4 flags:# message_colors_animated:flags.2?true base_theme:B
 
 webPageAttributeTheme#54b56617 flags:# documents:flags.0?Vector<Document> settings:flags.1?ThemeSettings = WebPageAttribute;
 webPageAttributeStory#2e94c3e7 flags:# peer:Peer id:int story:flags.0?StoryItem = WebPageAttribute;
+webPageAttributeStickerSet#50cc03d3 flags:# emojis:flags.0?true text_color:flags.1?true stickers:Vector<Document> = WebPageAttribute;
 
 messages.votesList#4899484e flags:# count:int votes:Vector<MessagePeerVote> chats:Vector<Chat> users:Vector<User> next_offset:flags.0?string = messages.VotesList;
 
@@ -1361,7 +1363,7 @@ account.resetPasswordFailedWait#e3779861 retry_date:int = account.ResetPasswordR
 account.resetPasswordRequestedWait#e9effc7d until_date:int = account.ResetPasswordResult;
 account.resetPasswordOk#e926d63e = account.ResetPasswordResult;
 
-sponsoredMessage#ed5383f7 flags:# recommended:flags.5?true show_peer_photo:flags.6?true can_report:flags.12?true random_id:bytes from_id:flags.3?Peer chat_invite:flags.4?ChatInvite chat_invite_hash:flags.4?string channel_post:flags.2?int start_param:flags.0?string webpage:flags.9?SponsoredWebPage app:flags.10?BotApp message:string entities:flags.1?Vector<MessageEntity> button_text:flags.11?string sponsor_info:flags.7?string additional_info:flags.8?string = SponsoredMessage;
+sponsoredMessage#bdedf566 flags:# recommended:flags.5?true can_report:flags.12?true random_id:bytes url:string title:string message:string entities:flags.1?Vector<MessageEntity> photo:flags.6?Photo color:flags.13?PeerColor button_text:string sponsor_info:flags.7?string additional_info:flags.8?string = SponsoredMessage;
 
 messages.sponsoredMessages#c9ee1d87 flags:# posts_between:flags.0?int messages:Vector<SponsoredMessage> chats:Vector<Chat> users:Vector<User> = messages.SponsoredMessages;
 messages.sponsoredMessagesEmpty#1839490f = messages.SponsoredMessages;
@@ -1565,8 +1567,6 @@ messagePeerVote#b6cc2d5c peer:Peer option:bytes date:int = MessagePeerVote;
 messagePeerVoteInputOption#74cda504 peer:Peer date:int = MessagePeerVote;
 messagePeerVoteMultiple#4628f6e6 peer:Peer options:Vector<bytes> date:int = MessagePeerVote;
 
-sponsoredWebPage#3db8ec63 flags:# url:string site_name:string photo:flags.0?Photo = SponsoredWebPage;
-
 storyViews#8d595cd6 flags:# has_viewers:flags.1?true views_count:int forwards_count:flags.2?int reactions:flags.3?Vector<ReactionCount> reactions_count:flags.4?int recent_viewers:flags.0?Vector<long> = StoryViews;
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
@@ -1576,7 +1576,7 @@ storyItem#79b26a24 flags:# pinned:flags.5?true public:flags.7?true close_friends
 stories.allStoriesNotModified#1158fe3e flags:# state:string stealth_mode:StoriesStealthMode = stories.AllStories;
 stories.allStories#6efc5e81 flags:# has_more:flags.0?true count:int state:string peer_stories:Vector<PeerStories> chats:Vector<Chat> users:Vector<User> stealth_mode:StoriesStealthMode = stories.AllStories;
 
-stories.stories#5dd8c3c8 count:int stories:Vector<StoryItem> chats:Vector<Chat> users:Vector<User> = stories.Stories;
+stories.stories#63c3dd0a flags:# count:int stories:Vector<StoryItem> pinned_to_top:flags.0?Vector<int> chats:Vector<Chat> users:Vector<User> = stories.Stories;
 
 storyView#b0bdeac5 flags:# blocked:flags.0?true blocked_my_stories_from:flags.1?true user_id:long date:int reaction:flags.2?Reaction = StoryView;
 storyViewPublicForward#9083670b flags:# blocked:flags.0?true blocked_my_stories_from:flags.1?true message:Message = StoryView;
@@ -1770,6 +1770,11 @@ broadcastRevenueTransactionRefund#42d30d2e amount:long date:int provider:string
 
 stats.broadcastRevenueTransactions#87158466 count:int transactions:Vector<BroadcastRevenueTransaction> = stats.BroadcastRevenueTransactions;
 
+reactionNotificationsFromContacts#bac3a61a = ReactionNotificationsFrom;
+reactionNotificationsFromAll#4b9e22a0 = ReactionNotificationsFrom;
+
+reactionsNotifySettings#56e34970 flags:# messages_notify_from:flags.0?ReactionNotificationsFrom stories_notify_from:flags.1?ReactionNotificationsFrom sound:NotificationSound show_previews:Bool = ReactionsNotifySettings;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1913,6 +1918,9 @@ account.deleteBusinessChatLink#60073674 slug:string = Bool;
 account.getBusinessChatLinks#6f70dde1 = account.BusinessChatLinks;
 account.resolveBusinessChatLink#5492e5ee slug:string = account.ResolvedBusinessChatLinks;
 account.updatePersonalChannel#d94305e0 channel:InputChannel = Bool;
+account.toggleSponsoredMessages#b9d9a38d enabled:Bool = Bool;
+account.getReactionsNotifySettings#6dd654c = ReactionsNotifySettings;
+account.setReactionsNotifySettings#316ce548 settings:ReactionsNotifySettings = ReactionsNotifySettings;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#b60f5918 id:InputUser = users.UserFull;
@@ -1993,7 +2001,7 @@ messages.startBot#e6df7378 bot:InputUser peer:InputPeer random_id:long start_par
 messages.getMessagesViews#5784d3e1 peer:InputPeer id:Vector<int> increment:Bool = messages.MessageViews;
 messages.editChatAdmin#a85bd1c2 chat_id:long user_id:InputUser is_admin:Bool = Bool;
 messages.migrateChat#a2875319 chat_id:long = Updates;
-messages.searchGlobal#4bc6589a flags:# folder_id:flags.0?int q:string filter:MessagesFilter min_date:int max_date:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
+messages.searchGlobal#4bc6589a flags:# broadcasts_only:flags.1?true folder_id:flags.0?int q:string filter:MessagesFilter min_date:int max_date:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 messages.reorderStickerSets#78337739 flags:# masks:flags.0?true emojis:flags.1?true order:Vector<long> = Bool;
 messages.getDocumentByHash#b1f2061f sha256:bytes size:long mime_type:string = Document;
 messages.getSavedGifs#5cf09635 hash:long = messages.SavedGifs;
@@ -2097,7 +2105,7 @@ messages.saveDefaultSendAs#ccfddf96 peer:InputPeer send_as:InputPeer = Bool;
 messages.sendReaction#d30d78d4 flags:# big:flags.1?true add_to_recent:flags.2?true peer:InputPeer msg_id:int reaction:flags.0?Vector<Reaction> = Updates;
 messages.getMessagesReactions#8bba90e6 peer:InputPeer id:Vector<int> = Updates;
 messages.getMessageReactionsList#461b3f48 flags:# peer:InputPeer id:int reaction:flags.0?Reaction offset:flags.1?string limit:int = messages.MessageReactionsList;
-messages.setChatAvailableReactions#feb16771 peer:InputPeer available_reactions:ChatReactions = Updates;
+messages.setChatAvailableReactions#5a150bd4 flags:# peer:InputPeer available_reactions:ChatReactions reactions_limit:flags.0?int = Updates;
 messages.getAvailableReactions#18dea0ac hash:int = messages.AvailableReactions;
 messages.setDefaultReaction#4f47a016 reaction:Reaction = Bool;
 messages.translateText#63183030 flags:# peer:flags.0?InputPeer id:flags.0?Vector<int> text:flags.1?Vector<TextWithEntities> to_lang:string = messages.TranslatedText;
@@ -2258,7 +2266,7 @@ channels.toggleParticipantsHidden#6a6e7854 channel:InputChannel enabled:Bool = U
 channels.clickSponsoredMessage#18afbc93 channel:InputChannel random_id:bytes = Bool;
 channels.updateColor#d8aa3671 flags:# for_profile:flags.1?true channel:InputChannel color:flags.2?int background_emoji_id:flags.0?long = Updates;
 channels.toggleViewForumAsMessages#9738bb15 channel:InputChannel enabled:Bool = Updates;
-channels.getChannelRecommendations#83b70d97 channel:InputChannel = messages.Chats;
+channels.getChannelRecommendations#25a71742 flags:# channel:flags.0?InputChannel = messages.Chats;
 channels.updateEmojiStatus#f0d3e6a8 channel:InputChannel emoji_status:EmojiStatus = Updates;
 channels.setBoostsToUnblockRestrictions#ad399cee channel:InputChannel boosts:int = Updates;
 channels.setEmojiStickers#3cd930b7 channel:InputChannel stickerset:InputStickerSet = Bool;
@@ -2398,6 +2406,7 @@ stories.getPeerMaxIDs#535983c3 id:Vector<InputPeer> = Vector<int>;
 stories.getChatsToSend#a56a8b60 = messages.Chats;
 stories.togglePeerStoriesHidden#bd0415c4 peer:InputPeer hidden:Bool = Bool;
 stories.getStoryReactionsList#b9b2881f flags:# forwards_first:flags.2?true peer:InputPeer id:int reaction:flags.0?Reaction offset:flags.1?string limit:int = stories.StoryReactionsList;
+stories.togglePinnedToTop#b297e9b peer:InputPeer id:Vector<int> = Bool;
 
 premium.getBoostsList#60f67660 flags:# gifts:flags.0?true peer:InputPeer offset:string limit:int = premium.BoostsList;
 premium.getMyBoosts#be77b4a = premium.MyBoosts;
@@ -2415,4 +2424,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 177
+// LAYER 178

From 72b274a2bf245fdc89cd98a6e9cf18be629b7820 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 12 Apr 2024 02:42:18 +0300
Subject: [PATCH 342/596] Added support of simplified constructor for MTP
 sponsored message.

---
 .../data/components/sponsored_messages.cpp    | 130 ++++--------------
 .../data/components/sponsored_messages.h      |  32 ++---
 Telegram/SourceFiles/history/history_item.cpp |  24 +---
 .../history/view/history_view_element.cpp     |  27 +---
 .../history_view_sponsored_click_handler.cpp  |  59 +++-----
 .../history_view_sponsored_click_handler.h    |   3 +-
 .../view/media/history_view_web_page.cpp      |  34 ++---
 .../view/media/history_view_web_page.h        |   5 +-
 8 files changed, 85 insertions(+), 229 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index a60d7c3fd..7bab7af0e 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -9,8 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_text_entities.h"
 #include "apiwrap.h"
-#include "data/data_bot_app.h"
+#include "core/click_handler_types.h"
 #include "data/data_channel.h"
+#include "data/data_photo.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "history/history.h"
@@ -257,94 +258,23 @@ void SponsoredMessages::append(
 		const MTPSponsoredMessage &message) {
 	const auto &data = message.data();
 	const auto randomId = data.vrandom_id().v;
-	const auto hash = qs(data.vchat_invite_hash().value_or_empty());
-	const auto makeFrom = [&](
-			not_null<PeerData*> peer,
-			bool exactPost = false) {
-		const auto channel = peer->asChannel();
-		return SponsoredFrom{
-			.peer = peer,
-			.title = peer->name(),
-			.isBroadcast = (channel && channel->isBroadcast()),
-			.isMegagroup = (channel && channel->isMegagroup()),
-			.isChannel = (channel != nullptr),
-			.isPublic = (channel && channel->isPublic()),
-			.isExactPost = exactPost,
-			.isRecommended = data.is_recommended(),
-			.isForceUserpicDisplay = data.is_show_peer_photo(),
-			.buttonText = qs(data.vbutton_text().value_or_empty()),
-			.canReport = data.is_can_report(),
-		};
+	const auto from = SponsoredFrom{
+		.title = qs(data.vtitle()),
+		.link = qs(data.vurl()),
+		.buttonText = qs(data.vbutton_text()),
+		.photoId = data.vphoto()
+			? history->session().data().processPhoto(*data.vphoto())->id
+			: PhotoId(0),
+		.backgroundEmojiId = data.vcolor().has_value()
+			? data.vcolor()->data().vbackground_emoji_id().value_or_empty()
+			: uint64(0),
+		.colorIndex = uint8(data.vcolor().has_value()
+			? data.vcolor()->data().vcolor().value_or_empty()
+			: 0),
+		.isLinkInternal = !UrlRequiresConfirmation(qs(data.vurl())),
+		.isRecommended = data.is_recommended(),
+		.canReport = data.is_can_report(),
 	};
-	const auto externalLink = data.vwebpage()
-		? qs(data.vwebpage()->data().vurl())
-		: QString();
-	const auto from = [&]() -> SponsoredFrom {
-		if (const auto webpage = data.vwebpage()) {
-			const auto &data = webpage->data();
-			const auto photoId = data.vphoto()
-				? _session->data().processPhoto(*data.vphoto())->id
-				: PhotoId(0);
-			return SponsoredFrom{
-				.title = qs(data.vsite_name()),
-				.externalLink = externalLink,
-				.webpageOrBotPhotoId = photoId,
-				.isForceUserpicDisplay = message.data().is_show_peer_photo(),
-				.canReport = message.data().is_can_report(),
-			};
-		} else if (const auto fromId = data.vfrom_id()) {
-			const auto peerId = peerFromMTP(*fromId);
-			auto result = makeFrom(
-				_session->data().peer(peerId),
-				(data.vchannel_post() != nullptr));
-			const auto user = result.peer->asUser();
-			if (user && user->isBot()) {
-				const auto botAppData = data.vapp()
-					? _session->data().processBotApp(peerId, *data.vapp())
-					: nullptr;
-				result.botLinkInfo = Window::PeerByLinkInfo{
-					.usernameOrId = user->username(),
-					.resolveType = botAppData
-						? Window::ResolveType::BotApp
-						: data.vstart_param()
-						? Window::ResolveType::BotStart
-						: Window::ResolveType::Default,
-					.startToken = qs(data.vstart_param().value_or_empty()),
-					.botAppName = botAppData
-						? botAppData->shortName
-						: QString(),
-				};
-				result.webpageOrBotPhotoId = (botAppData && botAppData->photo)
-					? botAppData->photo->id
-					: PhotoId(0);
-			}
-			return result;
-		}
-		Assert(data.vchat_invite());
-		return data.vchat_invite()->match([&](const MTPDchatInvite &data) {
-			return SponsoredFrom{
-				.title = qs(data.vtitle()),
-				.isBroadcast = data.is_broadcast(),
-				.isMegagroup = data.is_megagroup(),
-				.isChannel = data.is_channel(),
-				.isPublic = data.is_public(),
-				.isForceUserpicDisplay = message.data().is_show_peer_photo(),
-				.canReport = message.data().is_can_report(),
-			};
-		}, [&](const MTPDchatInviteAlready &data) {
-			const auto chat = _session->data().processChat(data.vchat());
-			if (const auto channel = chat->asChannel()) {
-				channel->clearInvitePeek();
-			}
-			return makeFrom(chat);
-		}, [&](const MTPDchatInvitePeek &data) {
-			const auto chat = _session->data().processChat(data.vchat());
-			if (const auto channel = chat->asChannel()) {
-				channel->setInvitePeek(hash, data.vexpires().v);
-			}
-			return makeFrom(chat);
-		});
-	}();
 	auto sponsorInfo = data.vsponsor_info()
 		? tr::lng_sponsored_info_submenu(
 			tr::now,
@@ -364,9 +294,7 @@ void SponsoredMessages::append(
 				data.ventities().value_or_empty()),
 		},
 		.history = history,
-		.msgId = data.vchannel_post().value_or_empty(),
-		.chatInviteHash = hash,
-		.externalLink = externalLink,
+		.link = from.link,
 		.sponsorInfo = std::move(sponsorInfo),
 		.additionalInfo = std::move(additionalInfo),
 	};
@@ -438,7 +366,6 @@ SponsoredMessages::Details SponsoredMessages::lookupDetails(
 		return {};
 	}
 	const auto &data = entryPtr->sponsored;
-	const auto &hash = data.chatInviteHash;
 
 	using InfoList = std::vector<TextWithEntities>;
 	auto info = (!data.sponsorInfo.text.isEmpty()
@@ -450,20 +377,13 @@ SponsoredMessages::Details SponsoredMessages::lookupDetails(
 		? InfoList{ data.additionalInfo }
 		: InfoList{};
 	return {
-		.hash = hash.isEmpty() ? std::nullopt : std::make_optional(hash),
-		.peer = data.from.peer,
-		.msgId = data.msgId,
 		.info = std::move(info),
-		.externalLink = data.externalLink,
-		.isForceUserpicDisplay = data.from.isForceUserpicDisplay,
-		.buttonText = !data.from.buttonText.isEmpty()
-			? data.from.buttonText
-			: !data.externalLink.isEmpty()
-			? tr::lng_view_button_external_link(tr::now)
-			: data.from.botLinkInfo
-			? tr::lng_view_button_bot(tr::now)
-			: QString(),
-		.botLinkInfo = data.from.botLinkInfo,
+		.link = data.link,
+		.photoId = data.from.photoId,
+		.buttonText = data.from.buttonText,
+		.backgroundEmojiId = data.from.backgroundEmojiId,
+		.colorIndex = data.from.colorIndex,
+		.isLinkInternal = data.from.isLinkInternal,
 		.canReport = data.from.canReport,
 	};
 }
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.h b/Telegram/SourceFiles/data/components/sponsored_messages.h
index 022ccd19e..179dabf30 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.h
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.h
@@ -40,19 +40,14 @@ struct SponsoredReportResult final {
 };
 
 struct SponsoredFrom {
-	PeerData *peer = nullptr;
 	QString title;
-	bool isBroadcast = false;
-	bool isMegagroup = false;
-	bool isChannel = false;
-	bool isPublic = false;
-	std::optional<Window::PeerByLinkInfo> botLinkInfo;
-	bool isExactPost = false;
-	bool isRecommended = false;
-	QString externalLink;
-	PhotoId webpageOrBotPhotoId = PhotoId(0);
-	bool isForceUserpicDisplay = false;
+	QString link;
 	QString buttonText;
+	PhotoId photoId = PhotoId(0);
+	uint64 backgroundEmojiId = 0;
+	uint8 colorIndex : 6 = 0;
+	bool isLinkInternal = false;
+	bool isRecommended = false;
 	bool canReport = false;
 };
 
@@ -61,9 +56,7 @@ struct SponsoredMessage {
 	SponsoredFrom from;
 	TextWithEntities textWithEntities;
 	History *history = nullptr;
-	MsgId msgId;
-	QString chatInviteHash;
-	QString externalLink;
+	QString link;
 	TextWithEntities sponsorInfo;
 	TextWithEntities additionalInfo;
 };
@@ -76,14 +69,13 @@ public:
 		InjectToMiddle,
 	};
 	struct Details {
-		std::optional<QString> hash;
-		PeerData *peer = nullptr;
-		MsgId msgId;
 		std::vector<TextWithEntities> info;
-		QString externalLink;
-		bool isForceUserpicDisplay = false;
+		QString link;
 		QString buttonText;
-		std::optional<Window::PeerByLinkInfo> botLinkInfo;
+		PhotoId photoId = PhotoId(0);
+		uint64 backgroundEmojiId = 0;
+		uint8 colorIndex : 6 = 0;
+		bool isLinkInternal = false;
 		bool canReport = false;
 	};
 	using RandomId = QByteArray;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 80a19453e..3dd4f26bb 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -641,32 +641,18 @@ HistoryItem::HistoryItem(
 		? injectedAfter->date()
 		: 0),
 }) {
-	const auto webPageType = !from.externalLink.isEmpty()
-		? WebPageType::None
-		: from.isExactPost
-		? WebPageType::Message
-		: (from.botLinkInfo && !from.botLinkInfo->botAppName.isEmpty())
-		? WebPageType::BotApp
-		: from.botLinkInfo
-		? WebPageType::Bot
-		: from.isBroadcast
-		? WebPageType::Channel
-		: (from.peer && from.peer->isUser())
-		? WebPageType::User
-		: WebPageType::Group;
-
 	const auto webpage = history->peer->owner().webpage(
 		history->peer->owner().nextLocalMessageId().bare,
-		webPageType,
-		from.externalLink,
-		from.externalLink,
+		WebPageType::None,
+		from.link,
+		from.link,
 		from.isRecommended
 			? tr::lng_recommended_message_title(tr::now)
 			: tr::lng_sponsored_message_title(tr::now),
 		from.title,
 		textWithEntities,
-		(from.webpageOrBotPhotoId
-			? history->owner().photo(from.webpageOrBotPhotoId).get()
+		(from.photoId
+			? history->owner().photo(from.photoId).get()
 			: nullptr),
 		nullptr,
 		WebPageCollage(),
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 1c7927701..e687ec921 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_element.h"
 
-#include "api/api_chat_invite.h"
 #include "history/view/history_view_service_message.h"
 #include "history/view/history_view_message.h"
 #include "history/view/media/history_view_media_grouped.h"
@@ -27,10 +26,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/click_handler_types.h"
-#include "core/file_utilities.h"
 #include "core/ui_integration.h"
 #include "main/main_session.h"
-#include "main/main_domain.h"
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "window/window_session_controller.h"
 #include "ui/effects/path_shift_gradient.h"
@@ -1099,29 +1096,7 @@ ClickHandlerPtr Element::fromLink() const {
 		return _fromLink;
 	}
 	const auto item = data();
-	if (item->isSponsored()) {
-		const auto session = &item->history()->session();
-		_fromLink = std::make_shared<LambdaClickHandler>([=](
-				ClickContext context) {
-			if (context.button != Qt::LeftButton) {
-				return;
-			}
-			const auto my = context.other.value<ClickHandlerContext>();
-			if (const auto window = ContextOrSessionWindow(my, session)) {
-				auto &sponsored = session->sponsoredMessages();
-				const auto itemId = my.itemId ? my.itemId : item->fullId();
-				const auto details = sponsored.lookupDetails(itemId);
-				if (!details.externalLink.isEmpty()) {
-					File::OpenUrl(details.externalLink);
-				} else if (const auto &hash = details.hash) {
-					Api::CheckChatInvite(window, *hash);
-				} else if (const auto peer = details.peer) {
-					window->showPeerInfo(peer);
-				}
-			}
-		});
-		return _fromLink;
-	} else if (const auto from = item->displayFrom()) {
+	if (const auto from = item->displayFrom()) {
 		_fromLink = std::make_shared<LambdaClickHandler>([=](
 				ClickContext context) {
 			if (context.button != Qt::LeftButton) {
diff --git a/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.cpp b/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.cpp
index 7a6d7b685..6fe341437 100644
--- a/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.cpp
@@ -7,53 +7,32 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_sponsored_click_handler.h"
 
-#include "api/api_chat_invite.h"
 #include "core/click_handler_types.h"
-#include "core/file_utilities.h"
-#include "data/components/sponsored_messages.h"
-#include "data/data_session.h"
-#include "main/main_session.h"
-#include "window/window_session_controller.h"
 
 namespace HistoryView {
 
-ClickHandlerPtr SponsoredLink(const QString &externalLink) {
-	if (!externalLink.isEmpty()) {
-		class ClickHandler : public UrlClickHandler {
-		public:
-			using UrlClickHandler::UrlClickHandler;
+ClickHandlerPtr SponsoredLink(const QString &link, bool isInternal) {
+	class ClickHandler final : public UrlClickHandler {
+	public:
+		ClickHandler(const QString &link, bool isInternal)
+		: UrlClickHandler(link, false)
+		, _isInternal(isInternal) {
+		}
 
-			QString copyToClipboardContextItemText() const override {
-				return QString();
-			}
+		QString copyToClipboardContextItemText() const override final {
+			return QString();
+		}
 
-		};
+		QString tooltip() const override final {
+			return _isInternal ? QString() : url();
+		}
 
-		return std::make_shared<ClickHandler>(externalLink, false);
-	} else {
-		return std::make_shared<LambdaClickHandler>([](ClickContext context) {
-			const auto my = context.other.value<ClickHandlerContext>();
-			const auto controller = my.sessionWindow.get();
-			if (!controller) {
-				return;
-			}
-			const auto &session = controller->session();
-			const auto details = session.sponsoredMessages().lookupDetails(
-				my.itemId);
-			if (!details.externalLink.isEmpty()) {
-				File::OpenUrl(details.externalLink);
-			} else if (details.hash) {
-				Api::CheckChatInvite(controller, *details.hash);
-			} else if (details.botLinkInfo) {
-				controller->showPeerByLink(*details.botLinkInfo);
-			} else if (details.peer) {
-				controller->showPeerHistory(
-					details.peer,
-					Window::SectionShow::Way::Forward,
-					details.msgId);
-			}
-		});
-	}
+	private:
+		const bool _isInternal;
+
+	};
+
+	return std::make_shared<ClickHandler>(link, isInternal);
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.h b/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.h
index 7849d8e5f..718557226 100644
--- a/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.h
+++ b/Telegram/SourceFiles/history/view/history_view_sponsored_click_handler.h
@@ -12,6 +12,7 @@ class ClickHandler;
 namespace HistoryView {
 
 [[nodiscard]] std::shared_ptr<ClickHandler> SponsoredLink(
-	const QString &externalLink);
+	const QString &link,
+	bool isInternal);
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index 3acd1c69f..0f9c850c0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -232,17 +232,10 @@ WebPage::WebPage(
 		_parent->data()->fullId());
 	auto result = std::make_optional<SponsoredData>();
 	result->buttonText = details.buttonText;
-	result->hasExternalLink = (details.externalLink == _data->url);
+	result->isLinkInternal = details.isLinkInternal;
+	result->backgroundEmojiId = details.backgroundEmojiId;
+	result->colorIndex = details.colorIndex;
 	result->canReport = details.canReport;
-#ifdef _DEBUG
-	if (details.peer) {
-#else
-	if (details.isForceUserpicDisplay && details.peer) {
-#endif
-		result->peer = details.peer;
-		result->userpicView = details.peer->createUserpicView();
-		details.peer->loadUserpic();
-	}
 	return result;
 }())
 , _siteName(st::msgMinWidth - _st.padding.left() - _st.padding.right())
@@ -345,9 +338,9 @@ QSize WebPage::countOptimalSize() {
 				_parent->data()->fullId());
 		}
 		if (_sponsoredData) {
-			_openl = SponsoredLink(_sponsoredData->hasExternalLink
-				? _data->url
-				: QString());
+			_openl = SponsoredLink(
+				_data->url,
+				_sponsoredData->isLinkInternal);
 
 			if (_sponsoredData->canReport) {
 				_sponsoredData->hintLink = AboutSponsoredClickHandler();
@@ -683,14 +676,23 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 	auto tshift = inner.top();
 	auto paintw = inner.width();
 
+	const auto asSponsored = (!!_sponsoredData);
+
 	const auto selected = context.selected();
 	const auto view = parent();
 	const auto from = view->data()->contentColorsFrom();
-	const auto colorIndex = from ? from->colorIndex() : view->colorIndex();
+	const auto colorIndex = (asSponsored && _sponsoredData->colorIndex)
+		? _sponsoredData->colorIndex
+		: from
+		? from->colorIndex()
+		: view->colorIndex();
 	const auto cache = context.outbg
 		? stm->replyCache[st->colorPatternIndex(colorIndex)].get()
 		: st->coloredReplyCache(selected, colorIndex).get();
-	const auto backgroundEmojiId = from
+	const auto backgroundEmojiId = (asSponsored
+			&& _sponsoredData->backgroundEmojiId)
+		? _sponsoredData->backgroundEmojiId
+		: from
 		? from->backgroundEmojiId()
 		: DocumentId();
 	const auto backgroundEmoji = backgroundEmojiId
@@ -724,8 +726,6 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 		}
 	}
 
-	const auto asSponsored = (!!_sponsoredData);
-
 	auto lineHeight = UnitedLineHeight();
 	if (asArticle()) {
 		ensurePhotoMediaCreated();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index 61c834eea..1f06f929c 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -134,7 +134,10 @@ private:
 		PeerData *peer = nullptr;
 		Ui::PeerUserpicView userpicView;
 		QString buttonText;
-		bool hasExternalLink = false;
+		bool isLinkInternal = false;
+
+		uint64 backgroundEmojiId = 0;
+		uint8 colorIndex : 6 = 0;
 
 		bool canReport = false;
 		QSize hintSize;

From 5543927042d6603f4dbfa6b1563d67ce78627b89 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 16 Apr 2024 03:29:06 +0300
Subject: [PATCH 343/596] Added ability to enable sponsored messages for
 premium self.

---
 Telegram/Resources/langs/lang.strings         |  5 +
 Telegram/SourceFiles/api/api_premium.cpp      | 35 +++++++
 Telegram/SourceFiles/api/api_premium.h        | 12 +++
 .../settings/settings_business.cpp            | 98 +++++++++++++++++++
 4 files changed, 150 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6215ec9fe..f31460e4e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2272,6 +2272,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_business_about_chat_intro" = "Customize the message people see before they start a chat with you.";
 "lng_business_subtitle_chat_links" = "Links to Chat";
 "lng_business_about_chat_links" = "Create links that start a chat with you, suggesting the first message.";
+"lng_business_subtitle_sponsored" = "Ads in Channels";
+"lng_business_button_sponsored" = "Do Not Hide Ads";
+"lng_business_about_sponsored" = "As a Premium subscriber, you don’t see any ads on Telegram, but you can turn them on, for example, to view your own ads that you launched on the {link}";
+"lng_business_about_sponsored_link" = "Telegram Ad Platform {emoji}";
+"lng_business_about_sponsored_url" = "https://ads.telegram.org";
 
 "lng_location_title" = "Location";
 "lng_location_about" = "Display the location of your business on your account.";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 5257feb2d..6ff4aa130 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -602,6 +602,41 @@ bool PremiumGiftCodeOptions::giveawayGiftsPurchaseAvailable() const {
 		false);
 }
 
+SponsoredToggle::SponsoredToggle(not_null<Main::Session*> session)
+: _api(&session->api().instance()) {
+}
+
+rpl::producer<bool> SponsoredToggle::toggled() {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		_api.request(MTPusers_GetFullUser(
+			MTP_inputUserSelf()
+		)).done([=](const MTPusers_UserFull &result) {
+			consumer.put_next_copy(
+				result.data().vfull_user().data().is_sponsored_enabled());
+		}).fail([=] { consumer.put_next(false); }).send();
+
+		return lifetime;
+	};
+}
+
+rpl::producer<rpl::no_value, QString> SponsoredToggle::setToggled(bool v) {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		_api.request(MTPaccount_ToggleSponsoredMessages(
+			MTP_bool(v)
+		)).done([=] {
+			consumer.put_done();
+		}).fail([=](const MTP::Error &error) {
+			consumer.put_error_copy(error.type());
+		}).send();
+
+		return lifetime;
+	};
+}
+
 RequirePremiumState ResolveRequiresPremiumToWrite(
 		not_null<PeerData*> peer,
 		History *maybeHistory) {
diff --git a/Telegram/SourceFiles/api/api_premium.h b/Telegram/SourceFiles/api/api_premium.h
index 9bacca92d..83423fcd2 100644
--- a/Telegram/SourceFiles/api/api_premium.h
+++ b/Telegram/SourceFiles/api/api_premium.h
@@ -216,6 +216,18 @@ private:
 
 };
 
+class SponsoredToggle final {
+public:
+	explicit SponsoredToggle(not_null<Main::Session*> session);
+
+	[[nodiscard]] rpl::producer<bool> toggled();
+	[[nodiscard]] rpl::producer<rpl::no_value, QString> setToggled(bool);
+
+private:
+	MTP::Sender _api;
+
+};
+
 enum class RequirePremiumState {
 	Unknown,
 	Yes,
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index 163716819..c11a0f3cd 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/business/data_business_info.h"
 #include "data/business/data_business_chatbots.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
 #include "data/data_peer_values.h" // AmPremiumValue.
 #include "data/data_session.h"
@@ -39,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/checkbox.h" // Ui::RadiobuttonGroup.
 #include "ui/widgets/gradient_round_button.h"
+#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
@@ -51,6 +53,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
+#include "styles/style_chat.h"
+#include "styles/style_channel_earn.h"
 
 namespace Settings {
 namespace {
@@ -470,6 +474,100 @@ void Business::setupContent() {
 		}
 	});
 
+	const auto sponsoredWrap = content->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			content,
+			object_ptr<Ui::VerticalLayout>(content)));
+	const auto fillSponsoredWrap = [=] {
+		while (sponsoredWrap->entity()->count()) {
+			delete sponsoredWrap->entity()->widgetAt(0);
+		}
+		Ui::AddDivider(sponsoredWrap->entity());
+		const auto loading = sponsoredWrap->entity()->add(
+			object_ptr<Ui::SlideWrap<Ui::FlatLabel>>(
+				sponsoredWrap->entity(),
+				object_ptr<Ui::FlatLabel>(
+					sponsoredWrap->entity(),
+					tr::lng_contacts_loading())),
+			st::boxRowPadding);
+		loading->entity()->setTextColorOverride(st::windowSubTextFg->c);
+
+		const auto wrap = sponsoredWrap->entity()->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				sponsoredWrap->entity(),
+				object_ptr<Ui::VerticalLayout>(sponsoredWrap->entity())));
+		wrap->toggle(false, anim::type::instant);
+		const auto inner = wrap->entity();
+		Ui::AddSkip(inner);
+		Ui::AddSubsectionTitle(
+			inner,
+			tr::lng_business_subtitle_sponsored());
+		const auto button = inner->add(object_ptr<Ui::SettingsButton>(
+			inner,
+			tr::lng_business_button_sponsored()));
+		Ui::AddSkip(inner);
+
+		const auto session = &_controller->session();
+		{
+			const auto arrow = Ui::Text::SingleCustomEmoji(
+				session->data().customEmojiManager().registerInternalEmoji(
+					st::topicButtonArrow,
+					st::channelEarnLearnArrowMargins,
+					false));
+			inner->add(object_ptr<Ui::DividerLabel>(
+				inner,
+				Ui::CreateLabelWithCustomEmoji(
+					inner,
+					tr::lng_business_about_sponsored(
+						lt_link,
+						rpl::combine(
+							tr::lng_business_about_sponsored_link(
+								lt_emoji,
+								rpl::single(arrow),
+								Ui::Text::RichLangValue),
+							tr::lng_business_about_sponsored_url()
+						) | rpl::map([](TextWithEntities text, QString url) {
+							return Ui::Text::Link(text, url);
+						}),
+						Ui::Text::RichLangValue),
+					{ .session = session },
+					st::boxDividerLabel),
+				st::defaultBoxDividerLabelPadding,
+				RectPart::Top | RectPart::Bottom));
+		}
+
+		const auto api = inner->lifetime().make_state<Api::SponsoredToggle>(
+			session);
+
+		api->toggled(
+		) | rpl::start_with_next([=](bool enabled) {
+			button->toggleOn(rpl::single(enabled));
+			wrap->toggle(true, anim::type::instant);
+			loading->toggle(false, anim::type::instant);
+
+			button->toggledChanges(
+			) | rpl::start_with_next([=](bool toggled) {
+				api->setToggled(
+					toggled
+				) | rpl::start_with_error_done([=](const QString &error) {
+					_controller->showToast(error);
+				}, [] {
+				}, button->lifetime());
+			}, button->lifetime());
+		}, inner->lifetime());
+
+		Ui::ToggleChildrenVisibility(sponsoredWrap->entity(), true);
+		sponsoredWrap->entity()->resizeToWidth(content->width());
+	};
+	Data::AmPremiumValue(
+		&_controller->session()
+	) | rpl::start_with_next([=](bool isPremium) {
+		sponsoredWrap->toggle(isPremium, anim::type::normal);
+		if (isPremium) {
+			fillSponsoredWrap();
+		}
+	}, content->lifetime());
+
 	Ui::ResizeFitChild(this, content);
 }
 

From 225c0e0af370e3d88b02906b14295f146ae61512 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 12 Apr 2024 14:22:57 +0300
Subject: [PATCH 344/596] Added initial api support of reactions limit in
 channels and groups.

---
 Telegram/SourceFiles/data/data_channel.cpp    |  8 +++-
 Telegram/SourceFiles/data/data_chat.cpp       |  7 +++-
 Telegram/SourceFiles/data/data_peer.cpp       |  4 +-
 Telegram/SourceFiles/data/data_peer.h         |  1 +
 .../SourceFiles/data/data_peer_values.cpp     | 42 +++++++++++++++----
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index b088be2d7..d4e1499d0 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -1198,10 +1198,14 @@ void ApplyChannelUpdate(
 	}
 	channel->setThemeEmoji(qs(update.vtheme_emoticon().value_or_empty()));
 	channel->setTranslationDisabled(update.is_translations_disabled());
+
+	const auto reactionsLimit = update.vreactions_limit().value_or_empty();
 	if (const auto allowed = update.vavailable_reactions()) {
-		channel->setAllowedReactions(Data::Parse(*allowed));
+		auto parsed = Data::Parse(*allowed);
+		parsed.maxCount = reactionsLimit;
+		channel->setAllowedReactions(std::move(parsed));
 	} else {
-		channel->setAllowedReactions({});
+		channel->setAllowedReactions({ .maxCount = reactionsLimit });
 	}
 	channel->owner().stories().apply(channel, update.vstories());
 	channel->fullUpdated();
diff --git a/Telegram/SourceFiles/data/data_chat.cpp b/Telegram/SourceFiles/data/data_chat.cpp
index 1e19a00d1..7f41c04b7 100644
--- a/Telegram/SourceFiles/data/data_chat.cpp
+++ b/Telegram/SourceFiles/data/data_chat.cpp
@@ -471,10 +471,13 @@ void ApplyChatUpdate(not_null<ChatData*> chat, const MTPDchatFull &update) {
 	chat->checkFolder(update.vfolder_id().value_or_empty());
 	chat->setThemeEmoji(qs(update.vtheme_emoticon().value_or_empty()));
 	chat->setTranslationDisabled(update.is_translations_disabled());
+	const auto reactionsLimit = update.vreactions_limit().value_or_empty();
 	if (const auto allowed = update.vavailable_reactions()) {
-		chat->setAllowedReactions(Data::Parse(*allowed));
+		auto parsed = Data::Parse(*allowed);
+		parsed.maxCount = reactionsLimit;
+		chat->setAllowedReactions(std::move(parsed));
 	} else {
-		chat->setAllowedReactions({});
+		chat->setAllowedReactions({ .maxCount = reactionsLimit });
 	}
 	chat->fullUpdated();
 	chat->setAbout(qs(update.vabout()));
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 9b5d6d379..6d5ac28d3 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -104,7 +104,9 @@ bool operator<(
 bool operator==(
 		const AllowedReactions &a,
 		const AllowedReactions &b) {
-	return (a.type == b.type) && (a.some == b.some);
+	return (a.type == b.type)
+		&& (a.some == b.some)
+		&& (a.maxCount == b.maxCount);
 }
 
 AllowedReactions Parse(const MTPChatReactions &value) {
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index b7f98e599..563f5a068 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -110,6 +110,7 @@ enum class AllowedReactionsType {
 struct AllowedReactions {
 	std::vector<ReactionId> some;
 	AllowedReactionsType type = AllowedReactionsType::Some;
+	int maxCount = 0;
 };
 
 bool operator<(const AllowedReactions &a, const AllowedReactions &b);
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 1d321f80d..60a1c5f43 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -75,6 +75,10 @@ std::optional<QString> OnlineTextCommon(LastseenStatus status, TimeId now) {
 	return std::nullopt;
 }
 
+[[nodiscard]] int UniqueReactionsLimit(not_null<Main::AppConfig*> config) {
+	return config->get<int>("reactions_uniq_max", 11);
+}
+
 } // namespace
 
 inline auto AdminRightsValue(not_null<ChannelData*> channel) {
@@ -562,21 +566,45 @@ const AllowedReactions &PeerAllowedReactions(not_null<PeerData*> peer) {
 	});
 }
 
-int UniqueReactionsLimit(not_null<Main::AppConfig*> config) {
-	return config->get<int>("reactions_uniq_max", 11);
-}
-
 int UniqueReactionsLimit(not_null<PeerData*> peer) {
+	if (const auto channel = peer->asChannel()) {
+		if (const auto limit = channel->allowedReactions().maxCount) {
+			return limit;
+		}
+	} else if (const auto chat = peer->asChat()) {
+		if (const auto limit = chat->allowedReactions().maxCount) {
+			return limit;
+		}
+	}
 	return UniqueReactionsLimit(&peer->session().appConfig());
 }
 
 rpl::producer<int> UniqueReactionsLimitValue(
 		not_null<PeerData*> peer) {
-	const auto config = &peer->session().appConfig();
-	return config->value(
-	) | rpl::map([=] {
+	auto configValue = peer->session().appConfig().value(
+	) | rpl::map([config = &peer->session().appConfig()] {
 		return UniqueReactionsLimit(config);
 	}) | rpl::distinct_until_changed();
+	if (const auto channel = peer->asChannel()) {
+		return rpl::combine(
+			PeerAllowedReactionsValue(peer),
+			std::move(configValue)
+		) | rpl::map([=](const auto &allowedReactions, int limit) {
+			return allowedReactions.maxCount
+				? allowedReactions.maxCount
+				: limit;
+		});
+	} else if (const auto chat = peer->asChat()) {
+		return rpl::combine(
+			PeerAllowedReactionsValue(peer),
+			std::move(configValue)
+		) | rpl::map([=](const auto &allowedReactions, int limit) {
+			return allowedReactions.maxCount
+				? allowedReactions.maxCount
+				: limit;
+		});
+	}
+	return configValue;
 }
 
 } // namespace Data

From df16e7c00bc3ea56fe405e5649a0e5f7fff3fa7a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 16 Apr 2024 04:35:46 +0300
Subject: [PATCH 345/596] Added ability to change reactions limit in channels.

---
 Telegram/Resources/langs/lang.strings         |   6 +
 .../boxes/peers/edit_peer_reactions.cpp       | 139 ++++++++++++++++--
 Telegram/SourceFiles/info/info.style          |  16 +-
 3 files changed, 144 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f31460e4e..c727d4c5e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1495,6 +1495,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_peer_reactions_none_about" = "Members of the group can't add any reactions to messages.";
 "lng_manage_peer_reactions_some_title" = "Only allow these reactions";
 "lng_manage_peer_reactions_available" = "Available reactions";
+"lng_manage_peer_reactions_available_ph" = "Add reactions...";
 "lng_manage_peer_reactions_own" = "You can also {link} emoji packs and use them as reactions.";
 "lng_manage_peer_reactions_own_link" = "create your own";
 "lng_manage_peer_reactions_level#one" = "Your channel needs to reach level **{count}** to use **{same_count}** custom reaction.";
@@ -1503,6 +1504,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_peer_reactions_boost_link" = "here";
 "lng_manage_peer_reactions_limit" = "Channels can't have more custom reactions.";
 
+"lng_manage_peer_reactions_max_title" = "Maximum number of reactions";
+"lng_manage_peer_reactions_max_slider#one" = "{count} reaction per post";
+"lng_manage_peer_reactions_max_slider#other" = "{count} reactions per post";
+"lng_manage_peer_reactions_max_about" = "Limit the number of different reactions that can be added to a post, including already published ones.";
+
 "lng_manage_peer_antispam" = "Aggressive Anti-Spam";
 "lng_manage_peer_antispam_about" = "Telegram will filter more spam but may occasionally affect ordinary messages. You can report False Positives in Recent Actions.";
 "lng_manage_peer_antispam_not_enough#one" = "Aggressive filtering can be enabled only in groups with more than **{count} member**.";
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
index 71430ace0..0873426e5 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
@@ -7,30 +7,33 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/peers/edit_peer_reactions.h"
 
+#include "apiwrap.h"
 #include "base/event_filter.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_selector.h"
-#include "data/data_chat.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_document.h"
+#include "data/data_peer_values.h" // UniqueReactionsLimit.
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
-#include "main/main_session.h"
-#include "apiwrap.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
 #include "ui/boxes/boost_box.h"
-#include "ui/widgets/fields/input_field.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/wrap/slide_wrap.h"
 #include "ui/vertical_list.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/wrap/slide_wrap.h"
 #include "window/window_session_controller.h"
 #include "window/window_session_controller_link_info.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
-#include "styles/style_settings.h"
 #include "styles/style_layers.h"
+#include "styles/style_settings.h"
 
 #include <QtWidgets/QTextEdit>
 #include <QtGui/QTextBlock>
@@ -705,12 +708,16 @@ void EditAllowedReactionsBox(
 		}
 	};
 	changed(selected.empty() ? DefaultSelected() : std::move(selected), {});
+	Ui::AddSubsectionTitle(
+		reactions,
+		enabled
+			? tr::lng_manage_peer_reactions_available()
+			: tr::lng_manage_peer_reactions_some_title(),
+		st::manageGroupReactionsFieldPadding);
 	reactions->add(AddReactionsSelector(reactions, {
 		.outer = box->getDelegate()->outerContainer(),
 		.controller = args.navigation->parentController(),
-		.title = (enabled
-			? tr::lng_manage_peer_reactions_available()
-			: tr::lng_manage_peer_reactions_some_title()),
+		.title = tr::lng_manage_peer_reactions_available_ph(),
 		.list = all,
 		.selected = state->selected,
 		.callback = changed,
@@ -726,6 +733,7 @@ void EditAllowedReactionsBox(
 		}
 	});
 
+	const auto reactionsLimit = container->lifetime().make_state<int>(0);
 	if (!isGroup) {
 		AddReactionsText(
 			container,
@@ -733,9 +741,109 @@ void EditAllowedReactionsBox(
 			args.allowedCustomReactions,
 			state->customCount.value(),
 			args.askForBoosts);
+
+		const auto session = &args.navigation->parentController()->session();
+
+		const auto wrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		const auto max = Data::UniqueReactionsLimit(session->user());
+		const auto inactiveColor = std::make_optional(st::windowSubTextFg->c);
+		const auto activeColor = std::make_optional(
+			st::windowActiveTextFg->c);
+		const auto inner = wrap->entity();
+		Ui::AddSkip(inner);
+		Ui::AddSubsectionTitle(
+			inner,
+			tr::lng_manage_peer_reactions_max_title(),
+			st::manageGroupReactionsMaxSubtitlePadding);
+		Ui::AddSkip(inner);
+		const auto line = inner->add(
+			object_ptr<Ui::RpWidget>(inner),
+			st::boxRowPadding);
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+		const auto left = Ui::CreateChild<Ui::FlatLabel>(
+			line,
+			QString::number(1),
+			st::defaultFlatLabel);
+		const auto center = Ui::CreateChild<Ui::FlatLabel>(
+			line,
+			st::defaultFlatLabel);
+		const auto right = Ui::CreateChild<Ui::FlatLabel>(
+			line,
+			QString::number(max),
+			st::defaultFlatLabel);
+		const auto slider = Ui::CreateChild<Ui::MediaSlider>(
+			line,
+			st::settingsScale);
+		rpl::combine(
+			line->sizeValue(),
+			left->sizeValue(),
+			center->sizeValue(),
+			right->sizeValue()
+		) | rpl::start_with_next([=](
+				const QSize &s,
+				const QSize &leftSize,
+				const QSize &centerSize,
+				const QSize &rightSize) {
+			const auto sliderHeight = st::settingsScale.seekSize.height();
+			line->resize(
+				line->width(),
+				leftSize.height() + sliderHeight * 2);
+			{
+				const auto r = line->rect();
+				slider->setGeometry(
+					0,
+					r.height() - sliderHeight * 1.5,
+					r.width(),
+					sliderHeight);
+			}
+			left->moveToLeft(0, 0);
+			right->moveToRight(0, 0);
+			center->moveToLeft((s.width() - centerSize.width()) / 2, 0);
+		}, line->lifetime());
+
+		const auto updateLabels = [=](int limit) {
+			left->setTextColorOverride((limit <= 1)
+				? activeColor
+				: inactiveColor);
+
+			center->setText(tr::lng_manage_peer_reactions_max_slider(
+				tr::now,
+				lt_count,
+				limit));
+			center->setTextColorOverride(activeColor);
+
+			right->setTextColorOverride((limit >= max)
+				? activeColor
+				: inactiveColor);
+
+			(*reactionsLimit) = limit;
+		};
+		const auto current = args.allowed.maxCount
+			? std::clamp(1, args.allowed.maxCount, max)
+			: max / 2;
+		slider->setPseudoDiscrete(
+			max,
+			[=](int index) { return index + 1; },
+			current,
+			updateLabels,
+			updateLabels);
+		updateLabels(current);
+
+		wrap->toggleOn(rpl::single(
+			optionInitial != Option::None
+		) | rpl::then(
+			state->selectorState.value(
+			) | rpl::map(rpl::mappers::_1 == SelectorState::Active)));
+
+		Ui::AddDividerText(inner, tr::lng_manage_peer_reactions_max_about());
 	}
 	const auto collect = [=] {
 		auto result = AllowedReactions();
+		result.maxCount = (*reactionsLimit);
 		if (isGroup
 			? (state->option.current() == Option::Some)
 			: (enabled->toggled())) {
@@ -783,6 +891,7 @@ void SaveAllowedReactions(
 		Data::ReactionToMTP
 	) | ranges::to<QVector<MTPReaction>>;
 
+	using Flag = MTPmessages_SetChatAvailableReactions::Flag;
 	using Type = Data::AllowedReactionsType;
 	const auto updated = (allowed.type != Type::Some)
 		? MTP_chatReactionsAll(MTP_flags((allowed.type == Type::Default)
@@ -792,16 +901,18 @@ void SaveAllowedReactions(
 		? MTP_chatReactionsNone()
 		: MTP_chatReactionsSome(MTP_vector<MTPReaction>(ids));
 	peer->session().api().request(MTPmessages_SetChatAvailableReactions(
-		MTP_flags(0),
+		allowed.maxCount ? MTP_flags(Flag::f_reactions_limit) : MTP_flags(0),
 		peer->input,
 		updated,
-		MTP_int(0) // reactions_limit
+		MTP_int(allowed.maxCount)
 	)).done([=](const MTPUpdates &result) {
 		peer->session().api().applyUpdates(result);
+		auto parsed = Data::Parse(updated);
+		parsed.maxCount = allowed.maxCount;
 		if (const auto chat = peer->asChat()) {
-			chat->setAllowedReactions(Data::Parse(updated));
+			chat->setAllowedReactions(parsed);
 		} else if (const auto channel = peer->asChannel()) {
-			channel->setAllowedReactions(Data::Parse(updated));
+			channel->setAllowedReactions(parsed);
 		} else {
 			Unexpected("Invalid peer type in SaveAllowedReactions.");
 		}
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index d59de8526..cf6f410cd 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -647,12 +647,22 @@ manageGroupReactions: IconButton(defaultIconButton) {
 	iconOver: icon{{ "info/edit/stickers_add", historyComposeIconFgOver }};
 }
 manageGroupReactionsField: InputField(defaultInputField) {
-	textMargins: margins(1px, 38px, 24px, 8px);
-	placeholderShift: -32px;
-	heightMin: 66px;
+	textMargins: margins(1px, 12px, 24px, 8px);
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	placeholderMargins: margins(1px, 0px, 7px, 0px);
+	placeholderAlign: align(topleft);
+	placeholderScale: 0.;
+	placeholderFont: normalFont;
+	placeholderShift: -50px;
+	font: normalFont;
+	heightMin: 36px;
 	heightMax: 158px;
 }
+manageGroupReactionsFieldPadding: margins(0px, 0px, 0px, -9px);
 manageGroupReactionsTextSkip: 16px;
+manageGroupReactionsMaxSubtitlePadding: margins(0px, 0px, 0px, -3px);
 
 infoEmptyFg: windowSubTextFg;
 infoEmptyPhoto: icon {{ "info/info_media_photo_empty", infoEmptyFg }};

From d33e3dc13ac0cca2bb15d3c7748bfef1ec6ba5d3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 14:23:53 +0400
Subject: [PATCH 346/596] Rename Story::pinned to Story::inProfile.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 22 +++++++++----------
 Telegram/SourceFiles/data/data_stories.h      |  6 +++--
 Telegram/SourceFiles/data/data_story.cpp      | 22 ++++++++++---------
 Telegram/SourceFiles/data/data_story.h        |  6 ++---
 .../info/media/info_media_list_widget.cpp     | 12 +++++-----
 .../stories/media_stories_controller.cpp      | 20 +++++++++--------
 .../media/stories/media_stories_controller.h  |  6 ++---
 .../media/stories/media_stories_view.cpp      |  4 ++--
 .../media/stories/media_stories_view.h        |  2 +-
 .../media/view/media_view_overlay_widget.cpp  | 10 ++++-----
 10 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 0090ba369..391caba74 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -340,7 +340,7 @@ void Stories::clearArchive(not_null<PeerData*> peer) {
 	_archive.erase(i);
 	for (const auto &id : archive.ids.list) {
 		if (const auto story = lookup({ peerId, id })) {
-			if ((*story)->expired() && !(*story)->pinned()) {
+			if ((*story)->expired() && !(*story)->inProfile()) {
 				applyDeleted(peer, id);
 			}
 		}
@@ -558,8 +558,8 @@ void Stories::unregisterDependentMessage(
 void Stories::savedStateChanged(not_null<Story*> story) {
 	const auto id = story->id();
 	const auto peer = story->peer()->id;
-	const auto pinned = story->pinned();
-	if (pinned) {
+	const auto inProfile = story->inProfile();
+	if (inProfile) {
 		auto &saved = _saved[peer];
 		const auto added = saved.ids.list.emplace(id).second;
 		if (added) {
@@ -794,7 +794,7 @@ void Stories::applyDeleted(not_null<PeerData*> peer, StoryId id) {
 					}
 				}
 			}
-			if (story->pinned()) {
+			if (story->inProfile()) {
 				if (const auto k = _saved.find(peerId); k != end(_saved)) {
 					const auto saved = &k->second;
 					if (saved->ids.list.remove(id)) {
@@ -832,7 +832,7 @@ void Stories::applyDeleted(not_null<PeerData*> peer, StoryId id) {
 void Stories::applyExpired(FullStoryId id) {
 	if (const auto maybeStory = lookup(id)) {
 		const auto story = *maybeStory;
-		if (!hasArchive(story->peer()) && !story->pinned()) {
+		if (!hasArchive(story->peer()) && !story->inProfile()) {
 			applyDeleted(story->peer(), id.story);
 			return;
 		}
@@ -1099,7 +1099,7 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 		return;
 	}
 	const auto story = *maybeStory;
-	if (story->expired() && story->pinned()) {
+	if (story->expired() && story->inProfile()) {
 		_incrementViewsPending[id.peer].emplace(id.story);
 		if (!_incrementViewsTimer.isActive()) {
 			_incrementViewsTimer.callOnce(kIncrementViewsDelay);
@@ -1724,9 +1724,9 @@ void Stories::deleteList(const std::vector<FullStoryId> &ids) {
 	}).send();
 }
 
-void Stories::togglePinnedList(
+void Stories::toggleInProfileList(
 		const std::vector<FullStoryId> &ids,
-		bool pinned) {
+		bool inProfile) {
 	if (ids.empty()) {
 		return;
 	}
@@ -1745,7 +1745,7 @@ void Stories::togglePinnedList(
 	api->request(MTPstories_TogglePinned(
 		peer->input,
 		MTP_vector<MTPint>(list),
-		MTP_bool(pinned)
+		MTP_bool(inProfile)
 	)).done([=](const MTPVector<MTPint> &result) {
 		const auto peerId = peer->id;
 		auto &saved = _saved[peerId];
@@ -1759,8 +1759,8 @@ void Stories::togglePinnedList(
 		for (const auto &id : result.v) {
 			if (const auto maybeStory = lookup({ peerId, id.v })) {
 				const auto story = *maybeStory;
-				story->setPinned(pinned);
-				if (pinned) {
+				story->setInProfile(inProfile);
+				if (inProfile) {
 					const auto add = loaded || (id.v >= lastId);
 					if (!add) {
 						dirty = true;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 1cc3bb30d..2508b3557 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -131,7 +131,7 @@ public:
 	explicit Stories(not_null<Session*> owner);
 	~Stories();
 
-	static constexpr auto kPinnedToastDuration = 4 * crl::time(1000);
+	static constexpr auto kInProfileToastDuration = 4 * crl::time(1000);
 
 	[[nodiscard]] Session &owner() const;
 	[[nodiscard]] Main::Session &session() const;
@@ -205,7 +205,9 @@ public:
 	void savedLoadMore(PeerId peerId);
 
 	void deleteList(const std::vector<FullStoryId> &ids);
-	void togglePinnedList(const std::vector<FullStoryId> &ids, bool pinned);
+	void toggleInProfileList(
+		const std::vector<FullStoryId> &ids,
+		bool inProfile);
 	void report(
 		std::shared_ptr<Ui::Show> show,
 		FullStoryId id,
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index cc0fefe99..6a525a7a6 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -389,12 +389,12 @@ TextWithEntities Story::inReplyText() const {
 			Ui::Text::WithEntities);
 }
 
-void Story::setPinned(bool pinned) {
-	_pinned = pinned;
+void Story::setInProfile(bool value) {
+	_inProfile = value;
 }
 
-bool Story::pinned() const {
-	return _pinned;
+bool Story::inProfile() const {
+	return _inProfile;
 }
 
 StoryPrivacy Story::privacy() const {
@@ -431,7 +431,9 @@ bool Story::canDownloadChecked() const {
 }
 
 bool Story::canShare() const {
-	return _privacyPublic && !forbidsForward() && (pinned() || !expired());
+	return _privacyPublic 
+		&& !forbidsForward() 
+		&& (inProfile() || !expired());
 }
 
 bool Story::canDelete() const {
@@ -447,7 +449,7 @@ bool Story::canReport() const {
 }
 
 bool Story::hasDirectLink() const {
-	if (!_privacyPublic || (!_pinned && expired())) {
+	if (!_privacyPublic || (!_inProfile && expired())) {
 		return false;
 	}
 	return !_peer->username().isEmpty();
@@ -707,7 +709,7 @@ void Story::applyFields(
 		: data.vsent_reaction()
 		? Data::ReactionFromMTP(*data.vsent_reaction())
 		: Data::ReactionId();
-	const auto pinned = data.is_pinned();
+	const auto inProfile = data.is_pinned();
 	const auto edited = data.is_edited();
 	const auto privacy = data.is_public()
 		? StoryPrivacy::Public
@@ -767,7 +769,7 @@ void Story::applyFields(
 		}
 	}
 
-	const auto pinnedChanged = (_pinned != pinned);
+	const auto inProfileChanged = (_inProfile != inProfile);
 	const auto editedChanged = (_edited != edited);
 	const auto mediaChanged = (_media != media);
 	const auto captionChanged = (_caption != caption);
@@ -783,7 +785,7 @@ void Story::applyFields(
 	_privacyContacts = (privacy == StoryPrivacy::Contacts);
 	_privacySelectedContacts = (privacy == StoryPrivacy::SelectedContacts);
 	_edited = edited;
-	_pinned = pinned;
+	_inProfile = inProfile;
 	_noForwards = noForwards;
 	if (mediaChanged) {
 		_media = std::move(media);
@@ -823,7 +825,7 @@ void Story::applyFields(
 		}
 		_peer->owner().refreshStoryItemViews(fullId());
 	}
-	if (pinnedChanged) {
+	if (inProfileChanged) {
 		_peer->owner().stories().savedStateChanged(this);
 	}
 }
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index 41da0239e..f4fd17d60 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -153,8 +153,8 @@ public:
 	[[nodiscard]] Image *replyPreview() const;
 	[[nodiscard]] TextWithEntities inReplyText() const;
 
-	void setPinned(bool pinned);
-	[[nodiscard]] bool pinned() const;
+	void setInProfile(bool value);
+	[[nodiscard]] bool inProfile() const;
 	[[nodiscard]] StoryPrivacy privacy() const;
 	[[nodiscard]] bool forbidsForward() const;
 	[[nodiscard]] bool edited() const;
@@ -250,7 +250,7 @@ private:
 	const TimeId _expires = 0;
 	TimeId _lastUpdateTime = 0;
 	bool _out : 1 = false;
-	bool _pinned : 1 = false;
+	bool _inProfile : 1 = false;
 	bool _privacyPublic : 1 = false;
 	bool _privacyCloseFriends : 1 = false;
 	bool _privacyContacts : 1 = false;
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 4e30f0b09..be09febef 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -1213,26 +1213,28 @@ void ListWidget::toggleStoryPin(
 	}
 	const auto channel = peerIsChannel(list.front().peer);
 	const auto count = int(list.size());
-	const auto pin = (_controller->storiesTab() == Stories::Tab::Archive);
+	const auto toProfile = (_controller->storiesTab() == Stories::Tab::Archive);
 	const auto controller = _controller;
 	const auto sure = [=](Fn<void()> close) {
 		using namespace ::Media::Stories;
-		controller->session().data().stories().togglePinnedList(list, pin);
+		controller->session().data().stories().toggleInProfileList(
+			list,
+			toProfile);
 		controller->showToast(
-			PrepareTogglePinnedToast(channel, count, pin));
+			PrepareToggleInProfileToast(channel, count, toProfile));
 		close();
 		if (confirmed) {
 			confirmed();
 		}
 	};
-	const auto onePhrase = pin
+	const auto onePhrase = toProfile
 		? (channel
 			? tr::lng_stories_channel_save_sure
 			: tr::lng_stories_save_sure)
 		: (channel
 			? tr::lng_stories_channel_archive_sure
 			: tr::lng_stories_archive_sure);
-	const auto manyPhrase = pin
+	const auto manyPhrase = toProfile
 		? (channel
 			? tr::lng_stories_channel_save_sure_many
 			: tr::lng_stories_save_sure_many)
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index d43ff3a27..10490e2aa 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1696,17 +1696,19 @@ void Controller::reportRequested() {
 	ReportRequested(uiShow(), _shown, &st::storiesReportBox);
 }
 
-void Controller::togglePinnedRequested(bool pinned) {
+void Controller::toggleInProfileRequested(bool inProfile) {
 	const auto story = this->story();
 	if (!story || !story->peer()->isSelf()) {
 		return;
 	}
-	if (!pinned && v::is<Data::StoriesContextSaved>(_context.data)) {
+	if (!inProfile && v::is<Data::StoriesContextSaved>(_context.data)) {
 		moveFromShown();
 	}
-	story->owner().stories().togglePinnedList({ story->fullId() }, pinned);
+	story->owner().stories().toggleInProfileList(
+		{ story->fullId() },
+		inProfile);
 	const auto channel = story->peer()->isChannel();
-	uiShow()->showToast(PrepareTogglePinnedToast(channel, 1, pinned));
+	uiShow()->showToast(PrepareToggleInProfileToast(channel, 1, inProfile));
 }
 
 void Controller::moveFromShown() {
@@ -1757,12 +1759,12 @@ void Controller::updatePowerSaveBlocker(const Player::TrackState &state) {
 		[=] { return _wrap->window()->windowHandle(); });
 }
 
-Ui::Toast::Config PrepareTogglePinnedToast(
+Ui::Toast::Config PrepareToggleInProfileToast(
 		bool channel,
 		int count,
-		bool pinned) {
+		bool inProfile) {
 	return {
-		.text = (pinned
+		.text = (inProfile
 			? (count == 1
 				? (channel
 					? tr::lng_stories_channel_save_done
@@ -1793,8 +1795,8 @@ Ui::Toast::Config PrepareTogglePinnedToast(
 						count,
 						Ui::Text::WithEntities))),
 		.st = &st::storiesActionToast,
-		.duration = (pinned
-			? Data::Stories::kPinnedToastDuration
+		.duration = (inProfile
+			? Data::Stories::kInProfileToastDuration
 			: Ui::Toast::kDefaultDuration),
 	};
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index b8745d4ed..2b5de5bc7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -172,7 +172,7 @@ public:
 	void shareRequested();
 	void deleteRequested();
 	void reportRequested();
-	void togglePinnedRequested(bool pinned);
+	void toggleInProfileRequested(bool inProfile);
 
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
 	void tryProcessKeyInput(not_null<QKeyEvent*> e);
@@ -328,10 +328,10 @@ private:
 
 };
 
-[[nodiscard]] Ui::Toast::Config PrepareTogglePinnedToast(
+[[nodiscard]] Ui::Toast::Config PrepareToggleInProfileToast(
 	bool channel,
 	int count,
-	bool pinned);
+	bool inProfile);
 void ReportRequested(
 	std::shared_ptr<Main::SessionShow> show,
 	FullStoryId id,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index e21cd1fd9..c8f5ffe94 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -103,8 +103,8 @@ void View::reportRequested() {
 	_controller->reportRequested();
 }
 
-void View::togglePinnedRequested(bool pinned) {
-	_controller->togglePinnedRequested(pinned);
+void View::toggleInProfileRequested(bool inProfile) {
+	_controller->toggleInProfileRequested(inProfile);
 }
 
 bool View::ignoreWindowMove(QPoint position) const {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 46a6662e2..da71d80d1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -112,7 +112,7 @@ public:
 	void shareRequested();
 	void deleteRequested();
 	void reportRequested();
-	void togglePinnedRequested(bool pinned);
+	void toggleInProfileRequested(bool inProfile);
 
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
 	void tryProcessKeyInput(not_null<QKeyEvent*> e);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 229b37636..cfa414afe 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1498,17 +1498,17 @@ void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) {
 			&st::mediaMenuIconShowInChat);
 	}
 	if (story && story->peer()->isSelf()) {
-		const auto pinned = story->pinned();
-		const auto text = pinned
+		const auto inProfile = story->inProfile();
+		const auto text = inProfile
 			? tr::lng_mediaview_archive_story(tr::now)
 			: tr::lng_mediaview_save_to_profile(tr::now);
 		addAction(text, [=] {
 			if (_stories) {
-				_stories->togglePinnedRequested(!pinned);
+				_stories->toggleInProfileRequested(!inProfile);
 			}
-		}, pinned
+		}, (inProfile
 			? &st::mediaMenuIconArchiveStory
-			: &st::mediaMenuIconSaveStory);
+			: &st::mediaMenuIconSaveStory));
 	}
 	if ((!story || story->canDownloadChecked())
 		&& _document

From 4b98ab1246f02d203352a83fbd21f542f12c287e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 19:31:45 +0400
Subject: [PATCH 347/596] Fix build with simplified ads.

---
 Telegram/SourceFiles/data/components/sponsored_messages.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 7bab7af0e..e60c0a1d3 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -379,8 +379,8 @@ SponsoredMessages::Details SponsoredMessages::lookupDetails(
 	return {
 		.info = std::move(info),
 		.link = data.link,
-		.photoId = data.from.photoId,
 		.buttonText = data.from.buttonText,
+		.photoId = data.from.photoId,
 		.backgroundEmojiId = data.from.backgroundEmojiId,
 		.colorIndex = data.from.colorIndex,
 		.isLinkInternal = data.from.isLinkInternal,

From 468d8b04d638f2050913eb2e2c7c91953cc926fc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Apr 2024 19:32:33 +0400
Subject: [PATCH 348/596] Implement stories pin-to-top.

---
 Telegram/Resources/langs/lang.strings         |  11 ++
 Telegram/SourceFiles/data/data_stories.cpp    | 143 ++++++++++++++++++
 Telegram/SourceFiles/data/data_stories.h      |  13 ++
 .../SourceFiles/data/data_stories_ids.cpp     |  38 +++--
 Telegram/SourceFiles/data/data_stories_ids.h  |   2 +-
 Telegram/SourceFiles/data/data_story.cpp      |  12 +-
 Telegram/SourceFiles/data/data_story.h        |   4 +
 Telegram/SourceFiles/info/info.style          |  22 +++
 Telegram/SourceFiles/info/info_top_bar.cpp    |  46 +++++-
 Telegram/SourceFiles/info/info_top_bar.h      |   3 +
 Telegram/SourceFiles/info/info_wrap_widget.h  |   2 +
 .../info/media/info_media_common.h            |   1 +
 .../info/media/info_media_list_widget.cpp     | 100 ++++++++++--
 .../info/media/info_media_list_widget.h       |   5 +
 .../info/stories/info_stories_provider.cpp    |  42 ++++-
 .../stories/media_stories_controller.cpp      |  73 ++++++---
 .../media/stories/media_stories_controller.h  |   4 +
 17 files changed, 464 insertions(+), 57 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index c727d4c5e..4aa6eae95 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3424,6 +3424,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mediaview_forward" = "Forward";
 "lng_mediaview_delete" = "Delete";
 "lng_mediaview_save_to_profile" = "Save to Profile";
+"lng_mediaview_pin_story_done" = "Story pinned";
+"lng_mediaview_pin_story_about" = "Now it will be always shown on the top.";
+"lng_mediaview_pin_stories_done#one" = "{count} story pinned";
+"lng_mediaview_pin_stories_done#other" = "{count} stories pinned";
+"lng_mediaview_pin_stories_about#one" = "Now it will be always shown on the top.";
+"lng_mediaview_pin_stories_about#other" = "Now they will be always shown on the top.";
+"lng_mediaview_unpin_story_done" = "Story unpinned.";
+"lng_mediaview_unpin_stories_done#one" = "{count} story unpinned";
+"lng_mediaview_unpin_stories_done#other" = "{count} stories unpinned";
+"lng_mediaview_pin_limit#one" = "You can't pin more than {count} story.";
+"lng_mediaview_pin_limit#other" = "You can't pin more than {count} stories.";
 "lng_mediaview_archive_story" = "Archive Story";
 "lng_mediaview_photos_all" = "View all photos";
 "lng_mediaview_files_all" = "View all files";
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 391caba74..7806e1aa6 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "ui/layers/show.h"
 #include "ui/text/text_utilities.h"
@@ -77,6 +78,47 @@ using UpdateFlag = StoryUpdate::Flag;
 
 } // namespace
 
+int IndexRespectingPinned(const StoriesIds &ids, StoryId id) {
+	const auto i = ids.list.find(id);
+	if (ids.pinnedToTop.empty() || i == end(ids.list)) {
+		return int(i - begin(ids.list));
+	}
+	const auto j = ranges::find(ids.pinnedToTop, id);
+	if (j != end(ids.pinnedToTop)) {
+		return int(j - begin(ids.pinnedToTop));
+	}
+	auto result = int(i - begin(ids.list));
+	for (const auto &pinnedId : ids.pinnedToTop) {
+		if (pinnedId < id) {
+			++result;
+		}
+	}
+
+	Ensures(result < int(ids.list.size()));
+	return result;
+}
+
+StoryId IdRespectingPinned(const StoriesIds &ids, int index) {
+	Expects(index >= 0 && index < int(ids.list.size()));
+
+	if (ids.pinnedToTop.empty()) {
+		return *(begin(ids.list) + index);
+	} else if (index < int(ids.pinnedToTop.size())) {
+		return ids.pinnedToTop[index];
+	}
+	auto i = begin(ids.list) + index - int(ids.pinnedToTop.size());
+	auto sorted = ids.pinnedToTop;
+	ranges::sort(sorted, ranges::greater());
+	for (const auto &pinnedId : sorted) {
+		if (pinnedId >= *i) {
+			++i;
+		}
+	}
+
+	Ensures(i != end(ids.list));
+	return *i;
+}
+
 StoriesSourceInfo StoriesSource::info() const {
 	return {
 		.id = peer->id,
@@ -1674,6 +1716,10 @@ void Stories::savedLoadMore(PeerId peerId) {
 
 		const auto &data = result.data();
 		const auto now = base::unixtime::now();
+		auto pinnedToTopIds = data.vpinned_to_top().value_or_empty();
+		auto pinnedToTop = pinnedToTopIds
+			| ranges::views::transform(&MTPint::v)
+			| ranges::to_vector;
 		saved.total = data.vcount().v;
 		for (const auto &story : data.vstories().v) {
 			const auto id = story.match([&](const auto &id) {
@@ -1691,6 +1737,7 @@ void Stories::savedLoadMore(PeerId peerId) {
 		const auto ids = int(saved.ids.list.size());
 		saved.loaded = data.vstories().v.empty();
 		saved.total = saved.loaded ? ids : std::max(saved.total, ids);
+		setPinnedToTop(peerId, std::move(pinnedToTop));
 		_savedChanged.fire_copy(peerId);
 	}).fail([=] {
 		auto &saved = _saved[peerId];
@@ -1701,6 +1748,33 @@ void Stories::savedLoadMore(PeerId peerId) {
 	}).send();
 }
 
+void Stories::setPinnedToTop(
+		PeerId peerId,
+		std::vector<StoryId> &&pinnedToTop) {
+	const auto i = _saved.find(peerId);
+	if (i == end(_saved) && pinnedToTop.empty()) {
+		return;
+	}
+	auto &saved = (i == end(_saved)) ? _saved[peerId] : i->second;
+	if (saved.ids.pinnedToTop != pinnedToTop) {
+		for (const auto id : saved.ids.pinnedToTop) {
+			if (!ranges::contains(pinnedToTop, id)) {
+				if (const auto maybeStory = lookup({ peerId, id })) {
+					(*maybeStory)->setPinnedToTop(false);
+				}
+			}
+		}
+		for (const auto id : pinnedToTop) {
+			if (!ranges::contains(saved.ids.pinnedToTop, id)) {
+				if (const auto maybeStory = lookup({ peerId, id })) {
+					(*maybeStory)->setPinnedToTop(true);
+				}
+			}
+		}
+		saved.ids.pinnedToTop = std::move(pinnedToTop);
+	}
+}
+
 void Stories::deleteList(const std::vector<FullStoryId> &ids) {
 	if (ids.empty()) {
 		return;
@@ -1788,6 +1862,75 @@ void Stories::toggleInProfileList(
 	}).send();
 }
 
+bool Stories::canTogglePinnedList(
+		const std::vector<FullStoryId> &ids,
+		bool pin) const {
+	Expects(!ids.empty());
+
+	if (!pin) {
+		return true;
+	}
+
+	const auto peerId = ids.front().peer;
+	const auto i = _saved.find(peerId);
+	if (i == end(_saved)) {
+		return false;
+	}
+
+	auto &already = i->second.ids.pinnedToTop;
+	auto count = int(already.size());
+	for (const auto &id : ids) {
+		if (!ranges::contains(already, id.story)) {
+			++count;
+		}
+	}
+	return count <= maxPinnedCount();
+}
+
+int Stories::maxPinnedCount() const {
+	const auto appConfig = &_owner->session().appConfig();
+	return appConfig->get<int>(u"stories_pinned_to_top_count_max"_q, 3);
+}
+
+void Stories::togglePinnedList(
+		const std::vector<FullStoryId> &ids,
+		bool pin) {
+	if (ids.empty()) {
+		return;
+	}
+	const auto peerId = ids.front().peer;
+	auto &saved = _saved[peerId];
+	auto list = QVector<MTPint>();
+	list.reserve(maxPinnedCount());
+	for (const auto &id : saved.ids.pinnedToTop) {
+		if (pin || !ranges::contains(ids, FullStoryId{ peerId, id })) {
+			list.push_back(MTP_int(id));
+		}
+	}
+	if (pin) {
+		auto copy = ids;
+		ranges::sort(copy, ranges::greater());
+		for (const auto &id : copy) {
+			if (id.peer == peerId
+				&& !ranges::contains(saved.ids.pinnedToTop, id.story)) {
+				list.push_back(MTP_int(id.story));
+			}
+		}
+	}
+	const auto api = &_owner->session().api();
+	const auto peer = session().data().peer(peerId);
+	api->request(MTPstories_TogglePinnedToTop(
+		peer->input,
+		MTP_vector<MTPint>(list)
+	)).done([=] {
+		setPinnedToTop(peerId, list
+			| ranges::views::transform(&MTPint::v)
+			| ranges::to_vector);
+		_savedChanged.fire_copy(peerId);
+	}).send();
+
+}
+
 void Stories::report(
 		std::shared_ptr<Ui::Show> show,
 		FullStoryId id,
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 2508b3557..c5f340cc1 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -33,12 +33,17 @@ class StoryPreload;
 
 struct StoriesIds {
 	base::flat_set<StoryId, std::greater<>> list;
+	std::vector<StoryId> pinnedToTop;
 
 	friend inline bool operator==(
 		const StoriesIds&,
 		const StoriesIds&) = default;
 };
 
+// ids.list.size() if not found.
+[[nodiscard]] int IndexRespectingPinned(const StoriesIds &ids, StoryId id);
+[[nodiscard]] StoryId IdRespectingPinned(const StoriesIds &ids, int index);
+
 struct StoriesSourceInfo {
 	PeerId id = 0;
 	TimeId last = 0;
@@ -208,6 +213,11 @@ public:
 	void toggleInProfileList(
 		const std::vector<FullStoryId> &ids,
 		bool inProfile);
+	[[nodiscard]] bool canTogglePinnedList(
+		const std::vector<FullStoryId> &ids,
+		bool pin) const;
+	[[nodiscard]] int maxPinnedCount() const;
+	void togglePinnedList(const std::vector<FullStoryId> &ids, bool pin);
 	void report(
 		std::shared_ptr<Ui::Show> show,
 		FullStoryId id,
@@ -314,6 +324,9 @@ private:
 
 	void notifySourcesChanged(StorySourcesList list);
 	void pushHiddenCountsToFolder();
+	void setPinnedToTop(
+		PeerId peerId,
+		std::vector<StoryId> &&pinnedToTop);
 
 	[[nodiscard]] int pollingInterval(
 		const PollingSettings &settings) const;
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index f8921fe8b..fbff87e09 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -40,18 +40,23 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 
 			const auto &saved = stories->saved(peerId);
 			const auto count = stories->savedCount(peerId);
-			const auto around = saved.list.lower_bound(aroundId);
-			const auto hasBefore = int(around - begin(saved.list));
-			const auto hasAfter = int(end(saved.list) - around);
+			auto aroundIndex = IndexRespectingPinned(saved, aroundId);
+			if (aroundIndex == int(saved.list.size())) {
+				const auto around = saved.list.lower_bound(aroundId);
+				aroundIndex = int(around - begin(saved.list));
+			}
+			const auto hasBefore = aroundIndex;
+			const auto hasAfter = int(saved.list.size()) - aroundIndex;
 			if (hasAfter < limit) {
 				stories->savedLoadMore(peerId);
 			}
 			const auto takeBefore = std::min(hasBefore, limit);
 			const auto takeAfter = std::min(hasAfter, limit);
-			auto ids = base::flat_set<StoryId>{
-				std::make_reverse_iterator(around + takeAfter),
-				std::make_reverse_iterator(around - takeBefore)
-			};
+			auto ids = std::vector<StoryId>();
+			ids.reserve(takeBefore + takeAfter);
+			for (auto i = aroundIndex - takeBefore; i != aroundIndex + takeAfter; ++i) {
+				ids.push_back(IdRespectingPinned(saved, i));
+			}
 			const auto added = int(ids.size());
 			state->slice = StoriesIdsSlice(
 				std::move(ids),
@@ -114,18 +119,23 @@ rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
 
 			const auto &archive = stories->archive(peerId);
 			const auto count = stories->archiveCount(peerId);
-			const auto i = archive.list.lower_bound(aroundId);
-			const auto hasBefore = int(i - begin(archive.list));
-			const auto hasAfter = int(end(archive.list) - i);
+			auto aroundIndex = IndexRespectingPinned(archive, aroundId);
+			if (aroundIndex == int(archive.list.size())) {
+				const auto around = archive.list.lower_bound(aroundId);
+				aroundIndex = int(around - begin(archive.list));
+			}
+			const auto hasBefore = aroundIndex;
+			const auto hasAfter = int(archive.list.size()) - aroundIndex;
 			if (hasAfter < limit) {
 				stories->archiveLoadMore(peerId);
 			}
 			const auto takeBefore = std::min(hasBefore, limit);
 			const auto takeAfter = std::min(hasAfter, limit);
-			auto ids = base::flat_set<StoryId>{
-				std::make_reverse_iterator(i + takeAfter),
-				std::make_reverse_iterator(i - takeBefore)
-			};
+			auto ids = std::vector<StoryId>();
+			ids.reserve(takeBefore + takeAfter);
+			for (auto i = aroundIndex - takeBefore; i != aroundIndex + takeAfter; ++i) {
+				ids.push_back(IdRespectingPinned(archive, i));
+			}
 			const auto added = int(ids.size());
 			state->slice = StoriesIdsSlice(
 				std::move(ids),
diff --git a/Telegram/SourceFiles/data/data_stories_ids.h b/Telegram/SourceFiles/data/data_stories_ids.h
index 6c95c16a9..88a5103b3 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.h
+++ b/Telegram/SourceFiles/data/data_stories_ids.h
@@ -17,7 +17,7 @@ class Session;
 
 namespace Data {
 
-using StoriesIdsSlice = AbstractSparseIds<base::flat_set<StoryId>>;
+using StoriesIdsSlice = AbstractSparseIds<std::vector<StoryId>>;
 
 [[nodiscard]] rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 	not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 6a525a7a6..d191d2360 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -389,6 +389,14 @@ TextWithEntities Story::inReplyText() const {
 			Ui::Text::WithEntities);
 }
 
+void Story::setPinnedToTop(bool pinned) {
+	_pinnedToTop = pinned;
+}
+
+bool Story::pinnedToTop() const {
+	return _pinnedToTop;
+}
+
 void Story::setInProfile(bool value) {
 	_inProfile = value;
 }
@@ -431,8 +439,8 @@ bool Story::canDownloadChecked() const {
 }
 
 bool Story::canShare() const {
-	return _privacyPublic 
-		&& !forbidsForward() 
+	return _privacyPublic
+		&& !forbidsForward()
 		&& (inProfile() || !expired());
 }
 
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index f4fd17d60..512f0ed38 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -153,6 +153,9 @@ public:
 	[[nodiscard]] Image *replyPreview() const;
 	[[nodiscard]] TextWithEntities inReplyText() const;
 
+	void setPinnedToTop(bool pinned);
+	bool pinnedToTop() const;
+
 	void setInProfile(bool value);
 	[[nodiscard]] bool inProfile() const;
 	[[nodiscard]] StoryPrivacy privacy() const;
@@ -251,6 +254,7 @@ private:
 	TimeId _lastUpdateTime = 0;
 	bool _out : 1 = false;
 	bool _inProfile : 1 = false;
+	bool _pinnedToTop : 1 = false;
 	bool _privacyPublic : 1 = false;
 	bool _privacyCloseFriends : 1 = false;
 	bool _privacyContacts : 1 = false;
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index cf6f410cd..27e3750b4 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -44,6 +44,8 @@ InfoTopBar {
 	mediaDelete: IconButton;
 	storiesSave: IconButton;
 	storiesArchive: IconButton;
+	storiesPin: IconButton;
+	storiesUnpin: IconButton;
 	search: IconButton;
 	searchRow: SearchFieldRow;
 	highlightBg: color;
@@ -185,6 +187,14 @@ infoTopBarArchiveStories: IconButton(infoTopBarForward) {
 	icon: icon {{ "info/info_stories_to_archive", boxTitleCloseFg }};
 	iconOver: icon {{ "info/info_stories_to_archive", boxTitleCloseFgOver }};
 }
+infoTopBarPinStories: IconButton(infoTopBarForward) {
+	icon: icon {{ "menu/pin", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/pin", boxTitleCloseFgOver }};
+}
+infoTopBarUnpinStories: IconButton(infoTopBarForward) {
+	icon: icon {{ "menu/unpin", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/unpin", boxTitleCloseFgOver }};
+}
 infoTopBar: InfoTopBar {
 	height: infoTopBarHeight;
 	back: infoTopBarBack;
@@ -205,6 +215,8 @@ infoTopBar: InfoTopBar {
 	mediaDelete: infoTopBarDelete;
 	storiesSave: infoTopBarSaveStories;
 	storiesArchive: infoTopBarArchiveStories;
+	storiesPin: infoTopBarPinStories;
+	storiesUnpin: infoTopBarUnpinStories;
 	search: infoTopBarSearch;
 	searchRow: infoTopBarSearchRow;
 	highlightBg: windowBgOver;
@@ -268,6 +280,14 @@ infoLayerTopBarArchiveStories: IconButton(infoLayerTopBarForward) {
 	icon: icon {{ "info/info_stories_to_archive", boxTitleCloseFg }};
 	iconOver: icon {{ "info/info_stories_to_archive", boxTitleCloseFgOver }};
 }
+infoLayerTopBarPinStories: IconButton(infoLayerTopBarForward) {
+	icon: icon {{ "menu/pin", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/pin", boxTitleCloseFgOver }};
+}
+infoLayerTopBarUnpinStories: IconButton(infoLayerTopBarForward) {
+	icon: icon {{ "menu/unpin", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/unpin", boxTitleCloseFgOver }};
+}
 infoLayerTopBar: InfoTopBar(infoTopBar) {
 	height: infoLayerTopBarHeight;
 	back: infoLayerTopBarBack;
@@ -282,6 +302,8 @@ infoLayerTopBar: InfoTopBar(infoTopBar) {
 	mediaDelete: infoLayerTopBarDelete;
 	storiesSave: infoLayerTopBarSaveStories;
 	storiesArchive: infoLayerTopBarArchiveStories;
+	storiesPin: infoLayerTopBarPinStories;
+	storiesUnpin: infoLayerTopBarUnpinStories;
 	search: infoTopBarSearch;
 	searchRow: infoTopBarSearchRow;
 	radius: boxRadius;
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 2caa1ffa8..0a59d52f2 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -393,6 +393,8 @@ void TopBar::updateSelectionControlsGeometry(int newWidth) {
 		right += _delete->width();
 	}
 	if (_canToggleStoryPin) {
+		_toggleStoryInProfile->moveToRight(right, 0, newWidth);
+		right += _toggleStoryInProfile->width();
 		_toggleStoryPin->moveToRight(right, 0, newWidth);
 		right += _toggleStoryPin->width();
 	}
@@ -609,14 +611,23 @@ rpl::producer<SelectionAction> TopBar::selectionActionRequests() const {
 }
 
 void TopBar::updateSelectionState() {
-	Expects(_selectionText && _delete && _forward && _toggleStoryPin);
+	Expects(_selectionText
+		&& _delete
+		&& _forward
+		&& _toggleStoryInProfile
+		&& _toggleStoryPin);
 
 	_canDelete = computeCanDelete();
 	_canForward = computeCanForward();
+	_canUnpinStories = computeCanUnpinStories();
 	_selectionText->entity()->setValue(generateSelectedText());
 	_delete->toggle(_canDelete, anim::type::instant);
 	_forward->toggle(_canForward, anim::type::instant);
+	_toggleStoryInProfile->toggle(_canToggleStoryPin, anim::type::instant);
 	_toggleStoryPin->toggle(_canToggleStoryPin, anim::type::instant);
+	_toggleStoryPin->entity()->setIconOverride(
+		_canUnpinStories ? &_st.storiesUnpin.icon : nullptr,
+		_canUnpinStories ? &_st.storiesUnpin.iconOver : nullptr);
 
 	updateSelectionControlsGeometry(width());
 }
@@ -631,6 +642,7 @@ void TopBar::createSelectionControls() {
 	};
 	_canDelete = computeCanDelete();
 	_canForward = computeCanForward();
+	_canUnpinStories = computeCanUnpinStories();
 	_canToggleStoryPin = computeCanToggleStoryPin();
 	_cancelSelection = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
 		this,
@@ -668,6 +680,7 @@ void TopBar::createSelectionControls() {
 		_selectionActionRequests,
 		_cancelSelection->lifetime());
 	_forward->entity()->setVisible(_canForward);
+
 	_delete = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
 		this,
 		object_ptr<Ui::IconButton>(this, _st.mediaDelete),
@@ -683,13 +696,38 @@ void TopBar::createSelectionControls() {
 		_selectionActionRequests,
 		_cancelSelection->lifetime());
 	_delete->entity()->setVisible(_canDelete);
-	const auto archive = _toggleStoryPin = wrap(
+
+	_toggleStoryInProfile = wrap(
 		Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
 			this,
 			object_ptr<Ui::IconButton>(
 				this,
 				_storiesArchive ? _st.storiesSave : _st.storiesArchive),
 			st::infoTopBarScale));
+	registerToggleControlCallback(
+		_toggleStoryInProfile.data(),
+		[this] { return selectionMode() && _canToggleStoryPin; });
+	_toggleStoryInProfile->setDuration(st::infoTopBarDuration);
+	_toggleStoryInProfile->entity()->clicks(
+	) | rpl::map_to(
+		SelectionAction::ToggleStoryInProfile
+	) | rpl::start_to_stream(
+		_selectionActionRequests,
+		_cancelSelection->lifetime());
+	_toggleStoryInProfile->entity()->setVisible(_canToggleStoryPin);
+
+	_toggleStoryPin = wrap(
+		Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
+			this,
+			object_ptr<Ui::IconButton>(
+				this,
+				_st.storiesPin),
+			st::infoTopBarScale));
+	if (_canUnpinStories) {
+		_toggleStoryPin->entity()->setIconOverride(
+			_canUnpinStories ? &_st.storiesUnpin.icon : nullptr,
+			_canUnpinStories ? &_st.storiesUnpin.iconOver : nullptr);
+	}
 	registerToggleControlCallback(
 		_toggleStoryPin.data(),
 		[this] { return selectionMode() && _canToggleStoryPin; });
@@ -713,6 +751,10 @@ bool TopBar::computeCanForward() const {
 	return ranges::all_of(_selectedItems.list, &SelectedItem::canForward);
 }
 
+bool TopBar::computeCanUnpinStories() const {
+	return ranges::any_of(_selectedItems.list, &SelectedItem::canUnpinStory);
+}
+
 bool TopBar::computeCanToggleStoryPin() const {
 	return ranges::all_of(
 		_selectedItems.list,
diff --git a/Telegram/SourceFiles/info/info_top_bar.h b/Telegram/SourceFiles/info/info_top_bar.h
index 9e6ad80a8..2aa1093de 100644
--- a/Telegram/SourceFiles/info/info_top_bar.h
+++ b/Telegram/SourceFiles/info/info_top_bar.h
@@ -127,6 +127,7 @@ private:
 	[[nodiscard]] Ui::StringWithNumbers generateSelectedText() const;
 	[[nodiscard]] bool computeCanDelete() const;
 	[[nodiscard]] bool computeCanForward() const;
+	[[nodiscard]] bool computeCanUnpinStories() const;
 	[[nodiscard]] bool computeCanToggleStoryPin() const;
 	void updateSelectionState();
 	void createSelectionControls();
@@ -174,11 +175,13 @@ private:
 	bool _canDelete = false;
 	bool _canForward = false;
 	bool _canToggleStoryPin = false;
+	bool _canUnpinStories = false;
 	bool _storiesArchive = false;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _cancelSelection;
 	QPointer<Ui::FadeWrap<Ui::LabelWithNumbers>> _selectionText;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _forward;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _delete;
+	QPointer<Ui::FadeWrap<Ui::IconButton>> _toggleStoryInProfile;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _toggleStoryPin;
 	rpl::event_stream<SelectionAction> _selectionActionRequests;
 
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h
index db76d4b43..5feb502f7 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.h
+++ b/Telegram/SourceFiles/info/info_wrap_widget.h
@@ -59,6 +59,7 @@ struct SelectedItem {
 	bool canDelete = false;
 	bool canForward = false;
 	bool canToggleStoryPin = false;
+	bool canUnpinStory = false;
 };
 
 struct SelectedItems {
@@ -74,6 +75,7 @@ enum class SelectionAction {
 	Forward,
 	Delete,
 	ToggleStoryPin,
+	ToggleStoryInProfile,
 };
 
 class WrapWidget final : public Window::SectionWidget {
diff --git a/Telegram/SourceFiles/info/media/info_media_common.h b/Telegram/SourceFiles/info/media/info_media_common.h
index 27e8d4b9f..e25c860d8 100644
--- a/Telegram/SourceFiles/info/media/info_media_common.h
+++ b/Telegram/SourceFiles/info/media/info_media_common.h
@@ -31,6 +31,7 @@ struct ListItemSelectionData {
 	bool canDelete = false;
 	bool canForward = false;
 	bool canToggleStoryPin = false;
+	bool canUnpinStory = false;
 
 	friend inline bool operator==(
 		ListItemSelectionData,
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index be09febef..8e9006629 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -261,6 +261,9 @@ void ListWidget::selectionAction(SelectionAction action) {
 	case SelectionAction::Clear: clearSelected(); return;
 	case SelectionAction::Forward: forwardSelected(); return;
 	case SelectionAction::Delete: deleteSelected(); return;
+	case SelectionAction::ToggleStoryInProfile:
+		toggleStoryInProfileSelected();
+		return;
 	case SelectionAction::ToggleStoryPin: toggleStoryPinSelected(); return;
 	}
 }
@@ -340,6 +343,7 @@ auto ListWidget::collectSelectedItems() const -> SelectedItems {
 		result.canDelete = selection.canDelete;
 		result.canForward = selection.canForward;
 		result.canToggleStoryPin = selection.canToggleStoryPin;
+		result.canUnpinStory = selection.canUnpinStory;
 		return result;
 	};
 	auto transformation = [&](const auto &item) {
@@ -908,21 +912,26 @@ void ListWidget::showContextMenu(
 		}
 	}
 
-	auto canDeleteAll = [&] {
+	const auto canDeleteAll = [&] {
 		return ranges::none_of(_selected, [](auto &&item) {
 			return !item.second.canDelete;
 		});
 	};
-	auto canForwardAll = [&] {
+	const auto canForwardAll = [&] {
 		return ranges::none_of(_selected, [](auto &&item) {
 			return !item.second.canForward;
 		}) && (!_controller->key().storiesPeer() || _selected.size() == 1);
 	};
-	auto canToggleStoryPinAll = [&] {
+	const auto canToggleStoryPinAll = [&] {
 		return ranges::none_of(_selected, [](auto &&item) {
 			return !item.second.canToggleStoryPin;
 		});
 	};
+	const auto canUnpinStoryAll = [&] {
+		return ranges::any_of(_selected, [](auto &&item) {
+			return item.second.canUnpinStory;
+		});
+	};
 
 	auto link = ClickHandler::getActive();
 
@@ -1024,15 +1033,26 @@ void ListWidget::showContextMenu(
 	if (overSelected == SelectionState::OverSelectedItems) {
 		if (canToggleStoryPinAll()) {
 			const auto tab = _controller->key().storiesTab();
-			const auto pin = (tab == Stories::Tab::Archive);
+			const auto toProfile = (tab == Stories::Tab::Archive);
 			_contextMenu->addAction(
-				(pin
+				(toProfile
 					? tr::lng_mediaview_save_to_profile
 					: tr::lng_archived_add)(tr::now),
-				crl::guard(this, [this] { toggleStoryPinSelected(); }),
-				(pin
+				crl::guard(this, [this] { toggleStoryInProfileSelected(); }),
+				(toProfile
 					? &st::menuIconStoriesSave
 					: &st::menuIconStoriesArchive));
+			if (!toProfile) {
+				const auto unpin = canUnpinStoryAll();
+				_contextMenu->addAction(
+					(unpin
+						? tr::lng_context_unpin_from_top
+						: tr::lng_context_pin_to_top)(tr::now),
+					crl::guard(
+						this,
+						[this] { toggleStoryPinSelected(); }),
+					(unpin ? &st::menuIconUnpin : &st::menuIconPin));
+			}
 		}
 		if (canForwardAll()) {
 			_contextMenu->addAction(
@@ -1065,17 +1085,28 @@ void ListWidget::showContextMenu(
 				FullSelection);
 			if (selectionData.canToggleStoryPin) {
 				const auto tab = _controller->key().storiesTab();
-				const auto pin = (tab == Stories::Tab::Archive);
+				const auto toProfile = (tab == Stories::Tab::Archive);
 				_contextMenu->addAction(
-					(pin
+					(toProfile
 						? tr::lng_mediaview_save_to_profile
 						: tr::lng_mediaview_archive_story)(tr::now),
 					crl::guard(this, [=] {
-						toggleStoryPin({ 1, globalId.itemId });
+						toggleStoryInProfile({ 1, globalId.itemId });
 					}),
-					(pin
+					(toProfile
 						? &st::menuIconStoriesSave
 						: &st::menuIconStoriesArchive));
+				if (!toProfile) {
+					const auto unpin = selectionData.canUnpinStory;
+					_contextMenu->addAction(
+						(unpin
+							? tr::lng_context_unpin_from_top
+							: tr::lng_context_pin_to_top)(tr::now),
+						crl::guard(this, [=] { toggleStoryPin(
+							{ 1, globalId.itemId },
+							!unpin); }),
+						(unpin ? &st::menuIconUnpin : &st::menuIconPin));
+				}
 			}
 			if (selectionData.canForward) {
 				_contextMenu->addAction(
@@ -1193,13 +1224,23 @@ void ListWidget::deleteSelected() {
 	}));
 }
 
-void ListWidget::toggleStoryPinSelected() {
-	toggleStoryPin(collectSelectedIds(), crl::guard(this, [=] {
+void ListWidget::toggleStoryInProfileSelected() {
+	toggleStoryInProfile(collectSelectedIds(), crl::guard(this, [=] {
 		clearSelected();
 	}));
 }
 
-void ListWidget::toggleStoryPin(
+void ListWidget::toggleStoryPinSelected() {
+	const auto items = collectSelectedItems();
+	const auto pin = ranges::none_of(
+		items.list,
+		&SelectedItem::canUnpinStory);
+	toggleStoryPin(collectSelectedIds(items), pin, crl::guard(this, [=] {
+		clearSelected();
+	}));
+}
+
+void ListWidget::toggleStoryInProfile(
 		MessageIdsList &&items,
 		Fn<void()> confirmed) {
 	auto list = std::vector<FullStoryId>();
@@ -1250,6 +1291,37 @@ void ListWidget::toggleStoryPin(
 	}));
 }
 
+void ListWidget::toggleStoryPin(
+		MessageIdsList &&items,
+		bool pin,
+		Fn<void()> confirmed) {
+	auto list = std::vector<FullStoryId>();
+	for (const auto &id : items) {
+		if (IsStoryMsgId(id.msg)) {
+			list.push_back({ id.peer, StoryIdFromMsgId(id.msg) });
+		}
+	}
+	if (list.empty()) {
+		return;
+	}
+	const auto channel = peerIsChannel(list.front().peer);
+	const auto count = int(list.size());
+	const auto controller = _controller;
+	const auto stories = &controller->session().data().stories();
+	if (stories->canTogglePinnedList(list, pin)) {
+		using namespace ::Media::Stories;
+		stories->togglePinnedList(list, pin);
+		controller->showToast(PrepareTogglePinToast(channel, count, pin));
+		if (confirmed) {
+			confirmed();
+		}
+	} else {
+		const auto limit = stories->maxPinnedCount();
+		controller->showToast(
+			tr::lng_mediaview_pin_limit(tr::now, lt_count, limit));
+	}
+}
+
 void ListWidget::deleteItem(GlobalMsgId globalId) {
 	if (const auto item = MessageByGlobalId(globalId)) {
 		auto items = SelectedItems(_provider->type());
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index 10984f27e..5b486c1de 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -190,10 +190,15 @@ private:
 	void forwardItems(MessageIdsList &&items);
 	void deleteSelected();
 	void toggleStoryPinSelected();
+	void toggleStoryInProfileSelected();
 	void deleteItem(GlobalMsgId globalId);
 	void deleteItems(SelectedItems &&items, Fn<void()> confirmed = nullptr);
+	void toggleStoryInProfile(
+		MessageIdsList &&items,
+		Fn<void()> confirmed = nullptr);
 	void toggleStoryPin(
 		MessageIdsList &&items,
+		bool pin,
 		Fn<void()> confirmed = nullptr);
 	void applyItemSelection(
 		HistoryItem *item,
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index ba82c297f..c3025bf85 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -189,9 +189,22 @@ void Provider::refreshViewer() {
 			return;
 		}
 		_slice = std::move(slice);
-		if (const auto nearest = _slice.nearest(idForViewer)) {
-			_aroundId = *nearest;
+
+		auto nearestId = std::optional<StoryId>();
+		for (auto i = 0; i != _slice.size(); ++i) {
+			if (!nearestId
+				|| std::abs(*nearestId - idForViewer)
+					> std::abs(_slice[i] - idForViewer)) {
+				nearestId = _slice[i];
+			}
 		}
+		if (nearestId) {
+			_aroundId = *nearestId;
+		}
+
+		//if (const auto nearest = _slice.nearest(idForViewer)) {
+		//	_aroundId = *nearest;
+		//}
 		_refreshed.fire({});
 	}, _viewerLifetime);
 }
@@ -208,8 +221,8 @@ std::vector<ListSection> Provider::fillSections(
 	auto result = std::vector<ListSection>();
 	auto section = ListSection(Type::PhotoVideo, sectionDelegate());
 	auto count = _slice.size();
-	for (auto i = count; i != 0;) {
-		const auto storyId = _slice[--i];
+	for (auto i = 0; i != count; ++i) {
+		const auto storyId = _slice[i];
 		if (const auto layout = getLayout(storyId, delegate)) {
 			if (!section.addItem(layout)) {
 				section.finishSection();
@@ -361,6 +374,7 @@ ListItemSelectionData Provider::computeSelectionData(
 		const auto story = *maybeStory;
 		result.canForward = peer->isSelf() && story->canShare();
 		result.canDelete = story->canDelete();
+		result.canUnpinStory = story->pinnedToTop();
 	}
 	result.canToggleStoryPin = peer->isSelf()
 		|| (channel && channel->canEditStories());
@@ -417,12 +431,28 @@ int64 Provider::scrollTopStatePosition(not_null<HistoryItem*> item) {
 HistoryItem *Provider::scrollTopStateItem(ListScrollTopState state) {
 	if (state.item && _slice.indexOf(StoryIdFromMsgId(state.item->id))) {
 		return state.item;
-	} else if (const auto id = _slice.nearest(state.position)) {
-		const auto full = FullMsgId(_peer->id, StoryIdToMsgId(*id));
+	//} else if (const auto id = _slice.nearest(state.position)) {
+	//	const auto full = FullMsgId(_peer->id, StoryIdToMsgId(*id));
+	//	if (const auto item = _controller->session().data().message(full)) {
+	//		return item;
+	//	}
+	}
+
+	auto nearestId = std::optional<StoryId>();
+	for (auto i = 0; i != _slice.size(); ++i) {
+		if (!nearestId
+			|| std::abs(*nearestId - state.position)
+				> std::abs(_slice[i] - state.position)) {
+			nearestId = _slice[i];
+		}
+	}
+	if (nearestId) {
+		const auto full = FullMsgId(_peer->id, StoryIdToMsgId(*nearestId));
 		if (const auto item = _controller->session().data().message(full)) {
 			return item;
 		}
 	}
+
 	return state.item;
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 10490e2aa..2b06956bd 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -80,13 +80,18 @@ struct SameDayRange {
 		int index) {
 	Expects(index >= 0 && index < ids.list.size());
 
+	const auto pinned = int(ids.pinnedToTop.size());
+	if (index < pinned) {
+		return SameDayRange{ .from = 0, .till = pinned - 1 };
+	}
+
 	auto result = SameDayRange{ .from = index, .till = index };
 	const auto peerId = story->peer()->id;
 	const auto stories = &story->owner().stories();
 	const auto now = base::unixtime::parse(story->date());
-	const auto b = begin(ids.list);
-	for (auto i = b + index; i != b;) {
-		if (const auto maybeStory = stories->lookup({ peerId, *--i })) {
+	for (auto i = index; i != 0;) {
+		const auto storyId = IdRespectingPinned(ids, --i);
+		if (const auto maybeStory = stories->lookup({ peerId, storyId })) {
 			const auto day = base::unixtime::parse((*maybeStory)->date());
 			if (day.date() != now.date()) {
 				break;
@@ -94,8 +99,9 @@ struct SameDayRange {
 		}
 		--result.from;
 	}
-	for (auto i = b + index + 1, e = end(ids.list); i != e; ++i) {
-		if (const auto maybeStory = stories->lookup({ peerId, *i })) {
+	for (auto i = index + 1, c = int(ids.list.size()); i != c; ++i) {
+		const auto storyId = IdRespectingPinned(ids, i);
+		if (const auto maybeStory = stories->lookup({ peerId, storyId })) {
 			const auto day = base::unixtime::parse((*maybeStory)->date());
 			if (day.date() != now.date()) {
 				break;
@@ -694,17 +700,16 @@ void Controller::rebuildFromContext(
 	}, [&](StoriesContextSaved) {
 		if (stories.savedCountKnown(peerId)) {
 			const auto &saved = stories.saved(peerId);
-			const auto &ids = saved.list;
-			const auto i = ids.find(id);
-			if (i != end(ids)) {
+			const auto i = IndexRespectingPinned(saved, id);
+			if (i < saved.list.size()) {
 				list = StoriesList{
 					.peer = peer,
 					.ids = saved,
 					.total = stories.savedCount(peerId),
 				};
-				_index = int(i - begin(ids));
-				if (ids.size() < list->total
-					&& (end(ids) - i) < kPreloadStoriesCount) {
+				_index = i;
+				if (saved.list.size() < list->total
+					&& (saved.list.size() - i) < kPreloadStoriesCount) {
 					stories.savedLoadMore(peerId);
 				}
 			}
@@ -713,17 +718,16 @@ void Controller::rebuildFromContext(
 	}, [&](StoriesContextArchive) {
 		if (stories.archiveCountKnown(peerId)) {
 			const auto &archive = stories.archive(peerId);
-			const auto &ids = archive.list;
-			const auto i = ids.find(id);
-			if (i != end(ids)) {
+			const auto i = IndexRespectingPinned(archive, id);
+			if (i < archive.list.size()) {
 				list = StoriesList{
 					.peer = peer,
 					.ids = archive,
 					.total = stories.archiveCount(peerId),
 				};
-				_index = int(i - begin(ids));
-				if (ids.size() < list->total
-					&& (end(ids) - i) < kPreloadStoriesCount) {
+				_index = i;
+				if (archive.list.size() < list->total
+					&& (archive.list.size() - i) < kPreloadStoriesCount) {
 					stories.archiveLoadMore(peerId);
 				}
 			}
@@ -1520,7 +1524,7 @@ StoryId Controller::shownId(int index) const {
 	return _source
 		? (_source->ids.begin() + index)->id
 		: (index < int(_list->ids.list.size()))
-		? *(_list->ids.list.begin() + index)
+		? IdRespectingPinned(_list->ids, index)
 		: StoryId();
 }
 
@@ -1801,6 +1805,39 @@ Ui::Toast::Config PrepareToggleInProfileToast(
 	};
 }
 
+Ui::Toast::Config PrepareTogglePinToast(
+		bool channel,
+		int count,
+		bool pin) {
+	return {
+		.title = (pin
+			? (count == 1
+				? tr::lng_mediaview_pin_story_done(tr::now)
+				: tr::lng_mediaview_pin_stories_done(
+					tr::now,
+					lt_count,
+					count))
+			: QString()),
+		.text = (pin
+			? (count == 1
+				? tr::lng_mediaview_pin_story_about(tr::now)
+				: tr::lng_mediaview_pin_stories_about(
+					tr::now,
+					lt_count,
+					count))
+			: (count == 1
+				? tr::lng_mediaview_unpin_story_done(tr::now)
+				: tr::lng_mediaview_unpin_stories_done(
+					tr::now,
+					lt_count,
+					count))),
+		.st = &st::storiesActionToast,
+		.duration = (pin
+			? Data::Stories::kInProfileToastDuration
+			: Ui::Toast::kDefaultDuration),
+	};
+}
+
 void ReportRequested(
 		std::shared_ptr<Main::SessionShow> show,
 		FullStoryId id,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 2b5de5bc7..45590e0a2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -332,6 +332,10 @@ private:
 	bool channel,
 	int count,
 	bool inProfile);
+[[nodiscard]] Ui::Toast::Config PrepareTogglePinToast(
+	bool channel,
+	int count,
+	bool pin);
 void ReportRequested(
 	std::shared_ptr<Main::SessionShow> show,
 	FullStoryId id,

From 9036e9e8e366b21f0fc48f41e064264f951f2583 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 Apr 2024 15:09:11 +0400
Subject: [PATCH 349/596] Show pinned icon in stories.

---
 .../icons/dialogs/dialogs_pinned_shadow.png    | Bin 0 -> 754 bytes
 .../icons/dialogs/dialogs_pinned_shadow@2x.png | Bin 0 -> 1608 bytes
 .../icons/dialogs/dialogs_pinned_shadow@3x.png | Bin 0 -> 2270 bytes
 Telegram/SourceFiles/data/data_story.cpp       |   7 ++++++-
 Telegram/SourceFiles/history/history_item.cpp  |  13 +++++++++++++
 .../info/stories/info_stories_provider.cpp     |   5 ++++-
 Telegram/SourceFiles/overview/overview.style   |   9 +++++++++
 .../SourceFiles/overview/overview_layout.cpp   |  17 +++++++++++++++++
 .../SourceFiles/overview/overview_layout.h     |   3 +++
 9 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 Telegram/Resources/icons/dialogs/dialogs_pinned_shadow.png
 create mode 100644 Telegram/Resources/icons/dialogs/dialogs_pinned_shadow@2x.png
 create mode 100644 Telegram/Resources/icons/dialogs/dialogs_pinned_shadow@3x.png

diff --git a/Telegram/Resources/icons/dialogs/dialogs_pinned_shadow.png b/Telegram/Resources/icons/dialogs/dialogs_pinned_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..19f8e0b158d6312eae7f165313329d23b4648e2a
GIT binary patch
literal 754
zcmV<O0uB9%P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkQq)9|UR5*>Llx=USN)&~kfpJj4hNecTHKs|^|NooX*s2r@zVI&0
z{ctXGw8xvA<nDwI4DhgK&stjmn!hL^1VRXNueC<&KR=a!1G6j(%d)U-8zF>&wQWn+
zbywj31omorkmEQwj>BLuKx<81*OX;R(=-Nr6WDL9S0$xnG#YVtcSjHec%DbsbsUdJ
zzQ4aY91fIaX;jOfFx$4VZ5yQ&N-12|B?tn-Fl0WT69fV0^O-1$czb&TpzAtw$xE1&
z5~UQL=P@3SjjGvf#&Wr2xm<F8e@|W4yuZIAgrF!2v-K-rzdhggnNFw7=X1g^WHy@-
zh9Qf^g2%^4JkKM`GK3Jsam>fZ2XP!@S=KL6mwg)y28_pJ!Z76Z^_7>G7oMJ;m`<lm
zCKJZvvFWelI7lfC=#NwGUzAefx-Jh74=ff7o}ZtYOeXlgk8RszSw^1cq-n~2zbDUg
znx-+<v3g+dtGceK>zcN0%?Z1%i&6@$HCdJsMG>pjiqFqa(ln*2D&t4l!!ChEQIO|3
zd7e|2B~?`+grKS_k|bfhUb9-Q*lxER4hO2LqHWvXz`lo<@oJie)9J)+w*$a+UFy0f
zj$^jlEni<>?Du<$qA;+l9$J>gU@%}f9HNw>>pGGoK?uQax5M{+wAO4k8=@#8NfPor
z=X^e2#m^}04@4=2Wm#ldX8NR*!uNfYQlx3hdc9`9-&2<5mAaeJYulF7>BMHUF_{%Y
z;JPlO(TJ+546v^2+rvR?P1kj%ZvaV>&@_$7>2Ns2aU9yV<#;@DJRVItF3SMhwxy~n
z0Lroi;CwzCk4Y(!Qlhn{X&Pg#pEFVL?||+5XxlcH^~;`p;I-D~`Q`dgbyq;MaABSP
k?>+FcZcXc(!2etS08ZD&)hKNhRsaA107*qoM6N<$f)O@jWdHyG

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/dialogs/dialogs_pinned_shadow@2x.png b/Telegram/Resources/icons/dialogs/dialogs_pinned_shadow@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac695b71d3dc4ce95e688e0854fcd44d68b8a600
GIT binary patch
literal 1608
zcmV-O2DkZ%P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000XU
z000XU0RWnu7ytkT`bk7VR9J=WnAvXI$QDHx=ULQjCypH_|Nl>c48#s)NfgDIqR4(|
zRDpKej*@iW<lz=T@I_=T?KA9CRDhm8c&Wb|;Ct(j2h{(|mn(|$<lguFllwXAKLJz}
z1w~O%RaM^mzNhbdx~`M=-vX#83Yw;&X&Sn&qwBf^Je^LQPAA&7<#akp*#8NjP)*Y`
z48y>-ZFw1nLErZ@O+#6hlx0cNG!pbJ$bSV;!0Eb<X_~mMOBjZX$74pL5te1qbsa@f
zkR%EF{hl;UDa#VzO~{`H92S78s%V;qX_|PR$8<X7;^KnK%S#rE1+MFII-NKi4y@N}
z9v&Xhbsa@fD2n1u$g=^5K*Q@LxcBehb8~aU&CLy$mzQ{+N7r@4am?4RU$Jc)P168m
z@rWG#DL_$;nx;LeOi>7iVc>Zl<MEiw%S&!=Z~6TBGao;GWVu{Q!2N!Y@B0{rAysSJ
zmbPtQt?oAgpC|tC5@4oj;y4ar7&4#F`S9TbpFVx!_V$*mt1Bjx3ASz1_dP)nV45b1
zqHsJOsj7;yEUBtW7L1}OPeT1&z+vKho`>goxUP$B+gO%`<2X{i#bUwL)fLy**Svf8
zj`@5p73=%{30#(C?Du<iyB$fAP?jaf<MDh2g>u8(n$PD<r&Gc(#P@w%*Tr>ReBUPw
zL#ERyi^YQZe9mMt!S{VE%R<vMsY(z8jK^c9(<$Te7|-+MZ$$c>rQi@S2m%(11=rWt
zTwPtUTrLU2P^u|Z^nITo2nd1z$8j)C6J7s%i>~WXRaNHh@DgAztv3Nhh;7>@3`3U7
zrG%W#X867@K}^%cvMkw{4a0b%NY`~7k4NgdrYH*XJf|oM>bmB5Jjyonyw!ZSip2wp
zqF@+?Y{IkIjL~R><2bTthKf9gYnq0lD2U^j$HzyaDB|()kt9iEk-X&3uL6n}w{1&Z
z*W`IlmSyC5PF>gZeUGl|SeAupnomMC43|)@C<?aQE%*2LtX3=T?(TSacp#2r%Cdab
zo8JUHolZ1OL!RfvaZD6NgkeY+h6F)?=Xp4e10Yo!uCD7iolaC$MUo^$QN-Qd9bdkD
zVYONjMUkxFwrzjRNrnm*MZs>j!?tZ)*Oi431Ocw=J}HLh?-0+&am>TR1FO}F)oR84
z{XM(gj-n`JdwB`)&52rUP}enCma*IISg+SaQN(t;B~4T6x|U<qFo%W_5P$I7w{P6v
z-xEa<yWNgF&uN<GAJ3kppx8ugBszal6tep_O+(W(9FIrot(vC&qjJR*v)yjlZnwm7
zEOYs_(4GY-mhfI-Z=!19Z$GW;8UVvEWF;$#B2%QQDzYr&a5!){94Lz7iE=*;_<R5j
zf`G|nA{{_gRqDFta5zYK(F=85r)^uBrjg3$dH!TrJ!kBHvr!AxhQq*exnw$>;y4a%
z+Y-mIRKc<=f*@ct8sWMwecw~pHDy^+6opKS;q3R*BfoGF%d+r&pV@52#l;27<&x28
zMBn$aMdW!-+qT%Y&1^Pfu~;yfOfXGTI)=#IA>cWuyB7h6>e;r<Xf$Frn=zly34#EC
z!{I=hrfj!c_WM1@;}OSkST2{OX(|WRvMfoGgfvZM?hWU^Uj}p>M~2OD9QwYOaF36V
ztk-MeIF^8-ePmh2cs!<UTh{9}`~Ch&ah!WLel^4bP$a*qsx(bQ9LH2u#b&dSewwDK
z46!&2rD@7^It5_6-LlziNYj+2X{35Tt)N&#qtCKT_O~=m*=#m4yj4}vbsf5{Q&kmp
zU6ZCM<M9|(RY}v7D2g~74zjWT^1)sBsAwaKqOjlZY1@`GO-Yi3EX$--^?i?~X|k#3
zdCq3DK~+_%sv=EOso+b8qaOl%?g9X1S)ys0^wzR0r4xt^Md(CxPLc#wRi#~u+3(x}
z0Z@45`=FS7ht8oW3T@kRJRT+3FyTdUiToYTgfIR6mjDH%03Cjz8d}s#n+-o4iS;9e
zaW<gXY&e7t587vK@az!uqwBkXzkB`hUs(SS_^a!W2mA{F@0EV^@(9BK0000<MNUMn
GLSTXt3>~fj

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/dialogs/dialogs_pinned_shadow@3x.png b/Telegram/Resources/icons/dialogs/dialogs_pinned_shadow@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b05f0f35f9ef59e9ae309f7f7a17e9bb53b14b63
GIT binary patch
literal 2270
zcmW+&eK^zW8z1H+ud@(ZsD@R;$~eneX|h;CD~r|HOpdZbB=3b$^D{-Q8X>EtRZCM-
zl-FgIN*Z=KtJb_T8ljy;#QFBSuKVqe=XtK@x$n>YdG7qZL4GENwuT@O$b{hUyASZ#
z-)f)-Sg*y8Cjqx2-k+QZ0vWCRty-Yca%&LC;3B~n7ZS~wETt!YdJAQSPi{JhGC)z6
zmZhvUF*UnyQ2gV)zkj|oQ3*<%$Vlua2{89q9@106Ey`_B5NyV6%S^+n>7LnDbHQ~j
z;;i~NeNEX#dm!Lh%}grAe4eXi1s+f)V(t32ai5&fcft@Y))Jt;#Ip#NOFy3;kAZ#A
z*i4_$9mPeFnLNbBC>s%Srv+ZGp>K*P_n2KcW3&Wa@TB1&4g@HikRuRuqD`0)Vw7=o
zsUDe=fVCr%EWcs>I8g|eHi>jocpUT;@vcR;r1bzN>aM_0hVD{-@2_|LOMZ@Cy4OOt
zZOA;WVtrvGZ~<jp9y*Z7iE3A<c4TcuJ>SUE4wTWzR#>T|qr)V}K@3<}8-q{Bz)bzw
z;Ia<A`#py3BTyhnfbE2ULrA)yqqr;^l%um(b-hqh8#~ur<X{k=kx`&f96G;i{ZpY4
zMc#!r8N|Fg`Rr`0VlU~cqbFM^5WF{>%mSCli9fI9^`K2^V{i3MMPltDy{-=q3~0&5
zEpBxgRH$$=G&(RBPUugw+art7(n)m=y#p8B2VMSApLHke7K#JUfBv(%s4M#H!a@di
z`}V=5CA+%1I&0IsvG3`7NtSsMEiz|w*xO#P;;LXj_SXg)b!P)!r}~Z(Jd$PyJnxj(
z%b}t5cJ}t0uLqffwKPsqbc*~YVt0EDm@M}w<<lLj`E;S#JFefiayY?-GGd?8leDIA
zsDE@+@A4aPN=iy<YN}YNT$AIFJ+<&KwoJ>e$nUl2vsYcCXK_@%2uUQ70=QYKks3x?
z5%H1OTdD0sBJpdkT++|ga=N^NFWX=gnRB~yq)6x2X$%agt85fbxCmb%LPqYxmz}hv
z*&UFf$LdWbC|aqLu_Rll?nGa}K@pagwXu>UiW3e8p`onBNt7_oOGDG8MH!bF@euW1
z15->|slVF-5@EfL0QF~|trun)o$*AGcJb-039!@(eW|7&V;ZA~W61arl%;jykod=$
zr@{hiwOk+^D^Kntl*N=f#VD9Vn2F^~cxa30GGjjRzF;G=J!fjcx~R?i!Y-HK@%r8z
zr(lgaj(C%9`=>VL!`B7xw`P>i`&v3Qw-Ayg08<Ut$py&OuT1;eSobhI@x!%Y=`(@g
zfqSscuh3mk-!}rmMov||<7iJ*e)2)0g*B5wt=8}Ru^DE1t=L3D+hI}IXr=ksbbo*{
zgu5r~jjQ_*S65Z*%F<4va6=APn7lK>l04b)M<x%EMtpkhdw6vlrD^H<40&t&769Wt
z$IiVx%$Pr22m}D$vC>C<Q^DW9k;PzwZAp~PAZ8b=?X}35L>h?4Jcf2WJ6dHFFqO|U
z0AOBST|GCiaXwOGV^yHbL-<svstlf$<~67gf%_+t|E!X$Q$BLcRQp?JL#Ng?DdXzG
zT#HLOj-;lix5{KIsZ?r7-twc1{Ec}&NaLNH{Q1MTGJ=9H8TI;~Xczgy+QJ?jNKH$7
zuF<$>F3vGjs-y2ziDx5Tue&c)U-se`_>_k4S;cm9Zg3auzmYc8&2MgMYRXl{cmkam
zMXs1o)-dR};gPS?7j_ex`}=RJENGuP1%fcm^6V`0V+<g(rkvmdcRt|7%855>cao1#
z4V0eq$ShBC;t417kJxB3$6sa<VJ&*s_?N3Wb1jeyqJ{BnIinY^gu1X^AuEd-l!YA?
zY<NTgZz2tACuOhOeI9832<zG-2d`X}UZ-Y$5u8gdPTyyHCpjaenY>IHo9U9Y14WAL
zZj(^AaGT$PvfaMU$K6vrmM8s+Fz?poyO*oBcB9Yy!Q1xaeB(yc^+R~#4Yk+mnxD;P
zQVmVv3ADU}0n(R#d2UY-xx5Ih?b;5-6B~1Xy_=Na#fx`)P{x?T+{_k$Xi&BnP%zU0
zjA>cGNZNZE7)LV!+pk#cF;s4uen^?39^)Rfn;RdBMz{XG<#{w304~Z{2NZVwkcDo*
zDS)p;$S}@1$$<FAeEAML{++VQ<`)tr1NQxeWB@WWV+}~|a}XyA2LTVKz2B0`h68lU
zLx_mMEqzC~J?0@m;>LEJ@SzE+@g5b2Uj!@$wg6xUw%5i26rOBv!CcE}cLcCQ<^a6j
zL^Z=f9t+?y^jg-s-^5;0IcYm^+6rYBKwx>-<vzcmTgKn;kJ@8Yv$eOk7s6c2;$<V-
z<0-2WV7HI~R{TKO4pL9b8y0srbfP%5BsgT4V*6?)qCCo`8~yUwlUB8Q6E!@XygHO*
z3H%i5`l>M%BT(i`k^8eN9sR<;Msx=(O>{dH>Z!03=}ku-YUW`8M<l=^Tl#i#MpE$J
z9!7;jJ0M`7Zzhuq04h?=e>7<&WzVOR<w+&{744#ue>(@~P*kK<Shc+BXl$t-8~()S
z+OPm&IM-}OV21@*<ITI#vG~?vN0(*+PnC-0Ap>IS4o&>X01kb5ct+T%@<Z_uwb+1_
zSI~h23)@3T_zG1_4Z?OVebGJnpBFmOMbxp118n%;WM;<^33F(8P0nrI0^SD!XKn>c
zU5`xYS`?Ih-hSL!OB1WeY&q)ggo8lZHaCnY;_Cj#yGt6=M237qWkO!-obX)zT6CUI
z2U4%DpUZz$oL2H9h7E^+8RN%f=m$RB#<wXRi#`p|{c;Z$PYj^eGL%Gm(EZKbUNr60
z|3aEKUy08TAX-@QD!Cz;y#;fdil##aXs1E9t}pdRq>g<jPurH{jjF=LS^C<GgFzIB
zKG)<H=@)8pxa7U|QZxf}&}dlyUuU<$RXWYbb3`cvIc|gA2m3wVHdj9^$X@17hX0tK
o4)6C?E@>~1|9^nUS~Hym8aJ3J)vqW#4h$?H0zSxB=tIl-51E}#;Q#;t

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index d191d2360..9db62b958 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -390,7 +390,12 @@ TextWithEntities Story::inReplyText() const {
 }
 
 void Story::setPinnedToTop(bool pinned) {
-	_pinnedToTop = pinned;
+	if (_pinnedToTop != pinned) {
+		_pinnedToTop = pinned;
+		if (const auto item = _peer->owner().stories().lookupItem(this)) {
+			item->setIsPinned(pinned);
+		}
+	}
 }
 
 bool Story::pinnedToTop() const {
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 3dd4f26bb..12727f64f 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1360,6 +1360,10 @@ void HistoryItem::setIsPinned(bool pinned) {
 	const auto changed = (isPinned() != pinned);
 	if (pinned) {
 		_flags |= MessageFlag::Pinned;
+		if (_flags & MessageFlag::StoryItem) {
+			return;
+		}
+
 		auto &storage = _history->session().storage();
 		storage.add(Storage::SharedMediaAddExisting(
 			_history->peer->id,
@@ -1379,6 +1383,10 @@ void HistoryItem::setIsPinned(bool pinned) {
 		}
 	} else {
 		_flags &= ~MessageFlag::Pinned;
+		if (_flags & MessageFlag::StoryItem) {
+			return;
+		}
+
 		_history->session().storage().remove(Storage::SharedMediaRemoveOne(
 			_history->peer->id,
 			Storage::SharedMediaType::Pinned,
@@ -1687,6 +1695,11 @@ void HistoryItem::setStoryFields(not_null<Data::Story*> story) {
 			/*ttlSeconds = */0);
 	}
 	setText(story->caption());
+	if (story->pinnedToTop()) {
+		_flags |= MessageFlag::Pinned;
+	} else {
+		_flags &= ~MessageFlag::Pinned;
+	}
 }
 
 void HistoryItem::applyEdition(const MTPDmessageService &message) {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index c3025bf85..6c9a7dabb 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -343,7 +343,10 @@ std::unique_ptr<BaseLayout> Provider::createLayout(
 		return nullptr;
 	};
 	using namespace Overview::Layout;
-	const auto options = MediaOptions{ .story = true };
+	const auto options = MediaOptions{
+		.pinned = item->isPinned(),
+		.story = true,
+	};
 	if (const auto photo = getPhoto()) {
 		return std::make_unique<Photo>(delegate, item, photo, options);
 	} else if (const auto file = getFile()) {
diff --git a/Telegram/SourceFiles/overview/overview.style b/Telegram/SourceFiles/overview/overview.style
index 82a9c70e6..6910d536b 100644
--- a/Telegram/SourceFiles/overview/overview.style
+++ b/Telegram/SourceFiles/overview/overview.style
@@ -140,3 +140,12 @@ overviewVideoPlaySelected: icon {{ "overview_video_play", historyFileThumbIconFg
 overviewVideoDownload: icon {{ "overview_video_download", historyFileThumbIconFg }};
 overviewVideoDownloadSelected: icon {{ "overview_video_download", historyFileThumbIconFgSelected }};
 overviewVideoRadialSize: 36px;
+
+storyPinnedIcon: icon{
+	{ "dialogs/dialogs_pinned_shadow", windowShadowFg },
+	{ "dialogs/dialogs_pinned", historyFileThumbIconFg }
+};
+storyPinnedIconSelected: icon{
+	{ "dialogs/dialogs_pinned_shadow", windowShadowFg },
+	{ "dialogs/dialogs_pinned", historyFileThumbIconFgSelected }
+};
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index b742a6436..e38bd1e23 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -339,6 +339,7 @@ Photo::Photo(
 , _spoiler(options.spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
 	delegate->repaintItem(this);
 }) : nullptr)
+, _pinned(options.pinned)
 , _story(options.story) {
 	if (_data->inlineThumbnailBytes().isEmpty()
 		&& (_data->hasExact(Data::PhotoSize::Small)
@@ -407,6 +408,14 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 	if (selected) {
 		p.fillRect(0, 0, _width, _height, st::overviewPhotoSelectOverlay);
 	}
+
+	if (_pinned) {
+		const auto &icon = selected
+			? st::storyPinnedIconSelected
+			: st::storyPinnedIcon;
+		icon.paint(p, _width - icon.width(), 0, _width);
+	}
+
 	const auto checkDelta = st::overviewCheckSkip + st::overviewCheck.size;
 	const auto checkLeft = _width - checkDelta;
 	const auto checkTop = _height - checkDelta;
@@ -475,6 +484,7 @@ Video::Video(
 , _spoiler(options.spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
 	delegate->repaintItem(this);
 }) : nullptr)
+, _pinned(options.pinned)
 , _story(options.story) {
 	setDocumentLinks(_data);
 	_data->loadThumbnail(parent->fullId());
@@ -547,6 +557,13 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		p.fillRect(QRect(0, 0, _width, _height), st::overviewPhotoSelectOverlay);
 	}
 
+	if (_pinned) {
+		const auto &icon = selected
+			? st::storyPinnedIconSelected
+			: st::storyPinnedIcon;
+		icon.paint(p, _width - icon.width(), 0, _width);
+	}
+
 	if (!selected && !context->selecting && radialOpacity < 1.) {
 		if (clip.intersects(QRect(0, _height - st::normalFont->height, _width, st::normalFont->height))) {
 			const auto download = !loaded && !_dataMedia->canBePlayed(parent());
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index 331d7f3e2..051dbb22e 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -185,6 +185,7 @@ struct Info : public RuntimeComponent<Info, LayoutItemBase> {
 
 struct MediaOptions {
 	bool spoiler = false;
+	bool pinned = false;
 	bool story = false;
 };
 
@@ -218,6 +219,7 @@ private:
 
 	QPixmap _pix;
 	bool _goodLoaded = false;
+	bool _pinned = false;
 	bool _story = false;
 
 };
@@ -318,6 +320,7 @@ private:
 
 	QPixmap _pix;
 	bool _pixBlurred = true;
+	bool _pinned = false;
 	bool _story = false;
 
 };

From 645ad5e1bdc64ef3a1c1f0f0a5d6c494d74af9e8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 Apr 2024 18:08:44 +0400
Subject: [PATCH 350/596] Update pinned icon in stories list.

---
 Telegram/SourceFiles/history/history_item.cpp    |  8 +++++---
 .../info/media/info_media_list_widget.cpp        |  7 +++++++
 .../SourceFiles/overview/overview_layout.cpp     | 16 ++++++++++++++++
 Telegram/SourceFiles/overview/overview_layout.h  |  4 ++++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 12727f64f..a6effce00 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1358,6 +1358,11 @@ bool HistoryItem::markContentsRead(bool fromThisClient) {
 
 void HistoryItem::setIsPinned(bool pinned) {
 	const auto changed = (isPinned() != pinned);
+	const auto guard = gsl::finally([&] {
+		if (changed) {
+			_history->owner().notifyItemDataChange(this);
+		}
+	});
 	if (pinned) {
 		_flags |= MessageFlag::Pinned;
 		if (_flags & MessageFlag::StoryItem) {
@@ -1392,9 +1397,6 @@ void HistoryItem::setIsPinned(bool pinned) {
 			Storage::SharedMediaType::Pinned,
 			id));
 	}
-	if (changed) {
-		_history->owner().notifyItemDataChange(this);
-	}
 }
 
 void HistoryItem::returnSavedMedia() {
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 8e9006629..280b35589 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -233,6 +233,13 @@ void ListWidget::subscribeToSession(
 	) | rpl::start_with_next([this](auto item) {
 		repaintItem(item);
 	}, lifetime);
+
+	session->data().itemDataChanges(
+	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+		if (const auto found = findItemByItem(item)) {
+			found->layout->itemDataChanged();
+		}
+	}, lifetime);
 }
 
 void ListWidget::setupSelectRestriction() {
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index e38bd1e23..e75af1464 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -460,6 +460,14 @@ void Photo::clearSpoiler() {
 	}
 }
 
+void Photo::itemDataChanged() {
+	const auto pinned = parent()->isPinned();
+	if (_pinned != pinned) {
+		_pinned = pinned;
+		delegate()->repaintItem(this);
+	}
+}
+
 void Photo::clearHeavyPart() {
 	_dataMedia = nullptr;
 }
@@ -637,6 +645,14 @@ void Video::clearSpoiler() {
 	}
 }
 
+void Video::itemDataChanged() {
+	const auto pinned = parent()->isPinned();
+	if (_pinned != pinned) {
+		_pinned = pinned;
+		delegate()->repaintItem(this);
+	}
+}
+
 void Video::clearHeavyPart() {
 	_dataMedia = nullptr;
 }
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index 051dbb22e..3526b5e57 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -71,6 +71,8 @@ public:
 
 	void invalidateCache();
 
+	virtual void itemDataChanged() {
+	}
 	virtual void clearHeavyPart() {
 	}
 
@@ -205,6 +207,7 @@ public:
 		QPoint point,
 		StateRequest request) const override;
 
+	void itemDataChanged() override;
 	void clearHeavyPart() override;
 
 private:
@@ -298,6 +301,7 @@ public:
 		QPoint point,
 		StateRequest request) const override;
 
+	void itemDataChanged() override;
 	void clearHeavyPart() override;
 	void clearSpoiler() override;
 

From 4fb03e532c56817bf037b58bab69f0d8fb5c4c12 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 18 Apr 2024 09:46:06 +0400
Subject: [PATCH 351/596] Optimize stories list generation.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 44 ++++---------------
 Telegram/SourceFiles/data/data_stories.h      |  4 +-
 .../SourceFiles/data/data_stories_ids.cpp     | 36 ++++++++-------
 .../stories/media_stories_controller.cpp      | 41 +++++++++++------
 .../media/stories/media_stories_controller.h  |  1 +
 5 files changed, 57 insertions(+), 69 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 7806e1aa6..668ec4c45 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -78,45 +78,19 @@ using UpdateFlag = StoryUpdate::Flag;
 
 } // namespace
 
-int IndexRespectingPinned(const StoriesIds &ids, StoryId id) {
-	const auto i = ids.list.find(id);
-	if (ids.pinnedToTop.empty() || i == end(ids.list)) {
-		return int(i - begin(ids.list));
-	}
-	const auto j = ranges::find(ids.pinnedToTop, id);
-	if (j != end(ids.pinnedToTop)) {
-		return int(j - begin(ids.pinnedToTop));
-	}
-	auto result = int(i - begin(ids.list));
-	for (const auto &pinnedId : ids.pinnedToTop) {
-		if (pinnedId < id) {
-			++result;
-		}
-	}
-
-	Ensures(result < int(ids.list.size()));
-	return result;
-}
-
-StoryId IdRespectingPinned(const StoriesIds &ids, int index) {
-	Expects(index >= 0 && index < int(ids.list.size()));
-
+std::vector<StoryId> RespectingPinned(const StoriesIds &ids) {
 	if (ids.pinnedToTop.empty()) {
-		return *(begin(ids.list) + index);
-	} else if (index < int(ids.pinnedToTop.size())) {
-		return ids.pinnedToTop[index];
+		return ids.list | ranges::to_vector;
 	}
-	auto i = begin(ids.list) + index - int(ids.pinnedToTop.size());
-	auto sorted = ids.pinnedToTop;
-	ranges::sort(sorted, ranges::greater());
-	for (const auto &pinnedId : sorted) {
-		if (pinnedId >= *i) {
-			++i;
+	auto result = std::vector<StoryId>();
+	result.reserve(ids.list.size());
+	result.insert(end(result), begin(ids.pinnedToTop), end(ids.pinnedToTop));
+	for (const auto &id : ids.list) {
+		if (!ranges::contains(ids.pinnedToTop, id)) {
+			result.push_back(id);
 		}
 	}
-
-	Ensures(i != end(ids.list));
-	return *i;
+	return result;
 }
 
 StoriesSourceInfo StoriesSource::info() const {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index c5f340cc1..2a172e46a 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -40,9 +40,7 @@ struct StoriesIds {
 		const StoriesIds&) = default;
 };
 
-// ids.list.size() if not found.
-[[nodiscard]] int IndexRespectingPinned(const StoriesIds &ids, StoryId id);
-[[nodiscard]] StoryId IdRespectingPinned(const StoriesIds &ids, int index);
+[[nodiscard]] std::vector<StoryId> RespectingPinned(const StoriesIds &ids);
 
 struct StoriesSourceInfo {
 	PeerId id = 0;
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index fbff87e09..71ccf4275 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -39,14 +39,15 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 			}
 
 			const auto &saved = stories->saved(peerId);
+			const auto sorted = RespectingPinned(saved);
 			const auto count = stories->savedCount(peerId);
-			auto aroundIndex = IndexRespectingPinned(saved, aroundId);
-			if (aroundIndex == int(saved.list.size())) {
-				const auto around = saved.list.lower_bound(aroundId);
-				aroundIndex = int(around - begin(saved.list));
+			auto i = ranges::find(sorted, aroundId);
+			if (i == end(sorted)) {
+				const auto j = saved.list.lower_bound(aroundId);
+				i = begin(sorted) + int(j - begin(saved.list));
 			}
-			const auto hasBefore = aroundIndex;
-			const auto hasAfter = int(saved.list.size()) - aroundIndex;
+			const auto hasBefore = int(i - begin(sorted));
+			const auto hasAfter = int(end(sorted) - i);
 			if (hasAfter < limit) {
 				stories->savedLoadMore(peerId);
 			}
@@ -54,8 +55,8 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 			const auto takeAfter = std::min(hasAfter, limit);
 			auto ids = std::vector<StoryId>();
 			ids.reserve(takeBefore + takeAfter);
-			for (auto i = aroundIndex - takeBefore; i != aroundIndex + takeAfter; ++i) {
-				ids.push_back(IdRespectingPinned(saved, i));
+			for (auto j = i - takeBefore; j != i + takeAfter; ++j) {
+				ids.push_back(*j);
 			}
 			const auto added = int(ids.size());
 			state->slice = StoriesIdsSlice(
@@ -118,14 +119,15 @@ rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
 			}
 
 			const auto &archive = stories->archive(peerId);
-			const auto count = stories->archiveCount(peerId);
-			auto aroundIndex = IndexRespectingPinned(archive, aroundId);
-			if (aroundIndex == int(archive.list.size())) {
-				const auto around = archive.list.lower_bound(aroundId);
-				aroundIndex = int(around - begin(archive.list));
+			const auto sorted = RespectingPinned(archive);
+			const auto count = stories->savedCount(peerId);
+			auto i = ranges::find(sorted, aroundId);
+			if (i == end(sorted)) {
+				const auto j = archive.list.lower_bound(aroundId);
+				i = begin(sorted) + int(j - begin(archive.list));
 			}
-			const auto hasBefore = aroundIndex;
-			const auto hasAfter = int(archive.list.size()) - aroundIndex;
+			const auto hasBefore = int(i - begin(sorted));
+			const auto hasAfter = int(end(sorted) - i);
 			if (hasAfter < limit) {
 				stories->archiveLoadMore(peerId);
 			}
@@ -133,8 +135,8 @@ rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
 			const auto takeAfter = std::min(hasAfter, limit);
 			auto ids = std::vector<StoryId>();
 			ids.reserve(takeBefore + takeAfter);
-			for (auto i = aroundIndex - takeBefore; i != aroundIndex + takeAfter; ++i) {
-				ids.push_back(IdRespectingPinned(archive, i));
+			for (auto j = i - takeBefore; j != i + takeAfter; ++j) {
+				ids.push_back(*j);
 			}
 			const auto added = int(ids.size());
 			state->slice = StoriesIdsSlice(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 2b06956bd..fa60aa3a7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -77,8 +77,10 @@ struct SameDayRange {
 [[nodiscard]] SameDayRange ComputeSameDayRange(
 		not_null<Data::Story*> story,
 		const Data::StoriesIds &ids,
+		const std::vector<StoryId> &sorted,
 		int index) {
 	Expects(index >= 0 && index < ids.list.size());
+	Expects(index >= 0 && index < sorted.size());
 
 	const auto pinned = int(ids.pinnedToTop.size());
 	if (index < pinned) {
@@ -90,7 +92,7 @@ struct SameDayRange {
 	const auto stories = &story->owner().stories();
 	const auto now = base::unixtime::parse(story->date());
 	for (auto i = index; i != 0;) {
-		const auto storyId = IdRespectingPinned(ids, --i);
+		const auto storyId = sorted[--i];
 		if (const auto maybeStory = stories->lookup({ peerId, storyId })) {
 			const auto day = base::unixtime::parse((*maybeStory)->date());
 			if (day.date() != now.date()) {
@@ -99,8 +101,8 @@ struct SameDayRange {
 		}
 		--result.from;
 	}
-	for (auto i = index + 1, c = int(ids.list.size()); i != c; ++i) {
-		const auto storyId = IdRespectingPinned(ids, i);
+	for (auto i = index + 1, c = int(sorted.size()); i != c; ++i) {
+		const auto storyId = sorted[i];
 		if (const auto maybeStory = stories->lookup({ peerId, storyId })) {
 			const auto day = base::unixtime::parse((*maybeStory)->date());
 			if (day.date() != now.date()) {
@@ -700,16 +702,19 @@ void Controller::rebuildFromContext(
 	}, [&](StoriesContextSaved) {
 		if (stories.savedCountKnown(peerId)) {
 			const auto &saved = stories.saved(peerId);
-			const auto i = IndexRespectingPinned(saved, id);
-			if (i < saved.list.size()) {
+			auto sorted = RespectingPinned(saved);
+			const auto i = ranges::find(sorted, id);
+			const auto tillEnd = int(end(sorted) - i);
+			if (tillEnd > 0) {
+				_index = int(i - begin(sorted));
 				list = StoriesList{
 					.peer = peer,
 					.ids = saved,
+					.sorted = std::move(sorted),
 					.total = stories.savedCount(peerId),
 				};
-				_index = i;
 				if (saved.list.size() < list->total
-					&& (saved.list.size() - i) < kPreloadStoriesCount) {
+					&& tillEnd < kPreloadStoriesCount) {
 					stories.savedLoadMore(peerId);
 				}
 			}
@@ -718,16 +723,19 @@ void Controller::rebuildFromContext(
 	}, [&](StoriesContextArchive) {
 		if (stories.archiveCountKnown(peerId)) {
 			const auto &archive = stories.archive(peerId);
-			const auto i = IndexRespectingPinned(archive, id);
-			if (i < archive.list.size()) {
+			auto sorted = RespectingPinned(archive);
+			const auto i = ranges::find(sorted, id);
+			const auto tillEnd = int(end(sorted) - i);
+			if (tillEnd > 0) {
+				_index = int(i - begin(sorted));
 				list = StoriesList{
 					.peer = peer,
 					.ids = archive,
+					.sorted = std::move(sorted),
 					.total = stories.archiveCount(peerId),
 				};
-				_index = i;
 				if (archive.list.size() < list->total
-					&& (archive.list.size() - i) < kPreloadStoriesCount) {
+					&& tillEnd < kPreloadStoriesCount) {
 					stories.archiveLoadMore(peerId);
 				}
 			}
@@ -761,7 +769,11 @@ void Controller::rebuildFromContext(
 		}
 		if (const auto maybe = peer->owner().stories().lookup(storyId)) {
 			const auto now = *maybe;
-			const auto range = ComputeSameDayRange(now, _list->ids, _index);
+			const auto range = ComputeSameDayRange(
+				now,
+				_list->ids,
+				_list->sorted,
+				_index);
 			_sliderCount = range.till - range.from + 1;
 			_sliderIndex = _index - range.from;
 		}
@@ -779,6 +791,7 @@ void Controller::rebuildFromContext(
 			_list = StoriesList{
 				.peer = peer,
 				.ids = { { id } },
+				.sorted = { id },
 				.total = 1,
 			};
 			_index = 0;
@@ -1523,8 +1536,8 @@ StoryId Controller::shownId(int index) const {
 
 	return _source
 		? (_source->ids.begin() + index)->id
-		: (index < int(_list->ids.list.size()))
-		? IdRespectingPinned(_list->ids, index)
+		: (index < int(_list->sorted.size()))
+		? _list->sorted[index]
 		: StoryId();
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 45590e0a2..b3d796882 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -194,6 +194,7 @@ private:
 	struct StoriesList {
 		not_null<PeerData*> peer;
 		Data::StoriesIds ids;
+		std::vector<StoryId> sorted;
 		int total = 0;
 
 		friend inline bool operator==(

From a3b8397361768e56018b29db44a5de888857bb99 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 18 Apr 2024 10:45:06 +0400
Subject: [PATCH 352/596] Close chat/media if thrown out by admin.

---
 Telegram/SourceFiles/data/data_channel.cpp |  9 +++++++++
 Telegram/SourceFiles/data/data_chat.cpp    | 13 +++++++++++++
 Telegram/SourceFiles/data/data_chat.h      |  4 +---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index d4e1499d0..2ba8346d2 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -165,6 +165,7 @@ void ChannelData::setFlags(ChannelDataFlags which) {
 	const auto taken = ((diff & Flag::Forum) && !(which & Flag::Forum))
 		? mgInfo->takeForumData()
 		: nullptr;
+	const auto wasIn = amIn();
 	if ((diff & Flag::Forum) && (which & Flag::Forum)) {
 		mgInfo->ensureForum(this);
 	}
@@ -174,6 +175,14 @@ void ChannelData::setFlags(ChannelDataFlags which) {
 			session().changes().peerUpdated(chat, UpdateFlag::Migration);
 			session().changes().peerUpdated(this, UpdateFlag::Migration);
 		}
+
+		if (wasIn && !amIn()) {
+			crl::on_main(&session(), [=] {
+				if (!amIn()) {
+					Core::App().closeChatFromWindows(this);
+				}
+			});
+		}
 	}
 	if (diff & (Flag::Forum | Flag::CallNotEmpty | Flag::SimilarExpanded)) {
 		if (const auto history = this->owner().historyLoaded(this)) {
diff --git a/Telegram/SourceFiles/data/data_chat.cpp b/Telegram/SourceFiles/data/data_chat.cpp
index 7f41c04b7..76aa1f714 100644
--- a/Telegram/SourceFiles/data/data_chat.cpp
+++ b/Telegram/SourceFiles/data/data_chat.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_chat.h"
 
+#include "core/application.h"
 #include "data/data_user.h"
 #include "data/data_channel.h"
 #include "data/data_session.h"
@@ -132,6 +133,18 @@ void ChatData::invalidateParticipants() {
 		UpdateFlag::Members | UpdateFlag::Admins);
 }
 
+void ChatData::setFlags(ChatDataFlags which) {
+	const auto wasIn = amIn();
+	_flags.set(which);
+	if (wasIn && !amIn()) {
+		crl::on_main(&session(), [=] {
+			if (!amIn()) {
+				Core::App().closeChatFromWindows(this);
+			}
+		});
+	}
+}
+
 void ChatData::setInviteLink(const QString &newInviteLink) {
 	_inviteLink = newInviteLink;
 }
diff --git a/Telegram/SourceFiles/data/data_chat.h b/Telegram/SourceFiles/data/data_chat.h
index 93202608a..5a285aeeb 100644
--- a/Telegram/SourceFiles/data/data_chat.h
+++ b/Telegram/SourceFiles/data/data_chat.h
@@ -42,9 +42,7 @@ public:
 		return (count > 0 || amIn()) && participants.empty();
 	}
 
-	void setFlags(ChatDataFlags which) {
-		_flags.set(which);
-	}
+	void setFlags(ChatDataFlags which);
 	void addFlags(ChatDataFlags which) {
 		_flags.add(which);
 	}

From f43f99cff25a24ccb7d67fa830b1e488f89ccc05 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 18 Apr 2024 05:14:19 +0300
Subject: [PATCH 353/596] Added initial api support of stickerset attribute in
 web pages.

---
 .../boxes/peers/edit_peer_color_box.cpp       |  1 +
 Telegram/SourceFiles/data/data_session.cpp    | 30 +++++++++++++++++++
 Telegram/SourceFiles/data/data_session.h      |  3 ++
 Telegram/SourceFiles/data/data_web_page.cpp   |  5 ++++
 Telegram/SourceFiles/data/data_web_page.h     | 12 ++++++++
 Telegram/SourceFiles/history/history_item.cpp |  1 +
 6 files changed, 52 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index 018d07915..09b5d273b 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -312,6 +312,7 @@ PreviewWrap::PreviewWrap(
 	nullptr, // document
 	WebPageCollage(),
 	nullptr, // iv
+	nullptr, // stickerSet
 	0, // duration
 	QString(), // author
 	false, // hasLargeMedia
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 6d6bb4404..464642d27 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -3377,6 +3377,7 @@ not_null<WebPageData*> Session::processWebpage(
 		nullptr,
 		WebPageCollage(),
 		nullptr,
+		nullptr,
 		0,
 		QString(),
 		false,
@@ -3402,6 +3403,7 @@ not_null<WebPageData*> Session::webpage(
 		nullptr,
 		WebPageCollage(),
 		nullptr,
+		nullptr,
 		0,
 		QString(),
 		false,
@@ -3420,6 +3422,7 @@ not_null<WebPageData*> Session::webpage(
 		DocumentData *document,
 		WebPageCollage &&collage,
 		std::unique_ptr<Iv::Data> iv,
+		std::unique_ptr<WebPageStickerSet> stickerSet,
 		int duration,
 		const QString &author,
 		bool hasLargeMedia,
@@ -3438,6 +3441,7 @@ not_null<WebPageData*> Session::webpage(
 		document,
 		std::move(collage),
 		std::move(iv),
+		std::move(stickerSet),
 		duration,
 		author,
 		hasLargeMedia,
@@ -3490,6 +3494,29 @@ void Session::webpageApplyFields(
 		}
 		return nullptr;
 	};
+	using WebPageStickerSetPtr = std::unique_ptr<WebPageStickerSet>;
+	const auto lookupStickerSet = [&]() -> WebPageStickerSetPtr {
+		if (const auto attributes = data.vattributes()) {
+			for (const auto &attribute : attributes->v) {
+				auto result = attribute.match([&](
+						const MTPDwebPageAttributeStickerSet &data) {
+					auto result = std::make_unique<WebPageStickerSet>();
+					result->isEmoji = data.is_emojis();
+					result->isTextColor = data.is_text_color();
+					for (const auto &tl : data.vstickers().v) {
+						result->items.push_back(processDocument(tl));
+					}
+					return result;
+				}, [](const auto &) {
+					return WebPageStickerSetPtr(nullptr);
+				});
+				if (!result->items.empty()) {
+					return result;
+				}
+			}
+		}
+		return nullptr;
+	};
 	auto story = (Data::Story*)nullptr;
 	auto storyId = FullStoryId();
 	if (const auto attributes = data.vattributes()) {
@@ -3581,6 +3608,7 @@ void Session::webpageApplyFields(
 			: lookupThemeDocument()),
 		WebPageCollage(this, data),
 		std::move(iv),
+		lookupStickerSet(),
 		data.vduration().value_or_empty(),
 		qs(data.vauthor().value_or_empty()),
 		data.is_has_large_media(),
@@ -3600,6 +3628,7 @@ void Session::webpageApplyFields(
 		DocumentData *document,
 		WebPageCollage &&collage,
 		std::unique_ptr<Iv::Data> iv,
+		std::unique_ptr<WebPageStickerSet> stickerSet,
 		int duration,
 		const QString &author,
 		bool hasLargeMedia,
@@ -3617,6 +3646,7 @@ void Session::webpageApplyFields(
 		document,
 		std::move(collage),
 		std::move(iv),
+		std::move(stickerSet),
 		duration,
 		author,
 		hasLargeMedia,
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index fa58d4847..117823802 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class Image;
 class HistoryItem;
 struct WebPageCollage;
+struct WebPageStickerSet;
 enum class WebPageType : uint8;
 enum class NewMessageType;
 
@@ -579,6 +580,7 @@ public:
 		DocumentData *document,
 		WebPageCollage &&collage,
 		std::unique_ptr<Iv::Data> iv,
+		std::unique_ptr<WebPageStickerSet> stickerSet,
 		int duration,
 		const QString &author,
 		bool hasLargeMedia,
@@ -857,6 +859,7 @@ private:
 		DocumentData *document,
 		WebPageCollage &&collage,
 		std::unique_ptr<Iv::Data> iv,
+		std::unique_ptr<WebPageStickerSet> stickerSet,
 		int duration,
 		const QString &author,
 		bool hasLargeMedia,
diff --git a/Telegram/SourceFiles/data/data_web_page.cpp b/Telegram/SourceFiles/data/data_web_page.cpp
index 215e1a407..f8d4b69c4 100644
--- a/Telegram/SourceFiles/data/data_web_page.cpp
+++ b/Telegram/SourceFiles/data/data_web_page.cpp
@@ -166,6 +166,8 @@ WebPageType ParseWebPageType(
 		return WebPageType::ChannelBoost;
 	} else if (type == u"telegram_giftcode"_q) {
 		return WebPageType::Giftcode;
+	} else if (type == u"telegram_stickerset"_q) {
+		return WebPageType::StickerSet;
 	} else if (hasIV) {
 		return WebPageType::ArticleWithIV;
 	} else {
@@ -219,6 +221,7 @@ bool WebPageData::applyChanges(
 		DocumentData *newDocument,
 		WebPageCollage &&newCollage,
 		std::unique_ptr<Iv::Data> newIv,
+		std::unique_ptr<WebPageStickerSet> newStickerSet,
 		int newDuration,
 		const QString &newAuthor,
 		bool newHasLargeMedia,
@@ -272,6 +275,7 @@ bool WebPageData::applyChanges(
 		&& collage.items == newCollage.items
 		&& (!iv == !newIv)
 		&& (!iv || iv->partial() == newIv->partial())
+		&& (!stickerSet == !newStickerSet)
 		&& duration == newDuration
 		&& author == resultAuthor
 		&& hasLargeMedia == (newHasLargeMedia ? 1 : 0)
@@ -293,6 +297,7 @@ bool WebPageData::applyChanges(
 	document = newDocument;
 	collage = std::move(newCollage);
 	iv = std::move(newIv);
+	stickerSet = std::move(newStickerSet);
 	duration = newDuration;
 	author = resultAuthor;
 	pendingTill = newPendingTill;
diff --git a/Telegram/SourceFiles/data/data_web_page.h b/Telegram/SourceFiles/data/data_web_page.h
index a659780c9..0293106f0 100644
--- a/Telegram/SourceFiles/data/data_web_page.h
+++ b/Telegram/SourceFiles/data/data_web_page.h
@@ -46,6 +46,7 @@ enum class WebPageType : uint8 {
 	WallPaper,
 	Theme,
 	Story,
+	StickerSet,
 
 	Article,
 	ArticleWithIV,
@@ -68,6 +69,15 @@ struct WebPageCollage {
 
 };
 
+struct WebPageStickerSet {
+	WebPageStickerSet() = default;
+
+	std::vector<not_null<DocumentData*>> items;
+	bool isEmoji = false;
+	bool isTextColor = false;
+
+};
+
 struct WebPageData {
 	WebPageData(not_null<Data::Session*> owner, const WebPageId &id);
 	~WebPageData();
@@ -87,6 +97,7 @@ struct WebPageData {
 		DocumentData *newDocument,
 		WebPageCollage &&newCollage,
 		std::unique_ptr<Iv::Data> newIv,
+		std::unique_ptr<WebPageStickerSet> newStickerSet,
 		int newDuration,
 		const QString &newAuthor,
 		bool newHasLargeMedia,
@@ -114,6 +125,7 @@ struct WebPageData {
 	DocumentData *document = nullptr;
 	WebPageCollage collage;
 	std::unique_ptr<Iv::Data> iv;
+	std::unique_ptr<WebPageStickerSet> stickerSet;
 	int duration = 0;
 	TimeId pendingTill = 0;
 	uint32 version : 30 = 0;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index a6effce00..079051b8c 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -657,6 +657,7 @@ HistoryItem::HistoryItem(
 		nullptr,
 		WebPageCollage(),
 		nullptr,
+		nullptr,
 		0,
 		QString(),
 		false,

From ed13a325e9d3ed2b526fbeb63fb3f7bd3382b8cb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 18 Apr 2024 21:24:40 +0300
Subject: [PATCH 354/596] Added stickerset preview to webpages.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 .../view/media/history_view_sticker.cpp       | 10 +++
 .../history/view/media/history_view_sticker.h |  3 +
 .../view/media/history_view_web_page.cpp      | 64 +++++++++++++++++--
 .../view/media/history_view_web_page.h        |  8 +++
 5 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 4aa6eae95..f8d2b1175 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4729,6 +4729,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_view_button_boost" = "Boost";
 "lng_view_button_giftcode" = "Open";
 "lng_view_button_iv" = "Instant View";
+"lng_view_button_stickerset" = "View stickers";
+"lng_view_button_emojipack" = "View emoji";
 
 "lng_sponsored_hide_ads" = "Hide";
 "lng_sponsored_title" = "What are sponsored messages?";
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index 0fe8f1b26..c8527d999 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -137,6 +137,10 @@ bool Sticker::emojiSticker() const {
 	return _emojiSticker;
 }
 
+bool Sticker::webpagePart() const {
+	return _webpagePart;
+}
+
 void Sticker::initSize(int customSize) {
 	if (customSize > 0) {
 		const auto original = Size(_data);
@@ -355,6 +359,8 @@ void Sticker::paintPath(
 		helper.emplace(Ui::CustomEmoji::PreviewColorFromTextColor(
 			ComputeEmojiTextColor(context)));
 		pathGradient->overrideColors(helper->color(), helper->color());
+	} else if (webpagePart()) {
+		pathGradient->overrideColors(st::shadowFg, st::shadowFg);
 	} else if (context.selected()) {
 		pathGradient->overrideColors(
 			context.st->msgServiceBgSelected(),
@@ -513,6 +519,10 @@ void Sticker::setEmojiSticker() {
 	_emojiSticker = true;
 }
 
+void Sticker::setWebpagePart() {
+	_webpagePart = true;
+}
+
 void Sticker::setupPlayer() {
 	Expects(_dataMedia != nullptr);
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.h b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
index 1cbd7ea82..c6bbbd0da 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
@@ -69,6 +69,7 @@ public:
 	void setCustomCachingTag(ChatHelpers::StickerLottieSize tag);
 	void setCustomEmojiPart();
 	void setEmojiSticker();
+	void setWebpagePart();
 	[[nodiscard]] bool atTheEnd() const {
 		return 	(_frameIndex >= 0) && (_frameIndex + 1 == _framesCount);
 	}
@@ -98,6 +99,7 @@ private:
 	[[nodiscard]] bool hasPremiumEffect() const;
 	[[nodiscard]] bool customEmojiPart() const;
 	[[nodiscard]] bool emojiSticker() const;
+	[[nodiscard]] bool webpagePart() const;
 	void paintAnimationFrame(
 		Painter &p,
 		const PaintContext &context,
@@ -137,6 +139,7 @@ private:
 	bool _skipPremiumEffect : 1 = false;
 	bool _customEmojiPart : 1 = false;
 	bool _emojiSticker : 1 = false;
+	bool _webpagePart : 1 = false;
 
 };
 
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 0f9c850c0..478835fc0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_reply.h"
 #include "history/view/history_view_sponsored_click_handler.h"
 #include "history/view/media/history_view_media_common.h"
+#include "history/view/media/history_view_sticker.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "menu/menu_sponsored.h"
@@ -179,6 +180,10 @@ constexpr auto kMaxOriginalEntryLines = 8192;
 		? tr::lng_view_button_user(tr::now)
 		: (type == WebPageType::BotApp)
 		? tr::lng_view_button_bot_app(tr::now)
+		: (page->stickerSet && page->stickerSet->isEmoji)
+		? tr::lng_view_button_emojipack(tr::now)
+		: (type == WebPageType::StickerSet)
+		? tr::lng_view_button_stickerset(tr::now)
 		: QString());
 	if (page->iv) {
 		const auto manager = &page->owner().customEmojiManager();
@@ -211,7 +216,8 @@ constexpr auto kMaxOriginalEntryLines = 8192;
 			&& (webpage->photo || webpage->document))
 		|| ((type == WebPageType::WallPaper)
 			&& webpage->document
-			&& webpage->document->isWallPaper());
+			&& webpage->document->isWallPaper())
+		|| (type == WebPageType::StickerSet);
 }
 
 } // namespace
@@ -285,6 +291,24 @@ QSize WebPage::countOptimalSize() {
 	}
 	const auto lineHeight = UnitedLineHeight();
 
+	if (_data->stickerSet && !_stickerSet) {
+		_stickerSet = std::make_unique<StickerSet>();
+		for (const auto &sticker : _data->stickerSet->items) {
+			if (!sticker->sticker()) {
+				continue;
+			}
+			_stickerSet->views.push_back(
+				std::make_unique<Sticker>(_parent, sticker, true));
+		}
+		const auto side = std::ceil(_stickerSet->views.size() / 2.);
+		const auto box = lineHeight * 2;
+		const auto single = box / side;
+		for (const auto &view : _stickerSet->views) {
+			view->setWebpagePart();
+			view->initSize(single);
+		}
+	}
+
 	if (!_openl && (!_data->url.isEmpty() || _sponsoredData)) {
 		const auto original = _parent->data()->originalText();
 		const auto previewOfHiddenUrl = [&] {
@@ -510,21 +534,22 @@ QSize WebPage::countCurrentSize(int newWidth) {
 	const auto innerWidth = newWidth - rect::m::sum::h(padding);
 	auto newHeight = 0;
 
+	const auto specialRightPix = (_sponsoredData || _stickerSet);
 	const auto lineHeight = UnitedLineHeight();
-	const auto linesMax = (_sponsoredData || isLogEntryOriginal())
+	const auto linesMax = (specialRightPix || isLogEntryOriginal())
 		? kMaxOriginalEntryLines
 		: 5;
 	const auto siteNameHeight = _siteNameLines ? lineHeight : 0;
 	const auto twoTitleLines = 2 * st::webPageTitleFont->height;
 	const auto descriptionLineHeight = st::webPageDescriptionFont->height;
-	const auto asSponsored = (!!_sponsoredData);
-	if (asArticle() || asSponsored) {
-		const auto sponsoredUserpic = (asSponsored && _sponsoredData->peer);
+	if (asArticle() || specialRightPix) {
+		const auto sponsoredUserpic = (_sponsoredData
+			&& _sponsoredData->peer);
 		constexpr auto kSponsoredUserpicLines = 2;
 		_pixh = lineHeight
-			* (asSponsored ? kSponsoredUserpicLines : linesMax);
+			* (specialRightPix ? kSponsoredUserpicLines : linesMax);
 		do {
-			_pixw = asSponsored
+			_pixw = specialRightPix
 				? _pixh
 				: ArticleThumbWidth(_data->photo, _pixh);
 			const auto wleft = innerWidth
@@ -644,6 +669,7 @@ void WebPage::ensurePhotoMediaCreated() const {
 bool WebPage::hasHeavyPart() const {
 	return _photoMedia
 		|| (_sponsoredData && !_sponsoredData->userpicView.null())
+		|| (_stickerSet)
 		|| (_attach ? _attach->hasHeavyPart() : false);
 }
 
@@ -727,6 +753,30 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	auto lineHeight = UnitedLineHeight();
+	if (_stickerSet) {
+		const auto viewsCount = _stickerSet->views.size();
+		const auto topLeft = QPoint(inner.left() + paintw - _pixh, tshift);
+		const auto side = std::ceil(viewsCount / 2.);
+		const auto box = lineHeight * 2;
+		const auto single = box / side;
+		for (auto i = 0; i < side; i++) {
+			for (auto j = 0; j < side; j++) {
+				const auto index = i * side + j;
+				if (viewsCount <= index) {
+					break;
+				}
+				const auto &view = _stickerSet->views[index];
+				const auto size = view->countOptimalSize();
+				const auto offsetX = (single - size.width()) / 2.;
+				const auto offsetY = (single - size.height()) / 2.;
+				const auto x = j * size.width() + offsetX;
+				const auto y = i * size.height() + offsetY;
+				const auto w = size.width();
+				const auto h = size.height();
+				view->draw(p, context, QRect(QPoint(x, y) + topLeft, size));
+			}
+		}
+	}
 	if (asArticle()) {
 		ensurePhotoMediaCreated();
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index 1f06f929c..37471f869 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -21,6 +21,8 @@ class RippleAnimation;
 
 namespace HistoryView {
 
+class Sticker;
+
 class WebPage : public Media {
 public:
 	WebPage(
@@ -130,6 +132,12 @@ private:
 	mutable std::shared_ptr<Data::PhotoMedia> _photoMedia;
 	mutable std::unique_ptr<Ui::RippleAnimation> _ripple;
 
+	struct StickerSet final {
+		std::vector<std::unique_ptr<Sticker>> views;
+	};
+
+	std::unique_ptr<StickerSet> _stickerSet;
+
 	struct SponsoredData final {
 		PeerData *peer = nullptr;
 		Ui::PeerUserpicView userpicView;

From 3a2c5c6d0aeac9b3208ae9f08fd2fa4a774189ca Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 18 Apr 2024 23:17:18 +0300
Subject: [PATCH 355/596] Increased size of stickerset preview in webpages.

---
 .../view/media/history_view_web_page.cpp      | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

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 478835fc0..2a6f031ed 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -42,6 +42,7 @@ namespace HistoryView {
 namespace {
 
 constexpr auto kMaxOriginalEntryLines = 8192;
+constexpr auto kStickerSetLines = 3;
 
 [[nodiscard]] int ArticleThumbWidth(not_null<PhotoData*> thumb, int height) {
 	const auto size = thumb->location(Data::PhotoSize::Thumbnail);
@@ -300,8 +301,8 @@ QSize WebPage::countOptimalSize() {
 			_stickerSet->views.push_back(
 				std::make_unique<Sticker>(_parent, sticker, true));
 		}
-		const auto side = std::ceil(_stickerSet->views.size() / 2.);
-		const auto box = lineHeight * 2;
+		const auto side = std::ceil(std::sqrt(_stickerSet->views.size()));
+		const auto box = lineHeight * kStickerSetLines;
 		const auto single = box / side;
 		for (const auto &view : _stickerSet->views) {
 			view->setWebpagePart();
@@ -547,7 +548,11 @@ QSize WebPage::countCurrentSize(int newWidth) {
 			&& _sponsoredData->peer);
 		constexpr auto kSponsoredUserpicLines = 2;
 		_pixh = lineHeight
-			* (specialRightPix ? kSponsoredUserpicLines : linesMax);
+			* (_stickerSet
+				? kStickerSetLines
+				: specialRightPix
+				? kSponsoredUserpicLines
+				: linesMax);
 		do {
 			_pixw = specialRightPix
 				? _pixh
@@ -755,9 +760,9 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 	auto lineHeight = UnitedLineHeight();
 	if (_stickerSet) {
 		const auto viewsCount = _stickerSet->views.size();
-		const auto topLeft = QPoint(inner.left() + paintw - _pixh, tshift);
-		const auto side = std::ceil(viewsCount / 2.);
-		const auto box = lineHeight * 2;
+		const auto box = _pixh;
+		const auto topLeft = QPoint(inner.left() + paintw - box, tshift);
+		const auto side = std::ceil(std::sqrt(viewsCount));
 		const auto single = box / side;
 		for (auto i = 0; i < side; i++) {
 			for (auto j = 0; j < side; j++) {
@@ -769,15 +774,15 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 				const auto size = view->countOptimalSize();
 				const auto offsetX = (single - size.width()) / 2.;
 				const auto offsetY = (single - size.height()) / 2.;
-				const auto x = j * size.width() + offsetX;
-				const auto y = i * size.height() + offsetY;
+				const auto x = j * single + offsetX;
+				const auto y = i * single + offsetY;
 				const auto w = size.width();
 				const auto h = size.height();
 				view->draw(p, context, QRect(QPoint(x, y) + topLeft, size));
 			}
 		}
-	}
-	if (asArticle()) {
+		paintw -= box;
+	} else if (asArticle()) {
 		ensurePhotoMediaCreated();
 
 		auto pix = QPixmap();

From 2ab8bb13c56fa5d27f3a2d59c3fdf84c598aab6d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 17:38:24 +0400
Subject: [PATCH 356/596] Fix links preview.

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

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 464642d27..f942cefe2 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -3510,7 +3510,7 @@ void Session::webpageApplyFields(
 				}, [](const auto &) {
 					return WebPageStickerSetPtr(nullptr);
 				});
-				if (!result->items.empty()) {
+				if (result && !result->items.empty()) {
 					return result;
 				}
 			}

From b2d8e2a1e66316e91b4133a047f61fa5e1979df4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 14:55:39 +0400
Subject: [PATCH 357/596] Initial version of channels/recommendations.

---
 Telegram/Resources/animations/noresults.tgs   | Bin 0 -> 8590 bytes
 Telegram/Resources/langs/lang.strings         |   8 +
 .../Resources/qrc/telegram/animations.qrc     |   1 +
 .../SourceFiles/api/api_chat_participants.cpp |  40 +-
 .../SourceFiles/api/api_chat_participants.h   |  13 +
 Telegram/SourceFiles/dialogs/dialogs.style    |  20 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   4 +-
 .../dialogs/ui/dialogs_suggestions.cpp        | 710 ++++++++++++++++--
 .../dialogs/ui/dialogs_suggestions.h          |  74 +-
 .../dialogs/ui/top_peers_strip.cpp            |   1 +
 .../ui/widgets/discrete_sliders.cpp           |   8 +-
 11 files changed, 807 insertions(+), 72 deletions(-)
 create mode 100644 Telegram/Resources/animations/noresults.tgs

diff --git a/Telegram/Resources/animations/noresults.tgs b/Telegram/Resources/animations/noresults.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..62a21279fb766aa9aa25ddc077936f2f51f34031
GIT binary patch
literal 8590
zcmaKwMNk|J@a1uL8Qg7fCj@sJ+#LpYcL>2PxVw9R;O+!>2{yR9YY4F4zjjZ%Roj=}
z>vw#YuGbVlkf8o&U|=te^qfh*CVw!;`OQ%Kz+?9DaR{QKSpnRIh(e0;y&zlZm~wXy
ze8eBuB-m3^6QO$5)fVz}Sxz4E)J<cQDQGeQvHJ<r?_FKf%zqp{ntWTJp(RjzZ29^&
zoQ%J&Ifw+Tbq`V$+(x3jOgiW26nZrIZh!oH!0vmJVR}BI`2Kl2>-_Qb>-%2D_m5ZW
zkLAbBO^Cn4`y)jTrf%cw^KpX7mR!Kj(ckB`wyI+Pry+)aw%OC~*Eu?^j?YKu8TMs2
zuk0&r&Z3*{!<(!cZ_I&j3Deep+mEh4W8lV}r;ofe!+6ZsHY+b$k{i|3Q7!R5Qgya(
zlFnxhzde8aorFjcVmJDF|LFPNt|Ix83OtPIdd`WDI+s%Qi$M9nq`;kdwF*^Xa`@+N
zVi&usUW{Tur@-gE`NgDfO94B?uDO2RnD<wkF&r5QUGc4s&c@97ia!4hx^^(iODxVn
zCqkc1aKS5PTS*I4)Pv?jwm!@*8IOTu*z&__-<My39lag?Z<l8V+_Zwta90clYm95^
zcC-fY(s@+TRC5K@71{Y>TzOE}H`uup=2>Ti2%3UL19KYl2u?_m%JBMov)?Qz_#oQG
zaBEU1VHMwR<rLSgKi$85eju(}Uw^-{%khHU*mQmoEO}qN`L45Rc<q%_n)TtRc~pOZ
zKq6-Bdf)eNzaqhKRQPlM<LUmFGr`~9is@&|jW!3`NB=z5=_~g-B6s)>vDeLCO`}(J
z*3ybEqRziWH{b7GpZ1R+S_Tg$Z3TUSyG6}3Q?V!eR<eh&w%tdb0mGoDM<+iG^t!{=
z2t<#9Rc=-)!pm?Pl3M{@>J=Uw2WW+2X0hnxA}B_MNt|XvqY!{SXbz?hj<s&=B7(Y!
z1T<BbPG_a_bKhF$k@p+30Ge$PP8VeFVGc5wOT#((r<+Cs`KTc|GyYo*P5ChebJgkB
zF$FgPKx2Atd~^+M#XhzDxNEr8*VL>-U8{6|tH$`;{2Ws08S=n|WNr)K#)DxH&FvA*
zeTMef>&-194#qV-&bpR5n$b_9aw~(8!9mQ&FAEnAGEFJ4(=$puT@dverwNTNx)QYm
z23GCbJwVrpz<}{1q5|ZfWmQIHdZG5Nq&gQ%YY0l{4_G=$`bX$V;(wFH@ro1CWR-+6
zz*G6ndG!jf05K&vEzAl>*FzkNn^F{UYW*(=o{f1Cty+VApe5j9wM{>hKAN3k(_<WU
zS%IyLSqr8dkDXy>yVWZ#&+(s$(ZJn=V$FzZ&3wJ8C23kox=FbRI=CS&w<0zg0F#~^
z3kx-VIyQ<YV^)2XT%`q7Qhk(^t_-E&m!Te^%H`-ZuPN$EBro6s{CQOo(w7+N_M{Ag
zvhoP7f57xzS!3hWbm9q@Qq>5WVJ_0~$<Y<H=bQgF2G0YuEcLKaEl;YFvolMr=kaFA
zFU$C;*fYNo!UL3aRD+m;q><Zw9o4+WFQt4ntuK@#8>nR#q??~haVz^3pua)?L3C6*
zPc-$TllTgTu>&AT!P%MYU8_L}JB2`L{%sWx^LT7kAV9s6#;~uR6b*IFE4|upS6%t-
zL{kc`La>&T{TQ0lqG$Szu;gMPVndv*;9bGbb1aN6SG)KUTdw_2xuR@0rT9nFfw_8s
z@aDyt@fx2;sGZ9awSWmJr4N0{lo(1z$Ca`)Sri=VmOV0bh4*IxVhFD4K(t1@QpQ(4
z#ES9;YniAv>@Z%tw3wY3-ak!m;jI#%aj@%Wx)<8=5imOACyj;%WcGSClhrgMCx1Dq
zLD?q#KzxFA6jyr4gs+CCQ~9s3UJgjDK|&32b_EY}j+~c1vb2?Qd_?wCuGvs{ZA0>2
zD4kZtx@PD8-W$2yljmIMm^K^%$-!=bgTreEecIiwcnhRX;7|F)?~`liJ^(gi-+4#o
zL?XK<molzUPa+i$B+3mBvO-iO&Wj@0r1<SkOsCJ0VzpJ}g3bF$bVX=R;|nLTWupyA
za+uJwbE14PPelVIVgAg66wbAe*8;AGXvzhy4r_YV*x!X?2AYfBLUgyzFqX1t{a{pR
zvrxC=BDea53e>^tz_o)eIUG~SjG*5RYEImz0B%CKX8aP>DY5zwQ}yC<l?N5*_mPTc
zsZM19BDN{4TaZ<hN1KYSdOdOf<9amRrRjE$zYhFIbpJIsOka;!u7jT)F_`8CfPf=u
zQei^Oc7#6h_|5apG-bj&7W`>G{oy2V6a*1Y=5itwSiNIMCupq+NxlA`EEWj9`-MPp
z#L-Vt5<TzVmkwz_H!tI*4`5-fW3%(=2bJbm_V>K(H@(1F&dd_DYb{eM$q@ZALSqvL
zO@0>{M1I>-CbwF=s2KU-ay^gBC7VD*DjW-S&|fZPLmR6-o%UIa1FfTmwea_%)Hl+g
zsev-LE!=R{g8A(xu;fr7LJygeYAx<F2AQh0-BH-d1kY>=tB`I+nz}-%u;!uJvp?A~
zn?N8LgjYA6C#E3RM8l|$2ytV(ChWIT9_&ZIW59oKIVY`m4(#~4(n}N_r#Mm|vau1s
zZV-w_sS8~ETa<@=EJ$+&A#{KF5&whhX2r%<(9kIV8lASm_8*Pwt&uI$#mZxM^*HZB
ztsRTpXuZ?<E3iydp=Ni;v$9hi)38cmCc}>ZV32aYLmER_N3BC%Jf0{iw1^accCcJ6
zp6i`!X)Mj)+^}q2;;*O6^Opb-Eo|$n0;e3p8jH&X^^tufM6si;eigUZ_V&7~NyAOM
z?oQFb55LdAv8d@l8PbxdogA^PDJns0j7R8joO%G8JoB+?J>~)(!wNpvCWfHlpLW#o
zg0)A30T3SZi5Dq+YJd5Cv^c{6?VPkgAp9Y=B#uf{2wEB*I%i$0CQ>6_7SO@BcmZKO
zeI9B3i(FY6;_K19^C%@iMfS``LhC30y))_-IYWv<Gto*SG3Z|sa1@|={-?A1eWWZI
zd94;McqyLs+Z7xwL0FQ2Gy+uGngaP6Omg&@SXUYn8HZr_3li5GfoKQ#n*~>7Mtj19
z0|qpDOsDI^xn~(ZOjyZg3HNfAf-+gobWnFPVE?_{h=uE_g)NiGJi`uwHs2|ulfu4H
zt@@-CvyyC4Iue?!Ry{xA?`?s~z8i0{NbiqxjF@zu)RRCz|M&Bp0;i{OkA2Q!0kaKK
z4;aQ`89)?n^*8MW?y){<Vam;g8u~Dw=X=IH?Iu}P%Fu+k;X^YoG=aUf(`?qAnVfvI
zgC;qv7=9ZZ!<!!?$+G2Iw~7@G=@Q`;1eDPz9k4H_*u`Zxafm`jgvQ=LOEBu7{`Yd4
zrzsw`{9niZ{uNz03&ZSLp7h3Y&%INa9aAFMI;0m%XNme`>OUpzJmucwN!2T6%KoG^
zcP4A=ESxF$Wiy|qL<p)|)m@<T2#<Wuo=z2q@qvl&klO1FmuLvR7GOILCZRjUzI0`b
zq61ucsIXkgxbPlql`f$p5tPt*E1$?P@)VZ^!fdKklO&axh{1VOn-1=uU#kG837GE`
zi#~eV$kCxIIAKW*Nm*Y4YQ!z;rV+>1Sh-cHchYr|E_{ZV{Qjn;+qx@b>b?4`B!Wtu
z4w#_C=gFEvWqjFFm%A{kQ01IbI&Ee*?}We4f`WeE3a89dX}3OS?kjPb%x`mLyT=aN
zCtxCTfCw{jaflrbV_#Mn+lmz0l+gwo_2^9;=L&wS7|V)Vsqk218JMfyp~UkKReJ^}
z)^)Ae#7Uz=oZ!z9_{#L<Kr*KEYavXgxazqNcsC%LG$7CFQq?j)4j-&mw%o!Cb?`JN
z-FG8{qzfhS>kB2<pIs*;`%(|%uB)aA^hnHW<%@)1Lx&n{V|vj@iyFz&af@Qc;^Brp
za(I+2*)39wJ338QjZJ|=>w>!~ov)n6!#a-hIII94zt*73@Qs?#`gtDy(&c1bH#y;d
zkWws9Z7JI^B!P*68pK^R#~ZeTu19JC2!AI|)~uiE_`V?`cy%eMj(O}WMc8qgc#poH
zp<UZOST;Q@VA`jYqenj;Au8o3%O@F7D8Qi~Wr#hc4yQ%xsv3d?)#NLyjVuRHj^LG5
zd50Zy$@{xlAp+~8bL2{U&%aqH0>nQpXwLrE-i(&~LBu5?NxfjQfXL6U1ASQtnAbs`
zAElshPHxy87z><{i)SN@)lkGvR%)wPXu*>}vu@6mbOnL7eYkj{w?~!EX;*I`+uOYz
z?_k0Z`2h*)EMpsUE%PAqi&WIQ`4q}NqYeXL0*KYNN7ww$F>Ba4OxkY<rpI+lo4y?S
z7WGF>kVK0Gd*(5wqK*cZSUJLF!X2Q+K;YjA)(|Ucv?$e=rX-j(824YAn=4KlEu`Vq
zYtM=)esdt<2Z9WYSKc>W4vkV_0%D5*fjmCLOW;wQ{6)ce+a>I|k}CyLaaVT6-0J~s
z{4C5UQ{czOZ{ZW>QpzDEjE3JvsLNO=*kgi1NSLr3FgkH7!P@!Ft`)$Fg*umzElOuG
z*XYgnno#N;rSfs@IEsaa#XVV`*}2?T-N=AyL>mCP!Ja(TXbOO1+3IEu>{BwmBpEWj
z(=_y;A8YsUu~6)c&}t(1ulJYUp!|=d#lCtD8tb4n5qfc0%|NO7j=$#~N*nu5md-H+
zr=r|Fk7s|{+py~eNuTu+%O(G{Syw?DFF^||$6{tBxaLx7&cmF_g$cGQ|5<kF<W(I<
z)Jx1R_fUthka(7e0KA<9E5GgHHhAjM5884GRai>4%rue{YG`6zj3kzEVhkxB!zAJq
z;Pe)ej<0)@PQh2tJK_XK4O(F7ua(f7!C*e%*cuUD283OM!9oWO4VmJ%Z^ooWGowBt
z#&=fWxUbze1c9E_1SeT!qLG9{+^uob)LD_ze<n^?Wy7G1#yWhYP@M*#ZcRfYjhp%N
zq7Lx@lhA71VXJ?du$S97z67SarOKFNNJ3y$PjGM4zsT}Cjrdf3Px3i+i!<s6T~hfl
zHfn`BuawHI=_Ta8;(Bv?S+CwM=fbnMFrrbBGclccRLVhhD&3#D#h<^OIU4kpAx0FL
zKM6?}A#a*dgmP#C61a&OOh)I2jojjuvKG}JTWeMRkX9=UTL)znXAW?#)0s?>`PupI
zymdV6`<j)D45?w<dKg@OGFH@;hwiM<#o<)7*v@h5E$d<)?$F-wTOyX*yzmeFG=@NT
zXDhTB-NHHXwEL@<YTiiKZ|j9B5>M>rA1+hfOol`1JpQT!mu#2fqALk9srdr#0k}5t
zw3B%M6tc;DtD2c}d*{YUURwLdZ^MZ|9oX!!)*>3-Tf#{8%mOv*u;;ffm*8LSrh>&E
zFFrh%g_qzy{Ea|;m$x!`!Jh+;izB60uxt{5Rp{mM)Z%cBK~<Sdr%Vh>8;jlcT*UfV
z9v_&fM6>V(NnntBuU>qA^j}?5TrL?sU@a=-1V{+Y&9s1)6_#oPA3I4a$bv$%Qvaw?
zjTSZmR|YbJY`=GAnnBpzj4q;c9-zA48&^iD?zxbbEWkWpC@pvxH#K&EL;ds8ti25R
zByt1yo&P&}gxy;W?$=Sx7}B|jn*z_0$VHkYp+;v#<}^k9H3iB>Xj<63Fg#{bCWDl{
zh2<9%Rfqfayg+8I+<a9%(9C@4jO@8PqY2wj%Zt0RzH3kqArUzG(W-PSR_Jkh?5s%Y
zYah|PiaR$KGT!IM<>Rb#V5i!fVMhf-LxZO^h#KP#P``E#MUwcXq&{pf+Osp@!eI>_
zg)aaJ>!%dLG4KetY=6U2Uo3hYK1UrGj>pN5(pyC_8pgGXM$QWzWh`K?4lNCEk|csv
zaCCg+FkKw)CFk^Ud#v|iTc85Ofpsup5BOqbZ41|TRs(nX50D!jF3N8~HM=<@t~!NM
zOKH^N|6wYPi%O?Zu0M_IR=ZHHJ&kMrKh)p@aqP+zOaFsSnPM)!E`GB_q%Diie=U}P
zw1H6~Ys^_%f={}=GEs?noJe0c)sz~Wjmc_p-Af`%FW%Cs!<rtOT-0unJdkUw>7R#M
zj+ypGhHTWELP-?asl);byzhCzN%&)sdVyusk>cKmw!fF7j<POMX9$#h;^#)^hd+#H
z{owd=$nq%Ot>IeM>UEUUwr&j120aT^0oxNYtzufWT7}#reCY>bjXO%rz1ChWj&qvN
z&))`gTTHjw(QOLdvzmLG_AxBHG1ld-Nu^CcWEecNI5_;0DR0^^3$}VX#C-z~)(igx
z29qzOnHE|E`#x+*K?9!!2ES?Dr&e*_MK1yU35FG2B+&O=cLjE!3@Y(n^xSBqh27dK
zDh*Mn%J|PB&)$cXXA6>4O3S~J;%9~McXh!WmEz6$3}AexAx5v_&P6h4rFHwwQL0uq
zdyBnsxY(X}bU7F`MemccK~tS0a1k5a4F&2=ZD0P!LlcEFQHfwi5*X{2UZ^N`KA+3j
z0WnXK8&9U7pC6}bZ7t7bipMR6=uPmLCmEe0yb|k$Bw|a8HMT`4sx94yMevs|l8IMP
z?c-&ruZ$9H1d*<|SBi{hRbiH=^o)`hx>Lb!(#&<_hF(nt{5{)K%glA1ym6@YuEqyf
zBWXxyG7V~Cm&b5ug;h~2s(4l?^cIE<78d@cL@99tP7#I#H(3uwV`(>3J9Q*&M|UtK
z2_3JNbG3HnS>-uTRO3zs-YYSpY^6Ff{Vprz3r!!9cYM)GeMn)@VlJ$9Lf$3xnQ(3i
zlA)Vjnc2>XX*JR#XG(O$x>4+VfcS{3;`yJE(0^m6t^eBc<vFwG5%iGMc@E2yyKaQ2
zc;k%eWxW!A1q=XJWz0)#3@fa%uAYu$)!sSelPILY$3;wr7U3V>Xra@+D}4mNv^JM$
zq6Y^3N;*V#Q3MZ}qF4*uSlF?x{;)*~#2Va_l-!PD)RWjL3*x?7?T9R%PVz<N$5s#<
z{JIp;NUvHBPuE|jYOio&18nexSfh?p?GNpyfT%?Q;g1J4Qm6QX7N*K5zhH)x6q?G=
zb%V{=f`v(O;~ipwLlLmh{0mK{o9tjy-=Kfeu`EBTHR`TT7_;Ob&@QQYxA@W%-#7dD
zE24_j$x@66os{IUN-PN)*T#6@_>e=PF4K8{Pz!N{v;{`v$lyvcsBiTAAA6&%Fry3v
zBGd~>My5ICBm6d$hceq8l1xG{FIKXCi+_0$4U3h<0$jw24QIw&jIa^|7+OH84c^D%
z@75*7EO!fw)1e-)K_oWzJ4NA>G;8=*MEE^A!_X}+cxtrfeDTTm{7+j;%QStX-uVA|
z#aaD(DcqD?24E*A>50C3*1ARV5QQW|>gd``i!;-)7c9rwS<qzYUE%KzGgW4(QZ%`e
zX&Um4*#($O;gm)3B+fS#kzsSOxrAdM+lN?;atE*p=ricm3~ODS&T$CT2$_V^S>CHc
zD;}a!*P?&&B5Lw~3Qwv3EjDHOx)!XR{q0K3{fX|nRItRK+b57g{5Dn;5=JvhN$=+r
zE+Pe*3JgtS<s?GM!gd*w&fwKk<3utvii5fP<T<|Q=amaRG=-Vp^?J^uVVWO7ILgLw
z7?wFeh|sA6iulH?Vl$$z9e_$&V{!Fg*M@-&T(Vv-7J2!5O#VZmBkV!$jLnUyxvzEp
zR!>ob+x)?q<zy5JuZ{WsT^UpQPdt#oMv1;3-Ikq7#7^rYpMUWyrZNY%zJOePyi>OT
zy-fPvq8rdUsibaNjTaxrblXevoERuPe~^2}=%8X~VYgd&@B$RV0hdkm{>rU2z=RBK
z$s79+`Ef3ns+<SZra+YlJokajW|lwO;8PBAd&9Z{*$Gv#UZd55kcIs-g8krkB;;Ps
z)KA`=BLB{188B7CVG^Hvp2yo!1=s_8`2>;+8wj$4DHBKcO);*KXh5=@g;KF!=z@wU
zES6TA!xQPn&5o@XcdgUq)*2i$p648duht3yj=i?B>iw4s7=4&15Iuj#6>(l_ca1NJ
zgFsNLACJKiR>2%RD^Vessk{UO%RlmVF=YjykS>D*8nBbfS{q9i%yk3_<`&FITfTKO
zU!B2^hJ%gG42;#42vHR>dc&x6fnY?y55l!^)j=WUjCzdA%Y+GCiUIg6j&x2TCUbAi
zku#gJJ=gBnOY)SGj^QMs1Y~m-v-j?W8)m$Qx0vwQa|@suUd1F~^b-qhI%lXcNZA&5
zM0W(>$NIHljODr8qV}{%V1U>gQ;^7tus$^JGgA%B6ASK8F>!X<O5F0*!N@W|$a^{}
z9AD!lw|rhXmCTns0dTxQczL*t1*R_8DIEPd7k{7)>W^aep_Sl$4U@%kIFw;@tMq{2
zQ`kv7VWI6y+NAOZQ25c4G!8qJn-lMH4h6^GW}Y@5vW%;TV0Iu>xqdA@;+zWf*3*rL
zP;^L2dZX$RWB0H(NXt0pjq`bZfya_|5wi---t7oXfa{$}DhYSLQ7{^0PHm#rRoeX8
zghYVRm9I3Iy0dY%q~f%nIeG}ZhuYke-T(`%X}C}?<EeiOT18{UDTYFYD{jXVA^_sE
zzF)=>wO=MXhE!m66)MH-oU4^KG-su(*orBOF?KWy<L1lCX#P_UJG23t!V$@;dTnj)
z1l1V8NRx51(a$l7P3YK5e35?P<*ERUa5=hg#^}t-@J4JJjw`JJQFNe5H#W^olDPS7
zkgQ=~Dqu@zR13vhNf3fa<gmw^XHm!1PONFrU|`BdR3)khNJ_8QQrAO%{XTsk9m(Mn
z%ArOynU?o06U7bj8HY9WitQa!(yIM7V|BToBi4HL_pSZm8Kh<xLGUTC4CLiiP>NH(
zUsbcK(YC-iD-j05p=Di%IF1RW#(`WdVeUW*(7XTq_HV=ac~w9MOL#)x!%}!CNE+!^
zEpw0<ZCS7PP9Y=5YQdVR;MOz*UZSl%H#L!5Mg^txF;-<Nc^uADzx^oD^j|vof7VJW
z4Y5m(E;N^sczGq1;#4(gmX`i6Io<R_btq6fQi1~v9YVBqJ%Q4%2~`fm!K>(kj%zps
zx56=iA67-F2oGjL(h$!?8Pvoo58?P9YpR$i_B;QP(v%D`AFqN-9FAcL+zN2u|1Wj=
ziU<I7FN8nwQ<R*Ipi@vXHTz3p=<zwKg5=>9nM~FHU+ZoVDrJaOaf%l6ae9S)CGcd&
z{8{j2EaKu2wF;`lP#(iuynrzJ(-go7R0@Az&e7rRkm<aPgy+1RYZbX;Qz5}4IC#HY
z2~8$C1aNR?RpL`pgv#k}60Ous{nZjqNvme8T`8K&&;O;>=3E;e+0LsBFfQ?t$PV<i
zO?B0cx%c5{4S)Da98t0=Tu`085?TSFM_|_Mdcs2f9fwZt|9{?b>!?O8R=swfhxMMd
zBCRZi6oyq^z3Q^I%Yzae$K;(f=TE^^Eb2oO0~F>NS*<VC7W%Cic`M|;HF0!xCan>8
z=I1{Q`|)gRM(dQ&E@oRNT8#h>Q;$&1?sz`-S{~pP6S1IS=W6Qt@JPqF#H+yJ)NZ=7
zJ*l>rE@{V94LiRgCBDWR)6J}Y<EW6S_elQ}O@6m^at$f)FV%*Hev@-#w+pFg95l8S
zGRyZt*l?IwC!s)QI%46h_AP1a<-P1MN6<^g0J{{*WqFw(L`$XMK@}NfnvM2h_$)N)
z!D)E$?d5J`AY5|q)6!MEBxZcO?WAZe!LIKD+I(%lVpjB11etg5d2(ETUJJPvJnmw}
zH{gy0V?w0*WZ@q@Ad`p+LxH=4;4K;R3m0h}U85V9psnO&UJWi@R?L5>l>eR~j3$$|
zdn%GxE%;{qV3tCr0U&IduB|Irmb@dR^!h~k8_ofND2GrQ?HEPI#f#}VjGF)0ARs>&
z30N89SR>gnD7-HQr;;ojoN9-{oX|*=8Ti$9_!)Z{g}Y0yu#AB<oI~6zquGxRzAz}9
zD|FG7*Ibp&n@TZGFz?Fvz-e+muhO1h=$!=y(dgjDGg|u+KGAJX%8=nnG1zQY`GDGl
z|II&O{#1h1C_3`#q}KsZOu?ES&5EsCOixxTFKfRrpY8GB@zlfxB{glN@1C)|QO4_i
zx_`*V>y+E|@ayyMq)Fh*t@HQy<L%F<jOkD!P(^<VEC!d2aMpGN%T2S0bLp*nkV8~_
zM^7u}1rj$y4}*QaLLwz{%uaMR!f$>+o%=C@lnp|`W+x#S<5XS=1HNn4DX%%`aV&*N
z{#wZkJ|#)_bB%Y9(Ga+uo$n2*R(wl3U3~7A`hpz>J?052&kdawF5%hG`dkx{uaeJ#
zTk$3(CwCa{xcn7P?(T+oJMc7JSAwvf@J+*Bg8OAdiM6X5$-ZbjFJQ9daeBwyd9<7;
z;0VEvqN{I+zSSb5ryW2%C_S^ad52WB4w(uwQAN;1ZKo9WwRp9#V<m!FCe`;L=}AP;
z_mMLg{F!vCA5ZJp69nM6vvM%Ipn=teD>tJ7oZse9%?;x{QZarnb98mV_PFD-txd;o
z#Ex;ge220wUWy04`q6mUX><T<z=%jQJZbf=rOK|7nq)0yNm9yLRe0}5Ib!u)WLu4S
zUat1fO4I}U{M@S@d$HL=wyEe0I93H&lGduO`df}3KJh9Hs&^Z~0&Y)8=ZFeyY1F8=
z+d4~Se5q2Y)>!^S1j?u7{CPIn12;El<f#||D1pmFQ_xMG?#AU5!3u?(|J8iS;o0Q^
zu|?)0UOU)d>(^ACKau^@ehx2Dxl7xd_4O3~hN|;&e%&(h>oR$-7Et^HuEx;t%(N~a
ziv4;s6tU4j+YMh=^oe=!({b91Cp|@t9l~V2dHV)=e1{l34kZ+bmhYcEU9x}1B{+V>
z!8<P<L8Ed8ps$OQU$4ix$+9Rg6!MUC+^NJ%TXgA4)p^$KC&S<UDNDMBbm%nX`ESpD
zTZg7`bE^CP-9P8xaK4>hIn-7cbYRVMYMF2nd+*Yv#an3T;9wqyV;q^Z`7@~K@SN{`
z^ObC>*BNqsY?ckY4jYz4`IAsckxrOvsl5H|sX~#GG*h(g0IQ~gCA8brtAHqdp6H@;
zq+<y47W@imp}AR%f9;m1c=yIjQ7Ndr0d7M-L0cF0X>bGQa0@O1XUcWNGjclL^^hWo
zh;TqN6L>Uhv+$t-Uz>@oOgb-r2&S<ZtR3W>UEYe_G9}gywc9BwYWqVpEfKXKn%=o!
zSL3qe7n~5c^&+$X&MhcXHi2s-Ir*+0&{8ka)%1gmf&N_lY+QIcnRCn{Nol>IvG00-
zyePx)rqVt`^)9M_CEE)V(2PrbxqbZ8$<t83#n2B`knP(erOB1mb)4qawCKmjenEw7
yT);`?n)?w&z!JYOw(f&jb|{G2|0hs)_}B|d=oRJFNA&#@a|%1zjKl{T>VE<2JadKs

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f8d2b1175..0f4535b16 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5123,6 +5123,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_recent_hide_sure" = "Are you sure you want to clear and disable frequent contacts list?\n\nYou can always turn this feature back on in Settings > Privacy > Suggest Frequent Contacts.";
 "lng_recent_hide_button" = "Hide";
 "lng_recent_none" = "Recent search results\nwill appear here.";
+"lng_recent_chats" = "Chats";
+"lng_recent_channels" = "Channels";
+"lng_channels_none_title" = "No channels yet...";
+"lng_channels_none_about" = "You are not currently subscribed to any channels.";
+"lng_channels_your_title" = "Channels you joined";
+"lng_channels_your_more" = "Show more";
+"lng_channels_your_less" = "Show less";
+"lng_channels_recommended" = "Recommended channels";
 
 // Wnd specific
 
diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc
index 3322b1387..16920ae4d 100644
--- a/Telegram/Resources/qrc/telegram/animations.qrc
+++ b/Telegram/Resources/qrc/telegram/animations.qrc
@@ -25,5 +25,6 @@
     <file alias="collectible_username.tgs">../../animations/collectible_username.tgs</file>
     <file alias="collectible_phone.tgs">../../animations/collectible_phone.tgs</file>
     <file alias="search.tgs">../../animations/search.tgs</file>
+    <file alias="noresults.tgs">../../animations/noresults.tgs</file>
   </qresource>
 </RCC>
diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
index a7d3d9f64..d1c8650d3 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.cpp
+++ b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -212,7 +212,7 @@ void ApplyBotsList(
 }
 
 [[nodiscard]] ChatParticipants::Channels ParseSimilar(
-		not_null<ChannelData*> channel,
+		not_null<Main::Session*> session,
 		const MTPmessages_Chats &chats) {
 	auto result = ChatParticipants::Channels();
 	std::vector<not_null<ChannelData*>>();
@@ -220,13 +220,13 @@ void ApplyBotsList(
 		const auto &list = data.vchats().v;
 		result.list.reserve(list.size());
 		for (const auto &chat : list) {
-			const auto peer = channel->owner().processChat(chat);
+			const auto peer = session->data().processChat(chat);
 			if (const auto channel = peer->asChannel()) {
 				result.list.push_back(channel);
 			}
 		}
 		if constexpr (MTPDmessages_chatsSlice::Is<decltype(data)>()) {
-			if (channel->session().premiumPossible()) {
+			if (session->premiumPossible()) {
 				result.more = data.vcount().v - data.vchats().v.size();
 			}
 		}
@@ -234,6 +234,12 @@ void ApplyBotsList(
 	return result;
 }
 
+[[nodiscard]] ChatParticipants::Channels ParseSimilar(
+		not_null<ChannelData*> channel,
+		const MTPmessages_Chats &chats) {
+	return ParseSimilar(&channel->session(), chats);
+}
+
 } // namespace
 
 ChatParticipant::ChatParticipant(
@@ -351,7 +357,8 @@ QString ChatParticipant::rank() const {
 }
 
 ChatParticipants::ChatParticipants(not_null<ApiWrap*> api)
-: _api(&api->instance()) {
+: _session(&api->session())
+, _api(&api->instance()) {
 }
 
 void ChatParticipants::requestForAdd(
@@ -769,4 +776,29 @@ auto ChatParticipants::similarLoaded() const
 	return _similarLoaded.events();
 }
 
+void ChatParticipants::loadRecommendations() {
+	if (_recommendationsLoaded.current() || _recommendations.requestId) {
+		return;
+	}
+	_recommendations.requestId = _api.request(
+		MTPchannels_GetChannelRecommendations(
+			MTP_flags(0),
+			MTP_inputChannelEmpty())
+	).done([=](const MTPmessages_Chats &result) {
+		_recommendations.requestId = 0;
+		auto parsed = ParseSimilar(_session, result);
+		_recommendations.channels = std::move(parsed);
+		_recommendations.channels.more = 0;
+		_recommendationsLoaded = true;
+	}).send();
+}
+
+const ChatParticipants::Channels &ChatParticipants::recommendations() const {
+	return _recommendations.channels;
+}
+
+rpl::producer<> ChatParticipants::recommendationsLoaded() const {
+	return _recommendationsLoaded.changes() | rpl::to_empty;
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_chat_participants.h b/Telegram/SourceFiles/api/api_chat_participants.h
index b8fc9fc67..fbab3f425 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.h
+++ b/Telegram/SourceFiles/api/api_chat_participants.h
@@ -14,6 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class ApiWrap;
 class ChannelData;
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Ui {
 class Show;
 } // namespace Ui
@@ -134,12 +138,18 @@ public:
 	[[nodiscard]] auto similarLoaded() const
 		-> rpl::producer<not_null<ChannelData*>>;
 
+	void loadRecommendations();
+	[[nodiscard]] const Channels &recommendations() const;
+	[[nodiscard]] rpl::producer<> recommendationsLoaded() const;
+
 private:
 	struct SimilarChannels {
 		Channels channels;
 		mtpRequestId requestId = 0;
 	};
 
+	const not_null<Main::Session*> _session;
+
 	MTP::Sender _api;
 
 	using PeerRequests = base::flat_map<PeerData*, mtpRequestId>;
@@ -165,6 +175,9 @@ private:
 	base::flat_map<not_null<ChannelData*>, SimilarChannels> _similar;
 	rpl::event_stream<not_null<ChannelData*>> _similarLoaded;
 
+	SimilarChannels _recommendations;
+	rpl::variable<bool> _recommendationsLoaded = false;
+
 };
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 7796afb4e..8298341c5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -624,6 +624,26 @@ recentPeersList: PeerList(defaultPeerList) {
 }
 recentPeersSpecialNamePosition: point(64px, 19px);
 
+dialogsSearchTabs: SettingsSlider(defaultSettingsSlider) {
+	height: 33px;
+	barTop: 30px;
+	barSkip: 0px;
+	barStroke: 6px;
+	barRadius: 2px;
+	barFg: transparent;
+	barSnapToLabel: true;
+	strictSkip: 34px;
+	labelTop: 7px;
+	labelStyle: semiboldTextStyle;
+	labelFg: windowSubTextFg;
+	labelFgActive: lightButtonFg;
+	rippleBottomSkip: 1px;
+	rippleBg: windowBgOver;
+	rippleBgActive: lightButtonBgOver;
+	ripple: defaultRippleAnimation;
+}
+
+
 dialogsStoriesList: DialogsStoriesList {
 	small: dialogsStories;
 	full: dialogsStoriesFull;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e5676f3bc..00cd49329 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1151,7 +1151,9 @@ void Widget::updateSuggestions(anim::type animated) {
 
 		rpl::merge(
 			_suggestions->topPeerChosen(),
-			_suggestions->recentPeerChosen()
+			_suggestions->recentPeerChosen(),
+			_suggestions->myChannelChosen(),
+			_suggestions->recommendationChosen()
 		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
 			chosenRow({
 				.key = peer->owner().history(peer),
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 033cdc7c9..17d761fe0 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -7,11 +7,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/ui/dialogs_suggestions.h"
 
+#include "api/api_chat_participants.h"
+#include "apiwrap.h"
 #include "base/unixtime.h"
 #include "boxes/peer_list_box.h"
 #include "data/components/recent_peers.h"
 #include "data/components/top_peers.h"
 #include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_folder.h"
 #include "data/data_peer_values.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -23,9 +28,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/delayed_activation.h"
@@ -43,6 +50,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Dialogs {
 namespace {
 
+constexpr auto kCollapsedChannelsCount = 5;
+constexpr auto kProbablyMaxChannels = 1000;
+constexpr auto kProbablyMaxRecommendations = 100;
+
 class RecentRow final : public PeerListRow {
 public:
 	explicit RecentRow(not_null<PeerData*> peer);
@@ -110,6 +121,76 @@ private:
 
 };
 
+class MyChannelsController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	explicit MyChannelsController(
+		not_null<Window::SessionController*> window);
+
+	[[nodiscard]] rpl::producer<int> count() const {
+		return _count.value();
+	}
+	[[nodiscard]] rpl::producer<not_null<PeerData*>> chosen() const {
+		return _chosen.events();
+	}
+
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+	Main::Session &session() const override;
+
+private:
+	void setupDivider();
+	void appendRow(not_null<ChannelData*> channel);
+	void fill();
+
+	const not_null<Window::SessionController*> _window;
+	std::vector<not_null<History*>> _channels;
+	rpl::variable<Ui::RpWidget*> _toggleExpanded = nullptr;
+	rpl::variable<int> _count = 0;
+	rpl::variable<bool> _expanded = false;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	rpl::event_stream<not_null<PeerData*>> _chosen;
+	rpl::lifetime _lifetime;
+
+};
+
+class RecommendationsController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	explicit RecommendationsController(
+		not_null<Window::SessionController*> window);
+
+	[[nodiscard]] rpl::producer<int> count() const {
+		return _count.value();
+	}
+	[[nodiscard]] rpl::producer<not_null<PeerData*>> chosen() const {
+		return _chosen.events();
+	}
+
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+	Main::Session &session() const override;
+
+private:
+	void setupDivider();
+	void appendRow(not_null<ChannelData*> channel);
+
+	const not_null<Window::SessionController*> _window;
+	rpl::variable<int> _count;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	rpl::event_stream<not_null<PeerData*>> _chosen;
+	rpl::lifetime _lifetime;
+
+};
+
 struct EntryMenuDescriptor {
 	not_null<Window::SessionController*> controller;
 	not_null<PeerData*> peer;
@@ -189,6 +270,20 @@ RecentRow::RecentRow(not_null<PeerData*> peer)
 , _history(peer->owner().history(peer)) {
 	if (peer->isSelf() || peer->isRepliesChat()) {
 		setCustomStatus(u" "_q);
+	} else if (const auto chat = peer->asChat()) {
+		if (chat->count > 0) {
+			setCustomStatus(
+				tr::lng_chat_status_members(tr::now, lt_count, chat->count));
+		}
+	} else if (const auto channel = peer->asChannel()) {
+		if (channel->membersCountKnown()) {
+			setCustomStatus((channel->isBroadcast()
+				? tr::lng_chat_status_subscribers
+				: tr::lng_chat_status_members)(
+					tr::now,
+					lt_count,
+					channel->membersCount()));
+		}
 	}
 	refreshBadge();
 }
@@ -426,6 +521,259 @@ void RecentsController::subscribeToEvents() {
 	}, _lifetime);
 }
 
+MyChannelsController::MyChannelsController(
+	not_null<Window::SessionController*> window)
+: _window(window) {
+}
+
+void MyChannelsController::prepare() {
+	setupDivider();
+
+	_channels.reserve(kProbablyMaxChannels);
+	const auto owner = &session().data();
+	const auto add = [&](not_null<Dialogs::MainList*> list) {
+		for (const auto &row : list->indexed()->all()) {
+			if (const auto history = row->history()) {
+				if (const auto channel = history->peer->asBroadcast()) {
+					_channels.push_back(history);
+				}
+			}
+		}
+	};
+	add(owner->chatsList());
+	if (const auto folder = owner->folderLoaded(Data::Folder::kId)) {
+		add(owner->chatsList(folder));
+	}
+
+	ranges::sort(_channels, ranges::greater(), &History::chatListTimeId);
+	_count = int(_channels.size());
+
+	_expanded.value() | rpl::start_with_next([=] {
+		fill();
+	}, _lifetime);
+
+	auto loading = owner->chatsListChanges(
+	) | rpl::take_while([=](Data::Folder *folder) {
+		return !owner->chatsListLoaded(folder);
+	});
+	rpl::merge(
+		std::move(loading),
+		owner->chatsListLoadedEvents()
+	) | rpl::start_with_next([=](Data::Folder *folder) {
+		const auto list = owner->chatsList(folder);
+		for (const auto &row : list->indexed()->all()) {
+			if (const auto history = row->history()) {
+				if (const auto channel = history->peer->asBroadcast()) {
+					if (ranges::contains(_channels, not_null(history))) {
+						_channels.push_back(history);
+					}
+				}
+			}
+		}
+		const auto was = _count.current();
+		const auto now = int(_channels.size());
+		if (was != now) {
+			_count = now;
+			fill();
+		}
+	}, _lifetime);
+}
+
+void MyChannelsController::fill() {
+	const auto count = _count.current();
+	const auto limit = _expanded.current()
+		? count
+		: std::min(count, kCollapsedChannelsCount);
+	const auto already = delegate()->peerListFullRowsCount();
+	const auto delta = limit - already;
+	if (!delta) {
+		return;
+	} else if (delta > 0) {
+		for (auto i = already; i != limit; ++i) {
+			appendRow(_channels[i]->peer->asBroadcast());
+		}
+	} else {
+		for (auto i = already; i != limit;) {
+			delegate()->peerListRemoveRow(delegate()->peerListRowAt(--i));
+		}
+	}
+	delegate()->peerListRefreshRows();
+}
+
+void MyChannelsController::appendRow(not_null<ChannelData*> channel) {
+	auto row = std::make_unique<PeerListRow>(channel);
+	if (channel->membersCountKnown()) {
+		row->setCustomStatus((channel->isBroadcast()
+			? tr::lng_chat_status_subscribers
+			: tr::lng_chat_status_members)(
+				tr::now,
+				lt_count,
+				channel->membersCount()));
+	}
+	delegate()->peerListAppendRow(std::move(row));
+}
+
+void MyChannelsController::rowClicked(not_null<PeerListRow*> row) {
+	_chosen.fire(row->peer());
+}
+
+base::unique_qptr<Ui::PopupMenu> MyChannelsController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	return nullptr;
+}
+
+Main::Session &MyChannelsController::session() const {
+	return _window->session();
+}
+
+void MyChannelsController::setupDivider() {
+	auto result = object_ptr<Ui::FixedHeightWidget>(
+		(QWidget*)nullptr,
+		st::searchedBarHeight);
+	const auto raw = result.data();
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		tr::lng_channels_your_title(),
+		st::searchedBarLabel);
+	_count.value(
+	) | rpl::map(
+		rpl::mappers::_1 > kCollapsedChannelsCount
+	) | rpl::distinct_until_changed() | rpl::start_with_next([=](bool more) {
+		_expanded = false;
+		if (!more) {
+			const auto toggle = _toggleExpanded.current();
+			_toggleExpanded = nullptr;
+			delete toggle;
+			return;
+		} else if (_toggleExpanded.current()) {
+			return;
+		}
+		const auto toggle = Ui::CreateChild<Ui::LinkButton>(
+			raw,
+			tr::lng_channels_your_more(tr::now),
+			st::searchedBarLink);
+		toggle->show();
+		toggle->setClickedCallback([=] {
+			const auto expand = !_expanded.current();
+			toggle->setText(expand
+				? tr::lng_channels_your_less(tr::now)
+				: tr::lng_channels_your_more(tr::now));
+			_expanded = expand;
+		});
+		rpl::combine(
+			raw->sizeValue(),
+			toggle->widthValue()
+		) | rpl::start_with_next([=](QSize size, int width) {
+			const auto x = st::searchedBarPosition.x();
+			const auto y = st::searchedBarPosition.y();
+			toggle->moveToRight(0, 0, size.width());
+			label->resizeToWidth(size.width() - x - width);
+			label->moveToLeft(x, y, size.width());
+		}, toggle->lifetime());
+		_toggleExpanded = toggle;
+	}, raw->lifetime());
+
+	rpl::combine(
+		raw->sizeValue(),
+		_toggleExpanded.value()
+	) | rpl::filter(
+		rpl::mappers::_2 == nullptr
+	) | rpl::start_with_next([=](QSize size, const auto) {
+		const auto x = st::searchedBarPosition.x();
+		const auto y = st::searchedBarPosition.y();
+		label->resizeToWidth(size.width() - x * 2);
+		label->moveToLeft(x, y, size.width());
+	}, raw->lifetime());
+
+	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		QPainter(raw).fillRect(clip, st::searchedBarBg);
+	}, raw->lifetime());
+
+	delegate()->peerListSetAboveWidget(std::move(result));
+}
+
+RecommendationsController::RecommendationsController(
+	not_null<Window::SessionController*> window)
+: _window(window) {
+}
+
+void RecommendationsController::prepare() {
+	setupDivider();
+
+	const auto participants = &session().api().chatParticipants();
+	const auto fill = [=] {
+		const auto &list = participants->recommendations().list;
+		if (list.empty()) {
+			return;
+		}
+		for (const auto &peer : list) {
+			if (const auto channel = peer->asBroadcast()) {
+				appendRow(channel);
+			}
+		}
+		delegate()->peerListRefreshRows();
+		_count = delegate()->peerListFullRowsCount();
+	};
+
+	fill();
+	if (!_count.current()) {
+		participants->loadRecommendations();
+		participants->recommendationsLoaded(
+		) | rpl::take(1) | rpl::start_with_next(fill, _lifetime);
+	}
+}
+
+void RecommendationsController::appendRow(not_null<ChannelData*> channel) {
+	auto row = std::make_unique<PeerListRow>(channel);
+	if (channel->membersCountKnown()) {
+		row->setCustomStatus((channel->isBroadcast()
+			? tr::lng_chat_status_subscribers
+			: tr::lng_chat_status_members)(
+				tr::now,
+				lt_count,
+				channel->membersCount()));
+	}
+	delegate()->peerListAppendRow(std::move(row));
+}
+
+void RecommendationsController::rowClicked(not_null<PeerListRow*> row) {
+	_chosen.fire(row->peer());
+}
+
+base::unique_qptr<Ui::PopupMenu> RecommendationsController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	return nullptr;
+}
+
+Main::Session &RecommendationsController::session() const {
+	return _window->session();
+}
+
+void RecommendationsController::setupDivider() {
+	auto result = object_ptr<Ui::FixedHeightWidget>(
+		(QWidget*)nullptr,
+		st::searchedBarHeight);
+	const auto raw = result.data();
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		tr::lng_channels_recommended(),
+		st::searchedBarLabel);
+	raw->sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		const auto x = st::searchedBarPosition.x();
+		const auto y = st::searchedBarPosition.y();
+		label->resizeToWidth(size.width() - x * 2);
+		label->moveToLeft(x, y, size.width());
+	}, raw->lifetime());
+	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		QPainter(raw).fillRect(clip, st::searchedBarBg);
+	}, raw->lifetime());
+
+	delegate()->peerListSetAboveWidget(std::move(result));
+}
+
 } // namespace
 
 Suggestions::Suggestions(
@@ -434,16 +782,54 @@ Suggestions::Suggestions(
 	rpl::producer<TopPeersList> topPeers,
 	RecentPeersList recentPeers)
 : RpWidget(parent)
-, _scroll(std::make_unique<Ui::ElasticScroll>(this))
-, _content(_scroll->setOwnedWidget(object_ptr<Ui::VerticalLayout>(this)))
-, _topPeersWrap(_content->add(object_ptr<Ui::SlideWrap<TopPeersStrip>>(
-	this,
-	object_ptr<TopPeersStrip>(this, std::move(topPeers)))))
+, _controller(controller)
+, _tabs(std::make_unique<Ui::SettingsSlider>(this, st::dialogsSearchTabs))
+, _chatsScroll(std::make_unique<Ui::ElasticScroll>(this))
+, _chatsContent(
+	_chatsScroll->setOwnedWidget(object_ptr<Ui::VerticalLayout>(this)))
+, _topPeersWrap(
+	_chatsContent->add(object_ptr<Ui::SlideWrap<TopPeersStrip>>(
+		this,
+		object_ptr<TopPeersStrip>(this, std::move(topPeers)))))
 , _topPeers(_topPeersWrap->entity())
-, _recentPeers(
-	_content->add(
-		setupRecentPeers(controller, std::move(recentPeers))))
-, _emptyRecent(_content->add(setupEmptyRecent(controller))) {
+, _recentPeers(_chatsContent->add(setupRecentPeers(std::move(recentPeers))))
+, _emptyRecent(_chatsContent->add(setupEmptyRecent()))
+, _channelsScroll(std::make_unique<Ui::ElasticScroll>(this))
+, _channelsContent(
+	_channelsScroll->setOwnedWidget(object_ptr<Ui::VerticalLayout>(this)))
+, _myChannels(_channelsContent->add(setupMyChannels()))
+, _recommendations(_channelsContent->add(setupRecommendations()))
+, _emptyChannels(_channelsContent->add(setupEmptyChannels())) {
+
+	setupTabs();
+	setupChats();
+	setupChannels();
+}
+
+Suggestions::~Suggestions() = default;
+
+void Suggestions::setupTabs() {
+	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
+	shadow->lower();
+
+	_tabs->sizeValue() | rpl::start_with_next([=](QSize size) {
+		const auto line = st::lineWidth;
+		shadow->setGeometry(0, size.height() - line, width(), line);
+	}, shadow->lifetime());
+
+	shadow->showOn(_tabs->shownValue());
+
+	_tabs->setSections({
+		tr::lng_recent_chats(tr::now),
+		tr::lng_recent_channels(tr::now),
+		});
+	_tabs->sectionActivated(
+	) | rpl::start_with_next([=](int section) {
+		switchTab(section ? Tab::Channels : Tab::Chats);
+	}, _tabs->lifetime());
+}
+
+void Suggestions::setupChats() {
 	_recentCount.value() | rpl::start_with_next([=](int count) {
 		_recentPeers->toggle(count > 0, anim::type::instant);
 		_emptyRecent->toggle(count == 0, anim::type::instant);
@@ -455,13 +841,13 @@ Suggestions::Suggestions(
 
 	_topPeers->clicks() | rpl::start_with_next([=](uint64 peerIdRaw) {
 		const auto peerId = PeerId(peerIdRaw);
-		_topPeerChosen.fire(controller->session().data().peer(peerId));
+		_topPeerChosen.fire(_controller->session().data().peer(peerId));
 	}, _topPeers->lifetime());
 
 	_topPeers->showMenuRequests(
 	) | rpl::start_with_next([=](const ShowTopPeerMenuRequest &request) {
 		const auto weak = Ui::MakeWeak(this);
-		const auto owner = &controller->session().data();
+		const auto owner = &_controller->session().data();
 		const auto peer = owner->peer(PeerId(request.id));
 		const auto removeOne = [=] {
 			peer->session().topPeers().remove(peer);
@@ -469,7 +855,7 @@ Suggestions::Suggestions(
 				_topPeers->removeLocally(peer->id.value);
 			}
 		};
-		const auto session = &controller->session();
+		const auto session = &_controller->session();
 		const auto removeAll = crl::guard(session, [=] {
 			session->topPeers().toggleDisabled(true);
 			if (weak) {
@@ -477,7 +863,7 @@ Suggestions::Suggestions(
 			}
 		});
 		FillEntryMenu(request.callback, {
-			.controller = controller,
+			.controller = _controller,
 			.peer = peer,
 			.removeOneText = tr::lng_recent_remove(tr::now),
 			.removeOne = removeOne,
@@ -487,9 +873,28 @@ Suggestions::Suggestions(
 			.removeAll = removeAll,
 		});
 	}, _topPeers->lifetime());
+
+	_chatsScroll->setVisible(_tab == Tab::Chats);
 }
 
-Suggestions::~Suggestions() = default;
+void Suggestions::setupChannels() {
+	_myChannelsCount.value() | rpl::start_with_next([=](int count) {
+		_myChannels->toggle(count > 0, anim::type::instant);
+	}, _myChannels->lifetime());
+
+	_recommendationsCount.value() | rpl::start_with_next([=](int count) {
+		_recommendations->toggle(count > 0, anim::type::instant);
+	}, _recommendations->lifetime());
+
+	_emptyChannels->toggleOn(
+		rpl::combine(
+			_myChannelsCount.value(),
+			_recommendationsCount.value(),
+			rpl::mappers::_1 + rpl::mappers::_2 == 0),
+		anim::type::instant);
+
+	_channelsScroll->setVisible(_tab == Tab::Channels);
+}
 
 void Suggestions::selectJump(Qt::Key direction, int pageSize) {
 	const auto recentHasSelection = [=] {
@@ -507,7 +912,7 @@ void Suggestions::selectJump(Qt::Key direction, int pageSize) {
 			}
 			if (_recentSelectJump(direction, pageSize) == JumpResult::AppliedAndOut) {
 				if (direction == Qt::Key_Up) {
-					_scroll->scrollTo(0);
+					_chatsScroll->scrollTo(0);
 				}
 			}
 		}
@@ -515,7 +920,7 @@ void Suggestions::selectJump(Qt::Key direction, int pageSize) {
 		if (_recentSelectJump(direction, pageSize)
 			== JumpResult::AppliedAndOut) {
 			_topPeers->selectByKeyboard(Qt::Key());
-			_scroll->scrollTo(0);
+			_chatsScroll->scrollTo(0);
 		} else {
 			_topPeers->deselectByKeyboard();
 		}
@@ -529,12 +934,12 @@ void Suggestions::selectJump(Qt::Key direction, int pageSize) {
 			_recentSelectJump(direction, pageSize);
 		} else {
 			_topPeers->selectByKeyboard(Qt::Key());
-			_scroll->scrollTo(0);
+			_chatsScroll->scrollTo(0);
 		}
 	} else if (direction == Qt::Key_Left || direction == Qt::Key_Right) {
 		if (!recentHasSelection()) {
 			_topPeers->selectByKeyboard(direction);
-			_scroll->scrollTo(0);
+			_chatsScroll->scrollTo(0);
 		}
 	}
 }
@@ -550,19 +955,9 @@ void Suggestions::show(anim::type animated, Fn<void()> finish) {
 
 	_hidden = false;
 	if (animated == anim::type::instant) {
-		_shownAnimation.stop();
-		_scroll->show();
+		finishShow();
 	} else {
-		_shownAnimation.start([=] {
-			update();
-			if (!_shownAnimation.animating() && finish) {
-				finish();
-				_cache = QPixmap();
-				_scroll->show();
-			}
-		}, 0., 1., st::slideDuration, anim::easeOutQuint);
-		_cache = Ui::GrabWidget(_scroll.get());
-		_scroll->hide();
+		startShownAnimation(true, std::move(finish));
 	}
 }
 
@@ -573,17 +968,78 @@ void Suggestions::hide(anim::type animated, Fn<void()> finish) {
 	} else if (animated == anim::type::instant) {
 		RpWidget::hide();
 	} else {
-		_shownAnimation.start([=] {
-			update();
-			if (!_shownAnimation.animating() && finish) {
-				finish();
-			}
-		}, 1., 0., st::slideDuration, anim::easeOutQuint);
-		_cache = Ui::GrabWidget(_scroll.get());
-		_scroll->hide();
+		startShownAnimation(false, std::move(finish));
 	}
 }
 
+void Suggestions::switchTab(Tab tab) {
+	if (_tab == tab) {
+		return;
+	}
+	_tab = tab;
+	if (_tabs->isHidden()) {
+		return;
+	}
+	startSlideAnimation();
+}
+
+void Suggestions::startSlideAnimation() {
+	if (!_slideAnimation.animating()) {
+		_slideLeft = Ui::GrabWidget(_chatsScroll.get());
+		_slideRight = Ui::GrabWidget(_channelsScroll.get());
+		_chatsScroll->hide();
+		_channelsScroll->hide();
+	}
+	const auto from = (_tab == Tab::Channels) ? 0. : 1.;
+	const auto to = (_tab == Tab::Channels) ? 1. : 0.;
+	_slideAnimation.start([=] {
+		update();
+		if (!_slideAnimation.animating() && !_shownAnimation.animating()) {
+			finishShow();
+		}
+	}, from, to, st::slideDuration, anim::sineInOut);
+}
+
+void Suggestions::startShownAnimation(bool shown, Fn<void()> finish) {
+	const auto from = shown ? 0. : 1.;
+	const auto to = shown ? 1. : 0.;
+	_shownAnimation.start([=] {
+		update();
+		if (!_shownAnimation.animating() && finish) {
+			finish();
+			if (shown) {
+				finishShow();
+			}
+		}
+	}, from, to, st::slideDuration, anim::easeOutQuint);
+	if (_cache.isNull()) {
+		const auto now = width();
+		if (now < st::columnMinimalWidthLeft) {
+			resize(st::columnMinimalWidthLeft, height());
+		}
+		_cache = Ui::GrabWidget(this);
+		if (now < st::columnMinimalWidthLeft) {
+			resize(now, height());
+		}
+	}
+	_tabs->hide();
+	_chatsScroll->hide();
+	_channelsScroll->hide();
+	_slideAnimation.stop();
+}
+
+void Suggestions::finishShow() {
+	_slideAnimation.stop();
+	_slideLeft = _slideRight = QPixmap();
+
+	_shownAnimation.stop();
+	_cache = QPixmap();
+
+	_tabs->show();
+	_chatsScroll->setVisible(_tab == Tab::Chats);
+	_channelsScroll->setVisible(_tab == Tab::Channels);
+}
+
 float64 Suggestions::shownOpacity() const {
 	return _shownAnimation.value(_hidden ? 0. : 1.);
 }
@@ -595,28 +1051,48 @@ void Suggestions::paintEvent(QPaintEvent *e) {
 
 	auto p = QPainter(this);
 	p.fillRect(e->rect(), color);
-	if (_scroll->isHidden()) {
+	if (!_cache.isNull()) {
 		const auto slide = st::topPeers.height + st::searchedBarHeight;
 		p.setOpacity(opacity);
 		p.drawPixmap(0, (opacity - 1.) * slide, _cache);
+	} else if (!_slideLeft.isNull()) {
+		const auto slide = st::topPeers.height + st::searchedBarHeight;
+		const auto right = (_tab == Tab::Channels);
+		const auto progress = _slideAnimation.value(right ? 1. : 0.);
+		const auto shift = st::topPeers.height + st::searchedBarHeight;
+		p.setOpacity(1. - progress);
+		p.drawPixmap(
+			anim::interpolate(0, -slide, progress),
+			_chatsScroll->y(),
+			_slideLeft);
+		p.setOpacity(progress);
+		p.drawPixmap(
+			anim::interpolate(slide, 0, progress),
+			_channelsScroll->y(),
+			_slideRight);
 	}
 }
 
 void Suggestions::resizeEvent(QResizeEvent *e) {
 	const auto w = std::max(width(), st::columnMinimalWidthLeft);
-	_scroll->setGeometry(0, 0, w, height());
-	_content->resizeToWidth(w);
+	_tabs->resizeToWidth(w);
+	const auto tabs = _tabs->height();
+
+	_chatsScroll->setGeometry(0, tabs, w, height() - tabs);
+	_chatsContent->resizeToWidth(w);
+
+	_channelsScroll->setGeometry(0, tabs, w, height() - tabs);
+	_channelsContent->resizeToWidth(w);
 }
 
 object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
-		not_null<Window::SessionController*> window,
 		RecentPeersList recentPeers) {
-	auto &lifetime = _content->lifetime();
+	auto &lifetime = _chatsContent->lifetime();
 	const auto delegate = lifetime.make_state<
 		PeerListContentDelegateSimple
 	>();
 	const auto controller = lifetime.make_state<RecentsController>(
-		window,
+		_controller,
 		std::move(recentPeers));
 	controller->setStyleOverrides(&st::recentPeersList);
 
@@ -624,11 +1100,11 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 
 	controller->chosen(
 	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
-		window->session().recentPeers().bump(peer);
+		_controller->session().recentPeers().bump(peer);
 		_recentPeerChosen.fire_copy(peer);
 	}, lifetime);
 
-	auto content = object_ptr<PeerListContent>(_content, controller);
+	auto content = object_ptr<PeerListContent>(_chatsContent, controller);
 
 	const auto raw = content.data();
 	_recentPeersChoose = [=] {
@@ -658,7 +1134,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 	raw->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		const auto add = _topPeersWrap->toggled() ? _topPeers->height() : 0;
-		_scroll->scrollToY(request.ymin + add, request.ymax + add);
+		_chatsScroll->scrollToY(request.ymin + add, request.ymax + add);
 	}, lifetime);
 
 	delegate->setContent(raw);
@@ -667,26 +1143,39 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 	return object_ptr<Ui::SlideWrap<>>(this, std::move(content));
 }
 
-object_ptr<Ui::SlideWrap<>> Suggestions::setupEmptyRecent(
-		not_null<Window::SessionController*> window) {
-	auto content = object_ptr<Ui::RpWidget>(_content);
+object_ptr<Ui::SlideWrap<>> Suggestions::setupEmptyRecent() {
+	return setupEmpty(_chatsContent, "search", tr::lng_recent_none());
+}
+
+object_ptr<Ui::SlideWrap<>> Suggestions::setupEmptyChannels() {
+	return setupEmpty(
+		_channelsContent,
+		"noresults",
+		tr::lng_channels_none_about());
+}
+
+object_ptr<Ui::SlideWrap<>> Suggestions::setupEmpty(
+		not_null<QWidget*> parent,
+		const QString &animation,
+		rpl::producer<QString> text) {
+	auto content = object_ptr<Ui::RpWidget>(parent);
 	const auto raw = content.data();
 
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		raw,
-		tr::lng_recent_none(),
+		std::move(text),
 		st::defaultPeerListAbout);
 	const auto size = st::recentPeersEmptySize;
 	const auto [widget, animate] = Settings::CreateLottieIcon(
 		raw,
 		{
-			.name = u"search"_q,
+			.name = animation,
 			.sizeOverride = { size, size },
 		},
 		st::recentPeersEmptyMargin);
 	const auto icon = widget.data();
 
-	_scroll->heightValue() | rpl::start_with_next([=](int height) {
+	_chatsScroll->heightValue() | rpl::start_with_next([=](int height) {
 		raw->resize(raw->width(), height - st::topPeers.height);
 	}, raw->lifetime());
 
@@ -699,11 +1188,13 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupEmptyRecent(
 			y + icon->height() + st::recentPeersEmptySkip);
 	}, raw->lifetime());
 
-	auto result = object_ptr<Ui::SlideWrap<>>(_content, std::move(content));
+	auto result = object_ptr<Ui::SlideWrap<>>(
+		parent,
+		std::move(content));
 	result->toggle(false, anim::type::instant);
 
 	result->toggledValue() | rpl::filter([=](bool shown) {
-		return shown && window->session().data().chatsListLoaded();
+		return shown && _controller->session().data().chatsListLoaded();
 	}) | rpl::start_with_next([=] {
 		animate(anim::repeat::once);
 	}, raw->lifetime());
@@ -711,6 +1202,115 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupEmptyRecent(
 	return result;
 }
 
+object_ptr<Ui::SlideWrap<>> Suggestions::setupMyChannels() {
+	auto &lifetime = _channelsContent->lifetime();
+	const auto delegate = lifetime.make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto controller = lifetime.make_state<MyChannelsController>(
+		_controller);
+	controller->setStyleOverrides(&st::recentPeersList);
+
+	_myChannelsCount = controller->count();
+
+	controller->chosen(
+	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		_myChannelChosen.fire_copy(peer);
+	}, lifetime);
+
+	auto content = object_ptr<PeerListContent>(_channelsContent, controller);
+
+	const auto raw = content.data();
+	_myChannelsChoose = [=] {
+		return raw->submitted();
+	};
+	_myChannelsSelectJump = [raw](Qt::Key direction, int pageSize) {
+		const auto had = raw->hasSelection();
+		if (direction == Qt::Key()) {
+			return had ? JumpResult::Applied : JumpResult::NotApplied;
+		} else if (direction == Qt::Key_Up && !had) {
+			return JumpResult::NotApplied;
+		} else if (direction == Qt::Key_Down || direction == Qt::Key_Up) {
+			const auto delta = (direction == Qt::Key_Down) ? 1 : -1;
+			if (pageSize > 0) {
+				raw->selectSkipPage(pageSize, delta);
+			} else {
+				raw->selectSkip(delta);
+			}
+			return raw->hasSelection()
+				? JumpResult::Applied
+				: had
+				? JumpResult::AppliedAndOut
+				: JumpResult::NotApplied;
+		}
+		return JumpResult::NotApplied;
+	};
+	raw->scrollToRequests(
+	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+		_channelsScroll->scrollToY(request.ymin, request.ymax);
+	}, lifetime);
+
+	delegate->setContent(raw);
+	controller->setDelegate(delegate);
+
+	return object_ptr<Ui::SlideWrap<>>(this, std::move(content));
+}
+
+object_ptr<Ui::SlideWrap<>> Suggestions::setupRecommendations() {
+	auto &lifetime = _channelsContent->lifetime();
+	const auto delegate = lifetime.make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto controller = lifetime.make_state<RecommendationsController>(
+		_controller);
+	controller->setStyleOverrides(&st::recentPeersList);
+
+	_recommendationsCount = controller->count();
+
+	controller->chosen(
+	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		_recommendationChosen.fire_copy(peer);
+	}, lifetime);
+
+	auto content = object_ptr<PeerListContent>(_channelsContent, controller);
+
+	const auto raw = content.data();
+	_recommendationsChoose = [=] {
+		return raw->submitted();
+	};
+	_recommendationsSelectJump = [raw](Qt::Key direction, int pageSize) {
+		const auto had = raw->hasSelection();
+		if (direction == Qt::Key()) {
+			return had ? JumpResult::Applied : JumpResult::NotApplied;
+		} else if (direction == Qt::Key_Up && !had) {
+			return JumpResult::NotApplied;
+		} else if (direction == Qt::Key_Down || direction == Qt::Key_Up) {
+			const auto delta = (direction == Qt::Key_Down) ? 1 : -1;
+			if (pageSize > 0) {
+				raw->selectSkipPage(pageSize, delta);
+			} else {
+				raw->selectSkip(delta);
+			}
+			return raw->hasSelection()
+				? JumpResult::Applied
+				: had
+				? JumpResult::AppliedAndOut
+				: JumpResult::NotApplied;
+		}
+		return JumpResult::NotApplied;
+	};
+	raw->scrollToRequests(
+	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+		const auto add = _myChannels->toggled() ? _myChannels->height() : 0;
+		_channelsScroll->scrollToY(request.ymin + add, request.ymax + add);
+	}, lifetime);
+
+	delegate->setContent(raw);
+	controller->setDelegate(delegate);
+
+	return object_ptr<Ui::SlideWrap<>>(this, std::move(content));
+}
+
 rpl::producer<TopPeersList> TopPeersContent(
 		not_null<Main::Session*> session) {
 	return [=](auto consumer) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index b6be97e26..5749d7af7 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -18,6 +18,7 @@ class Session;
 
 namespace Ui {
 class ElasticScroll;
+class SettingsSlider;
 class VerticalLayout;
 template <typename Widget>
 class SlideWrap;
@@ -52,12 +53,25 @@ public:
 	[[nodiscard]] rpl::producer<not_null<PeerData*>> topPeerChosen() const {
 		return _topPeerChosen.events();
 	}
-	[[nodiscard]] rpl::producer<not_null<PeerData*>> recentPeerChosen() const {
+	[[nodiscard]] auto recentPeerChosen() const
+	-> rpl::producer<not_null<PeerData*>> {
 		return _recentPeerChosen.events();
 	}
+	[[nodiscard]] auto myChannelChosen() const
+	-> rpl::producer<not_null<PeerData*>> {
+		return _myChannelChosen.events();
+	}
+	[[nodiscard]] auto recommendationChosen() const
+	-> rpl::producer<not_null<PeerData*>> {
+		return _recommendationChosen.events();
+	}
 
 private:
-	enum class JumpResult {
+	enum class Tab : uchar {
+		Chats,
+		Channels,
+	};
+	enum class JumpResult : uchar {
 		NotApplied,
 		Applied,
 		AppliedAndOut,
@@ -66,14 +80,34 @@ private:
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 
-	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupRecentPeers(
-		not_null<Window::SessionController*> window,
-		RecentPeersList recentPeers);
-	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupEmptyRecent(
-		not_null<Window::SessionController*> window);
+	void setupTabs();
+	void setupChats();
+	void setupChannels();
 
-	const std::unique_ptr<Ui::ElasticScroll> _scroll;
-	const not_null<Ui::VerticalLayout*> _content;
+	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupRecentPeers(
+		RecentPeersList recentPeers);
+	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupEmptyRecent();
+	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupMyChannels();
+	[[nodiscard]] auto setupRecommendations()
+		-> object_ptr<Ui::SlideWrap<Ui::RpWidget>>;
+	[[nodiscard]] auto setupEmptyChannels()
+		-> object_ptr<Ui::SlideWrap<Ui::RpWidget>>;
+	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupEmpty(
+		not_null<QWidget*> parent,
+		const QString &animation,
+		rpl::producer<QString> text);
+
+	void switchTab(Tab tab);
+	void startShownAnimation(bool shown, Fn<void()> finish);
+	void startSlideAnimation();
+	void finishShow();
+
+	const not_null<Window::SessionController*> _controller;
+
+	const std::unique_ptr<Ui::SettingsSlider> _tabs;
+
+	const std::unique_ptr<Ui::ElasticScroll> _chatsScroll;
+	const not_null<Ui::VerticalLayout*> _chatsContent;
 	const not_null<Ui::SlideWrap<TopPeersStrip>*> _topPeersWrap;
 	const not_null<TopPeersStrip*> _topPeers;
 
@@ -83,14 +117,36 @@ private:
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recentPeers;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyRecent;
 
+	const std::unique_ptr<Ui::ElasticScroll> _channelsScroll;
+	const not_null<Ui::VerticalLayout*> _channelsContent;
+
+	rpl::variable<int> _myChannelsCount;
+	Fn<bool()> _myChannelsChoose;
+	Fn<JumpResult(Qt::Key, int)> _myChannelsSelectJump;
+	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _myChannels;
+
+	rpl::variable<int> _recommendationsCount;
+	Fn<bool()> _recommendationsChoose;
+	Fn<JumpResult(Qt::Key, int)> _recommendationsSelectJump;
+	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recommendations;
+
+	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyChannels;
+
 	rpl::event_stream<not_null<PeerData*>> _topPeerChosen;
 	rpl::event_stream<not_null<PeerData*>> _recentPeerChosen;
+	rpl::event_stream<not_null<PeerData*>> _myChannelChosen;
+	rpl::event_stream<not_null<PeerData*>> _recommendationChosen;
 
 	Ui::Animations::Simple _shownAnimation;
 	Fn<void()> _showFinished;
+	Tab _tab = Tab::Chats;
 	bool _hidden = false;
 	QPixmap _cache;
 
+	Ui::Animations::Simple _slideAnimation;
+	QPixmap _slideLeft;
+	QPixmap _slideRight;
+
 };
 
 [[nodiscard]] rpl::producer<TopPeersList> TopPeersContent(
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 4797b7abb..52efe6f4d 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -467,6 +467,7 @@ void TopPeersStrip::paintEvent(QPaintEvent *e) {
 
 		const auto nameLeft = x + st.nameLeft;
 		const auto nameWidth = single - 2 * st.nameLeft;
+		p.setPen(st::dialogsNameFg);
 		entry.name.drawElided(
 			p,
 			nameLeft,
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index 3dda10b06..c2ff31487 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -243,8 +243,10 @@ std::vector<float64> SettingsSlider::countSectionsWidths(
 		return true;
 	});
 	// If labelsWidth > sectionsWidth we're screwed anyway.
-	if (!commonWidth && labelsWidth <= sectionsWidth) {
-		auto padding = (sectionsWidth - labelsWidth) / (2. * count);
+	if (_st.strictSkip || (!commonWidth && labelsWidth <= sectionsWidth)) {
+		auto padding = _st.strictSkip
+			? (_st.strictSkip / 2.)
+			: (sectionsWidth - labelsWidth) / (2. * count);
 		auto currentWidth = result.begin();
 		enumerateSections([&](const Section &section) {
 			Expects(currentWidth != result.end());
@@ -334,7 +336,7 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 			+ (section.width - activeWidth) / 2;
 		auto active = 1.
 			- std::clamp(
-				qAbs(range.left - activeLeft) / float64(section.width),
+				qAbs(range.left - activeLeft) / float64(range.width),
 				0.,
 				1.);
 		if (section.ripple) {

From ca1a30196ec0359618214e9365733d9bad3dd77c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 14:56:14 +0400
Subject: [PATCH 358/596] Fix LinkButton resizing.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 372543de6..eab785a1c 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 372543de6e8f4f7a552634e620c50a1ec01b3979
+Subproject commit eab785a1c87e933bc8a8356570ed3919a7fb2ea6

From 63f66a13695cb89c377346402fcac1d950cdeac2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 15:25:36 +0400
Subject: [PATCH 359/596] Show "Boost" button in boost group links.

---
 Telegram/SourceFiles/data/data_web_page.cpp | 2 ++
 Telegram/SourceFiles/data/data_web_page.h   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/data/data_web_page.cpp b/Telegram/SourceFiles/data/data_web_page.cpp
index f8d4b69c4..d45656277 100644
--- a/Telegram/SourceFiles/data/data_web_page.cpp
+++ b/Telegram/SourceFiles/data/data_web_page.cpp
@@ -164,6 +164,8 @@ WebPageType ParseWebPageType(
 		return WebPageType::BotApp;
 	} else if (type == u"telegram_channel_boost"_q) {
 		return WebPageType::ChannelBoost;
+	} else if (type == u"telegram_group_boost"_q) {
+		return WebPageType::GroupBoost;
 	} else if (type == u"telegram_giftcode"_q) {
 		return WebPageType::Giftcode;
 	} else if (type == u"telegram_stickerset"_q) {
diff --git a/Telegram/SourceFiles/data/data_web_page.h b/Telegram/SourceFiles/data/data_web_page.h
index 0293106f0..8b82ed859 100644
--- a/Telegram/SourceFiles/data/data_web_page.h
+++ b/Telegram/SourceFiles/data/data_web_page.h
@@ -29,6 +29,7 @@ enum class WebPageType : uint8 {
 
 	Group,
 	GroupWithRequest,
+	GroupBoost,
 	Channel,
 	ChannelWithRequest,
 	ChannelBoost,

From 56080bd0e48ad7caf2fe1a5483d9ad456d0c3774 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 15:25:52 +0400
Subject: [PATCH 360/596] Fix boost group link handling for forums.

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

diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 7b47da42d..7726234e7 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -572,7 +572,7 @@ void SessionNavigation::showPeerByLinkResolved(
 			info.messageId,
 			commentId->id,
 			params);
-	} else if (peer->isForum()) {
+	} else if (peer->isForum() && resolveType != ResolveType::Boost) {
 		const auto itemId = info.messageId;
 		if (!itemId) {
 			parentController()->showForum(peer->forum(), params);

From da423b5bd28296921cad04276002cbb198b777d4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 16:01:58 +0400
Subject: [PATCH 361/596] Add a general FastShareLink method.

---
 Telegram/SourceFiles/boxes/share_box.cpp | 116 ++++++++++++++++++++++-
 Telegram/SourceFiles/boxes/share_box.h   |   7 ++
 Telegram/SourceFiles/iv/iv_instance.cpp  |  86 +----------------
 3 files changed, 122 insertions(+), 87 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 4581fac40..32ec893d6 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -234,7 +234,10 @@ void ShareBox::prepareCommentField() {
 	const auto field = _comment->entity();
 
 	field->submits(
-	) | rpl::start_with_next([=] { submit({}); }, field->lifetime());
+	) | rpl::start_with_next([=] {
+		submit({});
+	}, field->lifetime());
+
 	if (const auto show = uiShow(); show->valid()) {
 		InitMessageFieldHandlers(
 			_descriptor.session,
@@ -246,6 +249,14 @@ void ShareBox::prepareCommentField() {
 	}
 	field->setSubmitSettings(Core::App().settings().sendSubmitWay());
 
+	field->changes() | rpl::start_with_next([=] {
+		if (!field->getLastText().isEmpty()) {
+			setCloseByOutsideClick(false);
+		} else if (_inner->selected().empty()) {
+			setCloseByOutsideClick(true);
+		}
+	}, field->lifetime());
+
 	Ui::SendPendingMoveResizeEvents(_comment);
 	if (_bottomWidget) {
 		Ui::SendPendingMoveResizeEvents(_bottomWidget);
@@ -255,8 +266,6 @@ void ShareBox::prepareCommentField() {
 void ShareBox::prepare() {
 	prepareCommentField();
 
-	setCloseByOutsideClick(false);
-
 	_select->resizeToWidth(st::boxWideWidth);
 	Ui::SendPendingMoveResizeEvents(_select);
 
@@ -313,6 +322,12 @@ void ShareBox::prepare() {
 			not_null<Data::Thread*> thread,
 			bool checked) {
 		innerSelectedChanged(thread, checked);
+		if (checked) {
+			setCloseByOutsideClick(false);
+		} else if (_inner->selected().empty()
+			&& _comment->entity()->getLastText().isEmpty()) {
+			setCloseByOutsideClick(true);
+		}
 	});
 
 	Ui::Emoji::SuggestionsController::Init(
@@ -1678,6 +1693,101 @@ void FastShareMessage(
 		Ui::LayerOption::CloseOther);
 }
 
+void FastShareLink(
+		not_null<Window::SessionController*> controller,
+		const QString &url) {
+	FastShareLink(controller->uiShow(), url);
+}
+
+void FastShareLink(
+		std::shared_ptr<Main::SessionShow> show,
+		const QString &url) {
+	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto sending = std::make_shared<bool>();
+	auto copyCallback = [=] {
+		QGuiApplication::clipboard()->setText(url);
+		show->showToast(tr::lng_background_link_copied(tr::now));
+	};
+	auto submitCallback = [=](
+			std::vector<not_null<::Data::Thread*>> &&result,
+			TextWithTags &&comment,
+			Api::SendOptions options,
+			::Data::ForwardOptions) {
+		if (*sending || result.empty()) {
+			return;
+		}
+
+		const auto error = [&] {
+			for (const auto thread : result) {
+				const auto error = GetErrorTextForSending(
+					thread,
+					{ .text = &comment });
+				if (!error.isEmpty()) {
+					return std::make_pair(error, thread);
+				}
+			}
+			return std::make_pair(QString(), result.front());
+		}();
+		if (!error.first.isEmpty()) {
+			auto text = TextWithEntities();
+			if (result.size() > 1) {
+				text.append(
+					Ui::Text::Bold(error.second->chatListName())
+				).append("\n\n");
+			}
+			text.append(error.first);
+			if (const auto weak = *box) {
+				weak->getDelegate()->show(Ui::MakeConfirmBox({
+					.text = text,
+					.inform = true,
+				}));
+			}
+			return;
+		}
+
+		*sending = true;
+		if (!comment.text.isEmpty()) {
+			comment.text = url + "\n" + comment.text;
+			const auto add = url.size() + 1;
+			for (auto &tag : comment.tags) {
+				tag.offset += add;
+			}
+		} else {
+			comment.text = url;
+		}
+		auto &api = show->session().api();
+		for (const auto thread : result) {
+			auto message = Api::MessageToSend(
+				Api::SendAction(thread, options));
+			message.textWithTags = comment;
+			message.action.clearDraft = false;
+			api.sendMessage(std::move(message));
+		}
+		if (*box) {
+			(*box)->closeBox();
+		}
+		show->showToast(tr::lng_share_done(tr::now));
+	};
+	auto filterCallback = [](not_null<::Data::Thread*> thread) {
+		if (const auto user = thread->peer()->asUser()) {
+			if (user->canSendIgnoreRequirePremium()) {
+				return true;
+			}
+		}
+		return ::Data::CanSend(thread, ChatRestriction::SendOther);
+	};
+	*box = show->show(
+		Box<ShareBox>(ShareBox::Descriptor{
+			.session = &show->session(),
+			.copyCallback = std::move(copyCallback),
+			.submitCallback = std::move(submitCallback),
+			.filterCallback = std::move(filterCallback),
+			.premiumRequiredError = SharePremiumRequiredError(),
+		}),
+		Ui::LayerOption::KeepOther,
+		anim::type::normal);
+}
+
 auto SharePremiumRequiredError()
 -> Fn<RecipientPremiumRequiredError(not_null<UserData*>)> {
 	return WritePremiumRequiredError;
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index d5cd22ffa..253a8228e 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -37,6 +37,7 @@ struct SendOptions;
 
 namespace Main {
 class Session;
+class SessionShow;
 } // namespace Main
 
 namespace Dialogs {
@@ -68,6 +69,12 @@ void ShareGameScoreByHash(
 void FastShareMessage(
 	not_null<Window::SessionController*> controller,
 	not_null<HistoryItem*> item);
+void FastShareLink(
+	not_null<Window::SessionController*> controller,
+	const QString &url);
+void FastShareLink(
+	std::shared_ptr<Main::SessionShow> show,
+	const QString &url);
 
 struct RecipientPremiumRequiredError;
 [[nodiscard]] auto SharePremiumRequiredError()
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 2362a6b61..5b8fead1a 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -297,80 +297,6 @@ ShareBoxResult Shown::shareBox(ShareBoxDescriptor &&descriptor) {
 		state->destroyRequests.fire({});
 	}, wrap->lifetime());
 
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
-	const auto sending = std::make_shared<bool>();
-	auto copyCallback = [=] {
-		QGuiApplication::clipboard()->setText(url);
-		show->showToast(tr::lng_background_link_copied(tr::now));
-	};
-	auto submitCallback = [=](
-			std::vector<not_null<::Data::Thread*>> &&result,
-			TextWithTags &&comment,
-			Api::SendOptions options,
-			::Data::ForwardOptions) {
-		if (*sending || result.empty()) {
-			return;
-		}
-
-		const auto error = [&] {
-			for (const auto thread : result) {
-				const auto error = GetErrorTextForSending(
-					thread,
-					{ .text = &comment });
-				if (!error.isEmpty()) {
-					return std::make_pair(error, thread);
-				}
-			}
-			return std::make_pair(QString(), result.front());
-		}();
-		if (!error.first.isEmpty()) {
-			auto text = TextWithEntities();
-			if (result.size() > 1) {
-				text.append(
-					Ui::Text::Bold(error.second->chatListName())
-				).append("\n\n");
-			}
-			text.append(error.first);
-			if (const auto weak = *box) {
-				weak->getDelegate()->show(Ui::MakeConfirmBox({
-					.text = text,
-					.inform = true,
-				}));
-			}
-			return;
-		}
-
-		*sending = true;
-		if (!comment.text.isEmpty()) {
-			comment.text = url + "\n" + comment.text;
-			const auto add = url.size() + 1;
-			for (auto &tag : comment.tags) {
-				tag.offset += add;
-			}
-		} else {
-			comment.text = url;
-		}
-		auto &api = _session->api();
-		for (const auto thread : result) {
-			auto message = Api::MessageToSend(
-				Api::SendAction(thread, options));
-			message.textWithTags = comment;
-			message.action.clearDraft = false;
-			api.sendMessage(std::move(message));
-		}
-		if (*box) {
-			(*box)->closeBox();
-		}
-		show->showToast(tr::lng_share_done(tr::now));
-	};
-	auto filterCallback = [](not_null<::Data::Thread*> thread) {
-		if (const auto user = thread->peer()->asUser()) {
-			if (user->canSendIgnoreRequirePremium()) {
-				return true;
-			}
-		}
-		return ::Data::CanSend(thread, ChatRestriction::SendOther);
-	};
 	const auto focus = crl::guard(layer, [=] {
 		if (!layer->window()->isActiveWindow()) {
 			layer->window()->activateWindow();
@@ -383,16 +309,8 @@ ShareBoxResult Shown::shareBox(ShareBoxDescriptor &&descriptor) {
 		.hide = [=] { show->hideLayer(); },
 		.destroyRequests = state->destroyRequests.events(),
 	};
-	*box = show->show(
-		Box<ShareBox>(ShareBox::Descriptor{
-			.session = _session,
-			.copyCallback = std::move(copyCallback),
-			.submitCallback = std::move(submitCallback),
-			.filterCallback = std::move(filterCallback),
-			.premiumRequiredError = SharePremiumRequiredError(),
-		}),
-		Ui::LayerOption::KeepOther,
-		anim::type::normal);
+
+	FastShareLink(Main::MakeSessionShow(show, _session), url);
 	return result;
 }
 

From a88770a8ec072ae19eb743e6b8becbd3a6882562 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 16:10:42 +0400
Subject: [PATCH 362/596] Don't close recommendations.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 20 ++++++-
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  1 +
 .../dialogs/ui/dialogs_suggestions.cpp        | 57 ++++++++++++++++---
 .../dialogs/ui/dialogs_suggestions.h          |  4 ++
 .../view/media/history_view_web_page.cpp      |  6 +-
 .../info/profile/info_profile_actions.cpp     |  6 +-
 6 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 00cd49329..d56f2ef46 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1108,13 +1108,14 @@ void Widget::updateHasFocus(not_null<QWidget*> focused) {
 }
 
 void Widget::processSearchFocusChange() {
+	_searchSuggestionsLocked = _suggestions && _suggestions->persist();
 	updateStoriesVisibility();
 	updateForceDisplayWide();
 	updateSuggestions(anim::type::normal);
 }
 
 void Widget::updateSuggestions(anim::type animated) {
-	const auto suggest = _searchHasFocus
+	const auto suggest = (_searchHasFocus || _searchSuggestionsLocked)
 		&& !_searchInChat
 		&& (_inner->state() == WidgetState::Default);
 	if (anim::Disabled() || !session().data().chatsListLoaded()) {
@@ -1148,6 +1149,7 @@ void Widget::updateSuggestions(anim::type animated) {
 			controller(),
 			TopPeersContent(&session()),
 			RecentPeersContent(&session()));
+		_searchSuggestionsLocked = false;
 
 		rpl::merge(
 			_suggestions->topPeerChosen(),
@@ -1155,6 +1157,10 @@ void Widget::updateSuggestions(anim::type animated) {
 			_suggestions->myChannelChosen(),
 			_suggestions->recommendationChosen()
 		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+			if (_searchSuggestionsLocked
+				&& (!_suggestions || !_suggestions->persist())) {
+				processSearchFocusChange();
+			}
 			chosenRow({
 				.key = peer->owner().history(peer),
 				.newWindow = base::IsCtrlPressed(),
@@ -1478,7 +1484,8 @@ void Widget::setInnerFocus() {
 		return;
 	} else if (!_search->getLastText().isEmpty()
 		|| _searchInChat
-		|| _searchHasFocus) {
+		|| _searchHasFocus
+		|| _searchSuggestionsLocked) {
 		_search->setFocus();
 	} else {
 		setFocus();
@@ -1620,6 +1627,7 @@ void Widget::updateStoriesVisibility() {
 		|| !_widthAnimationCache.isNull()
 		|| _childList
 		|| _searchHasFocus
+		|| _searchSuggestionsLocked
 		|| !_search->getLastText().isEmpty()
 		|| _searchInChat
 		|| _stories->empty();
@@ -2586,6 +2594,7 @@ void Widget::applySearchUpdate(bool force) {
 
 void Widget::updateForceDisplayWide() {
 	controller()->setChatsForceDisplayWide(_searchHasFocus
+		|| _searchSuggestionsLocked
 		|| !_search->getLastText().isEmpty()
 		|| _searchInChat);
 }
@@ -3342,7 +3351,12 @@ bool Widget::cancelSearch() {
 		setFocus();
 		clearingInChat = true;
 	}
-	const auto clearSearchFocus = !_searchInChat && _searchHasFocus;
+	const auto clearSearchFocus = !_searchInChat
+		&& (_searchHasFocus || _searchSuggestionsLocked);
+	if (!_searchInChat && _suggestions) {
+		_suggestions->clearPersistance();
+		_searchSuggestionsLocked = false;
+	}
 	if (!_suggestions && clearSearchFocus) {
 		// Don't create suggestions in unfocus case.
 		setFocus();
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 84faf7576..ac37ed427 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -304,6 +304,7 @@ private:
 	std::vector<Data::ReactionId> _searchTags;
 	rpl::lifetime _searchTagsLifetime;
 	QString _lastSearchText;
+	bool _searchSuggestionsLocked = false;
 	bool _searchHasFocus = false;
 
 	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 17d761fe0..821530807 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -115,7 +115,6 @@ private:
 	const not_null<Window::SessionController*> _window;
 	RecentPeersList _recent;
 	rpl::variable<int> _count;
-	base::unique_qptr<Ui::PopupMenu> _menu;
 	rpl::event_stream<not_null<PeerData*>> _chosen;
 	rpl::lifetime _lifetime;
 
@@ -145,14 +144,13 @@ public:
 private:
 	void setupDivider();
 	void appendRow(not_null<ChannelData*> channel);
-	void fill();
+	void fill(bool force = false);
 
 	const not_null<Window::SessionController*> _window;
 	std::vector<not_null<History*>> _channels;
 	rpl::variable<Ui::RpWidget*> _toggleExpanded = nullptr;
 	rpl::variable<int> _count = 0;
 	rpl::variable<bool> _expanded = false;
-	base::unique_qptr<Ui::PopupMenu> _menu;
 	rpl::event_stream<not_null<PeerData*>> _chosen;
 	rpl::lifetime _lifetime;
 
@@ -185,7 +183,6 @@ private:
 
 	const not_null<Window::SessionController*> _window;
 	rpl::variable<int> _count;
-	base::unique_qptr<Ui::PopupMenu> _menu;
 	rpl::event_stream<not_null<PeerData*>> _chosen;
 	rpl::lifetime _lifetime;
 
@@ -529,6 +526,27 @@ MyChannelsController::MyChannelsController(
 void MyChannelsController::prepare() {
 	setupDivider();
 
+	session().changes().peerUpdates(
+		Data::PeerUpdate::Flag::ChannelAmIn
+	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		const auto channel = update.peer->asBroadcast();
+		if (!channel || channel->amIn()) {
+			return;
+		}
+		const auto history = channel->owner().history(channel);
+		const auto i = ranges::remove(_channels, history);
+		if (i == end(_channels)) {
+			return;
+		}
+		_channels.erase(i, end(_channels));
+		const auto row = delegate()->peerListFindRow(channel->id.value);
+		if (row) {
+			delegate()->peerListRemoveRow(row);
+		}
+		_count = int(_channels.size());
+		fill(true);
+	}, _lifetime);
+
 	_channels.reserve(kProbablyMaxChannels);
 	const auto owner = &session().data();
 	const auto add = [&](not_null<Dialogs::MainList*> list) {
@@ -579,20 +597,20 @@ void MyChannelsController::prepare() {
 	}, _lifetime);
 }
 
-void MyChannelsController::fill() {
+void MyChannelsController::fill(bool force) {
 	const auto count = _count.current();
 	const auto limit = _expanded.current()
 		? count
 		: std::min(count, kCollapsedChannelsCount);
 	const auto already = delegate()->peerListFullRowsCount();
 	const auto delta = limit - already;
-	if (!delta) {
+	if (!delta && !force) {
 		return;
 	} else if (delta > 0) {
 		for (auto i = already; i != limit; ++i) {
 			appendRow(_channels[i]->peer->asBroadcast());
 		}
-	} else {
+	} else if (delta < 0) {
 		for (auto i = already; i != limit;) {
 			delegate()->peerListRemoveRow(delegate()->peerListRowAt(--i));
 		}
@@ -620,7 +638,19 @@ void MyChannelsController::rowClicked(not_null<PeerListRow*> row) {
 base::unique_qptr<Ui::PopupMenu> MyChannelsController::rowContextMenu(
 		QWidget *parent,
 		not_null<PeerListRow*> row) {
-	return nullptr;
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	const auto peer = row->peer();
+	const auto addAction = Ui::Menu::CreateAddActionCallback(result);
+	Window::FillDialogsEntryMenu(
+		_window,
+		Dialogs::EntryState{
+			.key = peer->owner().history(peer),
+			.section = Dialogs::EntryState::Section::ContextMenu,
+		},
+		addAction);
+	return result;
 }
 
 Main::Session &MyChannelsController::session() const {
@@ -977,6 +1007,7 @@ void Suggestions::switchTab(Tab tab) {
 		return;
 	}
 	_tab = tab;
+	_persist = false;
 	if (_tabs->isHidden()) {
 		return;
 	}
@@ -1215,6 +1246,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupMyChannels() {
 
 	controller->chosen(
 	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		_persist = false;
 		_myChannelChosen.fire_copy(peer);
 	}, lifetime);
 
@@ -1269,6 +1301,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecommendations() {
 
 	controller->chosen(
 	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		_persist = true;
 		_recommendationChosen.fire_copy(peer);
 	}, lifetime);
 
@@ -1311,6 +1344,14 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecommendations() {
 	return object_ptr<Ui::SlideWrap<>>(this, std::move(content));
 }
 
+bool Suggestions::persist() const {
+	return _persist;
+}
+
+void Suggestions::clearPersistance() {
+	_persist = false;
+}
+
 rpl::producer<TopPeersList> TopPeersContent(
 		not_null<Main::Session*> session) {
 	return [=](auto consumer) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 5749d7af7..4e08720bb 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -50,6 +50,9 @@ public:
 	void hide(anim::type animated, Fn<void()> finish);
 	[[nodiscard]] float64 shownOpacity() const;
 
+	[[nodiscard]] bool persist() const;
+	void clearPersistance();
+
 	[[nodiscard]] rpl::producer<not_null<PeerData*>> topPeerChosen() const {
 		return _topPeerChosen.events();
 	}
@@ -141,6 +144,7 @@ private:
 	Fn<void()> _showFinished;
 	Tab _tab = Tab::Chats;
 	bool _hidden = false;
+	bool _persist = false;
 	QPixmap _cache;
 
 	Ui::Animations::Simple _slideAnimation;
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 2a6f031ed..d2a609c39 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -167,7 +167,8 @@ constexpr auto kStickerSetLines = 3;
 		: (type == WebPageType::GroupWithRequest
 			|| type == WebPageType::ChannelWithRequest)
 		? tr::lng_view_button_request_join(tr::now)
-		: (type == WebPageType::ChannelBoost)
+		: (type == WebPageType::GroupBoost
+			|| type == WebPageType::ChannelBoost)
 		? tr::lng_view_button_boost(tr::now)
 		: (type == WebPageType::Giftcode)
 		? tr::lng_view_button_giftcode(tr::now)
@@ -202,8 +203,11 @@ constexpr auto kStickerSetLines = 3;
 	return webpage->iv
 		|| (type == WebPageType::Message)
 		|| (type == WebPageType::Group)
+		|| (type == WebPageType::GroupWithRequest)
+		|| (type == WebPageType::GroupBoost)
 		|| (type == WebPageType::Channel)
 		|| (type == WebPageType::ChannelBoost)
+		|| (type == WebPageType::ChannelWithRequest)
 		|| (type == WebPageType::Giftcode)
 		// || (type == WebPageType::Bot)
 		|| (type == WebPageType::User)
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index dfc7d3baa..c4ba68899 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -41,6 +41,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/add_bot_to_chat_box.h"
 #include "boxes/peers/edit_contact_box.h"
 #include "boxes/report_messages_box.h"
+#include "boxes/share_box.h"
 #include "boxes/translate_box.h"
 #include "lang/lang_keys.h"
 #include "menu/menu_mute.h"
@@ -131,9 +132,8 @@ base::options::toggle ShowPeerIdBelowAbout({
 				+ addToLink;
 		}
 		if (!link.isEmpty()) {
-			QGuiApplication::clipboard()->setText(link);
-			if (const auto window = weak.get()) {
-				window->showToast(tr::lng_username_copied(tr::now));
+			if (const auto strong = weak.get()) {
+				FastShareLink(strong, link);
 			}
 		}
 	};

From 705bd9693d0d6d5bcda2c4ac829858ada4538701 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 17:39:21 +0400
Subject: [PATCH 363/596] Load recommendations on demand.

---
 .../dialogs/ui/dialogs_suggestions.cpp        | 77 ++++++++++++-------
 .../dialogs/ui/dialogs_suggestions.h          |  2 +-
 2 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 821530807..3f416a179 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -177,12 +177,16 @@ public:
 		not_null<PeerListRow*> row) override;
 	Main::Session &session() const override;
 
+	void load();
+
 private:
+	void fill();
 	void setupDivider();
 	void appendRow(not_null<ChannelData*> channel);
 
 	const not_null<Window::SessionController*> _window;
 	rpl::variable<int> _count;
+	bool _requested = false;
 	rpl::event_stream<not_null<PeerData*>> _chosen;
 	rpl::lifetime _lifetime;
 
@@ -730,28 +734,35 @@ RecommendationsController::RecommendationsController(
 
 void RecommendationsController::prepare() {
 	setupDivider();
-
-	const auto participants = &session().api().chatParticipants();
-	const auto fill = [=] {
-		const auto &list = participants->recommendations().list;
-		if (list.empty()) {
-			return;
-		}
-		for (const auto &peer : list) {
-			if (const auto channel = peer->asBroadcast()) {
-				appendRow(channel);
-			}
-		}
-		delegate()->peerListRefreshRows();
-		_count = delegate()->peerListFullRowsCount();
-	};
-
 	fill();
-	if (!_count.current()) {
-		participants->loadRecommendations();
-		participants->recommendationsLoaded(
-		) | rpl::take(1) | rpl::start_with_next(fill, _lifetime);
+}
+
+void RecommendationsController::load() {
+	if (_requested || _count.current()) {
+		return;
 	}
+	_requested = true;
+	const auto participants = &session().api().chatParticipants();
+	participants->loadRecommendations();
+	participants->recommendationsLoaded(
+	) | rpl::take(1) | rpl::start_with_next([=] {
+		fill();
+	}, _lifetime);
+}
+
+void RecommendationsController::fill() {
+	const auto participants = &session().api().chatParticipants();
+	const auto &list = participants->recommendations().list;
+	if (list.empty()) {
+		return;
+	}
+	for (const auto &peer : list) {
+		if (const auto channel = peer->asBroadcast()) {
+			appendRow(channel);
+		}
+	}
+	delegate()->peerListRefreshRows();
+	_count = delegate()->peerListFullRowsCount();
 }
 
 void RecommendationsController::appendRow(not_null<ChannelData*> channel) {
@@ -852,7 +863,7 @@ void Suggestions::setupTabs() {
 	_tabs->setSections({
 		tr::lng_recent_chats(tr::now),
 		tr::lng_recent_channels(tr::now),
-		});
+	});
 	_tabs->sectionActivated(
 	) | rpl::start_with_next([=](int section) {
 		switchTab(section ? Tab::Channels : Tab::Chats);
@@ -904,7 +915,7 @@ void Suggestions::setupChats() {
 		});
 	}, _topPeers->lifetime());
 
-	_chatsScroll->setVisible(_tab == Tab::Chats);
+	_chatsScroll->setVisible(_tab.current() == Tab::Chats);
 }
 
 void Suggestions::setupChannels() {
@@ -923,7 +934,7 @@ void Suggestions::setupChannels() {
 			rpl::mappers::_1 + rpl::mappers::_2 == 0),
 		anim::type::instant);
 
-	_channelsScroll->setVisible(_tab == Tab::Channels);
+	_channelsScroll->setVisible(_tab.current() == Tab::Channels);
 }
 
 void Suggestions::selectJump(Qt::Key direction, int pageSize) {
@@ -1003,7 +1014,7 @@ void Suggestions::hide(anim::type animated, Fn<void()> finish) {
 }
 
 void Suggestions::switchTab(Tab tab) {
-	if (_tab == tab) {
+	if (_tab.current() == tab) {
 		return;
 	}
 	_tab = tab;
@@ -1021,8 +1032,9 @@ void Suggestions::startSlideAnimation() {
 		_chatsScroll->hide();
 		_channelsScroll->hide();
 	}
-	const auto from = (_tab == Tab::Channels) ? 0. : 1.;
-	const auto to = (_tab == Tab::Channels) ? 1. : 0.;
+	const auto channels = (_tab.current() == Tab::Channels);
+	const auto from = channels ? 0. : 1.;
+	const auto to = channels ? 1. : 0.;
 	_slideAnimation.start([=] {
 		update();
 		if (!_slideAnimation.animating() && !_shownAnimation.animating()) {
@@ -1067,8 +1079,9 @@ void Suggestions::finishShow() {
 	_cache = QPixmap();
 
 	_tabs->show();
-	_chatsScroll->setVisible(_tab == Tab::Chats);
-	_channelsScroll->setVisible(_tab == Tab::Channels);
+	const auto channels = (_tab.current() == Tab::Channels);
+	_chatsScroll->setVisible(!channels);
+	_channelsScroll->setVisible(channels);
 }
 
 float64 Suggestions::shownOpacity() const {
@@ -1088,7 +1101,7 @@ void Suggestions::paintEvent(QPaintEvent *e) {
 		p.drawPixmap(0, (opacity - 1.) * slide, _cache);
 	} else if (!_slideLeft.isNull()) {
 		const auto slide = st::topPeers.height + st::searchedBarHeight;
-		const auto right = (_tab == Tab::Channels);
+		const auto right = (_tab.current() == Tab::Channels);
 		const auto progress = _slideAnimation.value(right ? 1. : 0.);
 		const auto shift = st::topPeers.height + st::searchedBarHeight;
 		p.setOpacity(1. - progress);
@@ -1299,6 +1312,12 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecommendations() {
 
 	_recommendationsCount = controller->count();
 
+	_tab.value() | rpl::filter(
+		rpl::mappers::_1 == Tab::Channels
+	) | rpl::start_with_next([=] {
+		controller->load();
+	}, lifetime);
+
 	controller->chosen(
 	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
 		_persist = true;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 4e08720bb..a0d3e30f2 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -108,6 +108,7 @@ private:
 	const not_null<Window::SessionController*> _controller;
 
 	const std::unique_ptr<Ui::SettingsSlider> _tabs;
+	rpl::variable<Tab> _tab = Tab::Chats;
 
 	const std::unique_ptr<Ui::ElasticScroll> _chatsScroll;
 	const not_null<Ui::VerticalLayout*> _chatsContent;
@@ -142,7 +143,6 @@ private:
 
 	Ui::Animations::Simple _shownAnimation;
 	Fn<void()> _showFinished;
-	Tab _tab = Tab::Chats;
 	bool _hidden = false;
 	bool _persist = false;
 	QPixmap _cache;

From 4f365c73ad1d22a03e1e98c0a58de94f46e3a685 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 18:05:45 +0400
Subject: [PATCH 364/596] Support active selection in recommendations.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  | 38 +++++++------
 Telegram/SourceFiles/boxes/peer_list_box.h    |  2 +-
 Telegram/SourceFiles/dialogs/dialogs.style    | 18 +++++-
 .../dialogs/ui/dialogs_suggestions.cpp        | 57 +++++++++++++++++--
 4 files changed, 90 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 777773f0b..362387458 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -734,9 +734,9 @@ auto PeerListRow::generateNameWords() const
 	return peer()->nameWords();
 }
 
-QPoint PeerListRow::computeNamePosition(
+const style::PeerListItem &PeerListRow::computeSt(
 		const style::PeerListItem &st) const {
-	return st.namePosition;
+	return st;
 }
 
 void PeerListRow::invalidatePixmapsCache() {
@@ -1693,7 +1693,9 @@ crl::time PeerListContent::paintRow(
 	const auto row = getRow(index);
 	Assert(row != nullptr);
 
-	row->lazyInitialize(_st.item);
+	const auto &st = row->computeSt(_st.item);
+
+	row->lazyInitialize(st);
 	const auto outerWidth = width();
 
 	auto refreshStatusAt = row->refreshStatusTime();
@@ -1721,8 +1723,8 @@ crl::time PeerListContent::paintRow(
 
 	const auto opacity = row->opacity();
 	const auto &bg = selected
-		? _st.item.button.textBgOver
-		: _st.item.button.textBg;
+		? st.button.textBgOver
+		: st.button.textBg;
 	if (opacity < 1.) {
 		p.setOpacity(opacity);
 	}
@@ -1736,34 +1738,34 @@ crl::time PeerListContent::paintRow(
 	row->paintRipple(p, 0, 0, outerWidth);
 	row->paintUserpic(
 		p,
-		_st.item,
-		_st.item.photoPosition.x(),
-		_st.item.photoPosition.y(),
+		st,
+		st.photoPosition.x(),
+		st.photoPosition.y(),
 		outerWidth);
 
 	p.setPen(st::contactsNameFg);
 
-	const auto skipRight = _st.item.photoPosition.x();
+	const auto skipRight = st.photoPosition.x();
 	const auto rightActionSize = row->rightActionSize();
 	const auto rightActionMargins = rightActionSize.isEmpty()
 		? QMargins()
 		: row->rightActionMargins();
 	const auto &name = row->name();
-	const auto namePosition = row->computeNamePosition(_st.item);
+	const auto namePosition = st.namePosition;
 	const auto namex = namePosition.x();
 	const auto namey = namePosition.y();
 	auto namew = outerWidth - namex - skipRight;
 	if (!rightActionSize.isEmpty()
 		&& (namey < rightActionMargins.top() + rightActionSize.height())
-		&& (namey + _st.item.nameStyle.font->height
+		&& (namey + st.nameStyle.font->height
 			> rightActionMargins.top())) {
 		namew -= rightActionMargins.left()
 			+ rightActionSize.width()
 			+ rightActionMargins.right()
 			- skipRight;
 	}
-	const auto statusx = _st.item.statusPosition.x();
-	const auto statusy = _st.item.statusPosition.y();
+	const auto statusx = st.statusPosition.x();
+	const auto statusy = st.statusPosition.y();
 	auto statusw = outerWidth - statusx - skipRight;
 	if (!rightActionSize.isEmpty()
 		&& (statusy < rightActionMargins.top() + rightActionSize.height())
@@ -1785,7 +1787,7 @@ crl::time PeerListContent::paintRow(
 		width(),
 		selected);
 	auto nameCheckedRatio = row->disabled() ? 0. : row->checkedRatio();
-	p.setPen(anim::pen(_st.item.nameFg, _st.item.nameFgChecked, nameCheckedRatio));
+	p.setPen(anim::pen(st.nameFg, st.nameFgChecked, nameCheckedRatio));
 	name.drawLeftElided(p, namex, namey, namew, width());
 
 	p.setFont(st::contactsStatusFont);
@@ -1804,17 +1806,17 @@ crl::time PeerListContent::paintRow(
 			if (highlightedWidth > availableWidth) {
 				highlightedPart = st::contactsStatusFont->elided(highlightedPart, availableWidth);
 			}
-			p.setPen(_st.item.statusFgActive);
+			p.setPen(st.statusFgActive);
 			p.drawTextLeft(statusx, statusy, width(), highlightedPart);
 		} else {
 			grayedPart = st::contactsStatusFont->elided(grayedPart, availableWidth - highlightedWidth);
-			p.setPen(_st.item.statusFgActive);
+			p.setPen(st.statusFgActive);
 			p.drawTextLeft(statusx, statusy, width(), highlightedPart);
-			p.setPen(selected ? _st.item.statusFgOver : _st.item.statusFg);
+			p.setPen(selected ? st.statusFgOver : st.statusFg);
 			p.drawTextLeft(statusx + highlightedWidth, statusy, width(), grayedPart);
 		}
 	} else {
-		row->paintStatusText(p, _st.item, statusx, statusy, statusw, width(), selected);
+		row->paintStatusText(p, st, statusx, statusy, statusw, width(), selected);
 	}
 
 	row->elementsPaint(
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 010c63598..b276364d4 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -100,7 +100,7 @@ public:
 		-> const base::flat_set<QChar> &;
 	[[nodiscard]] virtual auto generateNameWords() const
 		-> const base::flat_set<QString> &;
-	[[nodiscard]] virtual QPoint computeNamePosition(
+	[[nodiscard]] virtual const style::PeerListItem &computeSt(
 		const style::PeerListItem &st) const;
 
 	virtual void preloadUserpic();
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 8298341c5..16aa472ec 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -622,7 +622,23 @@ recentPeersList: PeerList(defaultPeerList) {
 	padding: margins(0px, 4px, 0px, 4px);
 	item: recentPeersItem;
 }
-recentPeersSpecialNamePosition: point(64px, 19px);
+recentPeersItemActive: PeerListItem(recentPeersItem) {
+	nameFg: dialogsNameFgActive;
+	nameFgChecked: dialogsNameFgActive;
+	button: OutlineButton(defaultPeerListButton) {
+		textBg: dialogsBgActive;
+		textBgOver: dialogsBgActive;
+		ripple: RippleAnimation(defaultRippleAnimation) {
+			color: dialogsRippleBgActive;
+		}
+	}
+	statusFg: dialogsTextFgActive;
+	statusFgOver: dialogsTextFgActive;
+	statusFgActive: dialogsTextFgActive;
+}
+recentPeersSpecialName: PeerListItem(recentPeersItem) {
+	namePosition: point(64px, 19px);
+}
 
 dialogsSearchTabs: SettingsSlider(defaultSettingsSlider) {
 	height: 33px;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 3f416a179..f380c47d6 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -71,7 +71,8 @@ public:
 		bool actionSelected) override;
 	bool rightActionDisabled() const override;
 
-	QPoint computeNamePosition(const style::PeerListItem &st) const override;
+	const style::PeerListItem &computeSt(
+		const style::PeerListItem &st) const override;
 
 private:
 	const not_null<History*> _history;
@@ -120,6 +121,20 @@ private:
 
 };
 
+class ChannelRow final : public PeerListRow {
+public:
+	using PeerListRow::PeerListRow;
+
+	void setActive(bool active);
+
+	const style::PeerListItem &computeSt(
+		const style::PeerListItem &st) const override;
+
+private:
+	bool _active = false;
+
+};
+
 class MyChannelsController final
 	: public PeerListController
 	, public base::has_weak_ptr {
@@ -186,6 +201,7 @@ private:
 
 	const not_null<Window::SessionController*> _window;
 	rpl::variable<int> _count;
+	History *_activeHistory = nullptr;
 	bool _requested = false;
 	rpl::event_stream<not_null<PeerData*>> _chosen;
 	rpl::lifetime _lifetime;
@@ -367,10 +383,20 @@ bool RecentRow::rightActionDisabled() const {
 	return true;
 }
 
-QPoint RecentRow::computeNamePosition(const style::PeerListItem &st) const {
+const style::PeerListItem &RecentRow::computeSt(
+		const style::PeerListItem &st) const {
 	return (peer()->isSelf() || peer()->isRepliesChat())
-		? st::recentPeersSpecialNamePosition
-		: st.namePosition;
+		? st::recentPeersSpecialName
+		: st;
+}
+
+void ChannelRow::setActive(bool active) {
+	_active = active;
+}
+
+const style::PeerListItem &ChannelRow::computeSt(
+		const style::PeerListItem &st) const {
+	return _active ? st::recentPeersItemActive : st::recentPeersItem;
 }
 
 RecentsController::RecentsController(
@@ -763,10 +789,31 @@ void RecommendationsController::fill() {
 	}
 	delegate()->peerListRefreshRows();
 	_count = delegate()->peerListFullRowsCount();
+
+	_window->activeChatValue() | rpl::start_with_next([=](const Key &key) {
+		const auto history = key.history();
+		if (_activeHistory == history) {
+			return;
+		} else if (_activeHistory) {
+			const auto id = _activeHistory->peer->id.value;
+			if (const auto row = delegate()->peerListFindRow(id)) {
+				static_cast<ChannelRow*>(row)->setActive(false);
+				delegate()->peerListUpdateRow(row);
+			}
+		}
+		_activeHistory = history;
+		if (_activeHistory) {
+			const auto id = _activeHistory->peer->id.value;
+			if (const auto row = delegate()->peerListFindRow(id)) {
+				static_cast<ChannelRow*>(row)->setActive(true);
+				delegate()->peerListUpdateRow(row);
+			}
+		}
+	}, _lifetime);
 }
 
 void RecommendationsController::appendRow(not_null<ChannelData*> channel) {
-	auto row = std::make_unique<PeerListRow>(channel);
+	auto row = std::make_unique<ChannelRow>(channel);
 	if (channel->membersCountKnown()) {
 		row->setCustomStatus((channel->isBroadcast()
 			? tr::lng_chat_status_subscribers

From 34a7169b4f0098a1ed958f7e1ed4a0c8b1bd9651 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 21:48:07 +0400
Subject: [PATCH 365/596] Make unread badges on top peers nicer.

---
 Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 52efe6f4d..d970413c4 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -520,7 +520,7 @@ void TopPeersStrip::paintUserpic(
 	const auto inner = QRect(0, 0, size, size);
 	q.drawImage(inner, simple);
 
-	auto hq = PainterHighQualityEnabler(p);
+	auto hq = PainterHighQualityEnabler(q);
 
 	if (online > 0) {
 		q.setCompositionMode(QPainter::CompositionMode_Source);
@@ -554,7 +554,16 @@ void TopPeersStrip::paintUserpic(
 		st.selected = selected;
 		st.muted = entry.muted;
 		const auto &counter = entry.badgeString;
-		PaintUnreadBadge(q, counter, size, 0, st);
+		const auto badge = PaintUnreadBadge(q, counter, size, 0, st);
+
+		const auto width = style::ConvertScaleExact(2.);
+		const auto add = (width - style::ConvertScaleExact(1.)) / 2.;
+		auto pen = QPen(Qt::transparent);
+		pen.setWidthF(width);
+		q.setCompositionMode(QPainter::CompositionMode_Source);
+		q.setPen(pen);
+		q.setBrush(Qt::NoBrush);
+		q.drawEllipse(QRectF(badge).marginsAdded({ add, add, add, add }));
 	}
 
 	q.end();

From a11535806d5b328908a6b08467fbb1f9afcf2fe7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 22:04:36 +0400
Subject: [PATCH 366/596] Always show cancel search when focused.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 10 +++++++++-
 Telegram/SourceFiles/dialogs/dialogs_widget.h   |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index d56f2ef46..ea0d08f67 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1109,6 +1109,7 @@ void Widget::updateHasFocus(not_null<QWidget*> focused) {
 
 void Widget::processSearchFocusChange() {
 	_searchSuggestionsLocked = _suggestions && _suggestions->persist();
+	updateCancelSearch();
 	updateStoriesVisibility();
 	updateForceDisplayWide();
 	updateSuggestions(anim::type::normal);
@@ -2550,6 +2551,13 @@ void Widget::listScrollUpdated() {
 	_scrollToTop->update();
 }
 
+void Widget::updateCancelSearch() {
+	const auto shown = _searchHasFocus
+		|| _searchSuggestionsLocked
+		|| !_search->getLastText().isEmpty();
+	_cancelSearch->toggle(shown, anim::type::normal);
+}
+
 void Widget::applySearchUpdate(bool force) {
 	if (_showAnimation && !force) {
 		return;
@@ -2562,7 +2570,7 @@ void Widget::applySearchUpdate(bool force) {
 	if (filterText.isEmpty() && !_searchFromAuthor && _searchTags.empty()) {
 		clearSearchCache();
 	}
-	_cancelSearch->toggle(!filterText.isEmpty(), anim::type::normal);
+	updateCancelSearch();
 	if (!_postponeProcessSearchFocusChange) {
 		updateSuggestions(anim::type::instant);
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index ac37ed427..1c6179d03 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -227,6 +227,7 @@ private:
 	void closeChildList(anim::type animated);
 
 	void fullSearchRefreshOn(rpl::producer<> events);
+	void updateCancelSearch();
 	void applySearchUpdate(bool force = false);
 	void refreshLoadMoreButton(bool mayBlock, bool isBlocked);
 	void loadMoreBlockedByDate();

From 615f4b1d1ca5ad1f768f5315b439fa6f331ceb8a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 22:15:03 +0400
Subject: [PATCH 367/596] Ignore pageBlockUnsupported blocks.

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

diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp
index 6069d4407..f0c823676 100644
--- a/Telegram/SourceFiles/iv/iv_prepare.cpp
+++ b/Telegram/SourceFiles/iv/iv_prepare.cpp
@@ -377,7 +377,7 @@ QByteArray Parser::slideshow(
 }
 
 QByteArray Parser::block(const MTPDpageBlockUnsupported &data) {
-	return "Unsupported."_q;
+	return QByteArray();
 }
 
 QByteArray Parser::block(const MTPDpageBlockTitle &data) {

From 046803dbeda7733bea213ec2e5feacb944374e87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 22:47:37 +0400
Subject: [PATCH 368/596] Fix rotation reading in FFmpeg.

---
 .../SourceFiles/ffmpeg/ffmpeg_utility.cpp     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
index 95cefeffc..2a42d0034 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 extern "C" {
 #include <libavutil/opt.h>
+#include <libavutil/display.h>
 } // extern "C"
 
 namespace FFmpeg {
@@ -503,16 +504,17 @@ int DurationByPacket(const Packet &packet, AVRational timeBase) {
 }
 
 int ReadRotationFromMetadata(not_null<AVStream*> stream) {
-	const auto tag = av_dict_get(stream->metadata, "rotate", nullptr, 0);
-	if (tag && *tag->value) {
-		const auto string = QString::fromUtf8(tag->value);
-		auto ok = false;
-		const auto degrees = string.toInt(&ok);
-		if (ok && (degrees == 90 || degrees == 180 || degrees == 270)) {
-			return degrees;
-		}
+	const auto displaymatrix = av_stream_get_side_data(
+		stream,
+		AV_PKT_DATA_DISPLAYMATRIX,
+		nullptr);
+	auto theta = 0;
+	if (displaymatrix) {
+		theta = -round(av_display_rotation_get((int32_t*)displaymatrix));
 	}
-	return 0;
+	theta -= 360 * floor(theta / 360 + 0.9 / 360);
+	const auto result = int(base::SafeRound(theta));
+	return (result == 90 || result == 180 || result == 270) ? result : 0;
 }
 
 AVRational ValidateAspectRatio(AVRational aspect) {

From e6ba85e11272d78a006772599e67be93c67a3dd6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Apr 2024 23:17:14 +0400
Subject: [PATCH 369/596] Keyboard navigation in channels/recommendations.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  | 20 ++++
 Telegram/SourceFiles/boxes/peer_list_box.h    |  2 +
 .../dialogs/ui/dialogs_suggestions.cpp        | 93 ++++++++++++++++++-
 .../dialogs/ui/dialogs_suggestions.h          |  3 +
 4 files changed, 114 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 362387458..99da56122 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1912,10 +1912,30 @@ void PeerListContent::selectSkipPage(int height, int direction) {
 	selectSkip(rowsToSkip * direction);
 }
 
+void PeerListContent::selectLast() {
+	const auto rowsCount = shownRowsCount();
+	const auto newSelectedIndex = rowsCount - 1;
+	_selected.index.value = newSelectedIndex;
+	_selected.element = 0;
+	if (newSelectedIndex >= 0) {
+		auto top = (newSelectedIndex > 0) ? getRowTop(RowIndex(newSelectedIndex)) : 0;
+		auto bottom = (newSelectedIndex + 1 < rowsCount) ? getRowTop(RowIndex(newSelectedIndex + 1)) : height();
+		_scrollToRequests.fire({ top, bottom });
+	}
+
+	update();
+
+	_selectedIndex = _selected.index.value;
+}
+
 rpl::producer<int> PeerListContent::selectedIndexValue() const {
 	return _selectedIndex.value();
 }
 
+int PeerListContent::selectedIndex() const {
+	return _selectedIndex.current();
+}
+
 bool PeerListContent::hasSelection() const {
 	return _selected.index.value >= 0;
 }
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index b276364d4..e4a00d939 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -603,6 +603,7 @@ public:
 	};
 	SkipResult selectSkip(int direction);
 	void selectSkipPage(int height, int direction);
+	void selectLast();
 
 	enum class Mode {
 		Default,
@@ -611,6 +612,7 @@ public:
 	void setMode(Mode mode);
 
 	[[nodiscard]] rpl::producer<int> selectedIndexValue() const;
+	[[nodiscard]] int selectedIndex() const;
 	[[nodiscard]] bool hasSelection() const;
 	[[nodiscard]] bool hasPressed() const;
 	void clearSelection();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index f380c47d6..3f021593a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -985,8 +985,16 @@ void Suggestions::setupChannels() {
 }
 
 void Suggestions::selectJump(Qt::Key direction, int pageSize) {
+	if (_tab.current() == Tab::Chats) {
+		selectJumpChats(direction, pageSize);
+	} else {
+		selectJumpChannels(direction, pageSize);
+	}
+}
+
+void Suggestions::selectJumpChats(Qt::Key direction, int pageSize) {
 	const auto recentHasSelection = [=] {
-		return _recentSelectJump(Qt::Key(), 0) == JumpResult::Applied;
+		return _recentSelectJump({}, 0) == JumpResult::Applied;
 	};
 	if (pageSize) {
 		if (direction == Qt::Key_Down || direction == Qt::Key_Up) {
@@ -1007,7 +1015,7 @@ void Suggestions::selectJump(Qt::Key direction, int pageSize) {
 	} else if (direction == Qt::Key_Up) {
 		if (_recentSelectJump(direction, pageSize)
 			== JumpResult::AppliedAndOut) {
-			_topPeers->selectByKeyboard(Qt::Key());
+			_topPeers->selectByKeyboard({});
 			_chatsScroll->scrollTo(0);
 		} else {
 			_topPeers->deselectByKeyboard();
@@ -1021,7 +1029,7 @@ void Suggestions::selectJump(Qt::Key direction, int pageSize) {
 		} else if (!_topPeersWrap->toggled() || recentHasSelection()) {
 			_recentSelectJump(direction, pageSize);
 		} else {
-			_topPeers->selectByKeyboard(Qt::Key());
+			_topPeers->selectByKeyboard({});
 			_chatsScroll->scrollTo(0);
 		}
 	} else if (direction == Qt::Key_Left || direction == Qt::Key_Right) {
@@ -1032,6 +1040,69 @@ void Suggestions::selectJump(Qt::Key direction, int pageSize) {
 	}
 }
 
+void Suggestions::selectJumpChannels(Qt::Key direction, int pageSize) {
+	const auto myChannelsHasSelection = [=] {
+		return _myChannelsSelectJump({}, 0) == JumpResult::Applied;
+	};
+	const auto recommendationsHasSelection = [=] {
+		return _recommendationsSelectJump({}, 0) == JumpResult::Applied;
+	};
+	if (pageSize) {
+		if (direction == Qt::Key_Down) {
+			if (recommendationsHasSelection()) {
+				_recommendationsSelectJump(direction, pageSize);
+			} else if (myChannelsHasSelection()) {
+				if (_myChannelsSelectJump(direction, pageSize)
+					== JumpResult::AppliedAndOut) {
+					_recommendationsSelectJump(direction, 0);
+				}
+			} else if (_myChannelsCount.current()) {
+				_myChannelsSelectJump(direction, 0);
+				_myChannelsSelectJump(direction, pageSize);
+			} else if (_recommendationsCount.current()) {
+				_recommendationsSelectJump(direction, 0);
+				_recommendationsSelectJump(direction, pageSize);
+			}
+		} else if (direction == Qt::Key_Up) {
+			if (myChannelsHasSelection()) {
+				if (_myChannelsSelectJump(direction, pageSize)
+					== JumpResult::AppliedAndOut) {
+					_channelsScroll->scrollTo(0);
+				}
+			} else if (recommendationsHasSelection()) {
+				if (_recommendationsSelectJump(direction, pageSize)
+					== JumpResult::AppliedAndOut) {
+					_myChannelsSelectJump(direction, -1);
+				}
+			}
+		}
+	} else if (direction == Qt::Key_Up) {
+		if (myChannelsHasSelection()) {
+			_myChannelsSelectJump(direction, 0);
+		} else if (_recommendationsSelectJump(direction, 0)
+			== JumpResult::AppliedAndOut) {
+			_myChannelsSelectJump(direction, -1);
+		} else if (!recommendationsHasSelection()) {
+			if (_myChannelsSelectJump(direction, 0)
+				== JumpResult::AppliedAndOut) {
+				_channelsScroll->scrollTo(0);
+			}
+		}
+	} else if (direction == Qt::Key_Down) {
+		if (recommendationsHasSelection()) {
+			_recommendationsSelectJump(direction, 0);
+		} else if (_myChannelsSelectJump(direction, 0)
+			== JumpResult::AppliedAndOut) {
+			_recommendationsSelectJump(direction, 0);
+		} else if (!myChannelsHasSelection()) {
+			if (_recommendationsSelectJump(direction, 0)
+				== JumpResult::AppliedAndOut) {
+				_myChannelsSelectJump(direction, 0);
+			}
+		}
+	}
+}
+
 void Suggestions::chooseRow() {
 	if (!_topPeers->chooseRow()) {
 		_recentPeersChoose();
@@ -1316,19 +1387,33 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupMyChannels() {
 	_myChannelsChoose = [=] {
 		return raw->submitted();
 	};
-	_myChannelsSelectJump = [raw](Qt::Key direction, int pageSize) {
+	_myChannelsSelectJump = [=](Qt::Key direction, int pageSize) {
 		const auto had = raw->hasSelection();
 		if (direction == Qt::Key()) {
 			return had ? JumpResult::Applied : JumpResult::NotApplied;
 		} else if (direction == Qt::Key_Up && !had) {
+			if (pageSize < 0) {
+				raw->selectLast();
+				return raw->hasSelection()
+					? JumpResult::Applied
+					: JumpResult::NotApplied;
+			}
 			return JumpResult::NotApplied;
 		} else if (direction == Qt::Key_Down || direction == Qt::Key_Up) {
+			const auto was = raw->selectedIndex();
 			const auto delta = (direction == Qt::Key_Down) ? 1 : -1;
 			if (pageSize > 0) {
 				raw->selectSkipPage(pageSize, delta);
 			} else {
 				raw->selectSkip(delta);
 			}
+			if (had
+				&& delta > 0
+				&& _recommendationsCount.current()
+				&& raw->selectedIndex() == was) {
+				raw->clearSelection();
+				return JumpResult::AppliedAndOut;
+			}
 			return raw->hasSelection()
 				? JumpResult::Applied
 				: had
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index a0d3e30f2..49b74fa74 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -87,6 +87,9 @@ private:
 	void setupChats();
 	void setupChannels();
 
+	void selectJumpChats(Qt::Key direction, int pageSize);
+	void selectJumpChannels(Qt::Key direction, int pageSize);
+
 	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupRecentPeers(
 		RecentPeersList recentPeers);
 	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupEmptyRecent();

From 9caff93c357fff934e2f16d25d0af7763861b4f4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 20 Apr 2024 00:07:38 +0400
Subject: [PATCH 370/596] Fix build for Xcode.

---
 .../SourceFiles/media/stories/media_stories_controller.cpp    | 4 ++--
 Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp          | 2 ++
 Telegram/SourceFiles/ui/widgets/discrete_sliders.h            | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index fa60aa3a7..233823488 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1831,7 +1831,7 @@ Ui::Toast::Config PrepareTogglePinToast(
 					lt_count,
 					count))
 			: QString()),
-		.text = (pin
+		.text = { (pin
 			? (count == 1
 				? tr::lng_mediaview_pin_story_about(tr::now)
 				: tr::lng_mediaview_pin_stories_about(
@@ -1843,7 +1843,7 @@ Ui::Toast::Config PrepareTogglePinToast(
 				: tr::lng_mediaview_unpin_stories_done(
 					tr::now,
 					lt_count,
-					count))),
+					count))) },
 		.st = &st::storiesActionToast,
 		.duration = (pin
 			? Data::Stories::kInProfileToastDuration
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index c2ff31487..e78de050a 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -18,6 +18,8 @@ DiscreteSlider::DiscreteSlider(QWidget *parent, bool snapToLabel)
 	setCursor(style::cur_pointer);
 }
 
+DiscreteSlider::~DiscreteSlider() = default;
+
 void DiscreteSlider::setActiveSection(int index) {
 	_activeIndex = index;
 	activateCallback();
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
index e3ae54986..38cdb473d 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
@@ -19,6 +19,7 @@ class RippleAnimation;
 class DiscreteSlider : public RpWidget {
 public:
 	DiscreteSlider(QWidget *parent, bool snapToLabel);
+	~DiscreteSlider();
 
 	void addSection(const QString &label);
 	void setSections(const std::vector<QString> &labels);

From a86e7f035f0b43b2c1553c211adb8423950a676b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 19 Apr 2024 23:23:48 +0300
Subject: [PATCH 371/596] Slightly improved style of inner box for channel earn
 history entries.

---
 .../info/channel_statistics/earn/channel_earn.style         | 6 ++++++
 .../info/channel_statistics/earn/info_earn_inner_widget.cpp | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 01b72005a..6c2304141 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -61,6 +61,12 @@ channelEarnHistoryMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
 		font: font(12px semibold);
 	}
 }
+channelEarnHistoryDescriptionLabel: FlatLabel(channelEarnHistoryMajorLabel) {
+	// boxWidth - boxRowPadding = 320 - 24 * 2
+	minWidth: 272px;
+	maxHeight: 0px;
+	align: align(center);
+}
 channelEarnHistoryMinorLabelSkip: 2px;
 channelEarnHistoryOuter: margins(0px, 6px, 0px, 6px);
 channelEarnHistoryTwoSkip: 5px;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index ad1155b89..d3af5f14d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -809,6 +809,9 @@ void InnerWidget::fill() {
 
 			const auto detailsBox = [=, amount = entry.amount, peer = _peer](
 					not_null<Ui::GenericBox*> box) {
+				box->addTopButton(
+					st::boxTitleClose,
+					[=] { box->closeBox(); });
 				Ui::AddSkip(box->verticalLayout());
 				Ui::AddSkip(box->verticalLayout());
 				const auto labels = box->addRow(
@@ -860,7 +863,7 @@ void InnerWidget::fill() {
 						isIn
 							? tr::lng_channel_earn_history_in_about()
 							: tr::lng_channel_earn_history_out(),
-						st::channelEarnHistoryMajorLabel)));
+						st::channelEarnHistoryDescriptionLabel)));
 				Ui::AddSkip(box->verticalLayout());
 				if (isIn) {
 					Ui::AddSkip(box->verticalLayout());

From 8acada9b0f0a3fbb06c81dd6d2b482cc2a58fcdd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 22 Apr 2024 11:47:04 +0400
Subject: [PATCH 372/596] Fix toppeers animation with expanded stories.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index ea0d08f67..e3ba1b83e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1110,7 +1110,6 @@ void Widget::updateHasFocus(not_null<QWidget*> focused) {
 void Widget::processSearchFocusChange() {
 	_searchSuggestionsLocked = _suggestions && _suggestions->persist();
 	updateCancelSearch();
-	updateStoriesVisibility();
 	updateForceDisplayWide();
 	updateSuggestions(anim::type::normal);
 }
@@ -1124,7 +1123,13 @@ void Widget::updateSuggestions(anim::type animated) {
 	}
 	if (!suggest && _suggestions) {
 		if (animated == anim::type::normal) {
+			auto taken = base::take(_suggestions);
+			taken->setVisible(false);
+			updateStoriesVisibility();
 			startWidthAnimation();
+			taken->setVisible(true);
+			_suggestions = base::take(taken);
+
 			_suggestions->hide(animated, [=, raw = _suggestions.get()] {
 				stopWidthAnimation();
 				_hidingSuggestions.erase(
@@ -1144,6 +1149,7 @@ void Widget::updateSuggestions(anim::type animated) {
 	} else if (suggest && !_suggestions) {
 		if (animated == anim::type::normal) {
 			startWidthAnimation();
+			updateStoriesVisibility();
 		}
 		_suggestions = std::make_unique<Suggestions>(
 			this,
@@ -1174,6 +1180,8 @@ void Widget::updateSuggestions(anim::type animated) {
 			stopWidthAnimation();
 		});
 		_scroll->hide();
+	} else {
+		updateStoriesVisibility();
 	}
 }
 
@@ -1575,25 +1583,35 @@ void Widget::scrollToDefault(bool verytop) {
 
 [[nodiscard]] QPixmap Widget::grabNonNarrowScrollFrame() {
 	auto scrollGeometry = _scroll->geometry();
-	auto grabGeometry = QRect(
+	const auto top = _searchControls->y() + _searchControls->height();
+	const auto skip = scrollGeometry.y() - top;
+	auto wideGeometry = QRect(
 		scrollGeometry.x(),
 		scrollGeometry.y(),
 		std::max(scrollGeometry.width(), st::columnMinimalWidthLeft),
 		scrollGeometry.height());
-	_scroll->setGeometry(grabGeometry);
-	_inner->resize(grabGeometry.width(), _inner->height());
+	_scroll->setGeometry(wideGeometry);
+	_inner->resize(wideGeometry.width(), _inner->height());
 	_inner->setNarrowRatio(0.);
 	Ui::SendPendingMoveResizeEvents(_scroll);
+	const auto grabSize = QSize(
+		wideGeometry.width(),
+		skip + wideGeometry.height());
 	auto image = QImage(
-		grabGeometry.size() * style::DevicePixelRatio(),
+		grabSize * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
 	image.setDevicePixelRatio(style::DevicePixelRatio());
 	image.fill(Qt::transparent);
 	{
 		QPainter p(&image);
-		Ui::RenderWidget(p, _scroll);
+		Ui::RenderWidget(
+			p,
+			this,
+			QPoint(),
+			QRect(0, top, wideGeometry.width(), skip));
+		Ui::RenderWidget(p, _scroll, QPoint(0, skip));
 	}
-	if (scrollGeometry != grabGeometry) {
+	if (scrollGeometry != wideGeometry) {
 		_scroll->setGeometry(scrollGeometry);
 		updateControlsGeometry();
 	}
@@ -3282,9 +3300,11 @@ void Widget::paintEvent(QPaintEvent *e) {
 			: 0.;
 		const auto suggestionsSkip = suggestionsShown
 			* (st::topPeers.height + st::searchedBarHeight);
-		const auto top = _scroll->y() + suggestionsSkip;
+		const auto top = _searchControls->y()
+			+ _searchControls->height()
+			+ suggestionsSkip;
 		p.drawPixmapLeft(0, top, width(), _widthAnimationCache);
-		belowTop = _scroll->y()
+		belowTop = top
 			+ (_widthAnimationCache.height() / style::DevicePixelRatio());
 	}
 

From 05474f4a3fd737575fd89eb30e8ade1508e8439e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 22 Apr 2024 12:16:04 +0400
Subject: [PATCH 373/596] Improve filter switching with toppeers.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e3ba1b83e..7953264bc 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1125,6 +1125,7 @@ void Widget::updateSuggestions(anim::type animated) {
 		if (animated == anim::type::normal) {
 			auto taken = base::take(_suggestions);
 			taken->setVisible(false);
+			storiesExplicitCollapse();
 			updateStoriesVisibility();
 			startWidthAnimation();
 			taken->setVisible(true);

From 768e8b457b4d25f5a96f98d0162c5e5fc6ce1f74 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 22 Apr 2024 12:21:08 +0400
Subject: [PATCH 374/596] Improve second-time choose of toppeers.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 7953264bc..349ed93d1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1173,6 +1173,10 @@ void Widget::updateSuggestions(anim::type animated) {
 				.key = peer->owner().history(peer),
 				.newWindow = base::IsCtrlPressed(),
 			});
+			if (!_searchSuggestionsLocked && _searchHasFocus) {
+				setFocus();
+				controller()->widget()->setInnerFocus();
+			}
 		}, _suggestions->lifetime());
 
 		updateControlsGeometry();

From 1448cea01c7a917e084765306551d9e757bd41d5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 22 Apr 2024 12:29:29 +0400
Subject: [PATCH 375/596] Fix ripple in active recommendation row.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp | 11 ++++++++---
 Telegram/SourceFiles/boxes/peer_list_box.h   |  7 ++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 99da56122..7aa48aaa3 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -820,9 +820,14 @@ void PeerListRow::stopLastRipple() {
 	}
 }
 
-void PeerListRow::paintRipple(Painter &p, int x, int y, int outerWidth) {
+void PeerListRow::paintRipple(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth) {
 	if (_ripple) {
-		_ripple->paint(p, x, y, outerWidth);
+		_ripple->paint(p, x, y, outerWidth, &st.button.ripple.color->c);
 		if (_ripple->empty()) {
 			_ripple.reset();
 		}
@@ -1735,7 +1740,7 @@ crl::time PeerListContent::paintRow(
 	});
 
 	p.fillRect(0, 0, outerWidth, _rowHeight, bg);
-	row->paintRipple(p, 0, 0, outerWidth);
+	row->paintRipple(p, st, 0, 0, outerWidth);
 	row->paintUserpic(
 		p,
 		st,
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index e4a00d939..335001e02 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -230,7 +230,12 @@ public:
 		QPoint point,
 		UpdateCallback &&updateCallback);
 	void stopLastRipple();
-	void paintRipple(Painter &p, int x, int y, int outerWidth);
+	void paintRipple(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth);
 	void paintUserpic(
 		Painter &p,
 		const style::PeerListItem &st,

From 287d5a7413c6fb52c07dc0639661041e6ddee076 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 22 Apr 2024 12:35:08 +0400
Subject: [PATCH 376/596] Fix shadow below Chats/Channels.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 3f021593a..165a85f5b 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -902,7 +902,7 @@ void Suggestions::setupTabs() {
 
 	_tabs->sizeValue() | rpl::start_with_next([=](QSize size) {
 		const auto line = st::lineWidth;
-		shadow->setGeometry(0, size.height() - line, width(), line);
+		shadow->setGeometry(0, size.height() - line, size.width(), line);
 	}, shadow->lifetime());
 
 	shadow->showOn(_tabs->shownValue());

From 7be68ca82c01747c325bb4d51365046a486e7357 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 22 Apr 2024 16:19:42 +0300
Subject: [PATCH 377/596] Updated Qt to 6.2.8 on macOS.

---
 CMakeLists.txt                    |  2 +-
 Telegram/build/prepare/prepare.py | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bf13693b..4e2ac34c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
     if (WIN32)
         set(qt_version 5.15.13)
     elseif (APPLE)
-        set(qt_version 6.2.7)
+        set(qt_version 6.2.8)
     endif()
 endif()
 include(cmake/external/qt/package.cmake)
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 8a647d419..02a5fa374 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout b35735cd14
+    git checkout bc31d0a7fd
 """)
 
 stage('msys64', """
@@ -1503,14 +1503,14 @@ mac:
 """)
 
 if buildQt6:
-    stage('qt_6_2_7', """
+    stage('qt_6_2_8', """
 mac:
-    git clone -b v6.2.7-lts-lgpl https://github.com/qt/qt5.git qt_6_2_7
-    cd qt_6_2_7
+    git clone -b v6.2.8-lts-lgpl https://github.com/qt/qt5.git qt_6_2_8
+    cd qt_6_2_8
     git submodule update --init --recursive qtbase qtimageformats qtsvg
-depends:patches/qtbase_6.2.7/*.patch
+depends:patches/qtbase_6.2.8/*.patch
     cd qtbase
-    find ../../patches/qtbase_6.2.7 -type f -print0 | sort -z | xargs -0 git apply -v
+    find ../../patches/qtbase_6.2.8 -type f -print0 | sort -z | xargs -0 git apply -v
     cd ..
     sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
 
@@ -1518,7 +1518,7 @@ depends:patches/qtbase_6.2.7/*.patch
 release:
     CONFIGURATIONS=-debug-and-release
 mac:
-    ./configure -prefix "$USED_PREFIX/Qt-6.2.7" \
+    ./configure -prefix "$USED_PREFIX/Qt-6.2.8" \
         $CONFIGURATIONS \
         -force-debug-info \
         -opensource \

From bea715b41c2155796949f4b35f9fbba0e83eeb7f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 22 Apr 2024 17:12:47 +0300
Subject: [PATCH 378/596] Added ICCv4 with Little CMS on macOS.

---
 Telegram/build/prepare/prepare.py | 47 +++++++++++++++++++++++++++++++
 cmake                             |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 02a5fa374..655be322f 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1065,6 +1065,53 @@ depends:yasm/yasm
     make install
 """)
 
+stage('liblcms2', """
+mac:
+    git clone -b lcms2.16 https://github.com/mm2/Little-CMS.git liblcms2
+    cd liblcms2
+
+    buildOneArch() {
+        arch=$1
+        folder=`pwd`/$2
+
+        TARGET="\'${arch}\'"
+        MIN="\'${MIN_VER}\'"
+        FILE=cross-file.txt
+        echo "[binaries]" > $FILE
+        echo "c = ['clang', '-arch', ${TARGET}]" >> $FILE
+        echo "cpp = ['clang++', '-arch', ${TARGET}]" >> $FILE
+        echo "ar = 'ar'" >> $FILE
+        echo "strip = 'strip'" >> $FILE
+        echo "[built-in options]" >> $FILE
+        echo "c_args = [${MIN}]" >> $FILE
+        echo "cpp_args = [${MIN}]" >> $FILE
+        echo "c_link_args = [${MIN}]" >> $FILE
+        echo "cpp_link_args = [${MIN}]" >> $FILE
+        echo "[host_machine]" >> $FILE
+        echo "system = 'darwin'" >> $FILE
+        echo "subsystem = 'macos'" >> $FILE
+        echo "cpu_family = ${TARGET}" >> $FILE
+        echo "cpu = ${TARGET}" >> $FILE
+        echo "endian = 'little'" >> $FILE
+
+        meson setup \\
+            --cross-file $FILE \\
+            --prefix ${USED_PREFIX} \\
+            --default-library=static \\
+            --buildtype=minsize \\
+            ${folder}
+        meson compile -C ${folder}
+        meson install -C ${folder}
+
+        mv ${USED_PREFIX}/lib/liblcms2.a ${folder}/liblcms2.a
+    }
+
+    buildOneArch arm64 build.arm64
+    buildOneArch x86_64 build
+
+    lipo -create build.arm64/liblcms2.a build/liblcms2.a -output ${USED_PREFIX}/lib/liblcms2.a
+""")
+
 stage('nv-codec-headers', """
 win:
     git clone -b n12.1.14.0 https://github.com/FFmpeg/nv-codec-headers.git
diff --git a/cmake b/cmake
index a428df544..d9f958e0b 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit a428df5440e76a726abc30924766ac7da0cb381c
+Subproject commit d9f958e0ba4eef6359b0c968ca4fc75923134f78

From eef65af173f8c0cca0a54aefbf6c5f73e184670f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 22 Apr 2024 17:23:06 +0300
Subject: [PATCH 379/596] Slightly simplified meson usage on macOS in
 prepare.py.

---
 Telegram/build/prepare/prepare.py | 46 ++-----------------------------
 1 file changed, 3 insertions(+), 43 deletions(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 655be322f..046f5b47a 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout bc31d0a7fd
+    git checkout ab24db42b9
 """)
 
 stage('msys64', """
@@ -747,28 +747,8 @@ mac:
         arch=$1
         folder=`pwd`/$2
 
-        TARGET="\'${arch}\'"
-        MIN="\'${MIN_VER}\'"
-        FILE=cross-file.txt
-        echo "[binaries]" > $FILE
-        echo "c = ['clang', '-arch', ${TARGET}]" >> $FILE
-        echo "cpp = ['clang++', '-arch', ${TARGET}]" >> $FILE
-        echo "ar = 'ar'" >> $FILE
-        echo "strip = 'strip'" >> $FILE
-        echo "[built-in options]" >> $FILE
-        echo "c_args = [${MIN}]" >> $FILE
-        echo "cpp_args = [${MIN}]" >> $FILE
-        echo "c_link_args = [${MIN}]" >> $FILE
-        echo "cpp_link_args = [${MIN}]" >> $FILE
-        echo "[host_machine]" >> $FILE
-        echo "system = 'darwin'" >> $FILE
-        echo "subsystem = 'macos'" >> $FILE
-        echo "cpu_family = ${TARGET}" >> $FILE
-        echo "cpu = ${TARGET}" >> $FILE
-        echo "endian = 'little'" >> $FILE
-
         meson setup \\
-            --cross-file $FILE \\
+            --cross-file ../patches/macos_meson_${arch}.txt \\
             --prefix ${USED_PREFIX} \\
             --default-library=static \\
             --buildtype=minsize \\
@@ -1074,28 +1054,8 @@ mac:
         arch=$1
         folder=`pwd`/$2
 
-        TARGET="\'${arch}\'"
-        MIN="\'${MIN_VER}\'"
-        FILE=cross-file.txt
-        echo "[binaries]" > $FILE
-        echo "c = ['clang', '-arch', ${TARGET}]" >> $FILE
-        echo "cpp = ['clang++', '-arch', ${TARGET}]" >> $FILE
-        echo "ar = 'ar'" >> $FILE
-        echo "strip = 'strip'" >> $FILE
-        echo "[built-in options]" >> $FILE
-        echo "c_args = [${MIN}]" >> $FILE
-        echo "cpp_args = [${MIN}]" >> $FILE
-        echo "c_link_args = [${MIN}]" >> $FILE
-        echo "cpp_link_args = [${MIN}]" >> $FILE
-        echo "[host_machine]" >> $FILE
-        echo "system = 'darwin'" >> $FILE
-        echo "subsystem = 'macos'" >> $FILE
-        echo "cpu_family = ${TARGET}" >> $FILE
-        echo "cpu = ${TARGET}" >> $FILE
-        echo "endian = 'little'" >> $FILE
-
         meson setup \\
-            --cross-file $FILE \\
+            --cross-file ../patches/macos_meson_${arch}.txt \\
             --prefix ${USED_PREFIX} \\
             --default-library=static \\
             --buildtype=minsize \\

From b35d3f57fe8e8e374139896af602635dbd7b5a98 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 22 Apr 2024 22:47:13 +0300
Subject: [PATCH 380/596] Slightly improved style of sub-button in sponsored
 messages.

---
 .../history/view/media/history_view_web_page.cpp     | 12 +++++-------
 .../history/view/media/history_view_web_page.h       |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

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 d2a609c39..c75824a56 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -897,12 +897,10 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			const auto height = st::webPageSponsoredHintFont->height;
 			const auto radius = height / 2;
 
-			_sponsoredData->lastHintPos = QPoint(
+			_sponsoredData->lastHintPos = QPointF(
 				radius + inner.left() + _sponsoredData->widthBeforeHint,
-				tshift
-					+ (_siteName.style()->font->height - height) / 2
-					+ st::webPageSponsoredHintFont->descent / 2);
-			const auto rect = QRect(
+				tshift + (_siteName.style()->font->height - height) / 2.);
+			const auto rect = QRectF(
 				_sponsoredData->lastHintPos,
 				_sponsoredData->hintSize);
 			auto hq = PainterHighQualityEnabler(p);
@@ -1205,7 +1203,7 @@ TextState WebPage::textState(QPoint point, StateRequest request) const {
 		result.link = _openl;
 	}
 	if (_sponsoredData && _sponsoredData->canReport) {
-		const auto contains = QRect(
+		const auto contains = QRectF(
 			_sponsoredData->lastHintPos,
 			_sponsoredData->hintSize).contains(point
 				- QPoint(0, st::msgDateFont->height));
@@ -1298,7 +1296,7 @@ void WebPage::clickHandlerPressedChanged(
 			const auto outer = full - inBubblePadding();
 			_sponsoredData->hintRipple->add(_lastPoint
 				+ outer.topLeft()
-				- _sponsoredData->lastHintPos);
+				- _sponsoredData->lastHintPos.toPoint());
 		} else if (_sponsoredData->hintRipple) {
 			_sponsoredData->hintRipple->lastStop();
 		}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index 37471f869..1e1088bf7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -149,7 +149,7 @@ private:
 
 		bool canReport = false;
 		QSize hintSize;
-		QPoint lastHintPos;
+		QPointF lastHintPos;
 		int widthBeforeHint = 0;
 		std::unique_ptr<Ui::RippleAnimation> hintRipple;
 		ClickHandlerPtr hintLink;

From 7a6c55bd8ae71e45166c034e3ac0c2c22ff1ecc7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 22 Apr 2024 23:02:53 +0300
Subject: [PATCH 381/596] Fixed color of icon for replies with media story.

---
 .../history/view/history_view_reply.cpp          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_reply.cpp b/Telegram/SourceFiles/history/view/history_view_reply.cpp
index 5830bf0c5..1b9df5db6 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_reply.cpp
@@ -761,6 +761,14 @@ void Reply::paint(
 					: useColorIndex
 					? st->coloredTextPalette(selected, colorIndexPlusOne - 1)
 					: stm->replyTextPalette);
+				auto owned = std::optional<style::owned_color>();
+				auto copy = std::optional<style::TextPalette>();
+				if (inBubble && colorIndexPlusOne) {
+					copy.emplace(*replyToTextPalette);
+					owned.emplace(cache->icon);
+					copy->linkFg = owned->color();
+					replyToTextPalette = &*copy;
+				}
 				if (_replyToStory) {
 					st::dialogsMiniReplyStory.icon.icon.paint(
 						p,
@@ -771,14 +779,6 @@ void Reply::paint(
 					firstLineSkip += st::dialogsMiniReplyStory.skipText
 						+ st::dialogsMiniReplyStory.icon.icon.width();
 				}
-				auto owned = std::optional<style::owned_color>();
-				auto copy = std::optional<style::TextPalette>();
-				if (inBubble && colorIndexPlusOne) {
-					copy.emplace(*replyToTextPalette);
-					owned.emplace(cache->icon);
-					copy->linkFg = owned->color();
-					replyToTextPalette = &*copy;
-				}
 				_text.draw(p, {
 					.position = { textLeft, textTop },
 					.geometry = textGeometry(textw, firstLineSkip),

From 6f328b2ef8ad1d44c719426b9ca615afb2f4c0c8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 22 Apr 2024 15:06:48 +0400
Subject: [PATCH 382/596] Fix inline query draft applying.

---
 Telegram/SourceFiles/data/data_drafts.cpp | 9 ++++++---
 Telegram/SourceFiles/data/data_drafts.h   | 4 +---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_drafts.cpp b/Telegram/SourceFiles/data/data_drafts.cpp
index e0ebb7741..1bd7135e8 100644
--- a/Telegram/SourceFiles/data/data_drafts.cpp
+++ b/Telegram/SourceFiles/data/data_drafts.cpp
@@ -129,9 +129,12 @@ void ClearPeerCloudDraft(
 	history->applyCloudDraft(topicRootId);
 }
 
-void SetChatLinkDraft(
-		not_null<PeerData*> peer,
-		const TextWithEntities &draft) {
+void SetChatLinkDraft(not_null<PeerData*> peer, TextWithEntities draft) {
+	static const auto kInlineStart = QRegularExpression("^@[a-zA-Z0-9_]");
+	if (kInlineStart.match(draft.text).hasMatch()) {
+		draft = TextWithEntities().append(' ').append(std::move(draft));
+	}
+
 	const auto textWithTags = TextWithTags{
 		draft.text,
 		TextUtilities::ConvertEntitiesToTextTags(draft.entities)
diff --git a/Telegram/SourceFiles/data/data_drafts.h b/Telegram/SourceFiles/data/data_drafts.h
index 581acaeea..1330995ed 100644
--- a/Telegram/SourceFiles/data/data_drafts.h
+++ b/Telegram/SourceFiles/data/data_drafts.h
@@ -205,8 +205,6 @@ using HistoryDrafts = base::flat_map<DraftKey, std::unique_ptr<Draft>>;
 		&& (a->webpage == b->webpage);
 }
 
-void SetChatLinkDraft(
-	not_null<PeerData*> peer,
-	const TextWithEntities &draft);
+void SetChatLinkDraft(not_null<PeerData*> peer, TextWithEntities draft);
 
 } // namespace Data

From e066cf158922075b23c87792d4294d71883f2f33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 22 Apr 2024 19:01:18 +0400
Subject: [PATCH 383/596] Add "Show all" for top peers.

---
 Telegram/Resources/langs/lang.strings         |   3 +
 Telegram/SourceFiles/dialogs/dialogs.style    |   1 +
 .../dialogs/ui/dialogs_suggestions.cpp        |   9 +-
 .../dialogs/ui/top_peers_strip.cpp            | 365 ++++++++++++++----
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |  39 +-
 5 files changed, 321 insertions(+), 96 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0f4535b16..1b294b370 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5114,6 +5114,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_limit_upload_increase_speed" = "by **{percent}**";
 "lng_limit_upload_subscribe_link" = "Telegram Premium";
 
+"lng_recent_frequent" = "Frequent contacts";
+"lng_recent_frequent_all" = "Show all";
+"lng_recent_frequent_collapse" = "Collapse";
 "lng_recent_title" = "Recent";
 "lng_recent_clear" = "Clear";
 "lng_recent_clear_sure" = "Do you want to clear your search history?";
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 16aa472ec..5827ae6e1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -603,6 +603,7 @@ topPeersMargin: margins(3px, 3px, 3px, 4px);
 recentPeersEmptySize: 100px;
 recentPeersEmptyMargin: margins(10px, 10px, 10px, 10px);
 recentPeersEmptySkip: 10px;
+recentPeersEmptyHeightMin: 220px;
 recentPeersItem: PeerListItem(defaultPeerListItem) {
 	height: 56px;
 	photoSize: 42px;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 165a85f5b..04258c3d2 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -1337,8 +1337,13 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupEmpty(
 		st::recentPeersEmptyMargin);
 	const auto icon = widget.data();
 
-	_chatsScroll->heightValue() | rpl::start_with_next([=](int height) {
-		raw->resize(raw->width(), height - st::topPeers.height);
+	rpl::combine(
+		_chatsScroll->heightValue(),
+		_topPeersWrap->heightValue()
+	) | rpl::start_with_next([=](int height, int top) {
+		raw->resize(
+			raw->width(),
+			std::max(height - top, st::recentPeersEmptyHeightMin));
 	}, raw->lifetime());
 
 	raw->sizeValue() | rpl::start_with_next([=](QSize size) {
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index d970413c4..3438c29ba 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -7,8 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/ui/top_peers_strip.h"
 
+#include "base/event_filter.h"
+#include "lang/lang_keys.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/dynamic_image.h"
@@ -38,29 +42,169 @@ struct TopPeersStrip::Entry {
 	uint32 muted : 1 = 0;
 };
 
+struct TopPeersStrip::Layout {
+	int single = 0;
+	int inrow = 0;
+	float64 fsingle = 0.;
+	float64 added = 0.;
+};
+
 TopPeersStrip::TopPeersStrip(
 	not_null<QWidget*> parent,
 	rpl::producer<TopPeersList> content)
 : RpWidget(parent)
+, _header(this)
+, _strip(this)
 , _selection(st::topPeersRadius, st::windowBgOver) {
-	resize(0, st::topPeers.height);
+	setupHeader();
+	setupStrip();
 
 	std::move(content) | rpl::start_with_next([=](const TopPeersList &list) {
 		apply(list);
 	}, lifetime());
 
-	setMouseTracking(true);
+	rpl::combine(
+		_count.value(),
+		_expanded.value()
+	) | rpl::start_with_next([=] {
+		resizeToWidth(width());
+	}, _strip.lifetime());
+
+	resize(0, _header.height() + _strip.height());
+}
+
+void TopPeersStrip::setupHeader() {
+	_header.resize(0, st::searchedBarHeight);
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		&_header,
+		tr::lng_recent_frequent(),
+		st::searchedBarLabel);
+	const auto single = outer().width();
+
+	rpl::combine(
+		_count.value(),
+		widthValue()
+	) | rpl::map(
+		(rpl::mappers::_1 * single) > (rpl::mappers::_2 + (single * 2) / 3)
+	) | rpl::distinct_until_changed() | rpl::start_with_next([=](bool more) {
+		setExpanded(false);
+		if (!more) {
+			const auto toggle = _toggleExpanded.current();
+			_toggleExpanded = nullptr;
+			delete toggle;
+			return;
+		} else if (_toggleExpanded.current()) {
+			return;
+		}
+		const auto toggle = Ui::CreateChild<Ui::LinkButton>(
+			&_header,
+			tr::lng_channels_your_more(tr::now),
+			st::searchedBarLink);
+		toggle->show();
+		toggle->setClickedCallback([=] {
+			const auto expand = !_expanded.current();
+			toggle->setText(expand
+				? tr::lng_recent_frequent_collapse(tr::now)
+				: tr::lng_recent_frequent_all(tr::now));
+			setExpanded(expand);
+		});
+		rpl::combine(
+			_header.sizeValue(),
+			toggle->widthValue()
+		) | rpl::start_with_next([=](QSize size, int width) {
+			const auto x = st::searchedBarPosition.x();
+			const auto y = st::searchedBarPosition.y();
+			toggle->moveToRight(0, 0, size.width());
+			label->resizeToWidth(size.width() - x - width);
+			label->moveToLeft(x, y, size.width());
+		}, toggle->lifetime());
+		_toggleExpanded = toggle;
+	}, _header.lifetime());
+
+	rpl::combine(
+		_header.sizeValue(),
+		_toggleExpanded.value()
+	) | rpl::filter(
+		rpl::mappers::_2 == nullptr
+	) | rpl::start_with_next([=](QSize size, const auto) {
+		const auto x = st::searchedBarPosition.x();
+		const auto y = st::searchedBarPosition.y();
+		label->resizeToWidth(size.width() - x * 2);
+		label->moveToLeft(x, y, size.width());
+	}, _header.lifetime());
+
+	_header.paintRequest() | rpl::start_with_next([=](QRect clip) {
+		QPainter(&_header).fillRect(clip, st::searchedBarBg);
+	}, _header.lifetime());
+}
+
+void TopPeersStrip::setExpanded(bool expanded) {
+	if (_expanded.current() == expanded) {
+		return;
+	}
+	const auto from = expanded ? 0. : 1.;
+	const auto to = expanded ? 1. : 0.;
+	_expandAnimation.start([=] {
+		if (!_expandAnimation.animating()) {
+			updateScrollMax();
+		}
+		resizeToWidth(width());
+		update();
+	}, from, to, st::slideDuration, anim::easeOutQuint);
+	_expanded = expanded;
+}
+
+void TopPeersStrip::setupStrip() {
+	_strip.resize(0, st::topPeers.height);
+
+	_strip.setMouseTracking(true);
+
+	base::install_event_filter(&_strip, [=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::Wheel) {
+			stripWheelEvent(static_cast<QWheelEvent*>(e.get()));
+		} else if (type == QEvent::MouseButtonPress) {
+			stripMousePressEvent(static_cast<QMouseEvent*>(e.get()));
+		} else if (type == QEvent::MouseMove) {
+			stripMouseMoveEvent(static_cast<QMouseEvent*>(e.get()));
+		} else if (type == QEvent::MouseButtonRelease) {
+			stripMouseReleaseEvent(static_cast<QMouseEvent*>(e.get()));
+		} else if (type == QEvent::ContextMenu) {
+			stripContextMenuEvent(static_cast<QContextMenuEvent*>(e.get()));
+		} else if (type == QEvent::Leave) {
+			stripLeaveEvent(e.get());
+		} else {
+			return base::EventFilterResult::Continue;
+		}
+		return base::EventFilterResult::Cancel;
+	});
+
+	_strip.paintRequest() | rpl::start_with_next([=](QRect clip) {
+		paintStrip(clip);
+	}, _strip.lifetime());
 }
 
 TopPeersStrip::~TopPeersStrip() {
 	unsubscribeUserpics(true);
 }
 
-void TopPeersStrip::resizeEvent(QResizeEvent *e) {
-	updateScrollMax();
+int TopPeersStrip::resizeGetHeight(int newWidth) {
+	_header.resize(newWidth, _header.height());
+	const auto single = QSize(outer().width(), st::topPeers.height);
+	const auto inRow = newWidth / single.width();
+	const auto rows = (inRow > 0)
+		? ((std::max(_count.current(), 1) + inRow - 1) / inRow)
+		: 1;
+	const auto height = single.height() * rows;
+	const auto value = _expandAnimation.value(_expanded.current() ? 1. : 0.);
+	const auto result = anim::interpolate(single.height(), height, value);
+	_strip.setGeometry(0, _header.height(), newWidth, result);
+	updateScrollMax(newWidth);
+	return _strip.y() + _strip.height();
 }
 
-void TopPeersStrip::wheelEvent(QWheelEvent *e) {
+void TopPeersStrip::stripWheelEvent(QWheelEvent *e) {
 	const auto phase = e->phase();
 	const auto fullDelta = e->pixelDelta().isNull()
 		? e->angleDelta()
@@ -78,6 +222,8 @@ void TopPeersStrip::wheelEvent(QWheelEvent *e) {
 	if (_scrollingLock == Qt::Vertical || (vertical && !_scrollLeftMax)) {
 		_verticalScrollEvents.fire(e);
 		return;
+	} else if (_expandAnimation.animating()) {
+		return;
 	}
 	const auto delta = vertical
 		? fullDelta.y()
@@ -95,12 +241,12 @@ void TopPeersStrip::wheelEvent(QWheelEvent *e) {
 	e->accept();
 }
 
-void TopPeersStrip::leaveEventHook(QEvent *e) {
+void TopPeersStrip::stripLeaveEvent(QEvent *e) {
 	setSelected(-1);
 	_selectionByKeyboard = false;
 }
 
-void TopPeersStrip::mousePressEvent(QMouseEvent *e) {
+void TopPeersStrip::stripMousePressEvent(QMouseEvent *e) {
 	if (e->button() != Qt::LeftButton) {
 		return;
 	}
@@ -121,14 +267,19 @@ void TopPeersStrip::mousePressEvent(QMouseEvent *e) {
 					st::topPeersRadius),
 				[=] { update(); });
 		}
-		const auto single = outer().width();
+		const auto layout = currentLayout();
+		const auto expanded = _expanded.current();
+		const auto row = expanded ? (_selected / layout.inrow) : 0;
+		const auto column = (_selected - (row * layout.inrow));
+		const auto x = layout.added + column * layout.fsingle - scrollLeft();
+		const auto y = row * st::topPeers.height;
 		entry.ripple->add(e->pos() - QPoint(
-			_selected * single - _scrollLeft + st::topPeersMargin.left(),
-			st::topPeersMargin.top()));
+			x + st::topPeersMargin.left(),
+			y + st::topPeersMargin.top()));
 	}
 }
 
-void TopPeersStrip::mouseMoveEvent(QMouseEvent *e) {
+void TopPeersStrip::stripMouseMoveEvent(QMouseEvent *e) {
 	if (_lastMousePosition == e->globalPos() && _selectionByKeyboard) {
 		return;
 	}
@@ -139,15 +290,17 @@ void TopPeersStrip::mouseMoveEvent(QMouseEvent *e) {
 	if (!_dragging && _mouseDownPosition) {
 		if ((_lastMousePosition - *_mouseDownPosition).manhattanLength()
 			>= QApplication::startDragDistance()) {
-			_dragging = true;
-			_startDraggingLeft = _scrollLeft;
+			if (!_expandAnimation.animating()) {
+				_dragging = true;
+				_startDraggingLeft = _scrollLeft;
+			}
 		}
 	}
 	checkDragging();
 }
 
 void TopPeersStrip::checkDragging() {
-	if (_dragging) {
+	if (_dragging && !_expandAnimation.animating()) {
 		const auto sign = (style::RightToLeft() ? -1 : 1);
 		const auto newLeft = std::clamp(
 			(sign * (_mouseDownPosition->x() - _lastMousePosition.x())
@@ -163,8 +316,10 @@ void TopPeersStrip::checkDragging() {
 }
 
 void TopPeersStrip::unsubscribeUserpics(bool all) {
-	const auto &st = st::topPeers;
-	const auto single = st.photoLeft * 2 + st.photo;
+	if (!all && (_expandAnimation.animating() || _expanded.current())) {
+		return;
+	}
+	const auto single = outer().width();
 	auto x = -_scrollLeft;
 	for (auto &entry : _entries) {
 		if (all || x + single <= 0 || x >= width()) {
@@ -195,7 +350,7 @@ void TopPeersStrip::subscribeUserpic(Entry &entry) {
 	entry.subscribed = true;
 }
 
-void TopPeersStrip::mouseReleaseEvent(QMouseEvent *e) {
+void TopPeersStrip::stripMouseReleaseEvent(QMouseEvent *e) {
 	_lastMousePosition = e->globalPos();
 	const auto guard = gsl::finally([&] {
 		_mouseDownPosition = std::nullopt;
@@ -219,22 +374,33 @@ void TopPeersStrip::mouseReleaseEvent(QMouseEvent *e) {
 	}
 }
 
-void TopPeersStrip::updateScrollMax() {
-	const auto &st = st::topPeers;
-	const auto single = st.photoLeft * 2 + st.photo;
-	const auto widthFull = int(_entries.size()) * single;
-	_scrollLeftMax = std::max(widthFull - width(), 0);
-	_scrollLeft = std::clamp(_scrollLeft, 0, _scrollLeftMax);
+void TopPeersStrip::updateScrollMax(int newWidth) {
+	if (_expandAnimation.animating()) {
+		return;
+	} else if (!newWidth) {
+		newWidth = width();
+	}
+	if (_expanded.current()) {
+		_scrollLeft = 0;
+		_scrollLeftMax = 0;
+	} else {
+		const auto single = outer().width();
+		const auto widthFull = int(_entries.size()) * single;
+		_scrollLeftMax = std::max(widthFull - newWidth, 0);
+		_scrollLeft = std::clamp(_scrollLeft, 0, _scrollLeftMax);
+	}
 	unsubscribeUserpics();
 	update();
 }
 
 bool TopPeersStrip::empty() const {
-	return _empty.current();
+	return !_count.current();
 }
 
 rpl::producer<bool> TopPeersStrip::emptyValue() const {
-	return _empty.value();
+	return _count.value()
+		| rpl::map(!rpl::mappers::_1)
+		| rpl::distinct_until_changed();
 }
 
 rpl::producer<uint64> TopPeersStrip::clicks() const {
@@ -253,7 +419,7 @@ void TopPeersStrip::removeLocally(uint64 id) {
 		_pressed = -1;
 		_entries.clear();
 		_hiddenLocally = true;
-		_empty = true;
+		_count = 0;
 		return;
 	}
 	_removed.emplace(id);
@@ -272,9 +438,7 @@ void TopPeersStrip::removeLocally(uint64 id) {
 		--_pressed;
 	}
 	updateScrollMax();
-	if (_entries.empty()) {
-		_empty = true;
-	}
+	_count = int(_entries.size());
 	update();
 }
 
@@ -344,7 +508,7 @@ void TopPeersStrip::apply(const TopPeersList &list) {
 		apply(now.back(), entry);
 	}
 	if (now.empty()) {
-		_empty = true;
+		_count = 0;
 	}
 	for (auto &entry : _entries) {
 		if (entry.subscribed) {
@@ -367,9 +531,7 @@ void TopPeersStrip::apply(const TopPeersList &list) {
 	}
 	updateScrollMax();
 	unsubscribeUserpics();
-	if (!_entries.empty()) {
-		_empty = false;
-	}
+	_count = int(_entries.size());
 	update();
 }
 
@@ -423,65 +585,87 @@ void TopPeersStrip::apply(Entry &entry, const TopPeersEntry &data) {
 QRect TopPeersStrip::outer() const {
 	const auto &st = st::topPeers;
 	const auto single = st.photoLeft * 2 + st.photo;
-	return QRect(0, 0, single, height());
+	return QRect(0, 0, single, st::topPeers.height);
 }
 
 QRect TopPeersStrip::innerRounded() const {
 	return outer().marginsRemoved(st::topPeersMargin);
 }
 
-void TopPeersStrip::paintEvent(QPaintEvent *e) {
-	auto p = Painter(this);
+int TopPeersStrip::scrollLeft() const {
+	const auto value = _expandAnimation.value(_expanded.current() ? 1. : 0.);
+	return anim::interpolate(_scrollLeft, 0, value);
+}
+
+void TopPeersStrip::paintStrip(QRect clip) {
+	auto p = Painter(&_strip);
+
 	const auto &st = st::topPeers;
-	const auto single = st.photoLeft * 2 + st.photo;
+	const auto scroll = scrollLeft();
 
-	const auto from = std::min(_scrollLeft / single, int(_entries.size()));
-	const auto till = std::clamp(
-		(_scrollLeft + width() + single - 1) / single + 1,
-		from,
-		int(_entries.size()));
+	const auto rows = (height() + st.height - 1) / st.height;
+	const auto fromrow = std::min(clip.y() / st.height, rows);
+	const auto tillrow = std::min(
+		(clip.y() + clip.height() + st.height - 1) / st.height,
+		rows);
+	const auto layout = currentLayout();
+	const auto fsingle = layout.fsingle;
+	const auto added = layout.added;
 
-	auto x = -_scrollLeft + from * single;
-	const auto highlighted = (_pressed >= 0) ? _pressed : _selected;
-	for (auto i = from; i != till; ++i) {
-		auto &entry = _entries[i];
-		const auto selected = (i == highlighted);
-		if (selected) {
-			_selection.paint(p, innerRounded().translated(x, 0));
-		}
-		if (entry.ripple) {
-			entry.ripple->paint(
-				p,
-				x + st::topPeersMargin.left(),
-				st::topPeersMargin.top(),
-				width());
-			if (entry.ripple->empty()) {
-				entry.ripple = nullptr;
+	for (auto row = fromrow; row != tillrow; ++row) {
+		const auto shift = scroll + row * layout.inrow * fsingle;
+		const auto from = std::min(
+			int(std::floor((shift + clip.x()) / fsingle)),
+			int(_entries.size()));
+		const auto till = std::clamp(
+			int(std::ceil(
+				(shift + clip.x() + clip.width() + fsingle - 1) / fsingle + 1
+			)),
+			from,
+			int(_entries.size()));
+
+		auto x = int(base::SafeRound(-shift + from * fsingle + added));
+		auto y = row * st.height;
+		const auto highlighted = (_pressed >= 0) ? _pressed : _selected;
+		for (auto i = from; i != till; ++i) {
+			auto &entry = _entries[i];
+			const auto selected = (i == highlighted);
+			if (selected) {
+				_selection.paint(p, innerRounded().translated(x, y));
+			}
+			if (entry.ripple) {
+				entry.ripple->paint(
+					p,
+					x + st::topPeersMargin.left(),
+					y + st::topPeersMargin.top(),
+					width());
+				if (entry.ripple->empty()) {
+					entry.ripple = nullptr;
+				}
 			}
-		}
 
-		if (!entry.subscribed) {
-			subscribeUserpic(entry);
-		}
-		paintUserpic(p, x, i, selected);
+			if (!entry.subscribed) {
+				subscribeUserpic(entry);
+			}
+			paintUserpic(p, x, y, i, selected);
 
-		const auto nameLeft = x + st.nameLeft;
-		const auto nameWidth = single - 2 * st.nameLeft;
-		p.setPen(st::dialogsNameFg);
-		entry.name.drawElided(
-			p,
-			nameLeft,
-			st.nameTop,
-			nameWidth,
-			1,
-			style::al_top);
-		x += single;
+			p.setPen(st::dialogsNameFg);
+			entry.name.drawElided(
+				p,
+				x + st.nameLeft,
+				y + st.nameTop,
+				layout.single - 2 * st.nameLeft,
+				1,
+				style::al_top);
+			x += fsingle;
+		}
 	}
 }
 
 void TopPeersStrip::paintUserpic(
 		Painter &p,
 		int x,
+		int y,
 		int index,
 		bool selected) {
 	Expects(index >= 0 && index < _entries.size());
@@ -489,7 +673,7 @@ void TopPeersStrip::paintUserpic(
 	auto &entry = _entries[index];
 	const auto &st = st::topPeers;
 	const auto size = st.photo;
-	const auto rect = QRect(x + st.photoLeft, st.photoTop, size, size);
+	const auto rect = QRect(x + st.photoLeft, y + st.photoTop, size, size);
 
 	const auto online = entry.onlineShown.value(entry.online ? 1. : 0.);
 	const auto useFrame = !entry.userpicFrame.isNull()
@@ -571,7 +755,7 @@ void TopPeersStrip::paintUserpic(
 	p.drawImage(rect, entry.userpicFrame);
 }
 
-void TopPeersStrip::contextMenuEvent(QContextMenuEvent *e) {
+void TopPeersStrip::stripContextMenuEvent(QContextMenuEvent *e) {
 	_menu = nullptr;
 
 	if (e->reason() == QContextMenuEvent::Mouse) {
@@ -618,15 +802,31 @@ bool TopPeersStrip::finishDragging() {
 	return true;
 }
 
+TopPeersStrip::Layout TopPeersStrip::currentLayout() const {
+	const auto single = outer().width();
+	const auto inrow = std::max(width() / single, 1);
+	const auto value = _expandAnimation.value(_expanded.current() ? 1. : 0.);
+	const auto esingle = (width() / float64(inrow));
+	const auto fsingle = single + (esingle - single) * value;
+
+	return {
+		.single = single,
+		.inrow = inrow,
+		.fsingle = fsingle,
+		.added = (fsingle - single) / 2.,
+	};
+}
+
 void TopPeersStrip::updateSelected() {
 	if (_pressed >= 0) {
 		return;
 	}
-	const auto &st = st::topPeers;
-	const auto p = mapFromGlobal(_lastMousePosition);
-	const auto x = p.x();
-	const auto single = st.photoLeft * 2 + st.photo;
-	const auto index = (_scrollLeft + x) / single;
+	const auto p = _strip.mapFromGlobal(_lastMousePosition);
+	const auto expanded = _expanded.current();
+	const auto row = expanded ? (p.y() / st::topPeers.height) : 0;
+	const auto layout = currentLayout();
+	const auto column = (_scrollLeft + p.x()) / layout.fsingle;
+	const auto index = row * layout.inrow + int(std::floor(column));
 	setSelected((index < 0 || index >= _entries.size()) ? -1 : index);
 }
 
@@ -645,8 +845,7 @@ void TopPeersStrip::scrollToSelected() {
 	if (_selected < 0) {
 		return;
 	}
-	const auto &st = st::topPeers;
-	const auto single = st.photoLeft * 2 + st.photo;
+	const auto single = outer().width();
 	const auto left = _selected * single;
 	const auto right = left + single;
 	if (_scrollLeft > left) {
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index c3330e40d..ac3c73257 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -8,12 +8,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/weak_ptr.h"
+#include "ui/effects/animations.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/round_rect.h"
 #include "ui/rp_widget.h"
 
 namespace Ui {
 class DynamicImage;
+class LinkButton;
 } // namespace Ui
 
 namespace Dialogs {
@@ -59,34 +61,46 @@ public:
 
 private:
 	struct Entry;
+	struct Layout;
 
-	void resizeEvent(QResizeEvent *e) override;
-	void paintEvent(QPaintEvent *e) override;
-	void wheelEvent(QWheelEvent *e) override;
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseMoveEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-	void contextMenuEvent(QContextMenuEvent *e) override;
-	void leaveEventHook(QEvent *e) override;
+	int resizeGetHeight(int newWidth) override;
 
-	void updateScrollMax();
+	void setupHeader();
+	void setupStrip();
+
+	void paintStrip(QRect clip);
+	void stripWheelEvent(QWheelEvent *e);
+	void stripMousePressEvent(QMouseEvent *e);
+	void stripMouseMoveEvent(QMouseEvent *e);
+	void stripMouseReleaseEvent(QMouseEvent *e);
+	void stripContextMenuEvent(QContextMenuEvent *e);
+	void stripLeaveEvent(QEvent *e);
+
+	void updateScrollMax(int newWidth = 0);
 	void updateSelected();
 	void setSelected(int selected);
+	void setExpanded(bool expanded);
 	void scrollToSelected();
 	void checkDragging();
 	bool finishDragging();
 	void subscribeUserpic(Entry &entry);
 	void unsubscribeUserpics(bool all = false);
-	void paintUserpic(Painter &p, int x, int index, bool selected);
+	void paintUserpic(Painter &p, int x, int y, int index, bool selected);
 
 	[[nodiscard]] QRect outer() const;
 	[[nodiscard]] QRect innerRounded() const;
+	[[nodiscard]] int scrollLeft() const;
+	[[nodiscard]] Layout currentLayout() const;
 	void apply(const TopPeersList &list);
 	void apply(Entry &entry, const TopPeersEntry &data);
 
+	Ui::RpWidget _header;
+	Ui::RpWidget _strip;
+
 	std::vector<Entry> _entries;
-	rpl::variable<bool> _empty = true;
+	rpl::variable<int> _count = 0;
 	base::flat_set<uint64> _removed;
+	rpl::variable<Ui::LinkButton*> _toggleExpanded = nullptr;
 
 	rpl::event_stream<uint64> _clicks;
 	rpl::event_stream<ShowTopPeerMenuRequest> _showMenuRequests;
@@ -105,6 +119,9 @@ private:
 	bool _selectionByKeyboard = false;
 	bool _hiddenLocally = false;
 
+	Ui::Animations::Simple _expandAnimation;
+	rpl::variable<bool> _expanded = false;
+
 	Ui::RoundRect _selection;
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	base::has_weak_ptr _menuGuard;

From 7111c92ae7b95913e00bf89baa21efe08ab97e97 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 Apr 2024 09:07:53 +0400
Subject: [PATCH 384/596] Fix keyboard navigation in top peers.

---
 .../dialogs/ui/dialogs_suggestions.cpp        |  22 ++--
 .../dialogs/ui/top_peers_strip.cpp            | 113 ++++++++++++++----
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |   9 +-
 3 files changed, 113 insertions(+), 31 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 04258c3d2..096273a75 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -962,6 +962,11 @@ void Suggestions::setupChats() {
 		});
 	}, _topPeers->lifetime());
 
+	_topPeers->scrollToRequests(
+	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+		_chatsScroll->scrollToY(request.ymin, request.ymax);
+	}, _topPeers->lifetime());
+
 	_chatsScroll->setVisible(_tab.current() == Tab::Chats);
 }
 
@@ -1015,19 +1020,19 @@ void Suggestions::selectJumpChats(Qt::Key direction, int pageSize) {
 	} else if (direction == Qt::Key_Up) {
 		if (_recentSelectJump(direction, pageSize)
 			== JumpResult::AppliedAndOut) {
-			_topPeers->selectByKeyboard({});
-			_chatsScroll->scrollTo(0);
-		} else {
-			_topPeers->deselectByKeyboard();
+			_topPeers->selectByKeyboard(direction);
+		} else if (_topPeers->selectedByKeyboard()) {
+			_topPeers->selectByKeyboard(direction);
 		}
 	} else if (direction == Qt::Key_Down) {
-		if (_topPeers->selectedByKeyboard()) {
-			if (_recentCount.current() > 0) {
+		if (!_topPeersWrap->toggled() || recentHasSelection()) {
+			_recentSelectJump(direction, pageSize);
+		} else if (_topPeers->selectedByKeyboard()) {
+			if (!_topPeers->selectByKeyboard(direction)
+				&& _recentCount.current() > 0) {
 				_topPeers->deselectByKeyboard();
 				_recentSelectJump(direction, pageSize);
 			}
-		} else if (!_topPeersWrap->toggled() || recentHasSelection()) {
-			_recentSelectJump(direction, pageSize);
 		} else {
 			_topPeers->selectByKeyboard({});
 			_chatsScroll->scrollTo(0);
@@ -1035,7 +1040,6 @@ void Suggestions::selectJumpChats(Qt::Key direction, int pageSize) {
 	} else if (direction == Qt::Key_Left || direction == Qt::Key_Right) {
 		if (!recentHasSelection()) {
 			_topPeers->selectByKeyboard(direction);
-			_chatsScroll->scrollTo(0);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 3438c29ba..d32d32814 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/labels.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/scroll_area.h"
 #include "ui/dynamic_image.h"
 #include "ui/painter.h"
 #include "ui/unread_badge_paint.h"
@@ -242,8 +243,12 @@ void TopPeersStrip::stripWheelEvent(QWheelEvent *e) {
 }
 
 void TopPeersStrip::stripLeaveEvent(QEvent *e) {
-	setSelected(-1);
-	_selectionByKeyboard = false;
+	if (!_selectionByKeyboard) {
+		setSelected(-1);
+	}
+	if (!_dragging) {
+		_lastMousePosition = std::nullopt;
+	}
 }
 
 void TopPeersStrip::stripMousePressEvent(QMouseEvent *e) {
@@ -251,6 +256,7 @@ void TopPeersStrip::stripMousePressEvent(QMouseEvent *e) {
 		return;
 	}
 	_lastMousePosition = e->globalPos();
+	_selectionByKeyboard = false;
 	updateSelected();
 
 	_mouseDownPosition = _lastMousePosition;
@@ -280,7 +286,13 @@ void TopPeersStrip::stripMousePressEvent(QMouseEvent *e) {
 }
 
 void TopPeersStrip::stripMouseMoveEvent(QMouseEvent *e) {
-	if (_lastMousePosition == e->globalPos() && _selectionByKeyboard) {
+	if (!_lastMousePosition) {
+		_lastMousePosition = e->globalPos();
+		if (_selectionByKeyboard) {
+			return;
+		}
+	} else if (_selectionByKeyboard
+		&& (_lastMousePosition == e->globalPos())) {
 		return;
 	}
 	_lastMousePosition = e->globalPos();
@@ -288,7 +300,7 @@ void TopPeersStrip::stripMouseMoveEvent(QMouseEvent *e) {
 	updateSelected();
 
 	if (!_dragging && _mouseDownPosition) {
-		if ((_lastMousePosition - *_mouseDownPosition).manhattanLength()
+		if ((*_lastMousePosition - *_mouseDownPosition).manhattanLength()
 			>= QApplication::startDragDistance()) {
 			if (!_expandAnimation.animating()) {
 				_dragging = true;
@@ -303,7 +315,7 @@ void TopPeersStrip::checkDragging() {
 	if (_dragging && !_expandAnimation.animating()) {
 		const auto sign = (style::RightToLeft() ? -1 : 1);
 		const auto newLeft = std::clamp(
-			(sign * (_mouseDownPosition->x() - _lastMousePosition.x())
+			(sign * (_mouseDownPosition->x() - _lastMousePosition->x())
 				+ _startDraggingLeft),
 			0,
 			_scrollLeftMax);
@@ -367,6 +379,7 @@ void TopPeersStrip::stripMouseReleaseEvent(QMouseEvent *e) {
 	if (finishDragging()) {
 		return;
 	}
+	_selectionByKeyboard = false;
 	updateSelected();
 	if (_selected >= 0 && _selected == pressed) {
 		Assert(_selected < _entries.size());
@@ -412,6 +425,11 @@ auto TopPeersStrip::showMenuRequests() const
 	return _showMenuRequests.events();
 }
 
+auto TopPeersStrip::scrollToRequests() const
+-> rpl::producer<Ui::ScrollToRequest> {
+	return _scrollToRequests.events();
+}
+
 void TopPeersStrip::removeLocally(uint64 id) {
 	if (!id) {
 		unsubscribeUserpics(true);
@@ -446,34 +464,76 @@ bool TopPeersStrip::selectedByKeyboard() const {
 	return _selectionByKeyboard && _selected >= 0;
 }
 
-void TopPeersStrip::selectByKeyboard(Qt::Key direction) {
+bool TopPeersStrip::selectByKeyboard(Qt::Key direction) {
 	if (_entries.empty()) {
-		return;
-	}
-	if (direction == Qt::Key()) {
+		return false;
+	} else if (direction == Qt::Key()) {
 		_selectionByKeyboard = true;
 		if (_selected < 0) {
 			setSelected(0);
 			scrollToSelected();
+			return true;
 		}
 	} else if (direction == Qt::Key_Left) {
 		if (_selected > 0) {
 			_selectionByKeyboard = true;
 			setSelected(_selected - 1);
 			scrollToSelected();
+			return true;
 		}
 	} else if (direction == Qt::Key_Right) {
 		if (_selected + 1 < _entries.size()) {
 			_selectionByKeyboard = true;
 			setSelected(_selected + 1);
 			scrollToSelected();
+			return true;
+		}
+	} else if (direction == Qt::Key_Up) {
+		const auto layout = currentLayout();
+		if (_selected < 0) {
+			_selectionByKeyboard = true;
+			const auto rows = _expanded.current()
+				? ((int(_entries.size()) + layout.inrow - 1) / layout.inrow)
+				: 1;
+			setSelected((rows - 1) * layout.inrow);
+			scrollToSelected();
+			return true;
+		} else if (!_expanded.current()) {
+			deselectByKeyboard();
+		} else if (_selected >= 0) {
+			const auto row = _selected / layout.inrow;
+			if (row > 0) {
+				_selectionByKeyboard = true;
+				setSelected(_selected - layout.inrow);
+				scrollToSelected();
+				return true;
+			} else {
+				deselectByKeyboard();
+			}
+		}
+	} else if (direction == Qt::Key_Down) {
+		if (_selected >= 0 && _expanded.current()) {
+			const auto layout = currentLayout();
+			const auto row = _selected / layout.inrow;
+			const auto rows = (int(_entries.size()) + layout.inrow - 1)
+				/ layout.inrow;
+			if (row + 1 < rows) {
+				_selectionByKeyboard = true;
+				setSelected(std::min(
+					_selected + layout.inrow,
+					int(_entries.size()) - 1));
+				scrollToSelected();
+				return true;
+			} else {
+				deselectByKeyboard();
+			}
 		}
 	}
+	return false;
 }
 
 void TopPeersStrip::deselectByKeyboard() {
 	if (_selectionByKeyboard) {
-		_selectionByKeyboard = false;
 		setSelected(-1);
 	}
 }
@@ -760,6 +820,7 @@ void TopPeersStrip::stripContextMenuEvent(QContextMenuEvent *e) {
 
 	if (e->reason() == QContextMenuEvent::Mouse) {
 		_lastMousePosition = e->globalPos();
+		_selectionByKeyboard = false;
 		updateSelected();
 	}
 	if (_selected < 0 || _entries.empty()) {
@@ -781,6 +842,7 @@ void TopPeersStrip::stripContextMenuEvent(QContextMenuEvent *e) {
 		const auto globalPosition = QCursor::pos();
 		if (rect().contains(mapFromGlobal(globalPosition))) {
 			_lastMousePosition = globalPosition;
+			_selectionByKeyboard = false;
 			updateSelected();
 		}
 	};
@@ -798,6 +860,7 @@ bool TopPeersStrip::finishDragging() {
 	}
 	checkDragging();
 	_dragging = false;
+	_selectionByKeyboard = false;
 	updateSelected();
 	return true;
 }
@@ -818,10 +881,10 @@ TopPeersStrip::Layout TopPeersStrip::currentLayout() const {
 }
 
 void TopPeersStrip::updateSelected() {
-	if (_pressed >= 0) {
+	if (_pressed >= 0 || !_lastMousePosition || _selectionByKeyboard) {
 		return;
 	}
-	const auto p = _strip.mapFromGlobal(_lastMousePosition);
+	const auto p = _strip.mapFromGlobal(*_lastMousePosition);
 	const auto expanded = _expanded.current();
 	const auto row = expanded ? (p.y() / st::topPeers.height) : 0;
 	const auto layout = currentLayout();
@@ -844,14 +907,24 @@ void TopPeersStrip::setSelected(int selected) {
 void TopPeersStrip::scrollToSelected() {
 	if (_selected < 0) {
 		return;
-	}
-	const auto single = outer().width();
-	const auto left = _selected * single;
-	const auto right = left + single;
-	if (_scrollLeft > left) {
-		_scrollLeft = std::clamp(left, 0, _scrollLeftMax);
-	} else if (_scrollLeft + width() < right) {
-		_scrollLeft = std::clamp(right - width(), 0, _scrollLeftMax);
+	} else if (_expanded.current()) {
+		const auto layout = currentLayout();
+		const auto row = _selected / layout.inrow;
+		const auto header = _header.height();
+		const auto top = header + row * st::topPeers.height;
+		const auto bottom = top + st::topPeers.height;
+		_scrollToRequests.fire({ top - (row ? 0 : header), bottom});
+	} else {
+		const auto single = outer().width();
+		const auto left = _selected * single;
+		const auto right = left + single;
+		if (_scrollLeft > left) {
+			_scrollLeft = std::clamp(left, 0, _scrollLeftMax);
+		} else if (_scrollLeft + width() < right) {
+			_scrollLeft = std::clamp(right - width(), 0, _scrollLeftMax);
+		}
+		const auto height = _header.height() + st::topPeers.height;
+		_scrollToRequests.fire({ 0, height });
 	}
 }
 
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index ac3c73257..f23b3da11 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Ui {
 class DynamicImage;
 class LinkButton;
+struct ScrollToRequest;
 } // namespace Ui
 
 namespace Dialogs {
@@ -51,11 +52,13 @@ public:
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
 	[[nodiscard]] auto showMenuRequests() const
 		-> rpl::producer<ShowTopPeerMenuRequest>;
+	[[nodiscard]] auto scrollToRequests() const
+		-> rpl::producer<Ui::ScrollToRequest>;
 
 	void removeLocally(uint64 id = 0);
 
 	[[nodiscard]] bool selectedByKeyboard() const;
-	void selectByKeyboard(Qt::Key direction);
+	bool selectByKeyboard(Qt::Key direction);
 	void deselectByKeyboard();
 	bool chooseRow();
 
@@ -106,7 +109,7 @@ private:
 	rpl::event_stream<ShowTopPeerMenuRequest> _showMenuRequests;
 	rpl::event_stream<not_null<QWheelEvent*>> _verticalScrollEvents;
 
-	QPoint _lastMousePosition;
+	std::optional<QPoint> _lastMousePosition;
 	std::optional<QPoint> _mouseDownPosition;
 	int _startDraggingLeft = 0;
 	int _scrollLeft = 0;
@@ -122,6 +125,8 @@ private:
 	Ui::Animations::Simple _expandAnimation;
 	rpl::variable<bool> _expanded = false;
 
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+
 	Ui::RoundRect _selection;
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	base::has_weak_ptr _menuGuard;

From 25bd2b145b74f99dd47301f1c77b1b9dfc5852db Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 Apr 2024 10:21:29 +0400
Subject: [PATCH 385/596] 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 d5a6bfced..d4e5c298f 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit d5a6bfced0b1fa35c4f601816313d02e6ecb7cde
+Subproject commit d4e5c298fc50f0b7cdd90e9998e71f6aa8f1c5e9
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index eab785a1c..d944b4e4e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit eab785a1c87e933bc8a8356570ed3919a7fb2ea6
+Subproject commit d944b4e4ef94c7785bb987ab68d360cd0119b97a

From 97ecc57be8400c3a4b02626e2dd389f60d450146 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 Apr 2024 17:28:35 +0400
Subject: [PATCH 386/596] Add choose font settings.

---
 Telegram/Resources/langs/lang.strings         |   6 +
 .../boxes/background_preview_box.cpp          |   2 +-
 Telegram/SourceFiles/core/application.cpp     |   6 +-
 Telegram/SourceFiles/core/core_settings.cpp   |  11 +-
 Telegram/SourceFiles/core/core_settings.h     |   8 +
 .../SourceFiles/settings/settings_chat.cpp    |  47 +
 .../SourceFiles/ui/boxes/choose_font_box.cpp  | 888 ++++++++++++++++++
 .../SourceFiles/ui/boxes/choose_font_box.h    |  20 +
 Telegram/cmake/td_ui.cmake                    |   2 +
 Telegram/lib_ui                               |   2 +-
 10 files changed, 986 insertions(+), 6 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
 create mode 100644 Telegram/SourceFiles/ui/boxes/choose_font_box.h

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1b294b370..62cf4464e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -843,6 +843,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_auto_night_mode_on" = "System";
 "lng_settings_auto_night_warning" = "You have enabled auto-night mode. If you want to change the dark mode settings, you'll need to disable it first.";
 "lng_settings_auto_night_disable" = "Disable";
+"lng_settings_font_family" = "Font family";
 
 "lng_settings_color_title" = "Color preview";
 "lng_settings_color_reply" = "Reply to your message";
@@ -5135,6 +5136,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channels_your_less" = "Show less";
 "lng_channels_recommended" = "Recommended channels";
 
+"lng_font_box_title" = "Choose font family";
+"lng_font_default" = "Default";
+"lng_font_system" = "System font";
+"lng_font_not_found" = "Font not found.";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index a112c478a..828b2d095 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -940,7 +940,7 @@ int BackgroundPreviewBox::textsTop() const {
 		- st::historyPaddingBottom
 		- (_service ? _service->height() : 0)
 		- _text1->height()
-		- (forChannel() ? _text2->height() : 0);
+		- (forChannel() ? 0 : _text2->height());
 }
 
 QRect BackgroundPreviewBox::radialRect() const {
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 917baf16e..6c25de60b 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -249,8 +249,6 @@ Application::~Application() {
 }
 
 void Application::run() {
-	style::internal::StartFonts();
-
 	ThirdParty::start();
 
 	// Depends on OpenSSL on macOS, so on ThirdParty::start().
@@ -258,6 +256,10 @@ void Application::run() {
 	_notifications = std::make_unique<Window::Notifications::System>();
 
 	startLocalStorage();
+
+	style::SetCustomFont(settings().customFontFamily());
+	style::internal::StartFonts();
+
 	ValidateScale();
 
 	refreshGlobalProxy(); // Depends on app settings being read.
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index faa41445f..939f4d053 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -217,7 +217,8 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_callPlaybackDeviceId.current())
 		+ Serialize::stringSize(_callCaptureDeviceId.current())
 		+ Serialize::bytearraySize(ivPosition)
-		+ Serialize::stringSize(noWarningExtensions);
+		+ Serialize::stringSize(noWarningExtensions)
+		+ Serialize::stringSize(_customFontFamily);
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -363,7 +364,8 @@ QByteArray Settings::serialize() const {
 			<< _callPlaybackDeviceId.current()
 			<< _callCaptureDeviceId.current()
 			<< ivPosition
-			<< noWarningExtensions;
+			<< noWarningExtensions
+			<< _customFontFamily;
 	}
 
 	Ensures(result.size() == size);
@@ -481,6 +483,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 trayIconMonochrome = (_trayIconMonochrome.current() ? 1 : 0);
 	qint32 ttlVoiceClickTooltipHidden = _ttlVoiceClickTooltipHidden.current() ? 1 : 0;
 	QByteArray ivPosition;
+	QString customFontFamily = _customFontFamily;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -766,6 +769,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		noWarningExtensions = QString();
 		stream >> *noWarningExtensions;
 	}
+	if (!stream.atEnd()) {
+		stream >> customFontFamily;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -972,6 +978,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!ivPosition.isEmpty()) {
 		_ivPosition = Deserialize(ivPosition);
 	}
+	_customFontFamily = customFontFamily;
 }
 
 QString Settings::getSoundPath(const QString &key) const {
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index cded2ec20..9ebd4887e 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -871,6 +871,13 @@ public:
 		_ivPosition = position;
 	}
 
+	[[nodiscard]] QString customFontFamily() const {
+		return _customFontFamily;
+	}
+	void setCustomFontFamily(const QString &value) {
+		_customFontFamily = value;
+	}
+
 	[[nodiscard]] static bool ThirdColumnByDefault();
 	[[nodiscard]] static float64 DefaultDialogsWidthRatio();
 
@@ -999,6 +1006,7 @@ private:
 	rpl::variable<bool> _storiesClickTooltipHidden = false;
 	rpl::variable<bool> _ttlVoiceClickTooltipHidden = false;
 	WindowPosition _ivPosition;
+	QString _customFontFamily;
 
 	bool _tabbedReplacedWithInfo = false; // per-window
 	rpl::event_stream<bool> _tabbedReplacedWithInfoValue; // per-window
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index d7c977df6..a373617f3 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/background_preview_box.h"
 #include "boxes/download_path_box.h"
 #include "boxes/local_storage_box.h"
+#include "ui/boxes/choose_font_box.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/fields/input_field.h"
@@ -1603,6 +1604,52 @@ void SetupThemeSettings(
 		});
 	}
 
+	const auto family = container->lifetime().make_state<
+		rpl::variable<QString>
+	>(settings->customFontFamily());
+	auto label = family->value() | rpl::map([](QString family) {
+		return family.isEmpty()
+			? tr::lng_font_default(tr::now)
+			: (family == style::SystemFontTag())
+			? tr::lng_font_system(tr::now)
+			: family;
+	});
+	AddButtonWithLabel(
+		container,
+		tr::lng_settings_font_family(),
+		std::move(label),
+		st::settingsButton,
+		{ &st::menuIconTranslate }
+	)->setClickedCallback([=] {
+		const auto save = [=](QString chosen) {
+			*family = chosen;
+			settings->setCustomFontFamily(chosen);
+			Local::writeSettings();
+			Core::Restart();
+		};
+
+		const auto theme = std::shared_ptr<Ui::ChatTheme>(
+			Window::Theme::DefaultChatThemeOn(container->lifetime()));
+		const auto generateBg = [=] {
+			const auto size = st::boxWidth;
+			const auto ratio = style::DevicePixelRatio();
+			auto result = QImage(
+				QSize(size, size) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			auto p = QPainter(&result);
+			Window::SectionWidget::PaintBackground(
+				p,
+				theme.get(),
+				QSize(size, size * 3),
+				QRect(0, 0, size, size));
+			p.end();
+
+			return result;
+		};
+		controller->show(
+			Box(Ui::ChooseFontBox, generateBg, family->current(), save));
+	});
+
 	Ui::AddSkip(container, st::settingsCheckboxesSkip);
 }
 
diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
new file mode 100644
index 000000000..1b2c375fa
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -0,0 +1,888 @@
+/*
+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/boxes/choose_font_box.h"
+
+#include "lang/lang_keys.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/chat/chat_style.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/style/style_core_font.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/multi_select.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/cached_round_corners.h"
+#include "ui/painter.h"
+#include "styles/style_chat.h"
+#include "styles/style_settings.h"
+#include "styles/style_layers.h"
+#include "styles/style_window.h"
+
+#include <QtGui/QFontDatabase>
+
+namespace Ui {
+namespace {
+
+constexpr auto kMinTextWidth = 120;
+constexpr auto kMaxTextWidth = 320;
+constexpr auto kMaxTextLines = 3;
+
+struct PreviewRequest {
+	QString family;
+	QColor msgBg;
+	QColor msgShadow;
+	QColor replyBar;
+	QColor replyNameFg;
+	QColor textFg;
+	QImage bubbleTail;
+};
+
+class PreviewPainter {
+public:
+	PreviewPainter(const QImage &bg, PreviewRequest request);
+
+	QImage takeResult();
+
+private:
+	void layout();
+
+	void paintBubble(QPainter &p);
+	void paintContent(QPainter &p);
+	void paintReply(QPainter &p);
+	void paintMessage(QPainter &p);
+
+	void validateBubbleCache();
+
+	const PreviewRequest _request;
+	const style::owned_color _msgBg;
+	const style::owned_color _msgShadow;
+
+	QFont _nameFont;
+	QFontMetricsF _nameMetrics;
+	int _nameFontHeight = 0;
+	QFont _textFont;
+	QFontMetricsF _textMetrics;
+	int _textFontHeight = 0;
+
+	QString _nameText;
+	QString _replyText;
+	QString _messageText;
+
+	int _boundingLimit = 0;
+
+	QRect _replyRect;
+	QRect _name;
+	QRect _reply;
+	QRect _message;
+	QRect _content;
+	QRect _bubble;
+	QSize _outer;
+
+	Ui::CornersPixmaps _bubbleCorners;
+	QPixmap _bubbleShadowBottomRight;
+
+	QImage _result;
+
+};
+
+class Selector final : public Ui::RpWidget {
+public:
+	Selector(
+		not_null<QWidget*> parent,
+		const QString &now,
+		rpl::producer<QString> filter,
+		rpl::producer<> submits,
+		Fn<void(QString)> chosen,
+		Fn<void(Ui::ScrollToRequest)> scrollTo);
+
+	void initScroll();
+	void setMinHeight(int height);
+	void selectSkip(Qt::Key direction, int pageSize);
+
+	[[nodiscard]] auto scrollToRequests() const
+	-> rpl::producer<Ui::ScrollToRequest> {
+		return _scrollToRequests.events();
+	}
+
+private:
+	struct Entry {
+		QString id;
+		QString key;
+		QString text;
+		QStringList keywords;
+		QImage cache;
+		std::unique_ptr<Ui::RadioView> check;
+		std::unique_ptr<Ui::RippleAnimation> ripple;
+		int paletteVersion = 0;
+	};
+	[[nodiscard]] static std::vector<Entry> FullList(const QString &now);
+
+	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+
+	[[nodiscard]] bool searching() const;
+	[[nodiscard]] int shownRowsCount() const;
+	[[nodiscard]] Entry &shownRowAt(int index);
+	[[nodiscard]] const Entry &shownRowAt(int index) const;
+
+	void applyFilter(const QString &query);
+	void updateSelected(int selected);
+	void updatePressed(int pressed);
+	void updateRow(int index);
+	void updateRow(not_null<Entry*> row, int hint);
+	void addRipple(int index, QPoint position);
+	void validateCache(Entry &row);
+	void choose(Entry &row);
+
+	const style::SettingsButton &_st;
+	std::vector<Entry> _rows;
+	std::vector<not_null<Entry*>> _filtered;
+	QString _chosen;
+	int _selected = -1;
+	int _pressed = -1;
+
+	Fn<void(QString)> _callback;
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+
+	int _rowsSkip = 0;
+	int _rowHeight = 0;
+	int _minHeight = 0;
+
+	QString _query;
+	QStringList _queryWords;
+
+	rpl::lifetime _lifetime;
+
+};
+
+Selector::Selector(
+	not_null<QWidget*> parent,
+	const QString &now,
+	rpl::producer<QString> filter,
+	rpl::producer<> submits,
+	Fn<void(QString)> chosen,
+	Fn<void(Ui::ScrollToRequest)> scrollTo)
+: RpWidget(parent)
+, _st(st::settingsButton)
+, _rows(FullList(now))
+, _chosen(now)
+, _callback(std::move(chosen))
+, _rowsSkip(st::settingsInfoPhotoSkip)
+, _rowHeight(_st.height + _st.padding.top() + _st.padding.bottom()) {
+	Expects(_chosen >= 0 && _chosen < _rows.size());
+
+	setMouseTracking(true);
+
+	std::move(filter) | rpl::start_with_next([=](const QString &query) {
+		applyFilter(query);
+	}, _lifetime);
+
+	std::move(submits) | rpl::filter([=] {
+		return searching() && !_filtered.empty();
+	}) | rpl::start_with_next([=] {
+		choose(*_filtered.front());
+	}, _lifetime);
+
+	_scrollToRequests.events(
+	) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+		scrollTo(request);
+	}, _lifetime);
+}
+
+void Selector::applyFilter(const QString &query) {
+	if (_query == query) {
+		return;
+	}
+	_query = query;
+
+	updateSelected(-1);
+	updatePressed(-1);
+
+	_queryWords = TextUtilities::PrepareSearchWords(_query);
+
+	const auto skip = [](
+			const QStringList &haystack,
+			const QStringList &needles) {
+		const auto find = [](
+				const QStringList &haystack,
+				const QString &needle) {
+			for (const auto &item : haystack) {
+				if (item.startsWith(needle)) {
+					return true;
+				}
+			}
+			return false;
+		};
+		for (const auto &needle : needles) {
+			if (!find(haystack, needle)) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+	_filtered.clear();
+	if (!_queryWords.isEmpty()) {
+		_filtered.reserve(_rows.size());
+		for (auto &row : _rows) {
+			if (!skip(row.keywords, _queryWords)) {
+				_filtered.push_back(&row);
+			} else {
+				row.ripple = nullptr;
+			}
+		}
+	}
+
+	resizeToWidth(width());
+	Ui::SendPendingMoveResizeEvents(this);
+	update();
+}
+
+void Selector::updateSelected(int selected) {
+	if (_selected == selected) {
+		return;
+	}
+	const auto was = (_selected >= 0);
+	updateRow(_selected);
+	_selected = selected;
+	updateRow(_selected);
+	const auto now = (_selected >= 0);
+	if (was != now) {
+		setCursor(now ? style::cur_pointer : style::cur_default);
+	}
+}
+
+void Selector::updatePressed(int pressed) {
+	if (_pressed == pressed) {
+		return;
+	} else if (_pressed >= 0) {
+		if (auto &ripple = shownRowAt(_pressed).ripple) {
+			ripple->lastStop();
+		}
+	}
+	updateRow(_pressed);
+	_pressed = pressed;
+	updateRow(_pressed);
+}
+
+void Selector::updateRow(int index) {
+	if (index >= 0) {
+		update(0, _rowsSkip + index * _rowHeight, width(), _rowHeight);
+	}
+}
+
+void Selector::updateRow(not_null<Entry*> row, int hint) {
+	if (hint >= 0 && hint < shownRowsCount() && &shownRowAt(hint) == row) {
+		updateRow(hint);
+	} else if (searching()) {
+		const auto i = ranges::find(_filtered, row);
+		if (i != end(_filtered)) {
+			updateRow(int(i - begin(_filtered)));
+		}
+	} else {
+		const auto index = int(row.get() - &_rows[0]);
+		Assert(index >= 0 && index < _rows.size());
+		updateRow(index);
+	}
+}
+
+void Selector::validateCache(Entry &row) {
+	const auto version = style::PaletteVersion();
+	if (row.cache.isNull()) {
+		const auto ratio = style::DevicePixelRatio();
+		row.cache = QImage(
+			QSize(width(), _rowHeight) * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		row.cache.setDevicePixelRatio(ratio);
+	} else if (row.paletteVersion == version) {
+		return;
+	}
+	row.cache.fill(Qt::transparent);
+	auto font = style::ResolveFont(row.id, 0, st::boxFontSize);
+	auto p = QPainter(&row.cache);
+	p.setFont(font);
+	p.setPen(st::windowFg);
+
+	const auto textw = width() - _st.padding.left() - _st.padding.right();
+	const auto metrics = QFontMetrics(font);
+	p.drawText(
+		_st.padding.left(),
+		_st.padding.top() + metrics.ascent(),
+		metrics.elidedText(row.text, Qt::ElideRight, textw));
+}
+
+bool Selector::searching() const {
+	return !_queryWords.isEmpty();
+}
+
+int Selector::shownRowsCount() const {
+	return searching() ? int(_filtered.size()) : int(_rows.size());
+}
+
+Selector::Entry &Selector::shownRowAt(int index) {
+	return searching() ? *_filtered[index] : _rows[index];
+}
+
+const Selector::Entry &Selector::shownRowAt(int index) const {
+	return const_cast<Selector*>(this)->shownRowAt(index);
+}
+
+void Selector::setMinHeight(int height) {
+	_minHeight = height;
+	if (_minHeight > 0) {
+		resizeToWidth(width());
+	}
+}
+
+void Selector::initScroll() {
+	const auto index = [&] {
+		if (searching()) {
+			const auto i = ranges::find(_filtered, _chosen, &Entry::id);
+			if (i != end(_filtered)) {
+				return int(i - begin(_filtered));
+			}
+			return -1;
+		}
+		const auto i = ranges::find(_rows, _chosen, &Entry::id);
+		Assert(i != end(_rows));
+		return int(i - begin(_rows));
+	}();
+	if (index >= 0) {
+		const auto top = _rowsSkip + index * _rowHeight;
+		const auto use = std::max(top - (_minHeight - _rowHeight) / 2, 0);
+		_scrollToRequests.fire({ use, use + _minHeight });
+	}
+}
+
+int Selector::resizeGetHeight(int newWidth) {
+	const auto added = 2 * _rowsSkip;
+	return std::max(added + shownRowsCount() * _rowHeight, _minHeight);
+}
+
+void Selector::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	const auto rows = shownRowsCount();
+	const auto clip = e->rect();
+	const auto clipped = std::max(clip.y() - _rowsSkip, 0);
+	const auto from = std::min(clipped / _rowHeight, rows);
+	const auto till = std::min(
+		(clip.y() + clip.height() - _rowsSkip + _rowHeight - 1) / _rowHeight,
+		rows);
+	const auto active = (_pressed >= 0) ? _pressed : _selected;
+	for (auto i = from; i != till; ++i) {
+		auto &row = shownRowAt(i);
+		const auto y = _rowsSkip + i * _rowHeight;
+		const auto bg = (i == active) ? st::windowBgOver : st::windowBg;
+		const auto rect = QRect(0, y, width(), _rowHeight);
+		p.fillRect(rect, bg);
+
+		if (row.ripple) {
+			row.ripple->paint(p, 0, y, width());
+			if (row.ripple->empty()) {
+				row.ripple = nullptr;
+			}
+		}
+
+		validateCache(row);
+		p.drawImage(0, y, row.cache);
+
+		if (!row.check) {
+			row.check = std::make_unique<Ui::RadioView>(
+				st::defaultRadio,
+				(row.id == _chosen),
+				[=, row = &row] { updateRow(row, i); });
+		}
+		row.check->paint(
+			p,
+			_st.iconLeft,
+			y + (_rowHeight - st::defaultRadio.diameter) / 2,
+			width());
+	}
+}
+
+void Selector::mouseMoveEvent(QMouseEvent *e) {
+	const auto y = e->y() - _rowsSkip;
+	const auto index = (y >= 0) ? (y / _rowHeight) : -1;
+	updateSelected((index >= 0 && index < shownRowsCount()) ? index : -1);
+}
+
+void Selector::mousePressEvent(QMouseEvent *e) {
+	updatePressed(_selected);
+	if (_pressed >= 0) {
+		addRipple(_pressed, e->pos());
+	}
+}
+
+void Selector::mouseReleaseEvent(QMouseEvent *e) {
+	const auto pressed = _pressed;
+	updatePressed(-1);
+	if (pressed == _selected) {
+		choose(shownRowAt(pressed));
+	}
+}
+
+void Selector::choose(Entry &row) {
+	const auto id = row.id;
+	if (_chosen != id) {
+		const auto i = ranges::find(_rows, _chosen, &Entry::id);
+		Assert(i != end(_rows));
+		if (i->check) {
+			i->check->setChecked(false, anim::type::normal);
+		}
+		_chosen = id;
+		if (row.check) {
+			row.check->setChecked(true, anim::type::normal);
+		}
+	}
+	_callback(id);
+	initScroll();
+}
+
+void Selector::addRipple(int index, QPoint position) {
+	Expects(index >= 0 && index < shownRowsCount());
+
+	const auto row = &shownRowAt(index);
+	if (!row->ripple) {
+		row->ripple = std::make_unique<Ui::RippleAnimation>(
+			st::defaultRippleAnimation,
+			Ui::RippleAnimation::RectMask({ width(), _rowHeight }),
+			[=] { updateRow(row, index); });
+	}
+	row->ripple->add(position - QPoint(0, _rowsSkip + index * _rowHeight));
+}
+
+std::vector<Selector::Entry> Selector::FullList(const QString &now) {
+	using namespace TextUtilities;
+
+	auto database = QFontDatabase();
+	auto families = database.families();
+	auto result = std::vector<Entry>();
+	result.reserve(families.size() + 3);
+	const auto add = [&](const QString &text, const QString &id = {}) {
+		result.push_back({
+			.id = id,
+			.text = text,
+			.keywords = PrepareSearchWords(text),
+		});
+	};
+	add(tr::lng_font_default(tr::now));
+	add(tr::lng_font_system(tr::now), style::SystemFontTag());
+	for (const auto &family : families) {
+		if (database.isScalable(family)) {
+			result.push_back({ .id = family });
+		}
+	}
+	if (!ranges::contains(result, now, &Entry::id)) {
+		result.push_back({ .id = now });
+	}
+	for (auto i = begin(result) + 2; i != end(result); ++i) {
+		i->key = TextUtilities::RemoveAccents(i->id).toLower();
+		i->text = i->id;
+		i->keywords = TextUtilities::PrepareSearchWords(i->id);
+	}
+	ranges::sort(begin(result) + 2, end(result), std::less<>(), &Entry::key);
+	return result;
+}
+
+[[nodiscard]] PreviewRequest PrepareRequest(const QString &family) {
+	return {
+		.family = family,
+		.msgBg = st::msgInBg->c,
+		.msgShadow = st::msgInShadow->c,
+		.replyBar = st::msgInReplyBarColor->c,
+		.replyNameFg = st::msgInServiceFg->c,
+		.textFg = st::historyTextInFg->c,
+		.bubbleTail = st::historyBubbleTailInLeft.instance(st::msgInBg->c),
+	};
+}
+
+PreviewPainter::PreviewPainter(const QImage &bg, PreviewRequest request)
+: _request(request)
+, _msgBg(_request.msgBg)
+, _msgShadow(_request.msgShadow)
+, _nameFont(style::ResolveFont(
+	_request.family,
+	style::internal::FontSemibold,
+	st::fsize))
+, _nameMetrics(_nameFont)
+, _nameFontHeight(base::SafeRound(_nameMetrics.height()))
+, _textFont(style::ResolveFont(_request.family, 0, st::fsize))
+, _textMetrics(_textFont)
+, _textFontHeight(base::SafeRound(_textMetrics.height())) {
+	layout();
+
+	const auto ratio = style::DevicePixelRatio();
+	_result = QImage(
+		_outer * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	_result.setDevicePixelRatio(ratio);
+
+	auto p = QPainter(&_result);
+	p.drawImage(0, 0, bg);
+
+	p.translate(_bubble.topLeft());
+	paintBubble(p);
+}
+
+void PreviewPainter::paintBubble(QPainter &p) {
+	validateBubbleCache();
+	const auto bubble = QRect(QPoint(), _bubble.size());
+	const auto cornerShadow = _bubbleShadowBottomRight.size()
+		/ _bubbleShadowBottomRight.devicePixelRatio();
+	p.drawPixmap(
+		bubble.width() - cornerShadow.width(),
+		bubble.height() + st::msgShadow - cornerShadow.height(),
+		_bubbleShadowBottomRight);
+	Ui::FillRoundRect(p, bubble, _msgBg.color(), _bubbleCorners);
+	const auto &bubbleTail = _request.bubbleTail;
+	const auto tail = bubbleTail.size() / bubbleTail.devicePixelRatio();
+	p.drawImage(-tail.width(), bubble.height() - tail.height(), bubbleTail);
+	p.fillRect(
+		-tail.width(),
+		bubble.height(),
+		tail.width() + bubble.width() - cornerShadow.width(),
+		st::msgShadow,
+		_request.msgShadow);
+	p.translate(_content.topLeft());
+	const auto local = _content.translated(-_content.topLeft());
+	p.setClipRect(local);
+	paintContent(p);
+}
+
+void PreviewPainter::validateBubbleCache() {
+	if (!_bubbleCorners.p[0].isNull()) {
+		return;
+	}
+	const auto radius = st::bubbleRadiusLarge;
+	_bubbleCorners = Ui::PrepareCornerPixmaps(radius, _msgBg.color());
+	_bubbleCorners.p[2] = {};
+	_bubbleShadowBottomRight
+		= Ui::PrepareCornerPixmaps(radius, _msgShadow.color()).p[3];
+}
+
+void PreviewPainter::paintContent(QPainter &p) {
+	paintReply(p);
+
+	p.translate(_message.topLeft());
+	const auto local = _message.translated(-_message.topLeft());
+	p.setClipRect(local);
+	paintMessage(p);
+}
+
+void PreviewPainter::paintReply(QPainter &p) {
+	{
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(_request.replyBar);
+
+		const auto outline = st::messageTextStyle.blockquote.outline;
+		const auto radius = st::messageTextStyle.blockquote.radius;
+		p.setOpacity(Ui::kDefaultOutline1Opacity);
+		p.setClipRect(
+			_replyRect.x(),
+			_replyRect.y(),
+			outline,
+			_replyRect.height());
+		p.drawRoundedRect(_replyRect, radius, radius);
+		p.setOpacity(Ui::kDefaultBgOpacity);
+		p.setClipRect(
+			_replyRect.x() + outline,
+			_replyRect.y(),
+			_replyRect.width() - outline,
+			_replyRect.height());
+		p.drawRoundedRect(_replyRect, radius, radius);
+	}
+	p.setOpacity(1.);
+	p.setClipping(false);
+
+	p.setPen(_request.replyNameFg);
+	p.setFont(_nameFont);
+	const auto name = _nameMetrics.elidedText(
+		_nameText,
+		Qt::ElideRight,
+		_name.width());
+	p.drawText(_name.x(), _name.y() + _nameMetrics.ascent(), name);
+
+	p.setPen(_request.textFg);
+	p.setFont(_textFont);
+	const auto reply = _textMetrics.elidedText(
+		_replyText,
+		Qt::ElideRight,
+		_reply.width());
+	p.drawText(_reply.x(), _reply.y() + _textMetrics.ascent(), reply);
+}
+
+void PreviewPainter::paintMessage(QPainter &p) {
+	p.setPen(_request.textFg);
+	p.setFont(_textFont);
+	p.drawText(QRect(0, 0, _message.width(), _boundingLimit), _messageText);
+}
+
+QImage PreviewPainter::takeResult() {
+	return std::move(_result);
+}
+
+void PreviewPainter::layout() {
+	const auto skip = st::boxRowPadding.left();
+	const auto minTextWidth = style::ConvertScale(kMinTextWidth);
+	const auto maxTextWidth = st::boxWidth
+		- 2 * skip
+		- st::msgPadding.left()
+		- st::msgPadding.right();
+	_boundingLimit = 100 * maxTextWidth;
+
+	const auto textSize = [&](
+			const QFontMetricsF &metrics,
+			const QString &text,
+			int availableWidth,
+			bool oneline = false) {
+		const auto result = metrics.boundingRect(
+			QRect(0, 0, availableWidth, _boundingLimit),
+			(Qt::AlignLeft
+				| Qt::AlignTop
+				| (oneline ? Qt::TextSingleLine : Qt::TextWordWrap)),
+			text);
+		return QSize(
+			int(std::ceil(result.x() + result.width())),
+			int(std::ceil(result.y() + result.height())));
+	};
+	const auto naturalSize = [&](
+			const QFontMetricsF &metrics,
+			const QString &text,
+			bool oneline = false) {
+		return textSize(metrics, text, _boundingLimit, oneline);
+	};
+
+	_nameText = tr::lng_settings_chat_message_reply_from(tr::now);
+	_replyText = tr::lng_background_text2(tr::now);
+	_messageText = tr::lng_background_text1(tr::now);
+
+	const auto nameSize = naturalSize(_nameMetrics, _nameText, true);
+	const auto nameMaxWidth = nameSize.width();
+	const auto replySize = naturalSize(_textMetrics, _replyText, true);
+	const auto replyMaxWidth = replySize.width();
+	const auto messageSize = naturalSize(_textMetrics, _messageText);
+	const auto messageMaxWidth = messageSize.width();
+
+	const auto namePosition = QPoint(
+		st::historyReplyPadding.left(),
+		st::historyReplyPadding.top());
+	const auto replyPosition = QPoint(
+		st::historyReplyPadding.left(),
+		(st::historyReplyPadding.top() + _nameFontHeight));
+	const auto paddingRight = st::historyReplyPadding.right();
+
+	const auto wantedWidth = std::max({
+		namePosition.x() + nameMaxWidth + paddingRight,
+		replyPosition.x() + replyMaxWidth + paddingRight,
+		messageMaxWidth
+	});
+
+	const auto messageWidth = std::clamp(
+		wantedWidth,
+		minTextWidth,
+		maxTextWidth);
+	const auto messageHeight = textSize(
+		_textMetrics,
+		_messageText,
+		maxTextWidth).height();
+
+	_replyRect = QRect(
+		st::msgReplyBarPos.x(),
+		st::historyReplyTop,
+		messageWidth,
+		(st::historyReplyPadding.top()
+			+ _nameFontHeight
+			+ _textFontHeight
+			+ st::historyReplyPadding.bottom()));
+
+	_name = QRect(
+		_replyRect.topLeft() + namePosition,
+		QSize(messageWidth - namePosition.x(), _nameFontHeight));
+	_reply = QRect(
+		_replyRect.topLeft() + replyPosition,
+		QSize(messageWidth - replyPosition.x(), _textFontHeight));
+	_message = QRect(0, 0, messageWidth, messageHeight);
+
+	const auto replySkip = _replyRect.y()
+		+ _replyRect.height()
+		+ st::historyReplyBottom;
+	_message.moveTop(replySkip);
+
+	_content = QRect(0, 0, messageWidth, replySkip + messageHeight);
+
+	const auto msgPadding = st::msgPadding;
+	_bubble = _content.marginsAdded(msgPadding);
+	_content.moveTopLeft(-_bubble.topLeft());
+	_bubble.moveTopLeft({});
+	const auto bubbleShadow = st::msgShadow;
+
+	_outer = QSize(st::boxWidth, st::boxWidth / 2);
+
+	_bubble.moveTopLeft({ skip, std::max(
+		(_outer.height() - _bubble.height()) / 2,
+		st::msgMargin.top()) });
+}
+
+[[nodiscard]] QImage GeneratePreview(
+		const QImage &bg,
+		PreviewRequest request) {
+	return PreviewPainter(bg, request).takeResult();
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakePreview(
+		not_null<QWidget*> parent,
+		Fn<QImage()> generatePreviewBg,
+		rpl::producer<QString> family) {
+	auto result = object_ptr<Ui::RpWidget>(parent.get());
+	const auto raw = result.data();
+
+	struct State {
+		QImage preview;
+		QImage bg;
+		QString family;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+
+	state->bg = generatePreviewBg();
+	style::PaletteChanged() | rpl::start_with_next([=] {
+		state->bg = generatePreviewBg();
+	}, raw->lifetime());
+
+	rpl::combine(
+		rpl::single(rpl::empty) | rpl::then(style::PaletteChanged()),
+		std::move(family)
+	) | rpl::start_with_next([=](const auto &, QString family) {
+		state->family = family;
+		if (state->preview.isNull()) {
+			state->preview = GeneratePreview(
+				state->bg,
+				PrepareRequest(family));
+			const auto ratio = state->preview.devicePixelRatio();
+			raw->resize(state->preview.size() / int(ratio));
+		} else {
+			const auto weak = Ui::MakeWeak(raw);
+			const auto request = PrepareRequest(family);
+			crl::async([=, bg = state->bg] {
+				crl::on_main([
+					weak,
+					state,
+					preview = GeneratePreview(bg, request)
+				]() mutable {
+					if (const auto strong = weak.data()) {
+						state->preview = std::move(preview);
+						const auto ratio = state->preview.devicePixelRatio();
+						strong->resize(
+							strong->width(),
+							(state->preview.height() / int(ratio)));
+						strong->update();
+					}
+				});
+			});
+		}
+	}, raw->lifetime());
+
+	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		QPainter(raw).drawImage(0, 0, state->preview);
+	}, raw->lifetime());
+
+	return result;
+}
+
+} // namespace
+
+void ChooseFontBox(
+		not_null<GenericBox*> box,
+		Fn<QImage()> generatePreviewBg,
+		const QString &family,
+		Fn<void(QString)> save) {
+	box->setTitle(tr::lng_font_box_title());
+
+	struct State {
+		rpl::variable<QString> family;
+		rpl::variable<QString> query;
+		rpl::event_stream<> submits;
+	};
+	const auto state = box->lifetime().make_state<State>(State{
+		.family = family,
+	});
+
+	const auto top = box->setPinnedToTopContent(
+		object_ptr<Ui::VerticalLayout>(box));
+	top->add(MakePreview(top, generatePreviewBg, state->family.value()));
+	const auto filter = top->add(object_ptr<Ui::MultiSelect>(
+		top,
+		st::defaultMultiSelect,
+		tr::lng_participant_filter()));
+	top->resizeToWidth(st::boxWidth);
+
+	filter->setSubmittedCallback([=](Qt::KeyboardModifiers) {
+		state->submits.fire({});
+	});
+	filter->setQueryChangedCallback([=](const QString &query) {
+		state->query = query;
+	});
+	filter->setCancelledCallback([=] {
+		filter->clearQuery();
+	});
+
+	const auto chosen = [=](const QString &value) {
+		state->family = value;
+		filter->clearQuery();
+	};
+	const auto scrollTo = [=](Ui::ScrollToRequest request) {
+		box->scrollToY(request.ymin, request.ymax);
+	};
+	const auto selector = box->addRow(
+		object_ptr<Selector>(
+			box,
+			state->family.current(),
+			state->query.value(),
+			state->submits.events(),
+			chosen,
+			scrollTo),
+		QMargins());
+	box->setMinHeight(st::boxMaxListHeight);
+	box->setMaxHeight(st::boxMaxListHeight);
+
+	rpl::combine(
+		box->heightValue(),
+		top->heightValue()
+	) | rpl::start_with_next([=](int box, int top) {
+		selector->setMinHeight(box - top);
+	}, selector->lifetime());
+
+	box->addButton(tr::lng_settings_save(), [=] {
+		if (state->family.current() == family) {
+			box->closeBox();
+			return;
+		}
+		box->getDelegate()->show(Ui::MakeConfirmBox({
+			.text = tr::lng_settings_need_restart(),
+			.confirmed = [=] { save(state->family.current()); },
+			.confirmText = tr::lng_settings_restart_now(),
+		}));
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+
+	box->setFocusCallback([=] {
+		filter->setInnerFocus();
+	});
+	box->setInitScrollCallback([=] {
+		SendPendingMoveResizeEvents(box);
+		selector->initScroll();
+	});
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.h b/Telegram/SourceFiles/ui/boxes/choose_font_box.h
new file mode 100644
index 000000000..ed79f9bc4
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+
+class GenericBox;
+
+void ChooseFontBox(
+	not_null<GenericBox*> box,
+	Fn<QImage()> generatePreviewBg,
+	const QString &family,
+	Fn<void(QString)> save);
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 5c0d6e173..61c9012c1 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -239,6 +239,8 @@ PRIVATE
     ui/boxes/calendar_box.h
     ui/boxes/choose_date_time.cpp
     ui/boxes/choose_date_time.h
+    ui/boxes/choose_font_box.cpp
+    ui/boxes/choose_font_box.h
     ui/boxes/choose_language_box.cpp
     ui/boxes/choose_language_box.h
     ui/boxes/choose_time.cpp
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d944b4e4e..ae5a61f7a 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d944b4e4ef94c7785bb987ab68d360cd0119b97a
+Subproject commit ae5a61f7aeaa18eb4016d290c45be990c614a9a1

From d82e48f8e46870adf76d472d0d22e5c82f52a7a4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 Apr 2024 19:11:57 +0400
Subject: [PATCH 387/596] Improve ChooseFontBox navigation.

---
 Telegram/Resources/icons/menu/fonts.png       | Bin 0 -> 563 bytes
 Telegram/Resources/icons/menu/fonts@2x.png    | Bin 0 -> 1153 bytes
 Telegram/Resources/icons/menu/fonts@3x.png    | Bin 0 -> 1567 bytes
 .../SourceFiles/settings/settings_chat.cpp    |   2 +-
 .../SourceFiles/ui/boxes/choose_font_box.cpp  | 173 ++++++++++++++----
 Telegram/SourceFiles/ui/menu_icons.style      |   1 +
 Telegram/lib_ui                               |   2 +-
 7 files changed, 141 insertions(+), 37 deletions(-)
 create mode 100644 Telegram/Resources/icons/menu/fonts.png
 create mode 100644 Telegram/Resources/icons/menu/fonts@2x.png
 create mode 100644 Telegram/Resources/icons/menu/fonts@3x.png

diff --git a/Telegram/Resources/icons/menu/fonts.png b/Telegram/Resources/icons/menu/fonts.png
new file mode 100644
index 0000000000000000000000000000000000000000..a82aa21664488e0fd1c4ab127b5320cbe70d6abf
GIT binary patch
literal 563
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY_6w^V~B;|
z*(t004h0Cb?Owundx4h2M3Hvq=7UO}2L#s5x~|X|t}u1QqY5UW3PusO)&mTY9MkXW
zx0)<Jthph{y!y(SKmYBGpPRLPynpR@vh&A^JKNqKuMmh_8}|FJU4f~a+3dM~%cq}y
z`ue5S{PPzSvV#PeEadu|4<0C#nN_t(!NFRF?^lcn<2CV%u8PVNIlkT$T&g1Q*4eGe
zz{PX<Wtr|CDK^3LpLgBO>v(JJ;33eqV1>)qs@m<h3(GoPlvF-sujou-63bf}^z!@f
z?xTysR&#p1&$9Mf8g%`&=!&~}`qNKG=!Ask=(cn!Z84sGHsg3{?CDKiM;9rqc-QT6
z_@ThJvfZlT%P$8`t@>S<y)))riPgtfc7IzBrm9aq>G1#EwN+PNr5K%j{+YEt@xz~}
zwP6!H@;mx`F5k&9TN>n<3iQ|4D&7+AuD*AHp$%u5Uw*B6{4t`p-%a_Qpa-wl>@R;_
z%GXZxQEO&-sC)hIwHf-Kf9|=NbBgO?-QtT5izI!{u&jIb*YME(i~WLG%mt?U?9wb5
jN~hoV+<L+M)A@<CptQ817*}K)D8f8l{an^LB{Ts5c<$uo

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/fonts@2x.png b/Telegram/Resources/icons/menu/fonts@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d735d58b52cca60dc3e9526b5ccfbe038cf29f2
GIT binary patch
literal 1153
zcmV-{1b+L8P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF>q$gGR9Fe^SUXEAK@>Jo@sYwu
zKoBexgMyt;QrH*;8{ZE^d|~GcY=i$GRT@DH3z2}LAlUc^EYw61(Ml05L=j&hB8t!Z
z!GXgt*<EKh%e`{R7R#A4-+brWb7p5|Hzg%`B{T4!Wx%2GJVixC#l^*Lw_61qkNN)o
zet3AexVX5yyo~QP;Ym+VpPHIFIywTQEf=Uj2wD>&7+P9ddVG9riw=ndv>@j|lA&EP
zkH@pKvqLoshr_e8vwM4cNIR&d@hVM+!;zn#UsF?q^wibWVaVOxo!9F<J3CVuo`RH8
zZr<MB{C<CGYO2yO1rVq}2wFTCLa5db&p}DXV1+2AA)qCG1X3DIvv_xR*T&q4fk6v$
zXhI;-uWjQEC;3A|L)r*CydbA22q*D5rFKb433)J!r7jzrOwQq$To#1af%@=HG052H
z>FHTtU!R$oNlQyJMshEc=jG+GlMG!7q*Q`xHmj?vS65f@Vt00Setv!i0s&2!<YaOT
zl)B^$N!>p-$HvB(bb5MPJxO}Z2?@%~%<S#$1@+<KA?}5Rg&iFodXW_U2?=UzYs<;W
zL8S5V@spDiG86;r!4eWQJUk5E)6>)K?d|#bdDuRmue`imFPMtox}buBg68IC#8_Hd
z!hLaZ@#W<O2C}6RSPx@eP=9|vrZC=@P$&fU$H&K&l@%BxBO}?_*?RGQ^jjB1_1fCn
z!pV!m%+1Zg$j!}#)*l1w0W1otsHmu_ssbt1i`XNP2ra>hRL!CwO3&-->)P6y_^gy9
ztd_O4wW43$wj#*sbPfy*AjZbVMl2Q+gDo#FN25`ACMG6Czq)NjP(wol?b0nREtt#V
zb#-->m6e6?eSLlL`;>|-D}tzA&(F^;mkU!^x-v2{5E!yXM@Ll@NEqGCRl;!-BD%V|
z(A?bI+~414zi1$H_4W1G=7PZ>@1r8Xgx%iW4hmdY_cVtM4h|Bava(VW0B3i1H({EZ
znlv#WCji1p0MjL-df|wEaBv`TaTAjrlL<`=Q`?*%9N!un8xcudepm+^A0HnJ3kztr
zwzgu1v0ue7C+PkC{r2|u=H|v&5CUVb1?>L*{_E>YMF(T#NsZD{A0N9I3ghYNsjRFF
z7#N~I-oC!R1`>X0p&}%cb2w&@1@UPY)xje&jt$KK+$$OeNQ0BRTr%D%@#QPB+iNp9
zhcn{;T_1{2`qw_CCnqP362pD}_Gg3qSwyma*Y6nCL_cL{jkoa*T7w@}Tqq3#wZnX(
zIc|#}P=V0+w~%(pBy~9b;I9DAH@u)p0OKYe24|-8^YcW1dK!mG_9ip%OEd5XScDs^
T(-T_)00000NkvXXu0mjf3pn_>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/fonts@3x.png b/Telegram/Resources/icons/menu/fonts@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0aa3679f3ccbaf585291579d915d818334212608
GIT binary patch
literal 1567
zcmV+)2H^RLP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS=iAh93RA>e5TFonUT@-)tqJ$8N
zlCKHj!9WVhKp~V!z6~TH84v>le}FN`0EH;!qvT^?ARhxJ@=>Nl2q9lZc-~*{?p^KY
zT>IX0&)xgp$NQc;xUI9#+I#(eYwxr6TIcK^Kg^%$0n-Df2TTu`9{9c<a5DxyGBPqg
zK0YigEF>hv&CTE-R!o0>e%{>NTwGin9UYyVoLJG6b1N_~u(!8&Z*T9H6MrxVqcAOp
zgJu+WclXZD&fD8tCo=lY6ifpEU}%6jbm{N!zqGXUn;jQj00zM5A!GaTz(AXun@LGY
zG~E6D{rvp=%F4>|@iCqRaHLzZ1U$FF!NE~cQTh4#B_$;R0Rc4f!NEaRR@TGA1GN|t
zF!lUgy}!Tr_4V;)j0|dLADDyDkB<*pC4l7Un#8iE;ov0r&rVd*)C&p<0D!;%nDL<z
zh$vcMu3X59aR4`(HvlspClO@HLs$&PJtVIuU=Sq0GdM8qS9f=JPJXULhyep&7&pKZ
zsab1BZb7~o9UZl%>fCz(L%;x1WL&u4A!DLGi0mZ0T;Rd*AT_{*#KObFNfrAQ$u1Xo
zFi2KKc>WUI!2U?LunUuHK=AVNs;{q)i;LUc-JP16LV{~x5bDB%K?+Xo8bL^m&)Ko2
zHQn@IdU|@Uudk=4r?W0qRaM2s#f}Wf_vJxqAPJYEM$hnNb8|DX!XSl(g_V_+hDX!i
zQ8}^3#zqaAwzf7+i;7FN#D4zs)8Nj?$Vg63)-+1LR7(sogAfl443ON?(n7K#K_M{@
z50C2VYKHsr^0K3&gNpo`ni`#Dm0{WniRI?z(mpdeIr;YXHZ(NEfcpCS*45P+2Cb)~
zLSp<n92*-0n&IJL&||PvuSQkG{QUe-`7#cud0E1Gb#*l}Gs7Aa5)!hrvze^oUlp;k
zvN9hZABLDs7n27E2Z@H#NmE6P)*%uoJYYm-V`Jm+@Q_`WmX?NwhSDv$f)Zj85fM2#
zISlCP>gxIVIS-m94LPLc_RVWLA}b+QTU$$69KQ}3(DCu{r>7?-H#Idm`dUW7UI{T;
zhafOFH>WZE`1m+6F~J&9DI$B+C`h@KPb@7h4HXIlhZy+s@?r^;RwHgH3L)}|@jI{O
zI%FjG_xHE9wwRokmlqu!ZAsq27Rkg=eWBuFm`+bm*VfiV_-NAbjG?p<sTpn;7MjLJ
z#H&9lz46}f?CeZ54x$To0v0(M8XE8}?e+Clq->yFGBFApfP#b&KRuY>i}LbviYR)z
z*wm4^6!FrpsHljUe13kmX&VYu=SvSEGH0x!qQcwToAKG%*`dwK3d5kFpv=rnD4_a8
zQHr2qMcJ-fGKtYT#EX8AyuQA+2?aB}u&}_?T3cHsMiFUCF*Y_9US|-OmzVXhf-*h`
z@zp140-L_jsUVG*p6$yL69S{6>Qg>3eD9>yWy!>{MN#!BhgfQAYD`QF13f)GZP$*3
z>T`B>mi0|cOiW2hu_SMxMGi51k0aY7BO@g16#D!7Nz=g>;53e$sE9D#-rkO?8Cmc4
z_BM^KQ$XHG-6cl+udR1?cVqWtKSaE*m0ZyZF#qEE)z#G{f*@Rqe7vUgPc(`%+j%hj
zmlq8NAu*g|B2}EXAlc;t4~7S+0VX7d(^;hI^78_O1Og9+2g&Q$kiYfEb>WPGG`-wJ
z+TPRCW5W$jxeXX}eu3cGZTU|-z=B1H^qPf4hYqm76aUR4M<9mM{SQ1Owz#-x^KIn+
z^;jQ!F2CbJOuZ2WQ;+A34#QDW<1_)L0l?-8)XPVshd7D%WVF9IhZW4hsJ(~yY(HZf
zZtRjBPsgz&WN!5R;Y&?pjc^(AKzycg((!a-D9v7`2TTu`9xy#%dO(#2{sw>aqX<!Y
RPKE#g002ovPDHLkV1iw#&M5!@

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index a373617f3..2bc52090e 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -1619,7 +1619,7 @@ void SetupThemeSettings(
 		tr::lng_settings_font_family(),
 		std::move(label),
 		st::settingsButton,
-		{ &st::menuIconTranslate }
+		{ &st::menuIconFont }
 	)->setClickedCallback([=] {
 		const auto save = [=](QString chosen) {
 			*family = chosen;
diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index 1b2c375fa..6fe238a1c 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/boxes/choose_font_box.h"
 
+#include "base/event_filter.h"
 #include "lang/lang_keys.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/chat/chat_style.h"
@@ -18,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/scroll_area.h"
 #include "ui/cached_round_corners.h"
 #include "ui/painter.h"
+#include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_settings.h"
 #include "styles/style_layers.h"
@@ -98,16 +100,11 @@ public:
 		rpl::producer<QString> filter,
 		rpl::producer<> submits,
 		Fn<void(QString)> chosen,
-		Fn<void(Ui::ScrollToRequest)> scrollTo);
+		Fn<void(Ui::ScrollToRequest, anim::type)> scrollTo);
 
-	void initScroll();
+	void initScroll(anim::type animated);
 	void setMinHeight(int height);
-	void selectSkip(Qt::Key direction, int pageSize);
-
-	[[nodiscard]] auto scrollToRequests() const
-	-> rpl::producer<Ui::ScrollToRequest> {
-		return _scrollToRequests.events();
-	}
+	void selectSkip(Qt::Key direction);
 
 private:
 	struct Entry {
@@ -124,6 +121,7 @@ private:
 
 	int resizeGetHeight(int newWidth) override;
 	void paintEvent(QPaintEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
@@ -149,8 +147,11 @@ private:
 	int _selected = -1;
 	int _pressed = -1;
 
+	std::optional<QPoint> _lastGlobalPoint;
+	bool _selectedByKeyboard = false;
+
 	Fn<void(QString)> _callback;
-	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+	Fn<void(Ui::ScrollToRequest, anim::type)> _scrollTo;
 
 	int _rowsSkip = 0;
 	int _rowHeight = 0;
@@ -169,12 +170,13 @@ Selector::Selector(
 	rpl::producer<QString> filter,
 	rpl::producer<> submits,
 	Fn<void(QString)> chosen,
-	Fn<void(Ui::ScrollToRequest)> scrollTo)
+	Fn<void(Ui::ScrollToRequest, anim::type)> scrollTo)
 : RpWidget(parent)
 , _st(st::settingsButton)
 , _rows(FullList(now))
 , _chosen(now)
 , _callback(std::move(chosen))
+, _scrollTo(std::move(scrollTo))
 , _rowsSkip(st::settingsInfoPhotoSkip)
 , _rowHeight(_st.height + _st.padding.top() + _st.padding.bottom()) {
 	Expects(_chosen >= 0 && _chosen < _rows.size());
@@ -185,15 +187,14 @@ Selector::Selector(
 		applyFilter(query);
 	}, _lifetime);
 
-	std::move(submits) | rpl::filter([=] {
-		return searching() && !_filtered.empty();
-	}) | rpl::start_with_next([=] {
-		choose(*_filtered.front());
-	}, _lifetime);
-
-	_scrollToRequests.events(
-	) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
-		scrollTo(request);
+	std::move(
+		submits
+	) | rpl::start_with_next([=] {
+		if (_selected >= 0) {
+			choose(shownRowAt(_selected));
+		} else if (searching() && !_filtered.empty()) {
+			choose(*_filtered.front());
+		}
 	}, _lifetime);
 }
 
@@ -258,6 +259,17 @@ void Selector::updateSelected(int selected) {
 	if (was != now) {
 		setCursor(now ? style::cur_pointer : style::cur_default);
 	}
+	if (_selectedByKeyboard) {
+		const auto top = (_selected > 0)
+			? (_rowsSkip + _selected * _rowHeight)
+			: 0;
+		const auto bottom = (_selected > 0)
+			? (top + _rowHeight)
+			: _selected
+			? 0
+			: _rowHeight;
+		_scrollTo({ top, bottom }, anim::type::instant);
+	}
 }
 
 void Selector::updatePressed(int pressed) {
@@ -313,9 +325,10 @@ void Selector::validateCache(Entry &row) {
 
 	const auto textw = width() - _st.padding.left() - _st.padding.right();
 	const auto metrics = QFontMetrics(font);
+	const auto textt = (_rowHeight - metrics.height()) / 2.;
 	p.drawText(
 		_st.padding.left(),
-		_st.padding.top() + metrics.ascent(),
+		int(base::SafeRound(textt)) + metrics.ascent(),
 		metrics.elidedText(row.text, Qt::ElideRight, textw));
 }
 
@@ -342,7 +355,37 @@ void Selector::setMinHeight(int height) {
 	}
 }
 
-void Selector::initScroll() {
+void Selector::selectSkip(Qt::Key key) {
+	const auto count = shownRowsCount();
+	if (key == Qt::Key_Down) {
+		if (_selected + 1 < count) {
+			_selectedByKeyboard = true;
+			updateSelected(_selected + 1);
+		}
+	} else if (key == Qt::Key_Up) {
+		if (_selected >= 0) {
+			_selectedByKeyboard = true;
+			updateSelected(_selected - 1);
+		}
+	} else if (key == Qt::Key_PageDown) {
+		const auto change = _minHeight / _rowHeight;
+		if (_selected + 1 < count) {
+			_selectedByKeyboard = true;
+			updateSelected(std::min(_selected + change, count - 1));
+		}
+	} else if (key == Qt::Key_PageUp) {
+		const auto change = _minHeight / _rowHeight;
+		if (_selected > 0) {
+			_selectedByKeyboard = true;
+			updateSelected(std::max(_selected - change, 0));
+		} else if (!_selected) {
+			_selectedByKeyboard = true;
+			updateSelected(-1);
+		}
+	}
+}
+
+void Selector::initScroll(anim::type animated) {
 	const auto index = [&] {
 		if (searching()) {
 			const auto i = ranges::find(_filtered, _chosen, &Entry::id);
@@ -358,7 +401,7 @@ void Selector::initScroll() {
 	if (index >= 0) {
 		const auto top = _rowsSkip + index * _rowHeight;
 		const auto use = std::max(top - (_minHeight - _rowHeight) / 2, 0);
-		_scrollToRequests.fire({ use, use + _minHeight });
+		_scrollTo({ use, use + _minHeight }, animated);
 	}
 }
 
@@ -371,6 +414,15 @@ void Selector::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
 	const auto rows = shownRowsCount();
+	if (!rows) {
+		p.setFont(st::normalFont);
+		p.setPen(st::windowSubTextFg);
+		p.drawText(
+			QRect(0, 0, width(), height() * 2 / 3),
+			tr::lng_font_not_found(tr::now),
+			style::al_center);
+		return;
+	}
 	const auto clip = e->rect();
 	const auto clipped = std::max(clip.y() - _rowsSkip, 0);
 	const auto from = std::min(clipped / _rowHeight, rows);
@@ -397,19 +449,37 @@ void Selector::paintEvent(QPaintEvent *e) {
 
 		if (!row.check) {
 			row.check = std::make_unique<Ui::RadioView>(
-				st::defaultRadio,
+				st::langsRadio,
 				(row.id == _chosen),
 				[=, row = &row] { updateRow(row, i); });
 		}
 		row.check->paint(
 			p,
 			_st.iconLeft,
-			y + (_rowHeight - st::defaultRadio.diameter) / 2,
+			y + (_rowHeight - st::langsRadio.diameter) / 2,
 			width());
 	}
 }
 
+void Selector::leaveEventHook(QEvent *e) {
+	_lastGlobalPoint = std::nullopt;
+	if (!_selectedByKeyboard) {
+		updateSelected(-1);
+	}
+}
+
 void Selector::mouseMoveEvent(QMouseEvent *e) {
+	if (!_lastGlobalPoint) {
+		_lastGlobalPoint = e->globalPos();
+		if (_selectedByKeyboard) {
+			return;
+		}
+	} else if (*_lastGlobalPoint == e->globalPos() && _selectedByKeyboard) {
+		return;
+	} else {
+		_lastGlobalPoint = e->globalPos();
+	}
+	_selectedByKeyboard = false;
 	const auto y = e->y() - _rowsSkip;
 	const auto index = (y >= 0) ? (y / _rowHeight) : -1;
 	updateSelected((index >= 0 && index < shownRowsCount()) ? index : -1);
@@ -443,8 +513,11 @@ void Selector::choose(Entry &row) {
 			row.check->setChecked(true, anim::type::normal);
 		}
 	}
+	const auto animated = searching()
+		? anim::type::instant
+		: anim::type::normal;
 	_callback(id);
-	initScroll();
+	initScroll(animated);
 }
 
 void Selector::addRipple(int index, QPoint position) {
@@ -839,8 +912,10 @@ void ChooseFontBox(
 		state->family = value;
 		filter->clearQuery();
 	};
-	const auto scrollTo = [=](Ui::ScrollToRequest request) {
-		box->scrollToY(request.ymin, request.ymax);
+	const auto scrollTo = [=](
+			Ui::ScrollToRequest request,
+			anim::type animated) {
+		box->scrollTo(request, animated);
 	};
 	const auto selector = box->addRow(
 		object_ptr<Selector>(
@@ -854,6 +929,20 @@ void ChooseFontBox(
 	box->setMinHeight(st::boxMaxListHeight);
 	box->setMaxHeight(st::boxMaxListHeight);
 
+	base::install_event_filter(filter, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::KeyPress) {
+			const auto key = static_cast<QKeyEvent*>(e.get())->key();
+			if (key == Qt::Key_Up
+				|| key == Qt::Key_Down
+				|| key == Qt::Key_PageUp
+				|| key == Qt::Key_PageDown) {
+				selector->selectSkip(Qt::Key(key));
+				return base::EventFilterResult::Cancel;
+			}
+		}
+		return base::EventFilterResult::Continue;
+	});
+
 	rpl::combine(
 		box->heightValue(),
 		top->heightValue()
@@ -861,27 +950,41 @@ void ChooseFontBox(
 		selector->setMinHeight(box - top);
 	}, selector->lifetime());
 
-	box->addButton(tr::lng_settings_save(), [=] {
-		if (state->family.current() == family) {
+	const auto apply = [=](QString chosen) {
+		if (chosen == family) {
 			box->closeBox();
 			return;
 		}
 		box->getDelegate()->show(Ui::MakeConfirmBox({
 			.text = tr::lng_settings_need_restart(),
-			.confirmed = [=] { save(state->family.current()); },
+			.confirmed = [=] { save(chosen); },
 			.confirmText = tr::lng_settings_restart_now(),
 		}));
-	});
-	box->addButton(tr::lng_cancel(), [=] {
-		box->closeBox();
-	});
+	};
+	const auto refreshButtons = [=](QString chosen) {
+		box->clearButtons();
+		// Doesn't fit in most languages.
+		//if (!chosen.isEmpty()) {
+		//	box->addLeftButton(tr::lng_background_reset_default(), [=] {
+		//		apply(QString());
+		//	});
+		//}
+		box->addButton(tr::lng_settings_save(), [=] {
+			apply(chosen);
+		});
+		box->addButton(tr::lng_cancel(), [=] {
+			box->closeBox();
+		});
+	};
+	state->family.value(
+	) | rpl::start_with_next(refreshButtons, box->lifetime());
 
 	box->setFocusCallback([=] {
 		filter->setInnerFocus();
 	});
 	box->setInitScrollCallback([=] {
 		SendPendingMoveResizeEvents(box);
-		selector->initScroll();
+		selector->initScroll(anim::type::instant);
 	});
 }
 
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 38625f769..eee9919fd 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -152,6 +152,7 @@ menuIconAsMessages: icon {{ "menu/mode_messages", menuIconColor }};
 menuIconTagFilter: icon{{ "menu/tag_filter", menuIconColor }};
 menuIconTagRename: icon{{ "menu/tag_rename", menuIconColor }};
 menuIconGroupsHide: icon {{ "menu/hide_members", menuIconColor }};
+menuIconFont: icon {{ "menu/fonts", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ae5a61f7a..27b753473 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ae5a61f7aeaa18eb4016d290c45be990c614a9a1
+Subproject commit 27b75347341838cffd1d5a84c66db7241d27d030

From 56bce705585e495840eb7d19de8636eda62049ba Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 Apr 2024 21:47:57 +0400
Subject: [PATCH 388/596] Fix "long time ago" for users who blocked me.

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

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index f942cefe2..f44c14bac 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -747,8 +747,10 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 		result->setLoadedStatus(PeerData::LoadedStatus::Normal);
 	}
 
-	if (status && !minimal) {
-		const auto lastseen = LastseenFromMTP(*status, result->lastseen());
+	if (!minimal) {
+		const auto lastseen = status
+			? LastseenFromMTP(*status, result->lastseen())
+			: Data::LastseenStatus::LongAgo(false);
 		if (result->updateLastseen(lastseen)) {
 			flags |= UpdateFlag::OnlineStatus;
 		}

From 331e8c3ec6ee1ff8d0b838286ab0b0bcda27d39c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 Apr 2024 22:41:39 +0400
Subject: [PATCH 389/596] Beta version 4.16.9.

- Show "Frequent contacts" when you focus the search field.
- Show "Recent chats" when you focus the search field.
- Show "Channels" and channel recommendations.
- Allow changing font in Settings > Chat settings > Font family.
---
 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 +++---
 .../SourceFiles/dialogs/ui/dialogs_suggestions.cpp     |  1 -
 .../history/view/media/history_view_web_page.cpp       |  2 --
 Telegram/SourceFiles/ui/boxes/choose_font_box.cpp      |  8 --------
 Telegram/build/version                                 | 10 +++++-----
 changelog.txt                                          |  7 +++++++
 9 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 734a63bc4..068e2c2bf 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.8.0" />
+    Version="4.16.9.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 0ba1f8021..8536098db 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 4,16,8,0
- PRODUCTVERSION 4,16,8,0
+ FILEVERSION 4,16,9,0
+ PRODUCTVERSION 4,16,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", "4.16.8.0"
+            VALUE "FileVersion", "4.16.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.8.0"
+            VALUE "ProductVersion", "4.16.9.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index fa13de062..8ae0832aa 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 4,16,8,0
- PRODUCTVERSION 4,16,8,0
+ FILEVERSION 4,16,9,0
+ PRODUCTVERSION 4,16,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", "4.16.8.0"
+            VALUE "FileVersion", "4.16.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.8.0"
+            VALUE "ProductVersion", "4.16.9.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index b27f5c045..97924b37d 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 = 4016008;
-constexpr auto AppVersionStr = "4.16.8";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 4016009;
+constexpr auto AppVersionStr = "4.16.9";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 096273a75..59194a368 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -1225,7 +1225,6 @@ void Suggestions::paintEvent(QPaintEvent *e) {
 		const auto slide = st::topPeers.height + st::searchedBarHeight;
 		const auto right = (_tab.current() == Tab::Channels);
 		const auto progress = _slideAnimation.value(right ? 1. : 0.);
-		const auto shift = st::topPeers.height + st::searchedBarHeight;
 		p.setOpacity(1. - progress);
 		p.drawPixmap(
 			anim::interpolate(0, -slide, progress),
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 c75824a56..2994ce4a5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -780,8 +780,6 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 				const auto offsetY = (single - size.height()) / 2.;
 				const auto x = j * single + offsetX;
 				const auto y = i * single + offsetY;
-				const auto w = size.width();
-				const auto h = size.height();
 				view->draw(p, context, QRect(QPoint(x, y) + topLeft, size));
 			}
 		}
diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index 6fe238a1c..9ef7e24e0 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -129,7 +129,6 @@ private:
 	[[nodiscard]] bool searching() const;
 	[[nodiscard]] int shownRowsCount() const;
 	[[nodiscard]] Entry &shownRowAt(int index);
-	[[nodiscard]] const Entry &shownRowAt(int index) const;
 
 	void applyFilter(const QString &query);
 	void updateSelected(int selected);
@@ -179,8 +178,6 @@ Selector::Selector(
 , _scrollTo(std::move(scrollTo))
 , _rowsSkip(st::settingsInfoPhotoSkip)
 , _rowHeight(_st.height + _st.padding.top() + _st.padding.bottom()) {
-	Expects(_chosen >= 0 && _chosen < _rows.size());
-
 	setMouseTracking(true);
 
 	std::move(filter) | rpl::start_with_next([=](const QString &query) {
@@ -344,10 +341,6 @@ Selector::Entry &Selector::shownRowAt(int index) {
 	return searching() ? *_filtered[index] : _rows[index];
 }
 
-const Selector::Entry &Selector::shownRowAt(int index) const {
-	return const_cast<Selector*>(this)->shownRowAt(index);
-}
-
 void Selector::setMinHeight(int height) {
 	_minHeight = height;
 	if (_minHeight > 0) {
@@ -797,7 +790,6 @@ void PreviewPainter::layout() {
 	_bubble = _content.marginsAdded(msgPadding);
 	_content.moveTopLeft(-_bubble.topLeft());
 	_bubble.moveTopLeft({});
-	const auto bubbleShadow = st::msgShadow;
 
 	_outer = QSize(st::boxWidth, st::boxWidth / 2);
 
diff --git a/Telegram/build/version b/Telegram/build/version
index 2b788edea..a2ce256db 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016008
+AppVersion         4016009
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.8
-AppVersionStr      4.16.8
-BetaChannel        0
+AppVersionStrSmall 4.16.9
+AppVersionStr      4.16.9
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 4.16.8
+AppVersionOriginal 4.16.9.beta
diff --git a/changelog.txt b/changelog.txt
index d6905d010..eb2b59480 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+4.16.9 beta (23.04.24)
+
+- Show "Frequent contacts" when you focus the search field.
+- Show "Recent chats" when you focus the search field.
+- Show "Channels" and channel recommendations.
+- Allow changing font in Settings > Chat settings > Font family.
+
 4.16.8 (16.04.24)
 
 - Fix in-app playing of some video and audio files.

From 493f1d69e214ed1cc559181ac10e1a71ce3185de Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 14:59:40 +0400
Subject: [PATCH 390/596] Fix cancel search button overlap.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 349ed93d1..348c313d9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2575,9 +2575,9 @@ void Widget::listScrollUpdated() {
 }
 
 void Widget::updateCancelSearch() {
-	const auto shown = _searchHasFocus
-		|| _searchSuggestionsLocked
-		|| !_search->getLastText().isEmpty();
+	const auto shown = !_search->getLastText().isEmpty()
+		|| (!_searchInChat
+			&& (_searchHasFocus || _searchSuggestionsLocked));
 	_cancelSearch->toggle(shown, anim::type::normal);
 }
 
@@ -2970,12 +2970,14 @@ void Widget::updateLockUnlockVisibility(anim::type animated) {
 		return;
 	}
 	const auto hidden = !session().domain().local().hasLocalPasscode()
-		|| (_showAnimation != nullptr)
+		|| _showAnimation
 		|| _openedForum
 		|| !_widthAnimationCache.isNull()
 		|| _childList
-		|| !_search->getLastText().isEmpty()
-		|| _searchInChat;
+		|| _searchHasFocus
+		|| _searchSuggestionsLocked
+		|| _searchInChat
+		|| !_search->getLastText().isEmpty();
 	if (_lockUnlock->toggled() == hidden) {
 		const auto stories = _stories && !_stories->empty();
 		_lockUnlock->toggle(

From f675a8dcf79975b4a1143792cc5f481930917743 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 15:34:07 +0400
Subject: [PATCH 391/596] Attempt to fix a couple of crashes.

---
 Telegram/SourceFiles/core/application.cpp     | 16 +++++-----
 .../SourceFiles/history/history_widget.cpp    |  4 +--
 Telegram/SourceFiles/iv/iv_instance.cpp       | 32 ++++++++-----------
 Telegram/SourceFiles/main/main_session.cpp    | 22 +++++++++++--
 Telegram/SourceFiles/main/main_session.h      |  3 +-
 .../stories/media_stories_controller.cpp      | 16 ++++------
 6 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 6c25de60b..fadb5c49d 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -1527,14 +1527,14 @@ void Application::closeChatFromWindows(not_null<PeerData*> peer) {
 		}
 	}
 	if (const auto window = windowFor(&peer->account())) {
-		const auto primary = window->sessionController();
-		if ((primary->activeChatCurrent().peer() == peer)
-			&& (&primary->session() == &peer->session())) {
-			primary->clearSectionStack();
-		}
-		if (const auto forum = primary->shownForum().current()) {
-			if (peer->forum() == forum) {
-				primary->closeForum();
+		if (const auto primary = window->sessionController()) {
+			if (primary->activeChatCurrent().peer() == peer) {
+				primary->clearSectionStack();
+			}
+			if (const auto forum = primary->shownForum().current()) {
+				if (peer->forum() == forum) {
+					primary->closeForum();
+				}
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 418e38e60..205461cd1 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -810,7 +810,7 @@ HistoryWidget::HistoryWidget(
 				const auto account = &_peer->account();
 				closeCurrent();
 				if (const auto primary = Core::App().windowFor(account)) {
-					controller->showToast(unavailable);
+					primary->showToast(unavailable);
 				}
 				return;
 			}
@@ -3316,7 +3316,7 @@ void HistoryWidget::messagesFailed(const MTP::Error &error, int requestId) {
 		auto was = _peer;
 		closeCurrent();
 		if (const auto primary = Core::App().windowFor(&was->account())) {
-			controller()->showToast((was && was->isMegagroup())
+			primary->showToast((was && was->isMegagroup())
 				? tr::lng_group_not_accessible(tr::now)
 				: tr::lng_channel_not_accessible(tr::now));
 		}
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 5b8fead1a..9af2cd3d0 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -980,20 +980,16 @@ void Instance::processOpenChannel(const QString &context) {
 	} else if (const auto channelId = ChannelId(context.toLongLong())) {
 		const auto channel = _shownSession->data().channel(channelId);
 		if (channel->isLoaded()) {
-			if (const auto window = Core::App().windowFor(channel)) {
-				if (const auto controller = window->sessionController()) {
-					controller->showPeerHistory(channel);
-					_shown = nullptr;
-				}
+			if (const auto controller = _shownSession->tryResolveWindow(channel)) {
+				controller->showPeerHistory(channel);
+				_shown = nullptr;
 			}
 		} else if (!channel->username().isEmpty()) {
-			if (const auto window = Core::App().windowFor(channel)) {
-				if (const auto controller = window->sessionController()) {
-					controller->showPeerByLink({
-						.usernameOrId = channel->username(),
-					});
-					_shown = nullptr;
-				}
+			if (const auto controller = _shownSession->tryResolveWindow(channel)) {
+				controller->showPeerByLink({
+					.usernameOrId = channel->username(),
+				});
+				_shown = nullptr;
 			}
 		}
 	}
@@ -1008,13 +1004,11 @@ void Instance::processJoinChannel(const QString &context) {
 		if (channel->isLoaded()) {
 			_shownSession->api().joinChannel(channel);
 		} else if (!channel->username().isEmpty()) {
-			if (const auto window = Core::App().windowFor(channel)) {
-				if (const auto controller = window->sessionController()) {
-					controller->showPeerByLink({
-						.usernameOrId = channel->username(),
-						.joinChannel = true,
-					});
-				}
+			if (const auto controller = _shownSession->tryResolveWindow(channel)) {
+				controller->showPeerByLink({
+					.usernameOrId = channel->username(),
+					.joinChannel = true,
+				});
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index f6229af6b..1449d9497 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -434,6 +434,10 @@ void Session::uploadsStopWithConfirmation(Fn<void()> done) {
 	const auto window = message
 		? Core::App().windowFor(message->history()->peer)
 		: Core::App().activePrimaryWindow();
+	if (!window) {
+		done();
+		return;
+	}
 	auto box = Box([=](not_null<Ui::GenericBox*> box) {
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
@@ -476,8 +480,22 @@ auto Session::windows() const
 	return _windows;
 }
 
-Window::SessionController *Session::tryResolveWindow() const {
-	if (_windows.empty()) {
+Window::SessionController *Session::tryResolveWindow(
+		PeerData *forPeer) const {
+	if (forPeer) {
+		auto primary = (Window::SessionController*)nullptr;
+		for (const auto &window : _windows) {
+			if (window->singlePeer() == forPeer) {
+				return window;
+			} else if (window->isPrimary()) {
+				primary = window;
+			}
+		}
+		if (primary) {
+			return primary;
+		}
+	}
+	if (_windows.empty() || forPeer) {
 		domain().activate(_account);
 		if (_windows.empty()) {
 			return nullptr;
diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h
index 717df1751..daab53632 100644
--- a/Telegram/SourceFiles/main/main_session.h
+++ b/Telegram/SourceFiles/main/main_session.h
@@ -164,7 +164,8 @@ public:
 	void addWindow(not_null<Window::SessionController*> controller);
 	[[nodiscard]] auto windows() const
 		-> const base::flat_set<not_null<Window::SessionController*>> &;
-	[[nodiscard]] Window::SessionController *tryResolveWindow() const;
+	[[nodiscard]] Window::SessionController *tryResolveWindow(
+		PeerData *forPeer = nullptr) const;
 
 	// Shortcuts.
 	void notifyDownloaderTaskFinished();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 233823488..39b3f45ff 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1891,16 +1891,12 @@ ClickHandlerPtr MakeChannelPostHandler(
 		FullMsgId item) {
 	return std::make_shared<LambdaClickHandler>(crl::guard(session, [=] {
 		const auto peer = session->data().peer(item.peer);
-		if (const auto window = Core::App().windowFor(peer)) {
-			if (const auto controller = window->sessionController()) {
-				if (&controller->session() == &peer->session()) {
-					Core::App().hideMediaView();
-					controller->showPeerHistory(
-						item.peer,
-						Window::SectionShow::Way::ClearStack,
-						item.msg);
-				}
-			}
+		if (const auto controller = session->tryResolveWindow(peer)) {
+			Core::App().hideMediaView();
+			controller->showPeerHistory(
+				peer,
+				Window::SectionShow::Way::ClearStack,
+				item.msg);
 		}
 	}));
 }

From 83531801618e612a42f7b86d085c8f9c9be485f7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 15:56:41 +0400
Subject: [PATCH 392/596] Fix phrase cut-off in QR login.

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

diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style
index c3b078706..ed5c3b225 100644
--- a/Telegram/SourceFiles/intro/intro.style
+++ b/Telegram/SourceFiles/intro/intro.style
@@ -185,7 +185,7 @@ introQrTitle: FlatLabel(defaultFlatLabel) {
 introQrErrorTop: 336px;
 introQrTitleTop: 196px;
 introQrStep: FlatLabel(defaultFlatLabel) {
-	minWidth: introQrLabelsWidth;
+	minWidth: 200px;
 }
 introQrStepsTop: 232px;
 introQrStepMargins: margins(20px, 8px, 0px, 0px);

From 17b7db6219eacf0e52dc35bd0aa8bdb318e256cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 15:58:02 +0400
Subject: [PATCH 393/596] Request 64 frequent contacts instead of 32.

---
 Telegram/SourceFiles/data/components/top_peers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
index 318a739b5..f476869b6 100644
--- a/Telegram/SourceFiles/data/components/top_peers.cpp
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Data {
 namespace {
 
-constexpr auto kLimit = 32;
+constexpr auto kLimit = 64;
 constexpr auto kRequestTimeLimit = 10 * crl::time(1000);
 
 [[nodiscard]] float64 RatingDelta(TimeId now, TimeId was, int decay) {

From 3da51b1bc9bc4fab2ed28942a9e7a990f36b9b0e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 16:35:05 +0400
Subject: [PATCH 394/596] Fix crash on quit in sponsored messages.

---
 .../data/components/sponsored_messages.cpp          | 13 ++++++++++++-
 .../data/components/sponsored_messages.h            |  4 ++--
 Telegram/SourceFiles/data/data_session.cpp          |  2 ++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index e60c0a1d3..4cb54fc7e 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -37,9 +37,20 @@ SponsoredMessages::SponsoredMessages(not_null<Main::Session*> session)
 }
 
 SponsoredMessages::~SponsoredMessages() {
-	for (const auto &request : _requests) {
+	Expects(_data.empty());
+	Expects(_requests.empty());
+	Expects(_viewRequests.empty());
+}
+
+void SponsoredMessages::clear() {
+	_lifetime.destroy();
+	for (const auto &request : base::take(_requests)) {
 		_session->api().request(request.second.requestId).cancel();
 	}
+	for (const auto &request : base::take(_viewRequests)) {
+		_session->api().request(request.second.requestId).cancel();
+	}
+	base::take(_data);
 }
 
 void SponsoredMessages::clearOldRequests() {
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.h b/Telegram/SourceFiles/data/components/sponsored_messages.h
index 179dabf30..ca7edbdfe 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.h
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.h
@@ -80,8 +80,6 @@ public:
 	};
 	using RandomId = QByteArray;
 	explicit SponsoredMessages(not_null<Main::Session*> session);
-	SponsoredMessages(const SponsoredMessages &other) = delete;
-	SponsoredMessages &operator=(const SponsoredMessages &other) = delete;
 	~SponsoredMessages();
 
 	[[nodiscard]] bool canHaveFor(not_null<History*> history) const;
@@ -104,6 +102,8 @@ public:
 	[[nodiscard]] auto createReportCallback(const FullMsgId &fullId)
 	-> Fn<void(SponsoredReportResult::Id, Fn<void(SponsoredReportResult)>)>;
 
+	void clear();
+
 private:
 	using OwnedItem = std::unique_ptr<HistoryItem, HistoryItem::Destroyer>;
 	struct Entry {
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index f44c14bac..23f121443 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -41,6 +41,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/business/data_business_info.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/scheduled_messages.h"
+#include "data/components/sponsored_messages.h"
 #include "data/stickers/data_stickers.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_bot_app.h"
@@ -396,6 +397,7 @@ void Session::clear() {
 	_histories->unloadAll();
 	_shortcutMessages = nullptr;
 	_session->scheduledMessages().clear();
+	_session->sponsoredMessages().clear();
 	_dependentMessages.clear();
 	base::take(_messages);
 	base::take(_nonChannelMessages);

From e6d72b4861007a8024767c67530d7a7d1e827dbe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 16:54:10 +0400
Subject: [PATCH 395/596] Un-focus chats search on empty history click.

---
 Telegram/SourceFiles/history/history_widget.cpp | 8 ++++++++
 Telegram/SourceFiles/mainwidget.cpp             | 4 +---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 205461cd1..427d7dc37 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -6552,6 +6552,14 @@ bool HistoryWidget::cornerButtonsHas(HistoryView::CornerButtonType type) {
 }
 
 void HistoryWidget::mousePressEvent(QMouseEvent *e) {
+	if (!_list) {
+		// Remove focus from the chats list search.
+		setFocus();
+
+		// Set it back to the chats list so that typing filter chats.
+		controller()->widget()->setInnerFocus();
+		return;
+	}
 	const auto isReadyToForward = readyToForward();
 	if (_inPhotoEdit && _photoEditMedia) {
 		EditCaptionBox::StartPhotoEdit(
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 23d3bca8d..4a598931c 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1180,10 +1180,8 @@ void MainWidget::setInnerFocus() {
 		}
 	} else if (_mainSection) {
 		_mainSection->setInnerFocus();
-	} else if (_history->peer() || !_thirdSection) {
-		_history->setInnerFocus();
 	} else {
-		_thirdSection->setInnerFocus();
+		_history->setInnerFocus();
 	}
 }
 

From 72d5a9b3e00e8f76fabbfb3e130efe371d2d5aaa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 16:56:20 +0400
Subject: [PATCH 396/596] Toggle search focus by escape.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 348c313d9..b50511dbd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1788,6 +1788,8 @@ void Widget::escape() {
 			const auto first = list.empty() ? FilterId() : list.front().id();
 			if (controller()->activeChatsFilterCurrent() != first) {
 				controller()->setActiveChatsFilter(first);
+			} else {
+				_search->setFocus();
 			}
 		}
 	} else if (!_searchInChat

From d5a347ede72a868987cc65713ce7e454c786b083 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 17:41:12 +0400
Subject: [PATCH 397/596] Try cancelling the new search by mouse back button.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 7 +++++++
 Telegram/SourceFiles/dialogs/dialogs_widget.h   | 1 +
 Telegram/SourceFiles/mainwidget.cpp             | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index b50511dbd..856019d0f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1107,6 +1107,13 @@ void Widget::updateHasFocus(not_null<QWidget*> focused) {
 	}
 }
 
+bool Widget::cancelSearchByMouseBack() {
+	return _searchHasFocus
+		&& !_searchSuggestionsLocked
+		&& !_searchInChat
+		&& cancelSearch();
+}
+
 void Widget::processSearchFocusChange() {
 	_searchSuggestionsLocked = _suggestions && _suggestions->persist();
 	updateCancelSearch();
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 1c6179d03..7218c2513 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -133,6 +133,7 @@ public:
 	QRect floatPlayerAvailableRect() override;
 
 	bool cancelSearch();
+	bool cancelSearchByMouseBack();
 
 	~Widget();
 
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 4a598931c..6e6fbf8d3 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -2649,7 +2649,8 @@ bool MainWidget::eventFilter(QObject *o, QEvent *e) {
 		if (widget && (widget->window() == window())) {
 			const auto event = static_cast<QMouseEvent*>(e);
 			if (event->button() == Qt::BackButton) {
-				if (!Core::App().hideMediaView()) {
+				if (!Core::App().hideMediaView()
+					&& (!_dialogs || !_dialogs->cancelSearchByMouseBack())) {
 					handleHistoryBack();
 				}
 				return true;

From b46ca1ec17f81d1ad4d4a392109e8b3c63808097 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 17:44:40 +0400
Subject: [PATCH 398/596] Use different font fallback algo on Windows.

---
 Telegram/build/prepare/prepare.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 046f5b47a..ce00e278e 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout ab24db42b9
+    git checkout 5d64e21844
 """)
 
 stage('msys64', """

From ef614150d5ed6a4a05a422d034febd0088014434 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 17:44:51 +0400
Subject: [PATCH 399/596] Remove dead code in lib_ui.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 27b753473..17cc6f378 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 27b75347341838cffd1d5a84c66db7241d27d030
+Subproject commit 17cc6f3783788624b0cb6776664b398ce1177df1

From c16d820b88ec63ce35c193ad32cfe728918d9d08 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 19:12:46 +0400
Subject: [PATCH 400/596] Move OpenSSL probing before crash reporter.

---
 Telegram/SourceFiles/core/application.cpp              | 4 ----
 Telegram/SourceFiles/core/launcher.cpp                 | 2 ++
 Telegram/SourceFiles/core/utils.cpp                    | 2 --
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 3 ---
 Telegram/SourceFiles/platform/mac/specific_mac.h       | 3 ---
 Telegram/SourceFiles/platform/win/specific_win.h       | 3 ---
 6 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index fadb5c49d..0e67e7179 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -243,14 +243,10 @@ Application::~Application() {
 	Media::Player::finish(_audio.get());
 	style::stopManager();
 
-	ThirdParty::finish();
-
 	Instance = nullptr;
 }
 
 void Application::run() {
-	ThirdParty::start();
-
 	// Depends on OpenSSL on macOS, so on ThirdParty::start().
 	// Depends on notifications settings.
 	_notifications = std::make_unique<Window::Notifications::System>();
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index 2765fe3ed..0b6afb7aa 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -385,6 +385,7 @@ int Launcher::exec() {
 
 	// Must be started before Sandbox is created.
 	Platform::start();
+	ThirdParty::start();
 	auto result = executeApplication();
 
 	DEBUG_LOG(("Telegram finished, result: %1").arg(result));
@@ -400,6 +401,7 @@ int Launcher::exec() {
 	}
 
 	CrashReports::Finish();
+	ThirdParty::finish();
 	Platform::finish();
 	Logs::finish();
 
diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp
index c82c7ed65..c4d0b76fa 100644
--- a/Telegram/SourceFiles/core/utils.cpp
+++ b/Telegram/SourceFiles/core/utils.cpp
@@ -92,8 +92,6 @@ namespace ThirdParty {
 		FIPS_mode_set(0);
 #endif
 		CONF_modules_unload(1);
-
-		Platform::ThirdParty::finish();
 	}
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 48c189ca2..c874ae71d 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -755,9 +755,6 @@ namespace ThirdParty {
 void start() {
 }
 
-void finish() {
-}
-
 } // namespace ThirdParty
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index 187ceb7b1..013a59370 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -53,9 +53,6 @@ namespace ThirdParty {
 inline void start() {
 }
 
-inline void finish() {
-}
-
 } // namespace ThirdParty
 } // namespace Platform
 
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index 56f73a1b4..cea6ec176 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -55,9 +55,6 @@ namespace ThirdParty {
 
 void start();
 
-inline void finish() {
-}
-
 } // namespace ThirdParty
 } // namespace Platform
 

From a84ca0027012035e13f090f22b315ce674e954d4 Mon Sep 17 00:00:00 2001
From: Kolya <142352140+agl-1984@users.noreply.github.com>
Date: Sat, 13 Apr 2024 12:45:30 +0200
Subject: [PATCH 401/596] fix typo

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

diff --git a/Telegram/SourceFiles/lang/lang_instance.cpp b/Telegram/SourceFiles/lang/lang_instance.cpp
index e2d26b635..eadb2659d 100644
--- a/Telegram/SourceFiles/lang/lang_instance.cpp
+++ b/Telegram/SourceFiles/lang/lang_instance.cpp
@@ -101,7 +101,7 @@ bool ValueParser::readTag() {
 	auto isTagChar = [](QChar ch) {
 		if (ch >= 'a' && ch <= 'z') {
 			return true;
-		} else if (ch >= 'A' && ch <= 'z') {
+		} else if (ch >= 'A' && ch <= 'Z') {
 			return true;
 		} else if (ch >= '0' && ch <= '9') {
 			return true;

From ae4a73a15b286c396eed0a405de642ffc2b06a52 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 Apr 2024 22:20:22 +0400
Subject: [PATCH 402/596] Rollback OpenSans to 1.10.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 17cc6f378..69e474ea7 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 17cc6f3783788624b0cb6776664b398ce1177df1
+Subproject commit 69e474ea775f115afb3e4afeb80d3227325dfcc4

From e2f17f1131b3d2dbe3ab3b700edb08b098d0377c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 25 Apr 2024 11:21:09 +0400
Subject: [PATCH 403/596] Remove unneeded includes from
 notifications_manager_linux

---
 .../SourceFiles/platform/linux/notifications_manager_linux.cpp  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 747e4c2fa..21f09c116 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -17,12 +17,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum_topic.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "ui/empty_userpic.h"
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
 #include "base/weak_ptr.h"
 #include "window/notifications_utilities.h"
-#include "styles/style_window.h"
 
 #include <QtCore/QBuffer>
 #include <QtCore/QVersionNumber>

From b1e64419a5a0e52c8beb23e7a5685f7589394dc9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 25 Apr 2024 11:21:58 +0400
Subject: [PATCH 404/596] Fix setting application icon in Linux notifications

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

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 21f09c116..6bde1d993 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -436,9 +436,9 @@ void NotificationData::show() {
 	const auto weak = base::make_weak(this);
 	StartServiceAsync(_proxy.get_connection(), crl::guard(weak, [=] {
 		const auto iconName = _imageKey.empty()
-			|| _hints.lookup_value(_imageKey)
-				? std::string()
-				: base::IconName().toStdString();
+			|| !_hints.lookup_value(_imageKey)
+				? base::IconName().toStdString()
+				: std::string();
 
 		auto actions = _actions
 			| ranges::views::transform(&std::string::c_str)

From 471831bcd6559937a30a5b4a81d3299b98083006 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 24 Apr 2024 19:57:17 +0400
Subject: [PATCH 405/596] Revert "Remove not really needed notification
 capability checks"

This reverts commit abdfa4f785ca0094a1db3959deb3d922ffd3d1d5.
---
 .../linux/notifications_manager_linux.cpp     | 112 ++++++++++--------
 1 file changed, 62 insertions(+), 50 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 6bde1d993..f80d88c77 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -300,21 +300,25 @@ bool NotificationData::init(
 		_body = msg.toStdString();
 	}
 
-	_actions.push_back("default");
-	_actions.push_back(tr::lng_open_link(tr::now).toStdString());
+	if (HasCapability("actions")) {
+		_actions.push_back("default");
+		_actions.push_back(tr::lng_open_link(tr::now).toStdString());
 
-	if (!options.hideMarkAsRead) {
-		// icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
-		_actions.push_back("mail-mark-read");
-		_actions.push_back(tr::lng_context_mark_read(tr::now).toStdString());
-	}
+		if (!options.hideMarkAsRead) {
+			// icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
+			_actions.push_back("mail-mark-read");
+			_actions.push_back(
+				tr::lng_context_mark_read(tr::now).toStdString());
+		}
 
-	if (HasCapability("inline-reply") && !options.hideReplyButton) {
-		_actions.push_back("inline-reply");
-		_actions.push_back(tr::lng_notification_reply(tr::now).toStdString());
+		if (HasCapability("inline-reply")
+				&& !options.hideReplyButton) {
+			_actions.push_back("inline-reply");
+			_actions.push_back(
+				tr::lng_notification_reply(tr::now).toStdString());
 
-		_notificationRepliedSignalId
-			= _interface.signal_notification_replied().connect([=](
+			_notificationRepliedSignalId
+				= _interface.signal_notification_replied().connect([=](
 						XdgNotifications::Notifications,
 						uint id,
 						std::string text) {
@@ -326,51 +330,59 @@ bool NotificationData::init(
 						}
 					});
 				});
+		}
+
+		_actionInvokedSignalId = _interface.signal_action_invoked().connect(
+			[=](
+					XdgNotifications::Notifications,
+					uint id,
+					std::string actionName) {
+				Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+					if (id == _notificationId) {
+						if (actionName == "default") {
+							_manager->notificationActivated(_id);
+						} else if (actionName == "mail-mark-read") {
+							_manager->notificationReplied(_id, {});
+						}
+					}
+				});
+			});
+
+		_activationTokenSignalId
+			= _interface.signal_activation_token().connect([=](
+					XdgNotifications::Notifications,
+					uint id,
+					std::string token) {
+				if (id == _notificationId) {
+					GLib::setenv("XDG_ACTIVATION_TOKEN", token, true);
+				}
+			});
 	}
 
-	_actionInvokedSignalId = _interface.signal_action_invoked().connect([=](
-			XdgNotifications::Notifications,
-			uint id,
-			std::string actionName) {
-		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-			if (id == _notificationId) {
-				if (actionName == "default") {
-					_manager->notificationActivated(_id);
-				} else if (actionName == "mail-mark-read") {
-					_manager->notificationReplied(_id, {});
-				}
-			}
-		});
-	});
-
-	_activationTokenSignalId = _interface.signal_activation_token().connect(
-		[=](
-				XdgNotifications::Notifications,
-				uint id,
-				std::string token) {
-			if (id == _notificationId) {
-				GLib::setenv("XDG_ACTIVATION_TOKEN", token, true);
-			}
-		});
-
-	_hints.insert_value("action-icons", GLib::Variant::new_boolean(true));
+	if (HasCapability("action-icons")) {
+		_hints.insert_value("action-icons", GLib::Variant::new_boolean(true));
+	}
 
 	// suppress system sound if telegram sound activated,
 	// otherwise use system sound
-	if (Core::App().settings().soundNotify()) {
-		_hints.insert_value(
-			"suppress-sound",
-			GLib::Variant::new_boolean(true));
-	} else {
-		// sound name according to http://0pointer.de/public/sound-naming-spec.html
-		_hints.insert_value(
-			"sound-name",
-			GLib::Variant::new_string("message-new-instant"));
+	if (HasCapability("sound")) {
+		if (Core::App().settings().soundNotify()) {
+			_hints.insert_value(
+				"suppress-sound",
+				GLib::Variant::new_boolean(true));
+		} else {
+			// sound name according to http://0pointer.de/public/sound-naming-spec.html
+			_hints.insert_value(
+				"sound-name",
+				GLib::Variant::new_string("message-new-instant"));
+		}
 	}
 
-	_hints.insert_value(
-		"x-canonical-append",
-		GLib::Variant::new_string("true"));
+	if (HasCapability("x-canonical-append")) {
+		_hints.insert_value(
+			"x-canonical-append",
+			GLib::Variant::new_string("true"));
+	}
 
 	_hints.insert_value("category", GLib::Variant::new_string("im.received"));
 

From c6d034174b896364224e45869bb53e27277fbe29 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 25 Apr 2024 15:34:00 +0400
Subject: [PATCH 406/596] Support separate webview storages.

---
 .../inline_bots/bot_attach_web_view.cpp       |  2 +-
 Telegram/SourceFiles/intro/intro_step.cpp     |  1 +
 Telegram/SourceFiles/iv/iv_controller.cpp     | 14 +--
 Telegram/SourceFiles/iv/iv_controller.h       |  7 +-
 Telegram/SourceFiles/iv/iv_instance.cpp       |  6 +-
 .../payments/payments_checkout_process.cpp    |  8 +-
 .../payments/payments_checkout_process.h      |  5 +-
 .../payments/ui/payments_panel.cpp            |  2 +-
 .../payments/ui/payments_panel_delegate.h     |  3 +-
 .../SourceFiles/storage/storage_account.cpp   | 96 ++++++++++++++++++-
 .../SourceFiles/storage/storage_account.h     |  8 ++
 .../SourceFiles/storage/storage_domain.cpp    |  4 -
 Telegram/SourceFiles/storage/storage_domain.h |  2 -
 .../ui/chat/attach/attach_bot_webview.cpp     |  8 +-
 .../ui/chat/attach/attach_bot_webview.h       |  8 +-
 .../window/themes/window_theme.cpp            |  2 +-
 Telegram/lib_webview                          |  2 +-
 17 files changed, 138 insertions(+), 40 deletions(-)

diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 682afe3de..95e7630e4 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -1491,7 +1491,7 @@ void AttachWebView::show(
 	_catchingCancelInShowCall = true;
 	_panel = Ui::BotWebView::Show({
 		.url = url,
-		.userDataPath = _session->domain().local().webviewDataPath(),
+		.storageId = _session->local().resolveStorageIdBots(),
 		.title = std::move(title),
 		.bottom = rpl::single('@' + _bot->username()),
 		.delegate = static_cast<Ui::BotWebView::Delegate*>(this),
diff --git a/Telegram/SourceFiles/intro/intro_step.cpp b/Telegram/SourceFiles/intro/intro_step.cpp
index 9c408f412..c3181bd7c 100644
--- a/Telegram/SourceFiles/intro/intro_step.cpp
+++ b/Telegram/SourceFiles/intro/intro_step.cpp
@@ -224,6 +224,7 @@ void Step::createSession(
 	account->createSession(user, std::move(settings));
 
 	// "this" is already deleted here by creating the main widget.
+	account->local().enforceModernStorageIdBots();
 	account->local().writeMtpData();
 	auto &session = account->session();
 	session.data().chatsFilters().setPreloaded(filters);
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index c62debebf..a2a701d84 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -292,12 +292,12 @@ void Controller::initControls() {
 }
 
 void Controller::show(
-		const QString &dataPath,
+		const Webview::StorageId &storageId,
 		Prepared page,
 		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues) {
 	page.script = fillInChannelValuesScript(std::move(inChannelValues));
 	InvokeQueued(_container, [=, page = std::move(page)]() mutable {
-		showInWindow(dataPath, std::move(page));
+		showInWindow(storageId, std::move(page));
 	});
 }
 
@@ -389,7 +389,7 @@ void Controller::createWindow() {
 	window->show();
 }
 
-void Controller::createWebview(const QString &dataPath) {
+void Controller::createWebview(const Webview::StorageId &storageId) {
 	Expects(!_webview);
 
 	const auto window = _window.get();
@@ -397,7 +397,7 @@ void Controller::createWebview(const QString &dataPath) {
 		_container,
 		Webview::WindowConfig{
 			.opaqueBg = st::windowBg->c,
-			.userDataPath = dataPath,
+			.storageId = storageId,
 		});
 	const auto raw = _webview.get();
 
@@ -558,7 +558,9 @@ void Controller::createWebview(const QString &dataPath) {
 	raw->init(R"()");
 }
 
-void Controller::showInWindow(const QString &dataPath, Prepared page) {
+void Controller::showInWindow(
+		const Webview::StorageId &storageId,
+		Prepared page) {
 	Expects(_container != nullptr);
 
 	const auto url = page.url;
@@ -571,7 +573,7 @@ void Controller::showInWindow(const QString &dataPath, Prepared page) {
 	const auto index = i->second;
 	_index = index;
 	if (!_webview) {
-		createWebview(dataPath);
+		createWebview(storageId);
 		if (_webview && _webview->widget()) {
 			auto id = u"iv/page%1.html"_q.arg(index);
 			if (!_hash.isEmpty()) {
diff --git a/Telegram/SourceFiles/iv/iv_controller.h b/Telegram/SourceFiles/iv/iv_controller.h
index 85132b12b..d3363d67e 100644
--- a/Telegram/SourceFiles/iv/iv_controller.h
+++ b/Telegram/SourceFiles/iv/iv_controller.h
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "iv/iv_delegate.h"
 #include "ui/effects/animations.h"
 #include "ui/text/text.h"
+#include "webview/webview_common.h"
 
 class Painter;
 
@@ -69,7 +70,7 @@ public:
 	};
 
 	void show(
-		const QString &dataPath,
+		const Webview::StorageId &storageId,
 		Prepared page,
 		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues);
 	void update(Prepared page);
@@ -90,11 +91,11 @@ public:
 
 private:
 	void createWindow();
-	void createWebview(const QString &dataPath);
+	void createWebview(const Webview::StorageId &storageId);
 	[[nodiscard]] QByteArray navigateScript(int index, const QString &hash);
 	[[nodiscard]] QByteArray reloadScript(int index);
 
-	void showInWindow(const QString &dataPath, Prepared page);
+	void showInWindow(const Webview::StorageId &storageId, Prepared page);
 	[[nodiscard]] QByteArray fillInChannelValuesScript(
 		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues);
 	[[nodiscard]] QByteArray toggleInChannelScript(
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 9af2cd3d0..49ae8c144 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -31,13 +31,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "lottie/lottie_common.h" // Lottie::ReadContent.
 #include "main/main_account.h"
-#include "main/main_domain.h"
 #include "main/main_session.h"
 #include "main/session/session_show.h"
 #include "media/streaming/media_streaming_loader.h"
 #include "media/view/media_view_open_common.h"
 #include "storage/file_download.h"
-#include "storage/storage_domain.h"
+#include "storage/storage_account.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/layers/layer_widget.h"
 #include "ui/text/text_utilities.h"
@@ -348,9 +347,8 @@ void Shown::showWindowed(Prepared result) {
 		createController();
 	}
 
-	const auto domain = &_session->domain();
 	_controller->show(
-		domain->local().webviewDataPath(),
+		_session->local().resolveStorageIdOther(),
 		std::move(result),
 		base::duplicate(_inChannelValues));
 }
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index ad7299664..e9fb12d26 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -11,8 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "payments/ui/payments_panel.h"
 #include "main/main_session.h"
 #include "main/main_account.h"
-#include "main/main_domain.h"
-#include "storage/storage_domain.h"
+#include "storage/storage_account.h"
 #include "history/history_item.h"
 #include "history/history.h"
 #include "data/data_user.h" // UserData::isBot.
@@ -25,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "api/api_cloud_password.h"
 #include "window/themes/window_theme.h"
-#include "webview/webview_interface.h"
 
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -877,8 +875,8 @@ void CheckoutProcess::performInitialSilentValidation() {
 	_form->validateInformation(saved);
 }
 
-QString CheckoutProcess::panelWebviewDataPath() {
-	return _session->domain().local().webviewDataPath();
+Webview::StorageId CheckoutProcess::panelWebviewStorageId() {
+	return _session->local().resolveStorageIdOther();
 }
 
 Webview::ThemeParams CheckoutProcess::panelWebviewThemeParams() {
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.h b/Telegram/SourceFiles/payments/payments_checkout_process.h
index 84c0624cc..dd995324f 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.h
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.h
@@ -7,8 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "payments/ui/payments_panel_delegate.h"
 #include "base/weak_ptr.h"
+#include "payments/ui/payments_panel_delegate.h"
+#include "webview/webview_common.h"
 
 class HistoryItem;
 class PasscodeBox;
@@ -153,7 +154,7 @@ private:
 	void panelShowBox(object_ptr<Ui::BoxContent> box) override;
 	QVariant panelClickHandlerContext() override;
 
-	QString panelWebviewDataPath() override;
+	Webview::StorageId panelWebviewStorageId() override;
 	Webview::ThemeParams panelWebviewThemeParams() override;
 
 	std::optional<QDate> panelOverrideExpireDateThreshold() override;
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index a672f81fc..f509fdb70 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -547,7 +547,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 		container,
 		Webview::WindowConfig{
 			.opaqueBg = params.opaqueBg,
-			.userDataPath = _delegate->panelWebviewDataPath(),
+			.storageId = _delegate->panelWebviewStorageId(),
 		});
 
 	const auto raw = &_webview->window;
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel_delegate.h b/Telegram/SourceFiles/payments/ui/payments_panel_delegate.h
index b3113d558..fd73fd144 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel_delegate.h
+++ b/Telegram/SourceFiles/payments/ui/payments_panel_delegate.h
@@ -18,6 +18,7 @@ class BoxContent;
 
 namespace Webview {
 struct ThemeParams;
+struct StorageId;
 } // namespace Webview
 
 namespace Payments::Ui {
@@ -59,7 +60,7 @@ public:
 	virtual void panelShowBox(object_ptr<BoxContent> box) = 0;
 	virtual QVariant panelClickHandlerContext() = 0;
 
-	virtual QString panelWebviewDataPath() = 0;
+	virtual Webview::StorageId panelWebviewStorageId() = 0;
 	virtual Webview::ThemeParams panelWebviewThemeParams() = 0;
 
 	virtual std::optional<QDate> panelOverrideExpireDateThreshold() = 0;
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index 22484f65b..83d8e52f4 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/serialize_peer.h"
 #include "storage/serialize_document.h"
 #include "main/main_account.h"
+#include "main/main_domain.h"
 #include "main/main_session.h"
 #include "mtproto/mtproto_config.h"
 #include "mtproto/mtproto_dc_options.h"
@@ -35,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_drafts.h"
 #include "export/export_settings.h"
+#include "webview/webview_interface.h"
 #include "window/themes/window_theme.h"
 
 namespace Storage {
@@ -91,6 +93,7 @@ enum { // Local Storage Keys
 	lskMasksKeys = 0x16, // no data
 	lskCustomEmojiKeys = 0x17, // no data
 	lskSearchSuggestions = 0x18, // no data
+	lskWebviewTokens = 0x19, // data: QByteArray bots, QByteArray other
 };
 
 auto EmptyMessageDraftSources()
@@ -303,6 +306,7 @@ Account::ReadMapResult Account::readMapWith(
 	quint64 legacyBackgroundKeyDay = 0, legacyBackgroundKeyNight = 0;
 	quint64 userSettingsKey = 0, recentHashtagsAndBotsKey = 0, exportSettingsKey = 0;
 	quint64 searchSuggestionsKey = 0;
+	QByteArray webviewStorageTokenBots, webviewStorageTokenOther;
 	while (!map.stream.atEnd()) {
 		quint32 keyType;
 		map.stream >> keyType;
@@ -411,6 +415,11 @@ Account::ReadMapResult Account::readMapWith(
 		case lskSearchSuggestions: {
 			map.stream >> searchSuggestionsKey;
 		} break;
+		case lskWebviewTokens: {
+			map.stream
+				>> webviewStorageTokenBots
+				>> webviewStorageTokenOther;
+		} break;
 		default:
 			LOG(("App Error: unknown key type in encrypted map: %1").arg(keyType));
 			return ReadMapResult::Failed;
@@ -448,6 +457,8 @@ Account::ReadMapResult Account::readMapWith(
 	_exportSettingsKey = exportSettingsKey;
 	_searchSuggestionsKey = searchSuggestionsKey;
 	_oldMapVersion = mapData.version;
+	_webviewStorageIdBots.token = webviewStorageTokenBots;
+	_webviewStorageIdOther.token = webviewStorageTokenOther;
 
 	if (_oldMapVersion < AppVersion) {
 		writeMapDelayed();
@@ -553,6 +564,12 @@ void Account::writeMap() {
 		mapSize += sizeof(quint32) + 3 * sizeof(quint64);
 	}
 	if (_searchSuggestionsKey) mapSize += sizeof(quint32) + sizeof(quint64);
+	if (!_webviewStorageIdBots.token.isEmpty()
+		|| !_webviewStorageIdOther.token.isEmpty()) {
+		mapSize += sizeof(quint32)
+			+ Serialize::bytearraySize(_webviewStorageIdBots.token)
+			+ Serialize::bytearraySize(_webviewStorageIdOther.token);
+	}
 
 	EncryptedDescriptor mapData(mapSize);
 	if (!self.isEmpty()) {
@@ -616,6 +633,13 @@ void Account::writeMap() {
 		mapData.stream << quint32(lskSearchSuggestions);
 		mapData.stream << quint64(_searchSuggestionsKey);
 	}
+	if (!_webviewStorageIdBots.token.isEmpty()
+		|| !_webviewStorageIdOther.token.isEmpty()) {
+		mapData.stream << quint32(lskWebviewTokens);
+		mapData.stream
+			<< _webviewStorageIdBots.token
+			<< _webviewStorageIdOther.token;
+	}
 	map.writeEncrypted(mapData, _localKey);
 
 	_mapChanged = false;
@@ -655,11 +679,27 @@ void Account::reset() {
 	_cacheTotalTimeLimit = Database::Settings().totalTimeLimit;
 	_cacheBigFileTotalSizeLimit = Database::Settings().totalSizeLimit;
 	_cacheBigFileTotalTimeLimit = Database::Settings().totalTimeLimit;
+
+	const auto wvbots = _webviewStorageIdBots.path;
+	const auto wvother = _webviewStorageIdOther.path;
+	const auto wvclear = [](Webview::StorageId &storageId) {
+		Webview::ClearStorageDataByToken(
+			base::take(storageId).token.toStdString());
+	};
+	wvclear(_webviewStorageIdBots);
+	wvclear(_webviewStorageIdOther);
+
 	_mapChanged = true;
 	writeMap();
 	writeMtpData();
 
-	crl::async([base = _basePath, temp = _tempPath, names = std::move(names)] {
+	crl::async([
+		base = _basePath,
+		temp = _tempPath,
+		names = std::move(names),
+		wvbots,
+		wvother
+	] {
 		for (const auto &name : names) {
 			if (!name.endsWith(u"map0"_q)
 				&& !name.endsWith(u"map1"_q)
@@ -669,6 +709,12 @@ void Account::reset() {
 			}
 		}
 		QDir(LegacyTempDirectory()).removeRecursively();
+		if (!wvbots.isEmpty()) {
+			QDir(wvbots).removeRecursively();
+		}
+		if (!wvother.isEmpty()) {
+			QDir(wvother).removeRecursively();
+		}
 		QDir(temp).removeRecursively();
 	});
 
@@ -3080,6 +3126,54 @@ bool Account::isBotTrustedOpenWebView(PeerId botId) {
 		&& ((i->second & BotTrustFlag::OpenWebView) != 0);
 }
 
+void Account::enforceModernStorageIdBots() {
+	if (_webviewStorageIdBots.token.isEmpty()) {
+		_webviewStorageIdBots.token = QByteArray::fromStdString(
+			Webview::GenerateStorageToken());
+		writeMapDelayed();
+	}
+}
+
+Webview::StorageId Account::resolveStorageIdBots() {
+	if (!_webviewStorageIdBots) {
+		auto &token = _webviewStorageIdBots.token;
+		const auto legacy = Webview::LegacyStorageIdToken();
+		if (token.isEmpty()) {
+			auto legacyTaken = false;
+			const auto &list = _owner->domain().accounts();
+			for (const auto &[index, account] : list) {
+				if (account.get() != _owner.get()) {
+					const auto &id = account->local()._webviewStorageIdBots;
+					if (id.token == legacy) {
+						legacyTaken = true;
+						break;
+					}
+				}
+			}
+			token = legacyTaken
+				? QByteArray::fromStdString(Webview::GenerateStorageToken())
+				: legacy;
+			writeMapDelayed();
+		}
+		_webviewStorageIdBots.path = (token == legacy)
+			? (BaseGlobalPath() + u"webview"_q)
+			: (_databasePath + u"wvbots"_q);
+	}
+	return _webviewStorageIdBots;
+}
+
+Webview::StorageId Account::resolveStorageIdOther() {
+	if (!_webviewStorageIdOther) {
+		if (_webviewStorageIdOther.token.isEmpty()) {
+			_webviewStorageIdOther.token = QByteArray::fromStdString(
+				Webview::GenerateStorageToken());
+			writeMapDelayed();
+		}
+		_webviewStorageIdOther.path = _databasePath + u"wvother"_q;
+	}
+	return _webviewStorageIdOther;
+}
+
 bool Account::encrypt(
 		const void *src,
 		void *dst,
diff --git a/Telegram/SourceFiles/storage/storage_account.h b/Telegram/SourceFiles/storage/storage_account.h
index b22dd4cbb..d1314cde2 100644
--- a/Telegram/SourceFiles/storage/storage_account.h
+++ b/Telegram/SourceFiles/storage/storage_account.h
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/cache/storage_cache_database.h"
 #include "data/stickers/data_stickers_set.h"
 #include "data/data_drafts.h"
+#include "webview/webview_common.h"
 
 class History;
 
@@ -169,6 +170,10 @@ public:
 	void markBotTrustedOpenWebView(PeerId botId);
 	[[nodiscard]] bool isBotTrustedOpenWebView(PeerId botId);
 
+	void enforceModernStorageIdBots();
+	[[nodiscard]] Webview::StorageId resolveStorageIdBots();
+	[[nodiscard]] Webview::StorageId resolveStorageIdOther();
+
 	[[nodiscard]] bool encrypt(
 		const void *src,
 		void *dst,
@@ -309,6 +314,9 @@ private:
 	bool _recentHashtagsAndBotsWereRead = false;
 	bool _searchSuggestionsRead = false;
 
+	Webview::StorageId _webviewStorageIdBots;
+	Webview::StorageId _webviewStorageIdOther;
+
 	int _oldMapVersion = 0;
 
 	base::Timer _writeMapTimer;
diff --git a/Telegram/SourceFiles/storage/storage_domain.cpp b/Telegram/SourceFiles/storage/storage_domain.cpp
index 1ea0e0f46..c46594f0e 100644
--- a/Telegram/SourceFiles/storage/storage_domain.cpp
+++ b/Telegram/SourceFiles/storage/storage_domain.cpp
@@ -268,10 +268,6 @@ void Domain::clearOldVersion() {
 	_oldVersion = 0;
 }
 
-QString Domain::webviewDataPath() const {
-	return BaseGlobalPath() + "webview";
-}
-
 rpl::producer<> Domain::localPasscodeChanged() const {
 	return _passcodeKeyChanged.events();
 }
diff --git a/Telegram/SourceFiles/storage/storage_domain.h b/Telegram/SourceFiles/storage/storage_domain.h
index 300833091..eff89b6d5 100644
--- a/Telegram/SourceFiles/storage/storage_domain.h
+++ b/Telegram/SourceFiles/storage/storage_domain.h
@@ -44,8 +44,6 @@ public:
 	[[nodiscard]] int oldVersion() const;
 	void clearOldVersion();
 
-	[[nodiscard]] QString webviewDataPath() const;
-
 	[[nodiscard]] rpl::producer<> localPasscodeChanged() const;
 	[[nodiscard]] bool hasLocalPasscode() const;
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 262c852d5..a18c86bf2 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -313,12 +313,12 @@ Panel::Progress::Progress(QWidget *parent, Fn<QRect()> rect)
 }
 
 Panel::Panel(
-	const QString &userDataPath,
+	const Webview::StorageId &storageId,
 	rpl::producer<QString> title,
 	not_null<Delegate*> delegate,
 	MenuButtons menuButtons,
 	bool allowClipboardRead)
-: _userDataPath(userDataPath)
+: _storageId(storageId)
 , _delegate(delegate)
 , _menuButtons(menuButtons)
 , _widget(std::make_unique<SeparatePanel>())
@@ -597,7 +597,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 		container,
 		Webview::WindowConfig{
 			.opaqueBg = params.opaqueBg,
-			.userDataPath = _userDataPath,
+			.storageId = _storageId,
 		});
 	const auto raw = &_webview->window;
 
@@ -1339,7 +1339,7 @@ rpl::lifetime &Panel::lifetime() {
 
 std::unique_ptr<Panel> Show(Args &&args) {
 	auto result = std::make_unique<Panel>(
-		args.userDataPath,
+		args.storageId,
 		std::move(args.title),
 		args.delegate,
 		args.menuButtons,
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index bb22a4dfc..ee1dae837 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/object_ptr.h"
 #include "base/weak_ptr.h"
 #include "base/flags.h"
+#include "webview/webview_common.h"
 
 class QJsonObject;
 class QJsonValue;
@@ -23,7 +24,6 @@ class SeparatePanel;
 
 namespace Webview {
 struct Available;
-struct ThemeParams;
 } // namespace Webview
 
 namespace Ui::BotWebView {
@@ -72,7 +72,7 @@ public:
 class Panel final : public base::has_weak_ptr {
 public:
 	Panel(
-		const QString &userDataPath,
+		const Webview::StorageId &storageId,
 		rpl::producer<QString> title,
 		not_null<Delegate*> delegate,
 		MenuButtons menuButtons,
@@ -144,7 +144,7 @@ private:
 	[[nodiscard]] QRect progressRect() const;
 	void setupProgressGeometry();
 
-	QString _userDataPath;
+	Webview::StorageId _storageId;
 	const not_null<Delegate*> _delegate;
 	bool _closeNeedConfirmation = false;
 	bool _hasSettingsButton = false;
@@ -172,7 +172,7 @@ private:
 
 struct Args {
 	QString url;
-	QString userDataPath;
+	Webview::StorageId storageId;
 	rpl::producer<QString> title;
 	rpl::producer<QString> bottom;
 	not_null<Delegate*> delegate;
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index b225b321e..450cfe541 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -35,9 +35,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/style/style_palette_colorizer.h"
 #include "ui/ui_utility.h"
 #include "ui/boxes/confirm_box.h"
-#include "webview/webview_interface.h"
 #include "boxes/background_box.h"
 #include "core/application.h"
+#include "webview/webview_common.h"
 #include "styles/style_widgets.h"
 #include "styles/style_chat.h"
 
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 7c346c6b0..9f9bcaaec 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 7c346c6b042266b5adb116a2114df1d46b37c03f
+Subproject commit 9f9bcaaec922644406faadda4d37014c9dec2dd9

From 10c427127e392ab892691eabd7d6700b6b630a6e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Apr 2024 11:10:12 +0400
Subject: [PATCH 407/596] Fix accidental search focusing.

---
 Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp |  3 +++
 .../info/profile/info_profile_emoji_status_panel.cpp  | 11 ++++++++++-
 Telegram/SourceFiles/mainwidget.cpp                   |  4 ++++
 Telegram/SourceFiles/settings/settings_main.cpp       | 11 +----------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 5b32ea14c..744322933 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -958,6 +958,9 @@ void TabbedSelector::beforeHiding() {
 			_beforeHidingCallback(_currentTabType);
 		}
 	}
+	if (Ui::InFocusChain(this)) {
+		window()->setFocus();
+	}
 }
 
 void TabbedSelector::afterShown() {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
index c4cce455f..3a3176908 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
@@ -58,7 +58,16 @@ void PickUntilBox(not_null<Ui::GenericBox*> box, Fn<void(TimeId)> callback) {
 
 EmojiStatusPanel::EmojiStatusPanel() = default;
 
-EmojiStatusPanel::~EmojiStatusPanel() = default;
+EmojiStatusPanel::~EmojiStatusPanel() {
+	if (hasFocus()) {
+		// Panel will try to return focus to the layer widget, the problem is
+		// we are destroying the layer widget probably right now and focusing
+		// it will lead to a crash, because it destroys its children (how we
+		// got here) after it clears focus out of itself. So if you return
+		// the focus inside a child destructor, it won't be cleared at all.
+		_panel->window()->setFocus();
+	}
+}
 
 void EmojiStatusPanel::setChooseFilter(Fn<bool(DocumentId)> filter) {
 	_chooseFilter = std::move(filter);
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 6e6fbf8d3..ecd9ad066 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -2644,6 +2644,10 @@ bool MainWidget::eventFilter(QObject *o, QEvent *e) {
 	if (e->type() == QEvent::FocusIn) {
 		if (widget && relevantForDialogsFocus(widget)) {
 			_dialogs->updateHasFocus(widget);
+		} else if (widget == window()) {
+			crl::on_main(this, [=] {
+				_controller->widget()->setInnerFocus();
+			});
 		}
 	} else if (e->type() == QEvent::MouseButtonPress) {
 		if (widget && (widget->window() == window())) {
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index a33485c11..551d4f33c 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -165,16 +165,7 @@ Cover::Cover(
 	}, _name->lifetime());
 }
 
-Cover::~Cover() {
-	if (_emojiStatusPanel.hasFocus()) {
-		// Panel will try to return focus to the layer widget, the problem is
-		// we are destroying the layer widget probably right now and focusing
-		// it will lead to a crash, because it destroys its children (how we
-		// got here) after it clears focus out of itself. So if you return
-		// the focus inside a child destructor, it won't be cleared at all.
-		window()->setFocus();
-	}
-}
+Cover::~Cover() = default;
 
 void Cover::setupChildGeometry() {
 	using namespace rpl::mappers;

From 7388f46adf872d4bd0f8a1e82c6712bc1ad2ae64 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 23 Apr 2024 14:12:23 +0300
Subject: [PATCH 408/596] Fixed display of subscribers count in dialogs
 suggestions.

---
 .../SourceFiles/dialogs/ui/dialogs_suggestions.cpp    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 59194a368..9909fd036 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -290,7 +290,10 @@ RecentRow::RecentRow(not_null<PeerData*> peer)
 	} else if (const auto chat = peer->asChat()) {
 		if (chat->count > 0) {
 			setCustomStatus(
-				tr::lng_chat_status_members(tr::now, lt_count, chat->count));
+				tr::lng_chat_status_members(
+					tr::now,
+					lt_count_decimal,
+					chat->count));
 		}
 	} else if (const auto channel = peer->asChannel()) {
 		if (channel->membersCountKnown()) {
@@ -298,7 +301,7 @@ RecentRow::RecentRow(not_null<PeerData*> peer)
 				? tr::lng_chat_status_subscribers
 				: tr::lng_chat_status_members)(
 					tr::now,
-					lt_count,
+					lt_count_decimal,
 					channel->membersCount()));
 		}
 	}
@@ -655,7 +658,7 @@ void MyChannelsController::appendRow(not_null<ChannelData*> channel) {
 			? tr::lng_chat_status_subscribers
 			: tr::lng_chat_status_members)(
 				tr::now,
-				lt_count,
+				lt_count_decimal,
 				channel->membersCount()));
 	}
 	delegate()->peerListAppendRow(std::move(row));
@@ -819,7 +822,7 @@ void RecommendationsController::appendRow(not_null<ChannelData*> channel) {
 			? tr::lng_chat_status_subscribers
 			: tr::lng_chat_status_members)(
 				tr::now,
-				lt_count,
+				lt_count_decimal,
 				channel->membersCount()));
 	}
 	delegate()->peerListAppendRow(std::move(row));

From 804991a69c930fc203250e240ed7c9a8c9c0184f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 23 Apr 2024 20:23:29 +0300
Subject: [PATCH 409/596] Added universal duration to styles.

---
 Telegram/SourceFiles/boxes/boxes.style        |  2 +-
 Telegram/SourceFiles/calls/calls_top_bar.cpp  |  4 +-
 .../group/ui/calls_group_recording_box.cpp    |  4 +-
 .../chat_helpers/chat_helpers.style           |  2 -
 .../chat_helpers/emoji_suggestions_widget.cpp |  5 +-
 Telegram/SourceFiles/dialogs/dialogs.style    |  2 +-
 .../history_view_voice_record_bar.cpp         | 47 ++++++++++++-------
 .../history_view_voice_record_button.cpp      |  4 +-
 .../info/userpic/info_userpic_builder.style   |  2 -
 .../userpic/info_userpic_colors_editor.cpp    |  6 +--
 .../info_userpic_emoji_builder_widget.cpp     |  2 +-
 Telegram/SourceFiles/intro/intro.style        |  1 -
 .../SourceFiles/intro/intro_code_input.cpp    |  6 +--
 Telegram/SourceFiles/ui/chat/chat.style       |  2 +-
 .../SourceFiles/ui/controls/send_button.cpp   |  2 +-
 15 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index f64f2103d..890bb87e7 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -546,7 +546,7 @@ rightsToggle: Toggle(defaultToggle) {
 	vsize: 5px;
 	vshift: 1px;
 	stroke: 2px;
-	duration: 120;
+	duration: universalDuration;
 }
 
 rightsButton: SettingsButton(defaultSettingsButton) {
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 6a3314578..dea58fd2f 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "boxes/abstract_box.h"
 #include "base/timer.h"
+#include "styles/style_basic.h"
 #include "styles/style_calls.h"
 #include "styles/style_chat_helpers.h" // style::GroupCallUserpics
 #include "styles/style_layers.h"
@@ -49,7 +50,6 @@ enum class BarState {
 namespace {
 
 constexpr auto kUpdateDebugTimeoutMs = crl::time(500);
-constexpr auto kSwitchStateDuration = 120;
 
 constexpr auto kMinorBlobAlpha = 76. / 255.;
 
@@ -374,7 +374,7 @@ void TopBar::initControls() {
 		};
 
 		_switchStateAnimation.stop();
-		const auto duration = (to - from) * kSwitchStateDuration;
+		const auto duration = (to - from) * st::universalDuration;
 		_switchStateAnimation.start(
 			_switchStateCallback,
 			from,
diff --git a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
index 30a492a3f..513fa203c 100644
--- a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/labels.h"
+#include "styles/style_basic.h"
 #include "styles/style_calls.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
@@ -26,7 +27,6 @@ namespace {
 constexpr auto kRoundRadius = 9;
 constexpr auto kMaxGroupCallLength = 40;
 constexpr auto kSwitchDuration = 200;
-constexpr auto kSelectDuration = 120;
 
 class GraphicButton final : public Ui::AbstractButton {
 public:
@@ -103,7 +103,7 @@ void GraphicButton::setToggled(bool value) {
 		[=] { update(); },
 		_toggled ? 0. : 1.,
 		_toggled ? 1. : 0.,
-		kSelectDuration);
+		st::universalDuration);
 }
 
 void GraphicButton::paintEvent(QPaintEvent *e) {
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index d5a443d8e..67358e4c9 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1108,8 +1108,6 @@ historyRecordVoiceFgOver: historyComposeIconFgOver;
 historyRecordVoiceFgInactive: attentionButtonFg;
 historyRecordVoiceFgActive: windowBgActive;
 historyRecordVoiceFgActiveIcon: windowFgActive;
-historyRecordVoiceShowDuration: 120;
-historyRecordVoiceDuration: 120;
 historyRecordVoice: icon {{ "chat/input_record", historyRecordVoiceFg }};
 historyRecordVoiceOver: icon {{ "chat/input_record", historyRecordVoiceFgOver }};
 historyRecordVoiceOnceBg: icon {{ "voice_lock/audio_once_bg", historySendIconFg }};
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index f6c54ec6d..223870044 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -38,7 +38,6 @@ namespace {
 
 constexpr auto kShowExactDelay = crl::time(300);
 constexpr auto kMaxNonScrolledEmoji = 7;
-constexpr auto kAnimationDuration = crl::time(120);
 
 } // namespace
 
@@ -528,7 +527,7 @@ void SuggestionsWidget::setSelected(int selected, anim::type animated) {
 			[=] { update(); },
 			_selected,
 			selected,
-			kAnimationDuration,
+			st::universalDuration,
 			anim::sineInOut);
 		if (_scrollMax > 0) {
 			const auto selectedMax = int(_rows.size()) - 3;
@@ -560,7 +559,7 @@ void SuggestionsWidget::scrollTo(int value, anim::type animated) {
 			[=] { update(); },
 			_scrollValue,
 			value,
-			kAnimationDuration,
+			st::universalDuration,
 			anim::sineInOut);
 	}
 	_scrollValue = value;
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 5827ae6e1..3ee37b6f9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -116,7 +116,7 @@ dialogsSpeakingDenominator: 8.;
 
 dialogsImportantBarHeight: 37px;
 
-dialogsWidthDuration: 120;
+dialogsWidthDuration: universalDuration;
 dialogsTextWidthMin: 150px;
 
 dialogsTextPalette: TextPalette(defaultTextPalette) {
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 ade1c9eec..912bf454d 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
@@ -302,7 +302,7 @@ TTLButton::TTLButton(
 			[=] { update(); },
 			isActive ? 0. : 1.,
 			isActive ? 1. : 0.,
-			st::historyRecordVoiceShowDuration);
+			st::universalDuration);
 	});
 
 	Ui::RpWidget::shownValue() | rpl::start_with_next([=](bool shown) {
@@ -1058,9 +1058,11 @@ void RecordLock::drawProgress(QPainter &p) {
 }
 
 void RecordLock::startLockingAnimation(float64 to) {
-	auto callback = [=](float64 value) { setProgress(value); };
-	const auto &duration = st::historyRecordVoiceShowDuration;
-	_lockEnderAnimation.start(std::move(callback), 0., to, duration);
+	_lockEnderAnimation.start(
+		[=](float64 value) { setProgress(value); },
+		0.,
+		to,
+		st::universalDuration);
 }
 
 void RecordLock::requestPaintProgress(float64 progress) {
@@ -1453,7 +1455,7 @@ void VoiceRecordBar::init() {
 				if (!value) {
 					_listen = nullptr;
 				}
-			}, 1., 0., st::historyRecordVoiceShowDuration * 2);
+			}, 1., 0., st::universalDuration * 2);
 			setLevelAsSend();
 
 			return;
@@ -1473,7 +1475,6 @@ void VoiceRecordBar::init() {
 		// _lockShowing = false;
 
 		const auto to = 1.;
-		const auto &duration = st::historyRecordVoiceShowDuration;
 		auto callback = [=](float64 value) {
 			paintShowListenCallback(value);
 			if (to == value) {
@@ -1481,7 +1482,11 @@ void VoiceRecordBar::init() {
 			}
 		};
 		_showListenAnimation.stop();
-		_showListenAnimation.start(std::move(callback), 0., to, duration);
+		_showListenAnimation.start(
+			std::move(callback),
+			0.,
+			to,
+			st::universalDuration);
 	}, lifetime());
 
 	_lock->locks(
@@ -1498,15 +1503,16 @@ void VoiceRecordBar::init() {
 
 		setLevelAsSend();
 
-		const auto &duration = st::historyRecordVoiceShowDuration;
-		const auto from = 0.;
-		const auto to = 1.;
 		auto callback = [=](float64 value) {
 			_lock->requestPaintLockToStopProgress(value);
 			update();
 			updateTTLGeometry(TTLAnimationType::RightLeft, value);
 		};
-		_lockToStopAnimation.start(std::move(callback), from, to, duration);
+		_lockToStopAnimation.start(
+			std::move(callback),
+			0.,
+			1.,
+			st::universalDuration);
 	}, lifetime());
 
 	_send->events(
@@ -1523,7 +1529,7 @@ void VoiceRecordBar::init() {
 				return;
 			}
 			_recordingTipRequired = true;
-			_startTimer.callOnce(st::historyRecordVoiceShowDuration);
+			_startTimer.callOnce(st::universalDuration);
 		} else if (e->type() == QEvent::MouseButtonRelease) {
 			if (base::take(_recordingTipRequired)) {
 				_recordingTipRequests.fire({});
@@ -1556,23 +1562,24 @@ void VoiceRecordBar::init() {
 
 void VoiceRecordBar::activeAnimate(bool active) {
 	const auto to = active ? 1. : 0.;
-	const auto &duration = st::historyRecordVoiceDuration;
 	if (_activeAnimation.animating()) {
-		_activeAnimation.change(to, duration);
+		_activeAnimation.change(to, st::universalDuration);
 	} else {
 		auto callback = [=] {
 			update(_messageRect);
 			_level->requestPaintColor(activeAnimationRatio());
 		};
-		const auto from = active ? 0. : 1.;
-		_activeAnimation.start(std::move(callback), from, to, duration);
+		_activeAnimation.start(
+			std::move(callback),
+			active ? 0. : 1.,
+			to,
+			st::universalDuration);
 	}
 }
 
 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) {
 		if (!_listen) {
 			_level->requestPaintProgress(value);
@@ -1589,7 +1596,11 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 			}
 		}
 	};
-	_showAnimation.start(std::move(animationCallback), from, to, duration);
+	_showAnimation.start(
+		std::move(animationCallback),
+		from,
+		to,
+		st::universalDuration);
 }
 
 void VoiceRecordBar::setStartRecordingFilter(FilterCallback &&callback) {
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 84d565639..986ea9d6e 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
@@ -196,8 +196,8 @@ void VoiceRecordButton::init() {
 			}
 			update();
 		};
-		const auto duration = st::historyRecordVoiceDuration * 2;
-		_stateChangedAnimation.start(std::move(callback), 0., to, duration);
+		constexpr auto kDuration = st::universalDuration * 2;
+		_stateChangedAnimation.start(std::move(callback), 0., to, kDuration);
 	}, lifetime());
 }
 
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_builder.style b/Telegram/SourceFiles/info/userpic/info_userpic_builder.style
index e608fc9cf..10c212733 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_builder.style
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_builder.style
@@ -66,5 +66,3 @@ userpicBuilderEmojiColorPlus: IconButton(userpicBuilderEmojiColorMinus) {
 }
 
 userpicBuilderEmojiToggleStickersIcon: icon {{ "menu/stickers", emojiIconFg }};
-
-userpicBuilderEmojiSlideDuration: 120;
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
index 4e17bef1d..fbfa8fb7f 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
@@ -137,7 +137,7 @@ void ColorsLine::fillButtons() {
 					wasChosen->setSelectedProgress(1. - progress);
 				}
 				nowChosen->setSelectedProgress(progress);
-			}, 0., 1., st::userpicBuilderEmojiSlideDuration);
+			}, 0., 1., st::universalDuration);
 		});
 		if (i < _colors->size()) {
 			button->setBrush((*_colors)[i]);
@@ -164,7 +164,7 @@ void ColorsLine::fillButtons() {
 		setLastChosen();
 	});
 	for (const auto &wrap : _wraps) {
-		wrap->setDuration(st::userpicBuilderEmojiSlideDuration);
+		wrap->setDuration(st::universalDuration);
 	}
 }
 
@@ -213,7 +213,7 @@ void ColorsLine::processChange(
 			const auto left = anim::interpolate(wasLeft, nowLeft, value);
 			_wraps[i]->moveToLeft(left, 0);
 		}
-	}, 0., 1., st::userpicBuilderEmojiSlideDuration);
+	}, 0., 1., st::universalDuration);
 }
 
 void ColorsLine::setLastChosen() const {
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
index cd98ee596..7d4f075cc 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
@@ -493,7 +493,7 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 							1. - progress);
 					}
 					state->circleButtons[now]->setSelectedProgress(progress);
-				}, 0., 1., st::userpicBuilderEmojiSlideDuration);
+				}, 0., 1., st::universalDuration);
 				state->colorIndex = now;
 
 				const auto result = isSpecial
diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style
index ed5c3b225..bedbad748 100644
--- a/Telegram/SourceFiles/intro/intro.style
+++ b/Telegram/SourceFiles/intro/intro.style
@@ -119,7 +119,6 @@ introCodeDigitFont: font(20px);
 introCodeDigitHeight: 50px;
 introCodeDigitBorderWidth: 4px;
 introCodeDigitSkip: 10px;
-introCodeDigitAnimatioDuration: 120;
 
 introPasswordHint: FlatLabel(introDescription) {
 	textFg: windowFg;
diff --git a/Telegram/SourceFiles/intro/intro_code_input.cpp b/Telegram/SourceFiles/intro/intro_code_input.cpp
index 968cd87d4..a3964d3cf 100644
--- a/Telegram/SourceFiles/intro/intro_code_input.cpp
+++ b/Telegram/SourceFiles/intro/intro_code_input.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/widgets/popup_menu.h"
+#include "styles/style_basic.h"
 #include "styles/style_intro.h"
 #include "styles/style_layers.h" // boxRadius
 
@@ -91,7 +92,6 @@ void CodeDigit::setDigit(int digit) {
 	}
 	_dataDigit = digit;
 	if (_viewDigit != digit) {
-		constexpr auto kDuration = st::introCodeDigitAnimatioDuration;
 		_animation.stop();
 		if (digit == kDigitNone) {
 			_animation.start([=](float64 value) {
@@ -99,10 +99,10 @@ void CodeDigit::setDigit(int digit) {
 				if (!value) {
 					_viewDigit = digit;
 				}
-			}, 1., 0., kDuration);
+			}, 1., 0., st::universalDuration);
 		} else {
 			_viewDigit = digit;
-			_animation.start([=] { update(); }, 0., 1., kDuration);
+			_animation.start([=] { update(); }, 0, 1., st::universalDuration);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index ef46e0405..2cab84839 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -632,7 +632,7 @@ historyPollRadio: Radio(defaultRadio) {
 	diameter: 18px;
 	thickness: 2px;
 	skip: 65px; // * 0.1
-	duration: 120;
+	duration: universalDuration;
 	rippleAreaPadding: 8px;
 }
 historyPollRadioOpacity: 0.7;
diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
index 2e83de2fc..90c334812 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -40,7 +40,7 @@ void SendButton::setType(Type type) {
 			[=] { update(); },
 			0.,
 			1.,
-			st::historyRecordVoiceDuration);
+			st::universalDuration);
 		setPointerCursor(_type != Type::Slowmode);
 		update();
 	}

From 38fc6bfbb91ad82e15733c5ceec32eb19d843d19 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 24 Apr 2024 17:30:15 +0300
Subject: [PATCH 410/596] Added special mode to emoji list widget to exclude
 non-unicode emoji.

---
 .../chat_helpers/emoji_list_widget.cpp           | 16 ++++++++++------
 .../SourceFiles/chat_helpers/emoji_list_widget.h |  2 ++
 .../SourceFiles/chat_helpers/tabbed_selector.cpp |  2 ++
 .../SourceFiles/chat_helpers/tabbed_selector.h   |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index ac8b6f117..c8148ae8e 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -468,7 +468,8 @@ EmojiListWidget::EmojiListWidget(
 	std::move(descriptor.paused))
 , _show(std::move(descriptor.show))
 , _features(descriptor.features)
-, _mode(descriptor.mode)
+, _onlyUnicodeEmoji(descriptor.mode == Mode::PeerTitle)
+, _mode(_onlyUnicodeEmoji ? Mode::Full : descriptor.mode)
 , _api(&session().mtp())
 , _staticCount(_mode == Mode::Full ? kEmojiSectionCount : 1)
 , _premiumIcon(_mode == Mode::EmojiStatus
@@ -490,7 +491,8 @@ EmojiListWidget::EmojiListWidget(
 
 	if (_mode != Mode::RecentReactions
 		&& _mode != Mode::BackgroundEmoji
-		&& _mode != Mode::ChannelStatus) {
+		&& _mode != Mode::ChannelStatus
+		&& !_onlyUnicodeEmoji) {
 		setupSearch();
 	}
 
@@ -1052,7 +1054,7 @@ void EmojiListWidget::fillRecent() {
 	const auto test = session().isTestMode();
 	for (const auto &one : list) {
 		const auto document = std::get_if<RecentEmojiDocument>(&one.id.data);
-		if (document && document->test != test) {
+		if (document && ((document->test != test) || _onlyUnicodeEmoji)) {
 			continue;
 		}
 		_recent.push_back({
@@ -2129,7 +2131,9 @@ void EmojiListWidget::refreshCustom() {
 	auto old = base::take(_custom);
 	const auto session = &this->session();
 	const auto premiumPossible = session->premiumPossible();
-	const auto premiumMayBeBought = premiumPossible
+	const auto onlyUnicodeEmoji = _onlyUnicodeEmoji || !premiumPossible;
+	const auto premiumMayBeBought = (!onlyUnicodeEmoji)
+		&& premiumPossible
 		&& !session->premium()
 		&& !_allowWithoutPremium;
 	const auto owner = &session->data();
@@ -2189,7 +2193,7 @@ void EmojiListWidget::refreshCustom() {
 				}
 				return true;
 			}();
-			if (premium && !premiumPossible) {
+			if (premium && onlyUnicodeEmoji) {
 				return;
 			} else if (valid) {
 				i->thumbnailDocument = it->second->lookupThumbnailDocument();
@@ -2223,7 +2227,7 @@ void EmojiListWidget::refreshCustom() {
 				}
 			}
 		}
-		if (premium && !premiumPossible) {
+		if (premium && onlyUnicodeEmoji) {
 			return;
 		}
 		_custom.push_back({
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index d3fba5c72..3159d340e 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -76,6 +76,7 @@ enum class EmojiListMode {
 	RecentReactions,
 	UserpicBuilder,
 	BackgroundEmoji,
+	PeerTitle,
 };
 
 struct EmojiListDescriptor {
@@ -379,6 +380,7 @@ private:
 
 	const std::shared_ptr<Show> _show;
 	const ComposeFeatures _features;
+	const bool _onlyUnicodeEmoji;
 	Mode _mode = Mode::Full;
 	std::unique_ptr<Ui::TabbedSearch> _search;
 	MTP::Sender _api;
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 744322933..e57b3adc8 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -540,6 +540,8 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 					? EmojiMode::FullReactions
 					: _mode == Mode::RecentReactions
 					? EmojiMode::RecentReactions
+					: _mode == Mode::PeerTitle
+					? EmojiMode::PeerTitle
 					: EmojiMode::Full),
 				.customTextColor = _customTextColor,
 				.paused = paused,
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index adfee5361..606f1a926 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -86,6 +86,7 @@ enum class TabbedSelectorMode {
 	BackgroundEmoji,
 	FullReactions,
 	RecentReactions,
+	PeerTitle,
 };
 
 struct TabbedSelectorDescriptor {

From 9fcb5d6f3188fff9d7726e0773124762317159cc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 24 Apr 2024 18:31:25 +0300
Subject: [PATCH 411/596] Added emoji button to input field for peer title
 edit.

---
 .../boxes/peers/edit_peer_info_box.cpp        | 77 ++++++++++++++++++-
 Telegram/SourceFiles/info/info.style          |  4 +
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index a1ee68248..f732c794e 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_user_names.h"
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
+#include "base/event_filter.h"
 #include "boxes/peers/edit_participants_box.h"
 #include "boxes/peers/edit_peer_color_box.h"
 #include "boxes/peers/edit_peer_common.h"
@@ -27,6 +28,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/stickers_box.h"
 #include "boxes/username_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "data/data_channel.h"
@@ -47,6 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_app_config.h"
 #include "settings/settings_common.h"
 #include "ui/boxes/boost_box.h"
+#include "ui/controls/emoji_button.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/rp_widget.h"
 #include "ui/vertical_list.h"
@@ -61,6 +65,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/vertical_layout.h"
 #include "window/window_session_controller.h"
 #include "api/api_invite_links.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_boxes.h"
@@ -533,7 +538,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		_wrap,
 		object_ptr<Ui::InputField>(
 			_wrap,
-			st::defaultInputField,
+			st::editPeerTitleField,
 			(_isBot
 				? tr::lng_dlg_new_bot_name
 				: _isGroup
@@ -555,6 +560,76 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		submitTitle();
 	}, result->entity()->lifetime());
 
+	{
+		const auto field = result->entity();
+		const auto container = _box->getDelegate()->outerContainer();
+		using Selector = ChatHelpers::TabbedSelector;
+		using PanelPtr = base::unique_qptr<ChatHelpers::TabbedPanel>;
+		const auto emojiPanelPtr = field->lifetime().make_state<PanelPtr>(
+			base::make_unique_q<ChatHelpers::TabbedPanel>(
+				container,
+				ChatHelpers::TabbedPanelDescriptor{
+					.ownedSelector = object_ptr<Selector>(
+						nullptr,
+						ChatHelpers::TabbedSelectorDescriptor{
+							.show = _navigation->uiShow(),
+							.st = st::defaultComposeControls.tabbed,
+							.level = Window::GifPauseReason::Layer,
+							.mode = Selector::Mode::PeerTitle,
+						}),
+				}));
+		const auto emojiPanel = emojiPanelPtr->get();
+		emojiPanel->setDesiredHeightValues(
+			1.,
+			st::emojiPanMinHeight / 2,
+			st::emojiPanMinHeight);
+		emojiPanel->hide();
+		emojiPanel->selector()->setCurrentPeer(_peer);
+		emojiPanel->selector()->emojiChosen(
+		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+			Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
+			field->setFocus();
+		}, field->lifetime());
+		emojiPanel->setDropDown(true);
+
+		const auto emojiToggle = Ui::CreateChild<Ui::EmojiButton>(
+			field,
+			st::defaultComposeControls.files.emoji);
+		emojiToggle->show();
+		emojiToggle->installEventFilter(emojiPanel);
+		emojiToggle->addClickHandler([=] { emojiPanel->toggleAnimated(); });
+
+		const auto updateEmojiPanelGeometry = [=] {
+			const auto parent = emojiPanel->parentWidget();
+			const auto global = emojiToggle->mapToGlobal({ 0, 0 });
+			const auto local = parent->mapFromGlobal(global);
+			emojiPanel->moveTopRight(
+				local.y() + emojiToggle->height(),
+				local.x() + emojiToggle->width() * 3);
+		};
+
+		base::install_event_filter(container, [=](not_null<QEvent*> event) {
+			const auto type = event->type();
+			if (type == QEvent::Move || type == QEvent::Resize) {
+				crl::on_main(field, [=] { updateEmojiPanelGeometry(); });
+			}
+			return base::EventFilterResult::Continue;
+		});
+
+		field->widthValue() | rpl::start_with_next([=](int width) {
+			const auto &p = st::editPeerTitleEmojiPosition;
+			emojiToggle->moveToRight(p.x(), p.y(), width);
+			updateEmojiPanelGeometry();
+		}, emojiToggle->lifetime());
+
+		base::install_event_filter(emojiToggle, [=](not_null<QEvent*> event) {
+			if (event->type() == QEvent::Enter) {
+				updateEmojiPanelGeometry();
+			}
+			return base::EventFilterResult::Continue;
+		});
+	}
+
 	_controls.title = result->entity();
 	return result;
 }
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 27e3750b4..04bb9b1b6 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -722,6 +722,10 @@ editPeerHistoryVisibilityTopSkip: 8px;
 editPeerPhotoMargins: margins(22px, 8px, 22px, 8px);
 editPeerTitle: defaultInputField;
 editPeerTitleMargins: margins(27px, 13px, 22px, 8px);
+editPeerTitleEmojiPosition: point(0px, 23px);
+editPeerTitleField: InputField(defaultInputField) {
+	textMargins: margins(0px, 28px, 30px, 4px);
+}
 editPeerDescription: InputField(defaultInputField) {
 	textBg: transparent;
 	textMargins: margins(0px, 7px, 0px, 7px);

From 2c4d8418c182350b022ee33ee4af1fd6d21cf844 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 24 Apr 2024 18:36:51 +0300
Subject: [PATCH 412/596] Removed unused code for sponsored messages.

---
 .../view/media/history_view_web_page.cpp      | 24 +------------------
 .../view/media/history_view_web_page.h        |  2 --
 2 files changed, 1 insertion(+), 25 deletions(-)

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 2994ce4a5..0181d7da3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -548,8 +548,6 @@ QSize WebPage::countCurrentSize(int newWidth) {
 	const auto twoTitleLines = 2 * st::webPageTitleFont->height;
 	const auto descriptionLineHeight = st::webPageDescriptionFont->height;
 	if (asArticle() || specialRightPix) {
-		const auto sponsoredUserpic = (_sponsoredData
-			&& _sponsoredData->peer);
 		constexpr auto kSponsoredUserpicLines = 2;
 		_pixh = lineHeight
 			* (_stickerSet
@@ -576,8 +574,7 @@ QSize WebPage::countCurrentSize(int newWidth) {
 				newHeight += _titleLines * lineHeight;
 			}
 
-			const auto descriptionHeight = _description.countHeight(
-				sponsoredUserpic ? innerWidth : wleft);
+			const auto descriptionHeight = _description.countHeight(wleft);
 			const auto restLines = (linesMax - _siteNameLines - _titleLines);
 			if (descriptionHeight < restLines * descriptionLineHeight) {
 				// We have height for all the lines.
@@ -677,7 +674,6 @@ void WebPage::ensurePhotoMediaCreated() const {
 
 bool WebPage::hasHeavyPart() const {
 	return _photoMedia
-		|| (_sponsoredData && !_sponsoredData->userpicView.null())
 		|| (_stickerSet)
 		|| (_attach ? _attach->hasHeavyPart() : false);
 }
@@ -688,9 +684,6 @@ void WebPage::unloadHeavyPart() {
 	}
 	_description.unloadPersistentAnimation();
 	_photoMedia = nullptr;
-	if (_sponsoredData) {
-		_sponsoredData->userpicView = Ui::PeerUserpicView();
-	}
 }
 
 void WebPage::draw(Painter &p, const PaintContext &context) const {
@@ -834,21 +827,6 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			// as its width only affects the title.
 			paintw -= pw + st::webPagePhotoDelta;
 		}
-	} else if (asSponsored && _sponsoredData->peer) {
-		const auto size = _pixh;
-		const auto sizeHq = size * style::DevicePixelRatio();
-		const auto userpicPos = QPoint(inner.left() + paintw - size, tshift);
-		const auto &peer = _sponsoredData->peer;
-		auto &view = _sponsoredData->userpicView;
-		if (const auto cloud = peer->userpicCloudImage(view)) {
-			Ui::ValidateUserpicCache(view, cloud, nullptr, sizeHq, true);
-			p.drawImage(QRect(userpicPos, QSize(size, size)), view.cached);
-		} else {
-			const auto r = sizeHq * Ui::ForumUserpicRadiusMultiplier();
-			const auto empty = peer->generateUserpicImage(view, sizeHq, r);
-			p.drawImage(QRect(userpicPos, QSize(size, size)), empty);
-		}
-		// paintw -= size + st::webPagePhotoDelta;
 	}
 	if (_siteNameLines) {
 		p.setPen(cache->icon);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index 1e1088bf7..86f7ec817 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -139,8 +139,6 @@ private:
 	std::unique_ptr<StickerSet> _stickerSet;
 
 	struct SponsoredData final {
-		PeerData *peer = nullptr;
-		Ui::PeerUserpicView userpicView;
 		QString buttonText;
 		bool isLinkInternal = false;
 

From dd1cb00c629b94d3bddb238fe93ebbe92719605b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 19 Feb 2024 02:08:52 +0400
Subject: [PATCH 413/596] Update snap to core24

---
 snap/snapcraft.yaml | 96 ++++++++++++---------------------------------
 1 file changed, 24 insertions(+), 72 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index af58384fb..ee538420a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -2,7 +2,7 @@ name: telegram-desktop
 adopt-info: telegram
 icon: Telegram/Resources/art/icon512@2x.png
 
-base: core22
+base: core24
 grade: stable
 confinement: strict
 compression: lzo
@@ -70,12 +70,14 @@ layout:
     bind: $SNAP/usr/share/X11
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0:
     bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0
+  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-4.0:
+    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-4.0
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3:
     bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2:
     bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1
+  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0:
+    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0
 
 package-repositories:
   - type: apt
@@ -94,14 +96,17 @@ parts:
       - clang
       - libtool-bin
       - python3
+      - protobuf-compiler
       - libasound2-dev
       - libavif-dev
-      - libboost-regex1.74-dev
+      - libboost-regex-dev
       - libfmt-dev
       - libgirepository1.0-dev
       - libglib2.0-dev
       - libheif-dev
+      - libopenal-dev
       - libopus-dev
+      - libprotobuf-dev
       - libpulse-dev
       - libssl-dev
       - libwayland-dev
@@ -112,15 +117,17 @@ parts:
       - zlib1g-dev
     stage-packages:
       - libasound2
-      - libavif13
-      - libboost-regex1.74.0
+      - libavif16
+      - libboost-regex1.83.0
       - libglib2.0-0
       - libheif1
+      - libopenal1
       - libopus0
+      - libprotobuf-lite32
       - libpulse0
       - libssl3
       - libwayland-client0
-      - libwebkit2gtk-4.1-0
+      - libwebkitgtk-6.0-4
       - libxcb1
       - libxcb-keysyms1
       - libxcb-record0
@@ -157,8 +164,6 @@ parts:
     after:
       - ffmpeg
       - libjxl
-      - openal
-      - protobuf
       - qt
       - rnnoise
       - webrtc
@@ -220,12 +225,12 @@ parts:
       - libswresample-dev
       - libswscale-dev
     stage-packages:
-      - libavcodec58
-      - libavfilter7
-      - libavformat58
-      - libavutil56
-      - libswresample3
-      - libswscale5
+      - libavcodec60
+      - libavfilter9
+      - libavformat60
+      - libavutil58
+      - libswresample4
+      - libswscale7
       - va-driver-all
       - vdpau-driver-all
     override-build: |
@@ -273,60 +278,6 @@ parts:
     after:
       - patches
 
-  openal:
-    source: https://github.com/kcat/openal-soft.git
-    source-depth: 1
-    source-tag: 1.23.1
-    plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    build-packages:
-      - libasound2-dev
-      - libdbus-1-dev
-      - libpipewire-0.3-dev
-      - libpulse-dev
-    stage-packages:
-      - libasound2
-      - libdbus-1-3
-      - libpulse0
-      - pipewire
-    cmake-generator: Ninja
-    cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DALSOFT_EXAMPLES=OFF
-      - -DALSOFT_UTILS=OFF
-      - -DALSOFT_INSTALL_CONFIG=OFF
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-
-  protobuf:
-    source: https://github.com/protocolbuffers/protobuf.git
-    source-depth: 1
-    source-tag: v24.3
-    plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    build-packages:
-      - zlib1g-dev
-    stage-packages:
-      - zlib1g
-    cmake-generator: Ninja
-    cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DBUILD_SHARED_LIBS=ON
-      - -Dprotobuf_BUILD_TESTS=OFF
-    prime:
-      - -./usr/bin
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-
   qt:
     plugin: nil
     build-environment:
@@ -380,7 +331,7 @@ parts:
       - libgtk-3-0
       - libharfbuzz0b
       - libice6
-      - libicu70
+      - libicu74
       - liblcms2-2
       - libopengl0
       - libpcre2-16-0
@@ -413,6 +364,7 @@ parts:
       - libxkbcommon-x11-0
       - zlib1g
       - mesa-vulkan-drivers
+      - xkb-data
     override-pull: |
       QT=6.7.0
 
@@ -518,10 +470,10 @@ parts:
       - libgbm1
       - libgl1
       - libglib2.0-0
-      - libopenh264-6
+      - libopenh264-7
       - libopus0
       - libssl3
-      - libvpx7
+      - libvpx8
       - libx11-6
       - libxcomposite1
       - libxdamage1

From 643ecd2c2c2789b49b2f83059ce71685e375aa88 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 25 Apr 2024 14:10:30 +0300
Subject: [PATCH 414/596] Implemented initial ui of moderation box.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |  10 +
 Telegram/SourceFiles/boxes/boxes.style        |  13 +
 .../boxes/moderate_messages_box.cpp           | 494 ++++++++++++++++++
 .../SourceFiles/boxes/moderate_messages_box.h |  19 +
 Telegram/lib_ui                               |   2 +-
 6 files changed, 539 insertions(+), 1 deletion(-)
 create mode 100644 Telegram/SourceFiles/boxes/moderate_messages_box.cpp
 create mode 100644 Telegram/SourceFiles/boxes/moderate_messages_box.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 0ffd19f99..2f42270ee 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -273,6 +273,8 @@ PRIVATE
     boxes/local_storage_box.h
     boxes/max_invite_box.cpp
     boxes/max_invite_box.h
+    boxes/moderate_messages_box.cpp
+    boxes/moderate_messages_box.h
     boxes/peer_list_box.cpp
     boxes/peer_list_box.h
     boxes/peer_list_controllers.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 62cf4464e..1174605db 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2854,7 +2854,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_in_dlg_audio_count#other" = "{count} audio";
 
 "lng_ban_user" = "Ban User";
+"lng_ban_users" = "Ban users";
+"lng_restrict_users" = "Restrict users";
 "lng_delete_all_from_user" = "Delete all from {user}";
+"lng_delete_all_from_users" = "Delete all from users";
+"lng_restrict_user_part" = "Partially restrict this user";
+"lng_restrict_users_part" = "Partially restrict users";
+"lng_restrict_user_full" = "Fully ban this user";
+"lng_restrict_users_full" = "Fully ban users";
+"lng_restrict_users_part_single_header" = "What can this user do?";
+"lng_restrict_users_part_header#one" = "What can {count} selected user do?";
+"lng_restrict_users_part_header#other" = "What can {count} selected users do?";
 "lng_report_spam" = "Report Spam";
 "lng_report_spam_and_leave" = "Report spam and leave";
 "lng_report_spam_done" = "Thank you for your report.";
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 890bb87e7..ef166d580 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -1074,3 +1074,16 @@ collectibleBox: Box(defaultBox) {
 	buttonHeight: 36px;
 	button: collectibleCopy;
 }
+
+moderateBoxUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(34px, 42px);
+	photoSize: 34px;
+	photoPosition: point(0px, 4px);
+}
+moderateBoxExpand: icon {{ "chat/reply_type_group", boxTextFg }};
+moderateBoxExpandHeight: 20px;
+moderateBoxExpandRight: 10px;
+moderateBoxExpandInnerSkip: 2px;
+moderateBoxExpandFont: font(11px);
+moderateBoxExpandToggleSize: 4px;
+moderateBoxExpandToggleFourStrokes: 3px;
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
new file mode 100644
index 000000000..49d436700
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -0,0 +1,494 @@
+/*
+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/moderate_messages_box.h"
+
+#include "boxes/delete_messages_box.h"
+#include "boxes/peers/edit_peer_permissions_box.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_peer.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/effects/toggle_arrow.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/rect_part.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/wrap/slide_wrap.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+
+namespace {
+
+enum class ModerateOption {
+	Ban = (1 << 0),
+	DeleteAll = (1 << 1),
+};
+inline constexpr bool is_flag_type(ModerateOption) { return true; }
+using ModerateOptions = base::flags<ModerateOption>;
+
+ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
+	Expects(!items.empty());
+
+	const auto peer = items.front()->history()->peer;
+	auto allCanBan = true;
+	auto allCanDelete = true;
+	for (const auto &item : items) {
+		if (!allCanBan && !allCanDelete) {
+			return ModerateOptions(0);
+		}
+		if (peer != item->history()->peer) {
+			return ModerateOptions(0);
+		}
+		if (!item->suggestBanReport()) {
+			allCanBan = false;
+		}
+		if (!item->suggestDeleteAllReport()) {
+			allCanDelete = false;
+		}
+	}
+	return ModerateOptions(0)
+		| (allCanBan ? ModerateOption::Ban : ModerateOptions(0))
+		| (allCanDelete ? ModerateOption::DeleteAll : ModerateOptions(0));
+}
+
+class Button final : public Ui::RippleButton {
+public:
+	Button(not_null<QWidget*> parent, int count);
+
+	void setChecked(bool checked);
+	[[nodiscard]] bool checked() const;
+
+	[[nodiscard]] static QSize ComputeSize(int);
+
+private:
+	void paintEvent(QPaintEvent *event) override;
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+	const int _count;
+	const QString _text;
+	bool _checked = false;
+
+	Ui::Animations::Simple _animation;
+
+};
+
+Button::Button(not_null<QWidget*> parent, int count)
+: RippleButton(parent, st::defaultRippleAnimation)
+, _count(count)
+, _text(QString::number(std::abs(_count))) {
+}
+
+QSize Button::ComputeSize(int count) {
+	return QSize(
+		st::moderateBoxExpandHeight
+			+ st::moderateBoxExpand.width()
+			+ st::moderateBoxExpandInnerSkip * 4
+			+ st::moderateBoxExpandFont->width(
+				QString::number(std::abs(count)))
+			+ st::moderateBoxExpandToggleSize,
+		st::moderateBoxExpandHeight);
+}
+
+void Button::setChecked(bool checked) {
+	if (_checked == checked) {
+		return;
+	}
+	_checked = checked;
+	_animation.stop();
+	_animation.start(
+		[=] { update(); },
+		checked ? 0 : 1,
+		checked ? 1 : 0,
+		st::slideWrapDuration);
+}
+
+bool Button::checked() const {
+	return _checked;
+}
+
+void Button::paintEvent(QPaintEvent *event) {
+	auto p = Painter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	Ui::RippleButton::paintRipple(p, QPoint());
+	const auto radius = height() / 2;
+	p.setPen(Qt::NoPen);
+	st::moderateBoxExpand.paint(
+		p,
+		radius,
+		(height() - st::moderateBoxExpand.height()) / 2,
+		width());
+
+	const auto innerSkip = st::moderateBoxExpandInnerSkip;
+
+	p.setBrush(Qt::NoBrush);
+	p.setPen(st::boxTextFg);
+	p.setFont(st::moderateBoxExpandFont);
+	p.drawText(
+		QRect(
+			innerSkip + radius + st::moderateBoxExpand.width(),
+			0,
+			width(),
+			height()),
+		_text,
+		style::al_left);
+
+	const auto path = Ui::ToggleUpDownArrowPath(
+		width() - st::moderateBoxExpandToggleSize - radius,
+		height() / 2,
+		st::moderateBoxExpandToggleSize,
+		st::moderateBoxExpandToggleFourStrokes,
+		_animation.value(_checked ? 1. : 0.));
+	p.fillPath(path, st::boxTextFg);
+}
+
+QImage Button::prepareRippleMask() const {
+	return Ui::RippleAnimation::RoundRectMask(size(), size().height() / 2);
+}
+
+QPoint Button::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
+}
+
+} // namespace
+
+void CreateModerateMessagesBox(
+		not_null<Ui::GenericBox*> box,
+		const HistoryItemsList &items) {
+	const auto options = CalculateModerateOptions(items);
+	const auto inner = box->verticalLayout();
+
+	const auto users = [&] {
+		auto result = std::vector<not_null<UserData*>>();
+		for (const auto &item : items) {
+			if (const auto user = item->from()->asUser()) {
+				if (!ranges::contains(result, not_null{ user })) {
+					result.push_back(user);
+				}
+			}
+		}
+		return result;
+	}();
+	Assert(!users.empty());
+
+	const auto isSingle = users.size() == 1;
+	const auto buttonPadding = isSingle
+		? QMargins()
+		: QMargins(0, 0, Button::ComputeSize(users.size()).width(), 0);
+
+	struct Controller final {
+		rpl::event_stream<bool> toggleRequestsFromTop;
+		rpl::event_stream<bool> toggleRequestsFromInner;
+		rpl::event_stream<bool> checkAllRequests;
+	};
+	const auto createUsersList = [&](not_null<Controller*> controller) {
+		const auto wrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+		wrap->toggle(false, anim::type::instant);
+
+		controller->toggleRequestsFromTop.events(
+		) | rpl::start_with_next([=](bool toggled) {
+			wrap->toggle(toggled, anim::type::normal);
+		}, wrap->lifetime());
+
+		const auto container = wrap->entity();
+		Ui::AddSkip(container);
+
+		auto &lifetime = wrap->lifetime();
+		const auto clicks = lifetime.make_state<rpl::event_stream<>>();
+		const auto checkboxes = ranges::views::all(
+			users
+		) | ranges::views::transform([&](not_null<UserData*> user) {
+			const auto line = container->add(
+				object_ptr<Ui::AbstractButton>(container));
+			const auto &st = st::moderateBoxUserpic;
+			line->resize(line->width(), st.size.height());
+
+			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+				line,
+				user,
+				st);
+			const auto checkbox = Ui::CreateChild<Ui::Checkbox>(
+				line,
+				user->name(),
+				false,
+				st::defaultBoxCheckbox);
+			line->widthValue(
+			) | rpl::start_with_next([=](int width) {
+				userpic->moveToLeft(
+					st::boxRowPadding.left()
+						+ checkbox->checkRect().width()
+						+ st::defaultBoxCheckbox.textPosition.x(),
+					0);
+				const auto skip = st::defaultBoxCheckbox.textPosition.x();
+				checkbox->resizeToWidth(width
+					- rect::right(userpic)
+					- skip
+					- st::boxRowPadding.right());
+				checkbox->moveToLeft(
+					rect::right(userpic) + skip,
+					((userpic->height() - checkbox->height()) / 2)
+						+ st::defaultBoxCheckbox.margin.top());
+			}, checkbox->lifetime());
+
+			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+			checkbox->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+			line->setClickedCallback([=] {
+				checkbox->setChecked(!checkbox->checked());
+				clicks->fire({});
+			});
+
+			return checkbox;
+		}) | ranges::to_vector;
+
+		clicks->events(
+		) | rpl::start_with_next([=] {
+			controller->toggleRequestsFromInner.fire_copy(
+				ranges::any_of(checkboxes, &Ui::Checkbox::checked));
+		}, container->lifetime());
+
+		controller->checkAllRequests.events(
+		) | rpl::start_with_next([=](bool checked) {
+			for (const auto &c : checkboxes) {
+				c->setChecked(checked);
+			}
+		}, container->lifetime());
+	};
+
+	const auto appendList = [&](not_null<Ui::Checkbox*> checkbox) {
+		const auto button = Ui::CreateChild<Button>(inner, users.size());
+		button->resize(Button::ComputeSize(users.size()));
+
+		const auto overlay = Ui::CreateChild<Ui::AbstractButton>(inner);
+
+		checkbox->geometryValue(
+		) | rpl::start_with_next([=](const QRect &rect) {
+			overlay->setGeometry(rect);
+			overlay->raise();
+
+			button->moveToRight(
+				st::moderateBoxExpandRight,
+				rect.top() + (rect.height() - button->height()) / 2,
+				box->width());
+			button->raise();
+		}, button->lifetime());
+
+		const auto controller = checkbox->lifetime().make_state<Controller>();
+		controller->toggleRequestsFromInner.events(
+		) | rpl::start_with_next([=](bool toggled) {
+			checkbox->setChecked(toggled);
+		}, checkbox->lifetime());
+		button->setClickedCallback([=] {
+			button->setChecked(!button->checked());
+			controller->toggleRequestsFromTop.fire_copy(button->checked());
+		});
+		overlay->setClickedCallback([=] {
+			checkbox->setChecked(!checkbox->checked());
+			controller->checkAllRequests.fire_copy(checkbox->checked());
+		});
+		createUsersList(controller);
+	};
+
+	Ui::AddSkip(inner);
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			(items.size() == 1)
+				? tr::lng_selected_delete_sure_this()
+				: tr::lng_selected_delete_sure(
+					lt_count,
+					rpl::single(items.size()) | tr::to_count()),
+			st::boxLabel));
+	Ui::AddSkip(inner);
+	Ui::AddSkip(inner);
+	Ui::AddSkip(inner);
+	{
+		const auto report = box->addRow(
+			object_ptr<Ui::Checkbox>(
+				box,
+				tr::lng_report_spam(tr::now),
+				false,
+				st::defaultBoxCheckbox),
+			st::boxRowPadding + buttonPadding);
+		if (!isSingle) {
+			appendList(report);
+		}
+	}
+
+	if (options & ModerateOption::DeleteAll) {
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+
+		const auto deleteAll = inner->add(
+			object_ptr<Ui::Checkbox>(
+				inner,
+				!(isSingle)
+					? tr::lng_delete_all_from_users(
+						tr::now,
+						Ui::Text::WithEntities)
+					: tr::lng_delete_all_from_user(
+						tr::now,
+						lt_user,
+						Ui::Text::Bold(items.front()->from()->name()),
+						Ui::Text::WithEntities),
+				false,
+				st::defaultBoxCheckbox),
+			st::boxRowPadding + buttonPadding);
+		if (!isSingle) {
+			appendList(deleteAll);
+		}
+	}
+	if (options & ModerateOption::Ban) {
+		auto ownedWrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			inner,
+			object_ptr<Ui::VerticalLayout>(inner));
+
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+		const auto ban = inner->add(
+			object_ptr<Ui::Checkbox>(
+				box,
+				rpl::conditional(
+					ownedWrap->toggledValue(),
+					tr::lng_context_restrict_user(),
+					rpl::conditional(
+						rpl::single(isSingle),
+						tr::lng_ban_user(),
+						tr::lng_ban_users())),
+				false,
+				st::defaultBoxCheckbox),
+			st::boxRowPadding + buttonPadding);
+		if (!isSingle) {
+			appendList(ban);
+		}
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+
+		const auto wrap = inner->add(std::move(ownedWrap));
+		const auto container = wrap->entity();
+		wrap->toggle(false, anim::type::instant);
+		auto label = object_ptr<Ui::FlatLabel>(
+			inner,
+			wrap->toggledValue(
+			) | rpl::map([isSingle](bool toggled) {
+				return Ui::Text::Link(
+					((toggled && isSingle)
+						? tr::lng_restrict_user_part
+						: (toggled && !isSingle)
+						? tr::lng_restrict_users_part
+						: isSingle
+						? tr::lng_restrict_user_full
+						: tr::lng_restrict_users_full)(tr::now),
+					u"internal:"_q);
+			}),
+			st::boxDividerLabel);
+
+		auto &lifetime = wrap->lifetime();
+		const auto scrollLifetime = lifetime.make_state<rpl::lifetime>();
+		label->setClickHandlerFilter([=](
+				const ClickHandlerPtr &handler,
+				Qt::MouseButton button) {
+			if (button != Qt::LeftButton) {
+				return false;
+			}
+			wrap->toggle(!wrap->toggled(), anim::type::normal);
+			{
+				const auto start = crl::now();
+				inner->heightValue(
+				) | rpl::start_with_next([=] {
+					if (!wrap->animating()) {
+						scrollLifetime->destroy();
+						Ui::PostponeCall(crl::guard(box, [=] {
+							box->scrollToY(std::numeric_limits<int>::max());
+						}));
+					} else {
+						box->scrollToY(std::numeric_limits<int>::max());
+					}
+				}, *scrollLifetime);
+			}
+			return true;
+		});
+
+		Ui::AddSkip(inner);
+		inner->add(object_ptr<Ui::DividerLabel>(
+			inner,
+			std::move(label),
+			st::defaultBoxDividerLabelPadding,
+			RectPart::Top | RectPart::Bottom));
+
+		using Flag = ChatRestriction;
+		using Flags = ChatRestrictions;
+		const auto peer = items.front()->history()->peer;
+		const auto chat = peer->asChat();
+		const auto channel = peer->asChannel();
+		const auto defaultRestrictions = chat
+			? chat->defaultRestrictions()
+			: channel->defaultRestrictions();
+		const auto prepareFlags = FixDependentRestrictions(
+			defaultRestrictions
+			| ((channel && channel->isPublic())
+				? (Flag::ChangeInfo | Flag::PinMessages)
+				: Flags(0)));
+		const auto disabledMessages = [&] {
+			auto result = base::flat_map<Flags, QString>();
+			{
+				const auto disabled = FixDependentRestrictions(
+					defaultRestrictions
+					| ((channel && channel->isPublic())
+						? (Flag::ChangeInfo | Flag::PinMessages)
+						: Flags(0)));
+				result.emplace(
+					disabled,
+					tr::lng_rights_restriction_for_all(tr::now));
+			}
+			return result;
+		}();
+
+		auto [checkboxes, getRestrictions, changes] = CreateEditRestrictions(
+			box,
+			rpl::conditional(
+				rpl::single(isSingle),
+				tr::lng_restrict_users_part_single_header(),
+				tr::lng_restrict_users_part_header(
+					lt_count,
+					rpl::single(users.size()) | tr::to_count())),
+			prepareFlags,
+			disabledMessages,
+			{ .isForum = peer->isForum() });
+		std::move(
+			changes
+		) | rpl::start_with_next([=] {
+			ban->setChecked(true);
+		}, ban->lifetime());
+		Ui::AddSkip(container);
+		Ui::AddDivider(container);
+		Ui::AddSkip(container);
+		container->add(std::move(checkboxes));
+	}
+	Ui::AddSkip(inner);
+
+	box->addButton(tr::lng_box_delete(), [=] { box->closeBox(); });
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
+bool CanCreateModerateMessagesBox(const HistoryItemsList &items) {
+	const auto options = CalculateModerateOptions(items);
+	return (options & ModerateOption::Ban)
+		|| (options & ModerateOption::DeleteAll);
+}
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.h b/Telegram/SourceFiles/boxes/moderate_messages_box.h
new file mode 100644
index 000000000..c2c9f25d5
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.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
+
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+void CreateModerateMessagesBox(
+	not_null<Ui::GenericBox*> box,
+	const HistoryItemsList &items);
+
+[[nodiscard]] bool CanCreateModerateMessagesBox(const HistoryItemsList &);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 69e474ea7..6d1014fa8 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 69e474ea775f115afb3e4afeb80d3227325dfcc4
+Subproject commit 6d1014fa8f67d4f997c0580a90df075008e0f34c

From 629da68cfcb69a4f0c03598659e7ef59b0a5d2f1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 26 Apr 2024 02:47:39 +0300
Subject: [PATCH 415/596] Added api support to moderation box.

---
 .../SourceFiles/api/api_chat_participants.cpp |  27 +++
 .../SourceFiles/api/api_chat_participants.h   |   7 +
 .../boxes/moderate_messages_box.cpp           | 165 +++++++++++++++---
 .../SourceFiles/boxes/moderate_messages_box.h |   3 +-
 .../boxes/peers/edit_participants_box.cpp     |  29 +--
 5 files changed, 182 insertions(+), 49 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
index d1c8650d3..a4cd0c367 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.cpp
+++ b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -592,6 +592,33 @@ ChatParticipants::Parsed ChatParticipants::ParseRecent(
 	return result;
 }
 
+void ChatParticipants::Restrict(
+		not_null<ChannelData*> channel,
+		not_null<PeerData*> participant,
+		ChatRestrictionsInfo oldRights,
+		ChatRestrictionsInfo newRights,
+		Fn<void()> onDone,
+		Fn<void()> onFail) {
+	channel->session().api().request(MTPchannels_EditBanned(
+		channel->inputChannel,
+		participant->input,
+		MTP_chatBannedRights(
+			MTP_flags(MTPDchatBannedRights::Flags::from_raw(
+				uint32(newRights.flags))),
+			MTP_int(newRights.until))
+	)).done([=](const MTPUpdates &result) {
+		channel->session().api().applyUpdates(result);
+		channel->applyEditBanned(participant, oldRights, newRights);
+		if (onDone) {
+			onDone();
+		}
+	}).fail([=] {
+		if (onFail) {
+			onFail();
+		}
+	}).send();
+}
+
 void ChatParticipants::requestSelf(not_null<ChannelData*> channel) {
 	if (_selfParticipantRequests.contains(channel)) {
 		return;
diff --git a/Telegram/SourceFiles/api/api_chat_participants.h b/Telegram/SourceFiles/api/api_chat_participants.h
index fbab3f425..ad5aa930f 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.h
+++ b/Telegram/SourceFiles/api/api_chat_participants.h
@@ -100,6 +100,13 @@ public:
 	static Parsed ParseRecent(
 		not_null<ChannelData*> channel,
 		const TLMembers &data);
+	static void Restrict(
+		not_null<ChannelData*> channel,
+		not_null<PeerData*> participant,
+		ChatRestrictionsInfo oldRights,
+		ChatRestrictionsInfo newRights,
+		Fn<void()> onDone,
+		Fn<void()> onFail);
 	void add(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 49d436700..a06fff512 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -7,15 +7,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/moderate_messages_box.h"
 
+#include "api/api_chat_participants.h"
+#include "apiwrap.h"
+#include "base/timer.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
+#include "data/data_chat_participant_status.h"
+#include "data/data_histories.h"
 #include "data/data_peer.h"
+#include "data/data_session.h"
 #include "data/data_user.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/toggle_arrow.h"
@@ -167,12 +174,21 @@ QPoint Button::prepareRippleStartPosition() const {
 
 void CreateModerateMessagesBox(
 		not_null<Ui::GenericBox*> box,
-		const HistoryItemsList &items) {
+		const HistoryItemsList &items,
+		Fn<void()> confirmed) {
+	using Users = std::vector<not_null<UserData*>>;
+	struct Controller final {
+		rpl::event_stream<bool> toggleRequestsFromTop;
+		rpl::event_stream<bool> toggleRequestsFromInner;
+		rpl::event_stream<bool> checkAllRequests;
+		Fn<Users()> collectRequests;
+	};
+	constexpr auto kSmallDelayMs = 5;
 	const auto options = CalculateModerateOptions(items);
 	const auto inner = box->verticalLayout();
 
 	const auto users = [&] {
-		auto result = std::vector<not_null<UserData*>>();
+		auto result = Users();
 		for (const auto &item : items) {
 			if (const auto user = item->from()->asUser()) {
 				if (!ranges::contains(result, not_null{ user })) {
@@ -184,16 +200,59 @@ void CreateModerateMessagesBox(
 	}();
 	Assert(!users.empty());
 
+	const auto confirms = inner->lifetime().make_state<rpl::event_stream<>>();
+
 	const auto isSingle = users.size() == 1;
 	const auto buttonPadding = isSingle
 		? QMargins()
 		: QMargins(0, 0, Button::ComputeSize(users.size()).width(), 0);
 
-	struct Controller final {
-		rpl::event_stream<bool> toggleRequestsFromTop;
-		rpl::event_stream<bool> toggleRequestsFromInner;
-		rpl::event_stream<bool> checkAllRequests;
+	using Request = Fn<void(not_null<UserData*>, not_null<ChannelData*>)>;
+	const auto sequentiallyRequest = [=](Request request, Users users) {
+		const auto session = &items.front()->history()->session();
+		const auto history = items.front()->history();
+		const auto peerId = history->peer->id;
+		const auto userIds = ranges::views::all(
+			users
+		) | ranges::views::transform([](not_null<UserData*> user) {
+			return user->id;
+		}) | ranges::to_vector;
+		const auto lifetime = std::make_shared<rpl::lifetime>();
+		const auto counter = lifetime->make_state<int>(0);
+		const auto timer = lifetime->make_state<base::Timer>();
+		timer->setCallback(crl::guard(session, [=] {
+			if ((*counter) < userIds.size()) {
+				const auto peer = session->data().peer(peerId);
+				const auto channel = peer ? peer->asChannel() : nullptr;
+				const auto from = session->data().peer(userIds[*counter]);
+				if (const auto user = from->asUser(); channel && user) {
+					request(user, channel);
+				}
+				(*counter)++;
+			} else {
+				lifetime->destroy();
+			}
+		}));
+		timer->callEach(kSmallDelayMs);
 	};
+
+	const auto handleConfirmation = [=](
+			not_null<Ui::Checkbox*> checkbox,
+			not_null<Controller*> controller,
+			Request request) {
+		confirms->events() | rpl::start_with_next([=] {
+			if (checkbox->checked()) {
+				if (isSingle) {
+					const auto item = items.front();
+					const auto channel = item->history()->peer->asChannel();
+					request(users.front(), channel);
+				} else if (const auto collect = controller->collectRequests) {
+					sequentiallyRequest(request, collect());
+				}
+			}
+		}, checkbox->lifetime());
+	};
+
 	const auto createUsersList = [&](not_null<Controller*> controller) {
 		const auto wrap = inner->add(
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -269,9 +328,21 @@ void CreateModerateMessagesBox(
 				c->setChecked(checked);
 			}
 		}, container->lifetime());
+
+		controller->collectRequests = [=] {
+			auto result = Users();
+			for (auto i = 0; i < checkboxes.size(); i++) {
+				if (checkboxes[i]->checked()) {
+					result.push_back(users[i]);
+				}
+			}
+			return result;
+		};
 	};
 
-	const auto appendList = [&](not_null<Ui::Checkbox*> checkbox) {
+	const auto appendList = [&](
+			not_null<Ui::Checkbox*> checkbox,
+			not_null<Controller*> controller) {
 		const auto button = Ui::CreateChild<Button>(inner, users.size());
 		button->resize(Button::ComputeSize(users.size()));
 
@@ -289,7 +360,6 @@ void CreateModerateMessagesBox(
 			button->raise();
 		}, button->lifetime());
 
-		const auto controller = checkbox->lifetime().make_state<Controller>();
 		controller->toggleRequestsFromInner.events(
 		) | rpl::start_with_next([=](bool toggled) {
 			checkbox->setChecked(toggled);
@@ -326,9 +396,29 @@ void CreateModerateMessagesBox(
 				false,
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
+		const auto controller = box->lifetime().make_state<Controller>();
 		if (!isSingle) {
-			appendList(report);
+			appendList(report, controller);
 		}
+		const auto ids = items.front()->from()->owner().itemsToIds(items);
+		handleConfirmation(report, controller, [=](
+				not_null<UserData*> u,
+				not_null<ChannelData*> c) {
+			auto filtered = QVector<MTPint>();
+			for (const auto &id : ids) {
+				if (const auto item = u->session().data().message(id)) {
+					if (item->from()->asUser() == u) {
+						filtered.push_back(MTP_int(item->fullId().msg));
+					}
+				}
+			}
+			u->session().api().request(
+				MTPchannels_ReportSpam(
+					c->inputChannel,
+					u->input,
+					MTP_vector<MTPint>(std::move(filtered)))
+			).send();
+		});
 	}
 
 	if (options & ModerateOption::DeleteAll) {
@@ -350,9 +440,16 @@ void CreateModerateMessagesBox(
 				false,
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
+
+		const auto controller = box->lifetime().make_state<Controller>();
 		if (!isSingle) {
-			appendList(deleteAll);
+			appendList(deleteAll, controller);
 		}
+		handleConfirmation(deleteAll, controller, [=](
+				not_null<UserData*> u,
+				not_null<ChannelData*> c) {
+			u->session().api().deleteAllFromParticipant(c, u);
+		});
 	}
 	if (options & ModerateOption::Ban) {
 		auto ownedWrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -374,8 +471,9 @@ void CreateModerateMessagesBox(
 				false,
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
+		const auto controller = box->lifetime().make_state<Controller>();
 		if (!isSingle) {
-			appendList(ban);
+			appendList(ban, controller);
 		}
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);
@@ -410,8 +508,7 @@ void CreateModerateMessagesBox(
 			wrap->toggle(!wrap->toggled(), anim::type::normal);
 			{
 				const auto start = crl::now();
-				inner->heightValue(
-				) | rpl::start_with_next([=] {
+				inner->heightValue() | rpl::start_with_next([=] {
 					if (!wrap->animating()) {
 						scrollLifetime->destroy();
 						Ui::PostponeCall(crl::guard(box, [=] {
@@ -471,20 +568,48 @@ void CreateModerateMessagesBox(
 			prepareFlags,
 			disabledMessages,
 			{ .isForum = peer->isForum() });
-		std::move(
-			changes
-		) | rpl::start_with_next([=] {
+		std::move(changes) | rpl::start_with_next([=] {
 			ban->setChecked(true);
 		}, ban->lifetime());
 		Ui::AddSkip(container);
 		Ui::AddDivider(container);
 		Ui::AddSkip(container);
 		container->add(std::move(checkboxes));
-	}
-	Ui::AddSkip(inner);
 
-	box->addButton(tr::lng_box_delete(), [=] { box->closeBox(); });
-	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+		handleConfirmation(ban, controller, [=](
+				not_null<UserData*> user,
+				not_null<ChannelData*> channel) {
+			if (wrap->toggled()) {
+				Api::ChatParticipants::Restrict(
+					channel,
+					user,
+					ChatRestrictionsInfo(), // Unused.
+					ChatRestrictionsInfo(getRestrictions(), 0),
+					nullptr,
+					nullptr);
+			} else {
+				channel->session().api().chatParticipants().kick(
+					channel,
+					user,
+					{ channel->restrictions(), 0 });
+			}
+		});
+	}
+
+	const auto close = crl::guard(box, [=] { box->closeBox(); });
+	box->addButton(tr::lng_box_delete(), [=] {
+		confirms->fire({});
+		box->closeBox();
+		const auto data = &users.front()->session().data();
+		const auto ids = data->itemsToIds(items);
+		if (confirmed) {
+			confirmed();
+		}
+		data->histories().deleteMessages(ids, true);
+		data->sendHistoryChangeNotifications();
+		close();
+	});
+	box->addButton(tr::lng_cancel(), close);
 }
 
 bool CanCreateModerateMessagesBox(const HistoryItemsList &items) {
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.h b/Telegram/SourceFiles/boxes/moderate_messages_box.h
index c2c9f25d5..351b49741 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.h
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.h
@@ -14,6 +14,7 @@ class GenericBox;
 
 void CreateModerateMessagesBox(
 	not_null<Ui::GenericBox*> box,
-	const HistoryItemsList &items);
+	const HistoryItemsList &items,
+	Fn<void()> confirmed);
 
 [[nodiscard]] bool CanCreateModerateMessagesBox(const HistoryItemsList &);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 725427007..88a349001 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -166,33 +166,6 @@ void SaveChannelAdmin(
 	}).send();
 }
 
-void SaveChannelRestriction(
-		not_null<ChannelData*> channel,
-		not_null<PeerData*> participant,
-		ChatRestrictionsInfo oldRights,
-		ChatRestrictionsInfo newRights,
-		Fn<void()> onDone,
-		Fn<void()> onFail) {
-	channel->session().api().request(MTPchannels_EditBanned(
-		channel->inputChannel,
-		participant->input,
-		MTP_chatBannedRights(
-			MTP_flags(MTPDchatBannedRights::Flags::from_raw(
-				uint32(newRights.flags))),
-			MTP_int(newRights.until))
-	)).done([=](const MTPUpdates &result) {
-		channel->session().api().applyUpdates(result);
-		channel->applyEditBanned(participant, oldRights, newRights);
-		if (onDone) {
-			onDone();
-		}
-	}).fail([=] {
-		if (onFail) {
-			onFail();
-		}
-	}).send();
-}
-
 void SaveChatParticipantKick(
 		not_null<ChatData*> chat,
 		not_null<UserData*> user,
@@ -275,7 +248,7 @@ Fn<void(
 			ChatRestrictionsInfo newRights) {
 		const auto done = [=] { if (onDone) onDone(newRights); };
 		const auto saveForChannel = [=](not_null<ChannelData*> channel) {
-			SaveChannelRestriction(
+			Api::ChatParticipants::Restrict(
 				channel,
 				participant,
 				oldRights,

From 82293c98eb5ca1088fbab9e2073aeee7a49195cf Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 26 Apr 2024 04:05:02 +0300
Subject: [PATCH 416/596] Added arrow icon to divider link in moderation box.

---
 Telegram/Resources/langs/lang.strings         |  8 +--
 Telegram/SourceFiles/boxes/boxes.style        |  7 +++
 .../boxes/moderate_messages_box.cpp           | 57 ++++++++++++++-----
 3 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1174605db..eb3f33fc7 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2858,10 +2858,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_restrict_users" = "Restrict users";
 "lng_delete_all_from_user" = "Delete all from {user}";
 "lng_delete_all_from_users" = "Delete all from users";
-"lng_restrict_user_part" = "Partially restrict this user";
-"lng_restrict_users_part" = "Partially restrict users";
-"lng_restrict_user_full" = "Fully ban this user";
-"lng_restrict_users_full" = "Fully ban users";
+"lng_restrict_user_part" = "Partially restrict this user {emoji}";
+"lng_restrict_users_part" = "Partially restrict users {emoji}";
+"lng_restrict_user_full" = "Fully ban this user {emoji}";
+"lng_restrict_users_full" = "Fully ban users {emoji}";
 "lng_restrict_users_part_single_header" = "What can this user do?";
 "lng_restrict_users_part_header#one" = "What can {count} selected user do?";
 "lng_restrict_users_part_header#other" = "What can {count} selected users do?";
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index ef166d580..582468070 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -1087,3 +1087,10 @@ moderateBoxExpandInnerSkip: 2px;
 moderateBoxExpandFont: font(11px);
 moderateBoxExpandToggleSize: 4px;
 moderateBoxExpandToggleFourStrokes: 3px;
+moderateBoxExpandIcon: icon{{ "info/edit/expand_arrow_small-flip_vertical", windowActiveTextFg }};
+moderateBoxExpandIconDown: icon{{ "info/edit/expand_arrow_small", windowActiveTextFg }};
+moderateBoxDividerLabel: FlatLabel(boxDividerLabel) {
+	palette: TextPalette(defaultTextPalette) {
+		selectLinkFg: windowActiveTextFg;
+	}
+}
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index a06fff512..8117c7e77 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
+#include "core/ui_integration.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_chat_participant_status.h"
@@ -19,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
@@ -481,21 +483,29 @@ void CreateModerateMessagesBox(
 		const auto wrap = inner->add(std::move(ownedWrap));
 		const auto container = wrap->entity();
 		wrap->toggle(false, anim::type::instant);
+
+		const auto session = &users.front()->session();
+		const auto emojiMargin = QMargins(
+			-st::moderateBoxExpandInnerSkip,
+			-st::moderateBoxExpandInnerSkip / 2,
+			0,
+			0);
+		const auto emojiUp = Ui::Text::SingleCustomEmoji(
+			session->data().customEmojiManager().registerInternalEmoji(
+				st::moderateBoxExpandIcon,
+				emojiMargin,
+				false));
+		const auto emojiDown = Ui::Text::SingleCustomEmoji(
+			session->data().customEmojiManager().registerInternalEmoji(
+				st::moderateBoxExpandIconDown,
+				emojiMargin,
+				false));
+
 		auto label = object_ptr<Ui::FlatLabel>(
 			inner,
-			wrap->toggledValue(
-			) | rpl::map([isSingle](bool toggled) {
-				return Ui::Text::Link(
-					((toggled && isSingle)
-						? tr::lng_restrict_user_part
-						: (toggled && !isSingle)
-						? tr::lng_restrict_users_part
-						: isSingle
-						? tr::lng_restrict_user_full
-						: tr::lng_restrict_users_full)(tr::now),
-					u"internal:"_q);
-			}),
-			st::boxDividerLabel);
+			QString(),
+			st::moderateBoxDividerLabel);
+		const auto raw = label.data();
 
 		auto &lifetime = wrap->lifetime();
 		const auto scrollLifetime = lifetime.make_state<rpl::lifetime>();
@@ -521,6 +531,27 @@ void CreateModerateMessagesBox(
 			}
 			return true;
 		});
+		wrap->toggledValue(
+		) | rpl::map([isSingle, emojiUp, emojiDown](bool toggled) {
+			return ((toggled && isSingle)
+				? tr::lng_restrict_user_part
+				: (toggled && !isSingle)
+				? tr::lng_restrict_users_part
+				: isSingle
+				? tr::lng_restrict_user_full
+				: tr::lng_restrict_users_full)(
+					lt_emoji,
+					rpl::single(toggled ? emojiUp : emojiDown),
+					Ui::Text::WithEntities);
+		}) | rpl::flatten_latest(
+		) | rpl::start_with_next([=](const TextWithEntities &text) {
+			raw->setMarkedText(
+				Ui::Text::Link(text, u"internal:"_q),
+				Core::MarkedTextContext{
+					.session = session,
+					.customEmojiRepaint = [=] { raw->update(); },
+				});
+		}, label->lifetime());
 
 		Ui::AddSkip(inner);
 		inner->add(object_ptr<Ui::DividerLabel>(

From e5b91d2f3dfe35783e83ebbe7a7be737aeae9cde Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 26 Apr 2024 11:16:33 +0300
Subject: [PATCH 417/596] Added entry points for moderation box.

---
 .../history/history_inner_widget.cpp          | 10 ++++++--
 .../SourceFiles/history/history_widget.cpp    | 23 +++++++++++++------
 .../view/history_view_context_menu.cpp        | 13 ++++++++---
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 27b54f79d..ae28620d5 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_helpers.h"
 #include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/controls/history_view_draft_options.h"
+#include "boxes/moderate_messages_box.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/media/history_view_web_page.h"
 #include "history/view/reactions/history_view_reactions_button.h"
@@ -4269,8 +4270,13 @@ void HistoryInner::deleteItem(not_null<HistoryItem*> item) {
 		_controller->cancelUploadLayer(item);
 		return;
 	}
-	const auto suggestModerateActions = true;
-	_controller->show(Box<DeleteMessagesBox>(item, suggestModerateActions));
+	const auto list = HistoryItemsList{ item };
+	if (CanCreateModerateMessagesBox(list)) {
+		_controller->show(Box(CreateModerateMessagesBox, list, nullptr));
+	} else {
+		const auto suggestModerate = false;
+		_controller->show(Box<DeleteMessagesBox>(item, suggestModerate));
+	}
 }
 
 bool HistoryInner::hasPendingResizedItems() const {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 427d7dc37..fdd4935a0 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/send_files_box.h"
 #include "boxes/share_box.h"
 #include "boxes/edit_caption_box.h"
+#include "boxes/moderate_messages_box.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/premium_preview_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h" // ShowAboutGigagroup.
@@ -7953,15 +7954,23 @@ void HistoryWidget::forwardSelected() {
 void HistoryWidget::confirmDeleteSelected() {
 	if (!_list) return;
 
-	auto items = _list->getSelectedItems();
-	if (items.empty()) {
+	auto ids = _list->getSelectedItems();
+	if (ids.empty()) {
 		return;
 	}
-	auto box = Box<DeleteMessagesBox>(&session(), std::move(items));
-	box->setDeleteConfirmedCallback(crl::guard(this, [=] {
-		clearSelected();
-	}));
-	controller()->show(std::move(box));
+	const auto items = session().data().idsToItems(ids);
+	if (CanCreateModerateMessagesBox(items)) {
+		controller()->show(Box(
+			CreateModerateMessagesBox,
+			items,
+			crl::guard(this, [=] { clearSelected(); })));
+	} else {
+		auto box = Box<DeleteMessagesBox>(&session(), std::move(ids));
+		box->setDeleteConfirmedCallback(crl::guard(this, [=] {
+			clearSelected();
+		}));
+		controller()->show(std::move(box));
+	}
 }
 
 void HistoryWidget::escape() {
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 22d3292a3..94e34092d 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -47,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/fields/input_field.h"
 #include "ui/power_saving.h"
 #include "boxes/delete_messages_box.h"
+#include "boxes/moderate_messages_box.h"
 #include "boxes/report_messages_box.h"
 #include "boxes/sticker_set_box.h"
 #include "boxes/stickers_box.h"
@@ -828,9 +829,15 @@ bool AddDeleteMessageAction(
 				controller->cancelUploadLayer(item);
 				return;
 			}
-			const auto suggestModerateActions = true;
-			controller->show(
-				Box<DeleteMessagesBox>(item, suggestModerateActions));
+			const auto list = HistoryItemsList{ item };
+			if (CanCreateModerateMessagesBox(list)) {
+				controller->show(
+					Box(CreateModerateMessagesBox, list, nullptr));
+			} else {
+				const auto suggestModerateActions = false;
+				controller->show(
+					Box<DeleteMessagesBox>(item, suggestModerateActions));
+			}
 		}
 	});
 	if (item->isUploading()) {

From 612b81ee87ccac962af66da560ceb46533deb2f9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 26 Apr 2024 14:01:23 +0300
Subject: [PATCH 418/596] Fixed allowed reactions for channel posts in linked
 chats.

---
 Telegram/SourceFiles/data/data_message_reactions.cpp | 10 +++++++++-
 Telegram/SourceFiles/history/history_item.cpp        |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index 617e07e7e..4dbe1dc87 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "main/main_session.h"
 #include "main/main_app_config.h"
 #include "main/session/send_as_peers.h"
@@ -137,7 +138,14 @@ PossibleItemReactionsRef LookupPossibleReactions(
 		return {};
 	}
 	auto result = PossibleItemReactionsRef();
-	const auto peer = item->history()->peer;
+	auto peer = item->history()->peer;
+	if (item->isDiscussionPost()) {
+		if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
+			if (forwarded->savedFromPeer) {
+				peer = forwarded->savedFromPeer;
+			}
+		}
+	}
 	const auto session = &peer->session();
 	const auto reactions = &session->data().reactions();
 	const auto &full = reactions->list(Reactions::Type::Active);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 079051b8c..0695742bb 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -3427,6 +3427,14 @@ void HistoryItem::setupForwardedComponent(const CreateConfig &config) {
 	forwarded->savedFromMsgId = config.savedFromMsgId;
 	forwarded->savedFromSender = _history->owner().peerLoaded(
 		config.savedFromSenderId);
+	if (forwarded->savedFromPeer
+		&& !forwarded->savedFromPeer->isFullLoaded()
+		&& forwarded->savedFromPeer->isChannel()) {
+		_history->session().api().requestFullPeer(forwarded->savedFromPeer);
+	} else if (config.savedFromPeer) {
+		_history->session().api().requestFullPeer(
+			_history->owner().peer(config.savedFromPeer));
+	}
 	forwarded->savedFromOutgoing = config.savedFromOutgoing;
 	if (!forwarded->savedFromSender
 		&& !config.savedFromSenderName.isEmpty()) {

From 12a78c1f45e52637f0e7cfd4830f4fb4f850132f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Apr 2024 16:06:30 +0400
Subject: [PATCH 419/596] Allow pasting text to the unfocused search.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 33 +++++++++++++++----
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 ++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 856019d0f..13b83753c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3264,13 +3264,7 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		} else {
 			_inner->selectSkipPage(_scroll->height(), -1);
 		}
-	} else if (!(e->modifiers() & ~Qt::ShiftModifier)
-		&& e->key() != Qt::Key_Shift
-		&& !_openedFolder
-		&& !_openedForum
-		&& _search->isVisible()
-		&& !_search->hasFocus()
-		&& !e->text().isEmpty()) {
+	} else if (redirectKeyToSearch(e)) {
 		// This delay in search focus processing allows us not to create
 		// _suggestions in case the event inserts some non-whitespace search
 		// query while still show _suggestions animated, if it is a space.
@@ -3284,6 +3278,31 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
+bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
+	if (_openedFolder
+		|| _openedForum
+		|| !_search->isVisible()
+		|| _search->hasFocus()) {
+		return false;
+	}
+	const auto character = !(e->modifiers() & ~Qt::ShiftModifier)
+		&& (e->key() != Qt::Key_Shift)
+		&& !e->text().isEmpty();
+	if (character) {
+		return true;
+	} else if (e != QKeySequence::Paste) {
+		return false;
+	}
+	const auto useSelectionMode = (e->key() == Qt::Key_Insert)
+		&& (e->modifiers() == (Qt::CTRL | Qt::SHIFT))
+		&& QGuiApplication::clipboard()->supportsSelection();
+	const auto pasteMode = useSelectionMode
+		? QClipboard::Selection
+		: QClipboard::Clipboard;
+	const auto data = QGuiApplication::clipboard()->mimeData(pasteMode);
+	return data && data->hasText();
+}
+
 void Widget::paintEvent(QPaintEvent *e) {
 	if (controller()->contentOverlapped(this, e)) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 7218c2513..ecd2f3608 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -250,6 +250,8 @@ private:
 	void updateSuggestions(anim::type animated);
 	void processSearchFocusChange();
 
+	[[nodiscard]] bool redirectKeyToSearch(QKeyEvent *e) const;
+
 	MTP::Sender _api;
 
 	bool _dragInScroll = false;

From b3ae843f0e174e9823e0a447a5025882007100e6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 20 Apr 2024 00:11:25 +0400
Subject: [PATCH 420/596] Update API scheme to layer 179.

---
 Telegram/SourceFiles/api/api_confirm_phone.cpp       |  4 ++++
 Telegram/SourceFiles/data/data_poll.cpp              | 12 ++++++++----
 .../SourceFiles/export/data/export_data_types.cpp    |  4 ++--
 Telegram/SourceFiles/intro/intro_step.cpp            |  4 ++++
 Telegram/SourceFiles/mtproto/scheme/api.tl           |  9 ++++++---
 .../passport/passport_form_controller.cpp            |  4 ++++
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_confirm_phone.cpp b/Telegram/SourceFiles/api/api_confirm_phone.cpp
index 0dd1ae9a7..f4788e128 100644
--- a/Telegram/SourceFiles/api/api_confirm_phone.cpp
+++ b/Telegram/SourceFiles/api/api_confirm_phone.cpp
@@ -62,6 +62,10 @@ void ConfirmPhone::resolve(
 				return bad("FirebaseSms");
 			}, [&](const MTPDauth_sentCodeTypeEmailCode &) {
 				return bad("EmailCode");
+			}, [&](const MTPDauth_sentCodeTypeSmsWord &) {
+				return bad("SmsWord");
+			}, [&](const MTPDauth_sentCodeTypeSmsPhrase &) {
+				return bad("SmsPhrase");
 			}, [&](const MTPDauth_sentCodeTypeSetUpEmailRequired &) {
 				return bad("SetUpEmailRequired");
 			});
diff --git a/Telegram/SourceFiles/data/data_poll.cpp b/Telegram/SourceFiles/data/data_poll.cpp
index 800f3ee32..a7c386d0c 100644
--- a/Telegram/SourceFiles/data/data_poll.cpp
+++ b/Telegram/SourceFiles/data/data_poll.cpp
@@ -69,7 +69,7 @@ bool PollData::closeByTimer() {
 bool PollData::applyChanges(const MTPDpoll &poll) {
 	Expects(poll.vid().v == id);
 
-	const auto newQuestion = qs(poll.vquestion());
+	const auto newQuestion = qs(poll.vquestion().data().vtext());
 	const auto newFlags = (poll.is_closed() ? Flag::Closed : Flag(0))
 		| (poll.is_public_voters() ? Flag::PublicVotes : Flag(0))
 		| (poll.is_multiple_choice() ? Flag::MultiChoice : Flag(0))
@@ -82,7 +82,7 @@ bool PollData::applyChanges(const MTPDpoll &poll) {
 		return data.match([](const MTPDpollAnswer &answer) {
 			auto result = PollAnswer();
 			result.option = answer.voption().v;
-			result.text = qs(answer.vtext());
+			result.text = qs(answer.vtext().data().vtext());
 			return result;
 		});
 	}) | ranges::views::take(
@@ -253,7 +253,9 @@ bool PollData::quiz() const {
 MTPPoll PollDataToMTP(not_null<const PollData*> poll, bool close) {
 	const auto convert = [](const PollAnswer &answer) {
 		return MTP_pollAnswer(
-			MTP_string(answer.text),
+			MTP_textWithEntities(
+				MTP_string(answer.text),
+				MTP_vector<MTPMessageEntity>()),
 			MTP_bytes(answer.option));
 	};
 	auto answers = QVector<MTPPollAnswer>();
@@ -272,7 +274,9 @@ MTPPoll PollDataToMTP(not_null<const PollData*> poll, bool close) {
 	return MTP_poll(
 		MTP_long(poll->id),
 		MTP_flags(flags),
-		MTP_string(poll->question),
+		MTP_textWithEntities(
+			MTP_string(poll->question),
+			MTP_vector<MTPMessageEntity>()),
 		MTP_vector<MTPPollAnswer>(answers),
 		MTP_int(poll->closePeriod),
 		MTP_int(poll->closeDate));
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 2e08b24f7..c4b55f346 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -668,14 +668,14 @@ Poll ParsePoll(const MTPDmessageMediaPoll &data) {
 	auto result = Poll();
 	data.vpoll().match([&](const MTPDpoll &poll) {
 		result.id = poll.vid().v;
-		result.question = ParseString(poll.vquestion());
+		result.question = ParseString(poll.vquestion().data().vtext());
 		result.closed = poll.is_closed();
 		result.answers = ranges::views::all(
 			poll.vanswers().v
 		) | ranges::views::transform([](const MTPPollAnswer &answer) {
 			return answer.match([](const MTPDpollAnswer &answer) {
 				auto result = Poll::Answer();
-				result.text = ParseString(answer.vtext());
+				result.text = ParseString(answer.vtext().data().vtext());
 				result.option = answer.voption().v;
 				return result;
 			});
diff --git a/Telegram/SourceFiles/intro/intro_step.cpp b/Telegram/SourceFiles/intro/intro_step.cpp
index c3181bd7c..9e9a266f6 100644
--- a/Telegram/SourceFiles/intro/intro_step.cpp
+++ b/Telegram/SourceFiles/intro/intro_step.cpp
@@ -369,6 +369,10 @@ void Step::fillSentCodeData(const MTPDauth_sentCode &data) {
 		bad("FirebaseSms");
 	}, [&](const MTPDauth_sentCodeTypeEmailCode &) {
 		bad("EmailCode");
+	}, [&](const MTPDauth_sentCodeTypeSmsWord &) {
+		bad("SmsWord");
+	}, [&](const MTPDauth_sentCodeTypeSmsPhrase &) {
+		bad("SmsPhrase");
 	}, [&](const MTPDauth_sentCodeTypeSetUpEmailRequired &) {
 		bad("SetUpEmailRequired");
 	});
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index b55127064..a75781792 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -758,6 +758,8 @@ auth.sentCodeTypeEmailCode#f450f59b flags:# apple_signin_allowed:flags.0?true go
 auth.sentCodeTypeSetUpEmailRequired#a5491dea flags:# apple_signin_allowed:flags.0?true google_signin_allowed:flags.1?true = auth.SentCodeType;
 auth.sentCodeTypeFragmentSms#d9565c39 url:string length:int = auth.SentCodeType;
 auth.sentCodeTypeFirebaseSms#e57b1432 flags:# nonce:flags.0?bytes receipt:flags.1?string push_timeout:flags.1?int length:int = auth.SentCodeType;
+auth.sentCodeTypeSmsWord#a416ac81 flags:# beginning:flags.0?string = auth.SentCodeType;
+auth.sentCodeTypeSmsPhrase#b37794af flags:# beginning:flags.0?string = auth.SentCodeType;
 
 messages.botCallbackAnswer#36585ea4 flags:# alert:flags.1?true has_url:flags.3?true native_ui:flags.4?true message:flags.0?string url:flags.2?string cache_time:int = messages.BotCallbackAnswer;
 
@@ -1149,9 +1151,9 @@ help.supportName#8c05f1c9 name:string = help.SupportName;
 help.userInfoEmpty#f3ae2eed = help.UserInfo;
 help.userInfo#1eb3758 message:string entities:Vector<MessageEntity> author:string date:int = help.UserInfo;
 
-pollAnswer#6ca9c2e9 text:string option:bytes = PollAnswer;
+pollAnswer#ff16e2ca text:TextWithEntities option:bytes = PollAnswer;
 
-poll#86e18161 id:long flags:# closed:flags.0?true public_voters:flags.1?true multiple_choice:flags.2?true quiz:flags.3?true question:string answers:Vector<PollAnswer> close_period:flags.4?int close_date:flags.5?int = Poll;
+poll#58747131 id:long flags:# closed:flags.0?true public_voters:flags.1?true multiple_choice:flags.2?true quiz:flags.3?true question:TextWithEntities answers:Vector<PollAnswer> close_period:flags.4?int close_date:flags.5?int = Poll;
 
 pollAnswerVoters#3b6ddad2 flags:# chosen:flags.0?true correct:flags.1?true option:bytes voters:int = PollAnswerVoters;
 
@@ -1808,6 +1810,7 @@ auth.checkRecoveryPassword#d36bf79 code:string = Bool;
 auth.importWebTokenAuthorization#2db873a9 api_id:int api_hash:string web_auth_token:string = auth.Authorization;
 auth.requestFirebaseSms#89464b50 flags:# phone_number:string phone_code_hash:string safety_net_token:flags.0?string ios_push_secret:flags.1?string = Bool;
 auth.resetLoginEmail#7e960193 phone_number:string phone_code_hash:string = auth.SentCode;
+auth.reportMissingCode#cb9deff6 phone_number:string phone_code_hash:string mnc:string = Bool;
 
 account.registerDevice#ec86017a flags:# no_muted:flags.0?true token_type:int token:string app_sandbox:Bool secret:bytes other_uids:Vector<long> = Bool;
 account.unregisterDevice#6a0d3206 token_type:int token:string other_uids:Vector<long> = Bool;
@@ -2424,4 +2427,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 178
+// LAYER 179
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index b0ad0fcdf..eafb62369 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -2217,6 +2217,10 @@ void FormController::startPhoneVerification(not_null<Value*> value) {
 				bad("FirebaseSms");
 			}, [&](const MTPDauth_sentCodeTypeEmailCode &) {
 				bad("EmailCode");
+			}, [&](const MTPDauth_sentCodeTypeSmsWord &) {
+				bad("SmsWord");
+			}, [&](const MTPDauth_sentCodeTypeSmsPhrase &) {
+				bad("SmsPhrase");
 			}, [&](const MTPDauth_sentCodeTypeSetUpEmailRequired &) {
 				bad("SetUpEmailRequired");
 			});

From e6c22ec1ca32545ff54fca37e4f2cc59106beb8d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 22 Apr 2024 13:12:26 +0300
Subject: [PATCH 421/596] Added api support for custom emoji in polls.

---
 .../SourceFiles/boxes/create_poll_box.cpp     | 16 +++++++--
 .../SourceFiles/data/data_media_types.cpp     | 26 +++++++-------
 Telegram/SourceFiles/data/data_poll.cpp       | 29 ++++++++++-----
 Telegram/SourceFiles/data/data_poll.h         |  4 +--
 .../view/history_view_context_menu.cpp        |  6 ++--
 .../history/view/media/history_view_poll.cpp  | 36 +++++++++++++------
 .../polls/info_polls_results_inner_widget.cpp | 16 ++++-----
 .../window/notifications_manager.cpp          |  2 +-
 8 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 373899be4..7ec93239b 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -456,10 +456,16 @@ void Options::Option::removePlaceholder() const {
 PollAnswer Options::Option::toPollAnswer(int index) const {
 	Expects(index >= 0 && index < kMaxOptionsCount);
 
+	const auto text = field()->getTextWithTags();
+
 	auto result = PollAnswer{
-		field()->getLastText().trimmed(),
-		QByteArray(1, ('0' + index))
+		TextWithEntities{
+			.text = text.text,
+			.entities = TextUtilities::ConvertTextTagsToEntities(text.tags),
+		},
+		QByteArray(1, ('0' + index)),
 	};
+	TextUtilities::Trim(result.text);
 	result.correct = _correct ? _correct->entity()->Checkbox::checked() : false;
 	return result;
 }
@@ -1029,9 +1035,13 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 	};
 
 	const auto collectResult = [=] {
+		const auto textWithTags = question->getTextWithTags();
 		using Flag = PollData::Flag;
 		auto result = PollData(&_controller->session().data(), id);
-		result.question = question->getLastText().trimmed();
+		result.question.text = textWithTags.text;
+		result.question.entities = TextUtilities::ConvertTextTagsToEntities(
+			textWithTags.tags);
+		TextUtilities::Trim(result.question);
 		result.answers = options->toPollAnswers();
 		const auto solutionWithTags = quiz->checked()
 			? solution->getTextWithAppliedMarkdown()
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index f82b4522f..e6dd5006a 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1857,23 +1857,21 @@ TextWithEntities MediaPoll::notificationText() const {
 }
 
 QString MediaPoll::pinnedTextSubstring() const {
-	return QChar(171) + _poll->question + QChar(187);
+	return QChar(171) + _poll->question.text + QChar(187);
 }
 
 TextForMimeData MediaPoll::clipboardText() const {
-	const auto text = u"[ "_q
-		+ tr::lng_in_dlg_poll(tr::now)
-		+ u" : "_q
-		+ _poll->question
-		+ u" ]"_q
-		+ ranges::accumulate(
-			ranges::views::all(
-				_poll->answers
-			) | ranges::views::transform([](const PollAnswer &answer) {
-				return "\n- " + answer.text;
-			}),
-			QString());
-	return TextForMimeData::Simple(text);
+	auto result = TextWithEntities();
+	result
+		.append(u"[ "_q)
+		.append(tr::lng_in_dlg_poll(tr::now))
+		.append(u" : "_q)
+		.append(_poll->question)
+		.append(u" ]"_q);
+	for (const auto &answer : _poll->answers) {
+		result.append(u"\n- "_q).append(answer.text);
+	}
+	return TextForMimeData::Rich(std::move(result));
 }
 
 bool MediaPoll::updateInlineResultMedia(const MTPMessageMedia &media) {
diff --git a/Telegram/SourceFiles/data/data_poll.cpp b/Telegram/SourceFiles/data/data_poll.cpp
index a7c386d0c..64a3176d5 100644
--- a/Telegram/SourceFiles/data/data_poll.cpp
+++ b/Telegram/SourceFiles/data/data_poll.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_poll.h"
 
+#include "api/api_text_entities.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
 #include "base/call_delayed.h"
@@ -69,7 +70,12 @@ bool PollData::closeByTimer() {
 bool PollData::applyChanges(const MTPDpoll &poll) {
 	Expects(poll.vid().v == id);
 
-	const auto newQuestion = qs(poll.vquestion().data().vtext());
+	const auto newQuestion = TextWithEntities{
+		.text = qs(poll.vquestion().data().vtext()),
+		.entities = Api::EntitiesFromMTP(
+			&session(),
+			poll.vquestion().data().ventities().v),
+	};
 	const auto newFlags = (poll.is_closed() ? Flag::Closed : Flag(0))
 		| (poll.is_public_voters() ? Flag::PublicVotes : Flag(0))
 		| (poll.is_multiple_choice() ? Flag::MultiChoice : Flag(0))
@@ -78,11 +84,16 @@ bool PollData::applyChanges(const MTPDpoll &poll) {
 	const auto newClosePeriod = poll.vclose_period().value_or_empty();
 	auto newAnswers = ranges::views::all(
 		poll.vanswers().v
-	) | ranges::views::transform([](const MTPPollAnswer &data) {
-		return data.match([](const MTPDpollAnswer &answer) {
+	) | ranges::views::transform([&](const MTPPollAnswer &data) {
+		return data.match([&](const MTPDpollAnswer &answer) {
 			auto result = PollAnswer();
 			result.option = answer.voption().v;
-			result.text = qs(answer.vtext().data().vtext());
+			result.text = TextWithEntities{
+				.text = qs(answer.vtext().data().vtext()),
+				.entities = Api::EntitiesFromMTP(
+					&session(),
+					answer.vtext().data().ventities().v),
+			};
 			return result;
 		});
 	}) | ranges::views::take(
@@ -251,11 +262,11 @@ bool PollData::quiz() const {
 }
 
 MTPPoll PollDataToMTP(not_null<const PollData*> poll, bool close) {
-	const auto convert = [](const PollAnswer &answer) {
+	const auto convert = [&](const PollAnswer &answer) {
 		return MTP_pollAnswer(
 			MTP_textWithEntities(
-				MTP_string(answer.text),
-				MTP_vector<MTPMessageEntity>()),
+				MTP_string(answer.text.text),
+				Api::EntitiesToMTP(&poll->session(), answer.text.entities)),
 			MTP_bytes(answer.option));
 	};
 	auto answers = QVector<MTPPollAnswer>();
@@ -275,8 +286,8 @@ MTPPoll PollDataToMTP(not_null<const PollData*> poll, bool close) {
 		MTP_long(poll->id),
 		MTP_flags(flags),
 		MTP_textWithEntities(
-			MTP_string(poll->question),
-			MTP_vector<MTPMessageEntity>()),
+			MTP_string(poll->question.text),
+			Api::EntitiesToMTP(&poll->session(), poll->question.entities)),
 		MTP_vector<MTPPollAnswer>(answers),
 		MTP_int(poll->closePeriod),
 		MTP_int(poll->closeDate));
diff --git a/Telegram/SourceFiles/data/data_poll.h b/Telegram/SourceFiles/data/data_poll.h
index 4f428479b..49dd02173 100644
--- a/Telegram/SourceFiles/data/data_poll.h
+++ b/Telegram/SourceFiles/data/data_poll.h
@@ -16,7 +16,7 @@ class Session;
 } // namespace Main
 
 struct PollAnswer {
-	QString text;
+	TextWithEntities text;
 	QByteArray option;
 	int votes = 0;
 	bool chosen = false;
@@ -65,7 +65,7 @@ struct PollData {
 	[[nodiscard]] bool quiz() const;
 
 	PollId id = 0;
-	QString question;
+	TextWithEntities question;
 	std::vector<PollAnswer> answers;
 	std::vector<not_null<PeerData*>> recentVoters;
 	std::vector<QByteArray> sendingVotes;
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 94e34092d..a7a24e44b 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1307,15 +1307,15 @@ void AddPollActions(
 		const auto radio = QString::fromUtf8(kRadio);
 		auto text = poll->question;
 		for (const auto &answer : poll->answers) {
-			text += '\n' + radio + answer.text;
+			text.append('\n').append(radio).append(answer.text);
 		}
-		if (!Ui::SkipTranslate({ text })) {
+		if (!Ui::SkipTranslate(text)) {
 			menu->addAction(tr::lng_context_translate(tr::now), [=] {
 				controller->show(Box(
 					Ui::TranslateBox,
 					item->history()->peer,
 					MsgId(),
-					TextWithEntities{ .text = text },
+					std::move(text),
 					item->forbidsForward()));
 			}, &st::menuIconTranslate);
 		}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
index 82ca69e8f..6f924fc2e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/media/history_view_poll.h"
 
+#include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "lang/lang_keys.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -154,7 +155,10 @@ struct Poll::SendingAnimation {
 struct Poll::Answer {
 	Answer();
 
-	void fillData(not_null<PollData*> poll, const PollAnswer &original);
+	void fillData(
+		not_null<PollData*> poll,
+		const PollAnswer &original,
+		Core::MarkedTextContext context);
 
 	Ui::Text::String text;
 	QByteArray option;
@@ -201,16 +205,18 @@ Poll::Answer::Answer() : text(st::msgMinWidth / 2) {
 
 void Poll::Answer::fillData(
 		not_null<PollData*> poll,
-		const PollAnswer &original) {
+		const PollAnswer &original,
+		Core::MarkedTextContext context) {
 	chosen = original.chosen;
 	correct = poll->quiz() ? original.correct : chosen;
-	if (!text.isEmpty() && text.toString() == original.text) {
+	if (!text.isEmpty() && text.toTextWithEntities() == original.text) {
 		return;
 	}
-	text.setText(
+	text.setMarkedText(
 		st::historyPollAnswerStyle,
 		original.text,
-		Ui::WebpageTextTitleOptions());
+		Ui::WebpageTextTitleOptions(),
+		context);
 }
 
 Poll::CloseInformation::CloseInformation(
@@ -383,13 +389,18 @@ void Poll::updateTexts() {
 	const auto willStartAnimation = checkAnimationStart();
 	const auto voted = _voted;
 
-	if (_question.toString() != _poll->question) {
+	if (_question.toTextWithEntities() != _poll->question) {
 		auto options = Ui::WebpageTextTitleOptions();
 		options.maxw = options.maxh = 0;
-		_question.setText(
+		_question.setMarkedText(
 			st::historyPollQuestionStyle,
 			_poll->question,
-			options);
+			options,
+			Core::MarkedTextContext{
+				.session = &_poll->session(),
+				.customEmojiRepaint = [=] { repaint(); },
+				.customEmojiLoopLimit = 2,
+			});
 	}
 	if (_flags != _poll->flags() || _subtitle.isEmpty()) {
 		using Flag = PollData::Flag;
@@ -514,6 +525,11 @@ void Poll::updateRecentVoters() {
 }
 
 void Poll::updateAnswers() {
+	const auto context = Core::MarkedTextContext{
+		.session = &_poll->session(),
+		.customEmojiRepaint = [=] { repaint(); },
+		.customEmojiLoopLimit = 2,
+	};
 	const auto changed = !ranges::equal(
 		_answers,
 		_poll->answers,
@@ -523,7 +539,7 @@ void Poll::updateAnswers() {
 	if (!changed) {
 		auto &&answers = ranges::views::zip(_answers, _poll->answers);
 		for (auto &&[answer, original] : answers) {
-			answer.fillData(_poll, original);
+			answer.fillData(_poll, original, context);
 		}
 		return;
 	}
@@ -532,7 +548,7 @@ void Poll::updateAnswers() {
 	) | ranges::views::transform([&](const PollAnswer &answer) {
 		auto result = Answer();
 		result.option = answer.option;
-		result.fillData(_poll, answer);
+		result.fillData(_poll, answer, context);
 		return result;
 	}) | ranges::to_vector;
 
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 3d42cb8c0..9fa9ac483 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
@@ -8,17 +8,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/polls/info_polls_results_inner_widget.h"
 
 #include "info/polls/info_polls_results_widget.h"
-#include "info/info_controller.h"
 #include "lang/lang_keys.h"
 #include "data/data_poll.h"
-#include "data/data_peer.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
 #include "ui/controls/peer_list_dummy.h"
-#include "ui/widgets/labels.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/text/text_utilities.h"
 #include "boxes/peer_list_box.h"
@@ -26,7 +22,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "styles/style_layers.h"
-#include "styles/style_boxes.h"
 #include "styles/style_info.h"
 
 namespace Info {
@@ -461,10 +456,11 @@ ListController *CreateAnswerRows(
 		container.get(),
 		object_ptr<Ui::FlatLabel>(
 			container,
-			(answer.text
-				+ QString::fromUtf8(" \xe2\x80\x94 ")
-				+ QString::number(percent)
-				+ "%"),
+			rpl::single(
+				TextWithEntities(answer.text)
+					.append(QString::fromUtf8(" \xe2\x80\x94 "))
+					.append(QString::number(percent))
+					.append('%')),
 			st::boxDividerLabel),
 		style::margins(
 			st::pollResultsHeaderPadding.left(),
@@ -613,7 +609,7 @@ void InnerWidget::setupContent() {
 	_content->add(
 		object_ptr<Ui::FlatLabel>(
 			_content,
-			_poll->question,
+			rpl::single(_poll->question),
 			st::pollResultsQuestion),
 		style::margins{
 			st::boxRowPadding.left(),
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 9ab93b934..052abca8f 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -994,7 +994,7 @@ TextWithEntities Manager::ComposeReactionNotification(
 				lt_reaction,
 				reactionWithEntities,
 				lt_title,
-				Ui::Text::WithEntities(poll->question),
+				poll->question,
 				Ui::Text::WithEntities);
 	} else if (media->game()) {
 		return simple(tr::lng_reaction_game);

From c803603de416ee99c248f4813c09d3885013cfe6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 19 Apr 2024 02:23:55 +0300
Subject: [PATCH 422/596] Added ability to insert custom emoji to polls.

---
 Telegram/SourceFiles/boxes/boxes.style        |   7 +-
 .../SourceFiles/boxes/create_poll_box.cpp     | 263 +++++++++++++++---
 Telegram/SourceFiles/boxes/create_poll_box.h  |   5 +
 3 files changed, 235 insertions(+), 40 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 582468070..6d3d639ba 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -691,6 +691,10 @@ createPollOptionField: InputField(createPollField) {
 	placeholderMargins: margins(2px, 0px, 2px, 0px);
 	heightMax: 68px;
 }
+createPollOptionFieldPremium: InputField(createPollOptionField) {
+	textMargins: margins(22px, 11px, 68px, 11px);
+}
+createPollOptionFieldPremiumEmojiPosition: point(15px, -1px);
 createPollSolutionField: InputField(createPollField) {
 	textMargins: margins(0px, 4px, 0px, 4px);
 	border: 1px;
@@ -704,7 +708,7 @@ createPollOptionRemove: CrossButton {
 	cross: CrossAnimation {
 		size: 22px;
 		skip: 6px;
-		stroke: 1.;
+		stroke: 1.5;
 		minScale: 0.3;
 	}
 	crossFg: boxTitleCloseFg;
@@ -718,6 +722,7 @@ createPollOptionRemove: CrossButton {
 	}
 }
 createPollOptionRemovePosition: point(11px, 9px);
+createPollOptionEmojiPositionSkip: 4px;
 createPollWarning: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 	palette: TextPalette(defaultTextPalette) {
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 7ec93239b..1d02b5e52 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -7,33 +7,41 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/create_poll_box.h"
 
-#include "lang/lang_keys.h"
-#include "data/data_poll.h"
-#include "ui/toast/toast.h"
-#include "ui/wrap/vertical_layout.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/wrap/fade_wrap.h"
-#include "ui/widgets/fields/input_field.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/text/text_utilities.h"
-#include "ui/vertical_list.h"
-#include "main/main_session.h"
-#include "core/application.h"
-#include "core/core_settings.h"
+#include "base/call_delayed.h"
+#include "base/event_filter.h"
+#include "base/random.h"
+#include "base/unique_qptr.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/message_field.h"
-#include "menu/menu_send.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "data/data_poll.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "history/view/history_view_schedule_box.h"
-#include "base/unique_qptr.h"
-#include "base/event_filter.h"
-#include "base/call_delayed.h"
-#include "base/random.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "menu/menu_send.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
 #include "window/window_session_controller.h"
-#include "styles/style_layers.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h" // defaultComposeFiles.
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
 
 namespace {
 
@@ -46,12 +54,107 @@ constexpr auto kSolutionLimit = 200;
 constexpr auto kWarnSolutionLimit = 60;
 constexpr auto kErrorLimit = 99;
 
+[[nodiscard]] not_null<Ui::EmojiButton*> AddEmojiToggleToField(
+		not_null<Ui::InputField*> field,
+		not_null<Ui::BoxContent*> box,
+		not_null<Window::SessionController*> controller,
+		not_null<ChatHelpers::TabbedPanel*> emojiPanel,
+		QPoint shift) {
+	const auto emojiToggle = Ui::CreateChild<Ui::EmojiButton>(
+		field->parentWidget(),
+		st::defaultComposeFiles.emoji);
+	const auto fade = Ui::CreateChild<Ui::FadeAnimation>(
+		emojiToggle,
+		emojiToggle,
+		0.5);
+	{
+		const auto fadeTarget = Ui::CreateChild<Ui::RpWidget>(emojiToggle);
+		fadeTarget->resize(emojiToggle->size());
+		fadeTarget->paintRequest(
+		) | rpl::start_with_next([=](const QRect &rect) {
+			auto p = QPainter(fadeTarget);
+			if (fade->animating()) {
+				p.fillRect(fadeTarget->rect(), st::boxBg);
+			}
+			fade->paint(p);
+		}, fadeTarget->lifetime());
+		rpl::single(false) | rpl::then(
+			field->focusedChanges()
+		) | rpl::start_with_next([=](bool shown) {
+			if (shown) {
+				fade->fadeIn(st::universalDuration);
+			} else {
+				fade->fadeOut(st::universalDuration);
+			}
+		}, emojiToggle->lifetime());
+		fade->fadeOut(1);
+		fade->finish();
+	}
+
+
+	const auto outer = box->getDelegate()->outerContainer();
+	const auto allow = [](not_null<DocumentData*>) { return true; };
+	InitMessageFieldHandlers(
+		controller,
+		field,
+		Window::GifPauseReason::Layer,
+		allow);
+	Ui::Emoji::SuggestionsController::Init(
+		outer,
+		field,
+		&controller->session(),
+		Ui::Emoji::SuggestionsController::Options{
+			.suggestCustomEmoji = true,
+			.allowCustomWithoutPremium = allow,
+		});
+	const auto updateEmojiPanelGeometry = [=] {
+		const auto parent = emojiPanel->parentWidget();
+		const auto global = emojiToggle->mapToGlobal({ 0, 0 });
+		const auto local = parent->mapFromGlobal(global);
+		const auto right = local.x() + emojiToggle->width() * 3;
+		const auto isDropDown = local.y() < parent->height() / 2;
+		emojiPanel->setDropDown(isDropDown);
+		if (isDropDown) {
+			emojiPanel->moveTopRight(
+				local.y() + emojiToggle->height(),
+				right);
+		} else {
+			emojiPanel->moveBottomRight(local.y(), right);
+		}
+	};
+	rpl::combine(
+		box->sizeValue(),
+		field->geometryValue()
+	) | rpl::start_with_next([=](QSize outer, QRect inner) {
+		emojiToggle->moveToLeft(
+			rect::right(inner) + shift.x(),
+			inner.y() + shift.y());
+		emojiToggle->update();
+	}, emojiToggle->lifetime());
+
+	emojiToggle->installEventFilter(emojiPanel);
+	emojiToggle->addClickHandler([=] {
+		updateEmojiPanelGeometry();
+		emojiPanel->toggleAnimated();
+	});
+	const auto filterCallback = [=](not_null<QEvent*> event) {
+		if (event->type() == QEvent::Enter) {
+			updateEmojiPanelGeometry();
+		}
+		return base::EventFilterResult::Continue;
+	};
+	base::install_event_filter(emojiToggle, filterCallback);
+
+	return emojiToggle;
+}
+
 class Options {
 public:
 	Options(
-		not_null<QWidget*> outer,
+		not_null<Ui::BoxContent*> box,
 		not_null<Ui::VerticalLayout*> container,
-		not_null<Main::Session*> session,
+		not_null<Window::SessionController*> controller,
+		ChatHelpers::TabbedPanel *emojiPanel,
 		bool chooseCorrectEnabled);
 
 	[[nodiscard]] bool hasOptions() const;
@@ -140,9 +243,10 @@ private:
 	[[nodiscard]] auto createChooseCorrectGroup()
 		-> std::shared_ptr<Ui::RadiobuttonGroup>;
 
-	not_null<QWidget*> _outer;
+	not_null<Ui::BoxContent*> _box;
 	not_null<Ui::VerticalLayout*> _container;
-	const not_null<Main::Session*> _session;
+	const not_null<Window::SessionController*> _controller;
+	ChatHelpers::TabbedPanel * const _emojiPanel;
 	std::shared_ptr<Ui::RadiobuttonGroup> _chooseCorrectGroup;
 	int _position = 0;
 	std::vector<std::unique_ptr<Option>> _list;
@@ -154,6 +258,7 @@ private:
 	rpl::event_stream<not_null<QWidget*>> _scrollToWidget;
 	rpl::event_stream<> _backspaceInFront;
 	rpl::event_stream<> _tabbed;
+	rpl::lifetime _emojiPanelLifetime;
 
 };
 
@@ -193,8 +298,9 @@ not_null<Ui::FlatLabel*> CreateWarningLabel(
 			if (value >= 0) {
 				result->setText(QString::number(value));
 			} else {
+				constexpr auto kMinus = QChar(0x2212);
 				result->setMarkedText(Ui::Text::Colorized(
-					QString::number(value)));
+					kMinus + QString::number(std::abs(value))));
 			}
 			result->setVisible(shown);
 		}));
@@ -223,7 +329,9 @@ Options::Option::Option(
 , _field(
 	Ui::CreateChild<Ui::InputField>(
 		_content.get(),
-		st::createPollOptionField,
+		session->user()->isPremium()
+			? st::createPollOptionFieldPremium
+			: st::createPollOptionField,
 		Ui::InputField::Mode::NoNewlines,
 		tr::lng_polls_create_option_add())) {
 	InitField(outer, _field, session);
@@ -299,7 +407,7 @@ void Options::Option::createRemove() {
 	const auto remove = Ui::CreateChild<Ui::CrossButton>(
 		field.get(),
 		st::createPollOptionRemove);
-	remove->hide(anim::type::instant);
+	remove->show(anim::type::instant);
 
 	const auto toggle = lifetime.make_state<rpl::variable<bool>>(false);
 	_removeAlways = lifetime.make_state<rpl::variable<bool>>(false);
@@ -309,6 +417,7 @@ void Options::Option::createRemove() {
 		// Don't capture 'this'! Because Option is a value type.
 		*toggle = !field->getLastText().isEmpty();
 	}, field->lifetime());
+#if 0
 	rpl::combine(
 		toggle->value(),
 		_removeAlways->value(),
@@ -316,6 +425,7 @@ void Options::Option::createRemove() {
 	) | rpl::start_with_next([=](bool shown) {
 		remove->toggle(shown, anim::type::normal);
 	}, remove->lifetime());
+#endif
 
 	field->widthValue(
 	) | rpl::start_with_next([=](int width) {
@@ -475,13 +585,15 @@ rpl::producer<Qt::MouseButton> Options::Option::removeClicks() const {
 }
 
 Options::Options(
-	not_null<QWidget*> outer,
+	not_null<Ui::BoxContent*> box,
 	not_null<Ui::VerticalLayout*> container,
-	not_null<Main::Session*> session,
+	not_null<Window::SessionController*> controller,
+	ChatHelpers::TabbedPanel *emojiPanel,
 	bool chooseCorrectEnabled)
-: _outer(outer)
+: _box(box)
 , _container(container)
-, _session(session)
+, _controller(controller)
+, _emojiPanel(emojiPanel)
 , _chooseCorrectGroup(chooseCorrectEnabled
 	? createChooseCorrectGroup()
 	: nullptr)
@@ -651,12 +763,40 @@ void Options::addEmptyOption() {
 		(*(_list.end() - 2))->toggleRemoveAlways(true);
 	}
 	_list.push_back(std::make_unique<Option>(
-		_outer,
+		_box,
 		_container,
-		_session,
+		&_controller->session(),
 		_position + _list.size() + _destroyed.size(),
 		_chooseCorrectGroup));
 	const auto field = _list.back()->field();
+	if (const auto emojiPanel = _emojiPanel) {
+		const auto emojiToggle = AddEmojiToggleToField(
+			field,
+			_box,
+			_controller,
+			emojiPanel,
+			QPoint(
+				-st::createPollOptionFieldPremium.textMargins.right(),
+				st::createPollOptionEmojiPositionSkip));
+		emojiToggle->shownValue() | rpl::start_with_next([=](bool shown) {
+			if (!shown) {
+				return;
+			}
+			_emojiPanelLifetime.destroy();
+			emojiPanel->selector()->emojiChosen(
+			) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+				if (field->hasFocus()) {
+					Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
+				}
+			}, _emojiPanelLifetime);
+			emojiPanel->selector()->customEmojiChosen(
+			) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+				if (field->hasFocus()) {
+					Data::InsertCustomEmoji(field, data.document);
+				}
+			}, _emojiPanelLifetime);
+		}, emojiToggle->lifetime());
+	}
 	field->submits(
 	) | rpl::start_with_next([=] {
 		const auto index = findField(field);
@@ -703,7 +843,7 @@ void Options::addEmptyOption() {
 	});
 
 	_list.back()->removeClicks(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::start_with_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			Expects(!_list.empty());
 
@@ -795,19 +935,63 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 	using namespace Settings;
 
 	const auto session = &_controller->session();
+	const auto isPremium = session->user()->isPremium();
 	Ui::AddSubsectionTitle(container, tr::lng_polls_create_question());
+
 	const auto question = container->add(
 		object_ptr<Ui::InputField>(
 			container,
 			st::createPollField,
 			Ui::InputField::Mode::MultiLine,
 			tr::lng_polls_create_question_placeholder()),
-		st::createPollFieldPadding);
+		st::createPollFieldPadding
+			+ (isPremium
+				? QMargins(0, 0, st::defaultComposeFiles.emoji.inner.width, 0)
+				: QMargins()));
 	InitField(getDelegate()->outerContainer(), question, session);
 	question->setMaxLength(kQuestionLimit + kErrorLimit);
 	question->setSubmitSettings(Ui::InputField::SubmitSettings::Both);
 	question->customTab(true);
 
+	if (isPremium) {
+		using Selector = ChatHelpers::TabbedSelector;
+		const auto outer = getDelegate()->outerContainer();
+		_emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
+			outer,
+			_controller,
+			object_ptr<Selector>(
+				nullptr,
+				_controller->uiShow(),
+				Window::GifPauseReason::Layer,
+				Selector::Mode::EmojiOnly));
+		const auto emojiPanel = _emojiPanel.get();
+		emojiPanel->setDesiredHeightValues(
+			1.,
+			st::emojiPanMinHeight / 2,
+			st::emojiPanMinHeight);
+		emojiPanel->hide();
+		emojiPanel->selector()->setCurrentPeer(session->user());
+
+		const auto emojiToggle = AddEmojiToggleToField(
+			question,
+			this,
+			_controller,
+			emojiPanel,
+			st::createPollOptionFieldPremiumEmojiPosition);
+		emojiPanel->selector()->emojiChosen(
+		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+			if (question->hasFocus()) {
+				Ui::InsertEmojiAtCursor(question->textCursor(), data.emoji);
+			}
+		}, emojiToggle->lifetime());
+		emojiPanel->selector()->customEmojiChosen(
+		) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+			if (question->hasFocus()) {
+				Data::InsertCustomEmoji(question, data.document);
+			}
+		}, emojiToggle->lifetime());
+	}
+
 	const auto warning = CreateWarningLabel(
 		container,
 		question,
@@ -916,9 +1100,10 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			st::defaultSubsectionTitle),
 		st::createPollFieldTitlePadding);
 	const auto options = lifetime().make_state<Options>(
-		getDelegate()->outerContainer(),
+		this,
 		container,
-		&_controller->session(),
+		_controller,
+		_emojiPanel ? _emojiPanel.get() : nullptr,
 		(_chosen & PollData::Flag::Quiz));
 	auto limit = options->usedCount() | rpl::after_next([=](int count) {
 		setCloseByEscape(!count);
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.h b/Telegram/SourceFiles/boxes/create_poll_box.h
index 2147c2e32..91805f0d8 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.h
+++ b/Telegram/SourceFiles/boxes/create_poll_box.h
@@ -14,6 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 struct PollData;
 
+namespace ChatHelpers {
+class TabbedPanel;
+} // namespace ChatHelpers
+
 namespace Ui {
 class VerticalLayout;
 } // namespace Ui
@@ -72,6 +76,7 @@ private:
 	const PollData::Flags _disabled = PollData::Flags();
 	const Api::SendType _sendType = Api::SendType();
 	const SendMenu::Type _sendMenuType;
+	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	Fn<void()> _setInnerFocus;
 	Fn<rpl::producer<bool>()> _dataIsValidValue;
 	rpl::event_stream<Result> _submitRequests;

From a272807a99c0e8340ac4ebe384c995e31cd05a1a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Apr 2024 19:20:15 +0400
Subject: [PATCH 423/596] Remove "Create poll" button in Replies chat.

Fixes #27817.
---
 Telegram/SourceFiles/data/data_peer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 6d5ac28d3..064f8d91b 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -533,7 +533,9 @@ bool PeerData::canPinMessages() const {
 
 bool PeerData::canCreatePolls() const {
 	if (const auto user = asUser()) {
-		return user->isBot() && !user->isSupport();
+		return user->isBot()
+			&& !user->isSupport()
+			&& !user->isRepliesChat();
 	}
 	return Data::CanSend(this, ChatRestriction::SendPolls);
 }

From 7addcf2d25907f2ae193b301c48087882d3e9748 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Apr 2024 19:20:43 +0400
Subject: [PATCH 424/596] Add IV footer.

---
 Telegram/Resources/iv_html/page.css       | 28 ++++++++++++++++++++++-
 Telegram/Resources/iv_html/page.js        | 16 +++++++------
 Telegram/Resources/langs/lang.strings     |  1 +
 Telegram/SourceFiles/iv/iv_controller.cpp | 22 +++++++++++-------
 Telegram/SourceFiles/iv/iv_controller.h   |  2 ++
 Telegram/SourceFiles/iv/iv_data.h         |  1 +
 Telegram/SourceFiles/iv/iv_instance.cpp   | 15 +++++++++---
 Telegram/SourceFiles/iv/iv_prepare.cpp    | 28 ++++++++++++++++++++++-
 8 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
index 2763760f2..00a3302bd 100644
--- a/Telegram/Resources/iv_html/page.css
+++ b/Telegram/Resources/iv_html/page.css
@@ -134,9 +134,32 @@ html.custom_scroll ::-webkit-scrollbar-thumb:hover {
 .page-slide {
 	position: relative;
 	width: 100%;
+	min-height: 100%;
 	margin-left: 0%;
 	transition: margin 240ms ease-in-out;
 }
+.page-footer {
+	height: 32px;
+	margin-top: -32px;
+	background: var(--td-window-bg-over);
+}
+.page-footer .content {
+	padding: 3px 18px;
+	font-size: 15px;
+	color: var(--td-window-sub-text-fg);
+	text-align: center;
+}
+.page-footer .wrong {
+	position: relative;
+	padding: 5px;
+	margin: -5px;
+	color: var(--td-window-sub-text-fg);
+	text-decoration: none;
+	cursor: pointer;
+}
+.page-footer .wrong:hover {
+	text-decoration: underline;
+}
 .hidden-left,
 .hidden-right {
 	pointer-events: none;
@@ -148,7 +171,7 @@ html.custom_scroll ::-webkit-scrollbar-thumb:hover {
 	margin-left: 100%;
 }
 article {
-	padding-bottom: 12px;
+	padding-bottom: 40px;
 	overflow-y: hidden;
 	overflow-x: auto;
 	white-space: pre-wrap;
@@ -893,6 +916,9 @@ section.related a.related-link:after {
 	right: 0;
 	bottom: 0;
 }
+section.related a.related-link:last-child:after {
+	border-bottom: 0px;
+}
 section.related .related-link-url {
 	display: block;
 	font-size: 15px;
diff --git a/Telegram/Resources/iv_html/page.js b/Telegram/Resources/iv_html/page.js
index 053a6a0ab..bae02fe48 100644
--- a/Telegram/Resources/iv_html/page.js
+++ b/Telegram/Resources/iv_html/page.js
@@ -26,7 +26,7 @@ var IV = {
 			}
 			target = target.parentNode;
 		}
-		if (!target || !target.hasAttribute('href')) {
+		if (!target || (context === '' && !target.hasAttribute('href'))) {
 			return;
 		}
 		var base = document.createElement('A');
@@ -413,9 +413,12 @@ var IV = {
 		var article = function (el) {
 			return el.getElementsByTagName('article')[0];
 		};
-		var from = article(IV.findPageScroll());
-		var to = article(IV.makeScrolledContent(data.html));
-		morphdom(from, to, {
+		var footer = function (el) {
+			return el.getElementsByClassName('page-footer')[0];
+		};
+		var from = IV.findPageScroll();
+		var to = IV.makeScrolledContent(data.html);
+		morphdom(article(from), article(to), {
 			onBeforeElUpdated: function (fromEl, toEl) {
 				if (fromEl.classList.contains('video')
 					&& toEl.classList.contains('video')
@@ -439,6 +442,7 @@ var IV = {
 				return !fromEl.isEqualNode(toEl);
 			}
 		});
+		morphdom(footer(from), footer(to));
 		IV.initMedia();
 		eval(data.js);
 	},
@@ -477,9 +481,7 @@ var IV = {
 		var result = document.createElement('div');
 		result.className = 'page-scroll';
 		result.tabIndex = '-1';
-		result.innerHTML = '<div class="page-slide"><article>'
-			+ html
-			+ '</article></div>';
+		result.innerHTML = html.trim();
 		result.onscroll = IV.frameScrolled;
 		return result;
 	},
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index eb3f33fc7..52c9ed8d3 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5111,6 +5111,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_iv_share" = "Share";
 "lng_iv_join_channel" = "Join";
 "lng_iv_window_title" = "Instant View";
+"lng_iv_wrong_layout" = "Wrong layout?";
 
 "lng_limit_download_title" = "Download speed limited";
 "lng_limit_download_subscribe" = "Subscribe to {link} and increase download speed {increase}.";
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index a2a701d84..cc9d727fe 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -155,10 +155,6 @@ namespace {
 		+ "IV.init();"
 		+ page.script;
 
-	const auto contentAttributes = page.rtl
-		? " dir=\"rtl\" class=\"rtl\""_q
-		: QByteArray();
-
 	return R"(<!DOCTYPE html>
 <html)"_q
 	+ classAttribute
@@ -179,9 +175,7 @@ namespace {
 				<path d="M14.9972363,18 L9.13865768,12.1414214 C9.06055283,12.0633165 9.06055283,11.9366835 9.13865768,11.8585786 L14.9972363,6 L14.9972363,6" transform="translate(11.997236, 12.000000) scale(-1, -1) rotate(-90.000000) translate(-11.997236, -12.000000) "></path>
 			</svg>
 		</button>
-		<div class="page-scroll" tabindex="-1"><div class="page-slide">
-			<article)"_q + contentAttributes + ">"_q + page.content + R"(</article>
-		</div></div>
+		<div class="page-scroll" tabindex="-1">)"_q + page.content.trimmed() + R"(</div>
 		<script>)"_q + js + R"(</script>
 	</body>
 </html>
@@ -646,7 +640,12 @@ void Controller::processLink(const QString &url, const QString &context) {
 	const auto joinPrefix = u"join_link"_q;
 	const auto webpagePrefix = u"webpage"_q;
 	const auto viewerPrefix = u"viewer"_q;
-	if (context.startsWith(channelPrefix)) {
+	if (context == u"report-iv") {
+		_events.fire({
+			.type = Event::Type::Report,
+			.context = QString::number(compuseCurrentPageId()),
+		});
+	} else if (context.startsWith(channelPrefix)) {
 		_events.fire({
 			.type = Event::Type::OpenChannel,
 			.context = context.mid(channelPrefix.size()),
@@ -701,6 +700,13 @@ QString Controller::composeCurrentUrl() const {
 		+ (_hash.isEmpty() ? u""_q : ('#' + _hash));
 }
 
+uint64 Controller::compuseCurrentPageId() const {
+	const auto index = _index.current();
+	Assert(index >= 0 && index < _pages.size());
+
+	return _pages[index].pageId;
+}
+
 void Controller::showMenu() {
 	const auto index = _index.current();
 	if (_menu || index < 0 || index > _pages.size()) {
diff --git a/Telegram/SourceFiles/iv/iv_controller.h b/Telegram/SourceFiles/iv/iv_controller.h
index d3363d67e..473813fca 100644
--- a/Telegram/SourceFiles/iv/iv_controller.h
+++ b/Telegram/SourceFiles/iv/iv_controller.h
@@ -63,6 +63,7 @@ public:
 			OpenLink,
 			OpenLinkExternal,
 			OpenMedia,
+			Report,
 		};
 		Type type = Type::Close;
 		QString url;
@@ -116,6 +117,7 @@ private:
 	void quit();
 
 	[[nodiscard]] QString composeCurrentUrl() const;
+	[[nodiscard]] uint64 compuseCurrentPageId() const;
 	void showShareMenu();
 	void destroyShareMenu();
 
diff --git a/Telegram/SourceFiles/iv/iv_data.h b/Telegram/SourceFiles/iv/iv_data.h
index c33fe1b18..87900bce3 100644
--- a/Telegram/SourceFiles/iv/iv_data.h
+++ b/Telegram/SourceFiles/iv/iv_data.h
@@ -15,6 +15,7 @@ struct Options {
 };
 
 struct Prepared {
+	uint64 pageId = 0;
 	QString name;
 	QByteArray content;
 	QByteArray script;
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 49ae8c144..babce1d6c 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -742,9 +742,7 @@ void Instance::show(
 		not_null<Data*> data,
 		QString hash) {
 	const auto guard = gsl::finally([&] {
-		if (data->partial()) {
-			requestFull(session, data->id());
-		}
+		requestFull(session, data->id());
 	});
 	if (_shown && _shownSession == session) {
 		_shown->moveTo(data, hash);
@@ -834,6 +832,17 @@ void Instance::show(
 				UrlClickHandler::Open(event.url);
 			}).send();
 			break;
+		case Type::Report:
+			if (const auto controller = _shownSession->tryResolveWindow()) {
+				controller->window().activate();
+				controller->showPeerByLink(Window::PeerByLinkInfo{
+					.usernameOrId = "previews",
+					.resolveType = Window::ResolveType::BotStart,
+					.startToken = ("webpage"
+						+ QString::number(event.context.toULongLong())),
+				});
+			}
+			break;
 		}
 	}, _shown->lifetime());
 
diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp
index f0c823676..699f44677 100644
--- a/Telegram/SourceFiles/iv/iv_prepare.cpp
+++ b/Telegram/SourceFiles/iv/iv_prepare.cpp
@@ -142,6 +142,8 @@ private:
 	[[nodiscard]] QByteArray block(
 		const MTPDpageListOrderedItemBlocks &data);
 
+	[[nodiscard]] QByteArray wrap(const QByteArray &content, int views);
+
 	[[nodiscard]] QByteArray tag(
 		const QByteArray &name,
 		const QByteArray &body = {});
@@ -223,9 +225,13 @@ Parser::Parser(const Source &source, const Options &options)
 : /*_options(options)
 , */_fileOriginPostfix('/' + Number(source.pageId)) {
 	process(source);
+	_result.pageId = source.pageId;
 	_result.name = source.name;
 	_result.rtl = source.page.data().is_rtl();
-	_result.content = list(source.page.data().vblocks());
+
+	const auto views = source.page.data().vviews().value_or_empty();
+	const auto content = list(source.page.data().vblocks());
+	_result.content = wrap(content, views);
 }
 
 Prepared Parser::result() {
@@ -925,6 +931,26 @@ QByteArray Parser::utf(const tl::conditional<MTPstring> &text) {
 	return text ? utf(*text) : QByteArray();
 }
 
+QByteArray Parser::wrap(const QByteArray &content, int views) {
+	const auto sep = " \xE2\x80\xA2 ";
+	const auto viewsText = views
+		? (tr::lng_stories_views(tr::now, lt_count_decimal, views) + sep)
+		: QString();
+	return R"(
+<div class="page-slide">
+	<article>)"_q + content + R"(</article>
+</div>
+<div class="page-footer">
+	<div class="content">
+		)"_q
+		+ viewsText.toUtf8()
+		+ R"(<a class="wrong" data-context="report-iv">)"_q
+		+ tr::lng_iv_wrong_layout(tr::now).toUtf8()
+		+ R"(</a>
+	</div>
+</div>)"_q;
+}
+
 QByteArray Parser::tag(
 		const QByteArray &name,
 		const QByteArray &body) {

From 2949cdab613aad2ea042605483dd80cf2aece6f0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Apr 2024 19:48:28 +0400
Subject: [PATCH 425/596] Don't request IV two times in a row.

---
 Telegram/SourceFiles/iv/iv_instance.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index babce1d6c..ab2e21327 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -813,6 +813,7 @@ void Instance::show(
 			if (!urlChecked) {
 				break;
 			}
+			_fullRequested[_shownSession].emplace(event.url);
 			_shownSession->api().request(MTPmessages_GetWebPage(
 				MTP_string(event.url),
 				MTP_int(0)
@@ -947,6 +948,7 @@ void Instance::openWithIvPreferred(
 	};
 	_ivRequestSession = session;
 	_ivRequestUri = uri;
+	_fullRequested[session].emplace(url);
 	_ivRequestId = session->api().request(MTPmessages_GetWebPage(
 		MTP_string(url),
 		MTP_int(0)

From 363c191a6e738ee4c33544baa4110e7610cc3cf8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Apr 2024 20:08:44 +0400
Subject: [PATCH 426/596] Skip media bottom skip in IV.

---
 Telegram/Resources/iv_html/page.css    | 3 +++
 Telegram/SourceFiles/iv/iv_prepare.cpp | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
index 00a3302bd..9c0ab832f 100644
--- a/Telegram/Resources/iv_html/page.css
+++ b/Telegram/Resources/iv_html/page.css
@@ -1053,6 +1053,9 @@ section.channel > a > h4 {
 	display: block;
 	margin: 0 auto;
 }
+.media-outer {
+	margin-bottom: 16px;
+}
 .photo-wrap,
 .video-wrap {
 	width: 100%;
diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp
index 699f44677..d5f537524 100644
--- a/Telegram/SourceFiles/iv/iv_prepare.cpp
+++ b/Telegram/SourceFiles/iv/iv_prepare.cpp
@@ -520,6 +520,9 @@ QByteArray Parser::block(
 	}, result);
 	if (!slideshow) {
 		result += caption(data.vcaption());
+		if (!collage) {
+			result = tag("div", { { "class", "media-outer" } }, result);
+		}
 	}
 	return result;
 }
@@ -585,6 +588,9 @@ QByteArray Parser::block(
 	}
 	if (!slideshow) {
 		result += caption(data.vcaption());
+		if (!collage) {
+			result = tag("div", { { "class", "media-outer" } }, result);
+		}
 	}
 	return result;
 }

From aff2be605e09288a67b00a81ed04c62a15bc37fd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 26 Apr 2024 18:46:44 +0300
Subject: [PATCH 427/596] Removed item for poll creation from menu when it is
 impossible.

---
 .../SourceFiles/window/window_peer_menu.cpp   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 6860d3b0a..f3749d622 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1085,6 +1085,34 @@ void Filler::addViewStatistics() {
 }
 
 void Filler::addCreatePoll() {
+	const auto isJoinChannel = [&] {
+		if (_request.section != Section::Replies) {
+			if (const auto c = _peer->asChannel(); c && !c->amIn()) {
+				return true;
+			}
+		}
+		return false;
+	}();
+	const auto isBotStart = [&] {
+		const auto user = _peer ? _peer->asUser() : nullptr;
+		if (!user || !user->isBot()) {
+			return false;
+		} else if (!user->botInfo->startToken.isEmpty()) {
+			return true;
+		}
+		const auto history = _peer->owner().history(_peer);
+		if (history && history->isEmpty() && !history->lastMessage()) {
+			return true;
+		}
+		return false;
+	}();
+	const auto isBlocked = [&] {
+		return _peer && _peer->isUser() && _peer->asUser()->isBlocked();
+	}();
+	if (isBlocked || isJoinChannel || isBotStart) {
+		return;
+	}
+
 	const auto can = _topic
 		? Data::CanSend(_topic, ChatRestriction::SendPolls)
 		: _peer->canCreatePolls();

From 79532954dc885ec65b71095845acca3cbe76c235 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Apr 2024 20:16:38 +0400
Subject: [PATCH 428/596] Allow a bit more font size adjusting.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 6d1014fa8..cb57bef3f 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 6d1014fa8f67d4f997c0580a90df075008e0f34c
+Subproject commit cb57bef3f01b7ec60eb0eae0ee68cd56cb3a9b1f

From 372b3da09cb736e2293006452ad19bf4773e209b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Apr 2024 20:23:08 +0400
Subject: [PATCH 429/596] Beta version 4.16.10.

- Group admins can mass-moderate many messages.
- Premium users can use animated emoji in polls.
- Revert the default "Open Sans" font to 1.10.
- Several crash fixes and small improvements.
---
 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 ++++----
 Telegram/lib_webview                         | 2 +-
 changelog.txt                                | 7 +++++++
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 068e2c2bf..adc24216c 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.9.0" />
+    Version="4.16.10.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 8536098db..07bbe9102 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 4,16,9,0
- PRODUCTVERSION 4,16,9,0
+ FILEVERSION 4,16,10,0
+ PRODUCTVERSION 4,16,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", "4.16.9.0"
+            VALUE "FileVersion", "4.16.10.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.9.0"
+            VALUE "ProductVersion", "4.16.10.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 8ae0832aa..ae524c403 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 4,16,9,0
- PRODUCTVERSION 4,16,9,0
+ FILEVERSION 4,16,10,0
+ PRODUCTVERSION 4,16,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", "4.16.9.0"
+            VALUE "FileVersion", "4.16.10.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.9.0"
+            VALUE "ProductVersion", "4.16.10.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 97924b37d..271c39d52 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 = 4016009;
-constexpr auto AppVersionStr = "4.16.9";
+constexpr auto AppVersion = 4016010;
+constexpr auto AppVersionStr = "4.16.10";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index a2ce256db..620dc863c 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016009
+AppVersion         4016010
 AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.9
-AppVersionStr      4.16.9
+AppVersionStrSmall 4.16.10
+AppVersionStr      4.16.10
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 4.16.9.beta
+AppVersionOriginal 4.16.10.beta
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 9f9bcaaec..2ccbfa5f3 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 9f9bcaaec922644406faadda4d37014c9dec2dd9
+Subproject commit 2ccbfa5f3443274e40deb761674b536e2e8eedae
diff --git a/changelog.txt b/changelog.txt
index eb2b59480..649f042f3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+4.16.10 beta (26.04.24)
+
+- Group admins can mass-moderate many messages.
+- Premium users can use animated emoji in polls.
+- Revert the default "Open Sans" font to 1.10.
+- Several crash fixes and small improvements.
+
 4.16.9 beta (23.04.24)
 
 - Show "Frequent contacts" when you focus the search field.

From c0db5ee98ab3b536389d6bde0363c1030f7f5d87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Apr 2024 23:41:28 +0400
Subject: [PATCH 430/596] Beta version 4.16.10: Fix GCC build.

---
 Telegram/SourceFiles/boxes/moderate_messages_box.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 8117c7e77..0d1aa10a1 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -517,7 +517,6 @@ void CreateModerateMessagesBox(
 			}
 			wrap->toggle(!wrap->toggled(), anim::type::normal);
 			{
-				const auto start = crl::now();
 				inner->heightValue() | rpl::start_with_next([=] {
 					if (!wrap->animating()) {
 						scrollLifetime->destroy();

From 6e67cfc7beb17e207c31a2b9d86aa184eb109fb2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 27 Apr 2024 12:26:34 +0300
Subject: [PATCH 431/596] Fixed possible crash in moderation box.

---
 .../boxes/moderate_messages_box.cpp           | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 0d1aa10a1..5f08f98e3 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -185,7 +185,6 @@ void CreateModerateMessagesBox(
 		rpl::event_stream<bool> checkAllRequests;
 		Fn<Users()> collectRequests;
 	};
-	constexpr auto kSmallDelayMs = 5;
 	const auto options = CalculateModerateOptions(items);
 	const auto inner = box->verticalLayout();
 
@@ -211,6 +210,7 @@ void CreateModerateMessagesBox(
 
 	using Request = Fn<void(not_null<UserData*>, not_null<ChannelData*>)>;
 	const auto sequentiallyRequest = [=](Request request, Users users) {
+		constexpr auto kSmallDelayMs = 5;
 		const auto session = &items.front()->history()->session();
 		const auto history = items.front()->history();
 		const auto peerId = history->peer->id;
@@ -243,14 +243,8 @@ void CreateModerateMessagesBox(
 			not_null<Controller*> controller,
 			Request request) {
 		confirms->events() | rpl::start_with_next([=] {
-			if (checkbox->checked()) {
-				if (isSingle) {
-					const auto item = items.front();
-					const auto channel = item->history()->peer->asChannel();
-					request(users.front(), channel);
-				} else if (const auto collect = controller->collectRequests) {
-					sequentiallyRequest(request, collect());
-				}
+			if (checkbox->checked() && controller->collectRequests) {
+				sequentiallyRequest(request, controller->collectRequests());
 			}
 		}, checkbox->lifetime());
 	};
@@ -345,6 +339,11 @@ void CreateModerateMessagesBox(
 	const auto appendList = [&](
 			not_null<Ui::Checkbox*> checkbox,
 			not_null<Controller*> controller) {
+		if (isSingle) {
+			const auto user = users.front();
+			controller->collectRequests = [=] { return Users{ user }; };
+			return;
+		}
 		const auto button = Ui::CreateChild<Button>(inner, users.size());
 		button->resize(Button::ComputeSize(users.size()));
 
@@ -399,9 +398,8 @@ void CreateModerateMessagesBox(
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>();
-		if (!isSingle) {
-			appendList(report, controller);
-		}
+		appendList(report, controller);
+
 		const auto ids = items.front()->from()->owner().itemsToIds(items);
 		handleConfirmation(report, controller, [=](
 				not_null<UserData*> u,
@@ -444,9 +442,8 @@ void CreateModerateMessagesBox(
 			st::boxRowPadding + buttonPadding);
 
 		const auto controller = box->lifetime().make_state<Controller>();
-		if (!isSingle) {
-			appendList(deleteAll, controller);
-		}
+		appendList(deleteAll, controller);
+
 		handleConfirmation(deleteAll, controller, [=](
 				not_null<UserData*> u,
 				not_null<ChannelData*> c) {
@@ -474,9 +471,8 @@ void CreateModerateMessagesBox(
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>();
-		if (!isSingle) {
-			appendList(ban, controller);
-		}
+		appendList(ban, controller);
+
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);
 
@@ -629,7 +625,6 @@ void CreateModerateMessagesBox(
 	const auto close = crl::guard(box, [=] { box->closeBox(); });
 	box->addButton(tr::lng_box_delete(), [=] {
 		confirms->fire({});
-		box->closeBox();
 		const auto data = &users.front()->session().data();
 		const auto ids = data->itemsToIds(items);
 		if (confirmed) {

From e81465a54e828b40e76795487d229dad729c4b7d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 27 Apr 2024 13:31:00 +0300
Subject: [PATCH 432/596] Added Enter shortcut to moderation box for
 confirmation.

---
 .../boxes/moderate_messages_box.cpp           | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 5f08f98e3..ff34a8a45 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_chat_participants.h"
 #include "apiwrap.h"
+#include "base/event_filter.h"
 #include "base/timer.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
@@ -25,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/toggle_arrow.h"
@@ -249,6 +251,42 @@ void CreateModerateMessagesBox(
 		}, checkbox->lifetime());
 	};
 
+	const auto isEnter = [=](not_null<QEvent*> event) {
+		if (event->type() == QEvent::KeyPress) {
+			if (const auto k = static_cast<QKeyEvent*>(event.get())) {
+				return (k->key() == Qt::Key_Enter)
+					|| (k->key() == Qt::Key_Return);
+			}
+		}
+		return false;
+	};
+
+	base::install_event_filter(box, [=](not_null<QEvent*> event) {
+		if (isEnter(event)) {
+			box->triggerButton(0);
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	const auto handleSubmition = [=](not_null<Ui::Checkbox*> checkbox) {
+		base::install_event_filter(box, [=](not_null<QEvent*> event) {
+			if (!isEnter(event) || !checkbox->checked()) {
+				return base::EventFilterResult::Continue;
+			}
+			box->uiShow()->show(Ui::MakeConfirmBox({
+				.text = tr::lng_gigagroup_warning_title(),
+				.confirmed = [=](Fn<void()> close) {
+					box->triggerButton(0);
+					close();
+				},
+				.confirmText = tr::lng_box_yes(),
+				.cancelText = tr::lng_box_no(),
+			}));
+			return base::EventFilterResult::Cancel;
+		});
+	};
+
 	const auto createUsersList = [&](not_null<Controller*> controller) {
 		const auto wrap = inner->add(
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -399,6 +437,7 @@ void CreateModerateMessagesBox(
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>();
 		appendList(report, controller);
+		handleSubmition(report);
 
 		const auto ids = items.front()->from()->owner().itemsToIds(items);
 		handleConfirmation(report, controller, [=](
@@ -443,6 +482,7 @@ void CreateModerateMessagesBox(
 
 		const auto controller = box->lifetime().make_state<Controller>();
 		appendList(deleteAll, controller);
+		handleSubmition(deleteAll);
 
 		handleConfirmation(deleteAll, controller, [=](
 				not_null<UserData*> u,
@@ -472,6 +512,7 @@ void CreateModerateMessagesBox(
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>();
 		appendList(ban, controller);
+		handleSubmition(ban);
 
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);

From e0db0642bda6d9ece8e0ddfa94a28e39afc96468 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 27 Apr 2024 16:39:13 +0300
Subject: [PATCH 433/596] Fixed crash when deleting message from non-user.

---
 .../boxes/moderate_messages_box.cpp           | 60 +++++++++----------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index ff34a8a45..19032bcc2 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -43,36 +43,43 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
-enum class ModerateOption {
-	Ban = (1 << 0),
-	DeleteAll = (1 << 1),
+using Users = std::vector<not_null<UserData*>>;
+
+struct ModerateOptions final {
+	bool allCanBan = false;
+	bool allCanDelete = false;
+	Users users;
 };
-inline constexpr bool is_flag_type(ModerateOption) { return true; }
-using ModerateOptions = base::flags<ModerateOption>;
 
 ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 	Expects(!items.empty());
 
+	auto result = ModerateOptions{
+		.allCanBan = true,
+		.allCanDelete = true,
+	};
+
 	const auto peer = items.front()->history()->peer;
-	auto allCanBan = true;
-	auto allCanDelete = true;
 	for (const auto &item : items) {
-		if (!allCanBan && !allCanDelete) {
-			return ModerateOptions(0);
+		if (!result.allCanBan && !result.allCanDelete) {
+			return {};
 		}
 		if (peer != item->history()->peer) {
-			return ModerateOptions(0);
+			return {};
 		}
 		if (!item->suggestBanReport()) {
-			allCanBan = false;
+			result.allCanBan = false;
 		}
 		if (!item->suggestDeleteAllReport()) {
-			allCanDelete = false;
+			result.allCanDelete = false;
+		}
+		if (const auto user = item->from()->asUser()) {
+			if (!ranges::contains(result.users, not_null{ user })) {
+				result.users.push_back(user);
+			}
 		}
 	}
-	return ModerateOptions(0)
-		| (allCanBan ? ModerateOption::Ban : ModerateOptions(0))
-		| (allCanDelete ? ModerateOption::DeleteAll : ModerateOptions(0));
+	return result;
 }
 
 class Button final : public Ui::RippleButton {
@@ -180,27 +187,16 @@ void CreateModerateMessagesBox(
 		not_null<Ui::GenericBox*> box,
 		const HistoryItemsList &items,
 		Fn<void()> confirmed) {
-	using Users = std::vector<not_null<UserData*>>;
 	struct Controller final {
 		rpl::event_stream<bool> toggleRequestsFromTop;
 		rpl::event_stream<bool> toggleRequestsFromInner;
 		rpl::event_stream<bool> checkAllRequests;
 		Fn<Users()> collectRequests;
 	};
-	const auto options = CalculateModerateOptions(items);
+	const auto [allCanBan, allCanDelete, users] = CalculateModerateOptions(
+		items);
 	const auto inner = box->verticalLayout();
 
-	const auto users = [&] {
-		auto result = Users();
-		for (const auto &item : items) {
-			if (const auto user = item->from()->asUser()) {
-				if (!ranges::contains(result, not_null{ user })) {
-					result.push_back(user);
-				}
-			}
-		}
-		return result;
-	}();
 	Assert(!users.empty());
 
 	const auto confirms = inner->lifetime().make_state<rpl::event_stream<>>();
@@ -460,7 +456,7 @@ void CreateModerateMessagesBox(
 		});
 	}
 
-	if (options & ModerateOption::DeleteAll) {
+	if (allCanDelete) {
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);
 
@@ -490,7 +486,7 @@ void CreateModerateMessagesBox(
 			u->session().api().deleteAllFromParticipant(c, u);
 		});
 	}
-	if (options & ModerateOption::Ban) {
+	if (allCanBan) {
 		auto ownedWrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			inner,
 			object_ptr<Ui::VerticalLayout>(inner));
@@ -680,6 +676,6 @@ void CreateModerateMessagesBox(
 
 bool CanCreateModerateMessagesBox(const HistoryItemsList &items) {
 	const auto options = CalculateModerateOptions(items);
-	return (options & ModerateOption::Ban)
-		|| (options & ModerateOption::DeleteAll);
+	return (options.allCanBan || options.allCanDelete)
+		&& !options.users.empty();
 }

From b8b02b2285cc4fab65ebca245e651e8bdd43ed6e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 28 Apr 2024 13:33:04 +0300
Subject: [PATCH 434/596] Replaced list of history items for sending now with
 sorted by date.

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

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index f3749d622..f6473b07b 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2281,7 +2281,9 @@ QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
 	](Fn<void()> &&close) {
 		close();
 		auto ids = QVector<MTPint>();
-		for (const auto item : session->data().idsToItems(list)) {
+		auto sorted = session->data().idsToItems(list);
+		ranges::sort(sorted, ranges::less(), &HistoryItem::date);
+		for (const auto &item : sorted) {
 			if (item->allowsSendNow()) {
 				ids.push_back(
 					MTP_int(session->scheduledMessages().lookupId(item)));

From be255f1d0949b199c2f4685b816cc768a62f35b1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 28 Apr 2024 14:25:04 +0300
Subject: [PATCH 435/596] Added to moderate box number of all messages that
 will be deleted.

---
 .../boxes/moderate_messages_box.cpp           | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 19032bcc2..61464e2f9 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/moderate_messages_box.h"
 
 #include "api/api_chat_participants.h"
+#include "api/api_messages_search.h"
 #include "apiwrap.h"
 #include "base/event_filter.h"
 #include "base/timer.h"
@@ -82,6 +83,24 @@ ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 	return result;
 }
 
+[[nodiscard]] rpl::producer<int> MessagesCountValue(
+		not_null<History*> history,
+		not_null<PeerData*> from) {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+		auto search = lifetime.make_state<Api::MessagesSearch>(history);
+		consumer.put_next(0);
+
+		search->messagesFounds(
+		) | rpl::start_with_next([=](const Api::FoundMessages &found) {
+			consumer.put_next_copy(found.total);
+		}, lifetime);
+		search->searchMessages({ .from = from });
+
+		return lifetime;
+	};
+}
+
 class Button final : public Ui::RippleButton {
 public:
 	Button(not_null<QWidget*> parent, int count);
@@ -411,7 +430,7 @@ void CreateModerateMessagesBox(
 	};
 
 	Ui::AddSkip(inner);
-	box->addRow(
+	const auto title = box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			(items.size() == 1)
@@ -475,6 +494,22 @@ void CreateModerateMessagesBox(
 				false,
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
+		if (isSingle) {
+			const auto history = items.front()->history();
+			tr::lng_selected_delete_sure(
+				lt_count,
+				rpl::combine(
+					MessagesCountValue(history, users.front()),
+					deleteAll->checkedValue()
+				) | rpl::map([s = items.size()](int all, bool checked) {
+					return float64((checked && all) ? all : s);
+				})
+			) | rpl::start_with_next([=](const QString &text) {
+				title->setText(text);
+				title->resizeToWidth(inner->width()
+					- rect::m::sum::h(st::boxRowPadding));
+			}, title->lifetime());
+		}
 
 		const auto controller = box->lifetime().make_state<Controller>();
 		appendList(deleteAll, controller);

From 62bd1354dcc53404165e7fac6e970e1189bd9575 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 28 Apr 2024 16:38:37 +0300
Subject: [PATCH 436/596] Replaced box for leaving or deleting chat with
 generic box.

---
 .../SourceFiles/boxes/delete_messages_box.cpp |   8 +-
 .../boxes/moderate_messages_box.cpp           | 128 ++++++++++++++++++
 .../SourceFiles/boxes/moderate_messages_box.h |   3 +
 .../SourceFiles/window/window_peer_menu.cpp   |   5 +-
 4 files changed, 134 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index 1def53870..247cad699 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -379,13 +379,7 @@ auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
 		return result;
 	}
 
-	const auto items = ranges::views::all(
-		_ids
-	) | ranges::views::transform([&](FullMsgId id) {
-		return peer->owner().message(id);
-	}) | ranges::views::filter([](HistoryItem *item) {
-		return (item != nullptr);
-	}) | ranges::to_vector;
+	const auto items = peer->owner().idsToItems(_ids);
 
 	if (items.size() != _ids.size()) {
 		// We don't have information about all messages.
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 61464e2f9..e6079a0b7 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
+#include "core/application.h"
 #include "core/ui_integration.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -41,6 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
+#include "styles/style_window.h"
 
 namespace {
 
@@ -714,3 +716,129 @@ bool CanCreateModerateMessagesBox(const HistoryItemsList &items) {
 	return (options.allCanBan || options.allCanDelete)
 		&& !options.users.empty();
 }
+
+void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
+	const auto container = box->verticalLayout();
+
+	const auto maybeUser = peer->asUser();
+
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+
+	base::install_event_filter(box, [=](not_null<QEvent*> event) {
+		if (event->type() == QEvent::KeyPress) {
+			if (const auto k = static_cast<QKeyEvent*>(event.get())) {
+				if ((k->key() == Qt::Key_Enter)
+					|| (k->key() == Qt::Key_Return)) {
+					box->uiShow()->show(Ui::MakeConfirmBox({
+						.text = tr::lng_gigagroup_warning_title(),
+						.confirmed = [=](Fn<void()> close) {
+							box->triggerButton(0);
+							close();
+						},
+						.confirmText = tr::lng_box_yes(),
+						.cancelText = tr::lng_box_no(),
+					}));
+				}
+			}
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	const auto line = container->add(object_ptr<Ui::RpWidget>(container));
+	const auto &st = st::mainMenuUserpic;
+	line->resize(line->width(), st.size.height());
+
+	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+		line,
+		peer,
+		st);
+	userpic->showSavedMessagesOnSelf(true);
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		line,
+		peer->isSelf()
+			? tr::lng_saved_messages() | rpl::map(Ui::Text::Bold)
+			: maybeUser
+			? tr::lng_profile_delete_conversation() | rpl::map(Ui::Text::Bold)
+			: rpl::single(Ui::Text::Bold(peer->name())),
+		box->getDelegate()->style().title);
+	line->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		userpic->moveToLeft(st::boxRowPadding.left(), 0);
+		const auto skip = st::defaultBoxCheckbox.textPosition.x();
+		label->resizeToWidth(width
+			- rect::right(userpic)
+			- skip
+			- st::boxRowPadding.right());
+		label->moveToLeft(
+			rect::right(userpic) + skip,
+			((userpic->height() - label->height()) / 2));
+	}, label->lifetime());
+
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			peer->isSelf()
+				? tr::lng_sure_delete_saved_messages()
+				: maybeUser
+				? tr::lng_sure_delete_history(
+					lt_contact,
+					rpl::single(peer->name()))
+				: (peer->isChannel() && !peer->isMegagroup())
+				? tr::lng_sure_leave_channel()
+				: tr::lng_sure_leave_group(),
+			st::boxLabel));
+
+	const auto maybeCheckbox = [&]() -> Ui::Checkbox* {
+		if (!peer->canRevokeFullHistory()) {
+			return nullptr;
+		}
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		return box->addRow(
+			object_ptr<Ui::Checkbox>(
+				container,
+				maybeUser
+					? tr::lng_delete_for_other_check(
+						tr::now,
+						lt_user,
+						TextWithEntities{ maybeUser->firstName },
+						Ui::Text::RichLangValue)
+					: tr::lng_delete_for_everyone_check(
+						tr::now,
+						Ui::Text::WithEntities),
+				false,
+				st::defaultBoxCheckbox));
+	}();
+
+	Ui::AddSkip(container);
+
+	auto buttonText = maybeUser
+		? tr::lng_box_delete()
+		: !maybeCheckbox
+		? tr::lng_box_leave()
+		: maybeCheckbox->checkedValue() | rpl::map([](bool checked) {
+			return checked ? tr::lng_box_delete() : tr::lng_box_leave();
+		}) | rpl::flatten_latest();
+
+	const auto close = crl::guard(box, [=] { box->closeBox(); });
+	box->addButton(std::move(buttonText), [=] {
+		const auto revoke = maybeCheckbox && maybeCheckbox->checked();
+		Core::App().closeChatFromWindows(peer);
+		// Don't delete old history by default,
+		// because Android app doesn't.
+		//
+		//if (const auto from = peer->migrateFrom()) {
+		//	peer->session().api().deleteConversation(from, false);
+		//}
+		peer->session().api().deleteConversation(peer, revoke);
+		close();
+	}, st::attentionBoxButton);
+	box->addButton(tr::lng_cancel(), close);
+}
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.h b/Telegram/SourceFiles/boxes/moderate_messages_box.h
index 351b49741..eb2402612 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.h
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+class PeerData;
 
 namespace Ui {
 class GenericBox;
@@ -18,3 +19,5 @@ void CreateModerateMessagesBox(
 	Fn<void()> confirmed);
 
 [[nodiscard]] bool CanCreateModerateMessagesBox(const HistoryItemsList &);
+
+void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer);
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index f6473b07b..7648e4543 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/max_invite_box.h"
+#include "boxes/moderate_messages_box.h"
 #include "boxes/choose_filter_box.h"
 #include "boxes/create_poll_box.h"
 #include "boxes/pin_messages_box.h"
@@ -2549,9 +2550,7 @@ Fn<void()> ClearHistoryHandler(
 Fn<void()> DeleteAndLeaveHandler(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer) {
-	return [=] {
-		controller->show(Box<DeleteMessagesBox>(peer, false));
-	};
+	return [=] { controller->show(Box(DeleteChatBox, peer)); };
 }
 
 void FillDialogsEntryMenu(

From 2f0aa6ef05f6c3657e22e6ee675387ba9a80b0db Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 30 Apr 2024 16:49:17 +0300
Subject: [PATCH 437/596] Removed state sending of low level of battery to call
 participant.

---
 Telegram/SourceFiles/calls/calls_call.cpp | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 3a3e68b47..527839363 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -7,31 +7,29 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "calls/calls_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/abstract_box.h"
-#include "ui/boxes/confirm_box.h"
-#include "ui/boxes/rate_call_box.h"
-#include "calls/calls_instance.h"
-#include "base/battery_saving.h"
 #include "base/openssl_help.h"
+#include "base/platform/base_platform_info.h"
 #include "base/random.h"
-#include "mtproto/mtproto_dh_utils.h"
-#include "mtproto/mtproto_config.h"
+#include "boxes/abstract_box.h"
+#include "calls/calls_instance.h"
+#include "calls/calls_panel.h"
 #include "core/application.h"
 #include "core/core_settings.h"
-#include "window/window_controller.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
 #include "media/audio/media_audio_track.h"
-#include "base/platform/base_platform_info.h"
-#include "calls/calls_panel.h"
+#include "mtproto/mtproto_config.h"
+#include "mtproto/mtproto_dh_utils.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/rate_call_box.h"
+#include "webrtc/webrtc_create_adm.h"
 #include "webrtc/webrtc_environment.h"
 #include "webrtc/webrtc_video_track.h"
-#include "webrtc/webrtc_create_adm.h"
-#include "data/data_user.h"
-#include "data/data_session.h"
+#include "window/window_controller.h"
 
 #include <tgcalls/Instance.h>
 #include <tgcalls/VideoCaptureInterface.h>
@@ -1072,6 +1070,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 		Core::App().mediaDevices().setCaptureMuted(muted);
 	}, _instanceLifetime);
 
+#if 0
 	Core::App().batterySaving().value(
 	) | rpl::start_with_next([=](bool isSaving) {
 		crl::on_main(weak, [=] {
@@ -1080,6 +1079,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 			}
 		});
 	}, _instanceLifetime);
+#endif
 }
 
 void Call::handleControllerStateChange(tgcalls::State state) {

From 20a13663a6c3830b5106affe9061b051cfa713e3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 30 Apr 2024 17:35:04 +0300
Subject: [PATCH 438/596] Slightly improved style of rpl text mapping.

---
 Telegram/SourceFiles/boxes/moderate_messages_box.cpp         | 4 ++--
 Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp | 2 +-
 Telegram/SourceFiles/settings/settings_business.cpp          | 2 +-
 Telegram/SourceFiles/settings/settings_premium.cpp           | 4 ++--
 Telegram/SourceFiles/ui/effects/premium_graphics.cpp         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index e6079a0b7..4496ed421 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -757,9 +757,9 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		line,
 		peer->isSelf()
-			? tr::lng_saved_messages() | rpl::map(Ui::Text::Bold)
+			? tr::lng_saved_messages() | Ui::Text::ToBold()
 			: maybeUser
-			? tr::lng_profile_delete_conversation() | rpl::map(Ui::Text::Bold)
+			? tr::lng_profile_delete_conversation() | Ui::Text::ToBold()
 			: rpl::single(Ui::Text::Bold(peer->name())),
 		box->getDelegate()->style().title);
 	line->widthValue(
diff --git a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
index f2445a166..d2e2e945e 100644
--- a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
@@ -224,7 +224,7 @@ PreviewWrap::PreviewWrap(
 					lt_user,
 					rpl::single(
 						item->history()->peer->shortName()
-					) | rpl::map(Ui::Text::RichLangValue),
+					) | Ui::Text::ToRichLangValue(),
 					Ui::Text::RichLangValue)
 			: (isRound
 				? tr::lng_ttl_round_tooltip_in
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index c11a0f3cd..66b707c5f 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -185,7 +185,7 @@ void AddBusinessSummary(
 		const auto label = content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				std::move(entry.title) | rpl::map(Ui::Text::Bold),
+				std::move(entry.title) | Ui::Text::ToBold(),
 				stLabel),
 			titlePadding);
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 601f1f978..057f36d2d 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -986,7 +986,7 @@ void Premium::setupContent() {
 		object_ptr<Ui::FlatLabel>(
 			content,
 			tr::lng_premium_summary_bottom_subtitle(
-			) | rpl::map(Ui::Text::Bold),
+			) | Ui::Text::ToBold(),
 			stLabel),
 		st::defaultSubsectionTitlePadding);
 	content->add(
@@ -1630,7 +1630,7 @@ void AddSummaryPremium(
 		const auto label = content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				std::move(entry.title) | rpl::map(Ui::Text::Bold),
+				std::move(entry.title) | Ui::Text::ToBold(),
 				stLabel),
 			titlePadding);
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index 3d3cb00ef..b701f8500 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -1199,7 +1199,7 @@ void ShowListBox(
 		const auto title = content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				base::take(entry.title) | rpl::map(Ui::Text::Bold),
+				base::take(entry.title) | Ui::Text::ToBold(),
 				stLabel),
 			entry.icon ? iconTitlePadding : titlePadding);
 		content->add(

From ef8c07e6eb0f44ca634f817e30351a39a33720fe Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 30 Apr 2024 17:35:34 +0300
Subject: [PATCH 439/596] Added ability to translate selected text in profile
 section.

---
 .../SourceFiles/info/profile/info_profile_actions.cpp | 11 +++++++++--
 Telegram/lib_ui                                       |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index c4ba68899..b7a14b484 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -965,13 +965,20 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			if (Ui::SkipTranslate(state->labelText.current())) {
 				return;
 			}
-			auto item = tr::lng_context_translate(tr::now);
+			auto item = (request.selection.empty()
+				? tr::lng_context_translate
+				: tr::lng_context_translate_selected)(tr::now);
 			request.menu->addAction(std::move(item), [=] {
 				controller->window().show(Box(
 					Ui::TranslateBox,
 					peer,
 					MsgId(),
-					state->labelText.current(),
+					request.selection.empty()
+						? state->labelText.current()
+						: Ui::Text::Mid(
+							state->labelText.current(),
+							request.selection.from,
+							request.selection.to - request.selection.from),
 					false));
 			});
 		});
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index cb57bef3f..08b56a178 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit cb57bef3f01b7ec60eb0eae0ee68cd56cb3a9b1f
+Subproject commit 08b56a17892d4c9c6b7ef87fcffbb64090e9ce2a

From b9b7d9e33709daec348c51e81607e47c56d6e3bc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 Apr 2024 14:58:32 +0400
Subject: [PATCH 440/596] Implement live location view.

---
 .../icons/chat/live_location_long.png         | Bin 0 -> 416 bytes
 .../icons/chat/live_location_long@2x.png      | Bin 0 -> 913 bytes
 .../icons/chat/live_location_long@3x.png      | Bin 0 -> 1588 bytes
 Telegram/Resources/langs/lang.strings         |   9 +
 .../SourceFiles/data/data_media_types.cpp     |  51 ++-
 Telegram/SourceFiles/data/data_media_types.h  |  18 +-
 Telegram/SourceFiles/history/history_item.cpp |   4 +-
 .../view/media/history_view_location.cpp      | 409 ++++++++++++++++--
 .../view/media/history_view_location.h        |  33 +-
 .../history/view/media/history_view_media.cpp |   4 +
 .../history/view/media/history_view_media.h   |   1 +
 Telegram/SourceFiles/ui/chat/chat.style       |   6 +
 Telegram/SourceFiles/ui/chat/chat_style.cpp   |   6 +
 Telegram/SourceFiles/ui/chat/chat_style.h     |   1 +
 Telegram/build/prepare/prepare.py             |  76 +++-
 15 files changed, 555 insertions(+), 63 deletions(-)
 create mode 100644 Telegram/Resources/icons/chat/live_location_long.png
 create mode 100644 Telegram/Resources/icons/chat/live_location_long@2x.png
 create mode 100644 Telegram/Resources/icons/chat/live_location_long@3x.png

diff --git a/Telegram/Resources/icons/chat/live_location_long.png b/Telegram/Resources/icons/chat/live_location_long.png
new file mode 100644
index 0000000000000000000000000000000000000000..847930f549c6a70c90798213cbfdc6becb5414f6
GIT binary patch
literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000~S000~a0ssI2{clLa00009a7bBm000XU
z000XU0RWnu7ytkPQb|NXR7i>Kk-zFeVHkkl4mpwhD`tbFT!3US%YbWe0jHGgR;3hK
zT!f8HXCadO36nC|+<=_)7{2-?2FLt6&-OljJ>Ofeh=YT}2b!k&{r*qycDsE(-_JQ+
z*W2y(?REpk<8eNp*ECH;qS0u--?uCa7!HT2RO*KX=kqymxm;GO6#$4xC=|M0ufX|y
z-fT9&{eDj*61Jj-VE~;@M~#(ArCzU#$bP>Es@1CUrBVr)&1SZu>-Ac#_DZkU1Deg|
zt29j$2#3SpqucHFEt<>afWzVN_Hr_r0Fg-Kd$d-o0j*X`jhRg5@pu5SSgc$wHyRD)
zi^U?aSS-F5Ma1QDEtgB+bUIC^Q+239p&%l=-3~Y&kLr?^WhIkITTv0wb-ml|ss&Bc
z%x1I7$K&zAV4%JkjYjEo+HUa=kH-@X20y*m>kR|~Kj$1A{sB+<w7b<9L_kLX0000<
KMNUMnLSTYS?!6lT

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/live_location_long@2x.png b/Telegram/Resources/icons/chat/live_location_long@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4c0182008a996804ac48b4c201e86fc628f551f
GIT binary patch
literal 913
zcmV;C18)3@P)<h;3K|Lk000e1NJLTq001}u001}$0ssI2C*-V200009a7bBm000XU
z000XU0RWnu7ytkRLrFwIRA_<imO&^yQ5?s|Y`curOe7^a7)C5@q2{92$+}Pu4pNkw
zlqm<<rJS~i8wUr{W@C3L%E7@ZCwr1DrQNimrnIpvk~MZx)B7J@|M%Z4V{G$xdY{wm
z+t2)d-`?)~%@70zgTY`h7z_r3!TdU=yzeY7E@l`;RaI40_4qVRmz0#ezrO<j@@Q9(
z$321|baZqyG&ImOeSd!+i^X<#cMlH_Kb5Uks~`wG&)aM^ilP#UL^K-p`~9b<r+Kv2
zOLup7BoYBRsH(cZzu(&0`oR}PF&>ZS`Y$gpUayy7nE#Tpv$Io{<=n1_+uPfwrY7Xi
z&(CYf0Dw>^WVKoiPRViH<KrXhadL7pH#g^UxmH(KB}qd2R99CA{e^{v>`X^TN3*lD
zZnxX#^QBTLwC?x&4Gy}ov4N`3%*<r(M0Iub_VzXaU~Fs*t_%$gAz7B?{{DWG>EEff
z+wB(@7f5JtZ#OI@%d(kFMq>{sit6d<u~;kwLA12AD2f8*o12?YbJWz-B$G+#_<TOY
zg7)?G!J?T=hT}MG`S|!4?bhJn;8&W*<AF{j5}|3@n4nWrQ>du6IXO9rQU(G64b$m#
zLQRsS=H}*aGmv_M78K|jw>F#2<MF`jySuyb@o^0q{2luwNs{FEF?0o$Bnd@fS@u)M
zWHPO-tx*&OKMoHMr&1}6nmo_Li-(7Y>+5ShF}|m^wicZauh*L^kR-XZw3Pd!^E}_x
z)s^d4RaGSt2`I0xuN#vRvbnj5a=6{@>_0<gWo0lJMBkpBofQ=o5d^_73_RKc0|VKm
zIF5_OV#s$m97YChY-~)Y)2Mnl9G;$@76f5&aq;Tv3azKpX*3pAR#wpZ!NI}A#Kg$R
z$nx?s8cYCyt*tF1Q$n0h=iA#G_?mb;-qzNJe3#3mAp-zHp^#yN=>xsJz0qj&tFCst
z{ev%xB6`4PqbN!s5GXAz)!+KZuXz@WWps4Z;c(Q~*B2HRK0Q5MUS96(?CkCBed?E&
zmy4pv^E}J4X0th&OrD>g2ZO<IIQ*l&`Mi%p%F4>jX0t5IudlCq{ECVSk|dv>pA|*P
nyD0{P!C){L3<iV2{3?F{foZu_t%C1000000NkvXXu0mjfp}n~Z

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/live_location_long@3x.png b/Telegram/Resources/icons/chat/live_location_long@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a8cd36b53d105ad14199abfbe61d56ff057b0c8
GIT binary patch
literal 1588
zcmV-42Fv-0P)<h;3K|Lk000e1NJLTq002|~002}70ssI2lL?2G00009a7bBm000XU
z000XU0RWnu7ytkT=1D|BRCt{2*<nZ;eHZ|6U-MSB!!<)B93peA*_zab$Rc7e#;{2g
zu@6GTMvDzU3?xR-hnOE?5L+_((1#5N8$pcN*rNKNB1My7*uYgb*=nI!gsw96oR_%|
z!o7b^(=)BTFFe0b-T8l>d!FvR``=#{3jhEB0000000000000000055JKSz<2!{L;c
zmSPx|NF>7H@bBNh51r@q>C^lB`y@#c1VNHyVe2ep^FpDpwzjsqx>})72!+B^r%uIU
zvDMX8r_;H(xae>=*4NjW<dH}ub#-;;&!4ZUsgX*hCr+H$-rn|jJacn%3kwVL^Yful
zsDNb`z}2f)hlhuKK3^gouh(ld8k?J&IUG)gBsh+@wY9x@^Cl1oq|M`YyZih5FJHcV
zY<*=R5{dfz`?t2X(w2+b-Q6`BjS7V#ZJx%)#<y?Zk|dcmkI(0O^ypDpS=sS6nu5pU
z4Gs=QB9W{WQzj=TFJ8Pz%cEAStyU}ZB!NJnudnZ~wEQoF!4QkZ(iXS2wsz3ft5T`Z
zBx<$#$B!RrM{aIzdOV)AmsKnl)9G~i6rbrEm{m(li$<ftFbv)4a5zjR)3<Nm2!bdr
zEv>4mYHVy&DwS+DJ2_x(Zq9DEQ{xp1#pB11&z?PtCLu|3W@ct~c6McDg&+tXk0+DK
znwpwqG8r`n!?1hz?ky}Vm`tX8x;PB6SZp?%(NhtLL{i&eu~;IJ=)r>r%gf8jGuhJ8
zLVZ+TUjFs#SK2B4^yyPaM~6TlpyiRtWJ5zkw80-fd?+q1KI&%ay1KeHH#gBb^m;vx
z<7o%8*=&tQW4GIfhKA4^)ytPJY0cPdwrkg}9duBEKrk{gf{yokz1Oc_FLZO+jE;_?
zMVQUztRYgV^yJBt)aJv74{4p7&1Uq%PK(Rs(k_;Pfq{IR$%$Ajw%KfG1!}cArwl@&
zaBXc3&EWU@o12@N#A>x#G;nNe>{uUr_4W1NzkjC=@9}u3`x!&y<Kt)pp-@P#*E5Xe
za=B>i^z^h`F3-IQR&Etj_<VjzNeQ+2^XJd~{e9-)U0q!b4GriXr_=fD*)xXW1VNzh
z3pkGRcs%AuryR0*dX`*HdsS7HUav<l)IcE6+1VKk2AL<>+uNi5=5RQfXUzvWWb?sb
zFdB_gn_{t;d2DZQZ$(7~y644<7cQ5Jc?Jx_&>Lqc6x!b2W*(le%F0UG4e!Q{8%zRw
zdU`^k5E?i>KA!8*@7}$OW_bVpJ)h6dy@@=~9(5BF6Inx4DwW&qMx&z9s8lMY1_%U#
z%F4>jN!V<*!{I=a3=R(F+f1&sTCLyjM~l$ubhN21h0SKSx3{AYh(sb0iA1zoEj30W
zkytF2FJHdgym|AWgYtMhqtS>a@p`=(#vc`_RBEwU&^mT^cXc{l>La(jy!`(C`^o7o
zYIJlI9oEy+liY8&+uPgQQ*YoRk?6^jC$uCJ6BCD?-sZKEqtR%dKYvb}gxhSkj~_oK
zUu?Ks?u82%Zr!?7UtdpqBA863*4EZ=IGo&UZEb!1`ZYB>4u``Qi^XcSy4~)0JdWe|
zrAwD?-@aX4U5zGjxm?}d-BVLj`E+qe91drAcsP;H#>U3d(vsKfjmP7upIWU}rBaEe
zdiwNf>agT0*z)o+?faEPl4Ngh?_X$}g5&tWz(6z_P5UoM6_3Zq#>P_L{FF*1ZO)h3
ze_}C%#bTW~bH-pW?Ck7ht$1f=$7nPjv;x=A(D3fvJ0{Cm8yg#aeSLp_8H=J)sb0N$
zMSIDm_<X*Rk&(8xwyX=7ckbMooSZypMbP8%7z~CC@4PuF<kGc7BDr$qid-(2%jH6$
zkjv#pA`!pe?{c}EPUq*(pI25^nB=LcsZl5ta=HB6xpNg26&QvEgTeLn_4)bvrKP3W
z+1X#eeifwPBl*#ytgNi4sHmi*WN&YeAc&kM?I=E<UtC;VR8&L|L^K+u9t{8h00000
m00000000000002+zx4;1M!N?gyuBCz0000<MNUMnLSTZBP!!Mr

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 52c9ed8d3..d0a709c6d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3092,6 +3092,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_unread_bar_some" = "Unread messages";
 
 "lng_maps_point" = "Location";
+"lng_live_location" = "Live Location";
+"lng_live_location_now" = "updated just now";
+"lng_live_location_minutes#one" = "updated {count} minute ago";
+"lng_live_location_minutes#other" = "updated {count} minutes ago";
+"lng_live_location_hours#one" = "updated {count} hour ago";
+"lng_live_location_hours#other" = "updated {count} hours ago";
+"lng_live_location_today" = "updated today at {time}";
+"lng_live_location_yesterday" = "updated yesterday at {time}";
+"lng_live_location_date_time" = "updated {date} at {time}";
 "lng_save_photo" = "Save image";
 "lng_save_video" = "Save video";
 "lng_save_audio_file" = "Save audio file";
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index e6dd5006a..50e063da5 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1311,8 +1311,9 @@ std::unique_ptr<HistoryView::Media> MediaContact::createView(
 
 MediaLocation::MediaLocation(
 	not_null<HistoryItem*> parent,
-	const LocationPoint &point)
-: MediaLocation(parent, point, QString(), QString()) {
+	const LocationPoint &point,
+	TimeId livePeriod)
+: MediaLocation({}, parent, point, livePeriod, QString(), QString()) {
 }
 
 MediaLocation::MediaLocation(
@@ -1320,17 +1321,30 @@ MediaLocation::MediaLocation(
 	const LocationPoint &point,
 	const QString &title,
 	const QString &description)
+: MediaLocation({}, parent, point, TimeId(), title, description) {
+}
+
+MediaLocation::MediaLocation(
+	PrivateTag,
+	not_null<HistoryItem*> parent,
+	const LocationPoint &point,
+	TimeId livePeriod,
+	const QString &title,
+	const QString &description)
 : Media(parent)
 , _point(point)
 , _location(parent->history()->owner().location(point))
+, _livePeriod(livePeriod)
 , _title(title)
 , _description(description) {
 }
 
 std::unique_ptr<Media> MediaLocation::clone(not_null<HistoryItem*> parent) {
 	return std::make_unique<MediaLocation>(
+		PrivateTag(),
 		parent,
 		_point,
+		_livePeriod,
 		_title,
 		_description);
 }
@@ -1339,8 +1353,14 @@ CloudImage *MediaLocation::location() const {
 	return _location;
 }
 
+QString MediaLocation::typeString() const {
+	return _livePeriod
+		? tr::lng_live_location(tr::now)
+		: tr::lng_maps_point(tr::now);
+}
+
 ItemPreview MediaLocation::toPreview(ToPreviewOptions options) const {
-	const auto type = tr::lng_maps_point(tr::now);
+	const auto type = typeString();
 	const auto hasMiniImages = false;
 	const auto text = TextWithEntities{ .text = _title };
 	return {
@@ -1349,9 +1369,7 @@ ItemPreview MediaLocation::toPreview(ToPreviewOptions options) const {
 }
 
 TextWithEntities MediaLocation::notificationText() const {
-	return WithCaptionNotificationText(
-		tr::lng_maps_point(tr::now),
-		{ .text = _title });
+	return WithCaptionNotificationText(typeString(), { .text = _title });
 }
 
 QString MediaLocation::pinnedTextSubstring() const {
@@ -1360,7 +1378,7 @@ QString MediaLocation::pinnedTextSubstring() const {
 
 TextForMimeData MediaLocation::clipboardText() const {
 	auto result = TextForMimeData::Simple(
-		u"[ "_q + tr::lng_maps_point(tr::now) + u" ]\n"_q);
+		u"[ "_q + typeString() + u" ]\n"_q);
 	auto titleResult = TextUtilities::ParseEntities(
 		_title,
 		Ui::WebpageTextTitleOptions().flags);
@@ -1389,12 +1407,19 @@ std::unique_ptr<HistoryView::Media> MediaLocation::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
-	return std::make_unique<HistoryView::Location>(
-		message,
-		_location,
-		_point,
-		_title,
-		_description);
+	return _livePeriod
+		? std::make_unique<HistoryView::Location>(
+			message,
+			_location,
+			_point,
+			replacing,
+			_livePeriod)
+		: std::make_unique<HistoryView::Location>(
+			message,
+			_location,
+			_point,
+			_title,
+			_description);
 }
 
 MediaCall::MediaCall(not_null<HistoryItem*> parent, const Call &call)
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index 1aae67928..c486799cd 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -331,10 +331,14 @@ private:
 };
 
 class MediaLocation final : public Media {
+	struct PrivateTag {
+	};
+
 public:
 	MediaLocation(
 		not_null<HistoryItem*> parent,
-		const LocationPoint &point);
+		const LocationPoint &point,
+		TimeId livePeriod = 0);
 	MediaLocation(
 		not_null<HistoryItem*> parent,
 		const LocationPoint &point,
@@ -356,9 +360,21 @@ public:
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing = nullptr) override;
 
+	MediaLocation(
+		PrivateTag,
+		not_null<HistoryItem*> parent,
+		const LocationPoint &point,
+		TimeId livePeriod,
+		const QString &title,
+		const QString &description);
+
 private:
+
+	[[nodiscard]] QString typeString() const;
+
 	LocationPoint _point;
 	not_null<CloudImage*> _location;
+	TimeId _livePeriod = 0;
 	QString _title;
 	QString _description;
 
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 0695742bb..171480ab6 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -224,10 +224,12 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 			return nullptr;
 		});
 	}, [&](const MTPDmessageMediaGeoLive &media) -> Result {
+		const auto period = media.vperiod().v;
 		return media.vgeo().match([&](const MTPDgeoPoint &point) -> Result {
 			return std::make_unique<Data::MediaLocation>(
 				item,
-				Data::LocationPoint(point));
+				Data::LocationPoint(point),
+				media.vperiod().v);
 		}, [](const MTPDgeoPointEmpty &) -> Result {
 			return nullptr;
 		});
diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.cpp b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
index 5fab03d15..f16d65141 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
@@ -7,12 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/media/history_view_location.h"
 
+#include "base/unixtime.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
 #include "history/history_item.h"
 #include "history/history_location_manager.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
+#include "lang/lang_keys.h"
 #include "ui/chat/chat_style.h"
 #include "ui/image/image.h"
 #include "ui/text/text_options.h"
@@ -24,6 +26,98 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_chat.h"
 
 namespace HistoryView {
+namespace {
+
+constexpr auto kUntilOffPeriod = std::numeric_limits<TimeId>::max();
+constexpr auto kLiveElapsedPartOpacity = 0.2;
+
+[[nodiscard]] TimeId ResolveUpdateDate(not_null<Element*> view) {
+	const auto item = view->data();
+	const auto edited = item->Get<HistoryMessageEdited>();
+	return edited ? edited->date : item->date();
+}
+
+[[nodiscard]] QString RemainingTimeText(
+		not_null<Element*> view,
+		TimeId period) {
+	if (period == kUntilOffPeriod) {
+		return QString(1, QChar(0x221E));
+	}
+	const auto elapsed = base::unixtime::now() - view->data()->date();
+	const auto remaining = std::clamp(period - elapsed, 0, period);
+	if (remaining < 10) {
+		return tr::lng_seconds_tiny(tr::now, lt_count, remaining);
+	} else if (remaining < 600) {
+		return tr::lng_minutes_tiny(tr::now, lt_count, remaining / 60);
+	} else if (remaining < 3600) {
+		return QString::number(remaining / 60);
+	} else if (remaining < 86400) {
+		return tr::lng_hours_tiny(tr::now, lt_count, remaining / 3600);
+	}
+	return tr::lng_days_tiny(tr::now, lt_count, remaining / 86400);
+}
+
+[[nodiscard]] float64 RemainingTimeProgress(
+		not_null<Element*> view,
+		TimeId period) {
+	if (period == kUntilOffPeriod) {
+		return 1.;
+	} else if (period < 1) {
+		return 0.;
+	}
+	const auto elapsed = base::unixtime::now() - view->data()->date();
+	return std::clamp(period - elapsed, 0, period) / float64(period);
+}
+
+} // namespace
+
+struct Location::Live {
+	explicit Live(TimeId period) : period(period) {
+	}
+
+	base::Timer updateStatusTimer;
+	base::Timer updateRemainingTimer;
+	QImage previous;
+	QImage previousCache;
+	Ui::BubbleRounding previousRounding;
+	Ui::Animations::Simple crossfade;
+	TimeId period = 0;
+	int thumbnailHeight = 0;
+};
+
+Location::Location(
+	not_null<Element*> parent,
+	not_null<Data::CloudImage*> data,
+	Data::LocationPoint point,
+	Element *replacing,
+	TimeId livePeriod)
+: Media(parent)
+, _data(data)
+, _live(CreateLiveTracker(parent, livePeriod))
+, _title(st::msgMinWidth)
+, _description(st::msgMinWidth)
+, _link(std::make_shared<LocationClickHandler>(point)) {
+	if (_live) {
+		_title.setText(
+			st::webPageTitleStyle,
+			tr::lng_live_location(tr::now),
+			Ui::WebpageTextTitleOptions());
+		_live->updateStatusTimer.setCallback([=] {
+			updateLiveStatus();
+			checkLiveFinish();
+		});
+		_live->updateRemainingTimer.setCallback([=] {
+			checkLiveFinish();
+		});
+		updateLiveStatus();
+		if (const auto media = replacing ? replacing->media() : nullptr) {
+			_live->previous = media->locationTakeImage();
+			if (!_live->previous.isNull()) {
+				history()->owner().registerHeavyViewPart(_parent);
+			}
+		}
+	}
+}
 
 Location::Location(
 	not_null<Element*> parent,
@@ -53,18 +147,106 @@ Location::Location(
 }
 
 Location::~Location() {
-	if (_media) {
-		_media = nullptr;
+	if (hasHeavyPart()) {
+		unloadHeavyPart();
 		_parent->checkHeavyPart();
 	}
 }
 
+void Location::checkLiveFinish() {
+	Expects(_live != nullptr);
+
+	const auto now = base::unixtime::now();
+	const auto item = _parent->data();
+	const auto start = item->date();
+	if (_live->period != kUntilOffPeriod && now - start >= _live->period) {
+		_live = nullptr;
+		item->history()->owner().requestViewResize(_parent);
+	} else {
+		_parent->repaint();
+	}
+}
+
+std::unique_ptr<Location::Live> Location::CreateLiveTracker(
+		not_null<Element*> parent,
+		TimeId period) {
+	if (!period) {
+		return nullptr;
+	}
+	const auto now = base::unixtime::now();
+	const auto date = parent->data()->date();
+	return (now < date || now - date < period)
+		? std::make_unique<Live>(period)
+		: nullptr;
+}
+
+void Location::updateLiveStatus() {
+	const auto date = ResolveUpdateDate(_parent);
+	const auto now = base::unixtime::now();
+	const auto elapsed = now - date;
+	auto next = TimeId();
+	const auto text = [&] {
+		if (elapsed < 60) {
+			next = 60 - elapsed;
+			return tr::lng_live_location_now(tr::now);
+		} else if (const auto minutes = elapsed / 60; minutes < 60) {
+			next = 60 - (elapsed % 60);
+			return tr::lng_live_location_minutes(tr::now, lt_count, minutes);
+		} else if (const auto hours = elapsed / 3600; hours < 12) {
+			next = 3600 - (elapsed % 3600);
+			return tr::lng_live_location_hours(tr::now, lt_count, hours);
+		}
+		const auto dateFull = base::unixtime::parse(date);
+		const auto nowFull = base::unixtime::parse(now);
+		const auto nextTomorrow = [&] {
+			const auto tomorrow = nowFull.date().addDays(1);
+			next = nowFull.secsTo(QDateTime(tomorrow, QTime(0, 0)));
+		};
+		const auto locale = QLocale();
+		const auto format = QLocale::ShortFormat;
+		if (dateFull.date() == nowFull.date()) {
+			nextTomorrow();
+			const auto time = locale.toString(dateFull.time(), format);
+			return tr::lng_live_location_today(tr::now, lt_time, time);
+		} else if (dateFull.date().addDays(1) == nowFull.date()) {
+			nextTomorrow();
+			const auto time = locale.toString(dateFull.time(), format);
+			return tr::lng_live_location_yesterday(tr::now, lt_time, time);
+		}
+		return tr::lng_live_location_date_time(
+			tr::now,
+			lt_date,
+			locale.toString(dateFull.date(), format),
+			lt_time,
+			locale.toString(dateFull.time(), format));
+	}();
+	_description.setMarkedText(
+		st::webPageDescriptionStyle,
+		{ text },
+		Ui::WebpageTextDescriptionOptions());
+	if (next > 0 && next < 86400) {
+		_live->updateStatusTimer.callOnce(next * crl::time(1000));
+	}
+}
+
+QImage Location::locationTakeImage() {
+	if (_media && !_media->isNull()) {
+		return *_media;
+	} else if (_live && !_live->previous.isNull()) {
+		return _live->previous;
+	}
+	return {};
+}
+
 void Location::unloadHeavyPart() {
 	_media = nullptr;
+	if (_live) {
+		_live->previous = QImage();
+	}
 }
 
 bool Location::hasHeavyPart() const {
-	return (_media != nullptr);
+	return (_media != nullptr) || (_live && !_live->previous.isNull());
 }
 
 void Location::ensureMediaCreated() const {
@@ -99,8 +281,14 @@ QSize Location::countOptimalSize() {
 		}
 		if (!_title.isEmpty() || !_description.isEmpty()) {
 			minHeight += st::mediaInBubbleSkip;
-			if (isBubbleTop()) {
-				minHeight += st::msgPadding.top();
+			if (_live) {
+				if (isBubbleBottom()) {
+					minHeight += st::msgPadding.bottom();
+				}
+			} else {
+				if (isBubbleTop()) {
+					minHeight += st::msgPadding.top();
+				}
 			}
 		}
 	}
@@ -128,6 +316,9 @@ QSize Location::countCurrentSize(int newWidth) {
 		std::min(newWidth, st::maxMediaSize));
 	accumulate_max(newWidth, minWidth);
 	accumulate_max(newHeight, st::minPhotoSize);
+	if (_live) {
+		_live->thumbnailHeight = newHeight;
+	}
 	if (_parent->hasBubble()) {
 		if (!_title.isEmpty()) {
 			newHeight += qMin(_title.countHeight(newWidth - st::msgPadding.left() - st::msgPadding.right()), st::webPageTitleFont->height * 2);
@@ -137,8 +328,14 @@ QSize Location::countCurrentSize(int newWidth) {
 		}
 		if (!_title.isEmpty() || !_description.isEmpty()) {
 			newHeight += st::mediaInBubbleSkip;
-			if (isBubbleTop()) {
-				newHeight += st::msgPadding.top();
+			if (_live) {
+				if (isBubbleBottom()) {
+					newHeight += st::msgPadding.bottom();
+				}
+			} else {
+				if (isBubbleTop()) {
+					newHeight += st::msgPadding.top();
+				}
 			}
 		}
 	}
@@ -156,20 +353,27 @@ TextSelection Location::fromDescriptionSelection(
 }
 
 void Location::draw(Painter &p, const PaintContext &context) const {
-	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
+	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) {
+		return;
+	}
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	bool bubble = _parent->hasBubble();
 	const auto st = context.st;
 	const auto stm = context.messageStyle();
 
 	const auto hasText = !_title.isEmpty() || !_description.isEmpty();
-	const auto rounding = adjustedBubbleRounding(
-		hasText ? RectPart::FullTop : RectPart());
-	if (bubble) {
-		if (hasText) {
-			if (isBubbleTop()) {
-				painty += st::msgPadding.top();
-			}
+	const auto rounding = adjustedBubbleRounding(_live
+		? RectPart::FullBottom
+		: hasText
+		? RectPart::FullTop
+		: RectPart());
+	const auto paintText = [&] {
+		if (_live) {
+			painty += st::mediaInBubbleSkip;
+		} else if (!hasText) {
+			return;
+		} else if (isBubbleTop()) {
+			painty += st::msgPadding.top();
 		}
 
 		auto textw = width() - st::msgPadding.left() - st::msgPadding.right();
@@ -180,24 +384,45 @@ void Location::draw(Painter &p, const PaintContext &context) const {
 			painty += qMin(_title.countHeight(textw), 2 * st::webPageTitleFont->height);
 		}
 		if (!_description.isEmpty()) {
+			if (_live) {
+				p.setPen(stm->msgDateFg);
+			}
 			_description.drawLeftElided(p, paintx + st::msgPadding.left(), painty, textw, width(), 3, style::al_left, 0, -1, 0, false, toDescriptionSelection(context.selection));
 			painty += qMin(_description.countHeight(textw), 3 * st::webPageDescriptionFont->height);
 		}
-		if (!_title.isEmpty() || !_description.isEmpty()) {
+		if (!_live) {
 			painty += st::mediaInBubbleSkip;
+			painth -= painty;
 		}
-		painth -= painty;
+	};
+	if (!_live) {
+		paintText();
 	}
-	auto rthumb = QRect(paintx, painty, paintw, painth);
+	const auto thumbh = _live ? _live->thumbnailHeight : painth;
+	auto rthumb = QRect(paintx, painty, paintw, thumbh);
 	if (!bubble) {
 		fillImageShadow(p, rthumb, rounding, context);
 	}
 
 	ensureMediaCreated();
 	validateImageCache(rthumb.size(), rounding);
-	if (!_imageCache.isNull()) {
+	const auto paintPrevious = _live && !_live->previous.isNull();
+	auto opacity = _imageCache.isNull() ? 0. : 1.;
+	if (paintPrevious) {
+		opacity = _live->crossfade.value(opacity);
+		if (opacity < 1.) {
+			p.drawImage(rthumb.topLeft(), _live->previousCache);
+			if (opacity > 0.) {
+				p.setOpacity(opacity);
+			}
+		}
+	}
+	if (!_imageCache.isNull() && opacity > 0.) {
 		p.drawImage(rthumb.topLeft(), _imageCache);
-	} else if (!bubble) {
+		if (opacity < 1.) {
+			p.setOpacity(1.);
+		}
+	} else if (!bubble && !paintPrevious) {
 		Ui::PaintBubble(
 			p,
 			Ui::SimpleBubble{
@@ -223,8 +448,12 @@ void Location::draw(Painter &p, const PaintContext &context) const {
 	if (context.selected()) {
 		fillImageOverlay(p, rthumb, rounding, context);
 	}
-
-	if (_parent->media() == this) {
+	if (_live) {
+		painty += _live->thumbnailHeight;
+		painth -= _live->thumbnailHeight;
+		paintLiveRemaining(p, context, { paintx, painty, paintw, painth });
+		paintText();
+	} else if (_parent->media() == this) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = height();
 		_parent->drawInfo(
@@ -244,25 +473,114 @@ void Location::draw(Painter &p, const PaintContext &context) const {
 	}
 }
 
+void Location::paintLiveRemaining(
+		QPainter &p,
+		const PaintContext &context,
+		QRect bottom) const {
+	const auto size = st::liveLocationRemainingSize;
+	const auto skip = (bottom.height() - size) / 2;
+	const auto rect = QRect(
+		bottom.x() + bottom.width() - size - skip,
+		bottom.y() + skip,
+		size,
+		size);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto stm = context.messageStyle();
+	const auto color = stm->msgServiceFg->c;
+	const auto untiloff = (_live->period == kUntilOffPeriod);
+	const auto progress = RemainingTimeProgress(_parent, _live->period);
+	const auto part = 1. / 360;
+	const auto full = (progress >= 1. - part);
+	auto elapsed = color;
+	if (!full) {
+		elapsed.setAlphaF(elapsed.alphaF() * kLiveElapsedPartOpacity);
+	}
+	auto pen = QPen(elapsed);
+	const auto stroke = style::ConvertScaleExact(2.);
+	pen.setWidthF(stroke);
+	p.setPen(pen);
+	p.setBrush(Qt::NoBrush);
+	p.drawEllipse(rect);
+
+	if (untiloff) {
+		stm->liveLocationLongIcon.paintInCenter(p, rect);
+	} else {
+		if (!full && progress > part) {
+			auto pen = QPen(color);
+			pen.setWidthF(stroke);
+			p.setPen(pen);
+			p.drawArc(rect, 90 * 16, int(base::SafeRound(360 * 16 * progress)));
+		}
+
+		p.setPen(stm->msgServiceFg);
+		p.setFont(st::semiboldFont);
+		const auto text = RemainingTimeText(_parent, _live->period);
+		p.drawText(rect, text, style::al_center);
+		const auto each = std::clamp(_live->period / 360, 1, 86400);
+		_live->updateRemainingTimer.callOnce(each * crl::time(1000));
+	}
+}
+
 void Location::validateImageCache(
 		QSize outer,
 		Ui::BubbleRounding rounding) const {
 	Expects(_media != nullptr);
 
-	const auto ratio = style::DevicePixelRatio();
-	if ((_imageCache.size() == (outer * ratio)
-			&& _imageCacheRounding == rounding)
-		|| _media->isNull()) {
+	if (_live && !_live->previous.isNull()) {
+		validateImageCache(
+			_live->previous,
+			_live->previousCache,
+			_live->previousRounding,
+			outer,
+			rounding);
+	}
+	validateImageCache(
+		*_media,
+		_imageCache,
+		_imageCacheRounding,
+		outer,
+		rounding);
+	checkLiveCrossfadeStart();
+}
+
+void Location::checkLiveCrossfadeStart() const {
+	if (!_live
+		|| _live->previous.isNull()
+		|| !_media
+		|| _media->isNull()
+		|| _live->crossfade.animating()) {
 		return;
 	}
-	_imageCache = Images::Round(
-		_media->scaled(
+	_live->crossfade.start([=] {
+		if (!_live->crossfade.animating()) {
+			_live->previous = QImage();
+			_live->previousCache = QImage();
+		}
+		_parent->repaint();
+	}, 0., 1., st::fadeWrapDuration);
+}
+
+void Location::validateImageCache(
+		const QImage &source,
+		QImage &cache,
+		Ui::BubbleRounding &cacheRounding,
+		QSize outer,
+		Ui::BubbleRounding rounding) const {
+	if (source.isNull()) {
+		return;
+	}
+	const auto ratio = style::DevicePixelRatio();
+	if (cache.size() == (outer * ratio) && cacheRounding == rounding) {
+		return;
+	}
+	cache = Images::Round(
+		source.scaled(
 			outer * ratio,
 			Qt::IgnoreAspectRatio,
 			Qt::SmoothTransformation),
 		MediaRoundingMask(rounding));
-	_imageCache.setDevicePixelRatio(ratio);
-	_imageCacheRounding = rounding;
+	cache.setDevicePixelRatio(ratio);
+	cacheRounding = rounding;
 }
 
 TextState Location::textState(QPoint point, StateRequest request) const {
@@ -275,11 +593,13 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	bool bubble = _parent->hasBubble();
 
-	if (bubble) {
-		if (!_title.isEmpty() || !_description.isEmpty()) {
-			if (isBubbleTop()) {
-				painty += st::msgPadding.top();
-			}
+	auto checkText = [&] {
+		if (_live) {
+			painty += st::mediaInBubbleSkip;
+		} else if (_title.isEmpty() && _description.isEmpty()) {
+			return false;
+		} else if (isBubbleTop()) {
+			painty += st::msgPadding.top();
 		}
 
 		auto textw = width() - st::msgPadding.left() - st::msgPadding.right();
@@ -292,7 +612,7 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 					textw,
 					width(),
 					request.forText()));
-				return result;
+				return true;
 			} else if (point.y() >= painty + titleh) {
 				symbolAdd += _title.length();
 			}
@@ -306,6 +626,8 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 					textw,
 					width(),
 					request.forText()));
+				result.symbol += symbolAdd;
+				return true;
 			} else if (point.y() >= painty + descriptionh) {
 				symbolAdd += _description.length();
 			}
@@ -315,11 +637,22 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 			painty += st::mediaInBubbleSkip;
 		}
 		painth -= painty;
+		return false;
+	};
+	if (!_live && checkText()) {
+		return result;
 	}
-	if (QRect(paintx, painty, paintw, painth).contains(point) && _data) {
+	const auto thumbh = _live ? _live->thumbnailHeight : painth;
+	if (QRect(paintx, painty, paintw, thumbh).contains(point) && _data) {
 		result.link = _link;
 	}
-	if (_parent->media() == this) {
+	if (_live) {
+		painty += _live->thumbnailHeight;
+		painth -= _live->thumbnailHeight;
+		if (checkText()) {
+			return result;
+		}
+	} else if (_parent->media() == this) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = height();
 		const auto bottomInfoResult = _parent->bottomInfoTextState(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.h b/Telegram/SourceFiles/history/view/media/history_view_location.h
index ec412fd00..9e431ef74 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.h
@@ -22,8 +22,14 @@ public:
 		not_null<Element*> parent,
 		not_null<Data::CloudImage*> data,
 		Data::LocationPoint point,
-		const QString &title = QString(),
-		const QString &description = QString());
+		Element *replacing = nullptr,
+		TimeId livePeriod = 0);
+	Location(
+		not_null<Element*> parent,
+		not_null<Data::CloudImage*> data,
+		Data::LocationPoint point,
+		const QString &title,
+		const QString &description);
 	~Location();
 
 	void draw(Painter &p, const PaintContext &context) const override;
@@ -58,15 +64,33 @@ public:
 		return isRoundedInBubbleBottom();
 	}
 
+	QImage locationTakeImage() override;
+
 	void unloadHeavyPart() override;
 	bool hasHeavyPart() const override;
 
 private:
+	struct Live;
+	[[nodiscard]] static std::unique_ptr<Live> CreateLiveTracker(
+		not_null<Element*> parent,
+		TimeId period);
+
 	void ensureMediaCreated() const;
 
 	void validateImageCache(
 		QSize outer,
 		Ui::BubbleRounding rounding) const;
+	void validateImageCache(
+		const QImage &source,
+		QImage &cache,
+		Ui::BubbleRounding &cacheRounding,
+		QSize outer,
+		Ui::BubbleRounding rounding) const;
+
+	void paintLiveRemaining(
+		QPainter &p,
+		const PaintContext &context,
+		QRect bottom) const;
 
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
@@ -79,7 +103,12 @@ private:
 	[[nodiscard]] int fullWidth() const;
 	[[nodiscard]] int fullHeight() const;
 
+	void checkLiveCrossfadeStart() const;
+	void updateLiveStatus();
+	void checkLiveFinish();
+
 	const not_null<Data::CloudImage*> _data;
+	mutable std::unique_ptr<Live> _live;
 	mutable std::shared_ptr<QImage> _media;
 	Ui::Text::String _title, _description;
 	ClickHandlerPtr _link;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index f64cb808b..56720e83f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -356,6 +356,10 @@ std::unique_ptr<StickerPlayer> Media::stickerTakePlayer(
 	return nullptr;
 }
 
+QImage Media::locationTakeImage() {
+	return QImage();
+}
+
 TextState Media::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index 1b835dcce..f9ad5c987 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -190,6 +190,7 @@ public:
 	virtual std::unique_ptr<StickerPlayer> stickerTakePlayer(
 		not_null<DocumentData*> data,
 		const Lottie::ColorReplacements *replacements);
+	virtual QImage locationTakeImage();
 	virtual void checkAnimation() {
 	}
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 2cab84839..5dd77998a 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1070,3 +1070,9 @@ chatIntroWidth: 224px;
 chatIntroTitleMargin: margins(11px, 16px, 11px, 4px);
 chatIntroMargin: margins(11px, 0px, 11px, 0px);
 chatIntroStickerPadding: margins(10px, 8px, 10px, 16px);
+
+liveLocationLongInIcon: icon {{ "chat/live_location_long", msgInServiceFg }};
+liveLocationLongInIconSelected: icon {{ "chat/live_location_long", msgInServiceFgSelected }};
+liveLocationLongOutIcon: icon {{ "chat/live_location_long", msgOutServiceFg }};
+liveLocationLongOutIconSelected: icon {{ "chat/live_location_long", msgOutServiceFgSelected }};
+liveLocationRemainingSize: 28px;
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index 9470d71d6..a532a3180 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -543,6 +543,12 @@ ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
 		st::historyVoiceMessageInTTLSelected,
 		st::historyVoiceMessageOutTTL,
 		st::historyVoiceMessageOutTTLSelected);
+	make(
+		&MessageStyle::liveLocationLongIcon,
+		st::liveLocationLongInIcon,
+		st::liveLocationLongInIconSelected,
+		st::liveLocationLongOutIcon,
+		st::liveLocationLongOutIconSelected);
 
 	updateDarkValue();
 }
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.h b/Telegram/SourceFiles/ui/chat/chat_style.h
index 1053d630a..6b8cc459b 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.h
+++ b/Telegram/SourceFiles/ui/chat/chat_style.h
@@ -92,6 +92,7 @@ struct MessageStyle {
 	style::icon historyTranscribeLock = { Qt::Uninitialized };
 	style::icon historyTranscribeHide = { Qt::Uninitialized };
 	style::icon historyVoiceMessageTTL = { Qt::Uninitialized };
+	style::icon liveLocationLongIcon = { Qt::Uninitialized };
 	std::array<
 		std::unique_ptr<Text::QuotePaintCache>,
 		kColorPatternsCount> quoteCache;
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index ce00e278e..6351f95c6 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1510,22 +1510,82 @@ mac:
 """)
 
 if buildQt6:
-    stage('qt_6_2_8', """
+    qt6version = '6.2.8' if mac else '6.7.0'
+    qt6version_ = '6_2_8' if mac else '6_7_0'
+    arg0 = 'qt_' + qt6version_
+    arg1 = qt6version
+
+    stage('qt_' + qt6version_, """
+win:
+    git clone -b v{1} https://github.com/qt/qt5.git {0}
 mac:
-    git clone -b v6.2.8-lts-lgpl https://github.com/qt/qt5.git qt_6_2_8
-    cd qt_6_2_8
+    git clone -b v{1}-lts-lgpl https://github.com/qt/qt5.git {0}
+common:
+    cd {0}
     git submodule update --init --recursive qtbase qtimageformats qtsvg
-depends:patches/qtbase_6.2.8/*.patch
+depends:patches/qtbase_{1}/*.patch
     cd qtbase
-    find ../../patches/qtbase_6.2.8 -type f -print0 | sort -z | xargs -0 git apply -v
+win:
+    for /r %%i in (..\\..\\patches\\qtbase_{1}\\*) do git apply %%i -v
     cd ..
-    sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
+
+    SET CONFIGURATIONS=-debug
+release:
+    SET CONFIGURATIONS=-debug-and-release
+win:
+    """.format(arg0, arg1) + removeDir("\"%LIBS_DIR%\\Qt-\"" + qt6version) + """
+    SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
+    SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
+    SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
+    SET OPENSSL_DIR=%LIBS_DIR%\\openssl3
+    SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
+    SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
+    SET WEBP_DIR=%LIBS_DIR%\\libwebp
+    configure -prefix "%LIBS_DIR%\\Qt-{1}" ^
+        %CONFIGURATIONS% ^
+        -force-debug-info ^
+        -opensource ^
+        -confirm-license ^
+        -static ^
+        -static-runtime ^
+        -opengl es2 -no-angle ^
+        -I "%ANGLE_DIR%\\include" ^
+        -D "KHRONOS_STATIC=" ^
+        -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^
+        QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib" ^
+        QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib" ^
+        -egl ^
+        QMAKE_LIBS_EGL_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
+        QMAKE_LIBS_EGL_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
+        -openssl-linked ^
+        -I "%OPENSSL_DIR%\\include" ^
+        OPENSSL_LIBS_DEBUG="%OPENSSL_LIBS_DIR%.dbg\\libssl.lib %OPENSSL_LIBS_DIR%.dbg\\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
+        OPENSSL_LIBS_RELEASE="%OPENSSL_LIBS_DIR%\\libssl.lib %OPENSSL_LIBS_DIR%\\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
+        -I "%MOZJPEG_DIR%" ^
+        LIBJPEG_LIBS_DEBUG="%MOZJPEG_DIR%\\Debug\\jpeg-static.lib" ^
+        LIBJPEG_LIBS_RELEASE="%MOZJPEG_DIR%\\Release\\jpeg-static.lib" ^
+        -system-webp ^
+        -I "%WEBP_DIR%\\src" ^
+        -L "%WEBP_DIR%\\out\\release-static\\$X8664\\lib" ^
+        -mp ^
+        -no-feature-netlistmgr ^
+        -nomake examples ^
+        -nomake tests ^
+        -platform win32-msvc
+
+    jom -j%NUMBER_OF_PROCESSORS%
+    jom -j%NUMBER_OF_PROCESSORS% install
+
+mac:
+    find ../../patches/qtbase_{1} -type f -print0 | sort -z | xargs -0 git apply -v
+    cd ..
+    sed -i.bak 's/tqtc-//' {{qtimageformats,qtsvg}}/dependencies.yaml
 
     CONFIGURATIONS=-debug
 release:
     CONFIGURATIONS=-debug-and-release
 mac:
-    ./configure -prefix "$USED_PREFIX/Qt-6.2.8" \
+    ./configure -prefix "$USED_PREFIX/Qt-{1}" \
         $CONFIGURATIONS \
         -force-debug-info \
         -opensource \
@@ -1546,7 +1606,7 @@ mac:
 
     ninja
     ninja install
-""")
+""".format(arg0, arg1))
 
 stage('tg_owt', """
     git clone https://github.com/desktop-app/tg_owt.git

From 63e1731d7ca320a98f4e3bd087e45d6a7e8a7e65 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 Apr 2024 18:37:31 +0400
Subject: [PATCH 441/596] Fix premium preview bullet-dots.

Regression was introduced in 88751896af.
---
 Telegram/SourceFiles/boxes/premium_preview_box.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index da1ab9064..30f312745 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -913,7 +913,7 @@ void PreviewBox(
 	auto businessOrder = Settings::BusinessFeaturesOrder(&show->session());
 	state->order = ranges::contains(businessOrder, descriptor.section)
 		? std::move(businessOrder)
-		: ranges::contains(businessOrder, descriptor.section)
+		: ranges::contains(premiumOrder, descriptor.section)
 		? std::move(premiumOrder)
 		: std::vector{ descriptor.section };
 

From bb6fd4bc4dbe36f3988d0baf5a60a32893d874f1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 Apr 2024 22:30:39 +0400
Subject: [PATCH 442/596] Update scheme, new sticker categories.

---
 Telegram/SourceFiles/api/api_statistics.cpp   |   8 +-
 .../chat_helpers/emoji_list_widget.cpp        |   7 +-
 .../chat_helpers/gifs_list_widget.cpp         |   2 +-
 .../chat_helpers/stickers_list_widget.cpp     |  30 +++-
 .../chat_helpers/tabbed_selector.cpp          |   9 +-
 .../chat_helpers/tabbed_selector.h            |   9 +-
 .../SourceFiles/data/data_emoji_statuses.cpp  |  38 +++--
 .../SourceFiles/data/data_emoji_statuses.h    |   3 +
 .../data/stickers/data_stickers.cpp           | 135 ++++++++++++++++++
 .../SourceFiles/data/stickers/data_stickers.h |   2 +
 Telegram/SourceFiles/mtproto/scheme/api.tl    |   7 +-
 .../SourceFiles/ui/controls/tabbed_search.cpp |   9 +-
 .../SourceFiles/ui/controls/tabbed_search.h   |   9 ++
 13 files changed, 238 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index 7139c5ebb..ce1966623 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -760,14 +760,14 @@ rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
 			channel()->inputChannel
 		)).done([=](const MTPstats_BroadcastRevenueStats &result) {
 			const auto &data = result.data();
-
+			const auto &balances = data.vbalances().data();
 			_data = Data::EarnStatistics{
 				.topHoursGraph = StatisticalGraphFromTL(
 					data.vtop_hours_graph()),
 				.revenueGraph = StatisticalGraphFromTL(data.vrevenue_graph()),
-				.currentBalance = data.vcurrent_balance().v,
-				.availableBalance = data.vavailable_balance().v,
-				.overallRevenue = data.voverall_revenue().v,
+				.currentBalance = balances.vcurrent_balance().v,
+				.availableBalance = balances.vavailable_balance().v,
+				.overallRevenue = balances.voverall_revenue().v,
 				.usdRate = data.vusd_rate().v,
 			};
 
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index c8148ae8e..2157e9168 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -573,12 +573,17 @@ EmojiListWidget::~EmojiListWidget() {
 
 void EmojiListWidget::setupSearch() {
 	const auto session = &_show->session();
+	const auto type = (_mode == Mode::EmojiStatus)
+		? TabbedSearchType::Status
+		: (_mode == Mode::UserpicBuilder)
+		? TabbedSearchType::ProfilePhoto
+		: TabbedSearchType::Emoji;
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
 		_nextSearchQuery = std::move(query);
 		InvokeQueued(this, [=] {
 			applyNextSearchQuery();
 		});
-	}, session, (_mode == Mode::EmojiStatus), _mode == Mode::UserpicBuilder);
+	}, session, type);
 }
 
 void EmojiListWidget::applyNextSearchQuery() {
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 72794de39..609f21989 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -820,7 +820,7 @@ void GifsListWidget::setupSearch() {
 			: SearchEmojiSectionSetId();
 		refreshIcons();
 		searchForGifs(accumulated);
-	}, session);
+	}, session, TabbedSearchType::Emoji);
 }
 
 int32 GifsListWidget::showInlineRows(bool newResults) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 42ea6b934..07a02caa9 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -547,6 +547,15 @@ void StickersListWidget::sendSearchRequest() {
 	}
 
 	_search->setLoading(true);
+
+	if (_searchQuery == Ui::PremiumGroupFakeEmoticon()) {
+		_search->setLoading(false);
+		_searchRequestId = 0;
+		_searchCache.emplace(_searchQuery, std::vector<uint64>());
+		showSearchResults();
+		return;
+	}
+
 	const auto hash = uint64(0);
 	_searchRequestId = _api.request(MTPmessages_SearchStickerSets(
 		MTP_flags(0),
@@ -570,10 +579,14 @@ void StickersListWidget::searchForSets(
 		return;
 	}
 
-	_filteredStickers = session().data().stickers().getListByEmoji(
-		std::move(emoji),
-		0,
-		true);
+	if (query == Ui::PremiumGroupFakeEmoticon()) {
+		_filteredStickers = session().data().stickers().getPremiumList(0);
+	} else {
+		_filteredStickers = session().data().stickers().getListByEmoji(
+			std::move(emoji),
+			0,
+			true);
+	}
 	if (_searchQuery != cleaned) {
 		_search->setLoading(false);
 		if (const auto requestId = base::take(_searchRequestId)) {
@@ -2604,15 +2617,18 @@ void StickersListWidget::beforeHiding() {
 
 void StickersListWidget::setupSearch() {
 	const auto session = &_show->session();
+	const auto type = (_mode == Mode::UserpicBuilder)
+		? TabbedSearchType::ProfilePhoto
+		: TabbedSearchType::Stickers;
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
 		auto set = base::flat_set<EmojiPtr>();
 		auto text = ranges::accumulate(query, QString(), [](
-				QString a,
-				QString b) {
+			QString a,
+			QString b) {
 			return a.isEmpty() ? b : (a + ' ' + b);
 		});
 		searchForSets(std::move(text), SearchEmoji(query, set));
-	}, session, false, (_mode == Mode::UserpicBuilder));
+	}, session, type);
 }
 
 void StickersListWidget::displaySet(uint64 setId) {
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index e57b3adc8..7f8a915c7 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -307,16 +307,17 @@ std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 		const style::EmojiPan &st,
 		Fn<void(std::vector<QString>&&)> callback,
 		not_null<Main::Session*> session,
-		bool statusCategories,
-		bool profilePhotoCategories) {
+		TabbedSearchType type) {
 	using Descriptor = Ui::SearchDescriptor;
 	const auto owner = &session->data();
 	auto result = std::make_unique<Ui::TabbedSearch>(parent, st, Descriptor{
 		.st = st.search,
-		.groups = (profilePhotoCategories
+		.groups = ((type == TabbedSearchType::ProfilePhoto)
 			? owner->emojiStatuses().profilePhotoGroupsValue()
-			: statusCategories
+			: (type == TabbedSearchType::Status)
 			? owner->emojiStatuses().statusGroupsValue()
+			: (type == TabbedSearchType::Stickers)
+			? owner->emojiStatuses().stickerGroupsValue()
 			: owner->emojiStatuses().emojiGroupsValue()),
 		.customEmojiFactory = owner->customEmojiManager().factory(
 			Data::CustomEmojiManager::SizeTag::SetIcon,
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index 606f1a926..f663d470a 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -98,13 +98,18 @@ struct TabbedSelectorDescriptor {
 	ComposeFeatures features;
 };
 
+enum class TabbedSearchType {
+	Emoji,
+	Status,
+	ProfilePhoto,
+	Stickers,
+};
 [[nodiscard]] std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 	not_null<Ui::RpWidget*> parent,
 	const style::EmojiPan &st,
 	Fn<void(std::vector<QString>&&)> callback,
 	not_null<Main::Session*> session,
-	bool statusCategories = false,
-	bool profilePhotoCategories = false);
+	TabbedSearchType type);
 
 class TabbedSelector : public Ui::RpWidget {
 public:
diff --git a/Telegram/SourceFiles/data/data_emoji_statuses.cpp b/Telegram/SourceFiles/data/data_emoji_statuses.cpp
index dd1ad583b..e00dd8910 100644
--- a/Telegram/SourceFiles/data/data_emoji_statuses.cpp
+++ b/Telegram/SourceFiles/data/data_emoji_statuses.cpp
@@ -153,6 +153,11 @@ auto EmojiStatuses::statusGroupsValue() const -> rpl::producer<Groups> {
 	return _statusGroups.data.value();
 }
 
+auto EmojiStatuses::stickerGroupsValue() const -> rpl::producer<Groups> {
+	const_cast<EmojiStatuses*>(this)->requestStickerGroups();
+	return _stickerGroups.data.value();
+}
+
 auto EmojiStatuses::profilePhotoGroupsValue() const
 -> rpl::producer<Groups> {
 	const_cast<EmojiStatuses*>(this)->requestProfilePhotoGroups();
@@ -172,6 +177,12 @@ void EmojiStatuses::requestStatusGroups() {
 		MTPmessages_GetEmojiStatusGroups(MTP_int(_statusGroups.hash)));
 }
 
+void EmojiStatuses::requestStickerGroups() {
+	requestGroups(
+		&_stickerGroups,
+		MTPmessages_GetEmojiStickerGroups(MTP_int(_stickerGroups.hash)));
+}
+
 void EmojiStatuses::requestProfilePhotoGroups() {
 	requestGroups(
 		&_profilePhotoGroups,
@@ -185,15 +196,24 @@ void EmojiStatuses::requestProfilePhotoGroups() {
 	auto result = std::vector<Ui::EmojiGroup>();
 	result.reserve(list.size());
 	for (const auto &group : list) {
-		const auto &data = group.data();
-		auto emoticons = ranges::views::all(
-			data.vemoticons().v
-		) | ranges::views::transform([](const MTPstring &emoticon) {
-			return qs(emoticon);
-		}) | ranges::to_vector;
-		result.push_back({
-			.iconId = QString::number(data.vicon_emoji_id().v),
-			.emoticons = std::move(emoticons),
+		group.match([&](const MTPDemojiGroupPremium &data) {
+			result.push_back({
+				.iconId = QString::number(data.vicon_emoji_id().v),
+				.type = Ui::EmojiGroupType::Premium,
+			});
+		}, [&](const auto &data) {
+			auto emoticons = ranges::views::all(
+				data.vemoticons().v
+			) | ranges::views::transform([](const MTPstring &emoticon) {
+				return qs(emoticon);
+			}) | ranges::to_vector;
+			result.push_back({
+				.iconId = QString::number(data.vicon_emoji_id().v),
+				.emoticons = std::move(emoticons),
+				.type = (MTPDemojiGroupGreeting::Is<decltype(data)>()
+					? Ui::EmojiGroupType::Greeting
+					: Ui::EmojiGroupType::Normal),
+			});
 		});
 	}
 	return result;
diff --git a/Telegram/SourceFiles/data/data_emoji_statuses.h b/Telegram/SourceFiles/data/data_emoji_statuses.h
index 5501eb8bc..0a0b75ba2 100644
--- a/Telegram/SourceFiles/data/data_emoji_statuses.h
+++ b/Telegram/SourceFiles/data/data_emoji_statuses.h
@@ -60,9 +60,11 @@ public:
 	using Groups = std::vector<Ui::EmojiGroup>;
 	[[nodiscard]] rpl::producer<Groups> emojiGroupsValue() const;
 	[[nodiscard]] rpl::producer<Groups> statusGroupsValue() const;
+	[[nodiscard]] rpl::producer<Groups> stickerGroupsValue() const;
 	[[nodiscard]] rpl::producer<Groups> profilePhotoGroupsValue() const;
 	void requestEmojiGroups();
 	void requestStatusGroups();
+	void requestStickerGroups();
 	void requestProfilePhotoGroups();
 
 private:
@@ -124,6 +126,7 @@ private:
 
 	GroupsType _emojiGroups;
 	GroupsType _statusGroups;
+	GroupsType _stickerGroups;
 	GroupsType _profilePhotoGroups;
 
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index f6da8553d..057e1d8cf 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -1132,6 +1132,141 @@ void Stickers::gifsReceived(const QVector<MTPDocument> &items, uint64 hash) {
 	notifySavedGifsUpdated();
 }
 
+std::vector<not_null<DocumentData*>> Stickers::getPremiumList(uint64 seed) {
+	struct StickerWithDate {
+		not_null<DocumentData*> document;
+		TimeId date = 0;
+	};
+	auto result = std::vector<StickerWithDate>();
+	auto &sets = setsRef();
+	auto setsToRequest = base::flat_map<uint64, uint64>();
+
+	const auto add = [&](not_null<DocumentData*> document, TimeId date) {
+		if (ranges::find(result, document, [](const StickerWithDate &data) {
+			return data.document;
+		}) == result.end()) {
+			result.push_back({ document, date });
+		}
+	};
+
+	constexpr auto kSlice = 65536;
+	const auto CreateSortKey = [&](
+			not_null<DocumentData*> document,
+			int base) {
+		if (document->sticker() && document->sticker()->isAnimated()) {
+			base += kSlice;
+		}
+		return TimeId(base + int((document->id ^ seed) % kSlice));
+	};
+	const auto CreateRecentSortKey = [&](not_null<DocumentData*> document) {
+		return CreateSortKey(document, kSlice * 6);
+	};
+	auto myCounter = 0;
+	const auto CreateMySortKey = [&](not_null<DocumentData*> document) {
+		auto base = kSlice * 6;
+		if (!document->sticker() || !document->sticker()->isAnimated()) {
+			base -= kSlice;
+		}
+		return (base - (++myCounter));
+	};
+	const auto CreateFeaturedSortKey = [&](not_null<DocumentData*> document) {
+		return CreateSortKey(document, kSlice * 2);
+	};
+	const auto CreateOtherSortKey = [&](not_null<DocumentData*> document) {
+		return CreateSortKey(document, 0);
+	};
+	const auto InstallDateAdjusted = [&](
+			TimeId date,
+			not_null<DocumentData*> document) {
+		return (document->sticker() && document->sticker()->isAnimated())
+			? date
+			: date / 2;
+	};
+	const auto RecentInstallDate = [&](not_null<DocumentData*> document) {
+		Expects(document->sticker() != nullptr);
+
+		const auto sticker = document->sticker();
+		if (sticker->set.id) {
+			const auto setIt = sets.find(sticker->set.id);
+			if (setIt != sets.end()) {
+				return InstallDateAdjusted(setIt->second->installDate, document);
+			}
+		}
+		return TimeId(0);
+	};
+
+	auto recentIt = sets.find(Stickers::CloudRecentSetId);
+	if (recentIt != sets.cend()) {
+		const auto recent = recentIt->second.get();
+		const auto count = int(recent->stickers.size());
+		result.reserve(count);
+		for (auto i = 0; i != count; ++i) {
+			const auto document = recent->stickers[i];
+			auto index = i;
+			if (!document->isPremiumSticker()) {
+				continue;
+			} else {
+				index = recent->stickers.indexOf(document);
+			}
+			const auto usageDate = (recent->dates.empty() || index < 0)
+				? 0
+				: recent->dates[index];
+			const auto date = usageDate
+				? usageDate
+				: RecentInstallDate(document);
+			result.push_back({
+				document,
+				date ? date : CreateRecentSortKey(document) });
+		}
+	}
+	const auto addList = [&](
+			const StickersSetsOrder &order,
+			SetFlag skip) {
+		for (const auto setId : order) {
+			auto it = sets.find(setId);
+			if (it == sets.cend() || (it->second->flags & skip)) {
+				continue;
+			}
+			const auto set = it->second.get();
+			if (set->emoji.empty()) {
+				setsToRequest.emplace(set->id, set->accessHash);
+				set->flags |= SetFlag::NotLoaded;
+				continue;
+			}
+			const auto my = (set->flags & SetFlag::Installed);
+			result.reserve(result.size() + set->stickers.size());
+			for (const auto document : set->stickers) {
+				if (!document->isPremiumSticker()) {
+					continue;
+				}
+				const auto installDate = my ? set->installDate : TimeId(0);
+				const auto date = (installDate > 1)
+					? InstallDateAdjusted(installDate, document)
+					: my
+					? CreateMySortKey(document)
+					: CreateFeaturedSortKey(document);
+				add(document, date);
+			}
+		}
+	};
+
+	addList(setsOrder(), SetFlag::Archived);
+	addList(featuredSetsOrder(), SetFlag::Installed);
+
+	if (!setsToRequest.empty()) {
+		for (const auto &[setId, accessHash] : setsToRequest) {
+			session().api().scheduleStickerSetRequest(setId, accessHash);
+		}
+		session().api().requestStickerSets();
+	}
+
+	ranges::sort(result, std::greater<>(), &StickerWithDate::date);
+
+	return result
+		| ranges::views::transform(&StickerWithDate::document)
+		| ranges::to_vector;
+}
+
 std::vector<not_null<DocumentData*>> Stickers::getListByEmoji(
 		std::vector<EmojiPtr> emoji,
 		uint64 seed,
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.h b/Telegram/SourceFiles/data/stickers/data_stickers.h
index d5a192b4b..426b034aa 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.h
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.h
@@ -235,6 +235,8 @@ public:
 		const MTPmessages_FeaturedStickers &result);
 	void gifsReceived(const QVector<MTPDocument> &items, uint64 hash);
 
+	[[nodiscard]] std::vector<not_null<DocumentData*>> getPremiumList(
+		uint64 seed);
 	[[nodiscard]] std::vector<not_null<DocumentData*>> getListByEmoji(
 		std::vector<EmojiPtr> emoji,
 		uint64 seed,
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index a75781792..963785e0b 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1519,6 +1519,8 @@ emojiListNotModified#481eadfa = EmojiList;
 emojiList#7a1e11d1 hash:long document_id:Vector<long> = EmojiList;
 
 emojiGroup#7a9abda9 title:string icon_emoji_id:long emoticons:Vector<string> = EmojiGroup;
+emojiGroupGreeting#80d26cc7 title:string icon_emoji_id:long emoticons:Vector<string> = EmojiGroup;
+emojiGroupPremium#93bcf34 title:string icon_emoji_id:long = EmojiGroup;
 
 messages.emojiGroupsNotModified#6fb4ad87 = messages.EmojiGroups;
 messages.emojiGroups#881fb94b hash:int groups:Vector<EmojiGroup> = messages.EmojiGroups;
@@ -1762,7 +1764,7 @@ channels.sponsoredMessageReportResultChooseOption#846f9e42 title:string options:
 channels.sponsoredMessageReportResultAdsHidden#3e3bcf2f = channels.SponsoredMessageReportResult;
 channels.sponsoredMessageReportResultReported#ad798849 = channels.SponsoredMessageReportResult;
 
-stats.broadcastRevenueStats#d07b4bad top_hours_graph:StatsGraph revenue_graph:StatsGraph current_balance:long available_balance:long overall_revenue:long usd_rate:double = stats.BroadcastRevenueStats;
+stats.broadcastRevenueStats#5407e297 top_hours_graph:StatsGraph revenue_graph:StatsGraph balances:BroadcastRevenueBalances usd_rate:double = stats.BroadcastRevenueStats;
 
 stats.broadcastRevenueWithdrawalUrl#ec659737 url:string = stats.BroadcastRevenueWithdrawalUrl;
 
@@ -1777,6 +1779,8 @@ reactionNotificationsFromAll#4b9e22a0 = ReactionNotificationsFrom;
 
 reactionsNotifySettings#56e34970 flags:# messages_notify_from:flags.0?ReactionNotificationsFrom stories_notify_from:flags.1?ReactionNotificationsFrom sound:NotificationSound show_previews:Bool = ReactionsNotifySettings;
 
+broadcastRevenueBalances#8438f1c6 current_balance:long available_balance:long overall_revenue:long = BroadcastRevenueBalances;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2165,6 +2169,7 @@ messages.sendQuickReplyMessages#6c750de1 peer:InputPeer shortcut_id:int id:Vecto
 messages.deleteQuickReplyMessages#e105e910 shortcut_id:int id:Vector<int> = Updates;
 messages.toggleDialogFilterTags#fd2dda49 enabled:Bool = Bool;
 messages.getMyStickers#d0b5e1fc offset_id:long limit:int = messages.MyStickers;
+messages.getEmojiStickerGroups#1dd840f5 hash:int = messages.EmojiGroups;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#19c2f763 flags:# pts:int pts_limit:flags.1?int pts_total_limit:flags.0?int date:int qts:int qts_limit:flags.2?int = updates.Difference;
diff --git a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
index 6aaea70dc..7acc65a8f 100644
--- a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
+++ b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
@@ -273,6 +273,11 @@ void GroupsStrip::fireChosenGroup() {
 
 } // namespace
 
+const QString &PremiumGroupFakeEmoticon() {
+	static const auto result = u"*premium"_q;
+	return result;
+}
+
 SearchWithGroups::SearchWithGroups(
 	QWidget *parent,
 	SearchDescriptor descriptor)
@@ -359,7 +364,9 @@ void SearchWithGroups::initGroups() {
 	widget->chosen(
 	) | rpl::start_with_next([=](const GroupsStrip::Chosen &chosen) {
 		_chosenGroup = chosen.group->iconId;
-		_query = chosen.group->emoticons;
+		_query = (chosen.group->type == EmojiGroupType::Premium)
+			? std::vector{ PremiumGroupFakeEmoticon() }
+			: chosen.group->emoticons;
 		_debouncedQuery = chosen.group->emoticons;
 		_debounceTimer.cancel();
 		scrollGroupsToIcon(chosen.iconLeft, chosen.iconRight);
diff --git a/Telegram/SourceFiles/ui/controls/tabbed_search.h b/Telegram/SourceFiles/ui/controls/tabbed_search.h
index 000cbccea..2a5d67e40 100644
--- a/Telegram/SourceFiles/ui/controls/tabbed_search.h
+++ b/Telegram/SourceFiles/ui/controls/tabbed_search.h
@@ -31,15 +31,24 @@ class RpWidget;
 template <typename Widget>
 class FadeWrap;
 
+enum class EmojiGroupType {
+	Normal,
+	Greeting,
+	Premium,
+};
+
 struct EmojiGroup {
 	QString iconId;
 	std::vector<QString> emoticons;
+	EmojiGroupType type = EmojiGroupType::Normal;
 
 	friend inline auto operator<=>(
 		const EmojiGroup &a,
 		const EmojiGroup &b) = default;
 };
 
+[[nodiscard]] const QString &PremiumGroupFakeEmoticon();
+
 struct SearchDescriptor {
 	const style::TabbedSearch &st;
 	rpl::producer<std::vector<EmojiGroup>> groups;

From 16ce5ef046521bbbdb8e7def1f91379b6378520b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 12:47:12 +0400
Subject: [PATCH 443/596] Greeting category first in ChatIntro setup.

---
 .../chat_helpers/stickers_list_widget.cpp     |  2 ++
 .../chat_helpers/stickers_list_widget.h       |  1 +
 .../chat_helpers/tabbed_selector.cpp          | 27 ++++++++++++++++---
 .../chat_helpers/tabbed_selector.h            |  2 ++
 .../settings/business/settings_chat_intro.cpp |  2 +-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 07a02caa9..e44b8aaef 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -2619,6 +2619,8 @@ void StickersListWidget::setupSearch() {
 	const auto session = &_show->session();
 	const auto type = (_mode == Mode::UserpicBuilder)
 		? TabbedSearchType::ProfilePhoto
+		: (_mode == Mode::ChatIntro)
+		? TabbedSearchType::Greeting
 		: TabbedSearchType::Stickers;
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
 		auto set = base::flat_set<EmojiPtr>();
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index 2e1ef9c1c..aff2cf287 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -65,6 +65,7 @@ enum class StickersListMode {
 	Full,
 	Masks,
 	UserpicBuilder,
+	ChatIntro,
 };
 
 struct StickersListDescriptor {
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 7f8a915c7..7de254bad 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -302,6 +302,21 @@ void TabbedSelector::Tab::saveScrollTop() {
 	_scrollTop = widget()->getVisibleTop();
 }
 
+[[nodiscard]] rpl::producer<std::vector<Ui::EmojiGroup>> GreetingGroupFirst(
+		not_null<Data::Session*> owner) {
+	return owner->emojiStatuses().stickerGroupsValue(
+	) | rpl::map([](std::vector<Ui::EmojiGroup> &&groups) {
+		const auto i = ranges::find(
+			groups,
+			Ui::EmojiGroupType::Greeting,
+			&Ui::EmojiGroup::type);
+		if (i != begin(groups) && i != end(groups)) {
+			ranges::rotate(begin(groups), i, i + 1);
+		}
+		return std::move(groups);
+	});
+}
+
 std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 		not_null<Ui::RpWidget*> parent,
 		const style::EmojiPan &st,
@@ -318,6 +333,8 @@ std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 			? owner->emojiStatuses().statusGroupsValue()
 			: (type == TabbedSearchType::Stickers)
 			? owner->emojiStatuses().stickerGroupsValue()
+			: (type == TabbedSearchType::Greeting)
+			? GreetingGroupFirst(owner)
 			: owner->emojiStatuses().emojiGroupsValue()),
 		.customEmojiFactory = owner->customEmojiManager().factory(
 			Data::CustomEmojiManager::SizeTag::SetIcon,
@@ -379,7 +396,7 @@ TabbedSelector::TabbedSelector(
 		tabs.reserve(2);
 		tabs.push_back(createTab(SelectorTab::Stickers, 0));
 		tabs.push_back(createTab(SelectorTab::Masks, 1));
-	} else if (_mode == Mode::StickersOnly) {
+	} else if (_mode == Mode::StickersOnly || _mode == Mode::ChatIntro) {
 		tabs.reserve(1);
 		tabs.push_back(createTab(SelectorTab::Stickers, 0));
 	} else {
@@ -390,7 +407,9 @@ TabbedSelector::TabbedSelector(
 }())
 , _currentTabType(full()
 	? session().settings().selectorTab()
-	: (mediaEditor() || _mode == Mode::StickersOnly)
+	: (mediaEditor()
+		|| _mode == Mode::StickersOnly
+		|| _mode == Mode::ChatIntro)
 	? SelectorTab::Stickers
 	: SelectorTab::Emoji)
 , _hasEmojiTab(ranges::contains(_tabs, SelectorTab::Emoji, &Tab::type))
@@ -555,7 +574,9 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 			using Descriptor = StickersListDescriptor;
 			return object_ptr<StickersListWidget>(this, Descriptor{
 				.show = _show,
-				.mode = StickersMode::Full,
+				.mode = (_mode == Mode::ChatIntro
+					? StickersMode::ChatIntro
+					: StickersMode::Full),
 				.paused = paused,
 				.st = &_st,
 				.features = _features,
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index f663d470a..b9b03b33b 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -87,6 +87,7 @@ enum class TabbedSelectorMode {
 	FullReactions,
 	RecentReactions,
 	PeerTitle,
+	ChatIntro,
 };
 
 struct TabbedSelectorDescriptor {
@@ -103,6 +104,7 @@ enum class TabbedSearchType {
 	Status,
 	ProfilePhoto,
 	Stickers,
+	Greeting,
 };
 [[nodiscard]] std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 	not_null<Ui::RpWidget*> parent,
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 7bd61ca90..b8a7607f6 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -476,7 +476,7 @@ void StickerPanel::create(const Descriptor &descriptor) {
 				.show = controller->uiShow(),
 				.st = st::backgroundEmojiPan,
 				.level = Window::GifPauseReason::Layer,
-				.mode = Mode::StickersOnly,
+				.mode = Mode::ChatIntro,
 				.features = {
 					.megagroupSet = false,
 					.stickersSettings = false,

From bc649af941e1d2824eff5c95ceac87a84c566737 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 28 Apr 2024 22:42:48 +0400
Subject: [PATCH 444/596] Schedule no-response action runs at different times

To avoid rate limits
---
 .../{no-response.yml => cant-reproduce.yml}   | 25 ++-----------------
 .github/workflows/needs-user-action.yml       | 16 ++++++++++++
 .github/workflows/waiting-for-answer.yml      | 16 ++++++++++++
 3 files changed, 34 insertions(+), 23 deletions(-)
 rename .github/workflows/{no-response.yml => cant-reproduce.yml} (57%)
 create mode 100644 .github/workflows/needs-user-action.yml
 create mode 100644 .github/workflows/waiting-for-answer.yml

diff --git a/.github/workflows/no-response.yml b/.github/workflows/cant-reproduce.yml
similarity index 57%
rename from .github/workflows/no-response.yml
rename to .github/workflows/cant-reproduce.yml
index f414a55fd..5c4edcba0 100644
--- a/.github/workflows/no-response.yml
+++ b/.github/workflows/cant-reproduce.yml
@@ -1,32 +1,11 @@
-name: No Response
+name: Can't reproduce.
 
-# Both `issue_comment` and `scheduled` event types are required for this Action
-# to work properly.
 on:
-  issue_comment:
-    types: [created]
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 3 * * *'
 
 jobs:
-  waiting-for-answer:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lee-dohm/no-response@v0.5.0
-        with:
-          token: ${{ github.token }}
-          responseRequiredLabel: waiting for answer
-
-  needs-user-action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lee-dohm/no-response@v0.5.0
-        with:
-          token: ${{ github.token }}
-          responseRequiredLabel: needs user action
-
   cant-reproduce:
-    if: github.event_name != 'issue_comment'
     runs-on: ubuntu-latest
     steps:
       - uses: lee-dohm/no-response@v0.5.0
diff --git a/.github/workflows/needs-user-action.yml b/.github/workflows/needs-user-action.yml
new file mode 100644
index 000000000..46ad9f87d
--- /dev/null
+++ b/.github/workflows/needs-user-action.yml
@@ -0,0 +1,16 @@
+name: Needs user action.
+
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    - cron: '0 2 * * *'
+
+jobs:
+  needs-user-action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/no-response@v0.5.0
+        with:
+          token: ${{ github.token }}
+          responseRequiredLabel: needs user action
diff --git a/.github/workflows/waiting-for-answer.yml b/.github/workflows/waiting-for-answer.yml
new file mode 100644
index 000000000..657c45e92
--- /dev/null
+++ b/.github/workflows/waiting-for-answer.yml
@@ -0,0 +1,16 @@
+name: Waiting for answer.
+
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  waiting-for-answer:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/no-response@v0.5.0
+        with:
+          token: ${{ github.token }}
+          responseRequiredLabel: waiting for answer

From 6fa0afff377a9360479ea469b4658870296c12fb Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Wed, 1 May 2024 00:24:16 +0000
Subject: [PATCH 445/596] Update User-Agent for DNS to Chrome 124.0.0.0.

---
 .../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 1491174e3..93865a587 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/123.0.0.0 Safari/537.36");
+		"Chrome/124.0.0.0 Safari/537.36");
 	return kResult;
 }
 

From 9166a1c3a6e48ac09691eadb30475285ff6d3fb6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 12:56:57 +0400
Subject: [PATCH 446/596] Update Linux Qt patches. Hope fixes crashes.

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 2333305d7..f6e433535 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin f81dfc6f7061d7f70c7e952cee9c1c2689f937a2 \
+	&& git fetch --depth=1 origin ce5098d9bd638ec264fd8cf69ef3ef31d8139d18 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ee538420a..41559536c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -171,7 +171,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: f81dfc6f7061d7f70c7e952cee9c1c2689f937a2
+    source-commit: ce5098d9bd638ec264fd8cf69ef3ef31d8139d18
     plugin: dump
     override-pull: |
       craftctl default

From 32483fa13b46ba593fc7a302973878615428c4d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 12:57:47 +0400
Subject: [PATCH 447/596] Just focus the search field on Space.

---
 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 13b83753c..30848c491 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3270,7 +3270,9 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		// query while still show _suggestions animated, if it is a space.
 		_postponeProcessSearchFocusChange = true;
 		_search->setFocusFast();
-		QCoreApplication::sendEvent(_search->rawTextEdit(), e);
+		if (e->key() != Qt::Key_Space) {
+			QCoreApplication::sendEvent(_search->rawTextEdit(), e);
+		}
 		_postponeProcessSearchFocusChange = false;
 		processSearchFocusChange();
 	} else {

From 3170a45158e239dc5a589c93a43a1d84c169f5b4 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 1 May 2024 14:03:30 +0400
Subject: [PATCH 448/596] Increase snapcraft verbosity

---
 .github/workflows/snap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 0c2bc4148..badcf6cc9 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -64,7 +64,7 @@ jobs:
         uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
 
       - name: Telegram Desktop snap build.
-        run: sg lxd -c 'snap run snapcraft -v'
+        run: sg lxd -c 'snap run snapcraft --verbosity=debug'
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'

From b3eb1dbc14f589897d2d1928f27dde92afa1ff78 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 13:31:58 +0400
Subject: [PATCH 449/596] Revert "Toggle search focus by escape."

This reverts commit 72d5a9b3e00e8f76fabbfb3e130efe371d2d5aaa.
---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 30848c491..b8e3ccad6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1795,8 +1795,6 @@ void Widget::escape() {
 			const auto first = list.empty() ? FilterId() : list.front().id();
 			if (controller()->activeChatsFilterCurrent() != first) {
 				controller()->setActiveChatsFilter(first);
-			} else {
-				_search->setFocus();
 			}
 		}
 	} else if (!_searchInChat

From a62d1dfa6361bb371d40308960c52b02a6a2c2dd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 14:36:24 +0400
Subject: [PATCH 450/596] Focus chats search by Ctrl[Cmd]+F.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index b8e3ccad6..6d8a226b4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -995,11 +995,17 @@ void Widget::setupShortcuts() {
 	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
-		if (_openedForum && !controller()->activeChatCurrent()) {
+		if (!controller()->activeChatCurrent()) {
 			request->check(Command::Search) && request->handle([=] {
-				const auto history = _openedForum->history();
-				controller()->searchInChat(history);
-				return true;
+				if (const auto forum = _openedForum) {
+					const auto history = forum->history();
+					controller()->searchInChat(history);
+					return true;
+				} else if (!_openedFolder && _search->isVisible()) {
+					_search->setFocus();
+					return true;
+				}
+				return false;
 			});
 		}
 	}, lifetime());

From 7e071c770f7691ffdbbbd38ac3e17c9aae4d21b3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 14:37:52 +0400
Subject: [PATCH 451/596] Fix possible crash with custom wallpapered peers.

---
 Telegram/SourceFiles/window/section_widget.cpp          | 6 ++++--
 Telegram/SourceFiles/window/window_session_controller.h | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 18f3f7d05..ae24ad4d3 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -201,10 +201,12 @@ rpl::producer<const Data::WallPaper*> WallPaperResolved(
 		return result;
 	}
 	themes->refreshChatThemes();
-	return themes->chatThemesUpdated(
+	return rpl::single<const Data::WallPaper*>(
+		nullptr
+	) | rpl::then(themes->chatThemesUpdated(
 	) | rpl::take(1) | rpl::map([=] {
 		return fromThemes(true);
-	}) | rpl::flatten_latest();
+	}) | rpl::flatten_latest());
 }
 
 AbstractSectionWidget::AbstractSectionWidget(
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 241567b5e..cf4033ce4 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -700,7 +700,7 @@ private:
 
 	rpl::event_stream<> _filtersMenuChanged;
 
-	std::shared_ptr<Ui::ChatTheme> _defaultChatTheme;
+	const std::shared_ptr<Ui::ChatTheme> _defaultChatTheme;
 	base::flat_map<CachedThemeKey, CachedTheme> _customChatThemes;
 	rpl::event_stream<std::shared_ptr<Ui::ChatTheme>> _cachedThemesStream;
 	const std::unique_ptr<Ui::ChatStyle> _chatStyle;

From ad6321d3ae57b9b4ccb41c781b037458aa9db3da Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 1 May 2024 14:09:56 +0300
Subject: [PATCH 452/596] Fixed possible crash in moderate box.

---
 .../boxes/moderate_messages_box.cpp           | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 4496ed421..dbb9e7cb1 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -227,12 +227,12 @@ void CreateModerateMessagesBox(
 		? QMargins()
 		: QMargins(0, 0, Button::ComputeSize(users.size()).width(), 0);
 
+	const auto session = &items.front()->history()->session();
+	const auto historyPeerId = items.front()->history()->peer->id;
+
 	using Request = Fn<void(not_null<UserData*>, not_null<ChannelData*>)>;
 	const auto sequentiallyRequest = [=](Request request, Users users) {
 		constexpr auto kSmallDelayMs = 5;
-		const auto session = &items.front()->history()->session();
-		const auto history = items.front()->history();
-		const auto peerId = history->peer->id;
 		const auto userIds = ranges::views::all(
 			users
 		) | ranges::views::transform([](not_null<UserData*> user) {
@@ -243,7 +243,7 @@ void CreateModerateMessagesBox(
 		const auto timer = lifetime->make_state<base::Timer>();
 		timer->setCallback(crl::guard(session, [=] {
 			if ((*counter) < userIds.size()) {
-				const auto peer = session->data().peer(peerId);
+				const auto peer = session->data().peer(historyPeerId);
 				const auto channel = peer ? peer->asChannel() : nullptr;
 				const auto from = session->data().peer(userIds[*counter]);
 				if (const auto user = from->asUser(); channel && user) {
@@ -697,17 +697,19 @@ void CreateModerateMessagesBox(
 	}
 
 	const auto close = crl::guard(box, [=] { box->closeBox(); });
-	box->addButton(tr::lng_box_delete(), [=] {
-		confirms->fire({});
+	{
 		const auto data = &users.front()->session().data();
-		const auto ids = data->itemsToIds(items);
-		if (confirmed) {
-			confirmed();
-		}
-		data->histories().deleteMessages(ids, true);
-		data->sendHistoryChangeNotifications();
-		close();
-	});
+		const auto ids = users.front()->session().data().itemsToIds(items);
+		box->addButton(tr::lng_box_delete(), [=] {
+			confirms->fire({});
+			if (confirmed) {
+				confirmed();
+			}
+			data->histories().deleteMessages(ids, true);
+			data->sendHistoryChangeNotifications();
+			close();
+		});
+	}
 	box->addButton(tr::lng_cancel(), close);
 }
 

From 12a24dd473fffc48263bd786ace5d6f7e06a8968 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 15:02:35 +0400
Subject: [PATCH 453/596] Fix possible crash in common groups list.

Currently Data::Session::processChat() may change adminRights(),
that may change Data::CanSendAnyOf(peer, ...), that may lead to
Window::SessionController::updateThirdColumnToCurrentChat() call,
that destroys current third column to replace it with another one.

If common groups list was opened in the third column this will crash.

Fixes #27640.
---
 .../info_common_groups_inner_widget.cpp       | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

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 720f47eba..37defed0d 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
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/common_groups/info_common_groups_inner_widget.h"
 
+#include "base/weak_ptr.h"
 #include "info/common_groups/info_common_groups_widget.h"
 #include "info/info_controller.h"
 #include "lang/lang_keys.h"
@@ -27,7 +28,9 @@ namespace {
 constexpr auto kCommonGroupsPerPage = 40;
 constexpr auto kCommonGroupsSearchAfter = 20;
 
-class ListController final : public PeerListController {
+class ListController final
+	: public PeerListController
+	, public base::has_weak_ptr {
 public:
 	ListController(
 		not_null<Controller*> controller,
@@ -108,16 +111,30 @@ void ListController::loadMoreRows() {
 			return data.vchats().v;
 		});
 		if (!chats.empty()) {
+			auto add = std::vector<not_null<PeerData*>>();
+			auto allLoaded = _allLoaded;
+			auto preloadGroupId = _preloadGroupId;
+			const auto owner = &_user->owner();
+			const auto weak = base::make_weak(this);
 			for (const auto &chat : chats) {
-				if (const auto peer = _user->owner().processChat(chat)) {
+				if (const auto peer = owner->processChat(chat)) {
 					if (!peer->migrateTo()) {
-						delegate()->peerListAppendRow(
-							createRow(peer));
+						add.push_back(peer);
 					}
-					_preloadGroupId = peer->id;
-					_allLoaded = false;
+					preloadGroupId = peer->id;
+					allLoaded = false;
 				}
 			}
+			if (!weak) {
+				return;
+			}
+			for (const auto &peer : add) {
+				if (!delegate()->peerListFindRow(peer->id.value)) {
+					delegate()->peerListAppendRow(createRow(peer));
+				}
+			}
+			_preloadGroupId = preloadGroupId;
+			_allLoaded = allLoaded;
 			delegate()->peerListRefreshRows();
 		}
 		auto fullCount = delegate()->peerListFullRowsCount();

From 47800ee02d7b4fa431b19002ad8d46c10de44c32 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 19:09:54 +0400
Subject: [PATCH 454/596] Improve font size selection a bit.

---
 Telegram/SourceFiles/ui/boxes/choose_font_box.cpp | 1 +
 Telegram/lib_ui                                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index 9ef7e24e0..a5e8fb203 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -314,6 +314,7 @@ void Selector::validateCache(Entry &row) {
 	} else if (row.paletteVersion == version) {
 		return;
 	}
+	row.paletteVersion = version;
 	row.cache.fill(Qt::transparent);
 	auto font = style::ResolveFont(row.id, 0, st::boxFontSize);
 	auto p = QPainter(&row.cache);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 08b56a178..4ddff63a9 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 08b56a17892d4c9c6b7ef87fcffbb64090e9ce2a
+Subproject commit 4ddff63a9b6cd2e2787995611f1ee4b145bdb504

From 26e8c29f40de6da59ade55908a9882908fd3095c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 01:44:52 +0300
Subject: [PATCH 455/596] Moved formatting of dialog last date to td_ui.

---
 .../SourceFiles/dialogs/ui/dialogs_layout.cpp | 32 +++----------------
 .../SourceFiles/ui/text/format_values.cpp     | 18 +++++++++++
 Telegram/SourceFiles/ui/text/format_values.h  |  1 +
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
index a625d8aca..f7cbff178 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_window.h"
 #include "storage/localstorage.h"
 #include "ui/empty_userpic.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/unread_badge.h"
@@ -44,8 +45,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Dialogs::Ui {
 namespace {
 
-// Show all dates that are in the last 20 hours in time format.
-constexpr int kRecentlyInSeconds = 20 * 3600;
 const auto kPsaBadgePrefix = "cloud_lng_badge_psa_";
 
 [[nodiscard]] bool ShowUserBotIcon(not_null<UserData*> user) {
@@ -81,29 +80,6 @@ void PaintRowTopRight(
 		text);
 }
 
-void PaintRowDate(
-		QPainter &p,
-		QDateTime date,
-		QRect &rectForName,
-		const PaintContext &context) {
-	const auto now = QDateTime::currentDateTime();
-	const auto &lastTime = date;
-	const auto nowDate = now.date();
-	const auto lastDate = lastTime.date();
-
-	const auto dt = [&] {
-		if ((lastDate == nowDate)
-			|| (qAbs(lastTime.secsTo(now)) < kRecentlyInSeconds)) {
-			return QLocale().toString(lastTime.time(), QLocale::ShortFormat);
-		} else if (qAbs(lastDate.daysTo(nowDate)) < 7) {
-			return langDayOfWeek(lastDate);
-		} else {
-			return QLocale().toString(lastDate, QLocale::ShortFormat);
-		}
-	}();
-	PaintRowTopRight(p, dt, rectForName, context);
-}
-
 int PaintBadges(
 		QPainter &p,
 		const PaintContext &context,
@@ -444,7 +420,8 @@ void PaintRow(
 		|| (supportMode
 			&& entry->session().supportHelper().isOccupiedBySomeone(history))) {
 		if (!promoted) {
-			PaintRowDate(p, date, rectForName, context);
+			const auto dateString = Ui::FormatDialogsDate(date);
+			PaintRowTopRight(p, dateString, rectForName, context);
 		}
 
 		auto availableWidth = namewidth;
@@ -566,7 +543,8 @@ void PaintRow(
 		}
 	} else if (!item->isEmpty()) {
 		if ((thread || sublist) && !promoted) {
-			PaintRowDate(p, date, rectForName, context);
+			const auto dateString = Ui::FormatDialogsDate(date);
+			PaintRowTopRight(p, dateString, rectForName, context);
 		}
 
 		paintItemCallback(nameleft, namewidth);
diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp
index 41e985723..a5115acf2 100644
--- a/Telegram/SourceFiles/ui/text/format_values.cpp
+++ b/Telegram/SourceFiles/ui/text/format_values.cpp
@@ -484,4 +484,22 @@ QString FormatResetCloudPasswordIn(float64 sec) {
 	return (sec >= 3600) ? FormatTTL(sec) : FormatDurationText(sec);
 }
 
+QString FormatDialogsDate(const QDateTime &lastTime) {
+	// Show all dates that are in the last 20 hours in time format.
+	constexpr int kRecentlyInSeconds = 20 * 3600;
+
+	const auto now = QDateTime::currentDateTime();
+	const auto nowDate = now.date();
+	const auto lastDate = lastTime.date();
+
+	if ((lastDate == nowDate)
+		|| (std::abs(lastTime.secsTo(now)) < kRecentlyInSeconds)) {
+		return QLocale().toString(lastTime.time(), QLocale::ShortFormat);
+	} else if (std::abs(lastDate.daysTo(nowDate)) < 7) {
+		return langDayOfWeek(lastDate);
+	} else {
+		return QLocale().toString(lastDate, QLocale::ShortFormat);
+	}
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/text/format_values.h b/Telegram/SourceFiles/ui/text/format_values.h
index d4ac31b9e..b73775118 100644
--- a/Telegram/SourceFiles/ui/text/format_values.h
+++ b/Telegram/SourceFiles/ui/text/format_values.h
@@ -31,6 +31,7 @@ inline constexpr auto FileStatusSizeFailed = 0xFFFFFFF2LL;
 [[nodiscard]] QString FormatMuteFor(float64 sec);
 [[nodiscard]] QString FormatMuteForTiny(float64 sec);
 [[nodiscard]] QString FormatResetCloudPasswordIn(float64 sec);
+[[nodiscard]] QString FormatDialogsDate(const QDateTime &lastTime);
 
 struct CurrencyRule {
 	const char *international = "";

From 6becaaa95364d25f88f4172556f3d13c31bc08c9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 01:45:02 +0300
Subject: [PATCH 456/596] Slightly improved view style of giveaway results in
 dialogs list.

---
 Telegram/SourceFiles/data/data_media_types.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 50e063da5..3a8dc1943 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -2367,9 +2367,7 @@ const GiveawayResults *MediaGiveawayResults::giveawayResults() const {
 }
 
 TextWithEntities MediaGiveawayResults::notificationText() const {
-	return {
-		.text = tr::lng_prizes_results_title(tr::now),
-	};
+	return Ui::Text::Colorized({ tr::lng_prizes_results_title(tr::now) });
 }
 
 QString MediaGiveawayResults::pinnedTextSubstring() const {

From ab85d18cc801ae572980d5825e0b6fd1ed188892 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 02:38:52 +0300
Subject: [PATCH 457/596] Added support of personal channel with message.

---
 Telegram/SourceFiles/info/info.style          |  19 +
 .../info/profile/info_profile_actions.cpp     | 361 +++++++++++++-----
 2 files changed, 295 insertions(+), 85 deletions(-)

diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 04bb9b1b6..329a79158 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -10,6 +10,7 @@ using "ui/basic.style";
 using "boxes/boxes.style";
 using "ui/widgets/widgets.style";
 using "ui/chat/chat.style"; // GroupCallUserpics.
+using "dialogs/dialogs.style"; // dialogsDateFont.
 
 InfoToggle {
 	color: color;
@@ -469,6 +470,24 @@ infoGroupMembersIconPosition: point(20px, 10px);
 infoChannelMembersIconPosition: point(20px, 19px);
 
 infoPersonalChannelIconPosition: point(25px, 20px);
+infoPersonalChannelNameLabel: FlatLabel(infoProfileStatus) {
+	textFg: windowBoldFg;
+	style: semiboldTextStyle;
+	maxHeight: 20px;
+}
+infoPersonalChannelDateSkip: 22px;
+infoPersonalChannelDateLabel: FlatLabel(infoProfileStatus) {
+	textFg: dialogsDateFg;
+	style: TextStyle(semiboldTextStyle) {
+		font: dialogsDateFont;
+	}
+	maxHeight: 20px;
+}
+infoPersonalChannelUserpicSkip: 3px;
+infoPersonalChannelUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(42px, 42px);
+	photoSize: 42px;
+}
 
 infoBlockHeaderLabel: FlatLabel(infoProfileStatus) {
 	textFg: windowBoldFg;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index b7a14b484..096e4f802 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -7,66 +7,70 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/profile/info_profile_actions.h"
 
+#include "api/api_blocked_peers.h"
 #include "api/api_chat_participants.h"
+#include "apiwrap.h"
 #include "base/options.h"
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
-#include "data/business/data_business_common.h"
-#include "data/business/data_business_info.h"
-#include "data/data_peer_values.h"
-#include "data/data_session.h"
-#include "data/data_folder.h"
-#include "data/data_forum_topic.h"
-#include "data/data_channel.h"
-#include "data/data_changes.h"
-#include "data/data_chat.h"
-#include "data/data_user.h"
-#include "data/notify/data_notify_settings.h"
-#include "ui/vertical_list.h"
-#include "ui/wrap/vertical_layout.h"
-#include "ui/wrap/padding_wrap.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/boxes/report_box.h"
-#include "ui/layers/generic_box.h"
-#include "ui/toast/toast.h"
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
-#include "ui/text/text_variant.h"
-#include "history/history_location_manager.h" // LocationClickHandler.
-#include "history/view/history_view_context_menu.h" // HistoryView::ShowReportPeerBox
 #include "boxes/peers/add_bot_to_chat_box.h"
 #include "boxes/peers/edit_contact_box.h"
 #include "boxes/report_messages_box.h"
 #include "boxes/share_box.h"
 #include "boxes/translate_box.h"
-#include "lang/lang_keys.h"
-#include "menu/menu_mute.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "data/business/data_business_common.h"
+#include "data/business/data_business_info.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_folder.h"
+#include "data/data_forum_topic.h"
+#include "data/data_peer_values.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/notify/data_notify_settings.h"
+#include "dialogs/ui/dialogs_layout.h"
+#include "dialogs/ui/dialogs_message_view.h"
 #include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h"
+#include "history/view/history_view_context_menu.h" // HistoryView::ShowReportPeerBox
+#include "history/view/history_view_item_preview.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/profile/info_profile_phone_menu.h"
-#include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_text.h"
+#include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_widget.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "menu/menu_mute.h"
 #include "support/support_helper.h"
-#include "window/window_session_controller.h"
+#include "ui/boxes/report_box.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
+#include "ui/text/text_variant.h"
+#include "ui/toast/toast.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
 #include "window/window_controller.h" // Window::Controller::show.
 #include "window/window_peer_menu.h"
-#include "mainwidget.h"
-#include "mainwindow.h" // MainWindow::controller.
-#include "main/main_session.h"
-#include "core/application.h"
-#include "core/click_handler_types.h"
-#include "apiwrap.h"
-#include "api/api_blocked_peers.h"
+#include "window/window_session_controller.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
-#include "styles/style_boxes.h"
 #include "styles/style_menu_icons.h"
 
 #include <QtGui/QGuiApplication>
@@ -1228,63 +1232,250 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 		_wrap,
 		object_ptr<Ui::VerticalLayout>(_wrap));
 	const auto container = result->entity();
+	const auto window = _controller->parentController();
 
 	result->toggleOn(PersonalChannelValue(
 		user
 	) | rpl::map(rpl::mappers::_1 != nullptr));
 	result->finishAnimating();
 
-	Ui::AddDivider(container);
-
+	auto channelToggleValue = PersonalChannelValue(
+		user
+	) | rpl::map([=] { return !!user->personalChannelId(); });
 	auto channel = PersonalChannelValue(
 		user
 	) | rpl::start_spawning(result->lifetime());
-	auto text = rpl::duplicate(
-		channel
-	) | rpl::map([=](ChannelData *channel) {
-		return channel ? NameValue(channel) : rpl::single(QString());
-	}) | rpl::flatten_latest() | rpl::map([](const QString &name) {
-		return name.isEmpty() ? TextWithEntities() : Ui::Text::Link(name);
-	});
-	auto label = rpl::combine(
-		tr::lng_info_personal_channel_label(Ui::Text::WithEntities),
-		rpl::duplicate(channel)
-	) | rpl::map([](TextWithEntities &&text, ChannelData *channel) {
-		const auto count = channel ? channel->membersCount() : 0;
-		if (count > 1) {
-			text.append(
-				QString::fromUtf8(" \xE2\x80\xA2 ")
-			).append(tr::lng_chat_status_subscribers(
-				tr::now,
-				lt_count_decimal,
-				count));
-		}
-		return text;
-	});
-	auto line = CreateTextWithLabel(
-		result,
-		std::move(label),
-		std::move(text),
-		st::infoLabel,
-		st::infoLabeled,
-		st::infoProfileLabeledPadding);
-	container->add(std::move(line.wrap));
 
-	line.text->setClickHandlerFilter([
-		=,
-		window = _controller->parentController()](
-			const ClickHandlerPtr &handler,
-			Qt::MouseButton button) {
-		if (const auto channelId = user->personalChannelId()) {
-			window->showPeerInfo(peerFromChannel(channelId));
-		}
-		return false;
-	});
+	const auto channelLabelFactory = [=](rpl::producer<ChannelData*> c) {
+		return rpl::combine(
+			tr::lng_info_personal_channel_label(Ui::Text::WithEntities),
+			std::move(c)
+		) | rpl::map([](TextWithEntities &&text, ChannelData *channel) {
+			const auto count = channel ? channel->membersCount() : 0;
+			if (count > 1) {
+				text.append(
+					QString::fromUtf8(" \xE2\x80\xA2 ")
+				).append(tr::lng_chat_status_subscribers(
+					tr::now,
+					lt_count_decimal,
+					count));
+			}
+			return text;
+		});
+	};
 
-	object_ptr<FloatingIcon>(
-		result,
-		st::infoIconMediaChannel,
-		st::infoPersonalChannelIconPosition);
+	{
+		const auto onlyChannelWrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		onlyChannelWrap->toggleOn(rpl::duplicate(channelToggleValue)
+			| rpl::map(!rpl::mappers::_1));
+		onlyChannelWrap->finishAnimating();
+
+		Ui::AddDivider(onlyChannelWrap->entity());
+
+		auto text = rpl::duplicate(
+			channel
+		) | rpl::map([=](ChannelData *channel) {
+			return channel ? NameValue(channel) : rpl::single(QString());
+		}) | rpl::flatten_latest() | rpl::map([](const QString &name) {
+			return name.isEmpty() ? TextWithEntities() : Ui::Text::Link(name);
+		});
+		auto line = CreateTextWithLabel(
+			result,
+			channelLabelFactory(rpl::duplicate(channel)),
+			std::move(text),
+			st::infoLabel,
+			st::infoLabeled,
+			st::infoProfileLabeledPadding);
+		onlyChannelWrap->entity()->add(std::move(line.wrap));
+
+		line.text->setClickHandlerFilter([=](
+				const ClickHandlerPtr &handler,
+				Qt::MouseButton button) {
+			if (const auto channelId = user->personalChannelId()) {
+				window->showPeerInfo(peerFromChannel(channelId));
+			}
+			return false;
+		});
+
+		object_ptr<FloatingIcon>(
+			onlyChannelWrap,
+			st::infoIconMediaChannel,
+			st::infoPersonalChannelIconPosition);
+	}
+
+	{
+		const auto messageChannelWrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		messageChannelWrap->toggleOn(rpl::duplicate(channelToggleValue));
+		messageChannelWrap->finishAnimating();
+
+		const auto clear = [=] {
+			while (messageChannelWrap->entity()->count()) {
+				delete messageChannelWrap->entity()->widgetAt(0);
+			}
+		};
+
+		const auto rebuild = [=](
+				not_null<HistoryItem*> item,
+				anim::type animated) {
+			const auto &stUserpic = st::infoPersonalChannelUserpic;
+			const auto &stLabeled = st::infoProfileLabeledPadding;
+
+			messageChannelWrap->toggle(false, anim::type::instant);
+			clear();
+			Ui::AddDivider(messageChannelWrap->entity());
+			Ui::AddSkip(messageChannelWrap->entity());
+
+			const auto inner = messageChannelWrap->entity()->add(
+				object_ptr<Ui::VerticalLayout>(messageChannelWrap->entity()));
+
+			const auto line = inner->add(
+				object_ptr<Ui::FixedHeightWidget>(
+					inner,
+					stUserpic.photoSize + rect::m::sum::v(stLabeled)));
+			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+				line,
+				item->history()->peer,
+				st::infoPersonalChannelUserpic);
+
+			userpic->moveToLeft(
+				-st::infoPersonalChannelUserpicSkip
+					+ (stLabeled.left() - stUserpic.photoSize) / 2,
+				stLabeled.top());
+			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+			const auto date = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				Ui::FormatDialogsDate(ItemDateTime(item)),
+				st::infoPersonalChannelDateLabel);
+
+			const auto name = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				NameValue(item->history()->peer),
+				st::infoPersonalChannelNameLabel);
+
+			const auto preview = Ui::CreateChild<Ui::RpWidget>(line);
+			auto &lifetime = preview->lifetime();
+			using namespace Dialogs::Ui;
+			const auto previewView = lifetime.make_state<MessageView>();
+			preview->resize(0, st::infoLabeled.style.font->height);
+			preview->paintRequest(
+			) | rpl::start_with_next([=](const QRect &rect) {
+				auto p = Painter(preview);
+				if (previewView->prepared(item, nullptr)) {
+					previewView->paint(p, preview->rect(), {
+						.st = &st::defaultDialogRow,
+						.currentBg = st::boxBg->b,
+					});
+				} else if (!previewView->dependsOn(item)) {
+					p.setPen(st::infoPersonalChannelDateLabel.textFg);
+					p.setBrush(Qt::NoBrush);
+					p.setFont(st::infoPersonalChannelDateLabel.style.font);
+					p.drawText(
+						preview->rect(),
+						tr::lng_contacts_loading(tr::now),
+						style::al_left);
+					previewView->prepare(
+						item,
+						nullptr,
+						[=] { preview->update(); },
+						{});
+					preview->update();
+				}
+			}, preview->lifetime());
+
+			line->sizeValue(
+			) | rpl::start_with_next([=](const QSize &size) {
+				const auto left = stLabeled.left();
+				const auto right = st::infoPersonalChannelDateSkip;
+				const auto top = stLabeled.top();
+				date->moveToRight(right, top);
+
+				name->resizeToWidth(size.width()
+					- left
+					- date->width()
+					- st::defaultVerticalListSkip
+					- right);
+				name->moveToLeft(left, top);
+
+				preview->resize(
+					size.width() - left - right,
+					st::infoLabeled.style.font->height);
+				preview->moveToLeft(
+					left,
+					size.height() - stLabeled.bottom() - preview->height());
+			}, preview->lifetime());
+
+			{
+				inner->add(
+					object_ptr<Ui::FlatLabel>(
+						inner,
+						channelLabelFactory(
+							rpl::single(item->history()->peer->asChannel())),
+						st::infoLabel),
+					QMargins(
+						st::infoProfileLabeledPadding.left(),
+						0,
+						st::infoProfileLabeledPadding.right(),
+						st::infoProfileLabeledPadding.bottom()));
+			}
+			{
+				const auto button = Ui::CreateChild<Ui::RippleButton>(
+					messageChannelWrap->entity(),
+					st::defaultRippleAnimation);
+				button->paintRequest(
+				) | rpl::start_with_next([=](const QRect &rect) {
+					auto p = QPainter(button);
+					button->paintRipple(p, 0, 0);
+				}, button->lifetime());
+				inner->geometryValue(
+				) | rpl::start_with_next([=](const QRect &rect) {
+					button->setGeometry(rect);
+				}, button->lifetime());
+				button->setClickedCallback([=, msg = item->fullId().msg] {
+					window->showPeerHistory(
+						item->history()->peer,
+						Window::SectionShow::Way::Forward,
+						msg);
+				});
+				button->lower();
+			}
+			inner->setAttribute(Qt::WA_TransparentForMouseEvents);
+			Ui::AddSkip(messageChannelWrap->entity());
+
+			Ui::ToggleChildrenVisibility(messageChannelWrap->entity(), true);
+			Ui::ToggleChildrenVisibility(line, true);
+			messageChannelWrap->toggle(true, animated);
+		};
+
+		rpl::duplicate(
+			channel
+		) | rpl::start_with_next([=](ChannelData *channel) {
+			clear();
+			if (!channel) {
+				return;
+			}
+			const auto id = FullMsgId(
+				channel->id,
+				user->personalChannelMessageId());
+			if (const auto item = user->session().data().message(id)) {
+				return rebuild(item, anim::type::instant);
+			}
+			user->session().api().requestMessageData(
+				channel,
+				user->personalChannelMessageId(),
+				[=] {
+					if (const auto i = user->session().data().message(id)) {
+						rebuild(i, anim::type::normal);
+					}
+				});
+		}, messageChannelWrap->lifetime());
+	}
 
 	return result;
 }

From d40951f068c80d78d915e3dba6a76e5e0950bac5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 03:37:26 +0300
Subject: [PATCH 458/596] Added ability to moderate non-users to moderation
 box.

---
 .../boxes/moderate_messages_box.cpp           | 103 +++++++++---------
 1 file changed, 54 insertions(+), 49 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index dbb9e7cb1..974f3bbf8 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -46,12 +46,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
-using Users = std::vector<not_null<UserData*>>;
+using Participants = std::vector<not_null<PeerData*>>;
 
 struct ModerateOptions final {
 	bool allCanBan = false;
 	bool allCanDelete = false;
-	Users users;
+	Participants participants;
 };
 
 ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
@@ -76,9 +76,9 @@ ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 		if (!item->suggestDeleteAllReport()) {
 			result.allCanDelete = false;
 		}
-		if (const auto user = item->from()->asUser()) {
-			if (!ranges::contains(result.users, not_null{ user })) {
-				result.users.push_back(user);
+		if (const auto p = item->from()) {
+			if (!ranges::contains(result.participants, not_null{ p })) {
+				result.participants.push_back(p);
 			}
 		}
 	}
@@ -212,42 +212,45 @@ void CreateModerateMessagesBox(
 		rpl::event_stream<bool> toggleRequestsFromTop;
 		rpl::event_stream<bool> toggleRequestsFromInner;
 		rpl::event_stream<bool> checkAllRequests;
-		Fn<Users()> collectRequests;
+		Fn<Participants()> collectRequests;
 	};
-	const auto [allCanBan, allCanDelete, users] = CalculateModerateOptions(
-		items);
+	const auto [allCanBan, allCanDelete, participants]
+		= CalculateModerateOptions(items);
 	const auto inner = box->verticalLayout();
 
-	Assert(!users.empty());
+	Assert(!participants.empty());
 
 	const auto confirms = inner->lifetime().make_state<rpl::event_stream<>>();
 
-	const auto isSingle = users.size() == 1;
+	const auto isSingle = participants.size() == 1;
 	const auto buttonPadding = isSingle
 		? QMargins()
-		: QMargins(0, 0, Button::ComputeSize(users.size()).width(), 0);
+		: QMargins(0, 0, Button::ComputeSize(participants.size()).width(), 0);
 
 	const auto session = &items.front()->history()->session();
 	const auto historyPeerId = items.front()->history()->peer->id;
 
-	using Request = Fn<void(not_null<UserData*>, not_null<ChannelData*>)>;
-	const auto sequentiallyRequest = [=](Request request, Users users) {
+	using Request = Fn<void(not_null<PeerData*>, not_null<ChannelData*>)>;
+	const auto sequentiallyRequest = [=](
+			Request request,
+			Participants participants) {
 		constexpr auto kSmallDelayMs = 5;
-		const auto userIds = ranges::views::all(
-			users
-		) | ranges::views::transform([](not_null<UserData*> user) {
-			return user->id;
+		const auto participantIds = ranges::views::all(
+			participants
+		) | ranges::views::transform([](not_null<PeerData*> peer) {
+			return peer->id;
 		}) | ranges::to_vector;
 		const auto lifetime = std::make_shared<rpl::lifetime>();
 		const auto counter = lifetime->make_state<int>(0);
 		const auto timer = lifetime->make_state<base::Timer>();
 		timer->setCallback(crl::guard(session, [=] {
-			if ((*counter) < userIds.size()) {
+			if ((*counter) < participantIds.size()) {
 				const auto peer = session->data().peer(historyPeerId);
 				const auto channel = peer ? peer->asChannel() : nullptr;
-				const auto from = session->data().peer(userIds[*counter]);
-				if (const auto user = from->asUser(); channel && user) {
-					request(user, channel);
+				const auto from = session->data().peer(
+					participantIds[*counter]);
+				if (channel && from) {
+					request(from, channel);
 				}
 				(*counter)++;
 			} else {
@@ -304,7 +307,8 @@ void CreateModerateMessagesBox(
 		});
 	};
 
-	const auto createUsersList = [&](not_null<Controller*> controller) {
+	const auto createParticipantsList = [&](
+			not_null<Controller*> controller) {
 		const auto wrap = inner->add(
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 				inner,
@@ -322,8 +326,8 @@ void CreateModerateMessagesBox(
 		auto &lifetime = wrap->lifetime();
 		const auto clicks = lifetime.make_state<rpl::event_stream<>>();
 		const auto checkboxes = ranges::views::all(
-			users
-		) | ranges::views::transform([&](not_null<UserData*> user) {
+			participants
+		) | ranges::views::transform([&](not_null<PeerData*> peer) {
 			const auto line = container->add(
 				object_ptr<Ui::AbstractButton>(container));
 			const auto &st = st::moderateBoxUserpic;
@@ -331,11 +335,11 @@ void CreateModerateMessagesBox(
 
 			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
 				line,
-				user,
+				peer,
 				st);
 			const auto checkbox = Ui::CreateChild<Ui::Checkbox>(
 				line,
-				user->name(),
+				peer->name(),
 				false,
 				st::defaultBoxCheckbox);
 			line->widthValue(
@@ -381,10 +385,10 @@ void CreateModerateMessagesBox(
 		}, container->lifetime());
 
 		controller->collectRequests = [=] {
-			auto result = Users();
+			auto result = Participants();
 			for (auto i = 0; i < checkboxes.size(); i++) {
 				if (checkboxes[i]->checked()) {
-					result.push_back(users[i]);
+					result.push_back(participants[i]);
 				}
 			}
 			return result;
@@ -395,12 +399,13 @@ void CreateModerateMessagesBox(
 			not_null<Ui::Checkbox*> checkbox,
 			not_null<Controller*> controller) {
 		if (isSingle) {
-			const auto user = users.front();
-			controller->collectRequests = [=] { return Users{ user }; };
+			const auto p = participants.front();
+			controller->collectRequests = [=] { return Participants{ p }; };
 			return;
 		}
-		const auto button = Ui::CreateChild<Button>(inner, users.size());
-		button->resize(Button::ComputeSize(users.size()));
+		const auto count = int(participants.size());
+		const auto button = Ui::CreateChild<Button>(inner, count);
+		button->resize(Button::ComputeSize(count));
 
 		const auto overlay = Ui::CreateChild<Ui::AbstractButton>(inner);
 
@@ -428,7 +433,7 @@ void CreateModerateMessagesBox(
 			checkbox->setChecked(!checkbox->checked());
 			controller->checkAllRequests.fire_copy(checkbox->checked());
 		});
-		createUsersList(controller);
+		createParticipantsList(controller);
 	};
 
 	Ui::AddSkip(inner);
@@ -458,20 +463,20 @@ void CreateModerateMessagesBox(
 
 		const auto ids = items.front()->from()->owner().itemsToIds(items);
 		handleConfirmation(report, controller, [=](
-				not_null<UserData*> u,
+				not_null<PeerData*> p,
 				not_null<ChannelData*> c) {
 			auto filtered = QVector<MTPint>();
 			for (const auto &id : ids) {
-				if (const auto item = u->session().data().message(id)) {
-					if (item->from()->asUser() == u) {
+				if (const auto item = p->session().data().message(id)) {
+					if (item->from() == p) {
 						filtered.push_back(MTP_int(item->fullId().msg));
 					}
 				}
 			}
-			u->session().api().request(
+			c->session().api().request(
 				MTPchannels_ReportSpam(
 					c->inputChannel,
-					u->input,
+					p->input,
 					MTP_vector<MTPint>(std::move(filtered)))
 			).send();
 		});
@@ -501,7 +506,7 @@ void CreateModerateMessagesBox(
 			tr::lng_selected_delete_sure(
 				lt_count,
 				rpl::combine(
-					MessagesCountValue(history, users.front()),
+					MessagesCountValue(history, participants.front()),
 					deleteAll->checkedValue()
 				) | rpl::map([s = items.size()](int all, bool checked) {
 					return float64((checked && all) ? all : s);
@@ -518,9 +523,9 @@ void CreateModerateMessagesBox(
 		handleSubmition(deleteAll);
 
 		handleConfirmation(deleteAll, controller, [=](
-				not_null<UserData*> u,
+				not_null<PeerData*> p,
 				not_null<ChannelData*> c) {
-			u->session().api().deleteAllFromParticipant(c, u);
+			p->session().api().deleteAllFromParticipant(c, p);
 		});
 	}
 	if (allCanBan) {
@@ -554,7 +559,7 @@ void CreateModerateMessagesBox(
 		const auto container = wrap->entity();
 		wrap->toggle(false, anim::type::instant);
 
-		const auto session = &users.front()->session();
+		const auto session = &participants.front()->session();
 		const auto emojiMargin = QMargins(
 			-st::moderateBoxExpandInnerSkip,
 			-st::moderateBoxExpandInnerSkip / 2,
@@ -664,7 +669,7 @@ void CreateModerateMessagesBox(
 				tr::lng_restrict_users_part_single_header(),
 				tr::lng_restrict_users_part_header(
 					lt_count,
-					rpl::single(users.size()) | tr::to_count())),
+					rpl::single(participants.size()) | tr::to_count())),
 			prepareFlags,
 			disabledMessages,
 			{ .isForum = peer->isForum() });
@@ -677,12 +682,12 @@ void CreateModerateMessagesBox(
 		container->add(std::move(checkboxes));
 
 		handleConfirmation(ban, controller, [=](
-				not_null<UserData*> user,
+				not_null<PeerData*> peer,
 				not_null<ChannelData*> channel) {
 			if (wrap->toggled()) {
 				Api::ChatParticipants::Restrict(
 					channel,
-					user,
+					peer,
 					ChatRestrictionsInfo(), // Unused.
 					ChatRestrictionsInfo(getRestrictions(), 0),
 					nullptr,
@@ -690,7 +695,7 @@ void CreateModerateMessagesBox(
 			} else {
 				channel->session().api().chatParticipants().kick(
 					channel,
-					user,
+					peer,
 					{ channel->restrictions(), 0 });
 			}
 		});
@@ -698,8 +703,8 @@ void CreateModerateMessagesBox(
 
 	const auto close = crl::guard(box, [=] { box->closeBox(); });
 	{
-		const auto data = &users.front()->session().data();
-		const auto ids = users.front()->session().data().itemsToIds(items);
+		const auto data = &participants.front()->session().data();
+		const auto ids = data->itemsToIds(items);
 		box->addButton(tr::lng_box_delete(), [=] {
 			confirms->fire({});
 			if (confirmed) {
@@ -716,7 +721,7 @@ void CreateModerateMessagesBox(
 bool CanCreateModerateMessagesBox(const HistoryItemsList &items) {
 	const auto options = CalculateModerateOptions(items);
 	return (options.allCanBan || options.allCanDelete)
-		&& !options.users.empty();
+		&& !options.participants.empty();
 }
 
 void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {

From 14e8b8fb915175f2d3c617f004f57ae0cc8d15e3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 04:03:43 +0300
Subject: [PATCH 459/596] Fixed spam reporting in moderation box.

---
 .../SourceFiles/boxes/moderate_messages_box.cpp     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 974f3bbf8..c91e3f5da 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -465,14 +465,11 @@ void CreateModerateMessagesBox(
 		handleConfirmation(report, controller, [=](
 				not_null<PeerData*> p,
 				not_null<ChannelData*> c) {
-			auto filtered = QVector<MTPint>();
-			for (const auto &id : ids) {
-				if (const auto item = p->session().data().message(id)) {
-					if (item->from() == p) {
-						filtered.push_back(MTP_int(item->fullId().msg));
-					}
-				}
-			}
+			auto filtered = ranges::views::all(
+				ids
+			) | ranges::views::transform([](const FullMsgId &id) {
+				return MTP_int(id.msg);
+			}) | ranges::to<QVector<MTPint>>();
 			c->session().api().request(
 				MTPchannels_ReportSpam(
 					c->inputChannel,

From 95ec0633ed4c40f23e49457b1889590e7a569e14 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 11:33:47 +0400
Subject: [PATCH 460/596] Use custom-adjusted font metrics for custom fonts.

Fixes #27814.
---
 Telegram/SourceFiles/core/application.cpp     |   4 +-
 .../media/player/media_player_button.cpp      |   5 +-
 .../media/player/media_player_button.h        |   2 +
 .../media/stories/media_stories_sibling.cpp   |   2 +-
 .../SourceFiles/ui/boxes/choose_font_box.cpp  | 158 +++++++-----------
 Telegram/SourceFiles/ui/chat/chat_style.cpp   |   2 +-
 Telegram/SourceFiles/ui/countryinput.cpp      |  48 ------
 Telegram/SourceFiles/ui/countryinput.h        |   1 -
 Telegram/codegen                              |   2 +-
 Telegram/lib_ui                               |   2 +-
 10 files changed, 77 insertions(+), 149 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 0e67e7179..5557eb503 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -241,7 +241,7 @@ Application::~Application() {
 	_mediaControlsManager = nullptr;
 
 	Media::Player::finish(_audio.get());
-	style::stopManager();
+	style::StopManager();
 
 	Instance = nullptr;
 }
@@ -278,7 +278,7 @@ void Application::run() {
 	_translator = std::make_unique<Lang::Translator>();
 	QCoreApplication::instance()->installTranslator(_translator.get());
 
-	style::startManager(cScale());
+	style::StartManager(cScale());
 	Ui::InitTextOptions();
 	Ui::StartCachedCorners();
 	Ui::Emoji::Init();
diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp
index 79691a4e7..0e9ab424a 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_button.cpp
@@ -269,6 +269,9 @@ SpeedButtonLayout::SpeedButtonLayout(
 , _text(SpeedText(speed))
 , _textWidth(_metrics.horizontalAdvance(_text))
 , _callback(std::move(callback)) {
+	const auto result = style::FindAdjustResult(_st.font->f);
+	_adjustedAscent = result ? result->ascent : _metrics.ascent();
+	_adjustedHeight = result ? result->height : _metrics.height();
 }
 
 void SpeedButtonLayout::setSpeed(float64 speed) {
@@ -292,7 +295,7 @@ void SpeedButtonLayout::paint(QPainter &p, bool over, bool active) {
 	p.drawText(
 		QPointF(inner.topLeft()) + QPointF(
 			(inner.width() - _textWidth) / 2.,
-			(inner.height() - _metrics.height()) / 2. + _metrics.ascent()),
+			(inner.height() - _adjustedHeight) / 2. + _adjustedAscent),
 		_text);
 }
 
diff --git a/Telegram/SourceFiles/media/player/media_player_button.h b/Telegram/SourceFiles/media/player/media_player_button.h
index ae2b9563d..750b533eb 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.h
+++ b/Telegram/SourceFiles/media/player/media_player_button.h
@@ -69,6 +69,8 @@ private:
 	float64 _speed = 1.;
 
 	QFontMetricsF _metrics;
+	float64 _adjustedAscent = 0.;
+	float64 _adjustedHeight = 0.;
 
 	QString _text;
 	float64 _textWidth = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index e57825ea1..742639851 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -349,7 +349,7 @@ QImage Sibling::nameImage(const SiblingLayout &layout) {
 		const auto family = 0; // Default font family.
 		const auto font = style::font(
 			_nameFontSize,
-			style::internal::FontSemibold,
+			style::FontFlag::Semibold,
 			family);
 		_name.reset();
 		_nameStyle = std::make_unique<style::TextStyle>(style::TextStyle{
diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index a5e8fb203..512e8a691 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -53,10 +53,10 @@ public:
 private:
 	void layout();
 
-	void paintBubble(QPainter &p);
-	void paintContent(QPainter &p);
-	void paintReply(QPainter &p);
-	void paintMessage(QPainter &p);
+	void paintBubble(Painter &p);
+	void paintContent(Painter &p);
+	void paintReply(Painter &p);
+	void paintMessage(Painter &p);
 
 	void validateBubbleCache();
 
@@ -64,18 +64,16 @@ private:
 	const style::owned_color _msgBg;
 	const style::owned_color _msgShadow;
 
-	QFont _nameFont;
-	QFontMetricsF _nameMetrics;
-	int _nameFontHeight = 0;
-	QFont _textFont;
-	QFontMetricsF _textMetrics;
-	int _textFontHeight = 0;
+	style::owned_font _nameFontOwned;
+	style::font _nameFont;
+	style::TextStyle _nameStyle;
+	style::owned_font _textFontOwned;
+	style::font _textFont;
+	style::TextStyle _textStyle;
 
-	QString _nameText;
-	QString _replyText;
-	QString _messageText;
-
-	int _boundingLimit = 0;
+	Ui::Text::String _nameText;
+	Ui::Text::String _replyText;
+	Ui::Text::String _messageText;
 
 	QRect _replyRect;
 	QRect _name;
@@ -316,18 +314,18 @@ void Selector::validateCache(Entry &row) {
 	}
 	row.paletteVersion = version;
 	row.cache.fill(Qt::transparent);
-	auto font = style::ResolveFont(row.id, 0, st::boxFontSize);
+	auto owned = style::owned_font(row.id, 0, st::boxFontSize);
+	const auto font = owned.font();
 	auto p = QPainter(&row.cache);
 	p.setFont(font);
 	p.setPen(st::windowFg);
 
 	const auto textw = width() - _st.padding.left() - _st.padding.right();
-	const auto metrics = QFontMetrics(font);
-	const auto textt = (_rowHeight - metrics.height()) / 2.;
+	const auto textt = (_rowHeight - font->height) / 2.;
 	p.drawText(
 		_st.padding.left(),
-		int(base::SafeRound(textt)) + metrics.ascent(),
-		metrics.elidedText(row.text, Qt::ElideRight, textw));
+		textt + font->ascent,
+		font->elided(row.text, textw));
 }
 
 bool Selector::searching() const {
@@ -576,15 +574,15 @@ PreviewPainter::PreviewPainter(const QImage &bg, PreviewRequest request)
 : _request(request)
 , _msgBg(_request.msgBg)
 , _msgShadow(_request.msgShadow)
-, _nameFont(style::ResolveFont(
-	_request.family,
-	style::internal::FontSemibold,
-	st::fsize))
-, _nameMetrics(_nameFont)
-, _nameFontHeight(base::SafeRound(_nameMetrics.height()))
-, _textFont(style::ResolveFont(_request.family, 0, st::fsize))
-, _textMetrics(_textFont)
-, _textFontHeight(base::SafeRound(_textMetrics.height())) {
+, _nameFontOwned(_request.family, style::FontFlag::Semibold, st::fsize)
+, _nameFont(_nameFontOwned.font())
+, _nameStyle(st::semiboldTextStyle)
+, _textFontOwned(_request.family, 0, st::fsize)
+, _textFont(_textFontOwned.font())
+, _textStyle(st::defaultTextStyle) {
+	_nameStyle.font = _nameFont;
+	_textStyle.font = _textFont;
+
 	layout();
 
 	const auto ratio = style::DevicePixelRatio();
@@ -593,14 +591,14 @@ PreviewPainter::PreviewPainter(const QImage &bg, PreviewRequest request)
 		QImage::Format_ARGB32_Premultiplied);
 	_result.setDevicePixelRatio(ratio);
 
-	auto p = QPainter(&_result);
+	auto p = Painter(&_result);
 	p.drawImage(0, 0, bg);
 
 	p.translate(_bubble.topLeft());
 	paintBubble(p);
 }
 
-void PreviewPainter::paintBubble(QPainter &p) {
+void PreviewPainter::paintBubble(Painter &p) {
 	validateBubbleCache();
 	const auto bubble = QRect(QPoint(), _bubble.size());
 	const auto cornerShadow = _bubbleShadowBottomRight.size()
@@ -636,7 +634,7 @@ void PreviewPainter::validateBubbleCache() {
 		= Ui::PrepareCornerPixmaps(radius, _msgShadow.color()).p[3];
 }
 
-void PreviewPainter::paintContent(QPainter &p) {
+void PreviewPainter::paintContent(Painter &p) {
 	paintReply(p);
 
 	p.translate(_message.topLeft());
@@ -645,7 +643,7 @@ void PreviewPainter::paintContent(QPainter &p) {
 	paintMessage(p);
 }
 
-void PreviewPainter::paintReply(QPainter &p) {
+void PreviewPainter::paintReply(Painter &p) {
 	{
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
@@ -672,26 +670,25 @@ void PreviewPainter::paintReply(QPainter &p) {
 	p.setClipping(false);
 
 	p.setPen(_request.replyNameFg);
-	p.setFont(_nameFont);
-	const auto name = _nameMetrics.elidedText(
-		_nameText,
-		Qt::ElideRight,
-		_name.width());
-	p.drawText(_name.x(), _name.y() + _nameMetrics.ascent(), name);
+	_nameText.drawLeftElided(
+		p,
+		_name.x(),
+		_name.y(),
+		_name.width(),
+		_outer.width());
 
 	p.setPen(_request.textFg);
-	p.setFont(_textFont);
-	const auto reply = _textMetrics.elidedText(
-		_replyText,
-		Qt::ElideRight,
-		_reply.width());
-	p.drawText(_reply.x(), _reply.y() + _textMetrics.ascent(), reply);
+	_replyText.drawLeftElided(
+		p,
+		_reply.x(),
+		_reply.y(),
+		_reply.width(),
+		_outer.width());
 }
 
-void PreviewPainter::paintMessage(QPainter &p) {
+void PreviewPainter::paintMessage(Painter &p) {
 	p.setPen(_request.textFg);
-	p.setFont(_textFont);
-	p.drawText(QRect(0, 0, _message.width(), _boundingLimit), _messageText);
+	_messageText.drawLeft(p, 0, 0, _message.width(), _message.width());
 }
 
 QImage PreviewPainter::takeResult() {
@@ -705,79 +702,54 @@ void PreviewPainter::layout() {
 		- 2 * skip
 		- st::msgPadding.left()
 		- st::msgPadding.right();
-	_boundingLimit = 100 * maxTextWidth;
 
-	const auto textSize = [&](
-			const QFontMetricsF &metrics,
-			const QString &text,
-			int availableWidth,
-			bool oneline = false) {
-		const auto result = metrics.boundingRect(
-			QRect(0, 0, availableWidth, _boundingLimit),
-			(Qt::AlignLeft
-				| Qt::AlignTop
-				| (oneline ? Qt::TextSingleLine : Qt::TextWordWrap)),
-			text);
-		return QSize(
-			int(std::ceil(result.x() + result.width())),
-			int(std::ceil(result.y() + result.height())));
-	};
-	const auto naturalSize = [&](
-			const QFontMetricsF &metrics,
-			const QString &text,
-			bool oneline = false) {
-		return textSize(metrics, text, _boundingLimit, oneline);
-	};
-
-	_nameText = tr::lng_settings_chat_message_reply_from(tr::now);
-	_replyText = tr::lng_background_text2(tr::now);
-	_messageText = tr::lng_background_text1(tr::now);
-
-	const auto nameSize = naturalSize(_nameMetrics, _nameText, true);
-	const auto nameMaxWidth = nameSize.width();
-	const auto replySize = naturalSize(_textMetrics, _replyText, true);
-	const auto replyMaxWidth = replySize.width();
-	const auto messageSize = naturalSize(_textMetrics, _messageText);
-	const auto messageMaxWidth = messageSize.width();
+	_nameText = Ui::Text::String(
+		_nameStyle,
+		tr::lng_settings_chat_message_reply_from(tr::now));
+	_replyText = Ui::Text::String(
+		_textStyle,
+		tr::lng_background_text2(tr::now));
+	_messageText = Ui::Text::String(
+		_textStyle,
+		tr::lng_background_text1(tr::now),
+		kDefaultTextOptions,
+		st::msgMinWidth / 2);
 
 	const auto namePosition = QPoint(
 		st::historyReplyPadding.left(),
 		st::historyReplyPadding.top());
 	const auto replyPosition = QPoint(
 		st::historyReplyPadding.left(),
-		(st::historyReplyPadding.top() + _nameFontHeight));
+		(st::historyReplyPadding.top() + _nameFont->height));
 	const auto paddingRight = st::historyReplyPadding.right();
 
 	const auto wantedWidth = std::max({
-		namePosition.x() + nameMaxWidth + paddingRight,
-		replyPosition.x() + replyMaxWidth + paddingRight,
-		messageMaxWidth
+		namePosition.x() + _nameText.maxWidth() + paddingRight,
+		replyPosition.x() + _replyText.maxWidth() + paddingRight,
+		_messageText.maxWidth()
 	});
 
 	const auto messageWidth = std::clamp(
 		wantedWidth,
 		minTextWidth,
 		maxTextWidth);
-	const auto messageHeight = textSize(
-		_textMetrics,
-		_messageText,
-		maxTextWidth).height();
+	const auto messageHeight = _messageText.countHeight(messageWidth);
 
 	_replyRect = QRect(
 		st::msgReplyBarPos.x(),
 		st::historyReplyTop,
 		messageWidth,
 		(st::historyReplyPadding.top()
-			+ _nameFontHeight
-			+ _textFontHeight
+			+ _nameFont->height
+			+ _textFont->height
 			+ st::historyReplyPadding.bottom()));
 
 	_name = QRect(
 		_replyRect.topLeft() + namePosition,
-		QSize(messageWidth - namePosition.x(), _nameFontHeight));
+		QSize(messageWidth - namePosition.x(), _nameFont->height));
 	_reply = QRect(
 		_replyRect.topLeft() + replyPosition,
-		QSize(messageWidth - replyPosition.x(), _textFontHeight));
+		QSize(messageWidth - replyPosition.x(), _textFont->height));
 	_message = QRect(0, 0, messageWidth, messageHeight);
 
 	const auto replySkip = _replyRect.y()
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index a532a3180..56f236481 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -649,7 +649,7 @@ void ChatStyle::clearColorIndexCaches() {
 
 void ChatStyle::assignPalette(not_null<const style::palette*> palette) {
 	*static_cast<style::palette*>(this) = *palette;
-	style::internal::resetIcons();
+	style::internal::ResetIcons();
 
 	clearColorIndexCaches();
 	for (auto &style : _messageStyles) {
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index 002159100..a9c9e1add 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -29,18 +29,6 @@ CountryInput::CountryInput(
 , _st(st)
 , _text(tr::lng_country_code(tr::now)) {
 	resize(_st.width, _st.heightMin);
-
-	auto placeholderFont = _st.placeholderFont->f;
-	placeholderFont.setStyleStrategy(QFont::PreferMatch);
-	//auto metrics = QFontMetrics(placeholderFont);
-	auto placeholder = QString();// metrics.elidedText(tr::lng_country_fake_ph(tr::now), Qt::ElideRight, availableWidth);
-	if (!placeholder.isNull()) {
-		_placeholderPath.addText(
-			0,
-			QFontMetrics(placeholderFont).ascent(),
-			placeholderFont,
-			placeholder);
-	}
 }
 
 void CountryInput::paintEvent(QPaintEvent *e) {
@@ -70,42 +58,6 @@ void CountryInput::paintEvent(QPaintEvent *e) {
 	p.setFont(_st.font);
 	p.setPen(_st.textFg);
 	p.drawText(rect().marginsRemoved(_st.textMargins), _text, _st.textAlign);
-	if (!_placeholderPath.isEmpty()) {
-		auto placeholderShiftDegree = 1.;
-		p.save();
-		p.setClipRect(r);
-
-		const auto placeholderTop = anim::interpolate(
-			0,
-			_st.placeholderShift,
-			placeholderShiftDegree);
-
-		auto r = QRect(rect() - (_st.textMargins + _st.placeholderMargins));
-		r.moveTop(r.top() + placeholderTop);
-		if (rtl()) {
-			r.moveLeft(width() - r.left() - r.width());
-		}
-
-		const auto placeholderScale = 1.
-			- (1. - _st.placeholderScale) * placeholderShiftDegree;
-		auto placeholderFg = anim::color(
-			_st.placeholderFg,
-			_st.placeholderFgActive,
-			0.);
-		placeholderFg = anim::color(
-			placeholderFg,
-			_st.placeholderFgError,
-			0.);
-
-		PainterHighQualityEnabler hq(p);
-		p.setPen(Qt::NoPen);
-		p.setBrush(placeholderFg);
-		p.translate(r.topLeft());
-		p.scale(placeholderScale, placeholderScale);
-		p.drawPath(_placeholderPath);
-
-		p.restore();
-	}
 }
 
 void CountryInput::mouseMoveEvent(QMouseEvent *e) {
diff --git a/Telegram/SourceFiles/ui/countryinput.h b/Telegram/SourceFiles/ui/countryinput.h
index 7bf3f9796..3ce0f04c6 100644
--- a/Telegram/SourceFiles/ui/countryinput.h
+++ b/Telegram/SourceFiles/ui/countryinput.h
@@ -53,7 +53,6 @@ private:
 	bool _active = false;
 	QString _text;
 	QString _chosenIso;
-	QPainterPath _placeholderPath;
 
 	rpl::event_stream<QString> _codeChanged;
 
diff --git a/Telegram/codegen b/Telegram/codegen
index afed06a4c..6462cda46 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit afed06a4c04d1a1cf7cfce4faca273e1f574462e
+Subproject commit 6462cda46ec5d48a9ae452ba1b6f7dfe1b6d882d
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 4ddff63a9..86dc01e9b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 4ddff63a9b6cd2e2787995611f1ee4b145bdb504
+Subproject commit 86dc01e9bc61db48d33ff253d29bfedd74309278

From 2e7142742750c9add54057ae40b338184dde6c27 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 12:05:46 +0400
Subject: [PATCH 461/596] Improve font size edge cases.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 86dc01e9b..d703a804d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 86dc01e9bc61db48d33ff253d29bfedd74309278
+Subproject commit d703a804dfcfeb8bd1687b497726804708dc767f

From 641e74763fef10d583a8f5329f06a996d5a2a417 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 12:17:53 +0400
Subject: [PATCH 462/596] Revert non-production-ready prepare.py changes.

Accidentally commited in b9b7d9e337.
---
 Telegram/build/prepare/prepare.py | 76 ++++---------------------------
 1 file changed, 8 insertions(+), 68 deletions(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 6351f95c6..ce00e278e 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1510,82 +1510,22 @@ mac:
 """)
 
 if buildQt6:
-    qt6version = '6.2.8' if mac else '6.7.0'
-    qt6version_ = '6_2_8' if mac else '6_7_0'
-    arg0 = 'qt_' + qt6version_
-    arg1 = qt6version
-
-    stage('qt_' + qt6version_, """
-win:
-    git clone -b v{1} https://github.com/qt/qt5.git {0}
+    stage('qt_6_2_8', """
 mac:
-    git clone -b v{1}-lts-lgpl https://github.com/qt/qt5.git {0}
-common:
-    cd {0}
+    git clone -b v6.2.8-lts-lgpl https://github.com/qt/qt5.git qt_6_2_8
+    cd qt_6_2_8
     git submodule update --init --recursive qtbase qtimageformats qtsvg
-depends:patches/qtbase_{1}/*.patch
+depends:patches/qtbase_6.2.8/*.patch
     cd qtbase
-win:
-    for /r %%i in (..\\..\\patches\\qtbase_{1}\\*) do git apply %%i -v
+    find ../../patches/qtbase_6.2.8 -type f -print0 | sort -z | xargs -0 git apply -v
     cd ..
-
-    SET CONFIGURATIONS=-debug
-release:
-    SET CONFIGURATIONS=-debug-and-release
-win:
-    """.format(arg0, arg1) + removeDir("\"%LIBS_DIR%\\Qt-\"" + qt6version) + """
-    SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
-    SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
-    SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
-    SET OPENSSL_DIR=%LIBS_DIR%\\openssl3
-    SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
-    SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
-    SET WEBP_DIR=%LIBS_DIR%\\libwebp
-    configure -prefix "%LIBS_DIR%\\Qt-{1}" ^
-        %CONFIGURATIONS% ^
-        -force-debug-info ^
-        -opensource ^
-        -confirm-license ^
-        -static ^
-        -static-runtime ^
-        -opengl es2 -no-angle ^
-        -I "%ANGLE_DIR%\\include" ^
-        -D "KHRONOS_STATIC=" ^
-        -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^
-        QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib" ^
-        QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib" ^
-        -egl ^
-        QMAKE_LIBS_EGL_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
-        QMAKE_LIBS_EGL_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
-        -openssl-linked ^
-        -I "%OPENSSL_DIR%\\include" ^
-        OPENSSL_LIBS_DEBUG="%OPENSSL_LIBS_DIR%.dbg\\libssl.lib %OPENSSL_LIBS_DIR%.dbg\\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
-        OPENSSL_LIBS_RELEASE="%OPENSSL_LIBS_DIR%\\libssl.lib %OPENSSL_LIBS_DIR%\\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
-        -I "%MOZJPEG_DIR%" ^
-        LIBJPEG_LIBS_DEBUG="%MOZJPEG_DIR%\\Debug\\jpeg-static.lib" ^
-        LIBJPEG_LIBS_RELEASE="%MOZJPEG_DIR%\\Release\\jpeg-static.lib" ^
-        -system-webp ^
-        -I "%WEBP_DIR%\\src" ^
-        -L "%WEBP_DIR%\\out\\release-static\\$X8664\\lib" ^
-        -mp ^
-        -no-feature-netlistmgr ^
-        -nomake examples ^
-        -nomake tests ^
-        -platform win32-msvc
-
-    jom -j%NUMBER_OF_PROCESSORS%
-    jom -j%NUMBER_OF_PROCESSORS% install
-
-mac:
-    find ../../patches/qtbase_{1} -type f -print0 | sort -z | xargs -0 git apply -v
-    cd ..
-    sed -i.bak 's/tqtc-//' {{qtimageformats,qtsvg}}/dependencies.yaml
+    sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
 
     CONFIGURATIONS=-debug
 release:
     CONFIGURATIONS=-debug-and-release
 mac:
-    ./configure -prefix "$USED_PREFIX/Qt-{1}" \
+    ./configure -prefix "$USED_PREFIX/Qt-6.2.8" \
         $CONFIGURATIONS \
         -force-debug-info \
         -opensource \
@@ -1606,7 +1546,7 @@ mac:
 
     ninja
     ninja install
-""".format(arg0, arg1))
+""")
 
 stage('tg_owt', """
     git clone https://github.com/desktop-app/tg_owt.git

From 9c77346f3692c1fac023fc99704b3a76d21bd347 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 12:54:20 +0400
Subject: [PATCH 463/596] Fix build with Xcode and GCC.

---
 Telegram/SourceFiles/boxes/moderate_messages_box.cpp | 2 +-
 Telegram/SourceFiles/data/stickers/data_stickers.cpp | 3 ---
 Telegram/SourceFiles/history/history_item.cpp        | 1 -
 Telegram/lib_ui                                      | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index c91e3f5da..0e9ccab9e 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -764,7 +764,7 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 			? tr::lng_saved_messages() | Ui::Text::ToBold()
 			: maybeUser
 			? tr::lng_profile_delete_conversation() | Ui::Text::ToBold()
-			: rpl::single(Ui::Text::Bold(peer->name())),
+			: rpl::single(Ui::Text::Bold(peer->name())) | rpl::type_erased(),
 		box->getDelegate()->style().title);
 	line->widthValue(
 	) | rpl::start_with_next([=](int width) {
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index 057e1d8cf..9ed24fb38 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -1172,9 +1172,6 @@ std::vector<not_null<DocumentData*>> Stickers::getPremiumList(uint64 seed) {
 	const auto CreateFeaturedSortKey = [&](not_null<DocumentData*> document) {
 		return CreateSortKey(document, kSlice * 2);
 	};
-	const auto CreateOtherSortKey = [&](not_null<DocumentData*> document) {
-		return CreateSortKey(document, 0);
-	};
 	const auto InstallDateAdjusted = [&](
 			TimeId date,
 			not_null<DocumentData*> document) {
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 171480ab6..2c20bcec0 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -224,7 +224,6 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 			return nullptr;
 		});
 	}, [&](const MTPDmessageMediaGeoLive &media) -> Result {
-		const auto period = media.vperiod().v;
 		return media.vgeo().match([&](const MTPDgeoPoint &point) -> Result {
 			return std::make_unique<Data::MediaLocation>(
 				item,
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d703a804d..6e924177b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d703a804dfcfeb8bd1687b497726804708dc767f
+Subproject commit 6e924177b7ccf690ab6aeb7c5c4b462f59c84414

From fd633ecb49763fe8f6cae56992cb115ea9d4a211 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 12:11:56 +0400
Subject: [PATCH 464/596] Version 5.0.

- Choose custom font family in Settings > Chat settings > Font family.
- Show "Frequent contacts" when you focus the search field.
- Show "Recent chats" when you focus the search field.
- Show "Channels" list and similar channels.
- Premium users can use animated emoji in polls.
- Group admins can mass-moderate many messages.
- Fix frequent crashes on some Linux systems.
---
 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                                | 10 ++++++++++
 6 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index adc24216c..5aed31352 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.10.0" />
+    Version="5.0.0.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 07bbe9102..347b90da1 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 4,16,10,0
- PRODUCTVERSION 4,16,10,0
+ FILEVERSION 5,0,0,0
+ PRODUCTVERSION 5,0,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", "4.16.10.0"
+            VALUE "FileVersion", "5.0.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.10.0"
+            VALUE "ProductVersion", "5.0.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index ae524c403..db48e2cd9 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 4,16,10,0
- PRODUCTVERSION 4,16,10,0
+ FILEVERSION 5,0,0,0
+ PRODUCTVERSION 5,0,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", "4.16.10.0"
+            VALUE "FileVersion", "5.0.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.10.0"
+            VALUE "ProductVersion", "5.0.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 271c39d52..4bc103a2e 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 = 4016010;
-constexpr auto AppVersionStr = "4.16.10";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 5000000;
+constexpr auto AppVersionStr = "5.0";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 620dc863c..01ae1cbc0 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016010
-AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.10
-AppVersionStr      4.16.10
-BetaChannel        1
+AppVersion         5000000
+AppVersionStrMajor 5.0
+AppVersionStrSmall 5.0
+AppVersionStr      5.0.0
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.16.10.beta
+AppVersionOriginal 5.0
diff --git a/changelog.txt b/changelog.txt
index 649f042f3..9c58b6f93 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,13 @@
+5.0 (02.05.24)
+
+- Choose custom font family in Settings > Chat settings > Font family.
+- Show "Frequent contacts" when you focus the search field.
+- Show "Recent chats" when you focus the search field.
+- Show "Channels" list and similar channels.
+- Premium users can use animated emoji in polls.
+- Group admins can mass-moderate many messages.
+- Fix frequent crashes on some Linux systems.
+
 4.16.10 beta (26.04.24)
 
 - Group admins can mass-moderate many messages.

From b7e52119bca57068d9d962003b954d244ecba42c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 16:35:22 +0400
Subject: [PATCH 465/596] Add .jxl to the list of image extensions.

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

diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index 7467145cf..17a81e4dd 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -244,8 +244,8 @@ QString FileExtension(const QString &filepath) {
 
 NameType DetectNameType(const QString &filepath) {
 	static const auto kImage = SplitExtensions(u"\
-afdesign ai avif bmp dng gif heic icns ico jfif jpeg jpg jpg-large nef png \
-png-large psd raw sketch svg tga tif tiff webp"_q);
+afdesign ai avif bmp dng gif heic icns ico jfif jpeg jpg jpg-large jxl nef \
+png png-large psd raw sketch svg tga tif tiff webp"_q);
 	static const auto kVideo = SplitExtensions(u"\
 3g2 3gp 3gpp aep avi flv h264 m4s m4v mkv mov mp4 mpeg mpg ogv srt tgs tgv \
 vob webm wmv"_q);

From 2b580d29ae46873fbadfba3c03dfacc73bbc9a4f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 17:17:40 +0400
Subject: [PATCH 466/596] Add .qoi to list of image extensions.

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

diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index 17a81e4dd..cc1c14c84 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -245,7 +245,7 @@ QString FileExtension(const QString &filepath) {
 NameType DetectNameType(const QString &filepath) {
 	static const auto kImage = SplitExtensions(u"\
 afdesign ai avif bmp dng gif heic icns ico jfif jpeg jpg jpg-large jxl nef \
-png png-large psd raw sketch svg tga tif tiff webp"_q);
+png png-large psd qoi raw sketch svg tga tif tiff webp"_q);
 	static const auto kVideo = SplitExtensions(u"\
 3g2 3gp 3gpp aep avi flv h264 m4s m4v mkv mov mp4 mpeg mpg ogv srt tgs tgv \
 vob webm wmv"_q);

From bb47f4659dd322c1e6ce32c0a4683489ccc09126 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 19:36:59 +0400
Subject: [PATCH 467/596] Don't adjust monospace font size.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 6e924177b..5b8eb3a5b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 6e924177b7ccf690ab6aeb7c5c4b462f59c84414
+Subproject commit 5b8eb3a5b8f1dfab8c7ac70b2e7294590b253db9

From 0194687181f9be9b493750886aed1823d841cf74 Mon Sep 17 00:00:00 2001
From: Alan Pope <alan@popey.com>
Date: Thu, 2 May 2024 20:59:46 +0100
Subject: [PATCH 468/596] fix: Incorrect package name

Noble has libvpx9, not vpx8.

https://packages.ubuntu.com/search?keywords=libvpx9
---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 41559536c..46fa5e66c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -473,7 +473,7 @@ parts:
       - libopenh264-7
       - libopus0
       - libssl3
-      - libvpx8
+      - libvpx9
       - libx11-6
       - libxcomposite1
       - libxdamage1

From 2b013c108f04178c87984cd8c0e3dbae32079cae Mon Sep 17 00:00:00 2001
From: Alan Pope <alan@popey.com>
Date: Thu, 2 May 2024 23:01:50 +0100
Subject: [PATCH 469/596] Fixes for unable to find gtk-query-immodules-3.0

The package has been updated for 2038 t64 update. This fixes that.

Successfully build telegram 5.0.0 in arm64 after the fixes in this PR.
---
 snap/snapcraft.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 46fa5e66c..ecc16b482 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -193,7 +193,7 @@ parts:
       - dpkg-dev
       - gtk-update-icon-cache
       - libglib2.0-bin
-      - libgtk-3-0
+      - libgtk-3-0t64
     stage-packages:
       - libc-bin
       - libgdk-pixbuf-2.0-0
@@ -211,7 +211,7 @@ parts:
           update-icon-caches "$theme"
         fi
       done
-      GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
+      GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0t64/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
     after:
       - telegram
 

From e3a14d432be9c273ebd8b323babe34839d394ff7 Mon Sep 17 00:00:00 2001
From: Alan Pope <alan@popey.com>
Date: Thu, 2 May 2024 23:21:06 +0100
Subject: [PATCH 470/596] Be consistent with libgtk-3-0t64

The reason it worked without explicitly updating this one is because the deb of libgtk-3-0t64 has a 'replaces' line for libgtk-3-0 - which nullifies this entry, as both were specified. But, you're right, looks better to have the right package in there.
---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ecc16b482..87f926e0e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -328,7 +328,7 @@ parts:
       - libfreetype6
       - libglib2.0-0
       - libglx0
-      - libgtk-3-0
+      - libgtk-3-0t64
       - libharfbuzz0b
       - libice6
       - libicu74

From 5e1f0e9f7f5822c642dd72856cfa9b5e89f8754c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 3 May 2024 05:17:05 +0400
Subject: [PATCH 471/596] Move waiting for answer action 30 minutes later than
 lock threads

---
 .github/workflows/waiting-for-answer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/waiting-for-answer.yml b/.github/workflows/waiting-for-answer.yml
index 657c45e92..5e5ff87c9 100644
--- a/.github/workflows/waiting-for-answer.yml
+++ b/.github/workflows/waiting-for-answer.yml
@@ -4,7 +4,7 @@ on:
   issue_comment:
     types: [created]
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '30 0 * * *'
 
 jobs:
   waiting-for-answer:

From de1f222bacff5c0b100c252c183623c1ce3910d5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 23:39:27 +0300
Subject: [PATCH 472/596] Fixed rescheduling of selected and grouped scheduled
 messages.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index a7a24e44b..bb74d7311 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -553,11 +553,18 @@ bool AddRescheduleAction(
 		}
 		const auto callback = [=](Api::SendOptions options) {
 			list->cancelSelection();
+			auto groupedIds = std::vector<MessageGroupId>();
 			for (const auto &id : ids) {
 				const auto item = owner->message(id);
 				if (!item || !item->isScheduled()) {
 					continue;
 				}
+				if (const auto groupId = item->groupId()) {
+					if (ranges::contains(groupedIds, groupId)) {
+						continue;
+					}
+					groupedIds.push_back(groupId);
+				}
 				Api::RescheduleMessage(item, options);
 				// Increase the scheduled date by 1s to keep the order.
 				options.scheduled += 1;

From 1709fcd0dff23b0679f9dea776ff732fe8cce4be Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 3 May 2024 17:54:51 +0300
Subject: [PATCH 473/596] Guarded personal channel info from possible crash on
 deleting message.

---
 .../info/profile/info_profile_actions.cpp          | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 096e4f802..26adba123 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1365,8 +1365,20 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			const auto previewView = lifetime.make_state<MessageView>();
 			preview->resize(0, st::infoLabeled.style.font->height);
 			preview->paintRequest(
-			) | rpl::start_with_next([=](const QRect &rect) {
+			) | rpl::start_with_next([=, fullId = item->fullId()](
+					const QRect &rect) {
 				auto p = Painter(preview);
+				const auto item = user->session().data().message(fullId);
+				if (!item) {
+					p.setPen(st::infoPersonalChannelDateLabel.textFg);
+					p.setBrush(Qt::NoBrush);
+					p.setFont(st::infoPersonalChannelDateLabel.style.font);
+					p.drawText(
+						preview->rect(),
+						tr::lng_deleted_message(tr::now),
+						style::al_left);
+					return;
+				}
 				if (previewView->prepared(item, nullptr)) {
 					previewView->paint(p, preview->rect(), {
 						.st = &st::defaultDialogRow,

From fccaa587e1ee8c9785489ff2910b485905a87785 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 11:25:21 +0400
Subject: [PATCH 474/596] Fix adjustment of size for modified fonts.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 5b8eb3a5b..db8c3d16e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 5b8eb3a5b8f1dfab8c7ac70b2e7294590b253db9
+Subproject commit db8c3d16e8371bd58024970b8da793bef9d66ede

From 19ead551d93a1c5d371991ac9d52e9702a523c29 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 11:26:24 +0400
Subject: [PATCH 475/596] Fix a typo bug in replies section scrolling.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index fe9ef26e8..afd77d665 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -2385,7 +2385,7 @@ bool RepliesWidget::listScrollTo(int top, bool syntetic) {
 		updateInnerVisibleArea();
 	}
 	_synteticScrollEvent = false;
-	return syntetic;
+	return scrolled;
 }
 
 void RepliesWidget::listCancelRequest() {

From 638e88ec79e7878371aa961c18d878fdf9961a56 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 4 May 2024 07:56:25 +0400
Subject: [PATCH 476/596] Revert "Use latest mesa in snap"

This reverts commit b246328dcf96dfd44e11bef5932b8ff3d7deac5e.
---
 snap/snapcraft.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 87f926e0e..678b4d018 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -79,10 +79,6 @@ layout:
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0:
     bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0
 
-package-repositories:
-  - type: apt
-    ppa: kisak/kisak-mesa
-
 parts:
   telegram:
     plugin: cmake

From 7289292f026e222f33f62242a58b35f3bf162866 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 4 May 2024 13:01:01 +0400
Subject: [PATCH 477/596] Update lib_ui & patches on Linux

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 Telegram/lib_ui                             | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index f6e433535..350c7a3fd 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin ce5098d9bd638ec264fd8cf69ef3ef31d8139d18 \
+	&& git fetch --depth=1 origin 44f5103860dfa3f9b9675730231af6fbe28cde93 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index db8c3d16e..f76ddd841 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit db8c3d16e8371bd58024970b8da793bef9d66ede
+Subproject commit f76ddd841ca02ca35432f6de569f8c430a9713b1
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 678b4d018..7b7761769 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -167,7 +167,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: ce5098d9bd638ec264fd8cf69ef3ef31d8139d18
+    source-commit: 44f5103860dfa3f9b9675730231af6fbe28cde93
     plugin: dump
     override-pull: |
       craftctl default

From 129d3569099e02c790acf1f9cec13e9815b34ca8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 4 May 2024 14:36:26 +0400
Subject: [PATCH 478/596] Fix scrolling expanded frequent contacts.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp | 5 +++++
 Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp     | 4 ++++
 Telegram/SourceFiles/dialogs/ui/top_peers_strip.h       | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 9909fd036..50362e657 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -970,6 +970,11 @@ void Suggestions::setupChats() {
 		_chatsScroll->scrollToY(request.ymin, request.ymax);
 	}, _topPeers->lifetime());
 
+	_topPeers->verticalScrollEvents(
+	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+		_chatsScroll->viewportEvent(e);
+	}, _topPeers->lifetime());
+
 	_chatsScroll->setVisible(_tab.current() == Tab::Chats);
 }
 
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index d32d32814..f793da346 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -205,6 +205,10 @@ int TopPeersStrip::resizeGetHeight(int newWidth) {
 	return _strip.y() + _strip.height();
 }
 
+rpl::producer<not_null<QWheelEvent*>> TopPeersStrip::verticalScrollEvents() const {
+	return _verticalScrollEvents.events();
+}
+
 void TopPeersStrip::stripWheelEvent(QWheelEvent *e) {
 	const auto phase = e->phase();
 	const auto fullDelta = e->pixelDelta().isNull()
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index f23b3da11..9894235c6 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -62,6 +62,9 @@ public:
 	void deselectByKeyboard();
 	bool chooseRow();
 
+	[[nodiscard]] auto verticalScrollEvents() const
+		-> rpl::producer<not_null<QWheelEvent*>>;
+
 private:
 	struct Entry;
 	struct Layout;

From a866ba8cddf356436e65d7f613b95b97bf614374 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 4 May 2024 13:32:07 +0300
Subject: [PATCH 479/596] Fixed crash on restricting users from moderation box.

---
 .../boxes/moderate_messages_box.cpp           | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 0e9ccab9e..22d234ef0 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -678,24 +678,32 @@ void CreateModerateMessagesBox(
 		Ui::AddSkip(container);
 		container->add(std::move(checkboxes));
 
-		handleConfirmation(ban, controller, [=](
-				not_null<PeerData*> peer,
-				not_null<ChannelData*> channel) {
-			if (wrap->toggled()) {
-				Api::ChatParticipants::Restrict(
-					channel,
-					peer,
-					ChatRestrictionsInfo(), // Unused.
-					ChatRestrictionsInfo(getRestrictions(), 0),
-					nullptr,
-					nullptr);
-			} else {
-				channel->session().api().chatParticipants().kick(
-					channel,
-					peer,
-					{ channel->restrictions(), 0 });
+		// Handle confirmation manually.
+		confirms->events() | rpl::start_with_next([=] {
+			if (ban->checked() && controller->collectRequests) {
+				const auto kick = !wrap->toggled();
+				const auto restrictions = getRestrictions();
+				const auto request = [=](
+						not_null<PeerData*> peer,
+						not_null<ChannelData*> channel) {
+					if (!kick) {
+						Api::ChatParticipants::Restrict(
+							channel,
+							peer,
+							ChatRestrictionsInfo(), // Unused.
+							ChatRestrictionsInfo(restrictions, 0),
+							nullptr,
+							nullptr);
+					} else {
+						channel->session().api().chatParticipants().kick(
+							channel,
+							peer,
+							{ channel->restrictions(), 0 });
+					}
+				};
+				sequentiallyRequest(request, controller->collectRequests());
 			}
-		});
+		}, ban->lifetime());
 	}
 
 	const auto close = crl::guard(box, [=] { box->closeBox(); });

From c4f0db5bc52d9d5af41dd10187fd2f11aec7540a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 4 May 2024 13:53:40 +0300
Subject: [PATCH 480/596] Fixed possible crash on slow resolving message from
 personal channel.

---
 Telegram/SourceFiles/info/profile/info_profile_actions.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 26adba123..4dbd1fd33 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1481,11 +1481,11 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			user->session().api().requestMessageData(
 				channel,
 				user->personalChannelMessageId(),
-				[=] {
+				crl::guard(container, [=] {
 					if (const auto i = user->session().data().message(id)) {
 						rebuild(i, anim::type::normal);
 					}
-				});
+				}));
 		}, messageChannelWrap->lifetime());
 	}
 

From fb444e7dd42985104ec416cdc3545c554694017b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 4 May 2024 19:08:30 +0400
Subject: [PATCH 481/596] Version 5.0.1.

- Fix several crashes in new interfaces.
- Fix monospace font size.
- Fix possible problem with underline font size.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 5aed31352..0021dd5de 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.0.0" />
+    Version="5.0.1.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 347b90da1..73e7a40b7 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 5,0,0,0
- PRODUCTVERSION 5,0,0,0
+ FILEVERSION 5,0,1,0
+ PRODUCTVERSION 5,0,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", "5.0.0.0"
+            VALUE "FileVersion", "5.0.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.0.0"
+            VALUE "ProductVersion", "5.0.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index db48e2cd9..50804d116 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 5,0,0,0
- PRODUCTVERSION 5,0,0,0
+ FILEVERSION 5,0,1,0
+ PRODUCTVERSION 5,0,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", "5.0.0.0"
+            VALUE "FileVersion", "5.0.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.0.0"
+            VALUE "ProductVersion", "5.0.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4bc103a2e..5c6a409e8 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 = 5000000;
-constexpr auto AppVersionStr = "5.0";
+constexpr auto AppVersion = 5000001;
+constexpr auto AppVersionStr = "5.0.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 01ae1cbc0..dbb89ce4f 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000000
+AppVersion         5000001
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0
-AppVersionStr      5.0.0
+AppVersionStrSmall 5.0.1
+AppVersionStr      5.0.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.0
+AppVersionOriginal 5.0.1
diff --git a/changelog.txt b/changelog.txt
index 9c58b6f93..432af58b0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+5.0.1 (04.05.24)
+
+- Fix several crashes in new interfaces.
+- Fix monospace font size.
+- Fix possible problem with underline font size.
+
 5.0 (02.05.24)
 
 - Choose custom font family in Settings > Chat settings > Font family.

From 7ff5f81b8863506947161fee8b603bbe0f62495c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 6 May 2024 08:44:18 +0400
Subject: [PATCH 482/596] Try automatic actions update

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

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..5ace4600a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

From 046bc0303705780f2033f2e73e9066211d4f7e89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:20 +0000
Subject: [PATCH 483/596] Bump actions/checkout from 3.1.0 to 4.1.4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.1.0 to 4.1.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.1.0...v4.1.4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docker.yml         | 2 +-
 .github/workflows/linux.yml          | 2 +-
 .github/workflows/mac.yml            | 2 +-
 .github/workflows/mac_packaged.yml   | 2 +-
 .github/workflows/master_updater.yml | 2 +-
 .github/workflows/snap.yml           | 2 +-
 .github/workflows/win.yml            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7a65b483f..e70226345 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
 
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8020e46c5..0d772b8d7 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -58,7 +58,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 8271664c0..c96a45689 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -56,7 +56,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index d04b284de..fc0d5e514 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -60,7 +60,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
diff --git a/.github/workflows/master_updater.yml b/.github/workflows/master_updater.yml
index 284bb844e..a4e50c124 100644
--- a/.github/workflows/master_updater.yml
+++ b/.github/workflows/master_updater.yml
@@ -11,7 +11,7 @@ jobs:
       SKIP: "0"
       to_branch: "master"
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.4
         with:
           fetch-depth: 0
         if: env.SKIP == '0'
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index badcf6cc9..ae4371f0d 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           fetch-depth: 0
           submodules: recursive
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index f8332c36f..d4b8ce7a8 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -75,7 +75,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
           path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}

From 3847b97f80ede5efd8ac2bac7fda2c312b5c7ae1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:12 +0000
Subject: [PATCH 484/596] Bump actions/cache from 3.0.11 to 4.0.2

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.11 to 4.0.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.11...v4.0.2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/mac.yml          | 4 ++--
 .github/workflows/mac_packaged.yml | 2 +-
 .github/workflows/win.yml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index c96a45689..0bd06cb1f 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -76,7 +76,7 @@ jobs:
 
       - name: ThirdParty cache.
         id: cache-third-party
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v4.0.2
         with:
           path: ThirdParty
           key: ${{ runner.OS }}-third-party-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
@@ -84,7 +84,7 @@ jobs:
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v4.0.2
         with:
           path: Libraries
           key: ${{ runner.OS }}-libs-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index fc0d5e514..7f0daf22d 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -99,7 +99,7 @@ jobs:
 
       - name: WebRTC cache.
         id: cache-webrtc
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v4.0.2
         with:
           path: ${{ env.LibrariesPath }}/tg_owt
           key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_owt-version.json') }}
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index d4b8ce7a8..669ef15d4 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -96,7 +96,7 @@ jobs:
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v4.0.2
         with:
           path: ${{ env.TBUILD }}\Libraries
           key: ${{ runner.OS }}-${{ matrix.arch }}-libs-${{ env.CACHE_KEY }}

From ddf6514a90005c2600738f8c22149fab64bc0dc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:14 +0000
Subject: [PATCH 485/596] Bump actions/stale from 5 to 9

Bumps [actions/stale](https://github.com/actions/stale) from 5 to 9.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v5...v9)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 219f95a82..4148917e7 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v9
         with:
           stale-issue-message: |
             Hey there!

From 78a05768d83f5537c9d3e059ae766004e8284b58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:08 +0000
Subject: [PATCH 486/596] Bump dessant/lock-threads from 3 to 5

Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 3 to 5.
- [Release notes](https://github.com/dessant/lock-threads/releases)
- [Changelog](https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dessant/lock-threads/compare/v3...v5)

---
updated-dependencies:
- dependency-name: dessant/lock-threads
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lock.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index 562159d0d..cf3c46989 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -8,7 +8,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: 45

From 7e253314ecb560954d23e2e0f6c2e575e78bbb40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 16:42:41 +0000
Subject: [PATCH 487/596] Bump jinja2 from 3.1.3 to 3.1.4 in
 /Telegram/build/docker/centos_env

Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Telegram/build/docker/centos_env/poetry.lock    | 10 +++++-----
 Telegram/build/docker/centos_env/pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Telegram/build/docker/centos_env/poetry.lock b/Telegram/build/docker/centos_env/poetry.lock
index 08526811d..5ad561c71 100644
--- a/Telegram/build/docker/centos_env/poetry.lock
+++ b/Telegram/build/docker/centos_env/poetry.lock
@@ -1,14 +1,14 @@
-# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "jinja2"
-version = "3.1.3"
+version = "3.1.4"
 description = "A very fast and expressive template engine."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"},
-    {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"},
+    {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"},
+    {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"},
 ]
 
 [package.dependencies]
@@ -69,4 +69,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.7"
-content-hash = "bac9a23a86839c72127e75f2cf181e331f59d96f723403d529e7ea19774ff9c4"
+content-hash = "dcdc36798334f1f85051cf78d7f8a7242a480509eb34135934d9f092d2da5c33"
diff --git a/Telegram/build/docker/centos_env/pyproject.toml b/Telegram/build/docker/centos_env/pyproject.toml
index bba5c212f..d20d3d1d4 100644
--- a/Telegram/build/docker/centos_env/pyproject.toml
+++ b/Telegram/build/docker/centos_env/pyproject.toml
@@ -6,7 +6,7 @@ authors = []
 
 [tool.poetry.dependencies]
 python = "^3.7"
-Jinja2 = "^3.1.3"
+Jinja2 = "^3.1.4"
 
 [tool.poetry.dev-dependencies]
 

From 5d622b906e63a18155f7e812609d99a1e7b877af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:17 +0000
Subject: [PATCH 488/596] Bump ilammy/msvc-dev-cmd from 1.12.0 to 1.13.0

Bumps [ilammy/msvc-dev-cmd](https://github.com/ilammy/msvc-dev-cmd) from 1.12.0 to 1.13.0.
- [Release notes](https://github.com/ilammy/msvc-dev-cmd/releases)
- [Commits](https://github.com/ilammy/msvc-dev-cmd/compare/v1.12.0...v1.13.0)

---
updated-dependencies:
- dependency-name: ilammy/msvc-dev-cmd
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .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 669ef15d4..222366c6c 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -69,7 +69,7 @@ jobs:
         shell: bash
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      - uses: ilammy/msvc-dev-cmd@v1.12.0
+      - uses: ilammy/msvc-dev-cmd@v1.13.0
         name: Native Tools Command Prompt.
         with:
           arch: ${{ matrix.arch }}

From 593e76479ccb6fa7299a5638b28a6e8c1f2376b1 Mon Sep 17 00:00:00 2001
From: GkvJwa <gkvjwa@gmail.com>
Date: Sat, 4 May 2024 18:56:28 +0800
Subject: [PATCH 489/596] Use jom build openssl on windows

---
 Telegram/build/prepare/prepare.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index ce00e278e..ce6c87b9b 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -593,25 +593,25 @@ stage('openssl3', """
     git clone -b openssl-3.2.1 https://github.com/openssl/openssl openssl3
     cd openssl3
 win32:
-    perl Configure no-shared no-tests debug-VC-WIN32
+    perl Configure no-shared no-tests debug-VC-WIN32 /FS
 win64:
-    perl Configure no-shared no-tests debug-VC-WIN64A
+    perl Configure no-shared no-tests debug-VC-WIN64A /FS
 win:
-    nmake
+    jom -j%NUMBER_OF_PROCESSORS%
     mkdir out.dbg
     move libcrypto.lib out.dbg
     move libssl.lib out.dbg
     move ossl_static.pdb out.dbg
 release:
     move out.dbg\\ossl_static.pdb out.dbg\\ossl_static
-    nmake clean
+    jom clean
     move out.dbg\\ossl_static out.dbg\\ossl_static.pdb
 win32:
-    perl Configure no-shared no-tests VC-WIN32
+    perl Configure no-shared no-tests VC-WIN32 /FS
 win64:
-    perl Configure no-shared no-tests VC-WIN64A
+    perl Configure no-shared no-tests VC-WIN64A /FS
 win:
-    nmake
+    jom -j%NUMBER_OF_PROCESSORS%
     mkdir out
     move libcrypto.lib out
     move libssl.lib out

From c1a01728226d249384a52c590fd7508ca013ed12 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 May 2024 17:07:02 +0400
Subject: [PATCH 490/596] De-focus empty search by backspace.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6d8a226b4..bfa3771a6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3244,6 +3244,10 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		//} else {
 		//	e->ignore();
 		//}
+	} else if (e->key() == Qt::Key_Backspace
+		&& _searchHasFocus
+		&& !_searchInChat) {
+		escape();
 	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
 		submit();
 	} else if (_suggestions

From 1f3a3ec04b54f0cc15ef8b3e8bb5b0827aa30ee7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 May 2024 20:45:55 +0400
Subject: [PATCH 491/596] Don't focus search when forum is opened.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index bfa3771a6..2f1763964 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1001,7 +1001,9 @@ void Widget::setupShortcuts() {
 					const auto history = forum->history();
 					controller()->searchInChat(history);
 					return true;
-				} else if (!_openedFolder && _search->isVisible()) {
+				} else if (!_openedFolder
+					&& !_childList
+					&& _search->isVisible()) {
 					_search->setFocus();
 					return true;
 				}
@@ -3291,6 +3293,7 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
 	if (_openedFolder
 		|| _openedForum
+		|| _childList
 		|| !_search->isVisible()
 		|| _search->hasFocus()) {
 		return false;

From 2cb0651b046438cc444c9947a8cee95982e1e22f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 7 May 2024 13:18:58 +0400
Subject: [PATCH 492/596] Redirect IME to search on Windows.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 27 +++++++++++++++----
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 ++
 .../platform/win/main_window_win.cpp          | 15 +++++++++++
 .../platform/win/main_window_win.h            |  5 ++++
 Telegram/SourceFiles/window/main_window.cpp   |  8 ++++++
 Telegram/SourceFiles/window/main_window.h     |  5 +++-
 6 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 2f1763964..575516ffa 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -356,6 +356,14 @@ Widget::Widget(
 		Ui::PostponeCall(this, [=] { listScrollUpdated(); });
 	}, lifetime());
 
+	setAttribute(Qt::WA_InputMethodEnabled);
+	controller->widget()->imeCompositionStarts(
+	) | rpl::filter([=] {
+		return redirectImeToSearch();
+	}) | rpl::start_with_next([=] {
+		_search->setFocusFast();
+	}, lifetime());
+
 	_search->changes(
 	) | rpl::start_with_next([=] {
 		applySearchUpdate();
@@ -3290,12 +3298,17 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
+bool Widget::redirectToSearchPossible() const {
+	return !_openedFolder
+		&& !_openedForum
+		&& !_childList
+		&& _search->isVisible()
+		&& !_search->hasFocus()
+		&& hasFocus();
+}
+
 bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
-	if (_openedFolder
-		|| _openedForum
-		|| _childList
-		|| !_search->isVisible()
-		|| _search->hasFocus()) {
+	if (!redirectToSearchPossible()) {
 		return false;
 	}
 	const auto character = !(e->modifiers() & ~Qt::ShiftModifier)
@@ -3316,6 +3329,10 @@ bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
 	return data && data->hasText();
 }
 
+bool Widget::redirectImeToSearch() const {
+	return redirectToSearchPossible();
+}
+
 void Widget::paintEvent(QPaintEvent *e) {
 	if (controller()->contentOverlapped(this, e)) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index ecd2f3608..5ff9828d5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -250,7 +250,9 @@ private:
 	void updateSuggestions(anim::type animated);
 	void processSearchFocusChange();
 
+	[[nodiscard]] bool redirectToSearchPossible() const;
 	[[nodiscard]] bool redirectKeyToSearch(QKeyEvent *e) const;
+	[[nodiscard]] bool redirectImeToSearch() const;
 
 	MTP::Sender _api;
 
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 8c852b837..dd2f3dafe 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -480,6 +480,21 @@ bool MainWindow::initGeometryFromSystem() {
 	return true;
 }
 
+bool MainWindow::nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		long *result) {
+	if (message) {
+		const auto msg = static_cast<MSG*>(message);
+		if (msg->message == WM_IME_STARTCOMPOSITION) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				imeCompositionStartReceived();
+			});
+		}
+	}
+	return false;
+}
+
 void MainWindow::updateWindowIcon() {
 	updateTaskbarAndIconCounters();
 }
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.h b/Telegram/SourceFiles/platform/win/main_window_win.h
index 856bee773..63dc6ba17 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.h
+++ b/Telegram/SourceFiles/platform/win/main_window_win.h
@@ -48,6 +48,11 @@ protected:
 
 	bool initGeometryFromSystem() override;
 
+	bool nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		long *result) override;
+
 private:
 	struct Private;
 
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 3f8c9b5ba..1c5de5967 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -795,10 +795,18 @@ void MainWindow::setPositionInited() {
 	_positionInited = true;
 }
 
+void MainWindow::imeCompositionStartReceived() {
+	_imeCompositionStartReceived.fire({});
+}
+
 rpl::producer<> MainWindow::leaveEvents() const {
 	return _leaveEvents.events();
 }
 
+rpl::producer<> MainWindow::imeCompositionStarts() const {
+	return _imeCompositionStartReceived.events();
+}
+
 void MainWindow::leaveEventHook(QEvent *e) {
 	_leaveEvents.fire({});
 }
diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h
index 8feb329a9..79dc3c6fe 100644
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -119,7 +119,8 @@ public:
 
 	void launchDrag(std::unique_ptr<QMimeData> data, Fn<void()> &&callback);
 
-	rpl::producer<> leaveEvents() const;
+	[[nodiscard]] rpl::producer<> leaveEvents() const;
+	[[nodiscard]] rpl::producer<> imeCompositionStarts() const;
 
 	virtual void updateWindowIcon() = 0;
 	void updateTitle();
@@ -185,6 +186,7 @@ protected:
 		return false;
 	}
 
+	void imeCompositionStartReceived();
 	void setPositionInited();
 
 	virtual QRect computeDesktopRect() const;
@@ -214,6 +216,7 @@ private:
 	bool _isActive = false;
 
 	rpl::event_stream<> _leaveEvents;
+	rpl::event_stream<> _imeCompositionStartReceived;
 
 	bool _maximizedBeforeHide = false;
 

From 15697f4f2b81b9fbab920067919671a8361a8de7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 8 May 2024 10:29:17 +0400
Subject: [PATCH 493/596] Fix libpng package name in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7b7761769..79148548e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -331,7 +331,7 @@ parts:
       - liblcms2-2
       - libopengl0
       - libpcre2-16-0
-      - libpng16-16
+      - libpng16-16t64
       - libsm6
       - libssl3
       - libvulkan1

From 6ebbca58e87d80140c5ee42b60496d42b6e53f93 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 13 May 2024 19:46:18 +0400
Subject: [PATCH 494/596] Track major version for official GitHub helpers in
 actions

---
 .github/workflows/docker.yml         | 2 +-
 .github/workflows/linux.yml          | 4 ++--
 .github/workflows/mac.yml            | 8 ++++----
 .github/workflows/mac_packaged.yml   | 6 +++---
 .github/workflows/master_updater.yml | 2 +-
 .github/workflows/snap.yml           | 4 ++--
 .github/workflows/win.yml            | 6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e70226345..bf2008732 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0d772b8d7..e8d8f5901 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -58,7 +58,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
@@ -116,7 +116,7 @@ jobs:
           cd $REPO_NAME/out/Debug
           sudo mkdir artifact
           sudo mv {Telegram,Updater} artifact/
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 0bd06cb1f..8a83d62dd 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -56,7 +56,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
@@ -76,7 +76,7 @@ jobs:
 
       - name: ThirdParty cache.
         id: cache-third-party
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: ThirdParty
           key: ${{ runner.OS }}-third-party-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
@@ -84,7 +84,7 @@ jobs:
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: Libraries
           key: ${{ runner.OS }}-libs-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
@@ -134,7 +134,7 @@ jobs:
           mkdir artifact
           mv Telegram.app artifact/
           mv Updater artifact/
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index 7f0daf22d..9b40c249e 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -60,7 +60,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
@@ -99,7 +99,7 @@ jobs:
 
       - name: WebRTC cache.
         id: cache-webrtc
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: ${{ env.LibrariesPath }}/tg_owt
           key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_owt-version.json') }}
@@ -153,7 +153,7 @@ jobs:
           cd $REPO_NAME/build
           mkdir artifact
           mv Telegram.dmg artifact/
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/master_updater.yml b/.github/workflows/master_updater.yml
index a4e50c124..c59f62e29 100644
--- a/.github/workflows/master_updater.yml
+++ b/.github/workflows/master_updater.yml
@@ -11,7 +11,7 @@ jobs:
       SKIP: "0"
       to_branch: "master"
     steps:
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
         if: env.SKIP == '0'
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index ae4371f0d..3d01478e6 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -75,7 +75,7 @@ jobs:
           mkdir artifact
           mv $artifact_name artifact
 
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 222366c6c..1200e1de0 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -75,7 +75,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
@@ -96,7 +96,7 @@ jobs:
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: ${{ env.TBUILD }}\Libraries
           key: ${{ runner.OS }}-${{ matrix.arch }}-libs-${{ env.CACHE_KEY }}
@@ -183,7 +183,7 @@ jobs:
           mkdir artifact
           move %OUT%\Telegram.exe artifact/
           move %OUT%\Updater.exe artifact/
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         name: Upload artifact.
         if: (env.UPLOAD_ARTIFACT == 'true') || (github.ref == 'refs/heads/nightly')
         with:

From d28b9f10b469ebee69b76dfbb1b24a59e089ef41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 13:06:59 +0000
Subject: [PATCH 495/596] Bump jlumbroso/free-disk-space from 1.3.0 to 1.3.1

Bumps [jlumbroso/free-disk-space](https://github.com/jlumbroso/free-disk-space) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/jlumbroso/free-disk-space/releases)
- [Commits](https://github.com/jlumbroso/free-disk-space/compare/f68fdb76e2ea636224182cfb7377ff9a1708f9b8...54081f138730dfa15788a46383842cd2f914a1be)

---
updated-dependencies:
- dependency-name: jlumbroso/free-disk-space
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docker.yml | 2 +-
 .github/workflows/snap.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bf2008732..ac40f3a33 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -31,7 +31,7 @@ jobs:
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
       - name: Free up some disk space.
-        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
 
       - name: Docker image build.
         run: |
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 3d01478e6..c2ee6773a 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -61,7 +61,7 @@ jobs:
           sudo snap run lxd waitready
 
       - name: Free up some disk space.
-        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
 
       - name: Telegram Desktop snap build.
         run: sg lxd -c 'snap run snapcraft --verbosity=debug'

From 3358673ba423b539611be2fbf9ff23de680afeaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Fri, 10 May 2024 18:05:08 +0200
Subject: [PATCH 496/596] Add compatibility with FFMPEG 7.0

avio: Constify data pointees of write callbacks

avutil: remove deprecated FF_API_PKT_DURATION

Ref: https://github.com/FFmpeg/FFmpeg/commit/2a68d945cd74265bb71c3d38b7a2e7f7d7e87be5
     https://github.com/FFmpeg/FFmpeg/commit/02aea61d69d8f81bc285e2131bf25f96a3e27feb
     https://github.com/FFmpeg/FFmpeg/commit/b8fef7e9c520b3923b32813b6a82c154c74402dc
---
 .../ffmpeg/ffmpeg_frame_generator.cpp          |  4 ++++
 Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp |  8 ++++++++
 Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h   | 18 ++++++++++++++++--
 .../media/audio/media_audio_capture.cpp        |  4 ++++
 .../media/clip/media_clip_ffmpeg.cpp           |  4 ++++
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
index 116d998a2..de478b784 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
@@ -291,7 +291,11 @@ void FrameGenerator::Impl::jumpToStart() {
 
 void FrameGenerator::Impl::resolveNextFrameTiming() {
 	const auto base = _format->streams[_streamId]->time_base;
+#if DA_FFMPEG_HAVE_DURATION
+	const auto duration = _next.frame->duration;
+#else
 	const auto duration = _next.frame->pkt_duration;
+#endif
 	const auto framePts = _next.frame->pts;
 	auto framePosition = (framePts * 1000LL * base.num) / base.den;
 	_currentFrameDelay = _nextFrameDelay;
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
index 2a42d0034..0f7083df3 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -230,7 +230,11 @@ enum AVPixelFormat GetFormatImplementation(
 IOPointer MakeIOPointer(
 		void *opaque,
 		int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+		int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
 		int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
 		int64_t(*seek)(void *opaque, int64_t offset, int whence)) {
 	auto buffer = reinterpret_cast<uchar*>(av_malloc(kAvioBlockSize));
 	if (!buffer) {
@@ -263,7 +267,11 @@ void IODeleter::operator()(AVIOContext *value) {
 FormatPointer MakeFormatPointer(
 		void *opaque,
 		int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+		int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
 		int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
 		int64_t(*seek)(void *opaque, int64_t offset, int whence)) {
 	auto io = MakeIOPointer(opaque, read, write, seek);
 	if (!io) {
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
index bc9c8764b..d96daa9c7 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
@@ -22,8 +22,14 @@ extern "C" {
 #include <libavutil/version.h>
 } // extern "C"
 
-#define DA_FFMPEG_NEW_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR > 57 \
-	|| (LIBAVUTIL_VERSION_MAJOR == 57 && LIBAVUTIL_VERSION_MINOR >= 28))
+#define DA_FFMPEG_NEW_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_INT >= \
+	AV_VERSION_INT(57, 28, 100))
+
+#define DA_FFMPEG_CONST_WRITE_CALLBACK (LIBAVFORMAT_VERSION_INT >= \
+	AV_VERSION_INT(61, 01, 100))
+
+#define DA_FFMPEG_HAVE_DURATION (LIBAVUTIL_VERSION_INT >= \
+	AV_VERSION_INT(58, 02, 100))
 
 class QImage;
 
@@ -112,7 +118,11 @@ using IOPointer = std::unique_ptr<AVIOContext, IODeleter>;
 [[nodiscard]] IOPointer MakeIOPointer(
 	void *opaque,
 	int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+	int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
 	int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
 	int64_t(*seek)(void *opaque, int64_t offset, int whence));
 
 struct FormatDeleter {
@@ -122,7 +132,11 @@ using FormatPointer = std::unique_ptr<AVFormatContext, FormatDeleter>;
 [[nodiscard]] FormatPointer MakeFormatPointer(
 	void *opaque,
 	int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+	int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
 	int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
 	int64_t(*seek)(void *opaque, int64_t offset, int whence));
 
 struct CodecDeleter {
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index b9151db2a..1bbf9b10c 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -249,7 +249,11 @@ struct Instance::Inner::Private {
 		return nbytes;
 	}
 
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+	static int WriteData(void *opaque, const uint8_t *buf, int buf_size) {
+#else
 	static int WriteData(void *opaque, uint8_t *buf, int buf_size) {
+#endif
 		auto l = reinterpret_cast<Private*>(opaque);
 
 		if (buf_size <= 0) return 0;
diff --git a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
index 9f1c7b234..1188f0232 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
@@ -144,7 +144,11 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
 }
 
 void FFMpegReaderImplementation::processReadFrame() {
+#if DA_FFMPEG_HAVE_DURATION
+	int64 duration = _frame->duration;
+#else
 	int64 duration = _frame->pkt_duration;
+#endif
 	int64 framePts = _frame->pts;
 	crl::time frameMs = (framePts * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
 	_currentFrameDelay = _nextFrameDelay;

From 923e3ee8080b3d91a0aa643408127c95aa2375e9 Mon Sep 17 00:00:00 2001
From: GoodDok <konstantingudkov@gmail.com>
Date: Sat, 4 May 2024 02:56:13 +0300
Subject: [PATCH 497/596] Fix 25202: surrounding $PWD with double quotes

Added double quotes to work correctly with spaces in current directory's name
---
 docs/building-linux.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building-linux.md b/docs/building-linux.md
index 393bd854a..e8a0b050b 100644
--- a/docs/building-linux.md
+++ b/docs/building-linux.md
@@ -20,7 +20,7 @@ Install [poetry](https://python-poetry.org), go to ***BuildPath*** and run
 Go to ***BuildPath*/tdesktop** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
 
     docker run --rm -it \
-        -v $PWD:/usr/src/tdesktop \
+        -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 \
@@ -29,7 +29,7 @@ Go to ***BuildPath*/tdesktop** and run (using [your **api_id** and **api_hash**]
 Or, to create a debug build, run (also using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
 
     docker run --rm -it \
-        -v $PWD:/usr/src/tdesktop \
+        -v "$PWD:/usr/src/tdesktop" \
         -e CONFIG=Debug \
         tdesktop:centos_env \
         /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \

From 334fd4e951029ae15caeae917d5a4c382793a472 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 7 May 2024 17:47:52 +0300
Subject: [PATCH 498/596] Added ability to edit media with spoiled one without
 resending.

---
 Telegram/CMakeLists.txt                       |  2 +
 Telegram/SourceFiles/api/api_editing.cpp      | 39 ++++++++-
 Telegram/SourceFiles/api/api_editing.h        |  3 +-
 .../SourceFiles/history/history_widget.cpp    | 23 ++++-
 Telegram/SourceFiles/history/history_widget.h |  3 +
 .../view/controls/compose_controls_common.h   |  1 +
 .../history_view_compose_controls.cpp         | 67 ++++++++++++++-
 .../controls/history_view_compose_controls.h  | 11 +++
 ...istory_view_compose_media_edit_manager.cpp | 83 +++++++++++++++++++
 .../history_view_compose_media_edit_manager.h | 39 +++++++++
 .../view/history_view_replies_section.cpp     |  9 +-
 .../view/history_view_replies_section.h       |  3 +-
 .../view/history_view_scheduled_section.cpp   |  9 +-
 .../view/history_view_scheduled_section.h     |  3 +-
 .../business/settings_shortcut_messages.cpp   | 12 ++-
 15 files changed, 285 insertions(+), 22 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
 create mode 100644 Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2f42270ee..88d42a190 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -688,6 +688,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_compose_media_edit_manager.cpp
+    history/view/controls/history_view_compose_media_edit_manager.h
     history/view/controls/history_view_compose_search.cpp
     history/view/controls/history_view_compose_search.h
     history/view/controls/history_view_draft_options.cpp
diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index f91a73579..5705d267e 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -252,12 +252,47 @@ mtpRequestId EditTextMessage(
 		Data::WebPageDraft webpage,
 		SendOptions options,
 		Fn<void(mtpRequestId requestId)> done,
-		Fn<void(const QString &, mtpRequestId requestId)> fail) {
+		Fn<void(const QString &error, mtpRequestId requestId)> fail,
+		std::optional<bool> spoilerMediaOverride) {
 	const auto callback = [=](Fn<void()> applyUpdates, mtpRequestId id) {
 		applyUpdates();
 		done(id);
 	};
-	return EditMessage(item, caption, webpage, options, callback, fail);
+	auto inputMedia = std::optional<MTPInputMedia>();
+	if (spoilerMediaOverride) {
+		const auto spoiler = *spoilerMediaOverride;
+		if (const auto media = item->media()) {
+			if (const auto photo = media->photo()) {
+				using Flag = MTPDinputMediaPhoto::Flag;
+				const auto flags = Flag()
+					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
+					| (spoiler ? Flag::f_spoiler : Flag());
+				inputMedia = MTP_inputMediaPhoto(
+					MTP_flags(flags),
+					photo->mtpInput(),
+					MTP_int(media->ttlSeconds()));
+			} else if (const auto document = media->document()) {
+				using Flag = MTPDinputMediaDocument::Flag;
+				const auto flags = Flag()
+					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
+					| (spoiler ? Flag::f_spoiler : Flag());
+				inputMedia = MTP_inputMediaDocument(
+					MTP_flags(flags),
+					document->mtpInput(),
+					MTP_int(media->ttlSeconds()),
+					MTPstring()); // query
+			}
+		}
+	}
+
+	return EditMessage(
+		item,
+		caption,
+		webpage,
+		options,
+		callback,
+		fail,
+		inputMedia);
 }
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_editing.h b/Telegram/SourceFiles/api/api_editing.h
index 86f106f45..c8d0f6c50 100644
--- a/Telegram/SourceFiles/api/api_editing.h
+++ b/Telegram/SourceFiles/api/api_editing.h
@@ -55,6 +55,7 @@ mtpRequestId EditTextMessage(
 	Data::WebPageDraft webpage,
 	SendOptions options,
 	Fn<void(mtpRequestId requestId)> done,
-	Fn<void(const QString &error, mtpRequestId requestId)> fail);
+	Fn<void(const QString &error, mtpRequestId requestId)> fail,
+	std::optional<bool> spoilerMediaOverride);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index fdd4935a0..5e8da7f99 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2656,6 +2656,7 @@ void HistoryWidget::setEditMsgId(MsgId msgId) {
 	unregisterDraftSources();
 	_editMsgId = msgId;
 	if (!msgId) {
+		_mediaEditSpoiler.setSpoilerOverride(std::nullopt);
 		_canReplaceMedia = false;
 		if (_preview) {
 			_preview->setDisabled(false);
@@ -4043,7 +4044,8 @@ void HistoryWidget::saveEditMsg() {
 		webPageDraft,
 		options,
 		done,
-		fail);
+		fail,
+		_mediaEditSpoiler.spoilerOverride());
 }
 
 void HistoryWidget::hideChildWidgets() {
@@ -6562,7 +6564,14 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 		return;
 	}
 	const auto isReadyToForward = readyToForward();
-	if (_inPhotoEdit && _photoEditMedia) {
+	if (_editMsgId
+		&& (_inDetails || _inPhotoEdit)
+		&& (e->button() == Qt::RightButton)) {
+		_mediaEditSpoiler.showMenu(
+			_list,
+			session().data().message(_history->peer, _editMsgId),
+			[=](bool) { mouseMoveEvent(nullptr); });
+	} else if (_inPhotoEdit && _photoEditMedia) {
 		EditCaptionBox::StartPhotoEdit(
 			controller(),
 			_photoEditMedia,
@@ -8235,8 +8244,14 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 		? drawMsgText->media()
 		: nullptr;
 	const auto hasPreview = media && media->hasReplyPreview();
-	const auto preview = hasPreview ? media->replyPreview() : nullptr;
-	const auto spoilered = preview && media->hasSpoiler();
+	const auto preview = _mediaEditSpoiler.spoilerOverride()
+		? _mediaEditSpoiler.mediaPreview(drawMsgText)
+		: hasPreview
+		? media->replyPreview()
+		: nullptr;
+	const auto spoilered = _mediaEditSpoiler.spoilerOverride()
+		? (*_mediaEditSpoiler.spoilerOverride())
+		: (preview && media->hasSpoiler());
 	if (!spoilered) {
 		_replySpoiler = nullptr;
 	} else if (!_replySpoiler) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index b4d8bb49c..b731507b2 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "history/view/controls/history_view_compose_media_edit_manager.h"
 #include "history/view/history_view_corner_buttons.h"
 #include "history/history_drag_area.h"
 #include "history/history_view_highlight_manager.h"
@@ -103,6 +104,7 @@ class ForwardPanel;
 class TTLButton;
 class WebpageProcessor;
 class CharactersLimitLabel;
+class PhotoEditSpoilerManager;
 } // namespace HistoryView::Controls
 
 class BotKeyboard;
@@ -660,6 +662,7 @@ private:
 	MsgId _editMsgId = 0;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
 	bool _canReplaceMedia = false;
+	HistoryView::MediaEditSpoilerManager _mediaEditSpoiler;
 
 	HistoryItem *_replyEditMsg = nullptr;
 	Ui::Text::String _replyEditMsgText;
diff --git a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
index e707523ec..01237072b 100644
--- a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
+++ b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
@@ -21,6 +21,7 @@ struct MessageToEdit {
 	FullMsgId fullId;
 	Api::SendOptions options;
 	TextWithTags textWithTags;
+	std::optional<bool> spoilerMediaOverride;
 };
 struct VoiceToSend {
 	QByteArray bytes;
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 dff29122c..9154d846e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -50,6 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/controls/history_view_characters_limit.h"
+#include "history/view/controls/history_view_compose_media_edit_manager.h"
 #include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/controls/history_view_draft_options.h"
 #include "history/view/controls/history_view_voice_record_bar.h"
@@ -72,6 +73,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/ui_utility.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/text/format_values.h"
 #include "ui/controls/emoji_button.h"
 #include "ui/controls/send_button.h"
@@ -84,6 +86,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
 
 namespace HistoryView {
 namespace {
@@ -210,6 +213,8 @@ private:
 	bool _repaintScheduled : 1 = false;
 	bool _inClickable : 1 = false;
 
+	HistoryView::MediaEditSpoilerManager _mediaEditSpoiler;
+
 	const not_null<Data::Session*> _data;
 	const not_null<Ui::IconButton*> _cancel;
 
@@ -398,7 +403,12 @@ void FieldHeader::init() {
 					_editOptionsRequests.fire({});
 				}
 			} else if (!isLeftButton) {
-				if (const auto reply = replyingToMessage()) {
+				if (inPreviewRect && isEditingMessage()) {
+					_mediaEditSpoiler.showMenu(
+						this,
+						_data->message(_editMsgId.current()),
+						[=](bool) { update(); });
+				} else if (const auto reply = replyingToMessage()) {
 					_jumpToItemRequests.fire_copy(reply);
 				}
 			}
@@ -572,10 +582,14 @@ void FieldHeader::paintEditOrReplyToMessage(Painter &p) {
 
 	const auto media = _shownMessage->media();
 	_shownMessageHasPreview = media && media->hasReplyPreview();
-	const auto preview = _shownMessageHasPreview
+	const auto preview = _mediaEditSpoiler.spoilerOverride()
+		? _mediaEditSpoiler.mediaPreview(_shownMessage)
+		: _shownMessageHasPreview
 		? media->replyPreview()
 		: nullptr;
-	const auto spoilered = preview && media->hasSpoiler();
+	const auto spoilered = _mediaEditSpoiler.spoilerOverride()
+		? (*_mediaEditSpoiler.spoilerOverride())
+		: (preview && media->hasSpoiler());
 	if (!spoilered) {
 		_shownPreviewSpoiler = nullptr;
 	} else if (!_shownPreviewSpoiler) {
@@ -720,6 +734,7 @@ void FieldHeader::editMessage(FullMsgId id, bool photoEditAllowed) {
 	_photoEditAllowed = photoEditAllowed;
 	_editMsgId = id;
 	if (!photoEditAllowed) {
+		_mediaEditSpoiler.setSpoilerOverride(std::nullopt);
 		_inPhotoEdit = false;
 		_inPhotoEditOver.stop();
 	}
@@ -767,6 +782,7 @@ MessageToEdit FieldHeader::queryToEdit() {
 			.scheduled = item->isScheduled() ? item->date() : 0,
 			.shortcutId = item->shortcutId(),
 		},
+		.spoilerMediaOverride = _mediaEditSpoiler.spoilerOverride(),
 	};
 }
 
@@ -3440,4 +3456,49 @@ rpl::producer<bool> SendDisabledBySlowmode(not_null<PeerData*> peer) {
 			_1 && _2);
 }
 
+void ShowPhotoEditSpoilerMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<HistoryItem*> item,
+		const std::optional<bool> &override,
+		Fn<void(bool)> callback) {
+	const auto media = item->media();
+	const auto hasPreview = media && media->hasReplyPreview();
+	const auto preview = hasPreview ? media->replyPreview() : nullptr;
+	if (!preview) {
+		return;
+	}
+	const auto spoilered = override
+		? (*override)
+		: (preview && media->hasSpoiler());
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	menu->addAction(
+		spoilered
+			? tr::lng_context_disable_spoiler(tr::now)
+			: tr::lng_context_spoiler_effect(tr::now),
+		[=] { callback(!spoilered); },
+		spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler);
+	menu->popup(QCursor::pos());
+}
+
+Image *MediaPreviewWithOverriddenSpoiler(
+		not_null<HistoryItem*> item,
+		bool spoiler) {
+	if (const auto media = item->media()) {
+		if (const auto photo = media->photo()) {
+			return photo->getReplyPreview(
+				item->fullId(),
+				item->history()->peer,
+				spoiler);
+		} else if (const auto document = media->document()) {
+			return document->getReplyPreview(
+				item->fullId(),
+				item->history()->peer,
+				spoiler);
+		}
+	}
+	return nullptr;
+}
+
 } // 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 b24e0213a..f6c915968 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class History;
 class DocumentData;
 class FieldAutocomplete;
+class Image;
 
 namespace style {
 struct ComposeControls;
@@ -451,4 +452,14 @@ private:
 [[nodiscard]] rpl::producer<bool> SendDisabledBySlowmode(
 	not_null<PeerData*> peer);
 
+void ShowPhotoEditSpoilerMenu(
+	not_null<Ui::RpWidget*> parent,
+	not_null<HistoryItem*> item,
+	const std::optional<bool> &override,
+	Fn<void(bool)> callback);
+
+[[nodiscard]] Image *MediaPreviewWithOverriddenSpoiler(
+	not_null<HistoryItem*> item,
+	bool spoiler);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
new file mode 100644
index 000000000..940ff7ff2
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
@@ -0,0 +1,83 @@
+/*
+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_compose_media_edit_manager.h"
+
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "ui/widgets/popup_menu.h"
+#include "styles/style_menu_icons.h"
+
+namespace HistoryView {
+
+MediaEditSpoilerManager::MediaEditSpoilerManager() = default;
+
+void MediaEditSpoilerManager::showMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<HistoryItem*> item,
+		Fn<void(bool)> callback) {
+	const auto media = item->media();
+	const auto hasPreview = media && media->hasReplyPreview();
+	const auto preview = hasPreview ? media->replyPreview() : nullptr;
+	if (!preview) {
+		return;
+	}
+	const auto spoilered = _spoilerOverride
+		? (*_spoilerOverride)
+		: (preview && media->hasSpoiler());
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	menu->addAction(
+		spoilered
+			? tr::lng_context_disable_spoiler(tr::now)
+			: tr::lng_context_spoiler_effect(tr::now),
+		[=] {
+			_spoilerOverride = (!spoilered);
+			if (callback) {
+				callback(!spoilered);
+			}
+		},
+		spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler);
+	menu->popup(QCursor::pos());
+}
+
+[[nodiscard]] Image *MediaEditSpoilerManager::mediaPreview(
+		not_null<HistoryItem*> item) {
+	if (!_spoilerOverride) {
+		return nullptr;
+	}
+	if (const auto media = item->media()) {
+		if (const auto photo = media->photo()) {
+			return photo->getReplyPreview(
+				item->fullId(),
+				item->history()->peer,
+				*_spoilerOverride);
+		} else if (const auto document = media->document()) {
+			return document->getReplyPreview(
+				item->fullId(),
+				item->history()->peer,
+				*_spoilerOverride);
+		}
+	}
+	return nullptr;
+}
+
+void MediaEditSpoilerManager::setSpoilerOverride(
+		std::optional<bool> spoilerOverride) {
+	_spoilerOverride = spoilerOverride;
+}
+
+std::optional<bool> MediaEditSpoilerManager::spoilerOverride() const {
+	return _spoilerOverride;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
new file mode 100644
index 000000000..8bc34b7c4
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
@@ -0,0 +1,39 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+class Image;
+class HistoryItem;
+
+namespace HistoryView {
+
+class MediaEditSpoilerManager final {
+public:
+	MediaEditSpoilerManager();
+
+	void showMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<HistoryItem*> item,
+		Fn<void(bool)> callback);
+
+	[[nodiscard]] Image *mediaPreview(not_null<HistoryItem*> item);
+
+	void setSpoilerOverride(std::optional<bool> spoilerOverride);
+
+	std::optional<bool> spoilerOverride() const;
+
+private:
+	std::optional<bool> _spoilerOverride;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index afd77d665..1974cce2b 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -736,7 +736,8 @@ void RepliesWidget::setupComposeControls() {
 	_composeControls->editRequests(
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
-			edit(item, data.options, saveEditMsgRequestId);
+			const auto spoiler = data.spoilerMediaOverride;
+			edit(item, data.options, saveEditMsgRequestId, spoiler);
 		}
 	}, lifetime());
 
@@ -1207,7 +1208,8 @@ void RepliesWidget::send(Api::SendOptions options) {
 void RepliesWidget::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId) {
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride) {
 	if (*saveEditMsgRequestId) {
 		return;
 	}
@@ -1275,7 +1277,8 @@ void RepliesWidget::edit(
 		webpage,
 		options,
 		crl::guard(this, done),
-		crl::guard(this, fail));
+		crl::guard(this, fail),
+		spoilerMediaOverride);
 
 	_composeControls->hidePanelsAnimated();
 	doSetInnerFocus();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 3da1c44f0..33b7859b4 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -246,7 +246,8 @@ private:
 	void edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId);
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
 	[[nodiscard]] SendMenu::Type sendMenuType() const;
 	[[nodiscard]] FullReplyTo replyTo() const;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 667347423..887d16e09 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -318,7 +318,8 @@ void ScheduledWidget::setupComposeControls() {
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
 			if (item->isScheduled()) {
-				edit(item, data.options, saveEditMsgRequestId);
+				const auto spoiler = data.spoilerMediaOverride;
+				edit(item, data.options, saveEditMsgRequestId, spoiler);
 			}
 		}
 	}, lifetime());
@@ -726,7 +727,8 @@ void ScheduledWidget::sendVoice(
 void ScheduledWidget::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId) {
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride) {
 	if (*saveEditMsgRequestId) {
 		return;
 	}
@@ -794,7 +796,8 @@ void ScheduledWidget::edit(
 		webpage,
 		options,
 		crl::guard(this, done),
-		crl::guard(this, fail));
+		crl::guard(this, fail),
+		spoilerMediaOverride);
 
 	_composeControls->hidePanelsAnimated();
 	_composeControls->focus();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 43702688f..6685c113a 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -213,7 +213,8 @@ private:
 	void edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId);
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride);
 	void highlightSingleNewMessage(const Data::MessagesSlice &slice);
 	void chooseAttach();
 	[[nodiscard]] SendMenu::Type sendMenuType() const;
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index efeffaac9..ca82da329 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -238,7 +238,8 @@ private:
 	void edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId);
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
 	[[nodiscard]] SendMenu::Type sendMenuType() const;
 	[[nodiscard]] FullReplyTo replyTo() const;
@@ -673,7 +674,8 @@ void ShortcutMessages::setupComposeControls() {
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = _session->data().message(data.fullId)) {
 			if (item->isBusinessShortcut()) {
-				edit(item, data.options, saveEditMsgRequestId);
+				const auto spoiler = data.spoilerMediaOverride;
+				edit(item, data.options, saveEditMsgRequestId, spoiler);
 			}
 		}
 	}, lifetime());
@@ -1213,7 +1215,8 @@ void ShortcutMessages::send(Api::SendOptions options) {
 void ShortcutMessages::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId) {
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride) {
 	if (*saveEditMsgRequestId) {
 		return;
 	}
@@ -1281,7 +1284,8 @@ void ShortcutMessages::edit(
 		webpage,
 		options,
 		crl::guard(this, done),
-		crl::guard(this, fail));
+		crl::guard(this, fail),
+		spoilerMediaOverride);
 
 	_composeControls->hidePanelsAnimated();
 	doSetInnerFocus();

From 7a95b38d3c9239b4ad4cb1ff4a5adc880ef318be Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 13 May 2024 22:05:09 +0300
Subject: [PATCH 499/596] Fixed refreshing of file reference in api media
 spoiler editing module.

---
 Telegram/SourceFiles/api/api_editing.cpp | 84 +++++++++++++++++++-----
 1 file changed, 69 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index 5705d267e..7dcd768cb 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/scheduled_messages.h"
+#include "data/data_file_origin.h"
 #include "data/data_histories.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
@@ -254,37 +255,90 @@ mtpRequestId EditTextMessage(
 		Fn<void(mtpRequestId requestId)> done,
 		Fn<void(const QString &error, mtpRequestId requestId)> fail,
 		std::optional<bool> spoilerMediaOverride) {
-	const auto callback = [=](Fn<void()> applyUpdates, mtpRequestId id) {
-		applyUpdates();
-		done(id);
-	};
-	auto inputMedia = std::optional<MTPInputMedia>();
 	if (spoilerMediaOverride) {
 		const auto spoiler = *spoilerMediaOverride;
 		if (const auto media = item->media()) {
+			auto takeInputMedia = Fn<std::optional<MTPInputMedia>()>(nullptr);
+			auto takeFileReference = Fn<QByteArray()>(nullptr);
 			if (const auto photo = media->photo()) {
 				using Flag = MTPDinputMediaPhoto::Flag;
 				const auto flags = Flag()
 					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
 					| (spoiler ? Flag::f_spoiler : Flag());
-				inputMedia = MTP_inputMediaPhoto(
-					MTP_flags(flags),
-					photo->mtpInput(),
-					MTP_int(media->ttlSeconds()));
+				takeInputMedia = [=] {
+					return MTP_inputMediaPhoto(
+						MTP_flags(flags),
+						photo->mtpInput(),
+						MTP_int(media->ttlSeconds()));
+				};
+				takeFileReference = [=] { return photo->fileReference(); };
 			} else if (const auto document = media->document()) {
 				using Flag = MTPDinputMediaDocument::Flag;
 				const auto flags = Flag()
 					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
 					| (spoiler ? Flag::f_spoiler : Flag());
-				inputMedia = MTP_inputMediaDocument(
-					MTP_flags(flags),
-					document->mtpInput(),
-					MTP_int(media->ttlSeconds()),
-					MTPstring()); // query
+				takeInputMedia = [=] {
+					return MTP_inputMediaDocument(
+						MTP_flags(flags),
+						document->mtpInput(),
+						MTP_int(media->ttlSeconds()),
+						MTPstring()); // query
+				};
+				takeFileReference = [=] { return document->fileReference(); };
 			}
+
+			const auto usedFileReference = takeFileReference
+				? takeFileReference()
+				: QByteArray();
+			const auto origin = item->fullId();
+			const auto api = &item->history()->session().api();
+			const auto performRequest = [=](
+					const auto &repeatRequest,
+					mtpRequestId originalRequestId) -> mtpRequestId {
+				const auto handleReference = [=](
+						const QString &error,
+						mtpRequestId requestId) {
+					if (error.startsWith(u"FILE_REFERENCE_"_q)) {
+						api->refreshFileReference(origin, [=](const auto &) {
+							if (takeFileReference &&
+								(takeFileReference() != usedFileReference)) {
+								repeatRequest(
+									repeatRequest,
+									originalRequestId
+										? originalRequestId
+										: requestId);
+							} else {
+								fail(error, requestId);
+							}
+						});
+					} else {
+						fail(error, requestId);
+					}
+				};
+				const auto callback = [=](
+						Fn<void()> applyUpdates,
+						mtpRequestId requestId) {
+					applyUpdates();
+					done(originalRequestId ? originalRequestId : requestId);
+				};
+				const auto requestId = EditMessage(
+					item,
+					caption,
+					webpage,
+					options,
+					callback,
+					handleReference,
+					takeInputMedia ? takeInputMedia() : std::nullopt);
+				return originalRequestId ? originalRequestId : requestId;
+			};
+			return performRequest(performRequest, 0);
 		}
 	}
 
+	const auto callback = [=](Fn<void()> applyUpdates, mtpRequestId id) {
+		applyUpdates();
+		done(id);
+	};
 	return EditMessage(
 		item,
 		caption,
@@ -292,7 +346,7 @@ mtpRequestId EditTextMessage(
 		options,
 		callback,
 		fail,
-		inputMedia);
+		std::nullopt);
 }
 
 } // namespace Api

From bc11c667770471b83d4f1d27027b1995816e3f3f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 00:44:52 +0300
Subject: [PATCH 500/596] Added ability to hide single sponsored message to
 premium users.

---
 .../data/components/sponsored_messages.cpp    | 25 +++++++++++++------
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 12 ++++++---
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 4cb54fc7e..c20ec967e 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -443,6 +443,22 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 			return;
 		}
 
+		const auto erase = [=] {
+			const auto it = _data.find(history);
+			if (it != end(_data)) {
+				auto &list = it->second.entries;
+				const auto proj = [&](const Entry &e) {
+					return e.itemFullId == fullId;
+				};
+				list.erase(ranges::remove_if(list, proj), end(list));
+			}
+		};
+
+		if (optionId == Result::Id("-1")) {
+			erase();
+			return;
+		}
+
 		state->requestId = _session->api().request(
 			MTPchannels_ReportSponsoredMessage(
 				channel->inputChannel,
@@ -469,14 +485,7 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 			}, [](const TLAdsHidden &data) -> Result {
 				return { .result = Result::FinalStep::Hidden };
 			}, [&](const TLReported &data) -> Result {
-				const auto it = _data.find(history);
-				if (it != end(_data)) {
-					auto &list = it->second.entries;
-					const auto proj = [&](const Entry &e) {
-						return e.itemFullId == fullId;
-					};
-					list.erase(ranges::remove_if(list, proj), end(list));
-				}
+				erase();
 				if (optionId == Result::Id("1")) { // I don't like it.
 					return { .result = Result::FinalStep::Silence };
 				}
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index e917c3f07..f836106d0 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -332,9 +332,7 @@ void ShowSponsored(
 		not_null<HistoryItem*> item) {
 	Expects(item->isSponsored());
 
-	struct State final {
-	};
-	const auto state = std::make_shared<State>();
+	const auto session = &item->history()->session();
 
 	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
 		parent.get(),
@@ -351,7 +349,13 @@ void ShowSponsored(
 	menu->addSeparator(&st::expandedMenuSeparator);
 
 	menu->addAction(tr::lng_sponsored_hide_ads(tr::now), [=] {
-		ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
+		if (session->premium()) {
+			using Result = Data::SponsoredReportResult;
+			session->sponsoredMessages().createReportCallback(
+				item->fullId())(Result::Id("-1"), [](const auto &) {});
+		} else {
+			ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
+		}
 	}, &st::menuIconCancel);
 
 	menu->popup(QCursor::pos());

From 3e7d4af4a03cf2987b94376159d1c43e08854276 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 01:01:01 +0300
Subject: [PATCH 501/596] Fixed reply bubble width for short quotes.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_reply.cpp b/Telegram/SourceFiles/history/view/history_view_reply.cpp
index 1b9df5db6..d2043b027 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_reply.cpp
@@ -583,7 +583,7 @@ QSize Reply::countMultilineOptimalSize(
 		textGeometry(max, previewSkip, &elided));
 	_minHeightExpandable = elided ? 1 : 0;
 	return {
-		result.width,
+		result.width + st::historyReplyPadding.right(),
 		std::max(result.height, st::normalFont->height),
 	};
 }

From 2afb69e7878cb71085748a755aeab0415068746c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 01:28:46 +0300
Subject: [PATCH 502/596] Fixed text state of reply bubble for messages with
 unwrapped media.

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

diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
index b0dba7ecb..4c9e3277c 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -441,7 +441,7 @@ TextState UnwrappedMedia::textState(QPoint point, StateRequest request) const {
 			}
 			if (recth) {
 				int rectx = _additionalOnTop
-					? (rightAligned ? (inner.width() + st::msgReplyPadding.left() - rectw) : 0)
+					? (rightAligned ? (inner.x() + inner.width() - rectw) : 0)
 					: (rightAligned ? 0 : (inner.width() + st::msgReplyPadding.left()));
 				int recty = surrounding.height - recth;
 				if (rtl()) rectx = width() - rectx - rectw;

From 41e414af37fe09e35686c57a205cb144fc9631e6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 02:52:18 +0300
Subject: [PATCH 503/596] Removed transcribe buttons from scheduled messages.

---
 .../SourceFiles/history/view/media/history_view_document.cpp     | 1 +
 Telegram/SourceFiles/history/view/media/history_view_gif.cpp     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index b7714d579..bb64302c7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -440,6 +440,7 @@ QSize Document::countOptimalSize() {
 		const auto session = &history->session();
 		const auto transcribes = &session->api().transcribes();
 		if (_parent->data()->media()->ttlSeconds()
+			|| _realParent->isScheduled()
 			|| (!session->premium()
 				&& !transcribes->freeFor(_realParent)
 				&& !transcribes->trialsSupport())) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index bda09fe8d..2097ca1b5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -2063,6 +2063,7 @@ bool Gif::needCornerStatusDisplay() const {
 void Gif::ensureTranscribeButton() const {
 	if (_data->isVideoMessage()
 		&& !_parent->data()->media()->ttlSeconds()
+		&& !_parent->data()->isScheduled()
 		&& (_data->session().premium()
 			|| _data->session().api().transcribes().trialsSupport())) {
 		if (!_transcribe) {

From c1c49e8ddccd85b6a67162d7d61c515eaf3ca5f8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 03:45:49 +0300
Subject: [PATCH 504/596] Added captions to voice messages in overview layout.

---
 .../SourceFiles/overview/overview_layout.cpp  | 26 +++++++++++++++++++
 .../SourceFiles/overview/overview_layout.h    |  4 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index e75af1464..6bbacb1d8 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "overview/overview_layout.h"
 
 #include "overview/overview_layout_delegate.h"
+#include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_document.h"
 #include "data/data_document_resolver.h"
 #include "data/data_session.h"
@@ -867,6 +868,7 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			p.drawTextLeft(nameleft, statustop, _width, _status.text(), statusw);
 			unreadx += statusw;
 		}
+		auto captionLeft = unreadx + st::mediaUnreadSkip;
 		if (parent()->hasUnreadMediaFlag() && unreadx + st::mediaUnreadSkip + st::mediaUnreadSize <= _width) {
 			p.setPen(Qt::NoPen);
 			p.setBrush(selected ? st::msgFileInBgSelected : st::msgFileInBg);
@@ -875,6 +877,22 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 				PainterHighQualityEnabler hq(p);
 				p.drawEllipse(style::rtlrect(unreadx + st::mediaUnreadSkip, statustop + st::mediaUnreadTop, st::mediaUnreadSize, st::mediaUnreadSize, _width));
 			}
+			captionLeft += st::mediaUnreadSkip + st::mediaUnreadSize;
+		}
+		if (!_caption.isEmpty()) {
+			p.setPen(st::historyFileNameInFg);
+			const auto w = _width - captionLeft - st::defaultScrollArea.width;
+			_caption.draw(p, Ui::Text::PaintContext{
+				.position = QPoint(captionLeft, statustop),
+				.availableWidth = w,
+				.spoiler = Ui::Text::DefaultSpoilerCache(),
+				.paused = context
+					? context->paused
+					: On(PowerSaving::kEmojiChat),
+				.pausedEmoji = On(PowerSaving::kEmojiChat),
+				.pausedSpoiler = On(PowerSaving::kChatSpoiler),
+				.elisionLines = 1,
+			});
 		}
 	}
 
@@ -1005,6 +1023,14 @@ void Voice::updateName() {
 			Ui::NameTextOptions());
 	}
 	_nameVersion = parent()->fromOriginal()->nameVersion();
+	_caption.setMarkedText(
+		st::defaultTextStyle,
+		parent()->originalText(),
+		Ui::DialogTextOptions(),
+		Core::MarkedTextContext{
+			.session = &parent()->history()->session(),
+			.customEmojiRepaint = [=] { delegate()->repaintItem(this); },
+		});
 }
 
 bool Voice::updateStatusText() {
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index 3526b5e57..936379e36 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -362,7 +362,9 @@ private:
 
 	const style::OverviewFileLayout &_st;
 
-	Ui::Text::String _name, _details;
+	Ui::Text::String _name;
+	Ui::Text::String _details;
+	Ui::Text::String _caption;
 	int _nameVersion = 0;
 
 	void updateName();

From b406e2b99b98e5828069e6ecfaef2bcfb0ad3fb5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 04:04:07 +0300
Subject: [PATCH 505/596] Fixed sender name for voices in overview layout when
 sender is hidden.

---
 .../history/view/history_view_message.cpp     |  2 +-
 .../SourceFiles/overview/overview_layout.cpp  | 33 ++++++++-----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 67f10c033..4eddd3b49 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -3826,7 +3826,7 @@ void Message::fromNameUpdated(int width) const {
 			const auto nameText = [&]() -> const Ui::Text::String * {
 				if (from) {
 					return &_fromName;
-				} else if (const auto info= item->originalHiddenSenderInfo()) {
+				} else if (const auto info = item->originalHiddenSenderInfo()) {
 					return &info->nameText();
 				} else {
 					Unexpected("Corrupted forwarded information in message.");
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 6bbacb1d8..c56582bc4 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document_resolver.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
-#include "data/data_media_types.h"
 #include "data/data_peer.h"
 #include "data/data_photo_media.h"
 #include "data/data_document_media.h"
@@ -21,9 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "lang/lang_keys.h"
 #include "layout/layout_selection.h"
-#include "mainwidget.h"
 #include "storage/file_upload.h"
-#include "mainwindow.h"
 #include "main/main_session.h"
 #include "media/audio/media_audio.h"
 #include "media/player/media_player_instance.h"
@@ -999,23 +996,19 @@ const style::RoundCheckbox &Voice::checkboxStyle() const {
 
 void Voice::updateName() {
 	if (const auto forwarded = parent()->Get<HistoryMessageForwarded>()) {
-		if (parent()->fromOriginal()->isChannel()) {
-			_name.setText(
-				st::semiboldTextStyle,
-				tr::lng_forwarded_channel(
-					tr::now,
-					lt_channel,
-					parent()->fromOriginal()->name()),
-				Ui::NameTextOptions());
-		} else {
-			_name.setText(
-				st::semiboldTextStyle,
-				tr::lng_forwarded(
-					tr::now,
-					lt_user,
-					parent()->fromOriginal()->name()),
-				Ui::NameTextOptions());
-		}
+		const auto info = parent()->originalHiddenSenderInfo();
+		const auto name = info
+			? tr::lng_forwarded(tr::now, lt_user, info->nameText().toString())
+			: parent()->fromOriginal()->isChannel()
+			? tr::lng_forwarded_channel(
+				tr::now,
+				lt_channel,
+				parent()->fromOriginal()->name())
+			: tr::lng_forwarded(
+				tr::now,
+				lt_user,
+				parent()->fromOriginal()->name());
+		_name.setText(st::semiboldTextStyle, name, Ui::NameTextOptions());
 	} else {
 		_name.setText(
 			st::semiboldTextStyle,

From e4323ecd26f9bcabae3181f957a13b524766d5af Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 07:07:59 +0300
Subject: [PATCH 506/596] Slightly improved code style in processing of api
 text entities.

---
 .../SourceFiles/api/api_text_entities.cpp     | 308 +++++++++++++-----
 1 file changed, 227 insertions(+), 81 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_text_entities.cpp b/Telegram/SourceFiles/api/api_text_entities.cpp
index 6c434bc9b..44a689ff4 100644
--- a/Telegram/SourceFiles/api/api_text_entities.cpp
+++ b/Telegram/SourceFiles/api/api_text_entities.cpp
@@ -7,12 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "api/api_text_entities.h"
 
-#include "main/main_session.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/stickers/data_stickers_set.h"
-#include "data/data_session.h"
-#include "data/data_document.h"
-#include "data/data_user.h"
+#include "main/main_session.h"
 
 namespace Api {
 namespace {
@@ -62,67 +62,163 @@ using namespace TextUtilities;
 EntitiesInText EntitiesFromMTP(
 		Main::Session *session,
 		const QVector<MTPMessageEntity> &entities) {
+	if (entities.isEmpty()) {
+		return {};
+	}
 	auto result = EntitiesInText();
-	if (!entities.isEmpty()) {
-		result.reserve(entities.size());
-		for (const auto &entity : entities) {
-			switch (entity.type()) {
-			case mtpc_messageEntityUrl: { auto &d = entity.c_messageEntityUrl(); result.push_back({ EntityType::Url, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityTextUrl: { auto &d = entity.c_messageEntityTextUrl(); result.push_back({ EntityType::CustomUrl, d.voffset().v, d.vlength().v, qs(d.vurl()) }); } break;
-			case mtpc_messageEntityEmail: { auto &d = entity.c_messageEntityEmail(); result.push_back({ EntityType::Email, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityHashtag: { auto &d = entity.c_messageEntityHashtag(); result.push_back({ EntityType::Hashtag, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityCashtag: { auto &d = entity.c_messageEntityCashtag(); result.push_back({ EntityType::Cashtag, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityPhone: break; // Skipping phones.
-			case mtpc_messageEntityMention: { auto &d = entity.c_messageEntityMention(); result.push_back({ EntityType::Mention, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityMentionName: if (session) {
-				const auto &d = entity.c_messageEntityMentionName();
-				const auto userId = UserId(d.vuser_id());
-				const auto user = session->data().userLoaded(userId);
-				const auto data = MentionNameDataFromFields({
-					.selfId = session->userId().bare,
-					.userId = userId.bare,
-					.accessHash = user ? user->accessHash() : 0,
-				});
-				result.push_back({ EntityType::MentionName, d.voffset().v, d.vlength().v, data });
-			} break;
-			case mtpc_inputMessageEntityMentionName: if (session) {
-				const auto &d = entity.c_inputMessageEntityMentionName();
-				const auto data = d.vuser_id().match([&](
-						const MTPDinputUserSelf &) {
-					return MentionNameDataFromFields({
-						.selfId = session->userId().bare,
-						.userId = session->userId().bare,
-						.accessHash = session->user()->accessHash(),
-					});
-				}, [&](const MTPDinputUser &data) {
-					return MentionNameDataFromFields({
-						.selfId = session->userId().bare,
-						.userId = UserId(data.vuser_id()).bare,
-						.accessHash = data.vaccess_hash().v,
-					});
-				}, [&](const auto &) {
-					return QString();
-				});
-				if (!data.isEmpty()) {
-					result.push_back({ EntityType::MentionName, d.voffset().v, d.vlength().v, data });
-				}
-			} break;
-			case mtpc_messageEntityBotCommand: { auto &d = entity.c_messageEntityBotCommand(); result.push_back({ EntityType::BotCommand, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityBold: { auto &d = entity.c_messageEntityBold(); result.push_back({ EntityType::Bold, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityItalic: { auto &d = entity.c_messageEntityItalic(); result.push_back({ EntityType::Italic, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityUnderline: { auto &d = entity.c_messageEntityUnderline(); result.push_back({ EntityType::Underline, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityStrike: { auto &d = entity.c_messageEntityStrike(); result.push_back({ EntityType::StrikeOut, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityCode: { auto &d = entity.c_messageEntityCode(); result.push_back({ EntityType::Code, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityPre: { auto &d = entity.c_messageEntityPre(); result.push_back({ EntityType::Pre, d.voffset().v, d.vlength().v, qs(d.vlanguage()) }); } break;
-			case mtpc_messageEntityBlockquote: { auto &d = entity.c_messageEntityBlockquote(); result.push_back({ EntityType::Blockquote, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityBankCard: break; // Skipping cards. // #TODO entities
-			case mtpc_messageEntitySpoiler: { auto &d = entity.c_messageEntitySpoiler(); result.push_back({ EntityType::Spoiler, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityCustomEmoji: {
-				const auto &d = entity.c_messageEntityCustomEmoji();
-				result.push_back({ EntityType::CustomEmoji, d.voffset().v, d.vlength().v, CustomEmojiEntityData(d) });
-			} break;
+	result.reserve(entities.size());
+
+	for (const auto &entity : entities) {
+		entity.match([&](const MTPDmessageEntityUnknown &d) {
+		}, [&](const MTPDmessageEntityMention &d) {
+			result.push_back({
+				EntityType::Mention,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityHashtag &d) {
+			result.push_back({
+				EntityType::Hashtag,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityBotCommand &d) {
+			result.push_back({
+				EntityType::BotCommand,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityUrl &d) {
+			result.push_back({
+				EntityType::Url,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityEmail &d) {
+			result.push_back({
+				EntityType::Email,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityBold &d) {
+			result.push_back({
+				EntityType::Bold,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityItalic &d) {
+			result.push_back({
+				EntityType::Italic,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityCode &d) {
+			result.push_back({
+				EntityType::Code,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityPre &d) {
+			result.push_back({
+				EntityType::Pre,
+				d.voffset().v,
+				d.vlength().v,
+				qs(d.vlanguage()),
+			});
+		}, [&](const MTPDmessageEntityTextUrl &d) {
+			result.push_back({
+				EntityType::CustomUrl,
+				d.voffset().v,
+				d.vlength().v,
+				qs(d.vurl()),
+			});
+		}, [&](const MTPDmessageEntityMentionName &d) {
+			if (!session) {
+				return;
 			}
-		}
+			const auto userId = UserId(d.vuser_id());
+			const auto user = session->data().userLoaded(userId);
+			const auto data = MentionNameDataFromFields({
+				.selfId = session->userId().bare,
+				.userId = userId.bare,
+				.accessHash = user ? user->accessHash() : 0,
+			});
+			result.push_back({
+				EntityType::MentionName,
+				d.voffset().v,
+				d.vlength().v,
+				data,
+			});
+		}, [&](const MTPDinputMessageEntityMentionName &d) {
+			if (!session) {
+				return;
+			}
+			const auto data = d.vuser_id().match([&](
+					const MTPDinputUserSelf &) {
+				return MentionNameDataFromFields({
+					.selfId = session->userId().bare,
+					.userId = session->userId().bare,
+					.accessHash = session->user()->accessHash(),
+				});
+			}, [&](const MTPDinputUser &data) {
+				return MentionNameDataFromFields({
+					.selfId = session->userId().bare,
+					.userId = UserId(data.vuser_id()).bare,
+					.accessHash = data.vaccess_hash().v,
+				});
+			}, [](const auto &) {
+				return QString();
+			});
+			if (!data.isEmpty()) {
+				result.push_back({
+					EntityType::MentionName,
+					d.voffset().v,
+					d.vlength().v,
+					data,
+				});
+			}
+		}, [&](const MTPDmessageEntityPhone &d) {
+			// Skipping phones.
+		}, [&](const MTPDmessageEntityCashtag &d) {
+			result.push_back({
+				EntityType::Cashtag,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityUnderline &d) {
+			result.push_back({
+				EntityType::Underline,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityStrike &d) {
+			result.push_back({
+				EntityType::StrikeOut,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityBankCard &d) {
+			// Skipping cards. // #TODO entities
+		}, [&](const MTPDmessageEntitySpoiler &d) {
+			result.push_back({
+				EntityType::Spoiler,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityCustomEmoji &d) {
+			result.push_back({
+				EntityType::CustomEmoji,
+				d.voffset().v,
+				d.vlength().v,
+				CustomEmojiEntityData(d),
+			});
+		}, [&](const MTPDmessageEntityBlockquote &d) {
+			result.push_back({
+				EntityType::Blockquote,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		});
 	}
 	return result;
 }
@@ -134,7 +230,9 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 	auto v = QVector<MTPMessageEntity>();
 	v.reserve(entities.size());
 	for (const auto &entity : entities) {
-		if (entity.length() <= 0) continue;
+		if (entity.length() <= 0) {
+			continue;
+		}
 		if (option == ConvertOption::SkipLocal
 			&& entity.type() != EntityType::Bold
 			//&& entity.type() != EntityType::Semibold // Not in API.
@@ -154,28 +252,76 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 		auto offset = MTP_int(entity.offset());
 		auto length = MTP_int(entity.length());
 		switch (entity.type()) {
-		case EntityType::Url: v.push_back(MTP_messageEntityUrl(offset, length)); break;
-		case EntityType::CustomUrl: v.push_back(MTP_messageEntityTextUrl(offset, length, MTP_string(entity.data()))); break;
-		case EntityType::Email: v.push_back(MTP_messageEntityEmail(offset, length)); break;
-		case EntityType::Hashtag: v.push_back(MTP_messageEntityHashtag(offset, length)); break;
-		case EntityType::Cashtag: v.push_back(MTP_messageEntityCashtag(offset, length)); break;
-		case EntityType::Mention: v.push_back(MTP_messageEntityMention(offset, length)); break;
+		case EntityType::Url: {
+			v.push_back(MTP_messageEntityUrl(offset, length));
+		} break;
+		case EntityType::CustomUrl: {
+			v.push_back(
+				MTP_messageEntityTextUrl(
+					offset,
+					length,
+					MTP_string(entity.data())));
+		} break;
+		case EntityType::Email: {
+			v.push_back(MTP_messageEntityEmail(offset, length));
+		} break;
+		case EntityType::Hashtag: {
+			v.push_back(MTP_messageEntityHashtag(offset, length));
+		} break;
+		case EntityType::Cashtag: {
+			v.push_back(MTP_messageEntityCashtag(offset, length));
+		} break;
+		case EntityType::Mention: {
+			v.push_back(MTP_messageEntityMention(offset, length));
+		} break;
 		case EntityType::MentionName: {
-			if (const auto valid = MentionNameEntity(session, offset, length, entity.data())) {
+			const auto valid = MentionNameEntity(
+				session,
+				offset,
+				length,
+				entity.data());
+			if (valid) {
 				v.push_back(*valid);
 			}
 		} break;
-		case EntityType::BotCommand: v.push_back(MTP_messageEntityBotCommand(offset, length)); break;
-		case EntityType::Bold: v.push_back(MTP_messageEntityBold(offset, length)); break;
-		case EntityType::Italic: v.push_back(MTP_messageEntityItalic(offset, length)); break;
-		case EntityType::Underline: v.push_back(MTP_messageEntityUnderline(offset, length)); break;
-		case EntityType::StrikeOut: v.push_back(MTP_messageEntityStrike(offset, length)); break;
-		case EntityType::Code: v.push_back(MTP_messageEntityCode(offset, length)); break; // #TODO entities
-		case EntityType::Pre: v.push_back(MTP_messageEntityPre(offset, length, MTP_string(entity.data()))); break;
-		case EntityType::Blockquote: v.push_back(MTP_messageEntityBlockquote(offset, length)); break;
-		case EntityType::Spoiler: v.push_back(MTP_messageEntitySpoiler(offset, length)); break;
+		case EntityType::BotCommand: {
+			v.push_back(MTP_messageEntityBotCommand(offset, length));
+		} break;
+		case EntityType::Bold: {
+			v.push_back(MTP_messageEntityBold(offset, length));
+		} break;
+		case EntityType::Italic: {
+			v.push_back(MTP_messageEntityItalic(offset, length));
+		} break;
+		case EntityType::Underline: {
+			v.push_back(MTP_messageEntityUnderline(offset, length));
+		} break;
+		case EntityType::StrikeOut: {
+			v.push_back(MTP_messageEntityStrike(offset, length));
+		} break;
+		case EntityType::Code: {
+			// #TODO entities.
+			v.push_back(MTP_messageEntityCode(offset, length));
+		} break;
+		case EntityType::Pre: {
+			v.push_back(
+				MTP_messageEntityPre(
+					offset,
+					length,
+					MTP_string(entity.data())));
+		} break;
+		case EntityType::Blockquote: {
+			v.push_back(MTP_messageEntityBlockquote(offset, length));
+		} break;
+		case EntityType::Spoiler: {
+			v.push_back(MTP_messageEntitySpoiler(offset, length));
+		} break;
 		case EntityType::CustomEmoji: {
-			if (const auto valid = CustomEmojiEntity(offset, length, entity.data())) {
+			const auto valid = CustomEmojiEntity(
+				offset,
+				length,
+				entity.data());
+			if (valid) {
 				v.push_back(*valid);
 			}
 		} break;

From 76137ca1cf622401cbf5dac0138d19d2c58b4b63 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 09:34:58 +0300
Subject: [PATCH 507/596] Fixed link to premium section in box about sponsored
 messages.

---
 Telegram/SourceFiles/menu/menu_sponsored.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index f836106d0..495da6a85 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -37,11 +37,13 @@ namespace {
 
 void AboutBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<Main::Session*> session) {
+		std::shared_ptr<ChatHelpers::Show> show) {
 	constexpr auto kUrl = "https://promote.telegram.org"_cs;
 
 	box->setNoContentMargin(true);
 
+	const auto session = &show->session();
+
 	const auto content = box->verticalLayout().get();
 	const auto levels = Data::LevelLimits(session)
 		.channelRestrictSponsoredLevelMin();
@@ -101,7 +103,7 @@ void AboutBox(
 					st::channelEarnSemiboldLabel),
 				padding);
 			Ui::AddSkip(content, st::channelEarnHistoryThreeSkip);
-			content->add(
+			const auto label = content->add(
 				object_ptr<Ui::FlatLabel>(
 					content,
 					std::move(about),
@@ -121,6 +123,7 @@ void AboutBox(
 					(g.left() - left->width()) / 2,
 					g.top() + st::channelEarnHistoryThreeSkip);
 			}, left->lifetime());
+			return label;
 		};
 		addEntry(
 			tr::lng_sponsored_revenued_info1_title(),
@@ -144,10 +147,14 @@ void AboutBox(
 				lt_link,
 				tr::lng_settings_privacy_premium_link(
 				) | rpl::map([=](QString t) {
-					return Ui::Text::Link(t, kUrl.utf16());
+					return Ui::Text::Link(std::move(t), u"internal:"_q);
 				}),
 				Ui::Text::RichLangValue),
-			st::sponsoredAboutRemoveIcon);
+			st::sponsoredAboutRemoveIcon)->setClickHandlerFilter([=](
+					const auto &...) {
+				ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
+				return true;
+			});
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 	}
@@ -339,7 +346,7 @@ void ShowSponsored(
 		st::popupMenuWithIcons);
 
 	menu->addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
-		show->show(Box(AboutBox, &item->history()->session()));
+		show->show(Box(AboutBox, show));
 	}, &st::menuIconInfo);
 
 	menu->addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
@@ -363,7 +370,7 @@ void ShowSponsored(
 
 void ShowSponsoredAbout(std::shared_ptr<ChatHelpers::Show> show) {
 	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
-		AboutBox(box, &show->session());
+		AboutBox(box, show);
 	}));
 }
 

From 264e35a6a86809be1854eea5e82634faa6c5fabb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 17:16:02 +0300
Subject: [PATCH 508/596] Fixed rare crash in photo editor when editing media
 in message.

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

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 5ffdfb6f3..be4d4e7fa 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -206,6 +206,9 @@ void EditPhotoImage(
 		Storage::UpdateImageDetails(file, previewWidth, sideLimit);
 		done(std::move(list));
 	};
+	if (!large) {
+		return;
+	}
 	const auto fileImage = std::make_shared<Image>(*large);
 	auto editor = base::make_unique_q<Editor::PhotoEditor>(
 		parent,

From 213326a212ca4096b224c6db2e672f3622e965bf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 18:15:02 +0400
Subject: [PATCH 509/596] Update submodules.

---
 Telegram/lib_webrtc  | 2 +-
 Telegram/lib_webview | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index 1cbf5fa7d..f701713cd 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit 1cbf5fa7d875074c40e76216a3047bd7c59996d7
+Subproject commit f701713cd798bd7d5f69d318fdefb125d101aa76
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 2ccbfa5f3..6db384204 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 2ccbfa5f3443274e40deb761674b536e2e8eedae
+Subproject commit 6db384204054d853b30ba887d448a5a3ea4077c0

From b5f5aed1197aae6bccdeaef958d663fd5af41904 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 8 May 2024 09:30:59 +0400
Subject: [PATCH 510/596] Fix search focus in a hidden window on launch.

Fixes #27853.
---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 Telegram/build/prepare/prepare.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 350c7a3fd..d48e99710 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 44f5103860dfa3f9b9675730231af6fbe28cde93 \
+	&& git fetch --depth=1 origin 1b3aa9303260613841745a71442c939b55c8aaf2 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index ce6c87b9b..9a3d0587e 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 5d64e21844
+    git checkout 1b3aa93032
 """)
 
 stage('msys64', """

From 1f31d8032f752c90800255dfcfe3f3137a3beb0d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 8 May 2024 17:16:34 +0400
Subject: [PATCH 511/596] Bring chosen font to the top of the box.

---
 Telegram/SourceFiles/ui/boxes/choose_font_box.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index 512e8a691..80168ca0f 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -546,15 +546,25 @@ std::vector<Selector::Entry> Selector::FullList(const QString &now) {
 			result.push_back({ .id = family });
 		}
 	}
-	if (!ranges::contains(result, now, &Entry::id)) {
+	auto nowIt = ranges::find(result, now, &Entry::id);
+	if (nowIt == end(result)) {
 		result.push_back({ .id = now });
+		nowIt = end(result) - 1;
 	}
 	for (auto i = begin(result) + 2; i != end(result); ++i) {
 		i->key = TextUtilities::RemoveAccents(i->id).toLower();
 		i->text = i->id;
 		i->keywords = TextUtilities::PrepareSearchWords(i->id);
 	}
-	ranges::sort(begin(result) + 2, end(result), std::less<>(), &Entry::key);
+	auto skip = 2;
+	if (nowIt - begin(result) >= skip) {
+		std::swap(result[2], *nowIt);
+		++skip;
+	}
+	ranges::sort(
+		begin(result) + skip, end(result),
+		std::less<>(),
+		&Entry::key);
 	return result;
 }
 

From 88ad1be4c303d02fa9e2a24d88b246b7b648e6e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 9 May 2024 11:12:01 +0400
Subject: [PATCH 512/596] Try to fix custom fonts in the input field.

---
 Telegram/SourceFiles/chat_helpers/chat_helpers.style | 2 +-
 Telegram/build/docker/centos_env/Dockerfile          | 2 +-
 Telegram/build/prepare/prepare.py                    | 2 +-
 Telegram/lib_ui                                      | 2 +-
 snap/snapcraft.yaml                                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 67358e4c9..f8c8ad61b 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -983,7 +983,7 @@ historyComposeField: InputField(defaultInputField) {
 	placeholderFg: placeholderFg;
 	placeholderFgActive: placeholderFgActive;
 	placeholderFgError: placeholderFgActive;
-	placeholderMargins: margins(7px, 5px, 7px, 5px);
+	placeholderMargins: margins(2px, 0px, 2px, 0px);
 	placeholderAlign: align(topleft);
 	placeholderScale: 0.;
 	placeholderFont: normalFont;
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index d48e99710..251123360 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 1b3aa9303260613841745a71442c939b55c8aaf2 \
+	&& git fetch --depth=1 origin 25f76cf4d58fae5742447d17d2574ab1fad196e5 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 9a3d0587e..8384492e6 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 1b3aa93032
+    git checkout 25f76cf4d5
 """)
 
 stage('msys64', """
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f76ddd841..41d1fe923 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f76ddd841ca02ca35432f6de569f8c430a9713b1
+Subproject commit 41d1fe9232c1d09b1ada01a0cc552e5c66d74b89
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 79148548e..95f560866 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -167,7 +167,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 44f5103860dfa3f9b9675730231af6fbe28cde93
+    source-commit: 25f76cf4d58fae5742447d17d2574ab1fad196e5
     plugin: dump
     override-pull: |
       craftctl default

From bd48e2fff2a4f83834d53f7651cfd6abc7355e7c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 16 May 2024 19:13:21 +0400
Subject: [PATCH 513/596] Fix more package names in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 95f560866..531d3d14d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -115,13 +115,13 @@ parts:
       - libasound2
       - libavif16
       - libboost-regex1.83.0
-      - libglib2.0-0
+      - libglib2.0-0t64
       - libheif1
       - libopenal1
       - libopus0
-      - libprotobuf-lite32
+      - libprotobuf-lite32t64
       - libpulse0
-      - libssl3
+      - libssl3t64
       - libwayland-client0
       - libwebkitgtk-6.0-4
       - libxcb1
@@ -322,7 +322,7 @@ parts:
       - libegl1
       - libfontconfig1
       - libfreetype6
-      - libglib2.0-0
+      - libglib2.0-0t64
       - libglx0
       - libgtk-3-0t64
       - libharfbuzz0b
@@ -333,7 +333,7 @@ parts:
       - libpcre2-16-0
       - libpng16-16t64
       - libsm6
-      - libssl3
+      - libssl3t64
       - libvulkan1
       - libwayland-client0
       - libwayland-cursor0
@@ -465,10 +465,10 @@ parts:
       - libegl1
       - libgbm1
       - libgl1
-      - libglib2.0-0
+      - libglib2.0-0t64
       - libopenh264-7
       - libopus0
-      - libssl3
+      - libssl3t64
       - libvpx9
       - libx11-6
       - libxcomposite1

From a753c1515bd9bd069cee9285a8a47b140c010d2f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 16 May 2024 19:13:42 +0400
Subject: [PATCH 514/596] Remove unneeded wayland-client dependency from
 telegram part in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 531d3d14d..b65e2e06d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -105,7 +105,6 @@ parts:
       - libprotobuf-dev
       - libpulse-dev
       - libssl-dev
-      - libwayland-dev
       - libxcb1-dev
       - libxcb-keysyms1-dev
       - libxcb-record0-dev
@@ -122,7 +121,6 @@ parts:
       - libprotobuf-lite32t64
       - libpulse0
       - libssl3t64
-      - libwayland-client0
       - libwebkitgtk-6.0-4
       - libxcb1
       - libxcb-keysyms1

From ad13048cdc7f6ed64980634af83de07e7da5494b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 16 May 2024 19:15:56 +0400
Subject: [PATCH 515/596] Update submodules

---
 Telegram/lib_ui      | 2 +-
 Telegram/lib_webview | 2 +-
 cmake                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 41d1fe923..72a1c98fa 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 41d1fe9232c1d09b1ada01a0cc552e5c66d74b89
+Subproject commit 72a1c98fa6470f160d0d81cca9a1b123821e8e0f
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 6db384204..3cc1c1c16 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 6db384204054d853b30ba887d448a5a3ea4077c0
+Subproject commit 3cc1c1c1619a2c23bcc9500ddb2ca1231a5db5b5
diff --git a/cmake b/cmake
index d9f958e0b..a7527c0e6 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit d9f958e0ba4eef6359b0c968ca4fc75923134f78
+Subproject commit a7527c0e6eba1c71cd0dfd7bd8de9c1e68cb529f

From 98b58c1168a380dff4bf9192abdd420008c0daa1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 18 May 2024 01:02:49 +0400
Subject: [PATCH 516/596] Add missing binds for OpenGL shaders and buffers

---
 Telegram/SourceFiles/calls/calls_video_incoming.cpp          | 1 +
 .../SourceFiles/calls/group/calls_group_viewport_opengl.cpp  | 2 ++
 .../SourceFiles/media/view/media_view_overlay_opengl.cpp     | 5 +++++
 Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp    | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/Telegram/SourceFiles/calls/calls_video_incoming.cpp b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
index 9ab16d73d..e1a52ebe9 100644
--- a/Telegram/SourceFiles/calls/calls_video_incoming.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
@@ -331,6 +331,7 @@ void Panel::Incoming::RendererGL::paint(
 		shadow.texture.left(), shadow.texture.top(),
 	};
 
+	_contentBuffer->bind();
 	_contentBuffer->write(0, coords, sizeof(coords));
 
 	const auto bottomShadowArea = QRect(
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
index 63e5105fa..6f6b07620 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
@@ -783,6 +783,7 @@ void Viewport::RendererGL::paintTile(
 		: &*_frameProgram.yuv420;
 	const auto uniformViewport = QSizeF(_viewport) * _factor;
 
+	program->bind();
 	program->setUniformValue("viewport", uniformViewport);
 	program->setUniformValue(
 		"frameBg",
@@ -1078,6 +1079,7 @@ void Viewport::RendererGL::drawDownscalePass(
 		? &*_downscaleProgram.argb32
 		: &*_downscaleProgram.yuv420;
 
+	program->bind();
 	FillTexturedRectangle(f, program);
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 31ea35237..99be5557f 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -544,6 +544,7 @@ void OverlayWidget::RendererGL::paintTransformedContent(
 		0.f, 0.f,
 	};
 
+	_contentBuffer->bind();
 	_contentBuffer->write(0, coords, sizeof(coords));
 
 	program->setUniformValue("viewport", _uniformViewport);
@@ -712,6 +713,7 @@ void OverlayWidget::RendererGL::paintControl(
 	};
 	_controlsProgram->bind();
 	_controlsProgram->setUniformValue("viewport", _uniformViewport);
+	_contentBuffer->bind();
 	if (!over.isEmpty() && overOpacity > 0) {
 		_contentBuffer->write(
 			offset * 4 * sizeof(GLfloat),
@@ -915,6 +917,7 @@ void OverlayWidget::RendererGL::paintRoundedCorners(int radius) {
 	const auto offset = kControlsOffset
 		+ (kControlsCount * kControlValues) / 4;
 	const auto byteOffset = offset * 4 * sizeof(GLfloat);
+	_contentBuffer->bind();
 	_contentBuffer->write(byteOffset, coords, sizeof(coords));
 	_roundedCornersProgram->bind();
 	_roundedCornersProgram->setUniformValue("viewport", _uniformViewport);
@@ -981,6 +984,7 @@ void OverlayWidget::RendererGL::paintStoriesSiblingPart(
 		+ (6 * 2 * 4) / 4 // rounding
 		+ (index * 4);
 	const auto byteOffset = offset * 4 * sizeof(GLfloat);
+	_contentBuffer->bind();
 	_contentBuffer->write(byteOffset, coords, sizeof(coords));
 
 	_controlsProgram->bind();
@@ -1059,6 +1063,7 @@ void OverlayWidget::RendererGL::paintUsingRaster(
 		geometry.left(), geometry.bottom(),
 		textured.texture.left(), textured.texture.top(),
 	};
+	_contentBuffer->bind();
 	_contentBuffer->write(
 		bufferOffset * 4 * sizeof(GLfloat),
 		coords,
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
index 8e4e8e7c2..f4be398c2 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
@@ -427,6 +427,7 @@ void Pip::RendererGL::paintTransformedContent(
 		(geometry.outer.height() - geometry.inner.y()) * yscale,
 	};
 
+	_contentBuffer->bind();
 	_contentBuffer->write(0, coords, sizeof(coords));
 
 	const auto rgbaFrame = _chromaSize.isEmpty();
@@ -588,6 +589,7 @@ void Pip::RendererGL::paintButton(
 		iconOverRect.texture.right(), iconOverRect.texture.top(),
 		iconOverRect.texture.left(), iconOverRect.texture.top(),
 	};
+	_contentBuffer->bind();
 	_contentBuffer->write(
 		offset * 4 * sizeof(GLfloat),
 		coords,
@@ -741,6 +743,7 @@ void Pip::RendererGL::paintUsingRaster(
 		geometry.left(), geometry.bottom(),
 		textured.texture.left(), textured.texture.top(),
 	};
+	_contentBuffer->bind();
 	_contentBuffer->write(
 		bufferOffset * 4 * sizeof(GLfloat),
 		coords,

From 65b62485be4a7ce1f584b84231f69d829743b61c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 17 May 2024 03:24:20 +0400
Subject: [PATCH 517/596] Forward input method event from Dialogs::Widget to
 search field

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 28 +++++++++++++++++++
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  3 ++
 2 files changed, 31 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 575516ffa..6e5c30b7b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -82,6 +82,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/qt/qt_common_adapters.h"
 
 #include <QtCore/QMimeData>
+#include <QtGui/QTextBlock>
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QTextEdit>
 
@@ -239,6 +240,8 @@ Widget::Widget(
 	: nullptr)
 , _searchTimer([=] { searchMessages(); })
 , _singleMessageSearch(&controller->session()) {
+	setAttribute(Qt::WA_InputMethodEnabled);
+
 	const auto makeChildListShown = [](PeerId peerId, float64 shown) {
 		return InnerWidget::ChildListShown{ peerId, shown };
 	};
@@ -3298,6 +3301,31 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
+void Widget::inputMethodEvent(QInputMethodEvent *e) {
+	const auto cursor = _search->rawTextEdit()->textCursor();
+	bool isGettingInput = !e->commitString().isEmpty()
+		|| e->preeditString() != cursor.block().layout()->preeditAreaText()
+		|| e->replacementLength() > 0;
+
+	if (!isGettingInput || _postponeProcessSearchFocusChange) {
+		Window::AbstractSectionWidget::inputMethodEvent(e);
+		return;
+	}
+
+	// This delay in search focus processing allows us not to create
+	// _suggestions in case the event inserts some non-whitespace search
+	// query while still show _suggestions animated, if it is a space.
+	_postponeProcessSearchFocusChange = true;
+	_search->setFocusFast();
+	QCoreApplication::sendEvent(_search->rawTextEdit(), e);
+	_postponeProcessSearchFocusChange = false;
+	processSearchFocusChange();
+}
+
+QVariant Widget::inputMethodQuery(Qt::InputMethodQuery query) const {
+	return _search->rawTextEdit()->inputMethodQuery(query);
+}
+
 bool Widget::redirectToSearchPossible() const {
 	return !_openedFolder
 		&& !_openedForum
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 5ff9828d5..aa6dbdf93 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -135,6 +135,8 @@ public:
 	bool cancelSearch();
 	bool cancelSearchByMouseBack();
 
+	QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
+
 	~Widget();
 
 protected:
@@ -144,6 +146,7 @@ protected:
 	void dropEvent(QDropEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 	void keyPressEvent(QKeyEvent *e) override;
+	void inputMethodEvent(QInputMethodEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 
 private:

From af4e0178d0d4efdb87898386c0aa56ad6bd8ffc7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 19 May 2024 15:29:31 +0400
Subject: [PATCH 518/596] Ensure window flags are set before calling
 SeparatePanel::setInnerSize

Setting window flags may lead to native window being re-created
---
 Telegram/SourceFiles/payments/ui/payments_panel.cpp        | 2 +-
 Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp | 2 +-
 Telegram/lib_webview                                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index f509fdb70..7813a8244 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -70,8 +70,8 @@ Panel::Progress::Progress(QWidget *parent, Fn<QRect()> rect)
 Panel::Panel(not_null<PanelDelegate*> delegate)
 : _delegate(delegate)
 , _widget(std::make_unique<SeparatePanel>()) {
-	_widget->setInnerSize(st::paymentsPanelSize);
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
+	_widget->setInnerSize(st::paymentsPanelSize);
 
 	_widget->closeRequests(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index a18c86bf2..747c812e4 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -323,8 +323,8 @@ Panel::Panel(
 , _menuButtons(menuButtons)
 , _widget(std::make_unique<SeparatePanel>())
 , _allowClipboardRead(allowClipboardRead) {
-	_widget->setInnerSize(st::botWebViewPanelSize);
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
+	_widget->setInnerSize(st::botWebViewPanelSize);
 
 	_widget->closeRequests(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 3cc1c1c16..ebaa206b1 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 3cc1c1c1619a2c23bcc9500ddb2ca1231a5db5b5
+Subproject commit ebaa206b1d2f1f24cff08f3c8a73054ee69274f0

From 6734f99ba8b46b716beab112f98ff1551f47c2e2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 19 May 2024 20:14:15 +0400
Subject: [PATCH 519/596] Update lib_ui & patches on Linux

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 Telegram/lib_ui                             | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 251123360..1f623e190 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 25f76cf4d58fae5742447d17d2574ab1fad196e5 \
+	&& git fetch --depth=1 origin 931535985f75ca51313923d31d7924560719b3eb \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 72a1c98fa..037ceb272 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 72a1c98fa6470f160d0d81cca9a1b123821e8e0f
+Subproject commit 037ceb272c4dd2eb456e18b61e374c1fa759d109
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b65e2e06d..7a6fc8ffa 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -165,7 +165,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 25f76cf4d58fae5742447d17d2574ab1fad196e5
+    source-commit: 931535985f75ca51313923d31d7924560719b3eb
     plugin: dump
     override-pull: |
       craftctl default

From 2bdc204c4761178ca502cbad02a42aee08955cda Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 13:34:05 +0400
Subject: [PATCH 520/596] Fix geometry applying in webview windows.

---
 .../payments/ui/payments_panel.cpp            | 21 +++++----
 .../SourceFiles/payments/ui/payments_panel.h  |  2 +
 .../ui/chat/attach/attach_bot_webview.cpp     | 46 ++++++++++---------
 .../ui/chat/attach/attach_bot_webview.h       |  4 +-
 4 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index 7813a8244..d97628285 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -534,12 +534,15 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	const auto bottom = _webviewBottom.get();
 	bottom->show();
 
-	bottom->heightValue(
-	) | rpl::start_with_next([=](int height) {
-		const auto inner = _widget->innerGeometry();
+	rpl::combine(
+		container->geometryValue() | rpl::map([=] {
+			return _widget->innerGeometry();
+		}),
+		bottom->heightValue()
+	) | rpl::start_with_next([=](QRect inner, int height) {
 		bottom->move(inner.x(), inner.y() + inner.height() - height);
-		container->resize(inner.width(), inner.height() - height);
 		bottom->resizeToWidth(inner.width());
+		_footerHeight = bottom->height();
 	}, bottom->lifetime());
 	container->show();
 
@@ -584,10 +587,12 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 		});
 	});
 
-	container->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
-		if (raw->widget()) {
-			raw->widget()->setGeometry(geometry);
+	rpl::combine(
+		container->geometryValue(),
+		_footerHeight.value()
+	) | rpl::start_with_next([=](QRect geometry, int footer) {
+		if (const auto view = raw->widget()) {
+			view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
 		}
 	}, _webview->lifetime);
 
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.h b/Telegram/SourceFiles/payments/ui/payments_panel.h
index b65def015..6c64c661f 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.h
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.h
@@ -115,11 +115,13 @@ private:
 	[[nodiscard]] bool progressWithBackground() const;
 	[[nodiscard]] QRect progressRect() const;
 	void setupProgressGeometry();
+	void updateFooterHeight();
 
 	const not_null<PanelDelegate*> _delegate;
 	std::unique_ptr<SeparatePanel> _widget;
 	std::unique_ptr<WebviewWithLifetime> _webview;
 	std::unique_ptr<RpWidget> _webviewBottom;
+	rpl::variable<int> _footerHeight;
 	std::unique_ptr<Progress> _progress;
 	QPointer<Checkbox> _saveWebviewInformation;
 	QPointer<FormSummary> _weakFormSummary;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 747c812e4..d419d7775 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -570,17 +570,15 @@ void Panel::createWebviewBottom() {
 	label->show();
 	_webviewBottom->resize(_webviewBottom->width(), height);
 
-	bottom->heightValue(
-	) | rpl::start_with_next([=](int height) {
-		const auto inner = _widget->innerGeometry();
-		if (_mainButton && !_mainButton->isHidden()) {
-			height = _mainButton->height();
-		}
+	rpl::combine(
+		_webviewParent->geometryValue() | rpl::map([=] {
+			return _widget->innerGeometry();
+		}),
+		bottom->heightValue()
+	) | rpl::start_with_next([=](QRect inner, int height) {
 		bottom->move(inner.x(), inner.y() + inner.height() - height);
-		if (const auto container = _webviewParent.data()) {
-			container->setFixedSize(inner.width(), inner.height() - height);
-		}
 		bottom->resizeToWidth(inner.width());
+		updateFooterHeight();
 	}, bottom->lifetime());
 }
 
@@ -636,10 +634,13 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 		});
 	});
 
-	container->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
-		if (raw->widget()) {
-			raw->widget()->setGeometry(geometry);
+	updateFooterHeight();
+	rpl::combine(
+		container->geometryValue(),
+		_footerHeight.value()
+	) | rpl::start_with_next([=](QRect geometry, int footer) {
+		if (const auto view = raw->widget()) {
+			view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
 		}
 	}, _webview->lifetime);
 
@@ -1185,22 +1186,25 @@ void Panel::createMainButton() {
 	button->hide();
 
 	rpl::combine(
+		_webviewParent->geometryValue() | rpl::map([=] {
+			return _widget->innerGeometry();
+		}),
 		button->shownValue(),
 		button->heightValue()
-	) | rpl::start_with_next([=](bool shown, int height) {
-		const auto inner = _widget->innerGeometry();
-		if (!shown) {
-			height = _webviewBottom->height();
-		}
+	) | rpl::start_with_next([=](QRect inner, bool shown, int height) {
 		button->move(inner.x(), inner.y() + inner.height() - height);
-		if (const auto raw = _webviewParent.data()) {
-			raw->setFixedSize(inner.width(), inner.height() - height);
-		}
 		button->resizeToWidth(inner.width());
 		_webviewBottom->setVisible(!shown);
+		updateFooterHeight();
 	}, button->lifetime());
 }
 
+void Panel::updateFooterHeight() {
+	_footerHeight = (_mainButton && !_mainButton->isHidden())
+		? _mainButton->height()
+		: _webviewBottom->height();
+}
+
 void Panel::showBox(object_ptr<BoxContent> box) {
 	if (const auto widget = _webview ? _webview->window.widget() : nullptr) {
 		const auto hideNow = !widget->isHidden();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index ee1dae837..fb0231a01 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -143,6 +143,7 @@ private:
 	[[nodiscard]] bool progressWithBackground() const;
 	[[nodiscard]] QRect progressRect() const;
 	void setupProgressGeometry();
+	void updateFooterHeight();
 
 	Webview::StorageId _storageId;
 	const not_null<Delegate*> _delegate;
@@ -153,9 +154,10 @@ private:
 	std::unique_ptr<WebviewWithLifetime> _webview;
 	std::unique_ptr<RpWidget> _webviewBottom;
 	rpl::variable<QString> _bottomText;
-	QPointer<QWidget> _webviewParent;
+	QPointer<RpWidget> _webviewParent;
 	std::unique_ptr<Button> _mainButton;
 	mutable crl::time _mainButtonLastClick = 0;
+	rpl::variable<int> _footerHeight = 0;
 	std::unique_ptr<Progress> _progress;
 	rpl::event_stream<> _themeUpdateForced;
 	rpl::lifetime _headerColorLifetime;

From 4fddaef1125465ab11c675467eb61fda33d1aac1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 20 May 2024 12:53:58 +0400
Subject: [PATCH 521/596] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index ebaa206b1..c68aa80f1 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit ebaa206b1d2f1f24cff08f3c8a73054ee69274f0
+Subproject commit c68aa80f10b2953f2d32572e9ae1a5c29cfbfe78

From df808df8d30bdc49f9b208b0dca8bde024ff2844 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 12:59:51 +0000
Subject: [PATCH 522/596] Bump actions/upload-artifact from 2 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/linux.yml        | 2 +-
 .github/workflows/mac.yml          | 2 +-
 .github/workflows/mac_packaged.yml | 2 +-
 .github/workflows/snap.yml         | 2 +-
 .github/workflows/win.yml          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index e8d8f5901..8eb20a2e5 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -116,7 +116,7 @@ jobs:
           cd $REPO_NAME/out/Debug
           sudo mkdir artifact
           sudo mv {Telegram,Updater} artifact/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 8a83d62dd..e5f5e5620 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -134,7 +134,7 @@ jobs:
           mkdir artifact
           mv Telegram.app artifact/
           mv Updater artifact/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index 9b40c249e..bd51bb74a 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -153,7 +153,7 @@ jobs:
           cd $REPO_NAME/build
           mkdir artifact
           mv Telegram.dmg artifact/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index c2ee6773a..93ef6ad36 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -75,7 +75,7 @@ jobs:
           mkdir artifact
           mv $artifact_name artifact
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 1200e1de0..ca0c7bf09 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -183,7 +183,7 @@ jobs:
           mkdir artifact
           move %OUT%\Telegram.exe artifact/
           move %OUT%\Updater.exe artifact/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         name: Upload artifact.
         if: (env.UPLOAD_ARTIFACT == 'true') || (github.ref == 'refs/heads/nightly')
         with:

From 7dbf8ca1f481e081607dcade5ca1f93afa4599d4 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 21 May 2024 11:24:20 +0400
Subject: [PATCH 523/596] Remove unneeded Qt::WA_InputMethodEnabled

The widget already had it
---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6e5c30b7b..e3ee48b9e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -240,8 +240,6 @@ Widget::Widget(
 	: nullptr)
 , _searchTimer([=] { searchMessages(); })
 , _singleMessageSearch(&controller->session()) {
-	setAttribute(Qt::WA_InputMethodEnabled);
-
 	const auto makeChildListShown = [](PeerId peerId, float64 shown) {
 		return InnerWidget::ChildListShown{ peerId, shown };
 	};

From 8a5ad581b8847ca7beb1c664b115901ae448e35b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 21 May 2024 14:18:00 +0400
Subject: [PATCH 524/596] Update Qt to 6.7.1 on Linux

---
 Telegram/build/docker/centos_env/Dockerfile | 4 ++--
 snap/snapcraft.yaml                         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 1f623e190..f41aa85a8 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -1,6 +1,6 @@
 {%- set GIT = "https://github.com" -%}
 {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
-{%- set QT = "6.7.0" -%}
+{%- set QT = "6.7.1" -%}
 {%- set QT_TAG = "v" ~ QT -%}
 {%- set CMAKE_VER = "3.27.6" -%}
 {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 931535985f75ca51313923d31d7924560719b3eb \
+	&& git fetch --depth=1 origin 803f1c2630f5eb0d3b00ba3f095b3079c0533156 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7a6fc8ffa..d9db537b3 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -165,7 +165,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 931535985f75ca51313923d31d7924560719b3eb
+    source-commit: 803f1c2630f5eb0d3b00ba3f095b3079c0533156
     plugin: dump
     override-pull: |
       craftctl default
@@ -360,7 +360,7 @@ parts:
       - mesa-vulkan-drivers
       - xkb-data
     override-pull: |
-      QT=6.7.0
+      QT=6.7.1
 
       git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git .
       git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools

From 198528f79ff5f4f05a707ee448d898aee730ef91 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 21 May 2024 13:23:07 +0400
Subject: [PATCH 525/596] Remove code needed for a removed patch

---
 .../SourceFiles/platform/linux/integration_linux.cpp   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index b2a8cf611..147a9f03c 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -17,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/random.h"
 
 #include <QtCore/QAbstractEventDispatcher>
-#include <qpa/qwindowsysteminterface.h>
 
 #include <gio/gio.hpp>
 #include <xdpinhibit/xdpinhibit.hpp>
@@ -190,23 +189,24 @@ private:
 
 	const gi::ref_ptr<Application> _application;
 	XdpInhibit::InhibitProxy _inhibitProxy;
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 	base::Platform::XDP::SettingWatcher _darkModeWatcher;
+#endif // Qt < 6.5.0
 };
 
 LinuxIntegration::LinuxIntegration()
 : _application(MakeApplication())
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 , _darkModeWatcher(
 	"org.freedesktop.appearance",
 	"color-scheme",
 	[](GLib::Variant value) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-		QWindowSystemInterface::handleThemeChange();
-#else // Qt >= 6.5.0
 		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
 			Core::App().settings().setSystemDarkMode(value.get_uint32() == 1);
 		});
+})
 #endif // Qt < 6.5.0
-}) {
+{
 	LOG(("Icon theme: %1").arg(QIcon::themeName()));
 	LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
 

From 5e3e9ba8240ebbb7ac85410137e30a6e5791d558 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 22 May 2024 03:36:24 +0400
Subject: [PATCH 526/596] Ensure Qt doesn't prevent quit due to ignored widget
 close events

---
 Telegram/SourceFiles/core/sandbox.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 3daf91784..4110a73a7 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -255,7 +255,10 @@ void Sandbox::setupScreenScale() {
 Sandbox::~Sandbox() = default;
 
 bool Sandbox::event(QEvent *e) {
-	if (e->type() == QEvent::Quit && !Quitting()) {
+	if (e->type() == QEvent::Quit) {
+		if (Quitting()) {
+			return QCoreApplication::event(e);
+		}
 		Quit(QuitReason::QtQuitEvent);
 		e->ignore();
 		return false;

From 84ec2a5f7494ffc2516ecc78ef89aba3da199b33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 May 2024 21:18:42 +0400
Subject: [PATCH 527/596] Possibly fix wrong requests order.

---
 Telegram/SourceFiles/mtproto/mtp_instance.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
index 76c5cb623..ee1095837 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
@@ -1020,12 +1020,25 @@ void Instance::Private::sendRequest(
 	const auto signedDcId = toMainDc ? -realShiftedDcId : realShiftedDcId;
 	registerRequest(requestId, signedDcId);
 
-	if (afterRequestId) {
-		request->after = getRequest(afterRequestId);
-	}
 	request->lastSentTime = crl::now();
 	request->needsLayer = needsLayer;
 
+	if (afterRequestId) {
+		request->after = getRequest(afterRequestId);
+
+		if (request->after) {
+			// Check if this after request is waiting in _dependentRequests.
+			// This happens if it was after some other request and failed
+			// to wait for it, but that other request is still processed.
+			QMutexLocker locker(&_dependentRequestsLock);
+			const auto i = _dependentRequests.find(afterRequestId);
+			if (i != end(_dependentRequests)) {
+				_dependentRequests.emplace(requestId, afterRequestId);
+				return;
+			}
+		}
+	}
+
 	session->sendPrepared(request, msCanWait);
 }
 

From 39c1da6642cc3b2b134c9430af300bd4745112e4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 15 May 2024 18:55:39 +0400
Subject: [PATCH 528/596] Attempt to fix jump to unread in some cases.

---
 Telegram/SourceFiles/data/data_replies_list.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Telegram/SourceFiles/data/data_replies_list.cpp b/Telegram/SourceFiles/data/data_replies_list.cpp
index 5c1700093..2a962dc1b 100644
--- a/Telegram/SourceFiles/data/data_replies_list.cpp
+++ b/Telegram/SourceFiles/data/data_replies_list.cpp
@@ -368,6 +368,16 @@ bool RepliesList::buildFromData(not_null<Viewer*> viewer) {
 			return viewer->around;
 		} else if (const auto item = lookupRoot()) {
 			return computeInboxReadTillFull();
+		} else if (_owningTopic) {
+			// Somehow we don't want always to jump to computed inboxReadTill
+			// (this was in the code before, but I don't remember why).
+			// Maybe in case we "View Thread" from a group we don't really
+			// want to jump to unread inside thread, cause it isn't defined.
+			//
+			// But in case of topics we definitely want to support jumping
+			// to the first unread, even if it is General topic without the
+			// actual root message or it is a broken topic without root.
+			return computeInboxReadTillFull();
 		}
 		return viewer->around;
 	}();

From f10f3c08dedea7f42fe2dbd89bcb241497daf733 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 15 May 2024 18:55:56 +0400
Subject: [PATCH 529/596] Attempt to fix sending messages to broken topics.

---
 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 2c20bcec0..cdc57d00d 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -3543,7 +3543,8 @@ void HistoryItem::createComponentsHelper(HistoryItemCommonFields &&fields) {
 		const auto topicPost = config.reply.externalPeerId
 			? (replyTo.topicRootId
 				&& (replyTo.topicRootId != Data::ForumTopic::kGeneralId))
-			: (LookupReplyIsTopicPost(to)
+			: (topic
+				|| LookupReplyIsTopicPost(to)
 				|| (to && to->Has<HistoryServiceTopicInfo>())
 				|| (forum && forum->creating(config.reply.topMessageId)));
 		config.reply.topicPost = topicPost ? 1 : 0;

From ec6d6a78cf6180bbeeed08fb2bd219b991d6b88b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 13:29:03 +0400
Subject: [PATCH 530/596] Tab toggles search focus, Backspace doesn't focus.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 33 ++++++++++++-------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 +-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e3ee48b9e..a777cddca 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -98,6 +98,15 @@ base::options::toggle OptionForumHideChatsList({
 	.description = "Don't keep a narrow column of chats list.",
 });
 
+[[nodiscard]] bool RedirectTextToSearch(const QString &text) {
+	for (const auto &ch : text) {
+		if (ch.unicode() >= 32) {
+			return true;
+		}
+	}
+	return false;
+}
+
 } // namespace
 
 const char kOptionForumHideChatsList[] = "forum-hide-chats-list";
@@ -454,7 +463,6 @@ Widget::Widget(
 		loadMoreBlockedByDate();
 	}, lifetime());
 
-	_search->setFocusPolicy(Qt::StrongFocus);
 	_search->customUpDown(true);
 
 	updateJumpToDateVisibility(true);
@@ -1514,16 +1522,17 @@ void Widget::checkUpdateStatus() {
 	updateControlsGeometry();
 }
 
-void Widget::setInnerFocus() {
+void Widget::setInnerFocus(bool unfocusSearch) {
 	if (_childList) {
 		_childList->setInnerFocus();
 	} else if ((_openedFolder || _openedForum)
 		&& _subsectionTopBar->searchSetFocus()) {
 		return;
-	} else if (!_search->getLastText().isEmpty()
-		|| _searchInChat
-		|| _searchHasFocus
-		|| _searchSuggestionsLocked) {
+	} else if (!unfocusSearch
+		&& (!_search->getLastText().isEmpty()
+			|| _searchInChat
+			|| _searchHasFocus
+			|| _searchSuggestionsLocked)) {
 		_search->setFocus();
 	} else {
 		setFocus();
@@ -2874,7 +2883,7 @@ bool Widget::setSearchInChat(
 	if (_searchInChat || !_search->getLastText().isEmpty()) {
 		_search->setFocus();
 	} else {
-		setFocus();
+		setInnerFocus(true);
 	}
 	updateForceDisplayWide();
 	return true;
@@ -3255,7 +3264,7 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		//} else {
 		//	e->ignore();
 		//}
-	} else if (e->key() == Qt::Key_Backspace
+	} else if ((e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Tab)
 		&& _searchHasFocus
 		&& !_searchInChat) {
 		escape();
@@ -3339,7 +3348,7 @@ bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
 	}
 	const auto character = !(e->modifiers() & ~Qt::ShiftModifier)
 		&& (e->key() != Qt::Key_Shift)
-		&& !e->text().isEmpty();
+		&& RedirectTextToSearch(e->text());
 	if (character) {
 		return true;
 	} else if (e != QKeySequence::Paste) {
@@ -3467,7 +3476,7 @@ bool Widget::cancelSearch() {
 	if (!clearingQuery
 		&& _subsectionTopBar
 		&& _subsectionTopBar->toggleSearch(false, anim::type::normal)) {
-		setFocus();
+		setInnerFocus(true);
 		clearingInChat = true;
 	}
 	const auto clearSearchFocus = !_searchInChat
@@ -3478,7 +3487,7 @@ bool Widget::cancelSearch() {
 	}
 	if (!_suggestions && clearSearchFocus) {
 		// Don't create suggestions in unfocus case.
-		setFocus();
+		setInnerFocus(true);
 	}
 	_lastSearchPeer = nullptr;
 	_lastSearchId = _lastSearchMigratedId = 0;
@@ -3486,7 +3495,7 @@ bool Widget::cancelSearch() {
 	clearSearchField();
 	applySearchUpdate();
 	if (_suggestions && clearSearchFocus) {
-		setFocus();
+		setInnerFocus(true);
 	}
 	return clearingQuery || clearingInChat || clearSearchFocus;
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index aa6dbdf93..b183cb36f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -99,7 +99,7 @@ public:
 		not_null<Data::Forum*> forum,
 		const Window::SectionShow &params);
 	void searchInChat(Key chat);
-	void setInnerFocus();
+	void setInnerFocus(bool unfocusSearch = false);
 	[[nodiscard]] bool searchHasFocus() const;
 
 	void jumpToTop(bool belowPinned = false);

From ba8bb2d50f9c8707fca207429ca39018517f1b88 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 13:35:01 +0400
Subject: [PATCH 531/596] Add .vscode to .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 678ef32e3..c2896799e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ Release/
 *.xcodeproj
 ipch/
 .vs/
+.vscode/
 
 /Telegram/log.txt
 /Telegram/data

From 1c6f45d8d3e6cfe01b0c35aa7ba1c5e6b08a58ec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 19 May 2024 12:05:01 +0400
Subject: [PATCH 532/596] Fix drag-n-drop to frequent/recent contacts.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  | 10 ++++
 Telegram/SourceFiles/boxes/peer_list_box.h    |  3 ++
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 23 ++++++---
 .../dialogs/ui/dialogs_suggestions.cpp        | 51 +++++++++++++++++++
 .../dialogs/ui/dialogs_suggestions.h          | 18 +++++++
 .../dialogs/ui/top_peers_strip.cpp            | 30 +++++++++--
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |  5 ++
 7 files changed, 129 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 7aa48aaa3..dca4a065b 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -2125,6 +2125,16 @@ bool PeerListContent::submitted() {
 	return false;
 }
 
+PeerListRowId PeerListContent::updateFromParentDrag(QPoint globalPosition) {
+	selectByMouse(globalPosition);
+	const auto row = getRow(_selected.index);
+	return row ? row->id() : 0;
+}
+
+void PeerListContent::dragLeft() {
+	clearSelection();
+}
+
 void PeerListContent::visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 335001e02..4349fd8c6 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -625,6 +625,9 @@ public:
 	void searchQueryChanged(QString query);
 	bool submitted();
 
+	PeerListRowId updateFromParentDrag(QPoint globalPosition);
+	void dragLeft();
+
 	// Interface for the controller.
 	void appendRow(std::unique_ptr<PeerListRow> row);
 	void appendSearchRow(std::unique_ptr<PeerListRow> row);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index a777cddca..da180d120 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2543,15 +2543,18 @@ void Widget::dragMoveEvent(QDragMoveEvent *e) {
 		} else {
 			_chooseByDragTimer.callOnce(ChoosePeerByDragTimeout);
 		}
-		if (_inner->updateFromParentDrag(mapToGlobal(e->pos()))) {
-			e->setDropAction(Qt::CopyAction);
-		} else {
-			e->setDropAction(Qt::IgnoreAction);
-		}
+		const auto global = mapToGlobal(e->pos());
+		const auto thread = _suggestions
+			? _suggestions->updateFromParentDrag(global)
+			: _inner->updateFromParentDrag(global);
+		e->setDropAction(thread ? Qt::CopyAction : Qt::IgnoreAction);
 	} else {
 		if (_dragForward) {
 			updateDragInScroll(false);
 		}
+		if (_suggestions) {
+			_suggestions->dragLeft();
+		}
 		_inner->dragLeft();
 		e->setDropAction(Qt::IgnoreAction);
 	}
@@ -2564,6 +2567,9 @@ void Widget::dragLeaveEvent(QDragLeaveEvent *e) {
 	} else {
 		_chooseByDragTimer.cancel();
 	}
+	if (_suggestions) {
+		_suggestions->dragLeft();
+	}
 	_inner->dragLeft();
 	e->accept();
 }
@@ -2582,8 +2588,11 @@ void Widget::updateDragInScroll(bool inScroll) {
 void Widget::dropEvent(QDropEvent *e) {
 	_chooseByDragTimer.cancel();
 	if (_scroll->geometry().contains(e->pos())) {
-		const auto point = mapToGlobal(e->pos());
-		if (const auto thread = _inner->updateFromParentDrag(point)) {
+		const auto globalPosition = mapToGlobal(e->pos());
+		const auto thread = _suggestions
+			? _suggestions->updateFromParentDrag(globalPosition)
+			: _inner->updateFromParentDrag(globalPosition);
+		if (thread) {
 			e->setDropAction(Qt::CopyAction);
 			e->accept();
 			controller()->content()->filesOrForwardDrop(
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 50362e657..37be201fa 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -1121,6 +1121,39 @@ void Suggestions::chooseRow() {
 	}
 }
 
+Data::Thread *Suggestions::updateFromParentDrag(QPoint globalPosition) {
+	return (_tab.current() == Tab::Chats)
+		? updateFromChatsDrag(globalPosition)
+		: updateFromChannelsDrag(globalPosition);
+}
+
+Data::Thread *Suggestions::updateFromChatsDrag(QPoint globalPosition) {
+	if (const auto top = _topPeers->updateFromParentDrag(globalPosition)) {
+		return _controller->session().data().history(PeerId(top));
+	}
+	return fromListId(_recentUpdateFromParentDrag(globalPosition));
+}
+
+Data::Thread *Suggestions::updateFromChannelsDrag(QPoint globalPosition) {
+	if (const auto id = _myChannelsUpdateFromParentDrag(globalPosition)) {
+		return fromListId(id);
+	}
+	return fromListId(_recommendationsUpdateFromParentDrag(globalPosition));
+}
+
+Data::Thread *Suggestions::fromListId(uint64 peerListRowId) {
+	return peerListRowId
+		? _controller->session().data().history(PeerId(peerListRowId)).get()
+		: nullptr;
+}
+
+void Suggestions::dragLeft() {
+	_topPeers->dragLeft();
+	_recentDragLeft();
+	_myChannelsDragLeft();
+	_recommendationsDragLeft();
+}
+
 void Suggestions::show(anim::type animated, Fn<void()> finish) {
 	RpWidget::show();
 
@@ -1304,6 +1337,12 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 		}
 		return JumpResult::NotApplied;
 	};
+	_recentUpdateFromParentDrag = [=](QPoint globalPosition) {
+		return raw->updateFromParentDrag(globalPosition);
+	};
+	_recentDragLeft = [=] {
+		raw->dragLeft();
+	};
 	raw->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		const auto add = _topPeersWrap->toggled() ? _topPeers->height() : 0;
@@ -1438,6 +1477,12 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupMyChannels() {
 		}
 		return JumpResult::NotApplied;
 	};
+	_myChannelsUpdateFromParentDrag = [=](QPoint globalPosition) {
+		return raw->updateFromParentDrag(globalPosition);
+	};
+	_myChannelsDragLeft = [=] {
+		raw->dragLeft();
+	};
 	raw->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		_channelsScroll->scrollToY(request.ymin, request.ymax);
@@ -1499,6 +1544,12 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecommendations() {
 		}
 		return JumpResult::NotApplied;
 	};
+	_recommendationsUpdateFromParentDrag = [=](QPoint globalPosition) {
+		return raw->updateFromParentDrag(globalPosition);
+	};
+	_recommendationsDragLeft = [=] {
+		raw->dragLeft();
+	};
 	raw->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		const auto add = _myChannels->toggled() ? _myChannels->height() : 0;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 49b74fa74..947bf2fa9 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -12,6 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 
+namespace Data {
+class Thread;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -46,6 +50,9 @@ public:
 	void selectJump(Qt::Key direction, int pageSize = 0);
 	void chooseRow();
 
+	[[nodiscard]] Data::Thread *updateFromParentDrag(QPoint globalPosition);
+	void dragLeft();
+
 	void show(anim::type animated, Fn<void()> finish);
 	void hide(anim::type animated, Fn<void()> finish);
 	[[nodiscard]] float64 shownOpacity() const;
@@ -90,6 +97,11 @@ private:
 	void selectJumpChats(Qt::Key direction, int pageSize);
 	void selectJumpChannels(Qt::Key direction, int pageSize);
 
+	[[nodiscard]] Data::Thread *updateFromChatsDrag(QPoint globalPosition);
+	[[nodiscard]] Data::Thread *updateFromChannelsDrag(
+		QPoint globalPosition);
+	[[nodiscard]] Data::Thread *fromListId(uint64 peerListRowId);
+
 	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupRecentPeers(
 		RecentPeersList recentPeers);
 	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupEmptyRecent();
@@ -121,6 +133,8 @@ private:
 	rpl::variable<int> _recentCount;
 	Fn<bool()> _recentPeersChoose;
 	Fn<JumpResult(Qt::Key, int)> _recentSelectJump;
+	Fn<uint64(QPoint)> _recentUpdateFromParentDrag;
+	Fn<void()> _recentDragLeft;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recentPeers;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyRecent;
 
@@ -130,11 +144,15 @@ private:
 	rpl::variable<int> _myChannelsCount;
 	Fn<bool()> _myChannelsChoose;
 	Fn<JumpResult(Qt::Key, int)> _myChannelsSelectJump;
+	Fn<uint64(QPoint)> _myChannelsUpdateFromParentDrag;
+	Fn<void()> _myChannelsDragLeft;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _myChannels;
 
 	rpl::variable<int> _recommendationsCount;
 	Fn<bool()> _recommendationsChoose;
 	Fn<JumpResult(Qt::Key, int)> _recommendationsSelectJump;
+	Fn<uint64(QPoint)> _recommendationsUpdateFromParentDrag;
+	Fn<void()> _recommendationsDragLeft;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recommendations;
 
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyChannels;
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index f793da346..40e758ad2 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -248,7 +248,7 @@ void TopPeersStrip::stripWheelEvent(QWheelEvent *e) {
 
 void TopPeersStrip::stripLeaveEvent(QEvent *e) {
 	if (!_selectionByKeyboard) {
-		setSelected(-1);
+		clearSelection();
 	}
 	if (!_dragging) {
 		_lastMousePosition = std::nullopt;
@@ -299,9 +299,7 @@ void TopPeersStrip::stripMouseMoveEvent(QMouseEvent *e) {
 		&& (_lastMousePosition == e->globalPos())) {
 		return;
 	}
-	_lastMousePosition = e->globalPos();
-	_selectionByKeyboard = false;
-	updateSelected();
+	selectByMouse(e->globalPos());
 
 	if (!_dragging && _mouseDownPosition) {
 		if ((*_lastMousePosition - *_mouseDownPosition).manhattanLength()
@@ -315,6 +313,12 @@ void TopPeersStrip::stripMouseMoveEvent(QMouseEvent *e) {
 	checkDragging();
 }
 
+void TopPeersStrip::selectByMouse(QPoint globalPosition) {
+	_lastMousePosition = globalPosition;
+	_selectionByKeyboard = false;
+	updateSelected();
+}
+
 void TopPeersStrip::checkDragging() {
 	if (_dragging && !_expandAnimation.animating()) {
 		const auto sign = (style::RightToLeft() ? -1 : 1);
@@ -551,6 +555,20 @@ bool TopPeersStrip::chooseRow() {
 	return false;
 }
 
+uint64 TopPeersStrip::updateFromParentDrag(QPoint globalPosition) {
+	if (!rect().contains(mapFromGlobal(globalPosition))) {
+		dragLeft();
+		return 0;
+	}
+	selectByMouse(globalPosition);
+
+	return (_selected >= 0) ? _entries[_selected].id : 0;
+}
+
+void TopPeersStrip::dragLeft() {
+	clearSelection();
+}
+
 void TopPeersStrip::apply(const TopPeersList &list) {
 	if (_hiddenLocally) {
 		return;
@@ -908,6 +926,10 @@ void TopPeersStrip::setSelected(int selected) {
 	}
 }
 
+void TopPeersStrip::clearSelection() {
+	setSelected(-1);
+}
+
 void TopPeersStrip::scrollToSelected() {
 	if (_selected < 0) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 9894235c6..23db15d1f 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -62,6 +62,9 @@ public:
 	void deselectByKeyboard();
 	bool chooseRow();
 
+	uint64 updateFromParentDrag(QPoint globalPosition);
+	void dragLeft();
+
 	[[nodiscard]] auto verticalScrollEvents() const
 		-> rpl::producer<not_null<QWheelEvent*>>;
 
@@ -92,6 +95,8 @@ private:
 	void subscribeUserpic(Entry &entry);
 	void unsubscribeUserpics(bool all = false);
 	void paintUserpic(Painter &p, int x, int y, int index, bool selected);
+	void clearSelection();
+	void selectByMouse(QPoint globalPosition);
 
 	[[nodiscard]] QRect outer() const;
 	[[nodiscard]] QRect innerRounded() const;

From db486e957c58a2b79f57db7b5a7d388b9b990efa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 19 May 2024 10:18:55 +0400
Subject: [PATCH 533/596] Fix group/channel Appearance button style.

---
 Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp | 5 +++--
 Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h   | 3 ++-
 Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp  | 6 +++++-
 Telegram/SourceFiles/info/info.style                     | 4 ++++
 Telegram/SourceFiles/settings/settings_chat.cpp          | 3 ++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index 09b5d273b..b2e292a3c 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -1428,14 +1428,15 @@ void SetupPeerColorSample(
 void AddPeerColorButton(
 		not_null<Ui::VerticalLayout*> container,
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<PeerData*> peer) {
+		not_null<PeerData*> peer,
+		const style::SettingsButton &st) {
 	auto label = peer->isSelf()
 		? tr::lng_settings_theme_name_color()
 		: tr::lng_edit_channel_color();
 	const auto button = AddButtonWithIcon(
 		container,
 		rpl::duplicate(label),
-		st::settingsColorButton,
+		st,
 		{ &st::menuIconChangeColors });
 
 	const auto style = std::make_shared<Ui::ChatStyle>(
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
index 2272123a1..394a13aa8 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
@@ -48,7 +48,8 @@ void EditPeerColorBox(
 void AddPeerColorButton(
 	not_null<Ui::VerticalLayout*> container,
 	std::shared_ptr<ChatHelpers::Show> show,
-	not_null<PeerData*> peer);
+	not_null<PeerData*> peer,
+	const style::SettingsButton &st);
 
 void CheckBoostLevel(
 	std::shared_ptr<ChatHelpers::Show> show,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index f732c794e..c79ef325d 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1016,7 +1016,11 @@ void Controller::fillColorIndexButton() {
 	Expects(_controls.buttonsLayout != nullptr);
 
 	const auto show = _navigation->uiShow();
-	AddPeerColorButton(_controls.buttonsLayout, show, _peer);
+	AddPeerColorButton(
+		_controls.buttonsLayout,
+		_navigation->uiShow(),
+		_peer,
+		st::managePeerColorsButton);
 }
 
 void Controller::fillSignaturesButton() {
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 329a79158..ab16a1bd1 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -665,6 +665,10 @@ manageGroupTopicsButton: SettingsCountButton(manageGroupTopButtonWithText) {
 		}
 	}
 }
+managePeerColorsButton: SettingsButton(infoProfileButton) {
+	padding: margins(60px, 10px, 48px, 8px);
+}
+
 manageGroupNoIconButtonInner: SettingsButton(infoProfileButton) {
 	padding: margins(25px, 11px, 24px, 8px);
 }
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index 2bc52090e..9b2222b0e 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -1576,7 +1576,8 @@ void SetupThemeSettings(
 	AddPeerColorButton(
 		container,
 		controller->uiShow(),
-		controller->session().user());
+		controller->session().user(),
+		st::settingsColorButton);
 
 	const auto settings = &Core::App().settings();
 	if (settings->systemDarkMode().has_value()) {

From cedd8fc546df3e58cabd08dc867021444695e061 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 19 May 2024 11:44:05 +0400
Subject: [PATCH 534/596] Fix incorrect replace media button show in reply.

---
 Telegram/SourceFiles/history/history_widget.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 5e8da7f99..029da2623 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -8150,12 +8150,14 @@ void HistoryWidget::updateReplyEditTexts(bool force) {
 		}
 	}
 	if (_replyEditMsg) {
-		const auto media = _replyEditMsg->media();
-		_canReplaceMedia = media && media->allowsEditMedia();
+		const auto editMedia = _editMsgId
+			? _replyEditMsg->media()
+			: nullptr;
+		_canReplaceMedia = editMedia && editMedia->allowsEditMedia();
 		_photoEditMedia = (_canReplaceMedia
-			&& media->photo()
-			&& !media->photo()->isNull())
-			? media->photo()->createMediaView()
+			&& editMedia->photo()
+			&& !editMedia->photo()->isNull())
+			? editMedia->photo()->createMediaView()
 			: nullptr;
 		if (_photoEditMedia) {
 			_photoEditMedia->wanted(

From 74db2167f9c9bd64df7fce8951557b52dae9cced Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 19 May 2024 11:57:10 +0400
Subject: [PATCH 535/596] Allow copy custom emoji from panel.

---
 .../SourceFiles/chat_helpers/emoji_list_widget.cpp  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 2157e9168..a5b72ca7b 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -1134,9 +1134,7 @@ void EmojiListWidget::fillRecentMenu(
 		not_null<Ui::PopupMenu*> menu,
 		int section,
 		int index) {
-	if (section != int(Section::Recent)) {
-		return;
-	}
+	const auto recent = (section == int(Section::Recent));
 	const auto addAction = Ui::Menu::CreateAddActionCallback(menu);
 	const auto over = OverEmoji{ section, index };
 	const auto emoji = lookupOverEmoji(&over);
@@ -1157,18 +1155,21 @@ void EmojiListWidget::fillRecentMenu(
 				TextUtilities::SetClipboardText(data);
 			}, &st::menuIconCopy);
 		}
-		if (setId && _features.openStickerSets) {
+		if (recent && setId && _features.openStickerSets) {
 			addAction(
 				tr::lng_emoji_view_pack(tr::now),
 				crl::guard(this, [=] { displaySet(setId); }),
 				&st::menuIconShowAll);
 		}
-	} else if (emoji) {
+	} else if (recent && emoji) {
 		addAction(tr::lng_emoji_copy(tr::now), [=] {
 			const auto text = emoji->text();
 			TextUtilities::SetClipboardText({ text, { text } });
 		}, &st::menuIconCopy);
 	}
+	if (!recent) {
+		return;
+	}
 	auto id = RecentEmojiId{ emoji };
 	if (custom) {
 		id.data = RecentEmojiDocument{
@@ -1194,7 +1195,7 @@ void EmojiListWidget::fillRecentMenu(
 			.confirmed = crl::guard(this, sure),
 			.confirmText = tr::lng_emoji_reset_recent_button(tr::now),
 			.labelStyle = &st().boxLabel,
-			}));
+		}));
 	};
 	addAction({
 		.text = tr::lng_emoji_reset_recent(tr::now),

From c3fab28e1ce539824991d6d37d24d3796901c0fd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 13 May 2024 10:55:52 +0400
Subject: [PATCH 536/596] Improve scroll style for limited reaction selector.

---
 Telegram/SourceFiles/chat_helpers/chat_helpers.style        | 6 ++++++
 .../view/reactions/history_view_reactions_selector.cpp      | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index f8c8ad61b..73dc78f23 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -785,6 +785,12 @@ emojiScroll: ScrollArea(defaultSolidScroll) {
 reactPanelScroll: ScrollArea(emojiScroll) {
 	deltab: 7px;
 }
+reactPanelScrollRounded: ScrollArea(emojiScroll) {
+	width: 8px;
+	deltax: 3px;
+	deltat: 14px;
+	deltab: 14px;
+}
 
 choosePeerGroupIcon: icon {{ "info/edit/create_group", lightButtonFg }};
 choosePeerChannelIcon: icon {{ "info/edit/create_channel", lightButtonFg }};
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index da65f0902..cce557ffc 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -924,7 +924,9 @@ void Selector::createList() {
 		&_show->session(),
 		_strip ? _reactions.recent : std::vector<Data::Reaction>(),
 		_strip.get());
-	_scroll = Ui::CreateChild<Ui::ScrollArea>(this, st::reactPanelScroll);
+	_scroll = Ui::CreateChild<Ui::ScrollArea>(this, _reactions.customAllowed
+		? st::reactPanelScroll
+		: st::reactPanelScrollRounded);
 	_scroll->hide();
 
 	const auto st = lifetime().make_state<style::EmojiPan>(_st);

From 0551550e6191dff57c050072fc749c4017271be1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 16:44:55 +0400
Subject: [PATCH 537/596] Don't always open last topic in forums.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index da180d120..ae4061717 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -581,14 +581,6 @@ void Widget::chosenRow(const ChosenRow &row) {
 				history,
 				ShowAtUnreadMsgId,
 				Window::SectionShow::Way::ClearStack);
-		} else if (!controller()->adaptive().isOneColumn()) {
-			const auto item = history->chatListMessage();
-			if (const auto topic = item ? item->topic() : nullptr) {
-				controller()->showThread(
-					topic,
-					ShowAtUnreadMsgId,
-					Window::SectionShow::Way::ClearStack);
-			}
 		}
 		return;
 	} else if (history) {

From 685c7a865e697687baedccf3f01a30d3dc5a8726 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 May 2024 14:22:01 +0400
Subject: [PATCH 538/596] Use 64 iterations (like OpenSSL 3 for 2048 primes).

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index d4e5c298f..e2c62ef0b 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit d4e5c298fc50f0b7cdd90e9998e71f6aa8f1c5e9
+Subproject commit e2c62ef0b4581d84e4ff79623a7e5e9ed315bad7

From 4d4cf472c8bde691cbec4a99c7cfb139b9759cb8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 23 May 2024 13:06:38 +0400
Subject: [PATCH 539/596] Fix crash in group emoji set saving.

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

diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 7de254bad..b63ae6967 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -509,7 +509,7 @@ TabbedSelector::TabbedSelector(
 			_st.categoriesBg);
 	}, lifetime());
 
-	if (hasEmojiTab()) {
+	if (hasEmojiTab() && _mode == Mode::Full) {
 		session().data().stickers().emojiSetInstalled(
 		) | rpl::start_with_next([=](uint64 setId) {
 			_tabsSlider->setActiveSection(indexByType(SelectorTab::Emoji));

From d91b75b8f8aff77f826381b836f30f0abff3ee7e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 13:35:21 +0400
Subject: [PATCH 540/596] Allow wide chats in empty window.

---
 Telegram/SourceFiles/core/core_settings.cpp   | 84 +++++++++++++++----
 Telegram/SourceFiles/core/core_settings.h     | 16 +++-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  3 +-
 .../main/main_session_settings.cpp            |  4 +-
 Telegram/SourceFiles/mainwidget.cpp           | 63 ++++++++------
 Telegram/SourceFiles/mainwidget.h             |  2 +-
 .../details/storage_settings_scheme.cpp       |  2 +-
 .../window/window_session_controller.cpp      | 21 +++--
 .../window/window_session_controller.h        | 11 +++
 9 files changed, 149 insertions(+), 57 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 939f4d053..a54f5ef33 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -123,7 +123,8 @@ Settings::Settings()
 : _sendSubmitWay(Ui::InputSubmitSettings::Enter)
 , _floatPlayerColumn(Window::Column::Second)
 , _floatPlayerCorner(RectPart::TopRight)
-, _dialogsWidthRatio(DefaultDialogsWidthRatio()) {
+, _dialogsWithChatWidthRatio(DefaultDialogsWidthRatio())
+, _dialogsNoChatWidthRatio(DefaultDialogsWidthRatio()) {
 }
 
 Settings::~Settings() = default;
@@ -218,7 +219,8 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_callCaptureDeviceId.current())
 		+ Serialize::bytearraySize(ivPosition)
 		+ Serialize::stringSize(noWarningExtensions)
-		+ Serialize::stringSize(_customFontFamily);
+		+ Serialize::stringSize(_customFontFamily)
+		+ sizeof(qint32);
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -280,7 +282,7 @@ QByteArray Settings::serialize() const {
 			<< qint32(_floatPlayerCorner)
 			<< qint32(_thirdSectionInfoEnabled ? 1 : 0)
 			<< qint32(std::clamp(
-				qRound(_dialogsWidthRatio.current() * 1000000),
+				qRound(_dialogsWithChatWidthRatio.current() * 1000000),
 				0,
 				1000000))
 			<< qint32(_thirdColumnWidth.current())
@@ -365,7 +367,11 @@ QByteArray Settings::serialize() const {
 			<< _callCaptureDeviceId.current()
 			<< ivPosition
 			<< noWarningExtensions
-			<< _customFontFamily;
+			<< _customFontFamily
+			<< qint32(std::clamp(
+				qRound(_dialogsNoChatWidthRatio.current() * 1000000),
+				0,
+				1000000));
 	}
 
 	Ensures(result.size() == size);
@@ -434,7 +440,8 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 floatPlayerColumn = static_cast<qint32>(Window::Column::Second);
 	qint32 floatPlayerCorner = static_cast<qint32>(RectPart::TopRight);
 	qint32 thirdSectionInfoEnabled = 0;
-	float64 dialogsWidthRatio = _dialogsWidthRatio.current();
+	float64 dialogsWithChatWidthRatio = _dialogsWithChatWidthRatio.current();
+	float64 dialogsNoChatWidthRatio = _dialogsNoChatWidthRatio.current();
 	qint32 thirdColumnWidth = _thirdColumnWidth.current();
 	qint32 thirdSectionExtendedBy = _thirdSectionExtendedBy;
 	qint32 notifyFromAll = _notifyFromAll ? 1 : 0;
@@ -546,18 +553,18 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 			>> mainMenuAccountsShown;
 	}
 	if (!stream.atEnd()) {
-		auto dialogsWidthRatioInt = qint32();
+		auto dialogsWithChatWidthRatioInt = qint32();
 		stream
 			>> tabbedSelectorSectionEnabled
 			>> floatPlayerColumn
 			>> floatPlayerCorner
 			>> thirdSectionInfoEnabled
-			>> dialogsWidthRatioInt
+			>> dialogsWithChatWidthRatioInt
 			>> thirdColumnWidth
 			>> thirdSectionExtendedBy
 			>> notifyFromAll;
-		dialogsWidthRatio = std::clamp(
-			dialogsWidthRatioInt / 1000000.,
+		dialogsWithChatWidthRatio = std::clamp(
+			dialogsWithChatWidthRatioInt / 1000000.,
 			0.,
 			1.);
 	}
@@ -772,6 +779,15 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> customFontFamily;
 	}
+	if (!stream.atEnd()) {
+		auto dialogsNoChatWidthRatioInt = qint32();
+		stream
+			>> dialogsNoChatWidthRatioInt;
+		dialogsNoChatWidthRatio = std::clamp(
+			dialogsNoChatWidthRatioInt / 1000000.,
+			0.,
+			1.);
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -872,7 +888,10 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	case RectPart::BottomRight: _floatPlayerCorner = uncheckedCorner; break;
 	}
 	_thirdSectionInfoEnabled = thirdSectionInfoEnabled;
-	_dialogsWidthRatio = dialogsWidthRatio;
+	_dialogsWithChatWidthRatio = dialogsWithChatWidthRatio;
+	_dialogsNoChatWidthRatio = (dialogsWithChatWidthRatio > 0)
+		? dialogsWithChatWidthRatio
+		: dialogsNoChatWidthRatio;
 	_thirdColumnWidth = thirdColumnWidth;
 	_thirdSectionExtendedBy = thirdSectionExtendedBy;
 	if (_thirdSectionInfoEnabled) {
@@ -1025,16 +1044,46 @@ void Settings::setTabbedReplacedWithInfo(bool enabled) {
 	}
 }
 
-void Settings::setDialogsWidthRatio(float64 ratio) {
-	_dialogsWidthRatio = ratio;
+void Settings::updateDialogsWidthRatio(float64 ratio, bool nochat) {
+	const auto changeWithChat = !nochat
+		|| (dialogsWithChatWidthRatio() > 0)
+		|| _dialogsWidthSetToZeroWithoutChat;
+	const auto changedWithChat = changeWithChat
+		&& (dialogsWithChatWidthRatio() != ratio);
+
+	const auto changeNoChat = nochat
+		|| (dialogsWithChatWidthRatio() != ratio);
+	const auto changedNoChat = changeNoChat
+		&& (dialogsNoChatWidthRatio() != ratio);
+
+	if (changedWithChat) {
+		_dialogsWidthSetToZeroWithoutChat = nochat && !(ratio > 0);
+		_dialogsWithChatWidthRatio = ratio;
+	}
+	if (changedNoChat) {
+		_dialogsNoChatWidthRatio = ratio;
+	}
 }
 
-float64 Settings::dialogsWidthRatio() const {
-	return _dialogsWidthRatio.current();
+float64 Settings::dialogsWidthRatio(bool nochat) const {
+	const auto withchat = dialogsWithChatWidthRatio();
+	return (!nochat || withchat > 0) ? withchat : dialogsNoChatWidthRatio();
 }
 
-rpl::producer<float64> Settings::dialogsWidthRatioChanges() const {
-	return _dialogsWidthRatio.changes();
+float64 Settings::dialogsWithChatWidthRatio() const {
+	return _dialogsWithChatWidthRatio.current();
+}
+
+rpl::producer<float64> Settings::dialogsWithChatWidthRatioChanges() const {
+	return _dialogsWithChatWidthRatio.changes();
+}
+
+float64 Settings::dialogsNoChatWidthRatio() const {
+	return _dialogsNoChatWidthRatio.current();
+}
+
+rpl::producer<float64> Settings::dialogsNoChatWidthRatioChanges() const {
+	return _dialogsNoChatWidthRatio.changes();
 }
 
 void Settings::setThirdColumnWidth(int width) {
@@ -1326,7 +1375,8 @@ void Settings::resetOnLastLogout() {
 	_floatPlayerCorner = RectPart::TopRight; // per-window
 	_thirdSectionInfoEnabled = true; // per-window
 	_thirdSectionExtendedBy = -1; // per-window
-	_dialogsWidthRatio = DefaultDialogsWidthRatio(); // per-window
+	_dialogsWithChatWidthRatio = DefaultDialogsWidthRatio(); // per-window
+	_dialogsNoChatWidthRatio = DefaultDialogsWidthRatio(); // per-window
 	_thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
 	_notifyFromAll = true;
 	_tabbedReplacedWithInfo = false; // per-window
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 9ebd4887e..2588923c6 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -614,9 +614,15 @@ public:
 	[[nodiscard]] RectPart floatPlayerCorner() const {
 		return _floatPlayerCorner;
 	}
-	void setDialogsWidthRatio(float64 ratio);
-	[[nodiscard]] float64 dialogsWidthRatio() const;
-	[[nodiscard]] rpl::producer<float64> dialogsWidthRatioChanges() const;
+
+	void updateDialogsWidthRatio(float64 ratio, bool nochat);
+	[[nodiscard]] float64 dialogsWidthRatio(bool nochat) const;
+
+	[[nodiscard]] float64 dialogsWithChatWidthRatio() const;
+	[[nodiscard]] rpl::producer<float64> dialogsWithChatWidthRatioChanges() const;
+	[[nodiscard]] float64 dialogsNoChatWidthRatio() const;
+	[[nodiscard]] rpl::producer<float64> dialogsNoChatWidthRatioChanges() const;
+
 	void setThirdColumnWidth(int width);
 	[[nodiscard]] int thirdColumnWidth() const;
 	[[nodiscard]] rpl::producer<int> thirdColumnWidthChanges() const;
@@ -969,7 +975,8 @@ private:
 	bool _thirdSectionInfoEnabled = true; // per-window
 	rpl::event_stream<bool> _thirdSectionInfoEnabledValue; // per-window
 	int _thirdSectionExtendedBy = -1; // per-window
-	rpl::variable<float64> _dialogsWidthRatio; // per-window
+	rpl::variable<float64> _dialogsWithChatWidthRatio; // per-window
+	rpl::variable<float64> _dialogsNoChatWidthRatio; // per-window
 	rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
 	bool _notifyFromAll = true;
 	rpl::variable<bool> _nativeWindowFrame = false;
@@ -1015,6 +1022,7 @@ private:
 	float64 _rememberedSongVolume = kDefaultVolume;
 	bool _rememberedSoundNotifyFromTray = false;
 	bool _rememberedFlashBounceNotifyFromTray = false;
+	bool _dialogsWidthSetToZeroWithoutChat = false;
 
 	QByteArray _photoEditorBrush;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index ae4061717..db8d630ff 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2667,8 +2667,9 @@ void Widget::updateForceDisplayWide() {
 void Widget::showForum(
 		not_null<Data::Forum*> forum,
 		const Window::SectionShow &params) {
+	const auto nochat = !controller()->mainSectionShown();
 	if (!params.childColumn
-		|| !Core::App().settings().dialogsWidthRatio()
+		|| !Core::App().settings().dialogsWidthRatio(nochat)
 		|| (_layout != Layout::Main)
 		|| OptionForumHideChatsList.value()) {
 		changeOpenedForum(forum, params.animated);
diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index 7806dea9f..6349f6b6a 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -128,7 +128,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	base::flat_set<PeerId> groupEmojiSectionHidden;
 	qint32 appThirdSectionInfoEnabled = 0;
 	qint32 legacySmallDialogsList = 0;
-	float64 appDialogsWidthRatio = app.dialogsWidthRatio();
+	float64 appDialogsWidthRatio = app.dialogsWidthRatio(false);
 	int appThirdColumnWidth = app.thirdColumnWidth();
 	int appThirdSectionExtendedBy = app.thirdSectionExtendedBy();
 	qint32 appSendFilesWay = app.sendFilesWay().serialize();
@@ -535,7 +535,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 		case RectPart::BottomRight: app.setFloatPlayerCorner(uncheckedCorner); break;
 		}
 		app.setThirdSectionInfoEnabled(appThirdSectionInfoEnabled);
-		app.setDialogsWidthRatio(appDialogsWidthRatio);
+		app.updateDialogsWidthRatio(appDialogsWidthRatio, false);
 		app.setThirdColumnWidth(appThirdColumnWidth);
 		app.setThirdSectionExtendedBy(appThirdSectionExtendedBy);
 	}
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index ecd9ad066..ee0b44fba 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -303,8 +303,16 @@ MainWidget::MainWidget(
 		});
 	}, lifetime());
 
+	const auto filter = [=](bool mainSectionShown) {
+		return rpl::filter([=] {
+			return (_controller->mainSectionShown() == mainSectionShown);
+		});
+	};
 	rpl::merge(
-		Core::App().settings().dialogsWidthRatioChanges() | rpl::to_empty,
+		Core::App().settings().dialogsWithChatWidthRatioChanges(
+		) | filter(true) | rpl::to_empty,
+		Core::App().settings().dialogsNoChatWidthRatioChanges(
+		) | filter(false) | rpl::to_empty,
 		Core::App().settings().thirdColumnWidthChanges() | rpl::to_empty
 	) | rpl::start_with_next([=] {
 		updateControlsGeometry();
@@ -1408,6 +1416,7 @@ void MainWidget::showHistory(
 	auto onlyDialogs = noPeer && isOneColumn();
 	_mainSection.destroy();
 
+	updateMainSectionShown();
 	updateControlsGeometry();
 
 	if (noPeer) {
@@ -1781,6 +1790,7 @@ void MainWidget::showNewSection(
 		if (const auto entry = _mainSection->activeChat(); entry.key) {
 			_controller->setActiveChatEntry(entry);
 		}
+		updateMainSectionShown();
 
 		// Depends on SessionController::activeChatEntry
 		// for tabbed selector showing in the third column.
@@ -1815,22 +1825,16 @@ void MainWidget::checkMainSectionToLayer() {
 	}
 	Ui::FocusPersister persister(this);
 	if (auto layer = _mainSection->moveContentToLayer(rect())) {
-		dropMainSection(_mainSection);
+		_mainSection.destroy();
+		_controller->showBackFromStack(
+			SectionShow(
+				anim::type::instant,
+				anim::activation::background));
 		_controller->showSpecialLayer(
 			std::move(layer),
 			anim::type::instant);
 	}
-}
-
-void MainWidget::dropMainSection(Window::SectionWidget *widget) {
-	if (_mainSection != widget) {
-		return;
-	}
-	_mainSection.destroy();
-	_controller->showBackFromStack(
-		SectionShow(
-			anim::type::instant,
-			anim::activation::background));
+	updateMainSectionShown();
 }
 
 PeerData *MainWidget::singlePeer() const {
@@ -2236,13 +2240,18 @@ void MainWidget::resizeEvent(QResizeEvent *e) {
 	updateControlsGeometry();
 }
 
+void MainWidget::updateMainSectionShown() {
+	_controller->setMainSectionShown(_mainSection || _history->peer());
+}
+
 void MainWidget::updateControlsGeometry() {
 	if (!width()) {
 		return;
 	}
 	updateWindowAdaptiveLayout();
 	if (_dialogs) {
-		if (Core::App().settings().dialogsWidthRatio() > 0) {
+		const auto nochat = !_controller->mainSectionShown();
+		if (Core::App().settings().dialogsWidthRatio(nochat) > 0) {
 			_a_dialogsWidth.stop();
 		}
 		if (!_a_dialogsWidth.animating()) {
@@ -2444,19 +2453,22 @@ void MainWidget::ensureFirstColumnResizeAreaCreated() {
 		return;
 	}
 	auto moveLeftCallback = [=](int globalLeft) {
-		auto newWidth = globalLeft - mapToGlobal(QPoint(0, 0)).x();
-		auto newRatio = (newWidth < st::columnMinimalWidthLeft / 2)
+		const auto newWidth = globalLeft - mapToGlobal(QPoint(0, 0)).x();
+		const auto newRatio = (newWidth < st::columnMinimalWidthLeft / 2)
 			? 0.
 			: float64(newWidth) / width();
-		Core::App().settings().setDialogsWidthRatio(newRatio);
+		const auto nochat = !_controller->mainSectionShown();
+		Core::App().settings().updateDialogsWidthRatio(newRatio, nochat);
 	};
 	auto moveFinishedCallback = [=] {
 		if (isOneColumn()) {
 			return;
 		}
-		if (Core::App().settings().dialogsWidthRatio() > 0) {
-			Core::App().settings().setDialogsWidthRatio(
-				float64(_dialogsWidth) / width());
+		const auto nochat = !_controller->mainSectionShown();
+		if (Core::App().settings().dialogsWidthRatio(nochat) > 0) {
+			Core::App().settings().updateDialogsWidthRatio(
+				float64(_dialogsWidth) / width(),
+				nochat);
 		}
 		Core::App().saveSettingsDelayed();
 	};
@@ -2491,12 +2503,13 @@ void MainWidget::ensureThirdColumnResizeAreaCreated() {
 }
 
 void MainWidget::updateDialogsWidthAnimated() {
-	if (!_dialogs || Core::App().settings().dialogsWidthRatio() > 0) {
+	const auto nochat = !_controller->mainSectionShown();
+	if (!_dialogs || Core::App().settings().dialogsWidthRatio(nochat) > 0) {
 		return;
 	}
 	auto dialogsWidth = _dialogsWidth;
 	updateWindowAdaptiveLayout();
-	if (!Core::App().settings().dialogsWidthRatio()
+	if (!Core::App().settings().dialogsWidthRatio(nochat)
 		&& (_dialogsWidth != dialogsWidth
 			|| _a_dialogsWidth.animating())) {
 		_dialogs->startWidthAnimation();
@@ -2709,8 +2722,10 @@ void MainWidget::handleHistoryBack() {
 }
 
 void MainWidget::updateWindowAdaptiveLayout() {
+	const auto nochat = !_controller->mainSectionShown();
+
 	auto layout = _controller->computeColumnLayout();
-	auto dialogsWidthRatio = Core::App().settings().dialogsWidthRatio();
+	auto dialogsWidthRatio = Core::App().settings().dialogsWidthRatio(nochat);
 
 	// Check if we are in a single-column layout in a wide enough window
 	// for the normal layout. If so, switch to the normal layout.
@@ -2753,7 +2768,7 @@ void MainWidget::updateWindowAdaptiveLayout() {
 		//}
 	}
 
-	Core::App().settings().setDialogsWidthRatio(dialogsWidthRatio);
+	Core::App().settings().updateDialogsWidthRatio(dialogsWidthRatio, nochat);
 
 	auto useSmallColumnWidth = !isOneColumn()
 		&& !dialogsWidthRatio
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index aab9239ef..0f769a53f 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -250,6 +250,7 @@ private:
 	void handleAudioUpdate(const Media::Player::TrackState &state);
 	void updateMediaPlaylistPosition(int x);
 	void updateControlsGeometry();
+	void updateMainSectionShown();
 	void updateDialogsWidthAnimated();
 	void updateThirdColumnToCurrentChat(
 		Dialogs::Key key,
@@ -278,7 +279,6 @@ private:
 	void showNewSection(
 		std::shared_ptr<Window::SectionMemento> memento,
 		const SectionShow &params);
-	void dropMainSection(Window::SectionWidget *widget);
 
 	Window::SectionSlideParams prepareThirdSectionAnimation(Window::SectionWidget *section);
 
diff --git a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
index da60290b4..9baca321c 100644
--- a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
+++ b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
@@ -400,7 +400,7 @@ bool ReadSetting(
 		stream >> v;
 		if (!CheckStreamStatus(stream)) return false;
 
-		Core::App().settings().setDialogsWidthRatio(v / 1000000.);
+		Core::App().settings().updateDialogsWidthRatio(v / 1000000., false);
 		context.legacyRead = true;
 	} break;
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 7726234e7..4580991e7 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1946,7 +1946,10 @@ int SessionController::countDialogsWidthFromRatio(int bodyWidth) const {
 	if (!_isPrimary) {
 		return 0;
 	}
-	auto result = qRound(bodyWidth * Core::App().settings().dialogsWidthRatio());
+	const auto nochat = !mainSectionShown();
+	const auto width = bodyWidth
+		* Core::App().settings().dialogsWidthRatio(nochat);
+	auto result = qRound(width);
 	accumulate_max(result, st::columnMinimalWidthLeft);
 //	accumulate_min(result, st::columnMaximalWidthLeft);
 	return result;
@@ -2035,10 +2038,12 @@ void SessionController::resizeForThirdSection() {
 		if (extendBy != settings.thirdColumnWidth()) {
 			settings.setThirdColumnWidth(extendBy);
 		}
+		const auto nochat = !mainSectionShown();
 		auto newBodyWidth = layout.bodyWidth + extendedBy;
-		auto currentRatio = settings.dialogsWidthRatio();
-		settings.setDialogsWidthRatio(
-			(currentRatio * layout.bodyWidth) / newBodyWidth);
+		auto currentRatio = settings.dialogsWidthRatio(nochat);
+		settings.updateDialogsWidthRatio(
+			(currentRatio * layout.bodyWidth) / newBodyWidth,
+			nochat);
 	}
 	auto savedValue = (extendedBy == extendBy) ? -1 : extendedBy;
 	settings.setThirdSectionExtendedBy(savedValue);
@@ -2054,6 +2059,7 @@ void SessionController::closeThirdSection() {
 	auto newWindowSize = widget()->size();
 	auto layout = computeColumnLayout();
 	if (layout.windowLayout == Adaptive::WindowLayout::ThreeColumn) {
+		const auto nochat = !mainSectionShown();
 		auto noResize = widget()->isFullScreen()
 			|| widget()->isMaximized();
 		auto savedValue = settings.thirdSectionExtendedBy();
@@ -2063,9 +2069,10 @@ void SessionController::closeThirdSection() {
 		auto newBodyWidth = noResize
 			? layout.bodyWidth
 			: (layout.bodyWidth - extendedBy);
-		auto currentRatio = settings.dialogsWidthRatio();
-		settings.setDialogsWidthRatio(
-			(currentRatio * layout.bodyWidth) / newBodyWidth);
+		auto currentRatio = settings.dialogsWidthRatio(nochat);
+		settings.updateDialogsWidthRatio(
+			(currentRatio * layout.bodyWidth) / newBodyWidth,
+			nochat);
 		newWindowSize = QSize(
 			widget()->width() + (newBodyWidth - layout.bodyWidth),
 			widget()->height());
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index cf4033ce4..4ff92675f 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -515,6 +515,16 @@ public:
 		std::optional<bool> show = std::nullopt) const;
 	void finishChatThemeEdit(not_null<PeerData*> peer);
 
+	[[nodiscard]] bool mainSectionShown() const {
+		return _mainSectionShown.current();
+	}
+	[[nodiscard]] rpl::producer<bool> mainSectionShownChanges() const {
+		return _mainSectionShown.changes();
+	}
+	void setMainSectionShown(bool value) {
+		_mainSectionShown = value;
+	}
+
 	[[nodiscard]] bool chatsForceDisplayWide() const {
 		return _chatsForceDisplayWide.current();
 	}
@@ -678,6 +688,7 @@ private:
 	rpl::variable<Dialogs::Key> _searchInChat;
 	rpl::variable<Dialogs::RowDescriptor> _activeChatEntry;
 	rpl::lifetime _activeHistoryLifetime;
+	rpl::variable<bool> _mainSectionShown = false;
 	rpl::variable<bool> _chatsForceDisplayWide = false;
 	std::deque<Dialogs::RowDescriptor> _chatEntryHistory;
 	int _chatEntryHistoryPosition = -1;

From f03935ad9aded932cf17e7bb6ac07cb30ff9f885 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 13:57:42 +0400
Subject: [PATCH 541/596] Kill hang processes in case of app quitting.

---
 .../SourceFiles/platform/mac/notifications_manager_mac.mm   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index cc747016c..de2880907 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -550,6 +550,12 @@ void Manager::Private::checkFocusState() {
 }
 
 Manager::Private::~Private() {
+	if (_waitingDnd) {
+		_dnd.kill();
+	}
+	if (_waitingFocus) {
+		_focus.kill();
+	}
 	if (_clearingThread.joinable()) {
 		putClearTask(ClearFinish());
 		_clearingThread.join();

From e26b8e7ebc9257cd838e48b7bafdc28747b11c92 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 17:45:30 +0400
Subject: [PATCH 542/596] Fix passcode lock glitch with new search.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index db8d630ff..4652f8b22 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1169,13 +1169,16 @@ void Widget::updateSuggestions(anim::type animated) {
 		} else {
 			_suggestions = nullptr;
 			_hidingSuggestions.clear();
+			storiesExplicitCollapse();
+			updateStoriesVisibility();
 			_scroll->show();
 		}
 	} else if (suggest && !_suggestions) {
 		if (animated == anim::type::normal) {
 			startWidthAnimation();
-			updateStoriesVisibility();
 		}
+		// Hides stories and passcode lock.
+		updateStoriesVisibility();
 		_suggestions = std::make_unique<Suggestions>(
 			this,
 			controller(),

From 000911546b6486e7dff9561d444f39a0fb641c23 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 14:44:06 +0400
Subject: [PATCH 543/596] Fix usernames drop on `min` user being received.

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

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 23f121443..892830ede 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -690,7 +690,7 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 				result->setAccessHash(accessHash->v);
 			}
 			status = data.vstatus();
-			{
+			if (!minimal) {
 				const auto newUsername = uname;
 				const auto newUsernames = data.vusernames()
 					? Api::Usernames::FromTL(*data.vusernames())

From b67a1bca49973171257476f6f2faad4346eea045 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 15:12:53 +0400
Subject: [PATCH 544/596] Version 5.0.2.

- Toggle chats search focus by Tab key.
- Unfocus empty search by Backspace key.
- Add a spoiler to already sent media when editing.
- Forward by drag-n-drop to frequent contacts / recent searches.
- Allow wide chats list in empty window
with narrow list when a chat is opened.
- Improve custom font support in the input fields.
- Fix input method typing from unfocused search.
- Fix possible media reordering on batch send.
- Fix crash in group emoji set saving.
- Fix possible hang on quit on macOS.
---
 changelog.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 432af58b0..e5eb46a9f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,16 @@
+5.0.2 (24.05.24)
+
+- Toggle chats search focus by Tab key.
+- Unfocus empty search by Backspace key.
+- Add a spoiler to already sent media when editing.
+- Forward by drag-n-drop to frequent contacts / recent searches.
+- Allow wide chats list in empty window with narrow list when a chat is opened.
+- Improve custom font support in the input fields.
+- Fix input method typing from unfocused search.
+- Fix possible media reordering on batch send.
+- Fix crash in group emoji set saving.
+- Fix possible hang on quit on macOS.
+
 5.0.1 (04.05.24)
 
 - Fix several crashes in new interfaces.

From 364f62660c7a1a136a48275d7b63610d9d4ba8cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 15:26:18 +0400
Subject: [PATCH 545/596] Version 5.0.2: Update the version number.

---
 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 0021dd5de..e22af137a 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.1.0" />
+    Version="5.0.2.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 73e7a40b7..99096c4ee 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 5,0,1,0
- PRODUCTVERSION 5,0,1,0
+ FILEVERSION 5,0,2,0
+ PRODUCTVERSION 5,0,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.1.0"
+            VALUE "FileVersion", "5.0.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.1.0"
+            VALUE "ProductVersion", "5.0.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 50804d116..ebdc4e7bf 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 5,0,1,0
- PRODUCTVERSION 5,0,1,0
+ FILEVERSION 5,0,2,0
+ PRODUCTVERSION 5,0,2,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", "5.0.1.0"
+            VALUE "FileVersion", "5.0.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.1.0"
+            VALUE "ProductVersion", "5.0.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 5c6a409e8..e75931b50 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 = 5000001;
-constexpr auto AppVersionStr = "5.0.1";
+constexpr auto AppVersion = 5000002;
+constexpr auto AppVersionStr = "5.0.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index dbb89ce4f..8975fea05 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000001
+AppVersion         5000002
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.1
-AppVersionStr      5.0.1
+AppVersionStrSmall 5.0.2
+AppVersionStr      5.0.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.0.1
+AppVersionOriginal 5.0.2

From 36db1105a28f8df7d2ff1457b071e77ed25a8a55 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 16:09:01 +0400
Subject: [PATCH 546/596] Fix build with Xcode.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 2 +-
 Telegram/SourceFiles/mainwidget.cpp             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 4652f8b22..f74956bd3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2672,7 +2672,7 @@ void Widget::showForum(
 		const Window::SectionShow &params) {
 	const auto nochat = !controller()->mainSectionShown();
 	if (!params.childColumn
-		|| !Core::App().settings().dialogsWidthRatio(nochat)
+		|| (Core::App().settings().dialogsWidthRatio(nochat) == 0.)
 		|| (_layout != Layout::Main)
 		|| OptionForumHideChatsList.value()) {
 		changeOpenedForum(forum, params.animated);
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index ee0b44fba..c9acfef92 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -2509,7 +2509,7 @@ void MainWidget::updateDialogsWidthAnimated() {
 	}
 	auto dialogsWidth = _dialogsWidth;
 	updateWindowAdaptiveLayout();
-	if (!Core::App().settings().dialogsWidthRatio(nochat)
+	if (Core::App().settings().dialogsWidthRatio(nochat) == 0.
 		&& (_dialogsWidth != dialogsWidth
 			|| _a_dialogsWidth.animating())) {
 		_dialogs->startWidthAnimation();

From f4864cddc9ab055e7772fa36ba28b495c0027b12 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 09:20:52 +0400
Subject: [PATCH 547/596] Fix possible crash in Settings of crashed web-app.

Fixes #27943.
---
 Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index d419d7775..3fbe6e484 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -505,7 +505,7 @@ bool Panel::showWebview(
 	_webview->window.navigate(url);
 	_widget->setBackAllowed(allowBack);
 	_widget->setMenuAllowed([=](const Ui::Menu::MenuCallback &callback) {
-		if (_hasSettingsButton) {
+		if (_webview && _webview->window.widget() && _hasSettingsButton) {
 			callback(tr::lng_bot_settings(tr::now), [=] {
 				postEvent("settings_button_pressed");
 			}, &st::menuIconSettings);
@@ -1294,6 +1294,11 @@ void Panel::postEvent(const QString &event) {
 }
 
 void Panel::postEvent(const QString &event, EventData data) {
+	if (!_webview) {
+		LOG(("BotWebView Error: Post event \"%1\" on crashed webview."
+			).arg(event));
+		return;
+	}
 	auto written = v::is<QString>(data)
 		? v::get<QString>(data).toUtf8()
 		: QJsonDocument(

From 31fcca245f35f4a98c79f9bc8eb41241e40d652d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 16:09:21 +0400
Subject: [PATCH 548/596] Version 5.0.2: Fix IME-to-search on macOS.

---
 .../platform/mac/main_window_mac.h            |  7 ++--
 .../platform/mac/main_window_mac.mm           | 35 +++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 36dc140bd..6c2d15d07 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -20,8 +20,6 @@ class MainWindow : public Window::MainWindow {
 public:
 	explicit MainWindow(not_null<Window::Controller*> controller);
 
-	bool psFilterNativeEvent(void *event);
-
 	int getCustomTitleHeight() const {
 		return _customTitleHeight;
 	}
@@ -47,6 +45,11 @@ protected:
 private:
 	friend class Private;
 
+	bool nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		qintptr *result) override;
+
 	void hideAndDeactivate();
 	void updateDockCounter();
 
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 055722742..0b2adb9aa 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -63,6 +63,26 @@ namespace {
 // fullscreen mode, after that we'll hide the window no matter what.
 constexpr auto kHideAfterFullscreenTimeoutMs = 3000;
 
+[[nodiscard]] bool PossiblyTextTypingEvent(NSEvent *e) {
+	if ([e type] != NSEventTypeKeyDown) {
+		return false;
+	}
+	NSEventModifierFlags flags = [e modifierFlags]
+		& NSEventModifierFlagDeviceIndependentFlagsMask;
+	if ((flags & ~NSEventModifierFlagShift) != 0) {
+		return false;
+	}
+	NSString *text = [e characters];
+	const auto length = int([text length]);
+	for (auto i = 0; i != length; ++i) {
+		const auto utf16 = [text characterAtIndex:i];
+		if (utf16 >= 32) {
+			return true;
+		}
+	}
+	return false;
+}
+
 } // namespace
 
 class MainWindow::Private {
@@ -280,6 +300,21 @@ void MainWindow::initHook() {
 void MainWindow::updateWindowIcon() {
 }
 
+bool MainWindow::nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		qintptr *result) {
+	if (message && eventType == "NSEvent") {
+		const auto event = static_cast<NSEvent*>(message);
+		if (PossiblyTextTypingEvent(event)) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				imeCompositionStartReceived();
+			});
+		}
+	}
+	return false;
+}
+
 void MainWindow::hideAndDeactivate() {
 	hide();
 }

From 62c249015d3f39a0ca67c026cdf091b6c4040153 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 26 May 2024 10:50:35 +0400
Subject: [PATCH 549/596] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index c68aa80f1..76a03ceef 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit c68aa80f10b2953f2d32572e9ae1a5c29cfbfe78
+Subproject commit 76a03ceef98586ba148260f2f542ef67228f6e0e

From 0033ad749f5fe9b2e8d716bf593496696167eb6f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 27 May 2024 07:48:16 +0400
Subject: [PATCH 550/596] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 76a03ceef..bd2d2fe2f 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 76a03ceef98586ba148260f2f542ef67228f6e0e
+Subproject commit bd2d2fe2fb86d3c54d8e2151764be340f8c5809e

From daf30dcab876830af7c9a8601004ec4c54405ee5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 13:33:25 +0400
Subject: [PATCH 551/596] Fix jump to last topic in case of unread topic click.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 542d41118..cdf2fef0d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1330,8 +1330,7 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 		const auto selectedTopicJump = selected
 			&& selected->lookupIsInTopicJump(
 				local.x(),
-				mouseY - offset - selected->top())
-			&& _controller->adaptive().isOneColumn();
+				mouseY - offset - selected->top());
 		if (_collapsedSelected != collapsedSelected
 			|| _selected != selected
 			|| _selectedTopicJump != selectedTopicJump) {
@@ -1373,8 +1372,7 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 			const auto selectedTopicJump = (filteredSelected >= 0)
 				&& _filterResults[filteredSelected].row->lookupIsInTopicJump(
 					local.x(),
-					mouseY - skip - _filterResults[filteredSelected].top)
-				&& _controller->adaptive().isOneColumn();
+					mouseY - skip - _filterResults[filteredSelected].top);
 			if (_filteredSelected != filteredSelected
 				|| _selectedTopicJump != selectedTopicJump) {
 				updateSelectedRow();

From ad6e34f3a43664a00e3e6829185b5b97e357a6fd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 27 May 2024 13:59:05 +0400
Subject: [PATCH 552/596] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index bd2d2fe2f..064ff7caf 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit bd2d2fe2fb86d3c54d8e2151764be340f8c5809e
+Subproject commit 064ff7cafea2629c3a7162fb954fc597e0eec652

From 7357b40ba17d84725601462b2952fe3c683aac06 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 17:54:03 +0400
Subject: [PATCH 553/596] Fix build with updated lib_ui.

---
 .../view/history_view_context_menu.cpp        | 38 +------------------
 .../history/view/history_view_context_menu.h  |  2 -
 .../settings/business/settings_chat_intro.cpp |  2 +-
 .../business/settings_quick_replies.cpp       |  3 +-
 4 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index bb74d7311..dcebb2628 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1068,7 +1068,7 @@ void EditTagBox(
 		}
 	}, field->lifetime());
 
-	AddLengthLimitLabel(field, kTagNameLimit);
+	Ui::AddLengthLimitLabel(field, kTagNameLimit);
 
 	const auto save = [=] {
 		const auto text = field->getLastText();
@@ -1828,40 +1828,4 @@ bool ItemHasTtl(HistoryItem *item) {
 		: false;
 }
 
-void AddLengthLimitLabel(not_null<Ui::InputField*> field, int limit) {
-	struct State {
-		rpl::variable<int> length;
-	};
-	const auto state = field->lifetime().make_state<State>();
-	state->length = rpl::single(
-		rpl::empty
-	) | rpl::then(field->changes()) | rpl::map([=] {
-		return int(field->getLastText().size());
-	});
-	auto warningText = state->length.value() | rpl::map([=](int count) {
-		const auto threshold = std::min(limit / 2, 9);
-		const auto left = limit - count;
-		return (left < threshold) ? QString::number(left) : QString();
-	});
-	const auto warning = Ui::CreateChild<Ui::FlatLabel>(
-		field.get(),
-		std::move(warningText),
-		st::editTagLimit);
-	state->length.value() | rpl::map(
-		rpl::mappers::_1 > limit
-	) | rpl::start_with_next([=](bool exceeded) {
-		warning->setTextColorOverride(exceeded
-			? st::attentionButtonFg->c
-			: std::optional<QColor>());
-	}, warning->lifetime());
-	rpl::combine(
-		field->sizeValue(),
-		warning->sizeValue()
-	) | rpl::start_with_next([=] {
-		warning->moveToRight(0, 0);
-	}, warning->lifetime());
-	warning->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-}
-
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.h b/Telegram/SourceFiles/history/view/history_view_context_menu.h
index 8582a57fb..8f00f4da8 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.h
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.h
@@ -123,6 +123,4 @@ void AddEmojiPacksAction(
 
 [[nodiscard]] bool ItemHasTtl(HistoryItem *item);
 
-void AddLengthLimitLabel(not_null<Ui::InputField*> field, int limit);
-
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index b8a7607f6..b9fa7c68c 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -164,7 +164,7 @@ private:
 			current),
 		st::settingsChatIntroFieldMargins);
 	field->setMaxLength(limit);
-	AddLengthLimitLabel(field, limit);
+	Ui::AddLengthLimitLabel(field, limit);
 	return field;
 }
 
diff --git a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
index 57e74cf25..941409f98 100644
--- a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
@@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/data_session.h"
-#include "history/view/history_view_context_menu.h" // AddLengthLimitLabel.
 #include "lang/lang_keys.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
@@ -214,7 +213,7 @@ void EditShortcutNameBox(
 	field->selectAll();
 	field->setMaxLength(kShortcutLimit * 2);
 
-	HistoryView::AddLengthLimitLabel(field, kShortcutLimit);
+	Ui::AddLengthLimitLabel(field, kShortcutLimit);
 
 	const auto callback = [=] {
 		const auto name = field->getLastText().trimmed();

From a43143d01cbda44b2a76582b72c1629992b6a213 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 17:53:54 +0400
Subject: [PATCH 554/596] Separate ForceDisable from LastCheckCrashed.

---
 Telegram/SourceFiles/core/application.cpp   | 5 ++---
 Telegram/SourceFiles/core/core_settings.cpp | 5 +----
 Telegram/lib_ui                             | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 5557eb503..d0470dfc7 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -383,7 +383,7 @@ void Application::run() {
 	}
 
 	SetCrashAnnotationsGL();
-	if (!Platform::IsMac() && Ui::GL::LastCrashCheckFailed()) {
+	if (Ui::GL::LastCrashCheckFailed()) {
 		showOpenGLCrashNotification();
 	}
 
@@ -427,14 +427,12 @@ void Application::checkWindowAccount(not_null<Window::Controller*> window) {
 
 void Application::showOpenGLCrashNotification() {
 	const auto enable = [=] {
-		Ui::GL::ForceDisable(false);
 		Ui::GL::CrashCheckFinish();
 		settings().setDisableOpenGL(false);
 		Local::writeSettings();
 		Restart();
 	};
 	const auto keepDisabled = [=](Fn<void()> close) {
-		Ui::GL::ForceDisable(true);
 		Ui::GL::CrashCheckFinish();
 		settings().setDisableOpenGL(true);
 		Local::writeSettings();
@@ -792,6 +790,7 @@ void Application::badMtprotoConfigurationError() {
 }
 
 void Application::startLocalStorage() {
+	Ui::GL::DetectLastCheckCrash();
 	Local::start();
 	_saveSettingsTimer.emplace([=] { saveSettings(); });
 	settings().saveDelayedRequests() | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index a54f5ef33..daaff5acf 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -910,10 +910,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_recentEmojiPreload = std::move(recentEmojiPreload);
 	_emojiVariants = std::move(emojiVariants);
 	_disableOpenGL = (disableOpenGL == 1);
-	if (!Platform::IsMac()) {
-		Ui::GL::ForceDisable(_disableOpenGL
-			|| Ui::GL::LastCrashCheckFailed());
-	}
+	Ui::GL::ForceDisable(_disableOpenGL);
 	_groupCallNoiseSuppression = (groupCallNoiseSuppression == 1);
 	const auto uncheckedWorkMode = static_cast<WorkMode>(workMode);
 	switch (uncheckedWorkMode) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 037ceb272..b21a93f3b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 037ceb272c4dd2eb456e18b61e374c1fa759d109
+Subproject commit b21a93f3ba47d6233a0feb764be37850ae1edcb2

From f1c1c900bf84e652a4c391c1cfcc6effc16462d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 22:08:20 +0400
Subject: [PATCH 555/596] Fix newline regression on Linux.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b21a93f3b..b2653606b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b21a93f3ba47d6233a0feb764be37850ae1edcb2
+Subproject commit b2653606be9db432e850ba1a17da00c4e9cf2e17

From f09a939a7c3c12e50910e84378b488c6ee57cda0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 22:24:19 +0400
Subject: [PATCH 556/596] Improve fix for markup.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b2653606b..34fcd4981 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b2653606be9db432e850ba1a17da00c4e9cf2e17
+Subproject commit 34fcd4981d764f0869793893f37822b9c09393ab

From 7db9abf72558a4a6009213284d2abf1a9f11d7c8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 10:04:57 +0400
Subject: [PATCH 557/596] Fix forum search open by Ctrl+F.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index f74956bd3..a08c16119 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -999,6 +999,7 @@ void Widget::setupShortcuts() {
 	) | rpl::filter([=] {
 		return isActiveWindow()
 			&& Ui::InFocusChain(this)
+			&& !_childList
 			&& !controller()->isLayerShown()
 			&& !controller()->window().locked();
 	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
@@ -2723,6 +2724,7 @@ void Widget::openChildList(
 		*opacity = value;
 		update();
 		_inner->update();
+		_search->setVisible(value < 1.);
 		if (!value && _childListShadow.get() != shadow) {
 			delete shadow;
 		}

From 32cd2120acc6ff55842f9243d7116d7b8dd8f6ee Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 10:54:20 +0400
Subject: [PATCH 558/596] Allow zero width space in the middle of text.

Fixes #6959.
---
 Telegram/SourceFiles/chat_helpers/message_field.cpp | 5 +----
 Telegram/lib_ui                                     | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 648c5c98c..557d0c337 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -431,10 +431,7 @@ bool HasSendText(not_null<const Ui::InputField*> field) {
 	const auto &text = field->getTextWithTags().text;
 	for (const auto &ch : text) {
 		const auto code = ch.unicode();
-		if (code != ' '
-			&& code != '\n'
-			&& code != '\r'
-			&& !IsReplacedBySpace(code)) {
+		if (!IsTrimmed(ch) && !IsReplacedBySpace(code)) {
 			return true;
 		}
 	}
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 34fcd4981..a48b3d375 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 34fcd4981d764f0869793893f37822b9c09393ab
+Subproject commit a48b3d3750ac1a1e3b2f4da3494fa5fb23b66106

From b9f63f80f14d826908089618dee05b2d1a00b6b1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 10:59:46 +0400
Subject: [PATCH 559/596] Reply-in-another-chat by Ctrl+Click on Reply.

---
 .../SourceFiles/history/history_inner_widget.cpp   |  2 +-
 .../history/view/history_view_context_menu.cpp     | 14 +++++---------
 .../history/view/history_view_replies_section.cpp  |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index ae28620d5..1b5e78f3e 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2399,7 +2399,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			const auto quoteOffset = selected.offset;
 			text.replace('&', u"&&"_q);
 			_menu->addAction(text, [=] {
-				if (canSendReply) {
+				if (canSendReply && !base::IsCtrlPressed()) {
 					_widget->replyToMessage({
 						.messageId = itemId,
 						.quote = quote,
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index dcebb2628..390578393 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -632,15 +632,11 @@ bool AddReplyToMessageAction(
 	text.replace('&', u"&&"_q);
 	const auto itemId = item->fullId();
 	menu->addAction(text, [=] {
-		if (!item) {
-			return;
-		} else {
-			list->replyToMessageRequestNotify({
-				.messageId = itemId,
-				.quote = quote.text,
-				.quoteOffset = quote.offset,
-			});
-		}
+		list->replyToMessageRequestNotify({
+			.messageId = itemId,
+			.quote = quote.text,
+			.quoteOffset = quote.offset,
+		});
 	}, &st::menuIconReply);
 	return true;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 1974cce2b..7db2a2141 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -327,7 +327,7 @@ RepliesWidget::RepliesWidget(
 		const auto canSendReply = _topic
 			? Data::CanSendAnything(_topic)
 			: Data::CanSendAnything(_history->peer);
-		if (_joinGroup || !canSendReply) {
+		if (_joinGroup || !canSendReply || base::IsCtrlPressed()) {
 			Controls::ShowReplyToChatBox(controller->uiShow(), { fullId });
 		} else {
 			replyToMessage(fullId);

From 72471c74d0d21754e6e70bb5f6250e010c682173 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 11:45:21 +0400
Subject: [PATCH 560/596] Limit symbols that allow diacritics after them.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index a48b3d375..e7c598aff 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit a48b3d3750ac1a1e3b2f4da3494fa5fb23b66106
+Subproject commit e7c598affe724322577ef46d9a07d1dcac3c617b

From 275327c789f06064fafbd68d63f31a76bbb07b9c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 11:53:51 +0400
Subject: [PATCH 561/596] Version 5.0.3.

- Ctrl+Click on Reply in menu to Reply in another chat.
- Allow Zero-Width-Space character in text rendering.
- Fix creating custom links in the message field.
- Fix jump to the topic with last unread message.
- Fix newline entering via Shift+Enter on Linux.
- Fix forum search open by Ctrl+F.
---
 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                                | 9 +++++++++
 6 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index e22af137a..804884178 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.2.0" />
+    Version="5.0.3.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 99096c4ee..dde750548 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 5,0,2,0
- PRODUCTVERSION 5,0,2,0
+ FILEVERSION 5,0,3,0
+ PRODUCTVERSION 5,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.2.0"
+            VALUE "FileVersion", "5.0.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.2.0"
+            VALUE "ProductVersion", "5.0.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index ebdc4e7bf..9fce7f364 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 5,0,2,0
- PRODUCTVERSION 5,0,2,0
+ FILEVERSION 5,0,3,0
+ PRODUCTVERSION 5,0,3,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", "5.0.2.0"
+            VALUE "FileVersion", "5.0.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.2.0"
+            VALUE "ProductVersion", "5.0.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index e75931b50..73f9f2837 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 = 5000002;
-constexpr auto AppVersionStr = "5.0.2";
+constexpr auto AppVersion = 5000003;
+constexpr auto AppVersionStr = "5.0.3";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 8975fea05..f0887ef68 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000002
+AppVersion         5000003
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.2
-AppVersionStr      5.0.2
+AppVersionStrSmall 5.0.3
+AppVersionStr      5.0.3
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.0.2
+AppVersionOriginal 5.0.3
diff --git a/changelog.txt b/changelog.txt
index e5eb46a9f..5a24a32e1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,12 @@
+5.0.3 (28.05.24)
+
+- Ctrl+Click on Reply in menu to Reply in another chat.
+- Allow Zero-Width-Space character in text rendering.
+- Fix creating custom links in the message field.
+- Fix jump to the topic with last unread message.
+- Fix newline entering via Shift+Enter on Linux.
+- Fix forum search open by Ctrl+F.
+
 5.0.2 (24.05.24)
 
 - Toggle chats search focus by Tab key.

From adc536b81de8901d89ea26c7297e0aba2a396a87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 15:00:45 +0400
Subject: [PATCH 562/596] Fix Ctrl+Up reply in topics / comments.

---
 .../history/view/history_view_context_menu.cpp      |  3 ++-
 .../history/view/history_view_list_widget.cpp       |  9 ++++++---
 .../history/view/history_view_list_widget.h         | 13 ++++++++++---
 .../history/view/history_view_replies_section.cpp   |  9 +++++----
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 390578393..559a98ccd 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_transcribes.h"
 #include "api/api_who_reacted.h"
 #include "api/api_toggling_media.h" // Api::ToggleFavedSticker
+#include "base/qt/qt_key_modifiers.h"
 #include "base/unixtime.h"
 #include "history/view/history_view_list_widget.h"
 #include "history/view/history_view_cursor_state.h"
@@ -636,7 +637,7 @@ bool AddReplyToMessageAction(
 			.messageId = itemId,
 			.quote = quote.text,
 			.quoteOffset = quote.offset,
-		});
+		}, base::IsCtrlPressed());
 	}, &st::menuIconReply);
 	return true;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index e849bd943..e31188605 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -3904,12 +3904,15 @@ bool ListWidget::lastMessageEditRequestNotify() const {
 	}
 }
 
-rpl::producer<FullReplyTo> ListWidget::replyToMessageRequested() const {
+auto ListWidget::replyToMessageRequested() const
+-> rpl::producer<ReplyToMessageRequest> {
 	return _requestedToReplyToMessage.events();
 }
 
-void ListWidget::replyToMessageRequestNotify(FullReplyTo id) {
-	_requestedToReplyToMessage.fire(std::move(id));
+void ListWidget::replyToMessageRequestNotify(
+		FullReplyTo to,
+		bool forceAnotherChat) {
+	_requestedToReplyToMessage.fire({ std::move(to), forceAnotherChat });
 }
 
 rpl::producer<FullMsgId> ListWidget::readMessageRequested() const {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index b68e689e9..7770341d9 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -286,11 +286,18 @@ public:
 	QPoint tooltipPos() const override;
 	bool tooltipWindowActive() const override;
 
+	struct ReplyToMessageRequest {
+		FullReplyTo to;
+		bool forceAnotherChat = false;
+	};
 	[[nodiscard]] rpl::producer<FullMsgId> editMessageRequested() const;
 	void editMessageRequestNotify(FullMsgId item) const;
 	[[nodiscard]] bool lastMessageEditRequestNotify() const;
-	[[nodiscard]] rpl::producer<FullReplyTo> replyToMessageRequested() const;
-	void replyToMessageRequestNotify(FullReplyTo id);
+	[[nodiscard]] auto replyToMessageRequested() const
+		-> rpl::producer<ReplyToMessageRequest>;
+	void replyToMessageRequestNotify(
+		FullReplyTo to, 
+		bool forceAnotherChat = false);
 	[[nodiscard]] rpl::producer<FullMsgId> readMessageRequested() const;
 	[[nodiscard]] rpl::producer<FullMsgId> showMessageRequested() const;
 	void replyNextMessage(FullMsgId fullId, bool next = true);
@@ -760,7 +767,7 @@ private:
 	base::Timer _touchScrollTimer;
 
 	rpl::event_stream<FullMsgId> _requestedToEditMessage;
-	rpl::event_stream<FullReplyTo> _requestedToReplyToMessage;
+	rpl::event_stream<ReplyToMessageRequest> _requestedToReplyToMessage;
 	rpl::event_stream<FullMsgId> _requestedToReadMessage;
 	rpl::event_stream<FullMsgId> _requestedToShowMessage;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 7db2a2141..02d9c8412 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -323,14 +323,15 @@ RepliesWidget::RepliesWidget(
 	}, _inner->lifetime());
 
 	_inner->replyToMessageRequested(
-	) | rpl::start_with_next([=](auto fullId) {
+	) | rpl::start_with_next([=](ListWidget::ReplyToMessageRequest request) {
 		const auto canSendReply = _topic
 			? Data::CanSendAnything(_topic)
 			: Data::CanSendAnything(_history->peer);
-		if (_joinGroup || !canSendReply || base::IsCtrlPressed()) {
-			Controls::ShowReplyToChatBox(controller->uiShow(), { fullId });
+		const auto &to = request.to;
+		if (_joinGroup || !canSendReply || request.forceAnotherChat) {
+			Controls::ShowReplyToChatBox(controller->uiShow(), { to });
 		} else {
-			replyToMessage(fullId);
+			replyToMessage(to);
 			_composeControls->focus();
 		}
 	}, _inner->lifetime());

From 88cd886ec814fd465a7c543b7bcfaf669870e7a5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 28 May 2024 17:34:18 +0400
Subject: [PATCH 563/596] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 064ff7caf..115530c7a 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 064ff7cafea2629c3a7162fb954fc597e0eec652
+Subproject commit 115530c7aa8694f461d04f95d6a3561a18562e7e

From 9e85b1aa23301b4189e924ed0cf1710828380bb2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 14:37:19 +0300
Subject: [PATCH 564/596] Fixed fake ability to hide webpage media with
 spoiler.

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

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
index 940ff7ff2..d6c58bb6a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
@@ -27,7 +27,7 @@ void MediaEditSpoilerManager::showMenu(
 	const auto media = item->media();
 	const auto hasPreview = media && media->hasReplyPreview();
 	const auto preview = hasPreview ? media->replyPreview() : nullptr;
-	if (!preview) {
+	if (!preview || (media && media->webpage())) {
 		return;
 	}
 	const auto spoilered = _spoilerOverride

From 2605e754ff63ea632e586ade7720fdb42766cd87 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 15:03:20 +0300
Subject: [PATCH 565/596] Added back button to cloud password step in intro.

---
 Telegram/SourceFiles/intro/intro_password_check.h | 4 ++++
 Telegram/SourceFiles/intro/intro_widget.cpp       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/intro/intro_password_check.h b/Telegram/SourceFiles/intro/intro_password_check.h
index ddd117551..9bfcbad3d 100644
--- a/Telegram/SourceFiles/intro/intro_password_check.h
+++ b/Telegram/SourceFiles/intro/intro_password_check.h
@@ -35,6 +35,10 @@ public:
 	void submit() override;
 	rpl::producer<QString> nextButtonText() const override;
 
+	bool hasBack() const override {
+		return true;
+	}
+
 protected:
 	void resizeEvent(QResizeEvent *e) override;
 
diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp
index 13ba4837b..9592929e9 100644
--- a/Telegram/SourceFiles/intro/intro_widget.cpp
+++ b/Telegram/SourceFiles/intro/intro_widget.cpp
@@ -849,7 +849,7 @@ void Widget::backRequested() {
 		Core::App().domain().activate(parent);
 	} else {
 		moveToStep(
-			new StartWidget(this, _account, getData()),
+			Ui::CreateChild<StartWidget>(this, _account, getData()),
 			StackAction::Replace,
 			Animate::Back);
 	}

From 26ba7e57ce79480c095219d069c4db072ef60679 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 15:27:43 +0300
Subject: [PATCH 566/596] Fixed color of radial animation in audio files from
 shared media.

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

diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index c56582bc4..d8c70f1df 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -1398,7 +1398,9 @@ void Document::drawCornerDownload(QPainter &p, bool selected, const PaintContext
 	icon->paintInCenter(p, inner);
 	if (_radial && _radial->animating()) {
 		const auto rinner = inner.marginsRemoved(QMargins(st::historyAudioRadialLine, st::historyAudioRadialLine, st::historyAudioRadialLine, st::historyAudioRadialLine));
-		auto fg = selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg;
+		const auto &fg = selected
+			? st::historyFileInIconFgSelected
+			: st::historyFileInIconFg;
 		_radial->draw(p, rinner, st::historyAudioRadialLine, fg);
 	}
 }

From 48e3802565755be6ad2b1903823525f11590a933 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 16:42:26 +0300
Subject: [PATCH 567/596] Improved labels for channel and group types with
 restricted content.

---
 Telegram/Resources/langs/lang.strings         |  2 ++
 .../boxes/peers/edit_peer_info_box.cpp        | 25 ++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d0a709c6d..848496650 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1522,8 +1522,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_peer_link_invite" = "Invite link";
 "lng_manage_peer_link_expired" = "Expired link";
 "lng_manage_private_group_title" = "Private";
+"lng_manage_private_group_noforwards_title" = "Private restricted";
 "lng_manage_public_group_title" = "Public";
 "lng_manage_private_peer_title" = "Private";
+"lng_manage_private_peer_noforwards_title" = "Private restricted";
 "lng_manage_public_peer_title" = "Public";
 "lng_manage_peer_send_title" = "Who can send new messages?";
 "lng_manage_peer_send_only_members" = "Only members";
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index c79ef325d..99427aca0 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -415,7 +415,12 @@ private:
 	std::deque<FnMut<void()>> _saveStagesQueue;
 	Saving _savingData;
 
-	const rpl::event_stream<Privacy> _privacyTypeUpdates;
+	struct PrivacyAndForwards {
+		Privacy privacy;
+		bool noForwards = false;
+	};
+
+	const rpl::event_stream<PrivacyAndForwards> _privacyTypeUpdates;
 	const rpl::event_stream<ChannelData*> _linkedChatUpdates;
 	mtpRequestId _linkedChatsRequestId = 0;
 
@@ -761,7 +766,7 @@ void Controller::refreshHistoryVisibility() {
 void Controller::showEditPeerTypeBox(
 		std::optional<rpl::producer<QString>> error) {
 	const auto boxCallback = crl::guard(this, [=](EditPeerTypeData data) {
-		_privacyTypeUpdates.fire_copy(data.privacy);
+		_privacyTypeUpdates.fire({ data.privacy, data.noForwards });
 		_typeDataSavedValue = data;
 		refreshHistoryVisibility();
 	});
@@ -882,7 +887,8 @@ void Controller::fillPrivacyTypeButton() {
 			? tr::lng_manage_peer_group_type
 			: tr::lng_manage_peer_channel_type)(),
 		_privacyTypeUpdates.events(
-		) | rpl::map([=](Privacy flag) {
+		) | rpl::map([=](PrivacyAndForwards data) {
+			const auto flag = data.privacy;
 			if (flag == Privacy::HasUsername) {
 				_peer->session().api().usernames().requestToCache(_peer);
 			}
@@ -894,14 +900,21 @@ void Controller::fillPrivacyTypeButton() {
 					: tr::lng_manage_public_peer_title)()
 				: (hasLocation
 					? tr::lng_manage_peer_link_invite
-					: isGroup
+					: ((!data.noForwards) && isGroup)
 					? tr::lng_manage_private_group_title
-					: tr::lng_manage_private_peer_title)();
+					: ((!data.noForwards) && !isGroup)
+					? tr::lng_manage_private_peer_title
+					: isGroup
+					? tr::lng_manage_private_group_noforwards_title
+					: tr::lng_manage_private_peer_noforwards_title)();
 		}) | rpl::flatten_latest(),
 		[=] { showEditPeerTypeBox(); },
 		{ &st::menuIconCustomize });
 
-	_privacyTypeUpdates.fire_copy(_typeDataSavedValue->privacy);
+	_privacyTypeUpdates.fire_copy({
+		_typeDataSavedValue->privacy,
+		_typeDataSavedValue->noForwards,
+	});
 }
 
 void Controller::fillLinkedChatButton() {

From f6b849e4f76fcfa27cd0ba8ef722a76c1f93a698 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 18:46:04 +0300
Subject: [PATCH 568/596] Added ability to add proxy from clipboard.

---
 Telegram/Resources/langs/lang.strings         |   4 +
 Telegram/SourceFiles/boxes/connection_box.cpp | 143 ++++++++++++++----
 Telegram/SourceFiles/boxes/connection_box.h   |   4 +-
 3 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 848496650..87df781f8 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1053,6 +1053,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_proxy_sponsor" = "Proxy sponsor";
 "lng_proxy_sponsor_about" = "This channel is shown by your proxy server.\nTo remove this channel from your chats list,\ndisable the proxy in Telegram Settings.";
 "lng_proxy_sponsor_warning" = "This proxy may display a sponsored channel in your chat list. This doesn't reveal any of your Telegram traffic.";
+"lng_proxy_add_from_clipboard" = "Add proxy from clipboard";
+"lng_proxy_add_from_clipboard_good_toast" = "Proxy was added from clipboard.";
+"lng_proxy_add_from_clipboard_failed_toast" = "This is not a proxy link.";
+"lng_proxy_add_from_clipboard_existing_toast" = "This proxy is already in the list.";
 "lng_badge_psa_default" = "PSA";
 "lng_about_psa_default" = "This message provides you with a public service announcement. To remove it from your chats list, right click it and select **Hide**.";
 "lng_tooltip_psa_default" = "This message provides you with a public service announcement.";
diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index cf9d91f8c..f50ef4b3a 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -7,31 +7,35 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/connection_box.h"
 
-#include "ui/boxes/confirm_box.h"
-#include "lang/lang_keys.h"
-#include "storage/localstorage.h"
-#include "base/qthelp_url.h"
 #include "base/call_delayed.h"
+#include "base/qthelp_regex.h"
+#include "base/qthelp_url.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/core_settings.h"
+#include "core/local_url_handlers.h"
+#include "lang/lang_keys.h"
 #include "main/main_account.h"
 #include "mtproto/facade.h"
-#include "ui/widgets/checkbox.h"
+#include "storage/localstorage.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/radial_animation.h"
+#include "ui/painter.h"
+#include "ui/text/text_options.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/fields/number_input.h"
 #include "ui/widgets/fields/password_input.h"
 #include "ui/widgets/labels.h"
-#include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/toast/toast.h"
-#include "ui/effects/animations.h"
-#include "ui/effects/radial_animation.h"
-#include "ui/text/text_options.h"
-#include "ui/text/text_utilities.h"
-#include "ui/basic_click_handlers.h"
-#include "ui/painter.h"
 #include "boxes/abstract_box.h" // Ui::show().
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
@@ -48,6 +52,22 @@ constexpr auto kSaveSettingsDelayedTimeout = crl::time(1000);
 
 using ProxyData = MTP::ProxyData;
 
+[[nodiscard]] ProxyData ProxyDataFromFields(
+		ProxyData::Type type,
+		const QMap<QString, QString> &fields) {
+	auto proxy = ProxyData();
+	proxy.type = type;
+	proxy.host = fields.value(u"server"_q);
+	proxy.port = fields.value(u"port"_q).toUInt();
+	if (type == ProxyData::Type::Socks5) {
+		proxy.user = fields.value(u"user"_q);
+		proxy.password = fields.value(u"pass"_q);
+	} else if (type == ProxyData::Type::Mtproto) {
+		proxy.password = fields.value(u"secret"_q);
+	}
+	return proxy;
+};
+
 class HostInput : public Ui::MaskedInputField {
 public:
 	HostInput(
@@ -203,6 +223,7 @@ protected:
 
 private:
 	void setupContent();
+	void setupTopButton();
 	void createNoRowsLabel();
 	void addNewProxy();
 	void applyView(View &&view);
@@ -600,9 +621,80 @@ void ProxiesBox::prepare() {
 	addButton(tr::lng_proxy_add(), [=] { addNewProxy(); });
 	addButton(tr::lng_close(), [=] { closeBox(); });
 
+	setupTopButton();
 	setupContent();
 }
 
+void ProxiesBox::setupTopButton() {
+	const auto top = addTopButton(st::infoTopBarMenu);
+	const auto menu
+		= top->lifetime().make_state<base::unique_qptr<Ui::PopupMenu>>();
+	const auto callback = [=] {
+		const auto maybeUrl = QGuiApplication::clipboard()->text();
+		const auto local = Core::TryConvertUrlToLocal(maybeUrl);
+
+		const auto proxyString = u"proxy"_q;
+		const auto socksString = u"socks"_q;
+		const auto protocol = u"tg://"_q;
+		const auto command = base::StringViewMid(
+			local,
+			protocol.size(),
+			8192);
+
+		if (local.startsWith(protocol + proxyString)
+			|| local.startsWith(protocol + socksString)) {
+
+			using namespace qthelp;
+			const auto options = RegExOption::CaseInsensitive;
+			for (const auto &[expression, _] : Core::LocalUrlHandlers()) {
+				const auto midExpression = base::StringViewMid(
+					expression,
+					1);
+				const auto isSocks = midExpression.startsWith(
+					socksString);
+				if (!midExpression.startsWith(proxyString)
+					&& !isSocks) {
+					continue;
+				}
+				const auto match = regex_match(
+					expression,
+					command,
+					options);
+				if (!match) {
+					continue;
+				}
+				const auto type = isSocks
+					? ProxyData::Type::Socks5
+					: ProxyData::Type::Mtproto;
+				const auto fields = url_parse_params(
+					match->captured(1),
+					qthelp::UrlParamNameTransform::ToLower);
+				const auto proxy = ProxyDataFromFields(type, fields);
+				const auto contains = _controller->contains(proxy);
+				const auto toast = (contains
+					? tr::lng_proxy_add_from_clipboard_existing_toast
+					: tr::lng_proxy_add_from_clipboard_good_toast)(tr::now);
+				uiShow()->showToast(toast);
+				if (!contains) {
+					_controller->addNewItem(proxy);
+				}
+				break;
+			}
+		} else {
+			uiShow()->showToast(
+				tr::lng_proxy_add_from_clipboard_failed_toast(tr::now));
+		}
+	};
+	top->setClickedCallback([=] {
+		*menu = base::make_unique_q<Ui::PopupMenu>(top, st::defaultPopupMenu);
+		(*menu)->addAction(
+			tr::lng_proxy_add_from_clipboard(tr::now),
+			callback);
+		(*menu)->popup(QCursor::pos());
+		return true;
+	});
+}
+
 void ProxiesBox::setupContent() {
 	const auto inner = setInnerWidget(object_ptr<Ui::VerticalLayout>(this));
 
@@ -1096,24 +1188,13 @@ ProxiesBoxController::ProxiesBoxController(not_null<Main::Account*> account)
 void ProxiesBoxController::ShowApplyConfirmation(
 		Type type,
 		const QMap<QString, QString> &fields) {
-	const auto server = fields.value(u"server"_q);
-	const auto port = fields.value(u"port"_q).toUInt();
-	auto proxy = ProxyData();
-	proxy.type = type;
-	proxy.host = server;
-	proxy.port = port;
-	if (type == Type::Socks5) {
-		proxy.user = fields.value(u"user"_q);
-		proxy.password = fields.value(u"pass"_q);
-	} else if (type == Type::Mtproto) {
-		proxy.password = fields.value(u"secret"_q);
-	}
+	const auto proxy = ProxyDataFromFields(type, fields);
 	if (proxy) {
 		static const auto UrlStartRegExp = QRegularExpression(
 			"^https://",
 			QRegularExpression::CaseInsensitiveOption);
 		static const auto UrlEndRegExp = QRegularExpression("/$");
-		const auto displayed = "https://" + server + "/";
+		const auto displayed = "https://" + proxy.host + "/";
 		const auto parsed = QUrl::fromUserInput(displayed);
 		const auto displayUrl = !UrlClickHandler::IsSuspicious(displayed)
 			? displayed
@@ -1131,7 +1212,7 @@ void ProxiesBoxController::ShowApplyConfirmation(
 			lt_server,
 			displayServer,
 			lt_port,
-			QString::number(port))
+			QString::number(proxy.port))
 			+ (proxy.type == Type::Mtproto
 				? "\n\n" + tr::lng_proxy_sponsor_warning(tr::now)
 				: QString());
@@ -1448,6 +1529,14 @@ object_ptr<Ui::BoxContent> ProxiesBoxController::addNewItemBox() {
 	});
 }
 
+bool ProxiesBoxController::contains(const ProxyData &proxy) const {
+	const auto j = ranges::find(
+		_list,
+		proxy,
+		[](const Item &item) { return item.data; });
+	return (j != end(_list));
+}
+
 void ProxiesBoxController::addNewItem(const ProxyData &proxy) {
 	auto &proxies = _settings.list();
 	proxies.push_back(proxy);
diff --git a/Telegram/SourceFiles/boxes/connection_box.h b/Telegram/SourceFiles/boxes/connection_box.h
index 8c78ebf34..e3bbfd006 100644
--- a/Telegram/SourceFiles/boxes/connection_box.h
+++ b/Telegram/SourceFiles/boxes/connection_box.h
@@ -77,6 +77,9 @@ public:
 	void setTryIPv6(bool enabled);
 	rpl::producer<ProxyData::Settings> proxySettingsValue() const;
 
+	[[nodiscard]] bool contains(const ProxyData &proxy) const;
+	void addNewItem(const ProxyData &proxy);
+
 	rpl::producer<ItemView> views() const;
 
 	~ProxiesBoxController();
@@ -109,7 +112,6 @@ private:
 	void replaceItemValue(
 		std::vector<Item>::iterator which,
 		const ProxyData &proxy);
-	void addNewItem(const ProxyData &proxy);
 
 	const not_null<Main::Account*> _account;
 	Core::SettingsProxy &_settings;

From 3b6870396c915ab4af3c6f92b8d3cfd59fa54653 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 19:06:48 +0300
Subject: [PATCH 569/596] Added ability to hide every sponsored message to
 premium users.

---
 Telegram/SourceFiles/history/history_inner_widget.cpp |  8 +++++++-
 Telegram/SourceFiles/history/history_item_helpers.cpp | 10 +++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 1b5e78f3e..9809f9c89 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -161,7 +161,13 @@ void FillSponsoredMessagesMenu(
 		menu->addSeparator(&st::expandedMenuSeparator);
 	}
 	menu->addAction(tr::lng_sponsored_hide_ads(tr::now), [=] {
-		ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
+		if (controller->session().premium()) {
+			using Result = Data::SponsoredReportResult;
+			controller->session().sponsoredMessages().createReportCallback(
+				itemId)(Result::Id("-1"), [](const auto &) {});
+		} else {
+			ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
+		}
 	}, &st::menuIconCancel);
 }
 
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 7b51f751c..d3d9569e6 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_text_entities.h"
 #include "boxes/premium_preview_box.h"
 #include "calls/calls_instance.h"
+#include "data/components/sponsored_messages.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_channel.h"
@@ -363,7 +364,14 @@ ClickHandlerPtr HideSponsoredClickHandler() {
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
 		if (const auto controller = my.sessionWindow.get()) {
-			ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
+			const auto &session = controller->session();
+			if (session.premium()) {
+				using Result = Data::SponsoredReportResult;
+				session.sponsoredMessages().createReportCallback(
+					my.itemId)(Result::Id("-1"), [](const auto &) {});
+			} else {
+				ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
+			}
 		}
 	});
 }

From e5132e3fe88dc5f6504b349d05c006ba15fcb135 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 20:32:48 +0400
Subject: [PATCH 570/596] Version 5.0.4

- Fix reply to last message by Ctrl+Up in topics.
- Some other bug fixes.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 5 +++++
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 804884178..519db7170 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.3.0" />
+    Version="5.0.4.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index dde750548..5bec7f3bc 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 5,0,3,0
- PRODUCTVERSION 5,0,3,0
+ FILEVERSION 5,0,4,0
+ PRODUCTVERSION 5,0,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.3.0"
+            VALUE "FileVersion", "5.0.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.3.0"
+            VALUE "ProductVersion", "5.0.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 9fce7f364..d44287d24 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 5,0,3,0
- PRODUCTVERSION 5,0,3,0
+ FILEVERSION 5,0,4,0
+ PRODUCTVERSION 5,0,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.0.3.0"
+            VALUE "FileVersion", "5.0.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.3.0"
+            VALUE "ProductVersion", "5.0.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 73f9f2837..1d8cecd6e 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 = 5000003;
-constexpr auto AppVersionStr = "5.0.3";
+constexpr auto AppVersion = 5000004;
+constexpr auto AppVersionStr = "5.0.4";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index f0887ef68..68f363453 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000003
+AppVersion         5000004
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.3
-AppVersionStr      5.0.3
+AppVersionStrSmall 5.0.4
+AppVersionStr      5.0.4
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.0.3
+AppVersionOriginal 5.0.4
diff --git a/changelog.txt b/changelog.txt
index 5a24a32e1..19f721c85 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+5.0.4 (28.05.24)
+
+- Fix reply to last message by Ctrl+Up in topics.
+- Some other bug fixes.
+
 5.0.3 (28.05.24)
 
 - Ctrl+Click on Reply in menu to Reply in another chat.

From ef2aa051978bf7d17d5a15fb3a70cad3c96ccc8d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 19:39:19 +0400
Subject: [PATCH 571/596] Allow HistoryView::ListWidget without
 SessionController.

---
 .../history/view/history_view_list_widget.cpp | 314 ++++++++++++------
 .../history/view/history_view_list_widget.h   |  73 +++-
 .../view/history_view_pinned_section.cpp      |   3 +-
 .../view/history_view_pinned_section.h        |   2 +-
 .../view/history_view_replies_section.cpp     |   3 +-
 .../view/history_view_replies_section.h       |   2 +-
 .../view/history_view_scheduled_section.cpp   |   3 +-
 .../view/history_view_scheduled_section.h     |   2 +-
 .../view/history_view_sublist_section.cpp     |   3 +-
 .../view/history_view_sublist_section.h       |   2 +-
 .../business/settings_shortcut_messages.cpp   |  10 +-
 Telegram/SourceFiles/ui/chat/chat_style.h     |   8 +
 .../window/window_session_controller.cpp      |   2 +-
 .../window/window_session_controller.h        |  10 +-
 14 files changed, 312 insertions(+), 125 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index e31188605..538606339 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -90,6 +90,95 @@ constexpr auto kClearUserpicsAfter = 50;
 
 } // namespace
 
+const crl::time ListWidget::kItemRevealDuration = crl::time(150);
+
+WindowListDelegate::WindowListDelegate(
+	not_null<Window::SessionController*> window)
+: _window(window) {
+}
+
+not_null<Window::SessionController*> WindowListDelegate::listWindow() {
+	return _window;
+}
+
+not_null<const Ui::ChatStyle*> WindowListDelegate::listChatStyle() {
+	return _window->chatStyle();
+}
+
+rpl::producer<bool> WindowListDelegate::listChatWideValue() {
+	return _window->adaptive().chatWideValue();
+}
+
+auto WindowListDelegate::listMakeReactionsManager(
+	QWidget *wheelEventsTarget,
+	Fn<void(QRect)> update)
+-> std::unique_ptr<Reactions::Manager> {
+	return std::make_unique<Reactions::Manager>(
+		wheelEventsTarget,
+		std::move(update),
+		_window->cachedReactionIconFactory().createMethod());
+}
+
+void WindowListDelegate::listVisibleAreaUpdated() {
+	_window->floatPlayerAreaUpdated();
+}
+
+std::shared_ptr<Ui::Show> WindowListDelegate::listUiShow() {
+	return _window->uiShow();
+}
+
+void WindowListDelegate::listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) {
+	_window->showPollResults(poll, context);
+}
+
+void WindowListDelegate::listCancelUploadLayer(not_null<HistoryItem*> item) {
+	_window->cancelUploadLayer(item);
+}
+
+bool WindowListDelegate::listAnimationsPaused() {
+	return _window->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
+}
+
+auto WindowListDelegate::listSendingAnimation()
+-> Ui::MessageSendingAnimationController * {
+	return &_window->sendingAnimation();
+}
+
+Ui::ChatPaintContext WindowListDelegate::listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) {
+	return _window->preparePaintContext(std::move(args));
+}
+
+bool WindowListDelegate::listMarkingContentRead() {
+	return _window->widget()->markingAsRead();
+}
+
+bool WindowListDelegate::listIgnorePaintEvent(QWidget *w, QPaintEvent *e) {
+	return _window->contentOverlapped(w, e);
+}
+
+bool WindowListDelegate::listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) {
+	return Window::ShowReactPremiumError(_window, item, id);
+}
+
+void WindowListDelegate::listWindowSetInnerFocus() {
+	_window->widget()->setInnerFocus();
+}
+
+bool WindowListDelegate::listAllowsDragForward() {
+	return _window->adaptive().isOneColumn();
+}
+
+void WindowListDelegate::listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) {
+	_window->widget()->launchDrag(std::move(data), std::move(finished));
+}
+
 ListWidget::MouseState::MouseState() : pointState(PointState::Outside) {
 }
 
@@ -104,8 +193,6 @@ ListWidget::MouseState::MouseState(
 , pointState(pointState) {
 }
 
-const crl::time ListWidget::kItemRevealDuration = crl::time(150);
-
 template <ListWidget::EnumItemsDirection direction, typename Method>
 void ListWidget::enumerateItems(Method method) {
 	constexpr auto TopToBottom = (direction == EnumItemsDirection::TopToBottom);
@@ -283,31 +370,29 @@ void ListWidget::enumerateDates(Method method) {
 
 ListWidget::ListWidget(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller,
+	not_null<Main::Session*> session,
 	not_null<ListDelegate*> delegate)
 : RpWidget(parent)
 , _delegate(delegate)
-, _controller(controller)
+, _session(session)
 , _emojiInteractions(std::make_unique<EmojiInteractions>(
-	&controller->session(),
+	session,
 	[=](not_null<const Element*> view) { return itemTop(view); }))
 , _context(_delegate->listContext())
 , _itemAverageHeight(itemMinimalHeight())
 , _pathGradient(
 	MakePathShiftGradient(
-		controller->chatStyle(),
+		_delegate->listChatStyle(),
 		[=] { update(); }))
-, _reactionsManager(
-	std::make_unique<Reactions::Manager>(
-		this,
-		[=](QRect updated) { update(updated); },
-		controller->cachedReactionIconFactory().createMethod()))
+, _reactionsManager(_delegate->listMakeReactionsManager(
+	this,
+	[=](QRect updated) { update(updated); }))
 , _translateTracker(MaybeTranslateTracker(_delegate->listTranslateHistory()))
 , _scrollDateCheck([this] { scrollDateCheck(); })
 , _applyUpdatedScrollState([this] { applyUpdatedScrollState(); })
 , _selectEnabled(_delegate->listAllowsMultiSelect())
 , _highlighter(
-	&session().data(),
+	&_session->data(),
 	[=](const HistoryItem *item) { return viewForItem(item); },
 	[=](const Element *view) { repaintItem(view); })
 , _touchSelectTimer([=] { onTouchSelect(); })
@@ -315,25 +400,25 @@ ListWidget::ListWidget(
 	setAttribute(Qt::WA_AcceptTouchEvents);
 	setMouseTracking(true);
 	_scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); });
-	session().data().viewRepaintRequest(
+	_session->data().viewRepaintRequest(
 	) | rpl::start_with_next([this](auto view) {
 		if (view->delegate() == this) {
 			repaintItem(view);
 		}
 	}, lifetime());
-	session().data().viewResizeRequest(
+	_session->data().viewResizeRequest(
 	) | rpl::start_with_next([this](auto view) {
 		if (view->delegate() == this) {
 			resizeItem(view);
 		}
 	}, lifetime());
-	session().data().itemViewRefreshRequest(
+	_session->data().itemViewRefreshRequest(
 	) | rpl::start_with_next([this](auto item) {
 		if (const auto view = viewForItem(item)) {
 			refreshItem(view);
 		}
 	}, lifetime());
-	session().data().viewLayoutChanged(
+	_session->data().viewLayoutChanged(
 	) | rpl::start_with_next([this](auto view) {
 		if (view->delegate() == this) {
 			if (view->isUnderCursor()) {
@@ -341,37 +426,37 @@ ListWidget::ListWidget(
 			}
 		}
 	}, lifetime());
-	session().data().itemDataChanges(
+	_session->data().itemDataChanges(
 	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
 		if (const auto view = viewForItem(item)) {
 			view->itemDataChanged();
 		}
 	}, lifetime());
 
-	session().downloaderTaskFinished(
+	_session->downloaderTaskFinished(
 	) | rpl::start_with_next([=] {
 		update();
 	}, lifetime());
 
-	session().data().peerDecorationsUpdated(
+	_session->data().peerDecorationsUpdated(
 	) | rpl::start_with_next([=] {
 		update();
 	}, lifetime());
 
-	session().data().itemRemoved(
+	_session->data().itemRemoved(
 	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
 		itemRemoved(item);
 	}, lifetime());
 
 	using MessageUpdateFlag = Data::MessageUpdate::Flag;
-	session().changes().realtimeMessageUpdates(
+	_session->changes().realtimeMessageUpdates(
 		MessageUpdateFlag::NewUnreadReaction
 	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
 		maybeMarkReactionsRead(update.item);
 	}, lifetime());
 
 	if (const auto history = _delegate->listTranslateHistory()) {
-		session().changes().historyUpdates(
+		_session->changes().historyUpdates(
 			history,
 			Data::HistoryUpdate::Flag::TranslatedTo
 		) | rpl::start_with_next([=] {
@@ -379,7 +464,7 @@ ListWidget::ListWidget(
 		}, lifetime());
 	}
 
-	session().data().itemVisibilityQueries(
+	_session->data().itemVisibilityQueries(
 	) | rpl::start_with_next([=](
 			const Data::Session::ItemVisibilityQuery &query) {
 		if (const auto view = viewForItem(query.item)) {
@@ -392,25 +477,27 @@ ListWidget::ListWidget(
 		}
 	}, lifetime());
 
-	_reactionsManager->chosen(
-	) | rpl::start_with_next([=](ChosenReaction reaction) {
-		_reactionsManager->updateButton({});
-		reactionChosen(reaction);
-	}, lifetime());
-
-	Reactions::SetupManagerList(
-		_reactionsManager.get(),
-		_reactionsItem.value());
-
-	Core::App().settings().cornerReactionValue(
-	) | rpl::start_with_next([=](bool value) {
-		_useCornerReaction = value;
-		if (!value) {
+	if (_reactionsManager) {
+		_reactionsManager->chosen(
+		) | rpl::start_with_next([=](ChosenReaction reaction) {
 			_reactionsManager->updateButton({});
-		}
-	}, lifetime());
+			reactionChosen(reaction);
+		}, lifetime());
 
-	controller->adaptive().chatWideValue(
+		Reactions::SetupManagerList(
+			_reactionsManager.get(),
+			_reactionsItem.value());
+
+		Core::App().settings().cornerReactionValue(
+		) | rpl::start_with_next([=](bool value) {
+			_useCornerReaction = value;
+			if (!value) {
+				_reactionsManager->updateButton({});
+			}
+		}, lifetime());
+	}
+
+	_delegate->listChatWideValue(
 	) | rpl::start_with_next([=](bool wide) {
 		_isChatWide = wide;
 	}, lifetime());
@@ -427,11 +514,11 @@ ListWidget::ListWidget(
 }
 
 Main::Session &ListWidget::session() const {
-	return _controller->session();
+	return *_session;
 }
 
 not_null<Window::SessionController*> ListWidget::controller() const {
-	return _controller;
+	return _delegate->listWindow();
 }
 
 not_null<ListDelegate*> ListWidget::delegate() const {
@@ -1006,7 +1093,7 @@ void ListWidget::visibleTopBottomUpdated(
 	} else {
 		scrollDateHideByTimer();
 	}
-	_controller->floatPlayerAreaUpdated();
+	_delegate->listVisibleAreaUpdated();
 	session().data().itemVisibilitiesUpdated();
 	_applyUpdatedScrollState.call();
 
@@ -1439,7 +1526,7 @@ bool ListWidget::showCopyRestriction(HistoryItem *item) {
 	if (type == CopyRestrictionType::None) {
 		return false;
 	}
-	_controller->showToast((type == CopyRestrictionType::Channel)
+	_delegate->listUiShow()->showToast((type == CopyRestrictionType::Channel)
 		? tr::lng_error_nocopy_channel(tr::now)
 		: tr::lng_error_nocopy_group(tr::now));
 	return true;
@@ -1450,7 +1537,7 @@ bool ListWidget::showCopyMediaRestriction(not_null<HistoryItem*> item) {
 	if (type == CopyRestrictionType::None) {
 		return false;
 	}
-	_controller->showToast((type == CopyRestrictionType::Channel)
+	_delegate->listUiShow()->showToast((type == CopyRestrictionType::Channel)
 		? tr::lng_error_nocopy_channel(tr::now)
 		: tr::lng_error_nocopy_group(tr::now));
 	return true;
@@ -1676,7 +1763,7 @@ void ListWidget::elementStartStickerLoop(not_null<const Element*> view) {
 void ListWidget::elementShowPollResults(
 		not_null<PollData*> poll,
 		FullMsgId context) {
-	_controller->showPollResults(poll, context);
+	_delegate->listShowPollResults(poll, context);
 }
 
 void ListWidget::elementOpenPhoto(
@@ -1694,7 +1781,7 @@ void ListWidget::elementOpenDocument(
 
 void ListWidget::elementCancelUpload(const FullMsgId &context) {
 	if (const auto item = session().data().message(context)) {
-		_controller->cancelUploadLayer(item);
+		_delegate->listCancelUploadLayer(item);
 	}
 }
 
@@ -1706,7 +1793,7 @@ void ListWidget::elementShowTooltip(
 }
 
 bool ListWidget::elementAnimationsPaused() {
-	return _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
+	return _delegate->listAnimationsPaused();
 }
 
 bool ListWidget::elementHideReply(not_null<const Element*> view) {
@@ -1838,8 +1925,8 @@ void ListWidget::startItemRevealAnimations() {
 
 void ListWidget::startMessageSendingAnimation(
 		not_null<HistoryItem*> item) {
-	auto &sendingAnimation = controller()->sendingAnimation();
-	if (!sendingAnimation.checkExpectedType(item)) {
+	const auto sendingAnimation = _delegate->listSendingAnimation();
+	if (!sendingAnimation || !sendingAnimation->checkExpectedType(item)) {
 		return;
 	}
 
@@ -1855,7 +1942,7 @@ void ListWidget::startMessageSendingAnimation(
 		return mapToGlobal(QPoint(0, itemTop(view) - additional));
 	});
 
-	sendingAnimation.startAnimation({
+	sendingAnimation->startAnimation({
 		.globalEndTopLeft = std::move(globalEndTopLeft),
 		.view = [=] { return viewForItem(item); },
 		.paintContext = [=] { return preparePaintContext({}); },
@@ -2010,7 +2097,7 @@ TextSelection ListWidget::itemRenderSelection(
 
 Ui::ChatPaintContext ListWidget::preparePaintContext(
 		const QRect &clip) const {
-	return controller()->preparePaintContext({
+	return _delegate->listPreparePaintContext({
 		.theme = _delegate->listChatTheme(),
 		.clip = clip,
 		.visibleAreaPositionGlobal = mapToGlobal(QPoint(0, _visibleTop)),
@@ -2022,7 +2109,7 @@ Ui::ChatPaintContext ListWidget::preparePaintContext(
 bool ListWidget::markingContentsRead() const {
 	return _showFinished
 		&& !_refreshingViewer
-		&& controller()->widget()->markingAsRead();
+		&& _delegate->listMarkingContentRead();
 }
 
 bool ListWidget::markingMessagesRead() const {
@@ -2053,12 +2140,9 @@ void ListWidget::checkActivation() {
 }
 
 void ListWidget::paintEvent(QPaintEvent *e) {
-	if ((_context != Context::ShortcutMessages)
-		&& _controller->contentOverlapped(this, e)) {
+	if (_delegate->listIgnorePaintEvent(this, e)) {
 		return;
-	}
-
-	if (_translateTracker) {
+	} else if (_translateTracker) {
 		_translateTracker->startBunch();
 	}
 	auto readTill = (HistoryItem*)nullptr;
@@ -2100,20 +2184,25 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 		_delegate->listPaintEmpty(p, context);
 		return;
 	}
-	_reactionsManager->startEffectsCollection();
+	if (_reactionsManager) {
+		_reactionsManager->startEffectsCollection();
+	}
 
-	const auto session = &controller()->session();
+	const auto session = &this->session();
 	auto top = itemTop(from->get());
 	context = context.translated(0, -top);
 	p.translate(0, top);
-	const auto &sendingAnimation = _controller->sendingAnimation();
+	const auto sendingAnimation = _delegate->listSendingAnimation();
 	for (auto i = from; i != to; ++i) {
 		const auto view = *i;
 		const auto item = view->data();
 		const auto height = view->height();
-		if (!sendingAnimation.hasAnimatedMessage(item)) {
-			context.reactionInfo
-				= _reactionsManager->currentReactionPaintInfo();
+		if (!sendingAnimation
+			|| !sendingAnimation->hasAnimatedMessage(item)) {
+			if (_reactionsManager) {
+				context.reactionInfo
+					= _reactionsManager->currentReactionPaintInfo();
+			}
 			context.outbg = view->hasOutLayout();
 			context.selection = itemRenderSelection(view);
 			context.highlight = _highlighter.state(item);
@@ -2125,17 +2214,19 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 		const auto isSponsored = item->isSponsored();
 		const auto isUnread = _delegate->listElementShownUnread(view)
 			&& item->isRegular();
-		const auto withReaction = item->hasUnreadReaction();
+		const auto withReaction = context.reactionInfo
+			&& item->hasUnreadReaction();
 		const auto yShown = [&](int y) {
 			return (_visibleBottom >= y && _visibleTop <= y);
 		};
-		const auto markShown = isSponsored
-			? view->markSponsoredViewed(_visibleBottom - top)
-			: withReaction
-			? yShown(top + context.reactionInfo->position.y())
-			: isUnread
-			? yShown(top + height)
-			: yShown(top + height / 2);
+		const auto markShown = (_context != Context::ChatPreview)
+			&& (isSponsored
+				? view->markSponsoredViewed(_visibleBottom - top)
+				: withReaction
+				? yShown(top + context.reactionInfo->position.y())
+				: isUnread
+				? yShown(top + height)
+				: yShown(top + height / 2));
 		if (markShown) {
 			if (isSponsored) {
 				session->sponsoredMessages().view(item->fullId());
@@ -2157,9 +2248,11 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 		if (item->hasExtendedMediaPreview()) {
 			session->api().views().pollExtendedMedia(item);
 		}
-		_reactionsManager->recordCurrentReactionEffect(
-			item->fullId(),
-			QPoint(0, top));
+		if (_reactionsManager) {
+			_reactionsManager->recordCurrentReactionEffect(
+				item->fullId(),
+				QPoint(0, top));
+		}
 		top += height;
 		context.translate(0, -height);
 		p.translate(0, height);
@@ -2170,7 +2263,9 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 	paintUserpics(p, context, clip);
 	paintDates(p, context, clip);
 
-	_reactionsManager->paint(p, context);
+	if (_reactionsManager) {
+		_reactionsManager->paint(p, context);
+	}
 	_emojiInteractions->paint(p);
 }
 
@@ -2181,7 +2276,7 @@ void ListWidget::paintUserpics(
 	if (_context == Context::ShortcutMessages) {
 		return;
 	}
-	const auto session = &controller()->session();
+	const auto session = &this->session();
 	enumerateUserpics([&](not_null<Element*> view, int userpicTop) {
 		// stop the enumeration if the userpic is below the painted rect
 		if (userpicTop >= clip.top() + clip.height()) {
@@ -2530,7 +2625,7 @@ void ListWidget::toggleFavoriteReaction(not_null<Element*> view) const {
 			Data::LookupPossibleReactions(item).recent,
 			favorite,
 			&Data::Reaction::id)
-		|| Window::ShowReactPremiumError(_controller, item, favorite)) {
+		|| _delegate->listShowReactPremiumError(item, favorite)) {
 		return;
 	} else if (!ranges::contains(item->chosenReactions(), favorite)) {
 		if (const auto top = itemTop(view); top >= 0) {
@@ -2599,6 +2694,7 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	if (link
 		&& !link->property(
 			kSendReactionEmojiProperty).value<Data::ReactionId>().empty()
+		&& _reactionsManager
 		&& _reactionsManager->showContextMenu(
 			this,
 			e,
@@ -2624,13 +2720,13 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			this,
 			overItem,
 			clickedReaction,
-			_controller,
+			controller(),
 			_whoReactedMenuLifetime);
 		e->accept();
 		return;
 	}
 
-	auto request = ContextMenuRequest(_controller);
+	auto request = ContextMenuRequest(controller());
 
 	request.link = link;
 	request.view = _overElement;
@@ -2666,12 +2762,12 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	const auto attached = reactItem
 		? AttachSelectorToMenu(
 			_menu.get(),
-			_controller,
+			controller(),
 			desiredPosition,
 			reactItem,
 			[=](ChosenReaction reaction) { reactionChosen(reaction); },
 			ItemReactionsAbout(reactItem),
-			_controller->cachedReactionIconFactory().createMethod())
+			controller()->cachedReactionIconFactory().createMethod())
 		: AttachSelectorResult::Skipped;
 	if (attached == AttachSelectorResult::Failed) {
 		_menu = nullptr;
@@ -2688,10 +2784,7 @@ void ListWidget::reactionChosen(ChosenReaction reaction) {
 	const auto item = session().data().message(reaction.context);
 	if (!item) {
 		return;
-	} else if (Window::ShowReactPremiumError(
-			_controller,
-			item,
-			reaction.id)) {
+	} else if (_delegate->listShowReactPremiumError(item, reaction.id)) {
 		if (_menu) {
 			_menu->hideMenu();
 		}
@@ -2945,7 +3038,9 @@ void ListWidget::enterEventHook(QEnterEvent *e) {
 }
 
 void ListWidget::leaveEventHook(QEvent *e) {
-	_reactionsManager->updateButton({ .cursorLeft = true });
+	if (_reactionsManager) {
+		_reactionsManager->updateButton({ .cursorLeft = true });
+	}
 	if (const auto view = _overElement) {
 		if (_overState.pointState != PointState::Outside) {
 			repaintItem(view);
@@ -3160,9 +3255,9 @@ void ListWidget::mouseActionStart(
 	const auto pressElement = _overElement;
 
 	_mouseAction = MouseAction::None;
-	_pressWasInactive = Ui::WasInactivePress(_controller->widget());
+	_pressWasInactive = Ui::WasInactivePress(window());
 	if (_pressWasInactive) {
-		Ui::MarkInactivePress(_controller->widget(), false);
+		Ui::MarkInactivePress(window(), false);
 	}
 
 	if (ClickHandler::getPressed()) {
@@ -3334,7 +3429,7 @@ void ListWidget::mouseActionFinish(
 		} else if (_selectedTextItem && !_pressWasInactive) {
 			if (_selectedTextRange.from == _selectedTextRange.to) {
 				clearTextSelection();
-				_controller->widget()->setInnerFocus();
+				_delegate->listWindowSetInnerFocus();
 			}
 		}
 	}
@@ -3362,7 +3457,7 @@ ClickHandlerContext ListWidget::prepareClickHandlerContext(FullMsgId id) {
 				? (ElementDelegate*)weak
 				: nullptr;
 		},
-		.sessionWindow = base::make_weak(_controller),
+		.sessionWindow = base::make_weak(controller()),
 	};
 }
 
@@ -3372,7 +3467,9 @@ void ListWidget::mouseActionUpdate() {
 		std::clamp(mousePosition.x(), 0, width()),
 		std::clamp(mousePosition.y(), _visibleTop, _visibleBottom));
 
-	const auto reactionState = _reactionsManager->buttonTextState(point);
+	const auto reactionState = _reactionsManager
+		? _reactionsManager->buttonTextState(point)
+		: TextState();
 	const auto reactionItem = session().data().message(reactionState.itemId);
 	const auto reactionView = viewForItem(reactionItem);
 	const auto view = reactionView
@@ -3392,12 +3489,14 @@ void ListWidget::mouseActionUpdate() {
 		_overElement = view;
 		repaintItem(_overElement);
 	}
-	_reactionsManager->updateButton(view
-		? reactionButtonParameters(
-			view,
-			itemPoint,
-			reactionState)
-		: Reactions::ButtonParameters());
+	if (_reactionsManager) {
+		_reactionsManager->updateButton(view
+			? reactionButtonParameters(
+				view,
+				itemPoint,
+				reactionState)
+			: Reactions::ButtonParameters());
+	}
 	if (viewChanged && view) {
 		_reactionsItem = item;
 	}
@@ -3624,7 +3723,7 @@ std::unique_ptr<QMimeData> ListWidget::prepareDrag() {
 		if (!urls.isEmpty()) {
 			mimeData->setUrls(urls);
 		}
-		if (uponSelected && !_controller->adaptive().isOneColumn()) {
+		if (uponSelected && !_delegate->listAllowsDragForward()) {
 			const auto canForwardAll = [&] {
 				for (const auto &[itemId, data] : _selected) {
 					if (!data.canForward) {
@@ -3689,8 +3788,10 @@ std::unique_ptr<QMimeData> ListWidget::prepareDrag() {
 void ListWidget::performDrag() {
 	if (auto mimeData = prepareDrag()) {
 		// This call enters event loop and can destroy any QObject.
-		_reactionsManager->updateButton({});
-		_controller->widget()->launchDrag(
+		if (_reactionsManager) {
+			_reactionsManager->updateButton({});
+		}
+		_delegate->listLaunchDrag(
 			std::move(mimeData),
 			crl::guard(this, [=] { mouseActionUpdate(QCursor::pos()); }));
 	}
@@ -3708,7 +3809,10 @@ void ListWidget::repaintItem(const Element *view) {
 	const auto range = view->verticalRepaintRange();
 	update(0, top + range.top, width(), range.height);
 	const auto id = view->data()->fullId();
-	if (const auto area = _reactionsManager->lookupEffectArea(id)) {
+	const auto area = _reactionsManager
+		? _reactionsManager->lookupEffectArea(id)
+		: std::nullopt;
+	if (area) {
 		update(*area);
 	}
 }
@@ -3866,7 +3970,9 @@ void ListWidget::itemRemoved(not_null<const HistoryItem*> item) {
 	viewReplaced(view, nullptr);
 	_views.erase(i);
 
-	_reactionsManager->remove(item->fullId());
+	if (_reactionsManager) {
+		_reactionsManager->remove(item->fullId());
+	}
 	updateItemsGeometry();
 }
 
@@ -3992,7 +4098,7 @@ void ConfirmDeleteSelectedItems(not_null<ListWidget*> widget) {
 		}
 	}
 	auto box = Box<DeleteMessagesBox>(
-		&widget->controller()->session(),
+		&widget->session(),
 		widget->getSelectedIds());
 	box->setDeleteConfirmedCallback(crl::guard(widget, [=] {
 		widget->cancelSelection();
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 7770341d9..f88582722 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -25,11 +25,14 @@ class Session;
 } // namespace Main
 
 namespace Ui {
+class Show;
 class PopupMenu;
 class ChatTheme;
 struct ChatPaintContext;
+struct ChatPaintContextArgs;
 enum class TouchScrollState;
 struct PeerUserpicView;
+class MessageSendingAnimationController;
 } // namespace Ui
 
 namespace Window {
@@ -40,6 +43,7 @@ namespace Data {
 struct Group;
 struct Reaction;
 struct AllowedReactions;
+struct ReactionId;
 } // namespace Data
 
 namespace HistoryView::Reactions {
@@ -154,6 +158,71 @@ public:
 	virtual History *listTranslateHistory() = 0;
 	virtual void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) = 0;
+
+	// Methods that use Window::SessionController by default.
+	virtual not_null<Window::SessionController*> listWindow() = 0;
+	virtual not_null<const Ui::ChatStyle*> listChatStyle() = 0;
+	virtual rpl::producer<bool> listChatWideValue() = 0;
+	virtual std::unique_ptr<Reactions::Manager> listMakeReactionsManager(
+		QWidget *wheelEventsTarget,
+		Fn<void(QRect)> update) = 0;
+	virtual void listVisibleAreaUpdated() = 0;
+	virtual std::shared_ptr<Ui::Show> listUiShow() = 0;
+	virtual void listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) = 0;
+	virtual void listCancelUploadLayer(not_null<HistoryItem*> item) = 0;
+	virtual bool listAnimationsPaused() = 0;
+	virtual auto listSendingAnimation()
+		-> Ui::MessageSendingAnimationController* = 0;
+	virtual Ui::ChatPaintContext listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) = 0;
+	virtual bool listMarkingContentRead() = 0;
+	virtual bool listIgnorePaintEvent(QWidget *w, QPaintEvent *e) = 0;
+	virtual bool listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) = 0;
+	virtual void listWindowSetInnerFocus() = 0;
+	virtual bool listAllowsDragForward() = 0;
+	virtual void listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) = 0;
+};
+
+class WindowListDelegate : public ListDelegate {
+public:
+	explicit WindowListDelegate(not_null<Window::SessionController*> window);
+
+	not_null<Window::SessionController*> listWindow() override;
+	not_null<const Ui::ChatStyle*> listChatStyle() override;
+	rpl::producer<bool> listChatWideValue() override;
+	std::unique_ptr<Reactions::Manager> listMakeReactionsManager(
+		QWidget *wheelEventsTarget,
+		Fn<void(QRect)> update) override;
+	void listVisibleAreaUpdated() override;
+	std::shared_ptr<Ui::Show> listUiShow() override;
+	void listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) override;
+	void listCancelUploadLayer(not_null<HistoryItem*> item) override;
+	bool listAnimationsPaused() override;
+	Ui::MessageSendingAnimationController *listSendingAnimation() override;
+	Ui::ChatPaintContext listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) override;
+	bool listMarkingContentRead() override;
+	bool listIgnorePaintEvent(QWidget *w, QPaintEvent *e) override;
+	bool listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) override;
+	void listWindowSetInnerFocus() override;
+	bool listAllowsDragForward() override;
+	void listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) override;
+
+private:
+	const not_null<Window::SessionController*> _window;
+
 };
 
 struct SelectionData {
@@ -211,7 +280,7 @@ class ListWidget final
 public:
 	ListWidget(
 		QWidget *parent,
-		not_null<Window::SessionController*> controller,
+		not_null<Main::Session*> session,
 		not_null<ListDelegate*> delegate);
 
 	static const crl::time kItemRevealDuration;
@@ -648,7 +717,7 @@ private:
 	static constexpr auto kMinimalIdsLimit = 24;
 
 	const not_null<ListDelegate*> _delegate;
-	const not_null<Window::SessionController*> _controller;
+	const not_null<Main::Session*> _session;
 	const std::unique_ptr<EmojiInteractions> _emojiInteractions;
 	const Context _context;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 0051aecea..51a3101eb 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -94,6 +94,7 @@ PinnedWidget::PinnedWidget(
 	not_null<Window::SessionController*> controller,
 	not_null<Data::Thread*> thread)
 : Window::SectionWidget(parent, controller, thread->peer())
+, WindowListDelegate(controller)
 , _thread(thread->migrateToOrMe())
 , _history(thread->owningHistory())
 , _migratedPeer(thread->asHistory()
@@ -161,7 +162,7 @@ PinnedWidget::PinnedWidget(
 
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this)));
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index 88a592a1b..2c54e0684 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -36,7 +36,7 @@ class TranslateBar;
 
 class PinnedWidget final
 	: public Window::SectionWidget
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	PinnedWidget(
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 02d9c8412..b1dcb13db 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -205,6 +205,7 @@ RepliesWidget::RepliesWidget(
 	not_null<History*> history,
 	MsgId rootId)
 : Window::SectionWidget(parent, controller, history->peer)
+, WindowListDelegate(controller)
 , _history(history)
 , _rootId(rootId)
 , _root(lookupRoot())
@@ -299,7 +300,7 @@ RepliesWidget::RepliesWidget(
 
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this)));
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 33b7859b4..e3d05920e 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -71,7 +71,7 @@ class TranslateBar;
 
 class RepliesWidget final
 	: public Window::SectionWidget
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	RepliesWidget(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 887d16e09..3fe205b3c 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -97,6 +97,7 @@ ScheduledWidget::ScheduledWidget(
 	not_null<History*> history,
 	const Data::ForumTopic *forumTopic)
 : Window::SectionWidget(parent, controller, history->peer)
+, WindowListDelegate(controller)
 , _history(history)
 , _forumTopic(forumTopic)
 , _scroll(
@@ -167,7 +168,7 @@ ScheduledWidget::ScheduledWidget(
 
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this)));
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 6685c113a..9f181d231 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -52,7 +52,7 @@ class StickerToast;
 
 class ScheduledWidget final
 	: public Window::SectionWidget
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	ScheduledWidget(
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
index f4116fd15..df4f4ea04 100644
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
@@ -67,6 +67,7 @@ SublistWidget::SublistWidget(
 	not_null<Window::SessionController*> controller,
 	not_null<Data::SavedSublist*> sublist)
 : Window::SectionWidget(parent, controller, sublist->peer())
+, WindowListDelegate(controller)
 , _sublist(sublist)
 , _history(sublist->owner().history(sublist->session().user()))
 , _topBar(this, controller)
@@ -133,7 +134,7 @@ SublistWidget::SublistWidget(
 
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this)));
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.h b/Telegram/SourceFiles/history/view/history_view_sublist_section.h
index 7ce880439..eff71d50c 100644
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_sublist_section.h
@@ -37,7 +37,7 @@ class ComposeSearch;
 
 class SublistWidget final
 	: public Window::SectionWidget
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	SublistWidget(
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index ca82da329..22e419efa 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -72,7 +72,7 @@ using namespace HistoryView;
 
 class ShortcutMessages
 	: public AbstractSection
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	ShortcutMessages(
@@ -164,6 +164,7 @@ private:
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
+	bool listIgnorePaintEvent(QWidget *w, QPaintEvent *e) override;
 
 	// CornerButtonsDelegate delegate.
 	void cornerButtonsShowAtPosition(
@@ -330,6 +331,7 @@ ShortcutMessages::ShortcutMessages(
 	rpl::producer<Container> containerValue,
 	BusinessShortcutId shortcutId)
 : AbstractSection(parent)
+, WindowListDelegate(controller)
 , _controller(controller)
 , _session(&controller->session())
 , _scroll(scroll)
@@ -370,7 +372,7 @@ ShortcutMessages::ShortcutMessages(
 
 	_inner = Ui::CreateChild<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this));
 	_inner->overrideIsChatWide(false);
 
@@ -1053,6 +1055,10 @@ void ShortcutMessages::listAddTranslatedItems(
 	not_null<TranslateTracker*> tracker) {
 }
 
+bool ShortcutMessages::listIgnorePaintEvent(QWidget *w, QPaintEvent *e) {
+	return false;
+}
+
 void ShortcutMessages::cornerButtonsShowAtPosition(
 		Data::MessagePosition position) {
 	showAtPosition(position);
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.h b/Telegram/SourceFiles/ui/chat/chat_style.h
index 6b8cc459b..f7499a2d0 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.h
+++ b/Telegram/SourceFiles/ui/chat/chat_style.h
@@ -223,6 +223,14 @@ struct ChatPaintContext {
 
 };
 
+struct ChatPaintContextArgs {
+	not_null<ChatTheme*> theme;
+	QRect clip;
+	QPoint visibleAreaPositionGlobal;
+	int visibleAreaTop = 0;
+	int visibleAreaWidth = 0;
+};
+
 [[nodiscard]] int HistoryServiceMsgRadius();
 [[nodiscard]] int HistoryServiceMsgInvertedRadius();
 [[nodiscard]] int HistoryServiceMsgInvertedShrink();
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 4580991e7..0162d7169 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2951,7 +2951,7 @@ void SessionController::openPeerStories(
 }
 
 HistoryView::PaintContext SessionController::preparePaintContext(
-		PaintContextArgs &&args) {
+		Ui::ChatPaintContextArgs &&args) {
 	const auto visibleAreaTopLocal = content()->mapFromGlobal(
 		args.visibleAreaPositionGlobal).y();
 	const auto viewport = QRect(
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 4ff92675f..9888dc1c4 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -64,6 +64,7 @@ struct ChatThemeBackground;
 struct ChatThemeBackgroundData;
 class MessageSendingAnimationController;
 struct BoostCounters;
+struct ChatPaintContextArgs;
 } // namespace Ui
 
 namespace Data {
@@ -586,15 +587,8 @@ public:
 		PeerId peerId,
 		std::optional<Data::StorySourcesList> list = std::nullopt);
 
-	struct PaintContextArgs {
-		not_null<Ui::ChatTheme*> theme;
-		QRect clip;
-		QPoint visibleAreaPositionGlobal;
-		int visibleAreaTop = 0;
-		int visibleAreaWidth = 0;
-	};
 	[[nodiscard]] Ui::ChatPaintContext preparePaintContext(
-		PaintContextArgs &&args);
+		Ui::ChatPaintContextArgs &&args);
 	[[nodiscard]] not_null<const Ui::ChatStyle*> chatStyle() const {
 		return _chatStyle.get();
 	}

From 4427ae43065ba18d8caeefcda9bd5ebb37893714 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 19:39:36 +0400
Subject: [PATCH 572/596] Empty preview widget on long userpic press.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../dialogs/dialogs_inner_widget.cpp          |  78 +++++++++++-
 .../dialogs/dialogs_inner_widget.h            |  13 +-
 .../view/history_view_chat_preview.cpp        | 113 ++++++++++++++++++
 .../history/view/history_view_chat_preview.h  |  26 ++++
 Telegram/SourceFiles/ui/chat/chat.style       |   9 ++
 6 files changed, 234 insertions(+), 7 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
 create mode 100644 Telegram/SourceFiles/history/view/history_view_chat_preview.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 88d42a190..88778fc72 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -781,6 +781,8 @@ PRIVATE
     history/view/history_view_about_view.h
     history/view/history_view_bottom_info.cpp
     history/view/history_view_bottom_info.h
+    history/view/history_view_chat_preview.cpp
+    history/view/history_view_chat_preview.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/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index cdf2fef0d..fbf6eb513 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/dialogs_widget.h"
 #include "dialogs/dialogs_search_from_controllers.h"
 #include "dialogs/dialogs_search_tags.h"
+#include "history/view/history_view_chat_preview.h"
 #include "history/view/history_view_context_menu.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -80,6 +81,7 @@ namespace {
 
 constexpr auto kHashtagResultsLimit = 5;
 constexpr auto kStartReorderThreshold = 30;
+constexpr auto kChatPreviewDelay = crl::time(1000);
 
 int FixedOnTopDialogsCount(not_null<Dialogs::IndexedList*> list) {
 	auto result = 0;
@@ -157,6 +159,7 @@ InnerWidget::InnerWidget(
 	+ st::defaultDialogRow.padding.left())
 , _cancelSearchInChat(this, st::dialogsCancelSearchInPeer)
 , _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer)
+, _chatPreviewTimer([=] { showChatPreview(); })
 , _childListShown(std::move(childListShown)) {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 
@@ -651,6 +654,8 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		context.active = active;
 		context.selected = _menuRow.key
 			? (row->key() == _menuRow.key)
+			: _chatPreviewKey
+			? (row->key() == _chatPreviewKey)
 			: selected;
 		context.topicJumpSelected = selected
 			&& _selectedTopicJump
@@ -1268,6 +1273,14 @@ void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
 		return;
 	}
 	selectByMouse(globalPosition);
+	if (!isUserpicPress()) {
+		cancelChatPreview();
+	}
+}
+
+void InnerWidget::cancelChatPreview() {
+	_chatPreviewTimer.cancel();
+	_chatPreviewWillBeFor = {};
 }
 
 void InnerWidget::clearIrrelevantState() {
@@ -1490,11 +1503,15 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 			row->repaint());
 	}
 	ClickHandler::pressed();
-	if (anim::Disabled()
+	if (pressShowsPreview()) {
+		_chatPreviewWillBeFor = computeChosenRow().key;
+		_chatPreviewTimer.callOnce(kChatPreviewDelay);
+	} else if (anim::Disabled()
 		&& (!_pressed || !_pressed->entry()->isPinnedDialog(_filterId))) {
 		mousePressReleased(e->globalPos(), e->button(), e->modifiers());
 	}
 }
+
 const std::vector<Key> &InnerWidget::pinnedChatsOrder() const {
 	const auto owner = &session().data();
 	return _savedSublists
@@ -1513,6 +1530,7 @@ void InnerWidget::checkReorderPinnedStart(QPoint localPosition) {
 		< style::ConvertScale(kStartReorderThreshold)) {
 		return;
 	}
+	cancelChatPreview();
 	_dragging = _pressed;
 	if (updateReorderIndexGetCount() < 2) {
 		_dragging = nullptr;
@@ -2288,6 +2306,33 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 	});
 }
 
+void InnerWidget::showChatPreview() {
+	const auto key = base::take(_chatPreviewWillBeFor);
+	cancelChatPreview();
+	if (!pressShowsPreview() || key != computeChosenRow().key) {
+		return;
+	}
+	ClickHandler::unpressed();
+	mousePressReleased(QCursor::pos(), Qt::NoButton, Qt::NoModifier);
+
+	_chatPreviewKey = key;
+	_menu = HistoryView::MakeChatPreview(this, key.entry());
+	if (!_menu) {
+		return;
+	}
+	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
+		if (_chatPreviewKey) {
+			updateDialogRow(RowDescriptor(base::take(_chatPreviewKey), {}));
+		}
+		const auto globalPosition = QCursor::pos();
+		if (rect().contains(mapFromGlobal(globalPosition))) {
+			setMouseTracking(true);
+			selectByMouse(globalPosition);
+		}
+	});
+	_menu->popup(_lastMousePosition.value_or(QCursor::pos()));
+}
+
 void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = nullptr;
 
@@ -2316,7 +2361,9 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 		}
 		return RowDescriptor();
 	}();
-	if (!row.key) return;
+	if (!row.key) {
+		return;
+	}
 
 	_menuRow = row;
 	if (_pressButton != Qt::LeftButton) {
@@ -2555,6 +2602,12 @@ void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
 				refresh();
 				clearMouseSelection(true);
 			}
+			if (_chatPreviewWillBeFor.topic() == topic) {
+				_chatPreviewWillBeFor = {};
+			}
+			if (_chatPreviewKey.topic() == topic) {
+				_chatPreviewKey = {};
+			}
 		}, _searchResultsLifetime);
 	}
 }
@@ -3499,6 +3552,23 @@ ChosenRow InnerWidget::computeChosenRow() const {
 	return ChosenRow();
 }
 
+bool InnerWidget::isUserpicPress() const {
+	return  (_lastRowLocalMouseX >= 0)
+		&& (_lastRowLocalMouseX < _st->nameLeft)
+		&& (width() > _narrowWidth);
+}
+
+bool InnerWidget::pressShowsPreview() const {
+	if (!isUserpicPress()) {
+		return false;
+	}
+	const auto key = computeChosenRow().key;
+	if (const auto history = key.history()) {
+		return !history->peer->isForum();
+	}
+	return key.topic() != nullptr;;
+}
+
 bool InnerWidget::chooseRow(
 		Qt::KeyboardModifiers modifiers,
 		MsgId pressedTopicRootId) {
@@ -3511,9 +3581,7 @@ bool InnerWidget::chooseRow(
 			ChosenRow row,
 			Qt::KeyboardModifiers modifiers) {
 		row.newWindow = (modifiers & Qt::ControlModifier);
-		row.userpicClick = (_lastRowLocalMouseX >= 0)
-			&& (_lastRowLocalMouseX < _st->nameLeft)
-			&& (width() > _narrowWidth);
+		row.userpicClick = isUserpicPress();
 		return row;
 	};
 	auto chosen = modifyChosenRow(computeChosenRow(), modifiers);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 7699576c8..c8186e2ea 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -7,14 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/flags.h"
+#include "base/object_ptr.h"
+#include "base/timer.h"
 #include "dialogs/dialogs_key.h"
 #include "data/data_messages.h"
 #include "ui/dragging_scroll_manager.h"
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 #include "ui/userpic_view.h"
-#include "base/flags.h"
-#include "base/object_ptr.h"
 
 namespace style {
 struct DialogRow;
@@ -121,6 +122,10 @@ public:
 	void refreshEmptyLabel();
 	void resizeEmptyLabel();
 
+	[[nodiscard]] bool isUserpicPress() const;
+	[[nodiscard]] bool pressShowsPreview() const;
+	void cancelChatPreview();
+	void showChatPreview();
 	bool chooseRow(
 		Qt::KeyboardModifiers modifiers = {},
 		MsgId pressedTopicRootId = {});
@@ -514,6 +519,10 @@ private:
 	rpl::event_stream<QString> _completeHashtagRequests;
 	rpl::event_stream<> _refreshHashtagsRequests;
 
+	base::Timer _chatPreviewTimer;
+	Key _chatPreviewWillBeFor;
+	Key _chatPreviewKey;
+
 	rpl::variable<ChildListShown> _childListShown;
 	float64 _narrowRatio = 0.;
 	bool _geometryInited = false;
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
new file mode 100644
index 000000000..7779b8b28
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -0,0 +1,113 @@
+/*
+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_chat_preview.h"
+
+#include "data/data_peer.h"
+#include "history/history.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/menu/menu_item_base.h"
+#include "window/themes/window_theme.h"
+#include "window/section_widget.h"
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+namespace {
+
+class Item final : public Ui::Menu::ItemBase {
+public:
+	Item(not_null<Ui::RpWidget*> parent, not_null<History*> history);
+
+	not_null<QAction*> action() const override;
+	bool isEnabled() const override;
+
+private:
+	void setupBackground();
+
+	int contentHeight() const override;
+
+	void paintEvent(QPaintEvent *e) override;
+
+	const not_null<QAction*> _dummyAction;
+	const std::shared_ptr<Ui::ChatTheme> _theme;
+
+	QImage _bg;
+
+};
+
+Item::Item(not_null<Ui::RpWidget*> parent, not_null<History*> history)
+: Ui::Menu::ItemBase(parent, st::previewMenu.menu)
+, _dummyAction(new QAction(parent))
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime())) {
+	setPointerCursor(false);
+	setMinWidth(st::previewMenu.menu.widthMin);
+	resize(minWidth(), contentHeight());
+	setupBackground();
+}
+
+not_null<QAction*> Item::action() const {
+	return _dummyAction;
+}
+
+bool Item::isEnabled() const {
+	return false;
+}
+
+int Item::contentHeight() const {
+	return st::previewMenu.maxHeight;
+}
+
+void Item::setupBackground() {
+	const auto ratio = style::DevicePixelRatio();
+	_bg = QImage(
+		size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+
+	const auto paint = [=] {
+		auto p = QPainter(&_bg);
+		Window::SectionWidget::PaintBackground(
+			p,
+			_theme.get(),
+			QSize(width(), height() * 2),
+			QRect(QPoint(), size()));
+	};
+	paint();
+	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+		paint();
+		update();
+	}, lifetime());
+}
+
+void Item::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	p.drawImage(0, 0, _bg);
+}
+
+} // namespace
+
+base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
+		QWidget *parent,
+		not_null<Dialogs::Entry*> entry) {
+	if (const auto topic = entry->asTopic()) {
+		return nullptr;
+	}
+	const auto history = entry->asHistory();
+	if (!history || history->peer->isForum()) {
+		return nullptr;
+	}
+
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::previewMenu);
+
+	result->addAction(base::make_unique_q<Item>(result.get(), history));
+
+	return result;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.h b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
new file mode 100644
index 000000000..12a35bbba
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
@@ -0,0 +1,26 @@
+/*
+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/unique_qptr.h"
+
+namespace Dialogs {
+class Entry;
+} // namespace Dialogs
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace HistoryView {
+
+[[nodiscard]] base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
+	QWidget *parent,
+	not_null<Dialogs::Entry*> entry);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 5dd77998a..c72097f25 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1076,3 +1076,12 @@ liveLocationLongInIconSelected: icon {{ "chat/live_location_long", msgInServiceF
 liveLocationLongOutIcon: icon {{ "chat/live_location_long", msgOutServiceFg }};
 liveLocationLongOutIconSelected: icon {{ "chat/live_location_long", msgOutServiceFgSelected }};
 liveLocationRemainingSize: 28px;
+
+previewMenu: PopupMenu(defaultPopupMenu) {
+	scrollPadding: margins(0px, 0px, 0px, 0px);
+	menu: Menu(defaultMenu) {
+		widthMin: 380px;
+		widthMax: 380px;
+	}
+	maxHeight: 420px;
+}

From da31fef1ae7e512dd1591476c3a24b81ae8353d7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 11:26:39 +0400
Subject: [PATCH 573/596] Show long-press preview of topics.

---
 .../view/history_view_chat_preview.cpp        | 463 +++++++++++++++++-
 .../history/view/history_view_element.h       |   1 +
 .../history/view/history_view_message.cpp     |   2 +
 Telegram/SourceFiles/ui/chat/chat.style       |   2 +
 4 files changed, 455 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 7779b8b28..c394af68b 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -7,10 +7,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_chat_preview.h"
 
+#include "data/data_forum_topic.h"
 #include "data/data_peer.h"
+#include "data/data_replies_list.h"
+#include "data/data_thread.h"
+#include "history/view/reactions/history_view_reactions_button.h"
+#include "history/view/history_view_list_widget.h"
 #include "history/history.h"
+#include "history/history_item.h"
+#include "main/main_session.h"
+#include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/menu/menu_item_base.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
@@ -19,35 +28,159 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace HistoryView {
 namespace {
 
-class Item final : public Ui::Menu::ItemBase {
+class Item final
+	: public Ui::Menu::ItemBase
+	, private HistoryView::ListDelegate {
 public:
-	Item(not_null<Ui::RpWidget*> parent, not_null<History*> history);
+	Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread);
 
 	not_null<QAction*> action() const override;
 	bool isEnabled() const override;
 
 private:
-	void setupBackground();
-
 	int contentHeight() const override;
-
 	void paintEvent(QPaintEvent *e) override;
 
+	void setupBackground();
+	void updateInnerVisibleArea();
+
+	Context listContext() override;
+	bool listScrollTo(int top, bool syntetic = true) override;
+	void listCancelRequest() override;
+	void listDeleteRequest() override;
+	void listTryProcessKeyInput(not_null<QKeyEvent*> e) override;
+	rpl::producer<Data::MessagesSlice> listSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) override;
+	bool listAllowsMultiSelect() override;
+	bool listIsItemGoodForSelection(not_null<HistoryItem*> item) override;
+	bool listIsLessInOrder(
+		not_null<HistoryItem*> first,
+		not_null<HistoryItem*> second) override;
+	void listSelectionChanged(SelectedItems &&items) override;
+	void listMarkReadTill(not_null<HistoryItem*> item) override;
+	void listMarkContentsRead(
+		const base::flat_set<not_null<HistoryItem*>> &items) override;
+	MessagesBarData listMessagesBar(
+		const std::vector<not_null<Element*>> &elements) override;
+	void listContentRefreshed() override;
+	void listUpdateDateLink(
+		ClickHandlerPtr &link,
+		not_null<Element*> view) override;
+	bool listElementHideReply(not_null<const Element*> view) override;
+	bool listElementShownUnread(not_null<const Element*> view) override;
+	bool listIsGoodForAroundPosition(
+		not_null<const Element*> view) override;
+	void listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) override;
+	void listSearch(
+		const QString &query,
+		const FullMsgId &context) override;
+	void listHandleViaClick(not_null<UserData*> bot) override;
+	not_null<Ui::ChatTheme*> listChatTheme() override;
+	CopyRestrictionType listCopyRestrictionType(
+		HistoryItem *item) override;
+	CopyRestrictionType listCopyRestrictionType() {
+		return listCopyRestrictionType(nullptr);
+	}
+	CopyRestrictionType listCopyMediaRestrictionType(
+		not_null<HistoryItem*> item) override;
+	CopyRestrictionType listSelectRestrictionType() override;
+	auto listAllowedReactionsValue()
+		-> rpl::producer<Data::AllowedReactions> override;
+	void listShowPremiumToast(not_null<DocumentData*> document) override;
+	void listOpenPhoto(
+		not_null<PhotoData*> photo,
+		FullMsgId context) override;
+	void listOpenDocument(
+		not_null<DocumentData*> document,
+		FullMsgId context,
+		bool showInMediaView) override;
+	void listPaintEmpty(
+		Painter &p,
+		const Ui::ChatPaintContext &context) override;
+	QString listElementAuthorRank(not_null<const Element*> view) override;
+	History *listTranslateHistory() override;
+	void listAddTranslatedItems(
+		not_null<TranslateTracker*> tracker) override;
+	not_null<Window::SessionController*> listWindow() override;
+	not_null<const Ui::ChatStyle*> listChatStyle() override;
+	rpl::producer<bool> listChatWideValue() override;
+	std::unique_ptr<Reactions::Manager> listMakeReactionsManager(
+		QWidget *wheelEventsTarget,
+		Fn<void(QRect)> update) override;
+	void listVisibleAreaUpdated() override;
+	std::shared_ptr<Ui::Show> listUiShow() override;
+	void listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) override;
+	void listCancelUploadLayer(not_null<HistoryItem*> item) override;
+	bool listAnimationsPaused() override;
+	auto listSendingAnimation()
+		-> Ui::MessageSendingAnimationController* override;
+	Ui::ChatPaintContext listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) override;
+	bool listMarkingContentRead() override;
+	bool listIgnorePaintEvent(QWidget *w, QPaintEvent *e) override;
+	bool listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) override;
+	void listWindowSetInnerFocus() override;
+	bool listAllowsDragForward() override;
+	void listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) override;
+
 	const not_null<QAction*> _dummyAction;
+	const not_null<Main::Session*> _session;
+	const not_null<Data::Thread*> _thread;
+	const not_null<History*> _history;
+	const not_null<PeerData*> _peer;
 	const std::shared_ptr<Ui::ChatTheme> _theme;
+	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
+	const std::unique_ptr<Ui::ElasticScroll> _scroll;
+
+	QPointer<HistoryView::ListWidget> _inner;
 
 	QImage _bg;
 
 };
 
-Item::Item(not_null<Ui::RpWidget*> parent, not_null<History*> history)
+Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 : Ui::Menu::ItemBase(parent, st::previewMenu.menu)
 , _dummyAction(new QAction(parent))
-, _theme(Window::Theme::DefaultChatThemeOn(lifetime())) {
+, _session(&thread->session())
+, _thread(thread)
+, _history(thread->owningHistory())
+, _peer(thread->peer())
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
+, _chatStyle(std::make_unique<Ui::ChatStyle>(_session->colorIndicesValue()))
+, _scroll(std::make_unique<Ui::ElasticScroll>(this)) {
 	setPointerCursor(false);
 	setMinWidth(st::previewMenu.menu.widthMin);
 	resize(minWidth(), contentHeight());
 	setupBackground();
+
+	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
+		this,
+		_session,
+		static_cast<ListDelegate*>(this)));
+	_scroll->setGeometry(rect());
+	_scroll->scrolls(
+	) | rpl::start_with_next([=] {
+		updateInnerVisibleArea();
+	}, lifetime());
+	_scroll->setOverscrollBg(QColor(0, 0, 0, 0));
+	using Type = Ui::ElasticScroll::OverscrollType;
+	_scroll->setOverscrollTypes(Type::Real, Type::Real);
+
+	_inner->resizeToWidth(_scroll->width(), _scroll->height());
+
+	_inner->refreshViewer();
+
+	_inner->setAttribute(Qt::WA_TransparentForMouseEvents);
 }
 
 not_null<QAction*> Item::action() const {
@@ -88,24 +221,328 @@ void Item::paintEvent(QPaintEvent *e) {
 	p.drawImage(0, 0, _bg);
 }
 
+void Item::updateInnerVisibleArea() {
+	const auto scrollTop = _scroll->scrollTop();
+	_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
+}
+
+Context Item::listContext() {
+	return Context::ChatPreview;
+}
+
+bool Item::listScrollTo(int top, bool syntetic) {
+	top = std::clamp(top, 0, _scroll->scrollTopMax());
+	if (_scroll->scrollTop() == top) {
+		updateInnerVisibleArea();
+		return false;
+	}
+	_scroll->scrollToY(top);
+	return true;
+}
+
+void Item::listCancelRequest() {
+}
+
+void Item::listDeleteRequest() {
+}
+
+void Item::listTryProcessKeyInput(not_null<QKeyEvent*> e) {
+}
+
+rpl::producer<Data::MessagesSlice> Item::listSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	if (const auto topic = _thread->asTopic()) {
+		return topic->replies()->source(
+			aroundId,
+			limitBefore,
+			limitAfter
+		) | rpl::before_next([=] { // after_next makes a copy of value.
+			//if (!_loaded) {
+			//	_loaded = true;
+			//	crl::on_main(this, [=] {
+			//		updatePinnedVisibility();
+			//	});
+			//}
+		});
+	}
+	// #TODO
+	//const auto messageId = aroundId.fullId.msg
+	//	? aroundId.fullId.msg
+	//	: (ServerMaxMsgId - 1);
+
+	//return SharedMediaMergedViewer(
+	//	&_thread->session(),
+	//	SharedMediaMergedKey(
+	//		SparseIdsMergedSlice::Key(
+	//			_history->peer->id,
+	//			_thread->topicRootId(),
+	//			_migratedPeer ? _migratedPeer->id : 0,
+	//			messageId),
+	//		Storage::SharedMediaType::Pinned),
+	//	limitBefore,
+	//	limitAfter
+	//) | rpl::map([=](SparseIdsMergedSlice &&slice) {
+	//	auto result = Data::MessagesSlice();
+	//	result.fullCount = slice.fullCount();
+	//	result.skippedAfter = slice.skippedAfter();
+	//	result.skippedBefore = slice.skippedBefore();
+	//	const auto count = slice.size();
+	//	result.ids.reserve(count);
+	//	if (const auto msgId = slice.nearest(messageId)) {
+	//		result.nearestToAround = *msgId;
+	//	}
+	//	for (auto i = 0; i != count; ++i) {
+	//		result.ids.push_back(slice[i]);
+	//	}
+	//	return result;
+	//});
+	return rpl::single(Data::MessagesSlice());
+}
+
+bool Item::listAllowsMultiSelect() {
+	return false;
+}
+
+bool Item::listIsItemGoodForSelection(not_null<HistoryItem*> item) {
+	return false;
+}
+
+bool Item::listIsLessInOrder(
+		not_null<HistoryItem*> first,
+		not_null<HistoryItem*> second) {
+	if (first->isRegular() && second->isRegular()) {
+		const auto firstPeer = first->history()->peer;
+		const auto secondPeer = second->history()->peer;
+		if (firstPeer == secondPeer) {
+			return first->id < second->id;
+		} else if (firstPeer->isChat()) {
+			return true;
+		}
+		return false;
+	} else if (first->isRegular()) {
+		return true;
+	} else if (second->isRegular()) {
+		return false;
+	}
+	return first->id < second->id;
+}
+
+void Item::listSelectionChanged(SelectedItems &&items) {
+}
+
+void Item::listMarkReadTill(not_null<HistoryItem*> item) {
+}
+
+void Item::listMarkContentsRead(
+	const base::flat_set<not_null<HistoryItem*>> &items) {
+}
+
+MessagesBarData Item::listMessagesBar(
+		const std::vector<not_null<Element*>> &elements) {
+	return {};// #TODO
+}
+
+void Item::listContentRefreshed() {
+}
+
+void Item::listUpdateDateLink(
+	ClickHandlerPtr &link,
+	not_null<Element*> view) {
+}
+
+bool Item::listElementHideReply(not_null<const Element*> view) {
+	return false;
+}
+
+bool Item::listElementShownUnread(not_null<const Element*> view) {
+	return view->data()->unread(view->data()->history());
+}
+
+bool Item::listIsGoodForAroundPosition(not_null<const Element*> view) {
+	return view->data()->isRegular();
+}
+
+void Item::listSendBotCommand(
+	const QString &command,
+	const FullMsgId &context) {
+}
+
+void Item::listSearch(
+	const QString &query,
+	const FullMsgId &context) {
+}
+
+void Item::listHandleViaClick(not_null<UserData*> bot) {
+}
+
+not_null<Ui::ChatTheme*> Item::listChatTheme() {
+	return _theme.get();
+}
+
+CopyRestrictionType Item::listCopyRestrictionType(HistoryItem *item) {
+	return CopyRestrictionType::None;
+}
+
+CopyRestrictionType Item::listCopyMediaRestrictionType(
+		not_null<HistoryItem*> item) {
+	return CopyRestrictionType::None;
+}
+
+CopyRestrictionType Item::listSelectRestrictionType() {
+	return CopyRestrictionType::None;
+}
+
+auto Item::listAllowedReactionsValue()
+-> rpl::producer<Data::AllowedReactions> {
+	return rpl::single(Data::AllowedReactions());
+}
+
+void Item::listShowPremiumToast(not_null<DocumentData*> document) {
+}
+
+void Item::listOpenPhoto(
+	not_null<PhotoData*> photo,
+	FullMsgId context) {
+}
+
+void Item::listOpenDocument(
+	not_null<DocumentData*> document,
+	FullMsgId context,
+	bool showInMediaView) {
+}
+
+void Item::listPaintEmpty(
+	Painter &p,
+	const Ui::ChatPaintContext &context) {
+	// #TODO
+}
+
+QString Item::listElementAuthorRank(not_null<const Element*> view) {
+	return {};
+}
+
+History *Item::listTranslateHistory() {
+	return nullptr;
+}
+
+void Item::listAddTranslatedItems(
+	not_null<TranslateTracker*> tracker) {
+}
+
+not_null<Window::SessionController*> Item::listWindow() {
+	Unexpected("Item::listWindow.");
+}
+
+not_null<const Ui::ChatStyle*> Item::listChatStyle() {
+	return _chatStyle.get();
+}
+
+rpl::producer<bool> Item::listChatWideValue() {
+	return rpl::single(false);
+}
+
+std::unique_ptr<Reactions::Manager> Item::listMakeReactionsManager(
+		QWidget *wheelEventsTarget,
+		Fn<void(QRect)> update) {
+	return nullptr;
+}
+
+void Item::listVisibleAreaUpdated() {
+}
+
+std::shared_ptr<Ui::Show> Item::listUiShow() {
+	Unexpected("Item::listUiShow.");
+}
+
+void Item::listShowPollResults(
+	not_null<PollData*> poll,
+	FullMsgId context) {
+}
+
+void Item::listCancelUploadLayer(not_null<HistoryItem*> item) {
+}
+
+bool Item::listAnimationsPaused() {
+	return false;
+}
+
+auto Item::listSendingAnimation()
+-> Ui::MessageSendingAnimationController* {
+	return nullptr;
+}
+
+Ui::ChatPaintContext Item::listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) {
+	const auto visibleAreaTopLocal = mapFromGlobal(
+		args.visibleAreaPositionGlobal).y();
+	const auto viewport = QRect(
+		0,
+		args.visibleAreaTop - visibleAreaTopLocal,
+		args.visibleAreaWidth,
+		height());
+	return args.theme->preparePaintContext(
+		_chatStyle.get(),
+		viewport,
+		args.clip,
+		false);
+}
+
+bool Item::listMarkingContentRead() {
+	return false;
+}
+
+bool Item::listIgnorePaintEvent(QWidget *w, QPaintEvent *e) {
+	return false;
+}
+
+bool Item::listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) {
+	return false;
+}
+
+void Item::listWindowSetInnerFocus() {
+}
+
+bool Item::listAllowsDragForward() {
+	return false;
+}
+
+void Item::listLaunchDrag(
+	std::unique_ptr<QMimeData> data,
+	Fn<void()> finished) {
+}
+
 } // namespace
 
 base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
 		QWidget *parent,
 		not_null<Dialogs::Entry*> entry) {
-	if (const auto topic = entry->asTopic()) {
-		return nullptr;
-	}
-	const auto history = entry->asHistory();
-	if (!history || history->peer->isForum()) {
+	const auto thread = entry->asThread();
+	if (!thread) {
 		return nullptr;
+	} else if (const auto history = entry->asHistory()) {
+		if (history->peer->isForum()) {
+			return nullptr;
+		}
 	}
 
 	auto result = base::make_unique_q<Ui::PopupMenu>(
 		parent,
 		st::previewMenu);
 
-	result->addAction(base::make_unique_q<Item>(result.get(), history));
+	result->addAction(base::make_unique_q<Item>(result.get(), thread));
+	if (const auto topic = thread->asTopic()) {
+		const auto weak = Ui::MakeWeak(result.get());
+		topic->destroyed() | rpl::start_with_next([weak] {
+			if (const auto strong = weak.data()) {
+				LOG(("Preview hidden for a destroyed topic."));
+				strong->hideMenu(true);
+			}
+		}, result->lifetime());
+	}
 
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 6db33ff4b..a11d0831d 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -61,6 +61,7 @@ enum class Context : char {
 	TTLViewer,
 	ShortcutMessages,
 	ScheduledTopic,
+	ChatPreview,
 };
 
 enum class OnlyEmojiAndSpaces : char {
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 4eddd3b49..cc0b4aec7 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -2081,6 +2081,7 @@ bool Message::hasFromPhoto() const {
 	case Context::AdminLog:
 		return true;
 	case Context::History:
+	case Context::ChatPreview:
 	case Context::TTLViewer:
 	case Context::Pinned:
 	case Context::Replies:
@@ -3281,6 +3282,7 @@ bool Message::hasFromName() const {
 	case Context::AdminLog:
 		return true;
 	case Context::History:
+	case Context::ChatPreview:
 	case Context::TTLViewer:
 	case Context::Pinned:
 	case Context::Replies:
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index c72097f25..5c2cbf99d 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1084,4 +1084,6 @@ previewMenu: PopupMenu(defaultPopupMenu) {
 		widthMax: 380px;
 	}
 	maxHeight: 420px;
+	radius: boxRadius;
+	shadow: boxRoundShadow;
 }

From 68df8448a2fe9a915f7e268190921428065eeb5d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 11:50:44 +0400
Subject: [PATCH 574/596] Use arc_angles.h from lib_ui.

---
 .../history/view/media/history_view_location.cpp |  5 ++++-
 Telegram/SourceFiles/ui/arc_angles.h             | 16 ----------------
 Telegram/cmake/td_ui.cmake                       |  1 -
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 Telegram/SourceFiles/ui/arc_angles.h

diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.cpp b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
index f16d65141..5b8b18e61 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
@@ -509,7 +509,10 @@ void Location::paintLiveRemaining(
 			auto pen = QPen(color);
 			pen.setWidthF(stroke);
 			p.setPen(pen);
-			p.drawArc(rect, 90 * 16, int(base::SafeRound(360 * 16 * progress)));
+			p.drawArc(
+				rect,
+				arc::kQuarterLength,
+				int(base::SafeRound(arc::kFullLength * progress)));
 		}
 
 		p.setPen(stm->msgServiceFg);
diff --git a/Telegram/SourceFiles/ui/arc_angles.h b/Telegram/SourceFiles/ui/arc_angles.h
deleted file mode 100644
index cfaa59b94..000000000
--- a/Telegram/SourceFiles/ui/arc_angles.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-namespace arc {
-
-constexpr auto kFullLength = 360 * 16;
-constexpr auto kQuarterLength = (kFullLength / 4);
-constexpr auto kHalfLength = (kFullLength / 2);
-
-} // namespace arc
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 61c9012c1..da2ea224d 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -396,7 +396,6 @@ PRIVATE
     ui/widgets/vertical_drum_picker.cpp
     ui/widgets/vertical_drum_picker.h
 
-    ui/arc_angles.h
     ui/cached_round_corners.cpp
     ui/cached_round_corners.h
     ui/color_contrast.cpp

From f223ae7eeeb83ecd097ae528ec64f756db383ba5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 14:47:08 +0400
Subject: [PATCH 575/596] Implement chats preview, show from unread.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/SourceFiles/apiwrap.cpp              |  41 ++++
 Telegram/SourceFiles/apiwrap.h                |  18 +-
 .../data/data_history_messages.cpp            | 212 ++++++++++++++++++
 .../SourceFiles/data/data_history_messages.h  |  67 ++++++
 Telegram/SourceFiles/data/data_replies_list.h |   4 -
 .../data/data_search_controller.cpp           |  55 +++++
 .../SourceFiles/data/data_search_controller.h |  19 +-
 Telegram/SourceFiles/history/history.cpp      |  86 +++++--
 Telegram/SourceFiles/history/history.h        |  34 +--
 Telegram/SourceFiles/history/history_item.cpp |  11 +
 Telegram/SourceFiles/history/history_item.h   |   1 +
 .../view/history_view_chat_preview.cpp        |  92 ++++----
 .../history/view/history_view_list_widget.cpp |   4 +-
 .../storage/storage_sparse_ids_list.cpp       |  17 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   3 +
 16 files changed, 570 insertions(+), 96 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_history_messages.cpp
 create mode 100644 Telegram/SourceFiles/data/data_history_messages.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 88778fc72..6426c6446 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -539,6 +539,8 @@ PRIVATE
     data/data_groups.h
     data/data_histories.cpp
     data/data_histories.h
+    data/data_history_messages.cpp
+    data/data_history_messages.h
     data/data_lastseen_status.h
     data/data_location.cpp
     data/data_location.h
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index aeed9e1b3..32e97c77f 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -50,6 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_chat_filters.h"
 #include "data/data_histories.h"
+#include "data/data_history_messages.h"
 #include "core/core_cloud_password.h"
 #include "core/application.h"
 #include "base/unixtime.h"
@@ -3078,6 +3079,46 @@ void ApiWrap::resolveJumpToHistoryDate(
 	}
 }
 
+void ApiWrap::requestHistory(
+		not_null<History*> history,
+		MsgId messageId,
+		SliceType slice) {
+	const auto peer = history->peer;
+	const auto key = HistoryRequest{
+		peer,
+		messageId,
+		slice,
+	};
+	if (_historyRequests.contains(key)) {
+		return;
+	}
+
+	const auto prepared = Api::PrepareHistoryRequest(peer, messageId, slice);
+	auto &histories = history->owner().histories();
+	const auto requestType = Data::Histories::RequestType::History;
+	histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
+		return request(
+			std::move(prepared)
+		).done([=](const Api::HistoryRequestResult &result) {
+			_historyRequests.remove(key);
+			auto parsed = Api::ParseHistoryResult(
+				peer,
+				messageId,
+				slice,
+				result);
+			history->messages().addSlice(
+				std::move(parsed.messageIds),
+				parsed.noSkipRange,
+				parsed.fullCount);
+			finish();
+		}).fail([=] {
+			_historyRequests.remove(key);
+			finish();
+		}).send();
+	});
+	_historyRequests.emplace(key);
+}
+
 void ApiWrap::requestSharedMedia(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index b1c844702..9710ee1bd 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -274,6 +274,10 @@ public:
 		Fn<void(not_null<PeerData*>, MsgId)> callback);
 
 	using SliceType = Data::LoadDirection;
+	void requestHistory(
+		not_null<History*> history,
+		MsgId messageId,
+		SliceType slice);
 	void requestSharedMedia(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
@@ -511,7 +515,8 @@ private:
 		not_null<PeerData*> peer,
 		bool justClear,
 		bool revoke);
-	void applyAffectedMessages(const MTPmessages_AffectedMessages &result) const;
+	void applyAffectedMessages(
+		const MTPmessages_AffectedMessages &result) const;
 
 	void deleteAllFromParticipantSend(
 		not_null<ChannelData*> channel,
@@ -645,6 +650,17 @@ private:
 	};
 	base::flat_set<SharedMediaRequest> _sharedMediaRequests;
 
+	struct HistoryRequest {
+		not_null<PeerData*> peer;
+		MsgId aroundId = 0;
+		SliceType sliceType = {};
+
+		friend inline auto operator<=>(
+			const HistoryRequest&,
+			const HistoryRequest&) = default;
+	};
+	base::flat_set<HistoryRequest> _historyRequests;
+
 	std::unique_ptr<DialogsLoadState> _dialogsLoadState;
 	TimeId _dialogsLoadTill = 0;
 	rpl::variable<bool> _dialogsLoadMayBlockByDate = false;
diff --git a/Telegram/SourceFiles/data/data_history_messages.cpp b/Telegram/SourceFiles/data/data_history_messages.cpp
new file mode 100644
index 000000000..7c29daf9e
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_history_messages.cpp
@@ -0,0 +1,212 @@
+/*
+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_history_messages.h"
+
+#include "apiwrap.h"
+#include "data/data_chat.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_sparse_ids.h"
+#include "history/history.h"
+#include "main/main_session.h"
+
+namespace Data {
+
+void HistoryMessages::addNew(MsgId messageId) {
+	_chat.addNew(messageId);
+}
+
+void HistoryMessages::addExisting(MsgId messageId, MsgRange noSkipRange) {
+	_chat.addExisting(messageId, noSkipRange);
+}
+
+void HistoryMessages::addSlice(
+		std::vector<MsgId> &&messageIds,
+		MsgRange noSkipRange,
+		std::optional<int> count) {
+	_chat.addSlice(std::move(messageIds), noSkipRange, count);
+}
+
+void HistoryMessages::removeOne(MsgId messageId) {
+	_chat.removeOne(messageId);
+	_oneRemoved.fire_copy(messageId);
+}
+
+void HistoryMessages::removeAll() {
+	_chat.removeAll();
+	_allRemoved.fire({});
+}
+
+void HistoryMessages::invalidateBottom() {
+	_chat.invalidateBottom();
+	_bottomInvalidated.fire({});
+}
+
+Storage::SparseIdsListResult HistoryMessages::snapshot(
+		const Storage::SparseIdsListQuery &query) const {
+	return _chat.snapshot(query);
+}
+
+auto HistoryMessages::sliceUpdated() const
+-> rpl::producer<Storage::SparseIdsSliceUpdate> {
+	return _chat.sliceUpdated();
+}
+
+rpl::producer<MsgId> HistoryMessages::oneRemoved() const {
+	return _oneRemoved.events();
+}
+
+rpl::producer<> HistoryMessages::allRemoved() const {
+	return _allRemoved.events();
+}
+
+rpl::producer<> HistoryMessages::bottomInvalidated() const {
+	return _bottomInvalidated.events();
+}
+
+rpl::producer<SparseIdsSlice> HistoryViewer(
+		not_null<History*> history,
+		MsgId aroundId,
+		int limitBefore,
+		int limitAfter) {
+	Expects(IsServerMsgId(aroundId) || (aroundId == 0));
+	Expects((aroundId != 0) || (limitBefore == 0 && limitAfter == 0));
+
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		const auto messages = &history->messages();
+
+		auto builder = lifetime.make_state<SparseIdsSliceBuilder>(
+			aroundId,
+			limitBefore,
+			limitAfter);
+		using RequestAroundInfo = SparseIdsSliceBuilder::AroundData;
+		builder->insufficientAround(
+		) | rpl::start_with_next([=](const RequestAroundInfo &info) {
+			history->session().api().requestHistory(
+				history,
+				info.aroundId,
+				info.direction);
+		}, lifetime);
+
+		auto pushNextSnapshot = [=] {
+			consumer.put_next(builder->snapshot());
+		};
+
+		using SliceUpdate = Storage::SparseIdsSliceUpdate;
+		messages->sliceUpdated(
+		) | rpl::filter([=](const SliceUpdate &update) {
+			return builder->applyUpdate(update);
+		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+
+		messages->oneRemoved(
+		) | rpl::filter([=](MsgId messageId) {
+			return builder->removeOne(messageId);
+		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+
+		messages->allRemoved(
+		) | rpl::filter([=] {
+			return builder->removeAll();
+		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+
+		messages->bottomInvalidated(
+		) | rpl::filter([=] {
+			return builder->invalidateBottom();
+		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+
+		const auto snapshot = messages->snapshot({
+			aroundId,
+			limitBefore,
+			limitAfter,
+		});
+		if (snapshot.count || !snapshot.messageIds.empty()) {
+			if (builder->applyInitial(snapshot)) {
+				pushNextSnapshot();
+			}
+		}
+		builder->checkInsufficient();
+
+		return lifetime;
+	};
+}
+
+rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
+		not_null<History*> history,
+		/*Universal*/MsgId universalAroundId,
+		int limitBefore,
+		int limitAfter) {
+	const auto migrateFrom = history->peer->migrateFrom();
+	auto createSimpleViewer = [=](
+			PeerId peerId,
+			MsgId topicRootId,
+			SparseIdsSlice::Key simpleKey,
+			int limitBefore,
+			int limitAfter) {
+		const auto chosen = (history->peer->id == peerId)
+			? history
+			: history->owner().history(peerId);
+		return HistoryViewer(history, simpleKey, limitBefore, limitAfter);
+	};
+	const auto peerId = history->peer->id;
+	const auto topicRootId = MsgId();
+	const auto migratedPeerId = migrateFrom ? migrateFrom->id : peerId;
+	using Key = SparseIdsMergedSlice::Key;
+	return SparseIdsMergedSlice::CreateViewer(
+		Key(peerId, topicRootId, migratedPeerId, universalAroundId),
+		limitBefore,
+		limitAfter,
+		std::move(createSimpleViewer));
+}
+
+rpl::producer<MessagesSlice> HistoryMessagesViewer(
+		not_null<History*> history,
+		MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	const auto computeUnreadAroundId = [&] {
+		if (const auto migrated = history->migrateFrom()) {
+			if (const auto around = migrated->loadAroundId()) {
+				return MsgId(around - ServerMaxMsgId);
+			}
+		}
+		if (const auto around = history->loadAroundId()) {
+			return around;
+		}
+		return MsgId(ServerMaxMsgId - 1);
+	};
+	const auto messageId = (aroundId.fullId.msg == ShowAtUnreadMsgId)
+		? computeUnreadAroundId()
+		: (aroundId.fullId.msg == ShowAtTheEndMsgId)
+		? (ServerMaxMsgId - 1)
+		: (aroundId.fullId.peer == history->peer->id)
+		? aroundId.fullId.msg
+		: (aroundId.fullId.msg - ServerMaxMsgId);
+	return HistoryMergedViewer(
+		history,
+		messageId,
+		limitBefore,
+		limitAfter
+	) | rpl::map([=](SparseIdsMergedSlice &&slice) {
+		auto result = Data::MessagesSlice();
+		result.fullCount = slice.fullCount();
+		result.skippedAfter = slice.skippedAfter();
+		result.skippedBefore = slice.skippedBefore();
+		const auto count = slice.size();
+		result.ids.reserve(count);
+		if (const auto msgId = slice.nearest(messageId)) {
+			result.nearestToAround = *msgId;
+		}
+		for (auto i = 0; i != count; ++i) {
+			result.ids.push_back(slice[i]);
+		}
+		return result;
+	});
+}
+
+} // namespace Data
\ No newline at end of file
diff --git a/Telegram/SourceFiles/data/data_history_messages.h b/Telegram/SourceFiles/data/data_history_messages.h
new file mode 100644
index 000000000..2b68462fb
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_history_messages.h
@@ -0,0 +1,67 @@
+/*
+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 "storage/storage_sparse_ids_list.h"
+
+class History;
+class SparseIdsSlice;
+class SparseIdsMergedSlice;
+
+namespace Data {
+
+struct MessagesSlice;
+struct MessagePosition;
+
+class HistoryMessages final {
+public:
+	void addNew(MsgId messageId);
+	void addExisting(MsgId messageId, MsgRange noSkipRange);
+	void addSlice(
+		std::vector<MsgId> &&messageIds,
+		MsgRange noSkipRange,
+		std::optional<int> count);
+	void removeOne(MsgId messageId);
+	void removeAll();
+	void invalidateBottom();
+
+	[[nodiscard]] Storage::SparseIdsListResult snapshot(
+		const Storage::SparseIdsListQuery &query) const;
+	[[nodiscard]] auto sliceUpdated() const
+		-> rpl::producer<Storage::SparseIdsSliceUpdate>;
+	[[nodiscard]] rpl::producer<MsgId> oneRemoved() const;
+	[[nodiscard]] rpl::producer<> allRemoved() const;
+	[[nodiscard]] rpl::producer<> bottomInvalidated() const;
+
+private:
+	Storage::SparseIdsList _chat;
+	rpl::event_stream<MsgId> _oneRemoved;
+	rpl::event_stream<> _allRemoved;
+	rpl::event_stream<> _bottomInvalidated;
+
+};
+
+[[nodiscard]] rpl::producer<SparseIdsSlice> HistoryViewer(
+	not_null<History*> history,
+	MsgId aroundId,
+	int limitBefore,
+	int limitAfter);
+
+[[nodiscard]] rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
+	not_null<History*> history,
+	/*Universal*/MsgId universalAroundId,
+	int limitBefore,
+	int limitAfter);
+
+[[nodiscard]] rpl::producer<MessagesSlice> HistoryMessagesViewer(
+	not_null<History*> history,
+	MessagePosition aroundId,
+	int limitBefore,
+	int limitAfter);
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_replies_list.h b/Telegram/SourceFiles/data/data_replies_list.h
index a33dee56b..42f56c1ae 100644
--- a/Telegram/SourceFiles/data/data_replies_list.h
+++ b/Telegram/SourceFiles/data/data_replies_list.h
@@ -78,10 +78,6 @@ private:
 	[[nodiscard]] Histories &histories();
 
 	void subscribeToUpdates();
-	[[nodiscard]] rpl::producer<MessagesSlice> sourceFromServer(
-		MessagePosition aroundId,
-		int limitBefore,
-		int limitAfter);
 	void appendClientSideMessages(MessagesSlice &slice);
 
 	[[nodiscard]] bool buildFromData(not_null<Viewer*> viewer);
diff --git a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp
index 43c5efb66..4e33a9eaa 100644
--- a/Telegram/SourceFiles/data/data_search_controller.cpp
+++ b/Telegram/SourceFiles/data/data_search_controller.cpp
@@ -21,6 +21,7 @@ namespace {
 
 constexpr auto kSharedMediaLimit = 100;
 constexpr auto kFirstSharedMediaLimit = 0;
+constexpr auto kHistoryLimit = 50;
 constexpr auto kDefaultSearchTimeoutMs = crl::time(200);
 
 } // namespace
@@ -199,6 +200,60 @@ SearchResult ParseSearchResult(
 	return result;
 }
 
+HistoryRequest PrepareHistoryRequest(
+		not_null<PeerData*> peer,
+		MsgId messageId,
+		Data::LoadDirection direction) {
+	const auto minId = 0;
+	const auto maxId = 0;
+	const auto limit = kHistoryLimit;
+	const auto offsetId = [&] {
+		switch (direction) {
+		case Data::LoadDirection::Before:
+		case Data::LoadDirection::Around: return messageId;
+		case Data::LoadDirection::After: return messageId + 1;
+		}
+		Unexpected("Direction in PrepareSearchRequest");
+	}();
+	const auto addOffset = [&] {
+		switch (direction) {
+		case Data::LoadDirection::Before: return 0;
+		case Data::LoadDirection::Around: return -limit / 2;
+		case Data::LoadDirection::After: return -limit;
+		}
+		Unexpected("Direction in PrepareSearchRequest");
+	}();
+	const auto hash = uint64(0);
+	const auto offsetDate = int32(0);
+
+	const auto mtpOffsetId = int(std::clamp(
+		offsetId.bare,
+		int64(0),
+		int64(0x3FFFFFFF)));
+	return MTPmessages_GetHistory(
+		peer->input,
+		MTP_int(mtpOffsetId),
+		MTP_int(offsetDate),
+		MTP_int(addOffset),
+		MTP_int(limit),
+		MTP_int(maxId),
+		MTP_int(minId),
+		MTP_long(hash));
+}
+
+HistoryResult ParseHistoryResult(
+		not_null<PeerData*> peer,
+		MsgId messageId,
+		Data::LoadDirection direction,
+		const HistoryRequestResult &data) {
+	return ParseSearchResult(
+		peer,
+		Storage::SharedMediaType::kCount,
+		messageId,
+		direction,
+		data);
+}
+
 SearchController::CacheEntry::CacheEntry(
 	not_null<Main::Session*> session,
 	const Query &query)
diff --git a/Telegram/SourceFiles/data/data_search_controller.h b/Telegram/SourceFiles/data/data_search_controller.h
index a938df6ef..26b930b9b 100644
--- a/Telegram/SourceFiles/data/data_search_controller.h
+++ b/Telegram/SourceFiles/data/data_search_controller.h
@@ -32,7 +32,11 @@ struct SearchResult {
 using SearchRequest = MTPmessages_Search;
 using SearchRequestResult = MTPmessages_Messages;
 
-std::optional<SearchRequest> PrepareSearchRequest(
+using HistoryResult = SearchResult;
+using HistoryRequest = MTPmessages_GetHistory;
+using HistoryRequestResult = MTPmessages_Messages;
+
+[[nodiscard]] std::optional<SearchRequest> PrepareSearchRequest(
 	not_null<PeerData*> peer,
 	MsgId topicRootId,
 	Storage::SharedMediaType type,
@@ -40,13 +44,24 @@ std::optional<SearchRequest> PrepareSearchRequest(
 	MsgId messageId,
 	Data::LoadDirection direction);
 
-SearchResult ParseSearchResult(
+[[nodiscard]] SearchResult ParseSearchResult(
 	not_null<PeerData*> peer,
 	Storage::SharedMediaType type,
 	MsgId messageId,
 	Data::LoadDirection direction,
 	const SearchRequestResult &data);
 
+[[nodiscard]] HistoryRequest PrepareHistoryRequest(
+	not_null<PeerData*> peer,
+	MsgId messageId,
+	Data::LoadDirection direction);
+
+[[nodiscard]] HistoryResult ParseHistoryResult(
+	not_null<PeerData*> peer,
+	MsgId messageId,
+	Data::LoadDirection direction,
+	const HistoryRequestResult &data);
+
 class SearchController final {
 public:
 	using IdsList = Storage::SparseIdsList;
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index dca53737d..3643ed726 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -41,6 +41,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_document.h"
 #include "data/data_histories.h"
+#include "data/data_history_messages.h"
 #include "lang/lang_keys.h"
 #include "apiwrap.h"
 #include "api/api_chat_participants.h"
@@ -483,7 +484,7 @@ not_null<HistoryItem*> History::insertItem(
 		std::unique_ptr<HistoryItem> item) {
 	Expects(item != nullptr);
 
-	const auto &[i, ok] = _messages.insert(std::move(item));
+	const auto &[i, ok] = _items.insert(std::move(item));
 
 	const auto result = i->get();
 	owner().registerMessage(result);
@@ -500,6 +501,9 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 		// All this must be done for all items manually in History::clear()!
 		item->destroyHistoryEntry();
 		if (item->isRegular()) {
+			if (const auto messages = _messages.get()) {
+				messages->removeOne(item->id);
+			}
 			if (const auto types = item->sharedMediaTypes()) {
 				session().storage().remove(Storage::SharedMediaRemoveOne(
 					peerId,
@@ -524,11 +528,11 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 	Core::App().notifications().clearFromItem(item);
 
 	auto hack = std::unique_ptr<HistoryItem>(item.get());
-	const auto i = _messages.find(hack);
+	const auto i = _items.find(hack);
 	hack.release();
 
-	Assert(i != end(_messages));
-	_messages.erase(i);
+	Assert(i != end(_items));
+	_items.erase(i);
 
 	if (documentToCancel) {
 		session().data().documentMessageRemoved(documentToCancel);
@@ -537,8 +541,8 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 
 void History::destroyMessagesByDates(TimeId minDate, TimeId maxDate) {
 	auto toDestroy = std::vector<not_null<HistoryItem*>>();
-	toDestroy.reserve(_messages.size());
-	for (const auto &message : _messages) {
+	toDestroy.reserve(_items.size());
+	for (const auto &message : _items) {
 		if (message->isRegular()
 			&& message->date() > minDate
 			&& message->date() < maxDate) {
@@ -552,8 +556,8 @@ void History::destroyMessagesByDates(TimeId minDate, TimeId maxDate) {
 
 void History::destroyMessagesByTopic(MsgId topicRootId) {
 	auto toDestroy = std::vector<not_null<HistoryItem*>>();
-	toDestroy.reserve(_messages.size());
-	for (const auto &message : _messages) {
+	toDestroy.reserve(_items.size());
+	for (const auto &message : _items) {
 		if (message->topicRootId() == topicRootId) {
 			toDestroy.push_back(message.get());
 		}
@@ -575,7 +579,7 @@ void History::unpinMessagesFor(MsgId topicRootId) {
 				topic->setHasPinnedMessages(false);
 			});
 		}
-		for (const auto &item : _messages) {
+		for (const auto &item : _items) {
 			if (item->isPinned()) {
 				item->setIsPinned(false);
 			}
@@ -589,7 +593,7 @@ void History::unpinMessagesFor(MsgId topicRootId) {
 		if (const auto topic = peer->forumTopicFor(topicRootId)) {
 			topic->setHasPinnedMessages(false);
 		}
-		for (const auto &item : _messages) {
+		for (const auto &item : _items) {
 			if (item->isPinned() && item->topicRootId() == topicRootId) {
 				item->setIsPinned(false);
 			}
@@ -781,9 +785,12 @@ not_null<HistoryItem*> History::addNewToBack(
 	addItemToBlock(item);
 
 	if (!unread && item->isRegular()) {
+		const auto from = loadedAtTop() ? 0 : minMsgId();
+		const auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
+		if (_messages) {
+			_messages->addExisting(item->id, { from, till });
+		}
 		if (const auto types = item->sharedMediaTypes()) {
-			auto from = loadedAtTop() ? 0 : minMsgId();
-			auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
 			auto &storage = session().storage();
 			storage.add(Storage::SharedMediaAddExisting(
 				peer->id,
@@ -1190,6 +1197,7 @@ void History::mainViewRemoved(
 
 void History::newItemAdded(not_null<HistoryItem*> item) {
 	item->indexAsNewItem();
+	item->addToMessagesIndex();
 	if (const auto from = item->from() ? item->from()->asUser() : nullptr) {
 		if (from == item->author()) {
 			_sendActionPainter.clear(from);
@@ -2385,6 +2393,9 @@ void History::setNotLoadedAtBottom() {
 
 	session().storage().invalidate(
 		Storage::SharedMediaInvalidateBottom(peer->id));
+	if (const auto messages = _messages.get()) {
+		messages->invalidateBottom();
+	}
 }
 
 void History::clearSharedMedia() {
@@ -3092,6 +3103,46 @@ MsgRange History::rangeForDifferenceRequest() const {
 	return MsgRange();
 }
 
+Data::HistoryMessages &History::messages() {
+	if (!_messages) {
+		_messages = std::make_unique<Data::HistoryMessages>();
+
+		const auto from = loadedAtTop() ? 0 : minMsgId();
+		const auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
+		auto list = std::vector<MsgId>();
+		list.reserve(std::min(
+			int(_items.size()),
+			int(blocks.size()) * kNewBlockEachMessage));
+		auto sort = false;
+		for (const auto &block : blocks) {
+			for (const auto &view : block->messages) {
+				const auto item = view->data();
+				if (item->isRegular()) {
+					const auto id = item->id;
+					if (!list.empty() && list.back() >= id) {
+						sort = true;
+					}
+				}
+			}
+		}
+		if (sort) {
+			ranges::sort(list);
+		}
+		if (till) {
+			_messages->addSlice(std::move(list), { from, till }, {});
+		}
+	}
+	return *_messages;
+}
+
+const Data::HistoryMessages &History::messages() const {
+	return const_cast<History*>(this)->messages();
+}
+
+Data::HistoryMessages *History::maybeMessages() {
+	return _messages.get();
+}
+
 HistoryItem *History::insertJoinedMessage() {
 	const auto channel = peer->asChannel();
 	if (!channel
@@ -3194,11 +3245,11 @@ void History::removeJoinedMessage() {
 
 void History::reactionsEnabledChanged(bool enabled) {
 	if (!enabled) {
-		for (const auto &item : _messages) {
+		for (const auto &item : _items) {
 			item->updateReactions(nullptr);
 		}
 	} else {
-		for (const auto &item : _messages) {
+		for (const auto &item : _items) {
 			item->updateReactionsUnknown();
 		}
 	}
@@ -3372,6 +3423,9 @@ void History::clear(ClearType type) {
 		}
 		_loadedAtTop = _loadedAtBottom = _lastMessage.has_value();
 		clearSharedMedia();
+		if (const auto messages = _messages.get()) {
+			messages->removeAll();
+		}
 		clearLastKeyboard();
 	}
 
@@ -3388,8 +3442,8 @@ void History::clear(ClearType type) {
 
 void History::clearUpTill(MsgId availableMinId) {
 	auto remove = std::vector<not_null<HistoryItem*>>();
-	remove.reserve(_messages.size());
-	for (const auto &item : _messages) {
+	remove.reserve(_items.size());
+	for (const auto &item : _items) {
 		const auto itemId = item->id;
 		if (!item->isRegular()) {
 			continue;
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index e00c23b8d..729b66045 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -26,12 +26,14 @@ class HistoryMainElementDelegateMixin;
 struct LanguageId;
 
 namespace Data {
+
 struct Draft;
 class Session;
 class Folder;
 class ChatFilter;
 struct SponsoredFrom;
 class SponsoredMessages;
+class HistoryMessages;
 
 enum class ForwardOptions {
 	PreserveInfo,
@@ -79,7 +81,7 @@ public:
 	History(not_null<Data::Session*> owner, PeerId peerId);
 	~History();
 
-	not_null<History*> owningHistory() override {
+	[[nodiscard]] not_null<History*> owningHistory() override {
 		return this;
 	}
 	[[nodiscard]] Data::Thread *threadFor(MsgId topicRootId);
@@ -93,23 +95,27 @@ public:
 	void forumChanged(Data::Forum *old);
 	[[nodiscard]] bool isForum() const;
 
-	not_null<History*> migrateToOrMe() const;
-	History *migrateFrom() const;
-	MsgRange rangeForDifferenceRequest() const;
+	[[nodiscard]] not_null<History*> migrateToOrMe() const;
+	[[nodiscard]] History *migrateFrom() const;
+	[[nodiscard]] MsgRange rangeForDifferenceRequest() const;
 
-	HistoryItem *joinedMessageInstance() const;
+	[[nodiscard]] Data::HistoryMessages &messages();
+	[[nodiscard]] const Data::HistoryMessages &messages() const;
+	[[nodiscard]] Data::HistoryMessages *maybeMessages();
+
+	[[nodiscard]] HistoryItem *joinedMessageInstance() const;
 	void checkLocalMessages();
 	void removeJoinedMessage();
 
 	void reactionsEnabledChanged(bool enabled);
 
-	bool isEmpty() const;
-	bool isDisplayedEmpty() const;
-	Element *findFirstNonEmpty() const;
-	Element *findFirstDisplayed() const;
-	Element *findLastNonEmpty() const;
-	Element *findLastDisplayed() const;
-	bool hasOrphanMediaGroupPart() const;
+	[[nodiscard]] bool isEmpty() const;
+	[[nodiscard]] bool isDisplayedEmpty() const;
+	[[nodiscard]] Element *findFirstNonEmpty() const;
+	[[nodiscard]] Element *findFirstDisplayed() const;
+	[[nodiscard]] Element *findLastNonEmpty() const;
+	[[nodiscard]] Element *findLastDisplayed() const;
+	[[nodiscard]] bool hasOrphanMediaGroupPart() const;
 	[[nodiscard]] std::vector<MsgId> collectMessagesFromParticipantToDelete(
 		not_null<PeerData*> participant) const;
 
@@ -590,7 +596,9 @@ private:
 	std::optional<HistoryItem*> _lastMessage;
 	std::optional<HistoryItem*> _lastServerMessage;
 	base::flat_set<not_null<HistoryItem*>> _clientSideMessages;
-	std::unordered_set<std::unique_ptr<HistoryItem>> _messages;
+	std::unordered_set<std::unique_ptr<HistoryItem>> _items;
+
+	std::unique_ptr<Data::HistoryMessages> _messages;
 
 	// This almost always is equal to _lastMessage. The only difference is
 	// for a group that migrated to a supergroup. Then _lastMessage can
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index cdc57d00d..53ba1c67c 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -55,6 +55,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_game.h"
+#include "data/data_history_messages.h"
 #include "data/data_user.h"
 #include "data/data_group_call.h" // Data::GroupCall::id().
 #include "data/data_poll.h" // PollData::publicVotes.
@@ -1791,6 +1792,7 @@ void HistoryItem::applySentMessage(const MTPDmessage &data) {
 	setIsPinned(data.is_pinned());
 	contributeToSlowmode(data.vdate().v);
 	addToSharedMediaIndex();
+	addToMessagesIndex();
 	invalidateChatListEntry();
 	if (const auto period = data.vttl_period(); period && period->v > 0) {
 		applyTTL(data.vdate().v + period->v);
@@ -1815,6 +1817,7 @@ void HistoryItem::applySentMessage(
 	contributeToSlowmode(data.vdate().v);
 	if (!wasAlready) {
 		addToSharedMediaIndex();
+		addToMessagesIndex();
 	}
 	invalidateChatListEntry();
 	if (const auto period = data.vttl_period(); period && period->v > 0) {
@@ -2011,6 +2014,14 @@ void HistoryItem::removeFromSharedMediaIndex() {
 	}
 }
 
+void HistoryItem::addToMessagesIndex() {
+	if (isRegular()) {
+		if (const auto messages = _history->maybeMessages()) {
+			messages->addNew(id);
+		}
+	}
+}
+
 void HistoryItem::incrementReplyToTopCounter() {
 	if (isRegular() && _history->peer->isMegagroup()) {
 		_history->session().changes().messageUpdated(
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index c8963b707..c7d3e59aa 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -359,6 +359,7 @@ public:
 
 	void indexAsNewItem();
 	void addToSharedMediaIndex();
+	void addToMessagesIndex();
 	void removeFromSharedMediaIndex();
 
 	struct NotificationTextOptions {
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index c394af68b..caca93da1 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_chat_preview.h"
 
 #include "data/data_forum_topic.h"
+#include "data/data_history_messages.h"
 #include "data/data_peer.h"
 #include "data/data_replies_list.h"
 #include "data/data_thread.h"
@@ -15,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_list_widget.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
@@ -136,6 +138,7 @@ private:
 	const not_null<QAction*> _dummyAction;
 	const not_null<Main::Session*> _session;
 	const not_null<Data::Thread*> _thread;
+	const std::shared_ptr<Data::RepliesList> _replies;
 	const not_null<History*> _history;
 	const not_null<PeerData*> _peer;
 	const std::shared_ptr<Ui::ChatTheme> _theme;
@@ -153,6 +156,7 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 , _dummyAction(new QAction(parent))
 , _session(&thread->session())
 , _thread(thread)
+, _replies(thread->asTopic() ? thread->asTopic()->replies() : nullptr)
 , _history(thread->owningHistory())
 , _peer(thread->peer())
 , _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
@@ -253,52 +257,13 @@ rpl::producer<Data::MessagesSlice> Item::listSource(
 		Data::MessagePosition aroundId,
 		int limitBefore,
 		int limitAfter) {
-	if (const auto topic = _thread->asTopic()) {
-		return topic->replies()->source(
+	return _replies
+		? _replies->source(aroundId, limitBefore, limitAfter)
+		: Data::HistoryMessagesViewer(
+			_thread->asHistory(),
 			aroundId,
 			limitBefore,
-			limitAfter
-		) | rpl::before_next([=] { // after_next makes a copy of value.
-			//if (!_loaded) {
-			//	_loaded = true;
-			//	crl::on_main(this, [=] {
-			//		updatePinnedVisibility();
-			//	});
-			//}
-		});
-	}
-	// #TODO
-	//const auto messageId = aroundId.fullId.msg
-	//	? aroundId.fullId.msg
-	//	: (ServerMaxMsgId - 1);
-
-	//return SharedMediaMergedViewer(
-	//	&_thread->session(),
-	//	SharedMediaMergedKey(
-	//		SparseIdsMergedSlice::Key(
-	//			_history->peer->id,
-	//			_thread->topicRootId(),
-	//			_migratedPeer ? _migratedPeer->id : 0,
-	//			messageId),
-	//		Storage::SharedMediaType::Pinned),
-	//	limitBefore,
-	//	limitAfter
-	//) | rpl::map([=](SparseIdsMergedSlice &&slice) {
-	//	auto result = Data::MessagesSlice();
-	//	result.fullCount = slice.fullCount();
-	//	result.skippedAfter = slice.skippedAfter();
-	//	result.skippedBefore = slice.skippedBefore();
-	//	const auto count = slice.size();
-	//	result.ids.reserve(count);
-	//	if (const auto msgId = slice.nearest(messageId)) {
-	//		result.nearestToAround = *msgId;
-	//	}
-	//	for (auto i = 0; i != count; ++i) {
-	//		result.ids.push_back(slice[i]);
-	//	}
-	//	return result;
-	//});
-	return rpl::single(Data::MessagesSlice());
+			limitAfter);
 }
 
 bool Item::listAllowsMultiSelect() {
@@ -341,7 +306,44 @@ void Item::listMarkContentsRead(
 
 MessagesBarData Item::listMessagesBar(
 		const std::vector<not_null<Element*>> &elements) {
-	return {};// #TODO
+	if (elements.empty()) {
+		return {};
+	} else if (!_replies && !_history->unreadCount()) {
+		return {};
+	}
+	const auto repliesTill = _replies
+		? _replies->computeInboxReadTillFull()
+		: MsgId();
+	const auto migrated = _replies ? nullptr : _history->migrateFrom();
+	const auto migratedTill = migrated ? migrated->inboxReadTillId() : 0;
+	const auto historyTill = _replies ? 0 : _history->inboxReadTillId();
+	if (!_replies && !migratedTill && !historyTill) {
+		return {};
+	}
+
+	const auto hidden = _replies && (repliesTill < 2);
+	for (auto i = 0, count = int(elements.size()); i != count; ++i) {
+		const auto item = elements[i]->data();
+		if (!item->isRegular()
+			|| item->out()
+			|| (_replies && !item->replyToId())) {
+			continue;
+		}
+		const auto inHistory = (item->history() == _history);
+		if ((_replies && item->id > repliesTill)
+			|| (migratedTill && (inHistory || item->id > migratedTill))
+			|| (historyTill && inHistory && item->id > historyTill)) {
+			return {
+				.bar = {
+					.element = elements[i],
+					.hidden = hidden,
+					.focus = true,
+				},
+				.text = tr::lng_unread_bar_some(),
+			};
+		}
+	}
+	return {};
 }
 
 void Item::listContentRefreshed() {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 538606339..bdcf93a03 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -939,7 +939,9 @@ void ListWidget::restoreScrollState() {
 		}
 		_scrollInited = true;
 		_scrollTopState.item = _bar.element->data()->position();
-		_scrollTopState.shift = st::lineWidth + st::historyUnreadBarMargin;
+		_scrollTopState.shift = st::lineWidth
+			+ st::historyUnreadBarMargin
+			+ _bar.element->displayedDateHeight();
 	}
 	const auto index = findNearestItem(_scrollTopState.item);
 	if (index >= 0) {
diff --git a/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp b/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
index c3845ddca..33ea5ec5c 100644
--- a/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
+++ b/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
@@ -187,20 +187,9 @@ void SparseIdsList::invalidateBottom() {
 rpl::producer<SparseIdsListResult> SparseIdsList::query(
 		SparseIdsListQuery &&query) const {
 	return [this, query = std::move(query)](auto consumer) {
-		auto slice = query.aroundId
-			? ranges::lower_bound(
-				_slices,
-				query.aroundId,
-				std::less<>(),
-				[](const Slice &slice) { return slice.range.till; })
-			: _slices.end();
-		if (slice != _slices.end()
-			&& slice->range.from <= query.aroundId) {
-			consumer.put_next(queryFromSlice(query, *slice));
-		} else if (_count) {
-			auto result = SparseIdsListResult {};
-			result.count = _count;
-			consumer.put_next(std::move(result));
+		auto now = snapshot(query);
+		if (!now.messageIds.empty() || now.count) {
+			consumer.put_next(std::move(now));
 		}
 		consumer.put_done();
 		return rpl::lifetime();
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 5c2cbf99d..36e3b5947 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1086,4 +1086,7 @@ previewMenu: PopupMenu(defaultPopupMenu) {
 	maxHeight: 420px;
 	radius: boxRadius;
 	shadow: boxRoundShadow;
+	animation: PanelAnimation(defaultPanelAnimation) {
+		shadow: boxRoundShadow;
+	}
 }

From 0f524ac67da173c038be12a76af957b94fec599d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 16:27:43 +0400
Subject: [PATCH 576/596] Don't stick to bottom while loading down.

---
 .../SourceFiles/history/view/history_view_list_widget.cpp   | 6 ++++--
 .../SourceFiles/history/view/history_view_list_widget.h     | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index bdcf93a03..e951cd802 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -589,6 +589,7 @@ void ListWidget::refreshRows(const Data::MessagesSlice &old) {
 
 	auto destroyingBarElement = _bar.element;
 	auto clearingOverElement = _overElement;
+	_itemsKnownTillEnd = (_slice.skippedAfter == 0);
 	_resizePending = true;
 	_items.clear();
 	_items.reserve(_slice.ids.size());
@@ -1107,7 +1108,7 @@ void ListWidget::applyUpdatedScrollState() {
 }
 
 void ListWidget::updateVisibleTopItem() {
-	if (_visibleBottom == height()) {
+	if (_itemsKnownTillEnd && _visibleBottom == height()) {
 		_visibleTopItem = nullptr;
 	} else if (_items.empty()) {
 		_visibleTopItem = nullptr;
@@ -2558,7 +2559,8 @@ Element *ListWidget::strictFindItemByY(int y) const {
 }
 
 auto ListWidget::countScrollState() const -> ScrollTopState {
-	if (_items.empty() || _visibleBottom == height()) {
+	if (_items.empty()
+		|| (_itemsKnownTillEnd && _visibleBottom == height())) {
 		return { Data::MessagePosition(), 0 };
 	}
 	const auto topItem = findItemByY(_visibleTop);
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index f88582722..bd8ad7827 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -727,6 +727,8 @@ private:
 	int _aroundIndex = -1;
 	int _idsLimit = kMinimalIdsLimit;
 	Data::MessagesSlice _slice;
+	bool _itemsKnownTillEnd = false;
+
 	std::vector<not_null<Element*>> _items;
 	ViewsMap _views, _viewsCapacity;
 	int _itemsTop = 0;

From aee62c7591e530c69b386b41b738a63bddbdc5cd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 18:28:52 +0400
Subject: [PATCH 577/596] Fix migrated history in chat preview.

---
 Telegram/SourceFiles/data/data_history_messages.cpp | 2 +-
 Telegram/SourceFiles/history/history.cpp            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_history_messages.cpp b/Telegram/SourceFiles/data/data_history_messages.cpp
index 7c29daf9e..86b46503d 100644
--- a/Telegram/SourceFiles/data/data_history_messages.cpp
+++ b/Telegram/SourceFiles/data/data_history_messages.cpp
@@ -151,7 +151,7 @@ rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
 		const auto chosen = (history->peer->id == peerId)
 			? history
 			: history->owner().history(peerId);
-		return HistoryViewer(history, simpleKey, limitBefore, limitAfter);
+		return HistoryViewer(chosen, simpleKey, limitBefore, limitAfter);
 	};
 	const auto peerId = history->peer->id;
 	const auto topicRootId = MsgId();
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 3643ed726..02a3324b9 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -3107,8 +3107,9 @@ Data::HistoryMessages &History::messages() {
 	if (!_messages) {
 		_messages = std::make_unique<Data::HistoryMessages>();
 
+		const auto max = maxMsgId();
 		const auto from = loadedAtTop() ? 0 : minMsgId();
-		const auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
+		const auto till = loadedAtBottom() ? ServerMaxMsgId : max;
 		auto list = std::vector<MsgId>();
 		list.reserve(std::min(
 			int(_items.size()),
@@ -3122,13 +3123,14 @@ Data::HistoryMessages &History::messages() {
 					if (!list.empty() && list.back() >= id) {
 						sort = true;
 					}
+					list.push_back(id);
 				}
 			}
 		}
 		if (sort) {
 			ranges::sort(list);
 		}
-		if (till) {
+		if (max || (loadedAtTop() && loadedAtBottom())) {
 			_messages->addSlice(std::move(list), { from, till }, {});
 		}
 	}

From cd7cfcdf2fa1e566abe5c6e79379a2a07a384df4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 18:30:14 +0400
Subject: [PATCH 578/596] Show chat preview on Alt+Click.

---
 .../dialogs/dialogs_inner_widget.cpp          | 30 ++++++++++++-------
 .../dialogs/dialogs_inner_widget.h            |  4 +--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index fbf6eb513..6aef6c8a7 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -159,7 +159,7 @@ InnerWidget::InnerWidget(
 	+ st::defaultDialogRow.padding.left())
 , _cancelSearchInChat(this, st::dialogsCancelSearchInPeer)
 , _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer)
-, _chatPreviewTimer([=] { showChatPreview(); })
+, _chatPreviewTimer([=] { showChatPreview(true); })
 , _childListShown(std::move(childListShown)) {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 
@@ -1435,6 +1435,18 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	setFilteredPressed(_filteredSelected, _selectedTopicJump);
 	setPeerSearchPressed(_peerSearchSelected);
 	setSearchedPressed(_searchedSelected);
+
+	const auto alt = (e->modifiers() & Qt::AltModifier);
+	const auto onlyUserpic = !alt;
+	if (pressShowsPreview(onlyUserpic)) {
+		_chatPreviewWillBeFor = computeChosenRow().key;
+		if (alt) {
+			showChatPreview(onlyUserpic);
+			return;
+		}
+		_chatPreviewTimer.callOnce(kChatPreviewDelay);
+	}
+
 	if (base::in_range(_collapsedSelected, 0, _collapsedRows.size())) {
 		auto row = &_collapsedRows[_collapsedSelected]->row;
 		row->addRipple(e->pos(), QSize(width(), st::dialogsImportantBarHeight), [this, index = _collapsedSelected] {
@@ -1503,10 +1515,8 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 			row->repaint());
 	}
 	ClickHandler::pressed();
-	if (pressShowsPreview()) {
-		_chatPreviewWillBeFor = computeChosenRow().key;
-		_chatPreviewTimer.callOnce(kChatPreviewDelay);
-	} else if (anim::Disabled()
+	if (anim::Disabled()
+		&& !_chatPreviewTimer.isActive()
 		&& (!_pressed || !_pressed->entry()->isPinnedDialog(_filterId))) {
 		mousePressReleased(e->globalPos(), e->button(), e->modifiers());
 	}
@@ -2306,10 +2316,10 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 	});
 }
 
-void InnerWidget::showChatPreview() {
+void InnerWidget::showChatPreview(bool onlyUserpic) {
 	const auto key = base::take(_chatPreviewWillBeFor);
 	cancelChatPreview();
-	if (!pressShowsPreview() || key != computeChosenRow().key) {
+	if (!pressShowsPreview(onlyUserpic) || key != computeChosenRow().key) {
 		return;
 	}
 	ClickHandler::unpressed();
@@ -3558,15 +3568,15 @@ bool InnerWidget::isUserpicPress() const {
 		&& (width() > _narrowWidth);
 }
 
-bool InnerWidget::pressShowsPreview() const {
-	if (!isUserpicPress()) {
+bool InnerWidget::pressShowsPreview(bool onlyUserpic) const {
+	if (onlyUserpic && !isUserpicPress()) {
 		return false;
 	}
 	const auto key = computeChosenRow().key;
 	if (const auto history = key.history()) {
 		return !history->peer->isForum();
 	}
-	return key.topic() != nullptr;;
+	return key.topic() != nullptr;
 }
 
 bool InnerWidget::chooseRow(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index c8186e2ea..fe9a3d926 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -123,9 +123,9 @@ public:
 	void resizeEmptyLabel();
 
 	[[nodiscard]] bool isUserpicPress() const;
-	[[nodiscard]] bool pressShowsPreview() const;
+	[[nodiscard]] bool pressShowsPreview(bool onlyUserpic) const;
 	void cancelChatPreview();
-	void showChatPreview();
+	void showChatPreview(bool onlyUserpic);
 	bool chooseRow(
 		Qt::KeyboardModifiers modifiers = {},
 		MsgId pressedTopicRootId = {});

From de73d8766c764d2cf5e64d269a53705749649708 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 21:10:14 +0400
Subject: [PATCH 579/596] Open chat on exact clicked message from preview.

---
 .../dialogs/dialogs_inner_widget.cpp          | 28 ++++++++++-
 .../view/history_view_chat_preview.cpp        | 49 ++++++++++++++-----
 .../history/view/history_view_chat_preview.h  | 12 ++++-
 .../history/view/history_view_list_widget.cpp |  4 ++
 .../history/view/history_view_list_widget.h   |  1 +
 5 files changed, 80 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 6aef6c8a7..d3c772c31 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -2326,10 +2326,34 @@ void InnerWidget::showChatPreview(bool onlyUserpic) {
 	mousePressReleased(QCursor::pos(), Qt::NoButton, Qt::NoModifier);
 
 	_chatPreviewKey = key;
-	_menu = HistoryView::MakeChatPreview(this, key.entry());
-	if (!_menu) {
+	auto preview = HistoryView::MakeChatPreview(this, key.entry());
+	if (!preview.menu) {
 		return;
 	}
+	_menu = std::move(preview.menu);
+	const auto weakMenu = Ui::MakeWeak(_menu.get());
+	const auto weakThread = base::make_weak(key.entry()->asThread());
+	const auto weakController = base::make_weak(_controller);
+	std::move(
+		preview.actions
+	) | rpl::start_with_next([=](HistoryView::ChatPreviewAction action) {
+		if (const auto controller = weakController.get()) {
+			if (const auto thread = weakThread.get()) {
+				const auto itemId = action.openItemId;
+				const auto owner = &thread->owner();
+				if (action.openInfo) {
+					controller->showPeerInfo(thread);
+				} else if (const auto item = owner->message(itemId)) {
+					controller->showMessage(item);
+				} else {
+					controller->showThread(thread);
+				}
+			}
+		}
+		if (const auto strong = weakMenu.data()) {
+			strong->hideMenu();
+		}
+	}, _menu->lifetime());
 	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
 		if (_chatPreviewKey) {
 			updateDialogRow(RowDescriptor(base::take(_chatPreviewKey), {}));
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index caca93da1..48b15494a 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/menu/menu_item_base.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
+#include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -36,8 +37,12 @@ class Item final
 public:
 	Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread);
 
-	not_null<QAction*> action() const override;
-	bool isEnabled() const override;
+	[[nodiscard]] not_null<QAction*> action() const override;
+	[[nodiscard]] bool isEnabled() const override;
+
+	[[nodiscard]] rpl::producer<ChatPreviewAction> actions() {
+		return _actions.events();
+	}
 
 private:
 	int contentHeight() const override;
@@ -146,6 +151,7 @@ private:
 	const std::unique_ptr<Ui::ElasticScroll> _scroll;
 
 	QPointer<HistoryView::ListWidget> _inner;
+	rpl::event_stream<ChatPreviewAction> _actions;
 
 	QImage _bg;
 
@@ -180,6 +186,22 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 	using Type = Ui::ElasticScroll::OverscrollType;
 	_scroll->setOverscrollTypes(Type::Real, Type::Real);
 
+	_scroll->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			const auto relative = Ui::MapFrom(
+				_inner.data(),
+				_scroll.get(),
+				static_cast<QMouseEvent*>(e.get())->pos());
+			if (const auto view = _inner->lookupItemByY(relative.y())) {
+				_actions.fire(ChatPreviewAction{
+					.openItemId = view->data()->fullId(),
+				});
+			} else {
+				_actions.fire(ChatPreviewAction{});
+			}
+		}
+	}, lifetime());
+
 	_inner->resizeToWidth(_scroll->width(), _scroll->height());
 
 	_inner->refreshViewer();
@@ -519,31 +541,36 @@ void Item::listLaunchDrag(
 
 } // namespace
 
-base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
+ChatPreview MakeChatPreview(
 		QWidget *parent,
 		not_null<Dialogs::Entry*> entry) {
 	const auto thread = entry->asThread();
 	if (!thread) {
-		return nullptr;
+		return {};
 	} else if (const auto history = entry->asHistory()) {
 		if (history->peer->isForum()) {
-			return nullptr;
+			return {};
 		}
 	}
 
-	auto result = base::make_unique_q<Ui::PopupMenu>(
-		parent,
-		st::previewMenu);
+	auto result = ChatPreview{
+		.menu = base::make_unique_q<Ui::PopupMenu>(
+			parent,
+			st::previewMenu),
+	};
+	const auto menu = result.menu.get();
 
-	result->addAction(base::make_unique_q<Item>(result.get(), thread));
+	auto action = base::make_unique_q<Item>(menu, thread);
+	result.actions = action->actions();
+	menu->addAction(std::move(action));
 	if (const auto topic = thread->asTopic()) {
-		const auto weak = Ui::MakeWeak(result.get());
+		const auto weak = Ui::MakeWeak(menu);
 		topic->destroyed() | rpl::start_with_next([weak] {
 			if (const auto strong = weak.data()) {
 				LOG(("Preview hidden for a destroyed topic."));
 				strong->hideMenu(true);
 			}
-		}, result->lifetime());
+		}, menu->lifetime());
 	}
 
 	return result;
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.h b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
index 12a35bbba..9445b6171 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.h
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
@@ -19,7 +19,17 @@ class PopupMenu;
 
 namespace HistoryView {
 
-[[nodiscard]] base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
+struct ChatPreviewAction {
+	FullMsgId openItemId;
+	bool openInfo = false;
+};
+
+struct ChatPreview {
+	base::unique_qptr<Ui::PopupMenu> menu;
+	rpl::producer<ChatPreviewAction> actions;
+};
+
+[[nodiscard]] ChatPreview MakeChatPreview(
 	QWidget *parent,
 	not_null<Dialogs::Entry*> entry);
 
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index e951cd802..a320a67f7 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1584,6 +1584,10 @@ bool ListWidget::hasSelectRestriction() const {
 		!= CopyRestrictionType::None;
 }
 
+Element *ListWidget::lookupItemByY(int y) const {
+	return strictFindItemByY(y);
+}
+
 auto ListWidget::findViewForPinnedTracking(int top) const
 -> std::pair<Element*, int> {
 	const auto findScrollTopItem = [&](int top)
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index bd8ad7827..e5304bb44 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -344,6 +344,7 @@ public:
 	[[nodiscard]] bool hasCopyRestrictionForSelected() const;
 	[[nodiscard]] bool showCopyRestrictionForSelected();
 	[[nodiscard]] bool hasSelectRestriction() const;
+	[[nodiscard]] Element *lookupItemByY(int y) const;
 
 	[[nodiscard]] std::pair<Element*, int> findViewForPinnedTracking(
 		int top) const;

From a60783eae3016ea105d242a0a136e9c2eca1cb87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 4 May 2024 11:37:07 +0400
Subject: [PATCH 580/596] Implement preview top and bottom.

---
 .../dialogs/dialogs_inner_widget.cpp          |  10 +-
 .../view/history_view_chat_preview.cpp        | 279 +++++++++++++++---
 .../history/view/history_view_chat_preview.h  |   2 +
 .../info/profile/info_profile_cover.cpp       |  15 +-
 .../info/profile/info_profile_cover.h         |   4 +
 Telegram/SourceFiles/ui/chat/chat.style       |  22 ++
 6 files changed, 289 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index d3c772c31..e76b137ec 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -2341,7 +2341,15 @@ void InnerWidget::showChatPreview(bool onlyUserpic) {
 			if (const auto thread = weakThread.get()) {
 				const auto itemId = action.openItemId;
 				const auto owner = &thread->owner();
-				if (action.openInfo) {
+				if (action.markRead) {
+					Window::MarkAsReadThread(thread);
+				} else if (action.markUnread) {
+					if (const auto history = thread->asHistory()) {
+						history->owner().histories().changeDialogUnreadMark(
+							history,
+							true);
+					}
+				} else if (action.openInfo) {
 					controller->showPeerInfo(thread);
 				} else if (const auto item = owner->message(itemId)) {
 					controller->showMessage(item);
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 48b15494a..e1316a9eb 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -7,26 +7,39 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_chat_preview.h"
 
+#include "base/unixtime.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_forum_topic.h"
 #include "data/data_history_messages.h"
 #include "data/data_peer.h"
+#include "data/data_peer_values.h"
 #include "data/data_replies_list.h"
+#include "data/data_session.h"
 #include "data/data_thread.h"
 #include "history/view/reactions/history_view_reactions_button.h"
 #include "history/view/history_view_list_widget.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "info/profile/info_profile_cover.h"
+#include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/widgets/elastic_scroll.h"
+#include "ui/controls/userpic_button.h"
 #include "ui/widgets/menu/menu_item_base.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace HistoryView {
 namespace {
@@ -48,7 +61,10 @@ private:
 	int contentHeight() const override;
 	void paintEvent(QPaintEvent *e) override;
 
+	void setupTop();
+	void setupMarkRead();
 	void setupBackground();
+	void setupHistory();
 	void updateInnerVisibleArea();
 
 	Context listContext() override;
@@ -148,7 +164,9 @@ private:
 	const not_null<PeerData*> _peer;
 	const std::shared_ptr<Ui::ChatTheme> _theme;
 	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
+	const std::unique_ptr<Ui::AbstractButton> _top;
 	const std::unique_ptr<Ui::ElasticScroll> _scroll;
+	const std::unique_ptr<Ui::FlatButton> _markRead;
 
 	QPointer<HistoryView::ListWidget> _inner;
 	rpl::event_stream<ChatPreviewAction> _actions;
@@ -157,6 +175,56 @@ private:
 
 };
 
+struct StatusFields {
+	QString text;
+	bool active = false;
+};
+
+[[nodiscard]] rpl::producer<StatusFields> StatusValue(
+		not_null<PeerData*> peer) {
+	peer->updateFull();
+
+	using UpdateFlag = Data::PeerUpdate::Flag;
+	return peer->session().changes().peerFlagsValue(
+		peer,
+		UpdateFlag::OnlineStatus | UpdateFlag::Members
+	) | rpl::map([=](const Data::PeerUpdate &update)
+	-> StatusFields {
+		const auto wrap = [](QString text) {
+			return StatusFields{ .text = text };
+		};
+		if (const auto user = peer->asUser()) {
+			const auto now = base::unixtime::now();
+			return {
+				.text = Data::OnlineText(user, now),
+				.active = Data::OnlineTextActive(user, now),
+			};
+		} else if (const auto chat = peer->asChat()) {
+			return wrap(!chat->amIn()
+				? tr::lng_chat_status_unaccessible(tr::now)
+				: (chat->count <= 0)
+				? tr::lng_group_status(tr::now)
+				: tr::lng_chat_status_members(
+					tr::now,
+					lt_count_decimal,
+					chat->count));
+		} else if (const auto channel = peer->asChannel()) {
+			return wrap((channel->membersCount() > 0)
+				? ((channel->isMegagroup()
+					? tr::lng_chat_status_members
+					: tr::lng_chat_status_subscribers)(
+						tr::now,
+						lt_count_decimal,
+						channel->membersCount()))
+				: (channel->isMegagroup()
+					? tr::lng_group_status(tr::now)
+					: tr::lng_channel_status(tr::now)));
+		}
+		Unexpected("Peer type in ChatPreview Item.");
+	});
+
+}
+
 Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 : Ui::Menu::ItemBase(parent, st::previewMenu.menu)
 , _dummyAction(new QAction(parent))
@@ -167,17 +235,187 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 , _peer(thread->peer())
 , _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
 , _chatStyle(std::make_unique<Ui::ChatStyle>(_session->colorIndicesValue()))
-, _scroll(std::make_unique<Ui::ElasticScroll>(this)) {
+, _top(std::make_unique<Ui::AbstractButton>(this))
+, _scroll(std::make_unique<Ui::ElasticScroll>(this))
+, _markRead(
+	std::make_unique<Ui::FlatButton>(
+		this,
+		tr::lng_context_mark_read(tr::now),
+		st::previewMarkRead)) {
 	setPointerCursor(false);
 	setMinWidth(st::previewMenu.menu.widthMin);
 	resize(minWidth(), contentHeight());
+	setupTop();
+	setupMarkRead();
 	setupBackground();
+	setupHistory();
+}
 
+not_null<QAction*> Item::action() const {
+	return _dummyAction;
+}
+
+bool Item::isEnabled() const {
+	return false;
+}
+
+int Item::contentHeight() const {
+	return st::previewMenu.maxHeight;
+}
+
+void Item::setupTop() {
+	_top->setGeometry(0, 0, width(), st::previewTop.height);
+	_top->setClickedCallback([=] {
+		_actions.fire({ .openInfo = true });
+	});
+	_top->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		const auto &st = st::previewTop;
+		auto p = QPainter(_top.get());
+		p.fillRect(clip, st::topBarBg);
+	}, _top->lifetime());
+
+	const auto topic = _thread->asTopic();
+	const auto name = Ui::CreateChild<Ui::FlatLabel>(
+		_top.get(),
+		(topic
+			? Info::Profile::TitleValue(topic)
+			: Info::Profile::NameValue(_thread->peer())),
+		st::previewName);
+	name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	auto statusFields = StatusValue(
+		_thread->peer()
+	) | rpl::start_spawning(lifetime());
+	auto statusText = rpl::duplicate(
+		statusFields
+	) | rpl::map([](StatusFields &&fields) {
+		return fields.text;
+	});
+	const auto status = Ui::CreateChild<Ui::FlatLabel>(
+		_top.get(),
+		(topic
+			? Info::Profile::NameValue(topic->channel())
+			: std::move(statusText)),
+		st::previewStatus);
+	std::move(statusFields) | rpl::start_with_next([=](const StatusFields &fields) {
+		status->setTextColorOverride(fields.active
+			? st::windowActiveTextFg->c
+			: std::optional<QColor>());
+	}, status->lifetime());
+	status->setAttribute(Qt::WA_TransparentForMouseEvents);
+	const auto userpic = topic
+		? nullptr
+		: Ui::CreateChild<Ui::UserpicButton>(
+			_top.get(),
+			_thread->peer(),
+			st::previewUserpic);
+	if (userpic) {
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+	const auto icon = topic
+		? Ui::CreateChild<Info::Profile::TopicIconButton>(
+			this,
+			topic,
+			[=] { return false; })
+		: nullptr;
+	if (icon) {
+		icon->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+
+	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
+	_top->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+		const auto &st = st::previewTop;
+		name->resizeToWidth(geometry.width()
+			- st.namePosition.x()
+			- st.photoPosition.x());
+		name->move(st::previewTop.namePosition);
+		status->resizeToWidth(geometry.width()
+			- st.statusPosition.x()
+			- st.photoPosition.x());
+		status->move(st.statusPosition);
+		shadow->setGeometry(
+			geometry.x(),
+			geometry.y() + geometry.height(),
+			geometry.width(),
+			st::lineWidth);
+		if (userpic) {
+			userpic->move(st.photoPosition);
+		} else {
+			icon->move(
+				st.photoPosition.x() + (st.photoSize - icon->width()) / 2,
+				st.photoPosition.y() + (st.photoSize - icon->height()) / 2);
+		}
+	}, shadow->lifetime());
+}
+
+void Item::setupMarkRead() {
+	_markRead->resizeToWidth(width());
+	_markRead->move(0, height() - _markRead->height());
+
+	rpl::single(
+		rpl::empty
+	) | rpl::then(
+		_thread->owner().chatsListFor(_thread)->unreadStateChanges(
+		) | rpl::to_empty
+	) | rpl::start_with_next([=] {
+		const auto state = _thread->chatListBadgesState();
+		const auto unread = (state.unreadCounter || state.unread);
+		if (_thread->asTopic() && !unread) {
+			_markRead->hide();
+			return;
+		}
+		_markRead->setText(unread
+			? tr::lng_context_mark_read(tr::now)
+			: tr::lng_context_mark_unread(tr::now));
+		_markRead->setClickedCallback([=] {
+			_actions.fire({ .markRead = unread, .markUnread = !unread });
+		});
+		_markRead->show();
+	}, _markRead->lifetime());
+
+	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
+	_markRead->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+		shadow->setGeometry(
+			geometry.x(),
+			geometry.y() - st::lineWidth,
+			geometry.width(),
+			st::lineWidth);
+	}, shadow->lifetime());
+	shadow->showOn(_markRead->shownValue());
+}
+
+void Item::setupBackground() {
+	const auto ratio = style::DevicePixelRatio();
+	_bg = QImage(
+		size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+
+	const auto paint = [=] {
+		auto p = QPainter(&_bg);
+		Window::SectionWidget::PaintBackground(
+			p,
+			_theme.get(),
+			QSize(width(), height() * 2),
+			QRect(QPoint(), size()));
+	};
+	paint();
+	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+		paint();
+		update();
+	}, lifetime());
+}
+
+void Item::setupHistory() {
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
 		_session,
 		static_cast<ListDelegate*>(this)));
-	_scroll->setGeometry(rect());
+
+	_markRead->shownValue() | rpl::start_with_next([=](bool shown) {
+		const auto top = _top->height();
+		const auto bottom = shown ? _markRead->height() : 0;
+		_scroll->setGeometry(rect().marginsRemoved({ 0, top, 0, bottom }));
+	}, _markRead->lifetime());
+
 	_scroll->scrolls(
 	) | rpl::start_with_next([=] {
 		updateInnerVisibleArea();
@@ -209,39 +447,6 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 	_inner->setAttribute(Qt::WA_TransparentForMouseEvents);
 }
 
-not_null<QAction*> Item::action() const {
-	return _dummyAction;
-}
-
-bool Item::isEnabled() const {
-	return false;
-}
-
-int Item::contentHeight() const {
-	return st::previewMenu.maxHeight;
-}
-
-void Item::setupBackground() {
-	const auto ratio = style::DevicePixelRatio();
-	_bg = QImage(
-		size() * ratio,
-		QImage::Format_ARGB32_Premultiplied);
-
-	const auto paint = [=] {
-		auto p = QPainter(&_bg);
-		Window::SectionWidget::PaintBackground(
-			p,
-			_theme.get(),
-			QSize(width(), height() * 2),
-			QRect(QPoint(), size()));
-	};
-	paint();
-	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
-		paint();
-		update();
-	}, lifetime());
-}
-
 void Item::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 	p.drawImage(0, 0, _bg);
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.h b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
index 9445b6171..0598725c2 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.h
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
@@ -22,6 +22,8 @@ namespace HistoryView {
 struct ChatPreviewAction {
 	FullMsgId openItemId;
 	bool openInfo = false;
+	bool markRead = false;
+	bool markUnread = false;
 };
 
 struct ChatPreview {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 6cc611fdb..e460b4dc8 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -231,12 +231,17 @@ TopicIconButton::TopicIconButton(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
 	not_null<Data::ForumTopic*> topic)
+: TopicIconButton(parent, topic, [=] {
+	return controller->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
+}) {
+}
+
+TopicIconButton::TopicIconButton(
+	QWidget *parent,
+	not_null<Data::ForumTopic*> topic,
+	Fn<bool()> paused)
 : AbstractButton(parent)
-, _view(
-		topic,
-		[=] { return controller->isGifPausedAtLeastFor(
-			Window::GifPauseReason::Layer); },
-		[=] { update(); }) {
+, _view(topic, paused, [=] { update(); }) {
 	resize(st::infoTopicCover.photo.size);
 	paintRequest(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.h b/Telegram/SourceFiles/info/profile/info_profile_cover.h
index 20389e7c5..59a857eb6 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.h
@@ -82,6 +82,10 @@ public:
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
 		not_null<Data::ForumTopic*> topic);
+	TopicIconButton(
+		QWidget *parent,
+		not_null<Data::ForumTopic*> topic,
+		Fn<bool()> paused);
 
 private:
 	TopicIconView _view;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 36e3b5947..8bba17e87 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1090,3 +1090,25 @@ previewMenu: PopupMenu(defaultPopupMenu) {
 		shadow: boxRoundShadow;
 	}
 }
+previewTop: PeerListItem(defaultPeerListItem) {
+	height: 52px;
+	photoPosition: point(10px, 6px);
+	namePosition: point(60px, 9px);
+	statusPosition: point(60px, 27px);
+	photoSize: 40px;
+}
+previewMarkRead: FlatButton(historyComposeButton) {
+	height: 40px;
+	textTop: 10px;
+}
+previewName: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	textFg: windowFg;
+}
+previewStatus: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
+previewUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(40px, 40px);
+	photoSize: 40px;
+}

From 470b3a2cbd0ca980ad0376c74367a65010ffd8e3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 8 May 2024 17:14:30 +0400
Subject: [PATCH 581/596] Fix preview showing on fast userpic click.

---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index e76b137ec..e21dcbcf4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1760,6 +1760,8 @@ void InnerWidget::mousePressReleased(
 		QPoint globalPosition,
 		Qt::MouseButton button,
 		Qt::KeyboardModifiers modifiers) {
+	_chatPreviewTimer.cancel();
+
 	auto wasDragging = (_dragging != nullptr);
 	if (wasDragging) {
 		updateReorderIndexGetCount();

From 8a6b1677f4ce2b6cda2796a365ae87ebaa36f20e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 27 May 2024 16:28:03 +0300
Subject: [PATCH 582/596] Added userpic views to headers of forwarded messages.

---
 .../history/history_item_components.cpp       | 41 +++++++++++++------
 .../history/history_item_components.h         |  4 +-
 .../history/view/history_view_message.cpp     |  2 +-
 .../history/view/media/history_view_gif.cpp   |  2 +-
 .../media/history_view_media_unwrapped.cpp    |  2 +-
 Telegram/SourceFiles/ui/chat/chat.style       |  1 +
 6 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index b8a64263b..dc4a38c7a 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -183,8 +183,11 @@ bool HiddenSenderInfo::paintCustomUserpic(
 	return valid;
 }
 
-void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
+void HistoryMessageForwarded::create(
+		const HistoryMessageVia *via,
+		not_null<const HistoryItem*> item) const {
 	auto phrase = TextWithEntities();
+	auto context = Core::MarkedTextContext{};
 	const auto fromChannel = originalSender
 		&& originalSender->isChannel()
 		&& !originalSender->isMegagroup();
@@ -193,16 +196,27 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
 			? originalSender->name()
 			: originalHiddenSenderInfo->name)
 	};
+	if (originalSender) {
+		context.session = &originalSender->owner().session();
+		context.customEmojiRepaint = [=] {
+			originalSender->owner().requestItemRepaint(item);
+		};
+		phrase = Ui::Text::SingleCustomEmoji(
+			context.session->data().customEmojiManager().peerUserpicEmojiData(
+				originalSender,
+				st::fwdTextUserpicPadding));
+	}
 	if (!originalPostAuthor.isEmpty()) {
-		phrase = tr::lng_forwarded_signed(
-			tr::now,
-			lt_channel,
-			name,
-			lt_user,
-			{ .text = originalPostAuthor },
-			Ui::Text::WithEntities);
+		phrase.append(
+			tr::lng_forwarded_signed(
+				tr::now,
+				lt_channel,
+				name,
+				lt_user,
+				{ .text = originalPostAuthor },
+				Ui::Text::WithEntities));
 	} else {
-		phrase = name;
+		phrase.append(name);
 	}
 	if (story) {
 		phrase = tr::lng_forwarded_story(
@@ -248,18 +262,21 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
 					: tr::lng_forwarded_psa_default)(
 						tr::now,
 						lt_channel,
-						Ui::Text::Link(phrase.text, QString()), // Link 1.
+						Ui::Text::Wrapped(
+							phrase,
+							EntityType::CustomUrl,
+							QString()), // Link 1.
 						Ui::Text::WithEntities);
 			}
 		} else {
 			phrase = tr::lng_forwarded(
 				tr::now,
 				lt_user,
-				Ui::Text::Link(phrase.text, QString()), // Link 1.
+				Ui::Text::Wrapped(phrase, EntityType::CustomUrl, QString()), // Link 1.
 				Ui::Text::WithEntities);
 		}
 	}
-	text.setMarkedText(st::fwdTextStyle, phrase);
+	text.setMarkedText(st::fwdTextStyle, phrase, kMarkupTextOptions, context);
 
 	text.setLink(1, fromChannel
 		? JumpToMessageClickHandler(originalSender, originalId)
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index e35a804a2..44f31f3cd 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -125,7 +125,9 @@ private:
 };
 
 struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded, HistoryItem> {
-	void create(const HistoryMessageVia *via) const;
+	void create(
+		const HistoryMessageVia *via,
+		not_null<const HistoryItem*> item) const;
 
 	[[nodiscard]] bool forwardOfForward() const {
 		return savedFromSender || savedFromHiddenSenderInfo;
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index cc0b4aec7..96cbc4648 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -714,7 +714,7 @@ QSize Message::performCountOptimalSize() {
 		const auto via = item->Get<HistoryMessageVia>();
 		const auto entry = logEntryOriginal();
 		if (forwarded) {
-			forwarded->create(via);
+			forwarded->create(via, item);
 		}
 
 		auto mediaDisplayed = false;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 2097ca1b5..7dbee0416 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -293,7 +293,7 @@ QSize Gif::countOptimalSize() {
 		auto reply = _parent->Get<Reply>();
 		auto forwarded = item->Get<HistoryMessageForwarded>();
 		if (forwarded) {
-			forwarded->create(via);
+			forwarded->create(via, item);
 		}
 		maxWidth += additionalWidth(reply, via, forwarded);
 		accumulate_max(maxWidth, _parent->reactionsOptimalWidth());
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
index 4c9e3277c..beee98df1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -59,7 +59,7 @@ QSize UnwrappedMedia::countOptimalSize() {
 		const auto topic = _parent->displayedTopicButton();
 		const auto forwarded = getDisplayedForwardedInfo();
 		if (forwarded) {
-			forwarded->create(via);
+			forwarded->create(via, item);
 		}
 		maxWidth += additionalWidth(topic, reply, via, forwarded);
 		accumulate_max(maxWidth, _parent->reactionsOptimalWidth());
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 8bba17e87..91ba60a37 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -125,6 +125,7 @@ outTextPaletteSelected: TextPalette(outTextPalette) {
 	monoFg: msgOutMonoFgSelected;
 	spoilerFg: msgOutDateFgSelected;
 }
+fwdTextUserpicPadding: margins(0px, 1px, 3px, 0px);
 fwdTextStyle: TextStyle(semiboldTextStyle) {
 	linkUnderline: kLinkUnderlineNever;
 }

From 0dd6ff9d9be23af24da28c9c9ceb60d48a797844 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 21:43:05 +0400
Subject: [PATCH 583/596] Beta version 5.0.5.

- Long press on chat userpic to show quick preview.
- Alt+Click on chat to show quick preview.
- Show author userpics in forwarded messages.
---
 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 +++---
 .../history/view/history_view_chat_preview.cpp         |  1 -
 Telegram/build/version                                 | 10 +++++-----
 changelog.txt                                          |  6 ++++++
 7 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 519db7170..fe3b473ac 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.4.0" />
+    Version="5.0.5.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 5bec7f3bc..1f0a7a045 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 5,0,4,0
- PRODUCTVERSION 5,0,4,0
+ FILEVERSION 5,0,5,0
+ PRODUCTVERSION 5,0,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.4.0"
+            VALUE "FileVersion", "5.0.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.4.0"
+            VALUE "ProductVersion", "5.0.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index d44287d24..c334ca569 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 5,0,4,0
- PRODUCTVERSION 5,0,4,0
+ FILEVERSION 5,0,5,0
+ PRODUCTVERSION 5,0,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.0.4.0"
+            VALUE "FileVersion", "5.0.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.4.0"
+            VALUE "ProductVersion", "5.0.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 1d8cecd6e..8de17b03c 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 = 5000004;
-constexpr auto AppVersionStr = "5.0.4";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 5000005;
+constexpr auto AppVersionStr = "5.0.5";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index e1316a9eb..0a7e9a8b9 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -269,7 +269,6 @@ void Item::setupTop() {
 		_actions.fire({ .openInfo = true });
 	});
 	_top->paintRequest() | rpl::start_with_next([=](QRect clip) {
-		const auto &st = st::previewTop;
 		auto p = QPainter(_top.get());
 		p.fillRect(clip, st::topBarBg);
 	}, _top->lifetime());
diff --git a/Telegram/build/version b/Telegram/build/version
index 68f363453..5d551a173 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000004
+AppVersion         5000005
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.4
-AppVersionStr      5.0.4
-BetaChannel        0
+AppVersionStrSmall 5.0.5
+AppVersionStr      5.0.5
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 5.0.4
+AppVersionOriginal 5.0.5.beta
diff --git a/changelog.txt b/changelog.txt
index 19f721c85..ddfebe110 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+5.0.5 beta (28.05.24)
+
+- Long press on chat userpic to show quick preview.
+- Alt+Click on chat to show quick preview.
+- Show author userpics in forwarded messages.
+
 5.0.4 (28.05.24)
 
 - Fix reply to last message by Ctrl+Up in topics.

From 465fc42718be3bc8d6e1a9cc0be1b61b6eccdc32 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 09:43:40 +0400
Subject: [PATCH 584/596] Fix chat preview in non-default themes.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 0a7e9a8b9..b804f7382 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -242,6 +242,7 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 		this,
 		tr::lng_context_mark_read(tr::now),
 		st::previewMarkRead)) {
+	_chatStyle->apply(_theme.get());
 	setPointerCursor(false);
 	setMinWidth(st::previewMenu.menu.widthMin);
 	resize(minWidth(), contentHeight());

From d2e600352160420314721b76817988b80d1f3433 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 10:12:56 +0400
Subject: [PATCH 585/596] Ignore right click on preview.

---
 .../view/history_view_chat_preview.cpp        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index b804f7382..8ad2a2a6a 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -426,16 +426,19 @@ void Item::setupHistory() {
 
 	_scroll->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
-			const auto relative = Ui::MapFrom(
-				_inner.data(),
-				_scroll.get(),
-				static_cast<QMouseEvent*>(e.get())->pos());
-			if (const auto view = _inner->lookupItemByY(relative.y())) {
-				_actions.fire(ChatPreviewAction{
-					.openItemId = view->data()->fullId(),
-				});
-			} else {
-				_actions.fire(ChatPreviewAction{});
+			const auto button = static_cast<QMouseEvent*>(e.get())->button();
+			if (button == Qt::LeftButton) {
+				const auto relative = Ui::MapFrom(
+					_inner.data(),
+					_scroll.get(),
+					static_cast<QMouseEvent*>(e.get())->pos());
+				if (const auto view = _inner->lookupItemByY(relative.y())) {
+					_actions.fire(ChatPreviewAction{
+						.openItemId = view->data()->fullId(),
+					});
+				} else {
+					_actions.fire(ChatPreviewAction{});
+				}
 			}
 		}
 	}, lifetime());

From d6e827e9827dcaba54477fe866b3282025e27ed0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 10:48:41 +0400
Subject: [PATCH 586/596] Fix loading of chat preview messages.

---
 Telegram/SourceFiles/data/data_history_messages.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_history_messages.cpp b/Telegram/SourceFiles/data/data_history_messages.cpp
index 86b46503d..66e888e28 100644
--- a/Telegram/SourceFiles/data/data_history_messages.cpp
+++ b/Telegram/SourceFiles/data/data_history_messages.cpp
@@ -89,6 +89,13 @@ rpl::producer<SparseIdsSlice> HistoryViewer(
 		using RequestAroundInfo = SparseIdsSliceBuilder::AroundData;
 		builder->insufficientAround(
 		) | rpl::start_with_next([=](const RequestAroundInfo &info) {
+			if (!info.aroundId) {
+				// Ignore messages-count-only requests, because we perform
+				// them with non-zero limit of messages and end up adding
+				// a broken slice with several last messages from the chat
+				// with a non-skip range starting at zero.
+				return;
+			}
 			history->session().api().requestHistory(
 				history,
 				info.aroundId,
@@ -155,7 +162,7 @@ rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
 	};
 	const auto peerId = history->peer->id;
 	const auto topicRootId = MsgId();
-	const auto migratedPeerId = migrateFrom ? migrateFrom->id : peerId;
+	const auto migratedPeerId = migrateFrom ? migrateFrom->id : PeerId(0);
 	using Key = SparseIdsMergedSlice::Key;
 	return SparseIdsMergedSlice::CreateViewer(
 		Key(peerId, topicRootId, migratedPeerId, universalAroundId),

From 2b9e7a6b2568c2265be17289d29f246c406f0c4c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 12:06:30 +0400
Subject: [PATCH 587/596] Show preview on Force-Click on macOS.

---
 .../dialogs/dialogs_inner_widget.cpp          | 25 ++++++++++++++++---
 .../dialogs/dialogs_inner_widget.h            |  2 ++
 .../platform/mac/main_window_mac.h            |  6 +++++
 .../platform/mac/main_window_mac.mm           | 10 ++++++++
 Telegram/SourceFiles/window/main_window.h     |  4 +++
 5 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index e21dcbcf4..3b996f385 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -332,6 +332,11 @@ InnerWidget::InnerWidget(
 		switchToFilter(filterId);
 	}, lifetime());
 
+	_controller->window().widget()->globalForceClicks(
+	) | rpl::start_with_next([=](QPoint globalPosition) {
+		processGlobalForceClick(globalPosition);
+	}, lifetime());
+
 	session().data().stories().incrementPreloadingMainSources();
 
 	handleChatListEntryRefreshes();
@@ -1424,6 +1429,16 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 	}
 }
 
+void InnerWidget::processGlobalForceClick(QPoint globalPosition) {
+	const auto parent = parentWidget();
+	if (_pressButton == Qt::LeftButton
+		&& parent->rect().contains(parent->mapFromGlobal(globalPosition))
+		&& pressShowsPreview(false)) {
+		_chatPreviewWillBeFor = computeChosenRow().key;
+		showChatPreview(false);
+	}
+}
+
 void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	selectByMouse(e->globalPos());
 
@@ -1761,6 +1776,7 @@ void InnerWidget::mousePressReleased(
 		Qt::MouseButton button,
 		Qt::KeyboardModifiers modifiers) {
 	_chatPreviewTimer.cancel();
+	_pressButton = Qt::NoButton;
 
 	auto wasDragging = (_dragging != nullptr);
 	if (wasDragging) {
@@ -3598,8 +3614,11 @@ ChosenRow InnerWidget::computeChosenRow() const {
 
 bool InnerWidget::isUserpicPress() const {
 	return  (_lastRowLocalMouseX >= 0)
-		&& (_lastRowLocalMouseX < _st->nameLeft)
-		&& (width() > _narrowWidth);
+		&& (_lastRowLocalMouseX < _st->nameLeft);
+}
+
+bool InnerWidget::isUserpicPressOnWide() const {
+	return isUserpicPress() && (width() > _narrowWidth);
 }
 
 bool InnerWidget::pressShowsPreview(bool onlyUserpic) const {
@@ -3625,7 +3644,7 @@ bool InnerWidget::chooseRow(
 			ChosenRow row,
 			Qt::KeyboardModifiers modifiers) {
 		row.newWindow = (modifiers & Qt::ControlModifier);
-		row.userpicClick = isUserpicPress();
+		row.userpicClick = isUserpicPressOnWide();
 		return row;
 	};
 	auto chosen = modifyChosenRow(computeChosenRow(), modifiers);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index fe9a3d926..9194df36e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -123,6 +123,7 @@ public:
 	void resizeEmptyLabel();
 
 	[[nodiscard]] bool isUserpicPress() const;
+	[[nodiscard]] bool isUserpicPressOnWide() const;
 	[[nodiscard]] bool pressShowsPreview(bool onlyUserpic) const;
 	void cancelChatPreview();
 	void showChatPreview(bool onlyUserpic);
@@ -258,6 +259,7 @@ private:
 		QPoint globalPosition,
 		Qt::MouseButton button,
 		Qt::KeyboardModifiers modifiers);
+	void processGlobalForceClick(QPoint globalPosition);
 	void clearIrrelevantState();
 	void selectByMouse(QPoint globalPosition);
 	void preloadRowsData();
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 6c2d15d07..2a3a59b9c 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -28,6 +28,10 @@ public:
 
 	void updateWindowIcon() override;
 
+	rpl::producer<QPoint> globalForceClicks() override {
+		return _forceClicks.events();
+	}
+
 	class Private;
 
 protected:
@@ -85,7 +89,9 @@ private:
 	QAction *psMonospace = nullptr;
 	QAction *psClearFormat = nullptr;
 
+	rpl::event_stream<QPoint> _forceClicks;
 	int _customTitleHeight = 0;
+	int _lastPressureStage = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 0b2adb9aa..9b0dd14bb 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -310,6 +310,16 @@ bool MainWindow::nativeEvent(
 			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
 				imeCompositionStartReceived();
 			});
+		} else if ([event type] == NSEventTypePressure) {
+			const auto stage = [event stage];
+			if (_lastPressureStage != stage) {
+				_lastPressureStage = stage;
+				if (stage == 2) {
+					Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+						_forceClicks.fire(QCursor::pos());
+					});
+				}
+			}
 		}
 	}
 	return false;
diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h
index 79dc3c6fe..67f38567c 100644
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -144,6 +144,10 @@ public:
 		Core::WindowPosition initial,
 		QSize minSize) const;
 
+	[[nodiscard]] virtual rpl::producer<QPoint> globalForceClicks() {
+		return rpl::never<QPoint>();
+	}
+
 protected:
 	void leaveEventHook(QEvent *e) override;
 

From a9a0fe7cf5430549a542b3bb1c69d879fa0df060 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 12:07:56 +0400
Subject: [PATCH 588/596] Fix RTL chat names in preview.

---
 .../view/history_view_chat_preview.cpp        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 8ad2a2a6a..4baed10bb 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -275,11 +275,13 @@ void Item::setupTop() {
 	}, _top->lifetime());
 
 	const auto topic = _thread->asTopic();
+	auto nameValue = (topic
+		? Info::Profile::TitleValue(topic)
+		: Info::Profile::NameValue(_thread->peer())
+	) | rpl::start_spawning(_top->lifetime());
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(
 		_top.get(),
-		(topic
-			? Info::Profile::TitleValue(topic)
-			: Info::Profile::NameValue(_thread->peer())),
+		rpl::duplicate(nameValue),
 		st::previewName);
 	name->setAttribute(Qt::WA_TransparentForMouseEvents);
 	auto statusFields = StatusValue(
@@ -322,12 +324,19 @@ void Item::setupTop() {
 	}
 
 	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
-	_top->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	rpl::combine(
+		_top->widthValue(),
+		std::move(nameValue)
+	) | rpl::start_with_next([=](int width, const auto &) {
 		const auto &st = st::previewTop;
-		name->resizeToWidth(geometry.width()
+		name->resizeToNaturalWidth(width
 			- st.namePosition.x()
 			- st.photoPosition.x());
 		name->move(st::previewTop.namePosition);
+	}, name->lifetime());
+
+	_top->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+		const auto &st = st::previewTop;
 		status->resizeToWidth(geometry.width()
 			- st.statusPosition.x()
 			- st.photoPosition.x());

From e2b78b673be0132afffc2a967f62464de94514fd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 12:08:22 +0400
Subject: [PATCH 589/596] Fix unintentional search focus.

---
 .../SourceFiles/chat_helpers/tabbed_section.cpp |  3 +++
 Telegram/SourceFiles/mainwidget.cpp             | 17 +++++++++++++----
 Telegram/SourceFiles/mainwidget.h               |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
index 3759697e3..92f6aaa00 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
@@ -28,6 +28,9 @@ TabbedSection::TabbedSection(
 	not_null<Window::SessionController*> controller)
 : Window::SectionWidget(parent, controller)
 , _selector(controller->tabbedSelector()) {
+	if (Ui::InFocusChain(_selector)) {
+		parent->window()->setFocus();
+	}
 	_selector->setParent(this);
 	_selector->setRoundRadius(0);
 	_selector->setGeometry(rect());
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index c9acfef92..4dd47970d 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1772,7 +1772,7 @@ void MainWidget::showNewSection(
 		_thirdSection = std::move(newThirdSection);
 		_thirdSection->removeRequests(
 		) | rpl::start_with_next([=] {
-			_thirdSection.destroy();
+			destroyThirdSection();
 			_thirdShadow.destroy();
 			updateControlsGeometry();
 		}, _thirdSection->lifetime());
@@ -2289,7 +2289,7 @@ void MainWidget::updateControlsGeometry() {
 			}
 		}
 	} else {
-		_thirdSection.destroy();
+		destroyThirdSection();
 		_thirdShadow.destroy();
 	}
 	const auto mainSectionTop = getMainSectionTop();
@@ -2408,6 +2408,15 @@ void MainWidget::updateControlsGeometry() {
 	floatPlayerUpdatePositions();
 }
 
+void MainWidget::destroyThirdSection() {
+	if (const auto strong = _thirdSection.data()) {
+		if (Ui::InFocusChain(strong)) {
+			setFocus();
+		}
+	}
+	_thirdSection.destroy();
+}
+
 void MainWidget::refreshResizeAreas() {
 	if (!isOneColumn() && _dialogs) {
 		ensureFirstColumnResizeAreaCreated();
@@ -2555,7 +2564,7 @@ void MainWidget::updateThirdColumnToCurrentChat(
 		if (saveThirdSectionToStackBack()) {
 			_stack.back()->setThirdSectionMemento(
 				_thirdSection->createMemento());
-			_thirdSection.destroy();
+			destroyThirdSection();
 		}
 	};
 	auto &settings = Core::App().settings();
@@ -2601,7 +2610,7 @@ void MainWidget::updateThirdColumnToCurrentChat(
 		settings.setTabbedReplacedWithInfo(false);
 		if (!key) {
 			if (_thirdSection) {
-				_thirdSection.destroy();
+				destroyThirdSection();
 				_thirdShadow.destroy();
 				updateControlsGeometry();
 			}
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 0f769a53f..14e1ef2ab 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -279,6 +279,7 @@ private:
 	void showNewSection(
 		std::shared_ptr<Window::SectionMemento> memento,
 		const SectionShow &params);
+	void destroyThirdSection();
 
 	Window::SectionSlideParams prepareThirdSectionAnimation(Window::SectionWidget *section);
 

From 7d636820ac1509e99916e93d911bc0c99ac1c7a4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 10:26:48 +0400
Subject: [PATCH 590/596] Show last updated topic preview on Alt+Click.

---
 .../dialogs/dialogs_inner_widget.cpp          | 22 +++++++++++++++----
 .../dialogs/dialogs_inner_widget.h            |  1 +
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 3b996f385..4a7dc475c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1429,12 +1429,25 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 	}
 }
 
+Key InnerWidget::computeChatPreviewRow() const {
+	auto result = computeChosenRow().key;
+	if (const auto peer = result.peer()) {
+		const auto topicId = _pressedTopicJump
+			? _pressedTopicJumpRootId
+			: 0;
+		if (const auto topic = peer->forumTopicFor(topicId)) {
+			return topic;
+		}
+	}
+	return result;
+}
+
 void InnerWidget::processGlobalForceClick(QPoint globalPosition) {
 	const auto parent = parentWidget();
 	if (_pressButton == Qt::LeftButton
 		&& parent->rect().contains(parent->mapFromGlobal(globalPosition))
 		&& pressShowsPreview(false)) {
-		_chatPreviewWillBeFor = computeChosenRow().key;
+		_chatPreviewWillBeFor = computeChatPreviewRow();
 		showChatPreview(false);
 	}
 }
@@ -1454,7 +1467,7 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	const auto alt = (e->modifiers() & Qt::AltModifier);
 	const auto onlyUserpic = !alt;
 	if (pressShowsPreview(onlyUserpic)) {
-		_chatPreviewWillBeFor = computeChosenRow().key;
+		_chatPreviewWillBeFor = computeChatPreviewRow();
 		if (alt) {
 			showChatPreview(onlyUserpic);
 			return;
@@ -2337,7 +2350,7 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 void InnerWidget::showChatPreview(bool onlyUserpic) {
 	const auto key = base::take(_chatPreviewWillBeFor);
 	cancelChatPreview();
-	if (!pressShowsPreview(onlyUserpic) || key != computeChosenRow().key) {
+	if (!pressShowsPreview(onlyUserpic) || key != computeChatPreviewRow()) {
 		return;
 	}
 	ClickHandler::unpressed();
@@ -3627,7 +3640,8 @@ bool InnerWidget::pressShowsPreview(bool onlyUserpic) const {
 	}
 	const auto key = computeChosenRow().key;
 	if (const auto history = key.history()) {
-		return !history->peer->isForum();
+		return !history->peer->isForum()
+			|| (_pressedTopicJump && _pressedTopicJumpRootId);
 	}
 	return key.topic() != nullptr;
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 9194df36e..f78c220ad 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -398,6 +398,7 @@ private:
 	void trackSearchResultsForum(Data::Forum *forum);
 
 	[[nodiscard]] QBrush currentBg() const;
+	[[nodiscard]] Key computeChatPreviewRow() const;
 
 	[[nodiscard]] const std::vector<Key> &pinnedChatsOrder() const;
 	void checkReorderPinnedStart(QPoint localPosition);

From 28cbb02b2099a4e43c1bccfc7f43b8db0a825cfe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 10:40:30 +0400
Subject: [PATCH 591/596] Jump to chat only by Double-Click on preview.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 4baed10bb..56d7f648c 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -434,7 +434,7 @@ void Item::setupHistory() {
 	_scroll->setOverscrollTypes(Type::Real, Type::Real);
 
 	_scroll->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
-		if (e->type() == QEvent::MouseButtonPress) {
+		if (e->type() == QEvent::MouseButtonDblClick) {
 			const auto button = static_cast<QMouseEvent*>(e.get())->button();
 			if (button == Qt::LeftButton) {
 				const auto relative = Ui::MapFrom(

From 0527e9a0f728c66138136b58f7164ab2dee07af4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 16:41:51 +0400
Subject: [PATCH 592/596] Fix adding bot as admin to channel.

---
 .../SourceFiles/boxes/add_contact_box.cpp     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index 45d4b1e99..6b9a0852c 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -192,20 +192,27 @@ void ShowAddParticipantsError(
 			&& channel
 			&& !channel->isMegagroup()
 			&& channel->canAddAdmins()) {
-			const auto makeAdmin = [=] {
+			const auto makeAdmin = [=](Fn<void()> close) {
 				const auto user = forbidden.users.front();
 				const auto weak = std::make_shared<QPointer<EditAdminBox>>();
-				const auto close = [=](auto&&...) {
-					if (*weak) {
-						(*weak)->closeBox();
+				const auto done = [=](auto&&...) {
+					if (const auto strong = weak->data()) {
+						strong->uiShow()->showToast(
+							tr::lng_box_done(tr::now));
+						strong->closeBox();
+					}
+				};
+				const auto fail = [=] {
+					if (const auto strong = weak->data()) {
+						strong->closeBox();
 					}
 				};
 				const auto saveCallback = SaveAdminCallback(
 					show,
 					channel,
 					user,
-					close,
-					close);
+					done,
+					fail);
 				auto box = Box<EditAdminBox>(
 					channel,
 					user,
@@ -214,6 +221,7 @@ void ShowAddParticipantsError(
 				box->setSaveCallback(saveCallback);
 				*weak = box.data();
 				show->showBox(std::move(box));
+				close();
 			};
 			show->showBox(
 				Ui::MakeConfirmBox({

From 4f5594c8ccbfafb6d47aa418aab6b320360fcd0b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 17:10:12 +0400
Subject: [PATCH 593/596] ChatNext jumps to first chat if no chat opened.

Fixes #27963.
---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 4a7dc475c..6527140b3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -4030,6 +4030,12 @@ void InnerWidget::setupShortcuts() {
 			request->check(Command::ChatNext) && request->handle([=] {
 				return jumpToDialogRow(next);
 			});
+		} else if (_state == WidgetState::Default
+			? !_shownList->empty()
+			: !_filterResults.empty()) {
+			request->check(Command::ChatNext) && request->handle([=] {
+				return jumpToDialogRow(first);
+			});
 		}
 		request->check(Command::ChatFirst) && request->handle([=] {
 			return jumpToDialogRow(first);

From aa4156d1e740ba3ee3c680ff17d74fb2f62b593d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 17:12:28 +0400
Subject: [PATCH 594/596] Ignore shortcuts when preview is shown.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 6527140b3..3c3ab74f6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -3997,7 +3997,8 @@ void InnerWidget::setupShortcuts() {
 		return isActiveWindow()
 			&& !_controller->isLayerShown()
 			&& !_controller->window().locked()
-			&& !_childListShown.current().shown;
+			&& !_childListShown.current().shown
+			&& !_chatPreviewKey;
 	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 

From a9dd9aeb90184bc81e4cc18445a4638434fab9f0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 17:38:50 +0400
Subject: [PATCH 595/596] Use InnoSetup SignTool for setup signing.

Fixes #27583.
---
 Telegram/build/build.bat | 6 ------
 Telegram/build/setup.iss | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat
index 43f145c55..3f3b65caa 100644
--- a/Telegram/build/build.bat
+++ b/Telegram/build/build.bat
@@ -208,12 +208,6 @@ if %BuildUWP% equ 0 (
     iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppVersionFull=%AppVersionStrFull% "/dReleasePath=%ReleasePath%" "/dMyBuildTarget=%BuildTarget%" "%FullScriptPath%setup.iss"
     if %errorlevel% neq 0 goto error
     if not exist "%SetupFile%" goto error
-:sign3
-    call "%SignPath%" "%SetupFile%"
-    if %errorlevel% neq 0 (
-      timeout /t 3
-      goto sign3
-    )
   )
 
   call Packer.exe -version %VersionForPacker% -path %BinaryName%.exe -path Updater.exe -path "modules\%Platform%\d3d\d3dcompiler_47.dll" -target %BuildTarget% %AlphaBetaParam%
diff --git a/Telegram/build/setup.iss b/Telegram/build/setup.iss
index 8b0715581..5c5ee7635 100644
--- a/Telegram/build/setup.iss
+++ b/Telegram/build/setup.iss
@@ -34,6 +34,7 @@ CloseApplications=force
 DisableDirPage=no
 DisableProgramGroupPage=no
 WizardStyle=modern
+SignTool=sha256
 
 #if MyBuildTarget == "win64"
   ArchitecturesAllowed="x64 arm64"

From 2bbc7406da448659aa2ef7de69a8f95115af6350 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 19:06:51 +0400
Subject: [PATCH 596/596] Beta version 5.0.6.

- Fix chat preview with non-default themes.
- Fix chat preview crash when scrolling up.
- Jump to chat from preview only by Double-Click.
- Show chat preview with Force Touch on macOS.
---
 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                                | 7 +++++++
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index fe3b473ac..cc2453f6b 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.5.0" />
+    Version="5.0.6.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 1f0a7a045..0a0a61d84 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 5,0,5,0
- PRODUCTVERSION 5,0,5,0
+ FILEVERSION 5,0,6,0
+ PRODUCTVERSION 5,0,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.5.0"
+            VALUE "FileVersion", "5.0.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.5.0"
+            VALUE "ProductVersion", "5.0.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index c334ca569..1b7249bf0 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 5,0,5,0
- PRODUCTVERSION 5,0,5,0
+ FILEVERSION 5,0,6,0
+ PRODUCTVERSION 5,0,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.0.5.0"
+            VALUE "FileVersion", "5.0.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.5.0"
+            VALUE "ProductVersion", "5.0.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 8de17b03c..911f4794f 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 = 5000005;
-constexpr auto AppVersionStr = "5.0.5";
+constexpr auto AppVersion = 5000006;
+constexpr auto AppVersionStr = "5.0.6";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 5d551a173..2a02b657b 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000005
+AppVersion         5000006
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.5
-AppVersionStr      5.0.5
+AppVersionStrSmall 5.0.6
+AppVersionStr      5.0.6
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 5.0.5.beta
+AppVersionOriginal 5.0.6.beta
diff --git a/changelog.txt b/changelog.txt
index ddfebe110..70728871a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+5.0.6 beta (30.05.24)
+
+- Fix chat preview with non-default themes.
+- Fix chat preview crash when scrolling up.
+- Jump to chat from preview only by Double-Click.
+- Show chat preview with Force Touch on macOS.
+
 5.0.5 beta (28.05.24)
 
 - Long press on chat userpic to show quick preview.