From b363d8bfb558971e4a427d3baf43d2a8f695c443 Mon Sep 17 00:00:00 2001
From: Grigory <techuila.sunset@gmail.com>
Date: Sat, 19 Oct 2024 20:39:44 +0500
Subject: [PATCH 001/306] fix(ui/webview_helpers): append 0 if color channel
 value is 1 char long

---
 Telegram/SourceFiles/ui/webview_helpers.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/ui/webview_helpers.cpp b/Telegram/SourceFiles/ui/webview_helpers.cpp
index a0369421b..01cd56cb4 100644
--- a/Telegram/SourceFiles/ui/webview_helpers.cpp
+++ b/Telegram/SourceFiles/ui/webview_helpers.cpp
@@ -15,9 +15,9 @@ namespace {
 [[nodiscard]] QByteArray Serialize(const QColor &qt) {
 	if (qt.alpha() == 255) {
 		return '#'
-			+ QByteArray::number(qt.red(), 16).right(2)
-			+ QByteArray::number(qt.green(), 16).right(2)
-			+ QByteArray::number(qt.blue(), 16).right(2);
+			+ QByteArray::number(qt.red(), 16).rightJustified(2, '0')
+			+ QByteArray::number(qt.green(), 16).rightJustified(2, '0')
+			+ QByteArray::number(qt.blue(), 16).rightJustified(2, '0');
 	}
 	return "rgba("
 		+ QByteArray::number(qt.red()) + ","

From d85b668d4fa83623930b6af8b49e7fabe5a89aa4 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 24 Oct 2024 00:51:11 +0400
Subject: [PATCH 002/306] Fix lambda execution for portal dark mode getter

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

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 8a7db94ed..e048a2d05 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -204,7 +204,7 @@ LinuxIntegration::LinuxIntegration()
 		return value->get_uint32() == 1;
 	}
 	return std::nullopt;
-})
+}())
 , _darkModeWatcher(
 	"org.freedesktop.appearance",
 	"color-scheme",

From e5886862c3cf04415fbcc9d61765f99e827d2284 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 16 Oct 2024 13:40:52 +0300
Subject: [PATCH 003/306] Changed behavior to copy phone number from profile
 sections as trimmed.

---
 .../info/profile/info_profile_actions.cpp         | 14 +++++++++++++-
 Telegram/SourceFiles/settings/settings_main.cpp   | 15 +++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 4fc4d060d..7dd61c6da 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1150,7 +1150,19 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 				PhoneOrHiddenValue(user),
 				tr::lng_profile_copy_phone(tr::now)).text;
 			const auto hook = [=](Ui::FlatLabel::ContextMenuRequest request) {
-				phoneLabel->fillContextMenu(request);
+				if (request.selection.empty()) {
+					const auto callback = [=] {
+						auto phone = rpl::variable<TextWithEntities>(
+							PhoneOrHiddenValue(user)).current().text;
+						phone.replace(' ', QString()).replace('-', QString());
+						TextUtilities::SetClipboardText({ phone });
+					};
+					request.menu->addAction(
+						tr::lng_profile_copy_phone(tr::now),
+						callback);
+				} else {
+					phoneLabel->fillContextMenu(request);
+				}
 				AddPhoneMenu(request.menu, user);
 			};
 			phoneLabel->setContextMenuHook(hook);
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 685f3ae57..47aafcdaa 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/new_badges.h"
@@ -144,6 +145,20 @@ Cover::Cover(
 
 	_phone->setSelectable(true);
 	_phone->setContextCopyText(tr::lng_profile_copy_phone(tr::now));
+	const auto hook = [=](Ui::FlatLabel::ContextMenuRequest request) {
+		if (request.selection.empty()) {
+			const auto c = [=] {
+				auto phone = rpl::variable<TextWithEntities>(
+					Info::Profile::PhoneValue(_user)).current().text;
+				phone.replace(' ', QString()).replace('-', QString());
+				TextUtilities::SetClipboardText({ phone });
+			};
+			request.menu->addAction(tr::lng_profile_copy_phone(tr::now), c);
+		} else {
+			_phone->fillContextMenu(request);
+		}
+	};
+	_phone->setContextMenuHook(hook);
 
 	initViewers();
 	setupChildGeometry();

From b1e537e54eaf7ae777e504c4076462927a6ea434 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 16 Oct 2024 16:08:50 +0300
Subject: [PATCH 004/306] Added subscription icon to channel photo in
 ReceiptCreditsBox.

---
 Telegram/SourceFiles/api/api_chat_invite.cpp  | 46 ++++++++++++++-----
 .../boxes/peers/edit_peer_invite_link.cpp     |  5 +-
 .../settings/settings_credits_graphics.cpp    | 43 +++++++++++++++--
 .../settings/settings_credits_graphics.h      |  5 ++
 4 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_invite.cpp b/Telegram/SourceFiles/api/api_chat_invite.cpp
index be07e72ac..0a53c61dd 100644
--- a/Telegram/SourceFiles/api/api_chat_invite.cpp
+++ b/Telegram/SourceFiles/api/api_chat_invite.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_credits_graphics.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
 #include "ui/empty_userpic.h"
@@ -129,6 +130,7 @@ void ConfirmSubscriptionBox(
 	struct State final {
 		std::shared_ptr<Data::PhotoMedia> photoMedia;
 		std::unique_ptr<Ui::EmptyUserpic> photoEmpty;
+		QImage frame;
 
 		std::optional<MTP::Sender> api;
 		Ui::RpWidget* saveButton = nullptr;
@@ -146,25 +148,45 @@ void ConfirmSubscriptionBox(
 	const auto userpic = userpicWrap->entity();
 	const auto photoSize = st::confirmInvitePhotoSize;
 	userpic->resize(Size(photoSize));
+	const auto creditsIconSize = photoSize / 3;
+	const auto creditsIconCallback =
+		Ui::PaintOutlinedColoredCreditsIconCallback(
+			creditsIconSize,
+			1.5);
+	state->frame = QImage(
+		Size(photoSize * style::DevicePixelRatio()),
+		QImage::Format_ARGB32_Premultiplied);
+	state->frame.setDevicePixelRatio(style::DevicePixelRatio());
 	const auto options = Images::Option::RoundCircle;
 	userpic->paintRequest(
 	) | rpl::start_with_next([=, small = Data::PhotoSize::Small] {
-		auto p = QPainter(userpic);
-		if (state->photoMedia) {
-			if (const auto image = state->photoMedia->image(small)) {
-				p.drawPixmap(
+		state->frame.fill(Qt::transparent);
+		{
+			auto p = QPainter(&state->frame);
+			if (state->photoMedia) {
+				if (const auto image = state->photoMedia->image(small)) {
+					p.drawPixmap(
+						0,
+						0,
+						image->pix(Size(photoSize), { .options = options }));
+				}
+			} else if (state->photoEmpty) {
+				state->photoEmpty->paintCircle(
+					p,
 					0,
 					0,
-					image->pix(Size(photoSize), { .options = options }));
+					userpic->width(),
+					photoSize);
+			}
+			if (creditsIconCallback) {
+				p.translate(
+					photoSize - creditsIconSize,
+					photoSize - creditsIconSize);
+				creditsIconCallback(p);
 			}
-		} else if (state->photoEmpty) {
-			state->photoEmpty->paintCircle(
-				p,
-				0,
-				0,
-				userpic->width(),
-				photoSize);
 		}
+		auto p = QPainter(userpic);
+		p.drawImage(0, 0, state->frame);
 	}, userpicWrap->lifetime());
 	userpicWrap->setAttribute(Qt::WA_TransparentForMouseEvents);
 	if (photo) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 8e1a11030..4dc7f897b 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -956,12 +956,11 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 
-		const auto &stUser = st::boostReplaceUserpic;
+		const auto photoSize = st::boostReplaceUserpic.photoSize;
 		const auto session = &row->peer()->session();
 		content->add(object_ptr<Ui::CenterWrap<>>(
 			content,
-			object_ptr<Ui::UserpicButton>(content, channel, stUser))
-		)->setAttribute(Qt::WA_TransparentForMouseEvents);
+			Settings::SubscriptionUserpic(content, channel, photoSize)));
 
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 1e92b697b..7e813cf10 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -52,6 +52,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
 #include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
@@ -772,9 +774,15 @@ void ReceiptCreditsBox(
 			GenericEntryPhoto(content, callback, stUser.photoSize)));
 		AddViewMediaHandler(thumb->entity(), controller, e);
 	} else if (peer && !e.gift) {
-		content->add(object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::UserpicButton>(content, peer, stUser)));
+		if (e.subscriptionUntil.isNull() && s.until.isNull()) {
+			content->add(object_ptr<Ui::CenterWrap<>>(
+				content,
+				object_ptr<Ui::UserpicButton>(content, peer, stUser)));
+		} else {
+			content->add(object_ptr<Ui::CenterWrap<>>(
+				content,
+				SubscriptionUserpic(content, peer, stUser.photoSize)));
+		}
 	} else if (e.gift || isPrize) {
 		struct State final {
 			DocumentData *sticker = nullptr;
@@ -1541,6 +1549,35 @@ object_ptr<Ui::RpWidget> PaidMediaThumbnail(
 		photoSize);
 }
 
+object_ptr<Ui::RpWidget> SubscriptionUserpic(
+		not_null<Ui::RpWidget*> parent,
+		not_null<PeerData*> peer,
+		int photoSize) {
+	auto widget = object_ptr<Ui::RpWidget>(parent);
+	const auto raw = widget.data();
+	widget->resize(photoSize, photoSize);
+	const auto userpicMedia = Ui::MakeUserpicThumbnail(peer, false);
+	userpicMedia->subscribeToUpdates([=] { raw->update(); });
+	const auto creditsIconSize = photoSize / 3;
+	const auto creditsIconCallback =
+		Ui::PaintOutlinedColoredCreditsIconCallback(
+			creditsIconSize,
+			1.5);
+	widget->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(raw);
+		p.fillRect(Rect(Size(photoSize)), Qt::transparent);
+		auto image = userpicMedia->image(photoSize);
+		{
+			auto q = QPainter(&image);
+			q.translate(photoSize, photoSize);
+			q.translate(-creditsIconSize, -creditsIconSize);
+			creditsIconCallback(q);
+		}
+		p.drawImage(0, 0, image);
+	}, widget->lifetime());
+	return widget;
+}
+
 void SmallBalanceBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<Main::SessionShow> show,
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index bfc266e3e..fb19e2bff 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -126,6 +126,11 @@ void ShowRefundInfoBox(
 	int totalCount,
 	int photoSize);
 
+[[nodiscard]] object_ptr<Ui::RpWidget> SubscriptionUserpic(
+	not_null<Ui::RpWidget*> parent,
+	not_null<PeerData*> peer,
+	int photoSize);
+
 struct SmallBalanceBot {
 	UserId botId = 0;
 };

From ed9dcef66f3024985c0cf5bc5a31b4a0309cf179 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Oct 2024 02:19:33 +0300
Subject: [PATCH 005/306] Fixed display of selection marks for messages with
 huge code blocks.

---
 .../history/view/history_view_message.cpp          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index c57dc2848..b24546abf 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1615,14 +1615,16 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 			const auto o = ScopedPainterOpacity(p, progress);
 			const auto &st = st::msgSelectionCheck;
 			const auto right = delegate()->elementIsChatWide()
-				? (st::msgMaxWidth
-					+ st::msgPhotoSkip
-					+ st::msgSelectionOffset
-					+ st::msgPadding.left()
-					+ st.size)
+				? std::min(
+					(_bubbleWidthLimit
+						+ st::msgPhotoSkip
+						+ st::msgSelectionOffset
+						+ st::msgPadding.left()
+						+ st.size),
+					width())
 				: width();
 			const auto pos = QPoint(
-				(right
+				(width()
 					- (st::msgSelectionOffset * progress - st.size) / 2
 					- st::msgPadding.right() / 2
 					- st.size),

From 975ae17ef9a50c469cfc40f2168979782fb6aeee Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Oct 2024 02:57:26 +0300
Subject: [PATCH 006/306] Moved selection marks to bottom of message bubbles.

---
 Telegram/SourceFiles/history/view/history_view_message.cpp | 2 +-
 Telegram/SourceFiles/ui/chat/chat.style                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index b24546abf..51be68d40 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1628,7 +1628,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 					- (st::msgSelectionOffset * progress - st.size) / 2
 					- st::msgPadding.right() / 2
 					- st.size),
-				g.y() + (g.height() - st.size) / 2);
+				rect::bottom(g) - st.size - st::msgSelectionBottomSkip);
 			{
 				p.setPen(QPen(st.border, st.width));
 				p.setBrush(context.st->msgServiceBg());
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index cb30fdf47..2f9af4f2b 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -27,6 +27,7 @@ msgMargin: margins(16px, 6px, 56px, 2px);
 msgMarginTopAttached: 0px;
 msgShadow: 2px;
 msgSelectionOffset: 30px;
+msgSelectionBottomSkip: 5px;
 
 historyReplyTop: 2px;
 historyReplyBottom: 2px;

From 9e76e6406403c21ca29cff2501a9ec7cd64c09dc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Oct 2024 03:13:44 +0300
Subject: [PATCH 007/306] Improved parts alignments of round video messages.

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

diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index f3de7fe3d..6a3aebfcb 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -801,7 +801,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 				p,
 				context,
 				fullRight,
-				fullBottom,
+				fullBottom - st::msgDateImgDelta,
 				2 * paintx + paintw,
 				(unwrapped
 					? InfoDisplayType::Background

From 1a1e777b873d7ba30c5e06d848af0050b003e152 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Oct 2024 04:10:24 +0300
Subject: [PATCH 008/306] Fixed display of generic media with small width.

---
 .../history/view/media/history_view_media_generic.cpp     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 18625b684..077a8ebd9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
@@ -110,7 +110,13 @@ QSize MediaGeneric::countOptimalSize() {
 }
 
 QSize MediaGeneric::countCurrentSize(int newWidth) {
-	return { maxWidth(), minHeight() };
+	if (newWidth > maxWidth()) {
+		newWidth = maxWidth();
+	}
+	for (auto &entry : _entries) {
+		entry.object->resizeGetHeight(newWidth);
+	}
+	return { newWidth, minHeight() };
 }
 
 void MediaGeneric::draw(Painter &p, const PaintContext &context) const {

From a8a1b08127f8f023ad2864cc6d527ca1ceccddbe Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Oct 2024 05:40:10 +0300
Subject: [PATCH 009/306] Added ministars to buttons in section of peer gifts.

---
 .../info/peer_gifts/info_peer_gifts_common.cpp   | 14 +++++++++++++-
 .../info/peer_gifts/info_peer_gifts_common.h     |  2 ++
 .../SourceFiles/ui/effects/premium_stars.cpp     | 16 +++++++++++-----
 Telegram/SourceFiles/ui/effects/premium_stars.h  |  1 +
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index dd12b6646..d35759154 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/dynamic_image.h"
 #include "ui/dynamic_thumbnails.h"
+#include "ui/effects/premium_graphics.h"
 #include "ui/painter.h"
 #include "window/window_session_controller.h"
 #include "styles/style_credits.h"
@@ -39,7 +40,9 @@ GiftButton::GiftButton(
 	QWidget *parent,
 	not_null<GiftButtonDelegate*> delegate)
 : AbstractButton(parent)
-, _delegate(delegate) {
+, _delegate(delegate)
+, _stars(this, true, Ui::Premium::MiniStars::Type::SlowStars) {
+	_stars.setColorOverride(Ui::Premium::CreditsIconGradientStops());
 }
 
 GiftButton::~GiftButton() {
@@ -159,6 +162,8 @@ void GiftButton::setGeometry(QRect inner, QMargins extend) {
 void GiftButton::resizeEvent(QResizeEvent *e) {
 	if (!_button.isEmpty()) {
 		_button.moveLeft((width() - _button.width()) / 2);
+		const auto padding = _button.height() / 2;
+		_stars.setCenter(_button - QMargins(padding, 0, padding, 0));
 	}
 }
 
@@ -307,6 +312,13 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 	if (!premium) {
 		p.setOpacity(1.);
 	}
+	{
+		auto clipPath = QPainterPath();
+		clipPath.addRoundedRect(geometry, radius, radius);
+		p.setClipPath(clipPath);
+		_stars.paint(p);
+		p.setClipping(false);
+	}
 
 	if (!_text.isEmpty()) {
 		p.setPen(st::windowFg);
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index 6fd2b7413..47f591e05 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/abstract_button.h"
+#include "ui/effects/premium_stars_colored.h"
 #include "ui/text/text.h"
 
 class StickerPremiumMark;
@@ -101,6 +102,7 @@ private:
 	Ui::Text::String _text;
 	Ui::Text::String _price;
 	std::shared_ptr<Ui::DynamicImage> _userpic;
+	Ui::Premium::ColoredMiniStars _stars;
 	bool _subscribed = false;
 
 	QRect _button;
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars.cpp b/Telegram/SourceFiles/ui/effects/premium_stars.cpp
index c63f700d7..23d8ad355 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_stars.cpp
@@ -21,19 +21,25 @@ MiniStars::MiniStars(
 	Fn<void(const QRect &r)> updateCallback,
 	bool opaque,
 	Type type)
-: _availableAngles({
+: _availableAngles((type != Type::SlowStars)
+? std::vector<Interval>{
 	Interval{ -10, 40 },
 	Interval{ 180 + 10 - 40, 40 },
 	Interval{ 180 + 15, 50 },
 	Interval{ -15 - 50, 50 },
-})
-, _lifeLength({ 150 / 5, 200 / 5 })
-, _deathTime({ 1500, 2000 })
+}
+: std::vector<Interval>{ Interval{ -90, 180 }, Interval{ 90, 180 } })
+, _lifeLength((type != Type::SlowStars)
+	? Interval{ 150 / 5, 200 / 5 }
+	: Interval{ 150 * 2, 200 * 2 })
+, _deathTime((type != Type::SlowStars)
+	? Interval{ 1500, 2000 }
+	: Interval{ 1500 * 2, 2000 * 2 })
 , _size({ 5, 10 })
 , _alpha({ opaque ? 100 : 40, opaque ? 100 : 60 })
 , _sinFactor({ 10, 190 })
 , _spritesCount({ 0, ((type == Type::MonoStars) ? 1 : 2) })
-, _appearProgressTill(0.2)
+, _appearProgressTill((type != Type::SlowStars) ? 0.2 : 0.01)
 , _disappearProgressAfter(0.8)
 , _distanceProgressStart(0.5)
 , _sprite(u":/gui/icons/settings/starmini.svg"_q)
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars.h b/Telegram/SourceFiles/ui/effects/premium_stars.h
index d224d8186..0adbd21fe 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars.h
+++ b/Telegram/SourceFiles/ui/effects/premium_stars.h
@@ -19,6 +19,7 @@ public:
 	enum class Type {
 		MonoStars,
 		BiStars,
+		SlowStars,
 	};
 
 	MiniStars(

From 7f20cf59d1963931ccb1c0fd1ad4574d906f4427 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Oct 2024 06:33:55 +0300
Subject: [PATCH 010/306] Added ministars to button in service messages for
 gifts.

---
 .../view/media/history_view_premium_gift.cpp  |  4 +++
 .../view/media/history_view_premium_gift.h    |  1 +
 .../view/media/history_view_service_box.cpp   | 34 +++++++++++++++++--
 .../view/media/history_view_service_box.h     |  8 +++++
 .../ui/effects/premium_stars_colored.cpp      |  6 ++++
 .../ui/effects/premium_stars_colored.h        |  1 +
 6 files changed, 52 insertions(+), 2 deletions(-)

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 e12ab3d3f..12e9f1ffc 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -151,6 +151,10 @@ rpl::producer<QString> PremiumGift::button() {
 		: tr::lng_prize_open();
 }
 
+bool PremiumGift::buttonMinistars() {
+	return true;
+}
+
 ClickHandlerPtr PremiumGift::createViewLink() {
 	if (starGift() && outgoingGift()) {
 		return nullptr;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
index 00883240d..db976370e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
@@ -29,6 +29,7 @@ public:
 	QString title() override;
 	TextWithEntities subtitle() override;
 	rpl::producer<QString> button() override;
+	bool buttonMinistars() override;
 	QString cornerTagText() override;
 	int buttonSkip() override;
 	void draw(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
index 0252e3281..cda0204c6 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
@@ -16,9 +16,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/animation_value.h"
+#include "ui/effects/premium_stars_colored.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/power_saving.h"
 #include "styles/style_chat.h"
 #include "styles/style_premium.h"
@@ -98,6 +100,12 @@ ServiceBox::ServiceBox(
 			}
 		}, _lifetime);
 	}
+	if (_content->buttonMinistars()) {
+		_button.stars = std::make_unique<Ui::Premium::ColoredMiniStars>(
+			[=](const QRect &) { repaint(); },
+			Ui::Premium::MiniStars::Type::SlowStars);
+		_button.lastFg = std::make_unique<QColor>();
+	}
 }
 
 ServiceBox::~ServiceBox() = default;
@@ -117,7 +125,21 @@ void ServiceBox::draw(Painter &p, const PaintContext &context) const {
 	const auto radius = st::msgServiceGiftBoxRadius;
 	p.setPen(Qt::NoPen);
 	p.setBrush(context.st->msgServiceBg());
-	p.drawRoundedRect(QRect(QPoint(), _innerSize), radius, radius);
+	p.drawRoundedRect(Rect(_innerSize), radius, radius);
+
+	if (_button.stars) {
+		const auto &c = context.st->msgServiceFg()->c;
+		if ((*_button.lastFg) != c) {
+			_button.lastFg->setRgb(c.red(), c.green(), c.blue());
+			const auto padding = _button.size.height() / 2;
+			_button.stars->setColorOverride(QGradientStops{
+				{ 0., anim::with_alpha(c, .3) },
+				{ 1., c },
+			});
+			_button.stars->setCenter(
+				Rect(_button.size) - QMargins(padding, 0, padding, 0));
+		}
+	}
 
 	const auto content = contentRect();
 	auto top = content.top() + content.height();
@@ -340,7 +362,15 @@ bool ServiceBox::Button::empty() const {
 
 void ServiceBox::Button::drawBg(QPainter &p) const {
 	const auto radius = size.height() / 2.;
-	p.drawRoundedRect(0, 0, size.width(), size.height(), radius, radius);
+	const auto r = Rect(size);
+	p.drawRoundedRect(r, radius, radius);
+	if (stars) {
+		auto clipPath = QPainterPath();
+		clipPath.addRoundedRect(r, radius, radius);
+		p.setClipPath(clipPath);
+		stars->paint(p);
+		p.setClipping(false);
+	}
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.h b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
index 2a52e7336..733176c7d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
@@ -11,6 +11,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 class RippleAnimation;
+namespace Premium {
+class ColoredMiniStars;
+} // namespace Premium
 } // namespace Ui
 
 namespace HistoryView {
@@ -28,6 +31,9 @@ public:
 		return top();
 	}
 	[[nodiscard]] virtual rpl::producer<QString> button() = 0;
+	[[nodiscard]] virtual bool buttonMinistars() {
+		return false;
+	}
 	[[nodiscard]] virtual QString cornerTagText() {
 		return {};
 	}
@@ -106,6 +112,8 @@ private:
 
 		ClickHandlerPtr link;
 		std::unique_ptr<Ui::RippleAnimation> ripple;
+		std::unique_ptr<Ui::Premium::ColoredMiniStars> stars;
+		std::unique_ptr<QColor> lastFg;
 
 		mutable QPoint lastPoint;
 	} _button;
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
index 5e20cfd22..c90dc97ab 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
@@ -27,6 +27,12 @@ ColoredMiniStars::ColoredMiniStars(
 	type) {
 }
 
+ColoredMiniStars::ColoredMiniStars(
+	Fn<void(const QRect &)> update,
+	MiniStars::Type type)
+: _ministars(update, true, type) {
+}
+
 void ColoredMiniStars::setSize(const QSize &size) {
 	_frame = QImage(
 		size * style::DevicePixelRatio(),
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
index d0ae77b00..2b56d93aa 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
+++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
@@ -21,6 +21,7 @@ public:
 		not_null<Ui::RpWidget*> parent,
 		bool optimizeUpdate,
 		MiniStars::Type type = MiniStars::Type::MonoStars);
+	ColoredMiniStars(Fn<void(const QRect &)> update, MiniStars::Type type);
 
 	void setSize(const QSize &size);
 	void setPosition(QPoint position);

From a32ff465797d8b3e39e9011eb135a4240d2ca979 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Oct 2024 07:27:49 +0300
Subject: [PATCH 011/306] Added special hotkeys to change IV zoom more
 gradually.

---
 Telegram/Resources/langs/lang.strings     |  2 +
 Telegram/SourceFiles/iv/iv_controller.cpp | 53 ++++++++++++++++++++---
 Telegram/lib_ui                           |  2 +-
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 60c7a6413..600f37e1d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5562,6 +5562,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_iv_window_title" = "Instant View";
 "lng_iv_wrong_layout" = "Wrong layout?";
 "lng_iv_not_supported" = "This link appears to be invalid.";
+"lng_iv_zoom_tooltip_ctrl" = "Hold Ctrl to zoom by 5%.\nHold Alt to zoom by 1%.";
+"lng_iv_zoom_tooltip_cmd" = "Hold Cmd to zoom by 5%.\nHold Alt to zoom by 1%.";
 
 "lng_limit_download_title" = "Download speed limited";
 "lng_limit_download_subscribe" = "Subscribe to {link} to increase download speed {increase}.";
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 486778ef7..c17fd8368 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "iv/iv_controller.h"
 
 #include "base/platform/base_platform_info.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "base/invoke_queued.h"
 #include "base/qt_signal_producer.h"
 #include "base/qthelp_url.h"
@@ -21,9 +22,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/menu/menu_action.h"
 #include "ui/widgets/rp_window.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/tooltip.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/webview_helpers.h"
 #include "ui/ui_utility.h"
 #include "webview/webview_data_stream_memory.h"
@@ -52,9 +55,13 @@ namespace Iv {
 namespace {
 
 constexpr auto kZoomStep = int(10);
+constexpr auto kZoomSmallStep = int(5);
+constexpr auto kZoomTinyStep = int(1);
 constexpr auto kDefaultZoom = int(100);
 
-class ItemZoom final : public Ui::Menu::Action {
+class ItemZoom final
+	: public Ui::Menu::Action
+	, public Ui::AbstractTooltipShower {
 public:
 	ItemZoom(
 		not_null<RpWidget*> parent,
@@ -109,10 +116,21 @@ public:
 
 		};
 
+		const auto processTooltip = [=, this](not_null<Ui::RpWidget*> w) {
+			w->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+				if (e->type() == QEvent::Enter) {
+					Ui::Tooltip::Show(1000, this);
+				} else if (e->type() == QEvent::Leave) {
+					Ui::Tooltip::Hide();
+				}
+			}, w->lifetime());
+		};
+
 		const auto reset = Ui::CreateChild<Ui::RoundButton>(
 			this,
 			rpl::single<QString>(QString()),
 			st::ivResetZoom);
+		processTooltip(reset);
 		const auto resetLabel = Ui::CreateChild<Ui::FlatLabel>(
 			reset,
 			tr::lng_background_reset_default(),
@@ -128,8 +146,16 @@ public:
 			'+',
 			0,
 			_st.itemFg);
-		plus->setClickedCallback([this] {
-			_delegate->ivSetZoom(_delegate->ivZoom() + kZoomStep);
+		processTooltip(plus);
+		const auto step = [] {
+			return base::IsAltPressed()
+				? kZoomTinyStep
+				: base::IsCtrlPressed()
+				? kZoomSmallStep
+				: kZoomStep;
+		};
+		plus->setClickedCallback([this, step] {
+			_delegate->ivSetZoom(_delegate->ivZoom() + step());
 		});
 		plus->show();
 		const auto minus = Ui::CreateChild<SmallButton>(
@@ -137,8 +163,9 @@ public:
 			QChar(0x2013),
 			-1,
 			_st.itemFg);
-		minus->setClickedCallback([this] {
-			_delegate->ivSetZoom(_delegate->ivZoom() - kZoomStep);
+		processTooltip(minus);
+		minus->setClickedCallback([this, step] {
+			_delegate->ivSetZoom(_delegate->ivZoom() - step());
 		});
 		minus->show();
 
@@ -182,6 +209,22 @@ public:
 		});
 	}
 
+	QString tooltipText() const override {
+#ifdef Q_OS_MAC
+		return tr::lng_iv_zoom_tooltip_cmd(tr::now);
+#else
+		return tr::lng_iv_zoom_tooltip_ctrl(tr::now);
+#endif
+	}
+
+	QPoint tooltipPos() const override {
+		return QCursor::pos();
+	}
+
+	bool tooltipWindowActive() const override {
+		return true;
+	}
+
 private:
 	const not_null<Delegate*> _delegate;
 	const style::Menu &_st;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 887f54143..9ac125c50 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 887f5414302a1e8fd84cd880ef8454aa21b681da
+Subproject commit 9ac125c505ef105c62c50dd102d19f20f09210c1

From 7092fe2242fb1661abb3f947ec69695b92ea8c24 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 20 Oct 2024 03:38:47 +0300
Subject: [PATCH 012/306] Added default ripple animation style with
 windowBgOver color.

---
 Telegram/SourceFiles/boxes/boxes.style        | 24 ++++------------
 Telegram/SourceFiles/calls/calls.style        |  8 ++----
 .../chat_helpers/chat_helpers.style           | 28 +++++--------------
 Telegram/SourceFiles/dialogs/dialogs.style    |  4 +--
 Telegram/SourceFiles/info/info.style          | 16 +++--------
 Telegram/SourceFiles/intro/intro.style        |  4 +--
 Telegram/SourceFiles/iv/iv.style              |  8 ++----
 Telegram/SourceFiles/passport/passport.style  |  4 +--
 Telegram/SourceFiles/ui/chat/chat.style       |  8 ++----
 Telegram/SourceFiles/window/window.style      |  4 +--
 Telegram/lib_ui                               |  2 +-
 11 files changed, 28 insertions(+), 82 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 22e7da4a6..845098628 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -154,9 +154,7 @@ contactsSortButton: IconButton(defaultIconButton) {
 	iconPosition: point(10px, -1px);
 	rippleAreaPosition: point(1px, 6px);
 	rippleAreaSize: 42px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 contactsSortOnlineIcon: icon{{ "contacts_online", boxTitleCloseFg }};
 contactsSortOnlineIconOver: icon{{ "contacts_online", boxTitleCloseFgOver }};
@@ -416,9 +414,7 @@ calendarPrevious: IconButton {
 
 	rippleAreaPosition: point(2px, 2px);
 	rippleAreaSize: 44px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 calendarPreviousDisabled: icon {{ "calendar_down-flip_vertical", menuIconFg }};
 calendarNext: IconButton(calendarPrevious) {
@@ -616,9 +612,7 @@ proxyTryIPv6Padding: margins(22px, 8px, 22px, 5px);
 proxyRowPadding: margins(22px, 8px, 8px, 8px);
 proxyRowIconSkip: 32px;
 proxyRowSkip: 2px;
-proxyRowRipple: RippleAnimation(defaultRippleAnimation) {
-	color: windowBgOver;
-}
+proxyRowRipple: defaultRippleAnimationBgOver;
 proxyRowTitleFg: windowFg;
 proxyRowTitlePalette: TextPalette(defaultTextPalette) {
 	linkFg: windowSubTextFg;
@@ -683,9 +677,7 @@ themesMenuToggle: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(4px, 4px);
 	rippleAreaSize: 36px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 themesMenuPosition: point(-2px, 25px);
 
@@ -738,9 +730,7 @@ createPollOptionRemove: CrossButton {
 
 	duration: 150;
 	loadingPeriod: 1000;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 createPollOptionRemovePosition: point(11px, 9px);
 createPollOptionEmojiPositionSkip: 4px;
@@ -951,9 +941,7 @@ sponsoredUrlButton: RoundButton(defaultActiveButton) {
 	textTop: 7px;
 	style: defaultTextStyle;
 
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 requestPeerRestriction: FlatLabel(defaultFlatLabel) {
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 76b2e41dc..7e22913e3 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -409,9 +409,7 @@ callRatingStar: IconButton {
 	icon: icon {{ "calls/call_rating", windowSubTextFg }};
 	iconPosition: point(-1px, -1px);
 
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: 36px;
 }
@@ -1410,9 +1408,7 @@ groupCallRtmpShowButton: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: 32px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 groupCallSettingsRtmpShowButton: IconButton(groupCallRtmpShowButton) {
 	ripple: groupCallRipple;
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index d965b7f8a..0c680dd1e 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -331,9 +331,7 @@ stickersRemove: IconButton(defaultIconButton) {
 
 	rippleAreaSize: 40px;
 	rippleAreaPosition: point(0px, 0px);
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 stickersUndoRemove: RoundButton(defaultLightButton) {
 	width: -16px;
@@ -494,9 +492,7 @@ hashtagClose: IconButton {
 
 	rippleAreaPosition: point(5px, 5px);
 	rippleAreaSize: 20px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 stickerPanWidthMin: 64px;
@@ -898,9 +894,7 @@ historyBusinessBotSettings: IconButton(defaultIconButton) {
 	iconPosition: point(-1px, -1px);
 	rippleAreaSize: 40px;
 	rippleAreaPosition: point(4px, 9px);
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 	height: 58px;
 	width: 48px;
 }
@@ -927,9 +921,7 @@ historyReplyCancel: IconButton {
 
 	rippleAreaPosition: point(4px, 4px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 historyPinnedShowAll: IconButton(historyReplyCancel) {
 	icon: icon {{ "pinned_show_all", historyReplyCancelFg }};
@@ -1058,9 +1050,7 @@ historyAttach: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(2px, 3px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 historyMessagesTTL: IconButtonWithText {
@@ -1287,9 +1277,7 @@ defaultComposeFilesMenu: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(1px, 6px);
 	rippleAreaSize: 42px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 defaultComposeFilesField: InputField(defaultInputField) {
 	textMargins: margins(1px, 26px, 31px, 4px);
@@ -1349,9 +1337,7 @@ moreChatsBarClose: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(0px, 4px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 reportReasonTopSkip: 8px;
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 6451e79b4..d039869b7 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -222,9 +222,7 @@ dialogsMenuToggle: IconButton {
 
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 dialogsMenuToggleUnread: icon {
 	{ "dialogs/dialogs_menu_unread", dialogsMenuIconFg },
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 0c66b41a7..84dca5dec 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -129,9 +129,7 @@ infoTopBarBack: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(6px, 6px);
 	rippleAreaSize: 42px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 infoTopBarTitle: FlatLabel(defaultFlatLabel) {
 	textFg: windowBoldFg;
@@ -623,9 +621,7 @@ infoMembersCancelSearch: CrossButton {
 
 	duration: 150;
 	loadingPeriod: 1000;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 infoMembersSearchTop: 15px;
 
@@ -841,9 +837,7 @@ topBarSearch: IconButton {
 
 	rippleAreaPosition: point(0px, 7px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 topBarCloseChoose: IconButton(topBarSearch) {
 	width: 56px;
@@ -1146,9 +1140,7 @@ infoHoursDayLabel: infoHoursState;
 infoHoursOuter: RoundButton(defaultActiveButton) {
 	textBg: transparent;
 	textBgOver: transparent;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 infoHoursOuterMargin: margins(8px, 4px, 8px, 4px);
 infoHoursDaySkip: 6px;
diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style
index a6b8a7a4c..ddf09c24b 100644
--- a/Telegram/SourceFiles/intro/intro.style
+++ b/Telegram/SourceFiles/intro/intro.style
@@ -165,9 +165,7 @@ introBackButton: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(8px, 8px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 introQrTop: -18px;
diff --git a/Telegram/SourceFiles/iv/iv.style b/Telegram/SourceFiles/iv/iv.style
index cea363566..a3129f5d2 100644
--- a/Telegram/SourceFiles/iv/iv.style
+++ b/Telegram/SourceFiles/iv/iv.style
@@ -17,9 +17,7 @@ ivMenuToggle: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(6px, 6px);
 	rippleAreaSize: 36px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 ivMenuPosition: point(-2px, 40px);
 ivBackIcon: icon {{ "box_button_back", menuIconColor }};
@@ -36,9 +34,7 @@ ivPlusMinusZoom: IconButton(ivMenuToggle) {
 
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: ivZoomButtonsSize;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 ivResetZoomStyle: TextStyle(defaultTextStyle) {
 	font: font(12px);
diff --git a/Telegram/SourceFiles/passport/passport.style b/Telegram/SourceFiles/passport/passport.style
index f3a498575..df494e425 100644
--- a/Telegram/SourceFiles/passport/passport.style
+++ b/Telegram/SourceFiles/passport/passport.style
@@ -108,9 +108,7 @@ passportContactErrorMargin: margins(0px, 0px, 0px, 14px);
 passportRowPadding: margins(22px, 8px, 25px, 8px);
 passportRowIconSkip: 10px;
 passportRowSkip: 2px;
-passportRowRipple: RippleAnimation(defaultRippleAnimation) {
-	color: windowBgOver;
-}
+passportRowRipple: defaultRippleAnimationBgOver;
 passportRowReadyIcon: icon {{ "passport_ready", windowActiveTextFg }};
 passportRowEmptyIcon: icon {{ "passport_empty", menuIconFgOver }};
 passportRowTitleFg: windowFg;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 2f9af4f2b..7633eed08 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -551,9 +551,7 @@ historyAdminLogCancelSearch: CrossButton {
 
 	duration: 150;
 	loadingPeriod: 1000;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 historyAdminLogSearchTop: 11px;
 historyAdminLogSearchSlideDuration: 150;
@@ -977,9 +975,7 @@ backgroundSwitchToDark: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(4px, 4px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 backgroundSwitchToLight: IconButton(backgroundSwitchToDark) {
 	icon: icon {{ "menu/header_mode_day", boxTitleCloseFg }};
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 37654c990..32e233a0d 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -43,9 +43,7 @@ notifyClose: IconButton {
 
 	rippleAreaPosition: point(5px, 5px);
 	rippleAreaSize: 20px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 notifyItemTop: 12px;
 notifyTextLeft: 12px;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 9ac125c50..0198796f9 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 9ac125c505ef105c62c50dd102d19f20f09210c1
+Subproject commit 0198796f9011aeb8b1449e42a3cae02222df12fc

From e6af33367e35211c2a85670a5238e0024ebbca5f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Oct 2024 12:03:01 +0400
Subject: [PATCH 013/306] Accept bot username in chatbot setup.

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

diff --git a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
index 3c75cf9ba..cd439e139 100644
--- a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
@@ -226,6 +226,9 @@ Main::Session &PreviewController::session() const {
 
 [[nodiscard]] QString ExtractUsername(QString text) {
 	text = text.trimmed();
+	if (text.startsWith(QChar('@'))) {
+		return text.mid(1);
+	}
 	static const auto expression = QRegularExpression(
 		"^(https://)?([a-zA-Z0-9\\.]+/)?([a-zA-Z0-9_\\.]+)");
 	const auto match = expression.match(text);

From 285c96fd2e0fef5af575660a68891ca150714b8d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Oct 2024 12:58:05 +0400
Subject: [PATCH 014/306] Add "Respect the Focus settings" on Windows.

---
 Telegram/Resources/langs/lang.strings         |  3 ++-
 Telegram/SourceFiles/core/core_settings.cpp   | 19 +++++++++++++++--
 Telegram/SourceFiles/core/core_settings.h     |  4 ++++
 .../win/notifications_manager_win.cpp         |  4 +++-
 .../settings/settings_notifications.cpp       | 21 +++++++++++++++++++
 5 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 600f37e1d..66a51005b 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -499,8 +499,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_notify_global" = "Global settings";
 "lng_settings_notify_title" = "Notifications for chats";
 "lng_settings_desktop_notify" = "Desktop notifications";
-"lng_settings_native_title" = "Native notifications";
+"lng_settings_native_title" = "System integration";
 "lng_settings_use_windows" = "Use Windows notifications";
+"lng_settings_skip_in_focus" = "Respect system Focus mode";
 "lng_settings_use_native_notifications" = "Use native notifications";
 "lng_settings_notifications_position" = "Location on the screen";
 "lng_settings_notifications_count" = "Notifications count";
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 71d9ae0e8..af6819f8f 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -222,7 +222,7 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_customFontFamily)
 		+ sizeof(qint32) * 3
 		+ Serialize::bytearraySize(_tonsiteStorageToken)
-		+ sizeof(qint32) * 2;
+		+ sizeof(qint32) * 3;
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -378,7 +378,8 @@ QByteArray Settings::serialize() const {
 			<< qint32(!_weatherInCelsius ? 0 : *_weatherInCelsius ? 1 : 2)
 			<< _tonsiteStorageToken
 			<< qint32(_includeMutedCounterFolders ? 1 : 0)
-			<< qint32(_ivZoom.current());
+			<< qint32(_ivZoom.current())
+			<< qint32(_skipToastsInFocus ? 1 : 0);
 	}
 
 	Ensures(result.size() == size);
@@ -503,6 +504,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 weatherInCelsius = !_weatherInCelsius ? 0 : *_weatherInCelsius ? 1 : 2;
 	QByteArray tonsiteStorageToken = _tonsiteStorageToken;
 	qint32 ivZoom = _ivZoom.current();
+	qint32 skipToastsInFocus = _skipToastsInFocus ? 1 : 0;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -815,6 +817,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> ivZoom;
 	}
+	if (!stream.atEnd()) {
+		stream >> skipToastsInFocus;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -1027,6 +1032,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		: (weatherInCelsius == 1);
 	_tonsiteStorageToken = tonsiteStorageToken;
 	_ivZoom = ivZoom;
+	_skipToastsInFocus = (skipToastsInFocus == 1);
 }
 
 QString Settings::getSoundPath(const QString &key) const {
@@ -1353,6 +1359,7 @@ void Settings::resetOnLastLogout() {
 	_flashBounceNotify = true;
 	_notifyView = NotifyView::ShowPreview;
 	//_nativeNotifications = std::nullopt;
+	//_skipToastsInFocus = false;
 	//_notificationsCount = 3;
 	//_notificationsCorner = ScreenCorner::BottomRight;
 	_includeMutedCounter = true;
@@ -1472,6 +1479,14 @@ void Settings::setNativeNotifications(bool value) {
 		: std::make_optional(value);
 }
 
+bool Settings::skipToastsInFocus() const {
+	return _skipToastsInFocus;
+}
+
+void Settings::setSkipToastsInFocus(bool value) {
+	_skipToastsInFocus = value;
+}
+
 void Settings::setTranslateButtonEnabled(bool value) {
 	_translateButtonEnabled = value;
 }
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 54199d8e5..821f9ec21 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -220,6 +220,9 @@ public:
 	[[nodiscard]] bool nativeNotifications() const;
 	void setNativeNotifications(bool value);
 
+	[[nodiscard]] bool skipToastsInFocus() const;
+	void setSkipToastsInFocus(bool value);
+
 	[[nodiscard]] int notificationsCount() const {
 		return _notificationsCount;
 	}
@@ -958,6 +961,7 @@ private:
 	bool _flashBounceNotify = true;
 	NotifyView _notifyView = NotifyView::ShowPreview;
 	std::optional<bool> _nativeNotifications;
+	bool _skipToastsInFocus = false;
 	int _notificationsCount = 3;
 	ScreenCorner _notificationsCorner = ScreenCorner::BottomRight;
 	bool _includeMutedCounter = true;
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
index 99cd1b907..618e81823 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
@@ -367,6 +367,7 @@ bool SkipSoundForCustom() {
 
 	return (UserNotificationState == QUNS_NOT_PRESENT)
 		|| (UserNotificationState == QUNS_PRESENTATION_MODE)
+		|| (FocusAssistBlocks && Core::App().settings().skipToastsInFocus())
 		|| Core::App().screenIsLocked();
 }
 
@@ -387,7 +388,8 @@ bool SkipToastForCustom() {
 	QuerySystemNotificationSettings();
 
 	return (UserNotificationState == QUNS_PRESENTATION_MODE)
-		|| (UserNotificationState == QUNS_RUNNING_D3D_FULL_SCREEN);
+		|| (UserNotificationState == QUNS_RUNNING_D3D_FULL_SCREEN)
+		|| (FocusAssistBlocks && Core::App().settings().skipToastsInFocus());
 }
 
 void MaybeFlashBounceForCustom(Fn<void()> flashBounce) {
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index cf3c759af..00a8bdb9e 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -864,6 +864,27 @@ NotifyViewCheckboxes SetupNotifyViewOptions(
 void SetupAdvancedNotifications(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container) {
+	if (Platform::IsWindows()) {
+		const auto skipInFocus = container->add(object_ptr<Button>(
+			container,
+			tr::lng_settings_skip_in_focus(),
+			st::settingsButtonNoIcon
+		))->toggleOn(rpl::single(Core::App().settings().skipToastsInFocus()));
+
+		skipInFocus->toggledChanges(
+		) | rpl::filter([](bool checked) {
+			return (checked != Core::App().settings().skipToastsInFocus());
+		}) | rpl::start_with_next([=](bool checked) {
+			Core::App().settings().setSkipToastsInFocus(checked);
+			Core::App().saveSettingsDelayed();
+			if (checked && Platform::Notifications::SkipToastForCustom()) {
+				using Change = Window::Notifications::ChangeType;
+				Core::App().notifications().notifySettingsChanged(
+					Change::DesktopEnabled);
+			}
+		}, skipInFocus->lifetime());
+	}
+
 	Ui::AddSkip(container, st::settingsCheckboxesSkip);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container, st::settingsCheckboxesSkip);

From 4dc7fd8cd1224f7ba02788bacdce4a653e3de36e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Oct 2024 12:32:01 +0400
Subject: [PATCH 015/306] Add AAC/H264 encoders, MP4 muxer.

---
 Telegram/build/docker/centos_env/Dockerfile | 4 ++++
 Telegram/build/prepare/prepare.py           | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 89ca76a96..7c0edd864 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -493,6 +493,7 @@ RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \
 		--disable-autodetect \
 		--disable-everything \
 		--enable-libdav1d \
+		--enable-libopenh264 \
 		--enable-libopus \
 		--enable-libvpx \
 		--enable-vaapi \
@@ -587,6 +588,8 @@ RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \
 		--enable-decoder=wmav1 \
 		--enable-decoder=wmav2 \
 		--enable-decoder=wmavoice \
+		--enable-encoder=aac \
+		--enable-encoder=libopenh264 \
 		--enable-encoder=libopus \
 		--enable-filter=atempo \
 		--enable-parser=aac \
@@ -610,6 +613,7 @@ RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \
 		--enable-demuxer=mp3 \
 		--enable-demuxer=ogg \
 		--enable-demuxer=wav \
+		--enable-muxer=mp4 \
 		--enable-muxer=ogg \
 		--enable-muxer=opus \
 	&& make -j$(nproc) \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index c5932cb8a..d9067f99f 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1217,13 +1217,14 @@ depends:yasm/yasm
         --arch="$arch" \
         --extra-cflags="$MIN_VER -arch $arch $UNGUARDED -DCONFIG_SAFE_BITSTREAM_READER=1 -I$USED_PREFIX/include" \
         --extra-cxxflags="$MIN_VER -arch $arch $UNGUARDED -DCONFIG_SAFE_BITSTREAM_READER=1 -I$USED_PREFIX/include" \
-        --extra-ldflags="$MIN_VER -arch $arch $USED_PREFIX/lib/libopus.a" \
+        --extra-ldflags="$MIN_VER -arch $arch $USED_PREFIX/lib/libopus.a -lc++" \
         --disable-programs \
         --disable-doc \
         --disable-network \
         --disable-everything \
         --enable-protocol=file \
         --enable-libdav1d \
+        --enable-libopenh264 \
         --enable-libopus \
         --enable-libvpx \
         --enable-hwaccel=h264_videotoolbox \
@@ -1301,7 +1302,9 @@ depends:yasm/yasm
         --enable-decoder=wmav1 \
         --enable-decoder=wmav2 \
         --enable-decoder=wmavoice \
+        --enable-encoder=aac \
         --enable-encoder=libopus \
+        --enable-encoder=libopenh264 \
         --enable-filter=atempo \
         --enable-parser=aac \
         --enable-parser=aac_latm \
@@ -1324,6 +1327,7 @@ depends:yasm/yasm
         --enable-demuxer=mp3 \
         --enable-demuxer=ogg \
         --enable-demuxer=wav \
+        --enable-muxer=mp4 \
         --enable-muxer=ogg \
         --enable-muxer=opus
     }

From 552343fa37fdec7c0be9adcdf05376d02a034465 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 4 Oct 2024 14:38:49 +0400
Subject: [PATCH 016/306] PoC video messages sending.

---
 Telegram/SourceFiles/apiwrap.cpp              |   2 +
 Telegram/SourceFiles/apiwrap.h                |   1 +
 .../ui/desktop_capture_choose_source.cpp      |   4 +-
 .../SourceFiles/ffmpeg/ffmpeg_utility.cpp     | 173 ++++-
 Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h  |  47 +-
 .../SourceFiles/history/history_widget.cpp    |   1 +
 .../view/controls/compose_controls_common.h   |   1 +
 .../history_view_voice_record_bar.cpp         |  88 ++-
 .../controls/history_view_voice_record_bar.h  |  11 +-
 .../view/history_view_replies_section.cpp     |   1 +
 .../view/history_view_scheduled_section.cpp   | 288 ++++----
 .../view/history_view_scheduled_section.h     |  13 +-
 .../media/audio/media_audio_capture.cpp       |  75 +-
 .../media/audio/media_audio_capture.h         |  11 +-
 .../media/stories/media_stories_reply.cpp     |   1 +
 .../business/settings_shortcut_messages.cpp   |   1 +
 .../SourceFiles/storage/localimageloader.cpp  |  47 +-
 .../SourceFiles/storage/localimageloader.h    |   2 +
 .../ui/controls/round_video_recorder.cpp      | 649 ++++++++++++++++++
 .../ui/controls/round_video_recorder.h        |  65 ++
 Telegram/cmake/td_ui.cmake                    |   4 +
 Telegram/lib_webrtc                           |   2 +-
 22 files changed, 1278 insertions(+), 209 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
 create mode 100644 Telegram/SourceFiles/ui/controls/round_video_recorder.h

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 5ef4af3d6..4f23323ab 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3502,6 +3502,7 @@ void ApiWrap::sendVoiceMessage(
 		QByteArray result,
 		VoiceWaveform waveform,
 		crl::time duration,
+		bool video,
 		const SendAction &action) {
 	const auto caption = TextWithTags();
 	const auto to = FileLoadTaskOptions(action);
@@ -3510,6 +3511,7 @@ void ApiWrap::sendVoiceMessage(
 		result,
 		duration,
 		waveform,
+		video,
 		to,
 		caption));
 }
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 7259c410d..18a505de9 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -317,6 +317,7 @@ public:
 		QByteArray result,
 		VoiceWaveform waveform,
 		crl::time duration,
+		bool video,
 		const SendAction &action);
 	void sendFiles(
 		Ui::PreparedList &&list,
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 4e77023f2..a122f09a2 100644
--- a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
@@ -73,8 +73,8 @@ private:
 
 	SourceButton _widget;
 	FlatLabel _label;
-	RoundRect _selectedRect;
-	RoundRect _activeRect;
+	Ui::RoundRect _selectedRect;
+	Ui::RoundRect _activeRect;
 	tgcalls::DesktopCaptureSource _source;
 	std::unique_ptr<Preview> _preview;
 	rpl::event_stream<> _activations;
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
index 0f7083df3..8fd0f3e97 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -284,10 +284,12 @@ FormatPointer MakeFormatPointer(
 		return {};
 	}
 	result->pb = io.get();
+	result->flags |= AVFMT_FLAG_CUSTOM_IO;
 
 	auto options = (AVDictionary*)nullptr;
 	const auto guard = gsl::finally([&] { av_dict_free(&options); });
 	av_dict_set(&options, "usetoc", "1", 0);
+
 	const auto error = AvErrorWrap(avformat_open_input(
 		&result,
 		nullptr,
@@ -307,6 +309,54 @@ FormatPointer MakeFormatPointer(
 	return FormatPointer(result);
 }
 
+FormatPointer MakeWriteFormatPointer(
+		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),
+		const QByteArray &format) {
+	const AVOutputFormat *found = nullptr;
+	void *i = nullptr;
+	while ((found = av_muxer_iterate(&i))) {
+		if (found->name == format) {
+			break;
+		}
+	}
+	if (!found) {
+		LogError(
+			"av_muxer_iterate",
+			u"Format %1 not found"_q.arg(QString::fromUtf8(format)));
+		return {};
+	}
+
+	auto io = MakeIOPointer(opaque, read, write, seek);
+	if (!io) {
+		return {};
+	}
+	io->seekable = (seek != nullptr);
+
+	auto result = (AVFormatContext*)nullptr;
+	auto error = AvErrorWrap(avformat_alloc_output_context2(
+		&result,
+		(AVOutputFormat*)found,
+		nullptr,
+		nullptr));
+	if (!result || error) {
+		LogError("avformat_alloc_output_context2", error);
+		return {};
+	}
+	result->pb = io.get();
+	result->flags |= AVFMT_FLAG_CUSTOM_IO;
+
+	// Now FormatPointer will own and free the IO context.
+	io.release();
+	return FormatPointer(result);
+}
+
 void FormatDeleter::operator()(AVFormatContext *value) {
 	if (value) {
 		const auto deleter = IOPointer(value->pb);
@@ -448,21 +498,134 @@ SwscalePointer MakeSwscalePointer(
 		existing);
 }
 
+void SwresampleDeleter::operator()(SwrContext *value) {
+	if (value) {
+		swr_free(&value);
+	}
+}
+
+SwresamplePointer MakeSwresamplePointer(
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+		AVChannelLayout *srcLayout,
+#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+		uint64_t srcLayout,
+#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+		AVSampleFormat srcFormat,
+		int srcRate,
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+		AVChannelLayout *dstLayout,
+#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+		uint64_t dstLayout,
+#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+		AVSampleFormat dstFormat,
+		int dstRate,
+		SwresamplePointer *existing) {
+	// We have to use custom caching for SwsContext, because
+	// sws_getCachedContext checks passed flags with existing context flags,
+	// and re-creates context if they're different, but in the process of
+	// context creation the passed flags are modified before being written
+	// to the resulting context, so the caching doesn't work.
+	if (existing && (*existing) != nullptr) {
+		const auto &deleter = existing->get_deleter();
+		if (true
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+			&& srcLayout->nb_channels == deleter.srcChannels
+			&& dstLayout->nb_channels == deleter.dstChannels
+#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+			&& (av_get_channel_layout_nb_channels(srcLayout)
+				== deleter.srcChannels)
+			&& (av_get_channel_layout_nb_channels(dstLayout)
+				== deleter.dstChannels)
+#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+			&& srcFormat == deleter.srcFormat
+			&& dstFormat == deleter.dstFormat
+			&& srcRate == deleter.srcRate
+			&& dstRate == deleter.dstRate) {
+			return std::move(*existing);
+		}
+	}
+
+	// Initialize audio resampler
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	auto result = (SwrContext*)nullptr;
+	auto error = AvErrorWrap(swr_alloc_set_opts2(
+		&result,
+		dstLayout,
+		dstFormat,
+		dstRate,
+		srcLayout,
+		srcFormat,
+		srcRate,
+		0,
+		nullptr));
+	if (error || !result) {
+		LogError(u"swr_alloc_set_opts2"_q, error);
+		return SwresamplePointer();
+	}
+#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	auto result = swr_alloc_set_opts(
+		existing ? existing.get() : nullptr,
+		dstLayout,
+		dstFormat,
+		dstRate,
+		srcLayout,
+		srcFormat,
+		srcRate,
+		0,
+		nullptr);
+	if (!result) {
+		LogError(u"swr_alloc_set_opts"_q);
+	}
+#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+
+	error = AvErrorWrap(swr_init(result));
+	if (error) {
+		LogError(u"swr_init"_q, error);
+		swr_free(&result);
+		return SwresamplePointer();
+	}
+
+	return SwresamplePointer(
+		result,
+		{
+			srcFormat,
+			srcRate,
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+			srcLayout->nb_channels,
+#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+			av_get_channel_layout_nb_channels(srcLayout),
+#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+			dstFormat,
+			dstRate,
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+			dstLayout->nb_channels,
+#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+			av_get_channel_layout_nb_channels(dstLayout),
+#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+		});
+}
+
 void SwscaleDeleter::operator()(SwsContext *value) {
 	if (value) {
 		sws_freeContext(value);
 	}
 }
 
-void LogError(const QString &method) {
-	LOG(("Streaming Error: Error in %1.").arg(method));
+void LogError(const QString &method, const QString &details) {
+	LOG(("Streaming Error: Error in %1%2."
+		).arg(method
+		).arg(details.isEmpty() ? QString() : " - " + details));
 }
 
-void LogError(const QString &method, AvErrorWrap error) {
-	LOG(("Streaming Error: Error in %1 (code: %2, text: %3)."
+void LogError(
+		const QString &method,
+		AvErrorWrap error,
+		const QString &details) {
+	LOG(("Streaming Error: Error in %1 (code: %2, text: %3)%4."
 		).arg(method
 		).arg(error.code()
-		).arg(error.text()));
+		).arg(error.text()
+		).arg(details.isEmpty() ? QString() : " - " + details));
 }
 
 crl::time PtsToTime(int64_t pts, AVRational timeBase) {
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
index d96daa9c7..6397cbb92 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
@@ -19,6 +19,8 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
+#include <libswresample/swresample.h>
+#include <libavutil/opt.h>
 #include <libavutil/version.h>
 } // extern "C"
 
@@ -138,6 +140,16 @@ using FormatPointer = std::unique_ptr<AVFormatContext, FormatDeleter>;
 	int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
 #endif
 	int64_t(*seek)(void *opaque, int64_t offset, int whence));
+[[nodiscard]] FormatPointer MakeWriteFormatPointer(
+	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),
+	const QByteArray &format);
 
 struct CodecDeleter {
 	void operator()(AVCodecContext *value);
@@ -179,8 +191,39 @@ using SwscalePointer = std::unique_ptr<SwsContext, SwscaleDeleter>;
 	QSize resize,
 	SwscalePointer *existing = nullptr);
 
-void LogError(const QString &method);
-void LogError(const QString &method, FFmpeg::AvErrorWrap error);
+struct SwresampleDeleter {
+	AVSampleFormat srcFormat = AV_SAMPLE_FMT_NONE;
+	int srcRate = 0;
+	int srcChannels = 0;
+	AVSampleFormat dstFormat = AV_SAMPLE_FMT_NONE;
+	int dstRate = 0;
+	int dstChannels = 0;
+
+	void operator()(SwrContext *value);
+};
+using SwresamplePointer = std::unique_ptr<SwrContext, SwresampleDeleter>;
+[[nodiscard]] SwresamplePointer MakeSwresamplePointer(
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	AVChannelLayout *srcLayout,
+#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	uint64_t srcLayout,
+#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	AVSampleFormat srcFormat,
+	int srcRate,
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	AVChannelLayout *dstLayout,
+#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	uint64_t dstLayout,
+#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	AVSampleFormat dstFormat,
+	int dstRate,
+	SwresamplePointer *existing = nullptr);
+
+void LogError(const QString &method, const QString &details = {});
+void LogError(
+	const QString &method,
+	FFmpeg::AvErrorWrap error,
+	const QString &details = {});
 
 [[nodiscard]] const AVCodec *FindDecoder(not_null<AVCodecContext*> context);
 [[nodiscard]] crl::time PtsToTime(int64_t pts, AVRational timeBase);
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 56c61b71b..7f71f6549 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1042,6 +1042,7 @@ void HistoryWidget::initVoiceRecordBar() {
 			data.bytes,
 			data.waveform,
 			data.duration,
+			data.video,
 			action);
 		_voiceRecordBar->clearListenState();
 	}, lifetime());
diff --git a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
index e51bae134..bebcc9c57 100644
--- a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
+++ b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
@@ -28,6 +28,7 @@ struct VoiceToSend {
 	VoiceWaveform waveform;
 	crl::time duration = 0;
 	Api::SendOptions options;
+	bool video = false;
 };
 struct SendActionUpdate {
 	Api::SendProgressType type = Api::SendProgressType();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 837cc0957..7ed5bf0db 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/random.h"
 #include "base/unixtime.h"
 #include "ui/boxes/confirm_box.h"
+#include "calls/calls_instance.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "core/application.h"
 #include "data/data_document.h"
@@ -27,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio_capture.h"
 #include "media/player/media_player_button.h"
 #include "media/player/media_player_instance.h"
+#include "ui/controls/round_video_recorder.h"
 #include "ui/controls/send_button.h"
 #include "ui/effects/animation_value.h"
 #include "ui/effects/animation_value_f.h"
@@ -37,11 +39,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/tooltip.h"
 #include "ui/rect.h"
 #include "ui/ui_utility.h"
+#include "webrtc/webrtc_video_track.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_media_player.h"
 
+#include <tgcalls/VideoCaptureInterface.h>
+
 namespace HistoryView::Controls {
 namespace {
 
@@ -1579,6 +1584,11 @@ void VoiceRecordBar::activeAnimate(bool active) {
 }
 
 void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
+	//if (_videoRecorder) {
+	//	_videoHiding.push_back(base::take(_videoRecorder));
+	//	_videoHiding.back()->hide();
+	//}
+	AssertIsDebug();
 	const auto to = show ? 1. : 0.;
 	const auto from = show ? 0. : 1.;
 	auto animationCallback = [=, callback = std::move(callback)](auto value) {
@@ -1646,12 +1656,17 @@ void VoiceRecordBar::startRecording() {
 	if (isRecording()) {
 		return;
 	}
+	_recordingVideo = true; AssertIsDebug();
 	auto appearanceCallback = [=] {
 		if (_showAnimation.animating()) {
 			return;
 		}
 
 		using namespace ::Media::Capture;
+		if (_recordingVideo && !createVideoRecorder()) {
+			stop(false);
+			return;
+		}
 		if (!instance()->available()) {
 			stop(false);
 			return;
@@ -1664,8 +1679,13 @@ void VoiceRecordBar::startRecording() {
 		if (_paused.current()) {
 			_paused = false;
 			instance()->pause(false, nullptr);
+			if (_videoRecorder) {
+				_videoRecorder->setPaused(false);
+			}
 		} else {
-			instance()->start();
+			instance()->start(_videoRecorder
+				? _videoRecorder->audioChunkProcessor()
+				: nullptr);
 		}
 		instance()->updated(
 		) | rpl::start_with_next_error([=](const Update &update) {
@@ -1769,10 +1789,17 @@ void VoiceRecordBar::hideFast() {
 void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 	using namespace ::Media::Capture;
 	if (type == StopType::Cancel) {
+		if (_videoRecorder) {
+			_videoRecorder->setPaused(true);
+			_videoRecorder->hide();
+		}
 		instance()->stop(crl::guard(this, [=](Result &&data) {
 			_cancelRequests.fire({});
 		}));
 	} else if (type == StopType::Listen) {
+		if (_videoRecorder) {
+			_videoRecorder->setPaused(true);
+		}
 		instance()->pause(true, crl::guard(this, [=](Result &&data) {
 			if (data.bytes.isEmpty()) {
 				// Close everything.
@@ -1795,6 +1822,29 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 			// _lockShowing = false;
 		}));
 	} else if (type == StopType::Send) {
+		if (_videoRecorder) {
+			const auto weak = Ui::MakeWeak(this);
+			_videoRecorder->hide([=](Ui::RoundVideoResult data) {
+				crl::on_main([=, data = std::move(data)]() mutable {
+					if (weak) {
+						window()->raise();
+						window()->activateWindow();
+						const auto options = Api::SendOptions{
+							.ttlSeconds = (ttlBeforeHide
+								? std::numeric_limits<int>::max()
+								: 0),
+						};
+						_sendVoiceRequests.fire({
+							data.content,
+							VoiceWaveform{},
+							data.duration,
+							options,
+							true,
+						});
+					}
+				});
+			});
+		}
 		instance()->stop(crl::guard(this, [=](Result &&data) {
 			if (data.bytes.isEmpty()) {
 				// Close everything.
@@ -2094,4 +2144,40 @@ void VoiceRecordBar::showDiscardBox(
 	_warningShown = true;
 }
 
+bool VoiceRecordBar::createVideoRecorder() {
+	if (_videoRecorder) {
+		return true;
+	}
+	const auto hidden = [=](not_null<Ui::RoundVideoRecorder*> which) {
+		if (_videoRecorder.get() == which) {
+			_videoRecorder = nullptr;
+		}
+		_videoHiding.erase(
+			ranges::remove(
+				_videoHiding,
+				which.get(),
+				&std::unique_ptr<Ui::RoundVideoRecorder>::get),
+			end(_videoHiding));
+	};
+	auto capturer = Core::App().calls().getVideoCapture();
+	auto track = std::make_shared<Webrtc::VideoTrack>(
+		Webrtc::VideoState::Active);
+	capturer->setOutput(track->sink());
+	capturer->setPreferredAspectRatio(1.);
+	_videoCapturerLifetime = track->stateValue(
+	) | rpl::start_with_next([=](Webrtc::VideoState state) {
+		capturer->setState((state == Webrtc::VideoState::Active)
+			? tgcalls::VideoState::Active
+			: tgcalls::VideoState::Inactive);
+	});
+	_videoRecorder = std::make_unique<Ui::RoundVideoRecorder>(
+		Ui::RoundVideoRecorderDescriptor{
+			.container = _outerContainer,
+			.hidden = hidden,
+			.capturer = std::move(capturer),
+			.track = std::move(track),
+		});
+	return true;
+}
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 332bf5b1f..92ac2e6f8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -24,6 +24,7 @@ struct RecordBar;
 namespace Ui {
 class AbstractButton;
 class SendButton;
+class RoundVideoRecorder;
 } // namespace Ui
 
 namespace Window {
@@ -124,13 +125,10 @@ private:
 
 	void recordUpdated(quint16 level, int samples);
 
-	[[nodiscard]] bool recordingAnimationCallback(crl::time now);
-
 	void stop(bool send);
 	void stopRecording(StopType type, bool ttlBeforeHide = false);
 	void visibilityAnimate(bool show, Fn<void()> &&callback);
 
-	[[nodiscard]] bool showRecordButton() const;
 	void drawDuration(QPainter &p);
 	void drawRedCircle(QPainter &p);
 	void drawMessage(QPainter &p, float64 recordActive);
@@ -153,6 +151,8 @@ private:
 	[[nodiscard]] bool peekTTLState() const;
 	[[nodiscard]] bool takeTTLState() const;
 
+	[[nodiscard]] bool createVideoRecorder();
+
 	const style::RecordBar &_st;
 	const not_null<Ui::RpWidget*> _outerContainer;
 	const std::shared_ptr<ChatHelpers::Show> _show;
@@ -195,6 +195,11 @@ private:
 	bool _recordingTipRequired = false;
 	bool _lockFromBottom = false;
 
+	std::unique_ptr<Ui::RoundVideoRecorder> _videoRecorder;
+	std::vector<std::unique_ptr<Ui::RoundVideoRecorder>> _videoHiding;
+	rpl::lifetime _videoCapturerLifetime;
+	bool _recordingVideo = false;
+
 	const style::font &_cancelFont;
 
 	rpl::lifetime _recordingLifetime;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 1ae6f36c5..107e4bf7f 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1224,6 +1224,7 @@ void RepliesWidget::sendVoice(ComposeControls::VoiceToSend &&data) {
 		data.bytes,
 		data.waveform,
 		data.duration,
+		data.video,
 		std::move(action));
 
 	_composeControls->cancelReplyMessage();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index cb5352f0b..31b31d01d 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -57,29 +57,29 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace HistoryView {
 
 ScheduledMemento::ScheduledMemento(not_null<History*> history)
-: _history(history)
-, _forumTopic(nullptr) {
+	: _history(history)
+	, _forumTopic(nullptr) {
 	const auto list = _history->session().scheduledMessages().list(_history);
 	if (!list.ids.empty()) {
-		_list.setScrollTopState({ .item = { .fullId = list.ids.front() } });
+		_list.setScrollTopState({ .item = {.fullId = list.ids.front() } });
 	}
 }
 
 ScheduledMemento::ScheduledMemento(not_null<Data::ForumTopic*> forumTopic)
-: _history(forumTopic->owningHistory())
-, _forumTopic(forumTopic) {
+	: _history(forumTopic->owningHistory())
+	, _forumTopic(forumTopic) {
 	const auto list = _history->session().scheduledMessages().list(
 		_forumTopic);
 	if (!list.ids.empty()) {
-		_list.setScrollTopState({ .item = { .fullId = list.ids.front() } });
+		_list.setScrollTopState({ .item = {.fullId = list.ids.front() } });
 	}
 }
 
 object_ptr<Window::SectionWidget> ScheduledMemento::createWidget(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		Window::Column column,
-		const QRect &geometry) {
+	QWidget *parent,
+	not_null<Window::SessionController*> controller,
+	Window::Column column,
+	const QRect &geometry) {
 	if (column == Window::Column::Third) {
 		return nullptr;
 	}
@@ -97,30 +97,30 @@ ScheduledWidget::ScheduledWidget(
 	not_null<Window::SessionController*> controller,
 	not_null<History*> history,
 	const Data::ForumTopic *forumTopic)
-: Window::SectionWidget(parent, controller, history->peer)
-, WindowListDelegate(controller)
-, _show(controller->uiShow())
-, _history(history)
-, _forumTopic(forumTopic)
-, _scroll(
-	this,
-	controller->chatStyle()->value(lifetime(), st::historyScroll),
-	false)
-, _topBar(this, controller)
-, _topBarShadow(this)
-, _composeControls(std::make_unique<ComposeControls>(
-	this,
-	ComposeControlsDescriptor{
-		.show = controller->uiShow(),
-		.unavailableEmojiPasted = [=](not_null<DocumentData*> emoji) {
-			listShowPremiumToast(emoji);
-		},
-		.mode = ComposeControls::Mode::Scheduled,
-		.sendMenuDetails = [] { return SendMenu::Details(); },
-		.regularWindow = controller,
-		.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
-	}))
-, _cornerButtons(
+	: Window::SectionWidget(parent, controller, history->peer)
+	, WindowListDelegate(controller)
+	, _show(controller->uiShow())
+	, _history(history)
+	, _forumTopic(forumTopic)
+	, _scroll(
+		this,
+		controller->chatStyle()->value(lifetime(), st::historyScroll),
+		false)
+	, _topBar(this, controller)
+	, _topBarShadow(this)
+	, _composeControls(std::make_unique<ComposeControls>(
+		this,
+		ComposeControlsDescriptor{
+			.show = controller->uiShow(),
+			.unavailableEmojiPasted = [=](not_null<DocumentData*> emoji) {
+				listShowPremiumToast(emoji);
+			},
+			.mode = ComposeControls::Mode::Scheduled,
+			.sendMenuDetails = [] { return SendMenu::Details(); },
+			.regularWindow = controller,
+			.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
+		}))
+	, _cornerButtons(
 		_scroll.data(),
 		controller->chatStyle(),
 		static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
@@ -209,83 +209,83 @@ ScheduledWidget::~ScheduledWidget() = default;
 void ScheduledWidget::setupComposeControls() {
 	auto writeRestriction = _forumTopic
 		? [&] {
-			auto topicWriteRestrictions = rpl::single(
-			) | rpl::then(session().changes().topicUpdates(
-				Data::TopicUpdate::Flag::Closed
-			) | rpl::filter([=](const Data::TopicUpdate &update) {
-				return (update.topic->history() == _history)
-					&& (update.topic->rootId() == _forumTopic->rootId());
-			}) | rpl::to_empty) | rpl::map([=] {
-				return (!_forumTopic
-						|| _forumTopic->canToggleClosed()
-						|| !_forumTopic->closed())
-					? std::optional<QString>()
-					: tr::lng_forum_topic_closed(tr::now);
-			});
-			return rpl::combine(
-				session().changes().peerFlagsValue(
-					_history->peer,
-					Data::PeerUpdate::Flag::Rights),
-				Data::CanSendAnythingValue(_history->peer),
-				std::move(topicWriteRestrictions)
-			) | rpl::map([=](
-					auto,
-					auto,
-					std::optional<QString> topicRestriction) {
-				const auto allWithoutPolls = Data::AllSendRestrictions()
-					& ~ChatRestriction::SendPolls;
-				const auto canSendAnything = Data::CanSendAnyOf(
-					_forumTopic,
-					allWithoutPolls);
-				const auto restriction = Data::RestrictionError(
-					_history->peer,
-					ChatRestriction::SendOther);
-				auto text = !canSendAnything
-					? (restriction
-						? restriction
-						: topicRestriction
-						? std::move(topicRestriction)
-						: tr::lng_group_not_accessible(tr::now))
+		auto topicWriteRestrictions = rpl::single(
+		) | rpl::then(session().changes().topicUpdates(
+			Data::TopicUpdate::Flag::Closed
+		) | rpl::filter([=](const Data::TopicUpdate &update) {
+			return (update.topic->history() == _history)
+				&& (update.topic->rootId() == _forumTopic->rootId());
+		}) | rpl::to_empty) | rpl::map([=] {
+			return (!_forumTopic
+				|| _forumTopic->canToggleClosed()
+				|| !_forumTopic->closed())
+				? std::optional<QString>()
+				: tr::lng_forum_topic_closed(tr::now);
+		});
+		return rpl::combine(
+			session().changes().peerFlagsValue(
+				_history->peer,
+				Data::PeerUpdate::Flag::Rights),
+			Data::CanSendAnythingValue(_history->peer),
+			std::move(topicWriteRestrictions)
+		) | rpl::map([=](
+			auto,
+			auto,
+			std::optional<QString> topicRestriction) {
+			const auto allWithoutPolls = Data::AllSendRestrictions()
+				& ~ChatRestriction::SendPolls;
+			const auto canSendAnything = Data::CanSendAnyOf(
+				_forumTopic,
+				allWithoutPolls);
+			const auto restriction = Data::RestrictionError(
+				_history->peer,
+				ChatRestriction::SendOther);
+			auto text = !canSendAnything
+				? (restriction
+					? restriction
 					: topicRestriction
 					? std::move(topicRestriction)
-					: std::optional<QString>();
-				return text ? Controls::WriteRestriction{
-					.text = std::move(*text),
-					.type = Controls::WriteRestrictionType::Rights,
-				} : Controls::WriteRestriction();
-			}) | rpl::type_erased();
-		}()
+					: tr::lng_group_not_accessible(tr::now))
+				: topicRestriction
+				? std::move(topicRestriction)
+				: std::optional<QString>();
+			return text ? Controls::WriteRestriction{
+				.text = std::move(*text),
+				.type = Controls::WriteRestrictionType::Rights,
+			} : Controls::WriteRestriction();
+		}) | rpl::type_erased();
+	}()
 		: [&] {
-			return rpl::combine(
-				session().changes().peerFlagsValue(
-					_history->peer,
-					Data::PeerUpdate::Flag::Rights),
-				Data::CanSendAnythingValue(_history->peer)
-			) | rpl::map([=] {
-				const auto allWithoutPolls = Data::AllSendRestrictions()
-					& ~ChatRestriction::SendPolls;
-				const auto canSendAnything = Data::CanSendAnyOf(
-					_history->peer,
-					allWithoutPolls,
-					false);
-				const auto restriction = Data::RestrictionError(
-					_history->peer,
-					ChatRestriction::SendOther);
-				auto text = !canSendAnything
-					? (restriction
-						? restriction
-						: tr::lng_group_not_accessible(tr::now))
-					: std::optional<QString>();
-				return text ? Controls::WriteRestriction{
-					.text = std::move(*text),
-					.type = Controls::WriteRestrictionType::Rights,
-				} : Controls::WriteRestriction();
-			}) | rpl::type_erased();
-		}();
+		return rpl::combine(
+			session().changes().peerFlagsValue(
+				_history->peer,
+				Data::PeerUpdate::Flag::Rights),
+			Data::CanSendAnythingValue(_history->peer)
+		) | rpl::map([=] {
+			const auto allWithoutPolls = Data::AllSendRestrictions()
+				& ~ChatRestriction::SendPolls;
+			const auto canSendAnything = Data::CanSendAnyOf(
+				_history->peer,
+				allWithoutPolls,
+				false);
+			const auto restriction = Data::RestrictionError(
+				_history->peer,
+				ChatRestriction::SendOther);
+			auto text = !canSendAnything
+				? (restriction
+					? restriction
+					: tr::lng_group_not_accessible(tr::now))
+				: std::optional<QString>();
+			return text ? Controls::WriteRestriction{
+				.text = std::move(*text),
+				.type = Controls::WriteRestrictionType::Rights,
+			} : Controls::WriteRestriction();
+		}) | rpl::type_erased();
+	}();
 	_composeControls->setHistory({
 		.history = _history.get(),
 		.writeRestriction = std::move(writeRestriction),
-	});
+		});
 
 	_composeControls->height(
 	) | rpl::start_with_next([=] {
@@ -308,7 +308,7 @@ void ScheduledWidget::setupComposeControls() {
 
 	_composeControls->sendVoiceRequests(
 	) | rpl::start_with_next([=](ComposeControls::VoiceToSend &&data) {
-		sendVoice(data.bytes, data.waveform, data.duration);
+		sendVoice(std::move(data));
 	}, lifetime());
 
 	_composeControls->sendCommandRequests(
@@ -393,8 +393,8 @@ void ScheduledWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->setMimeDataHook([=](
-			not_null<const QMimeData*> data,
-			Ui::InputField::MimeAction action) {
+		not_null<const QMimeData*> data,
+		Ui::InputField::MimeAction action) {
 		if (action == Ui::InputField::MimeAction::Check) {
 			return Core::CanSendFiles(data);
 		} else if (action == Ui::InputField::MimeAction::Insert) {
@@ -426,7 +426,7 @@ void ScheduledWidget::chooseAttach() {
 
 	const auto filter = FileDialog::AllOrImagesFilter();
 	FileDialog::GetOpenPaths(this, tr::lng_choose_files(tr::now), filter, crl::guard(this, [=](
-			FileDialog::OpenResult &&result) {
+		FileDialog::OpenResult &&result) {
 		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
 			return;
 		}
@@ -434,7 +434,7 @@ void ScheduledWidget::chooseAttach() {
 		if (!result.remoteContent.isEmpty()) {
 			auto read = Images::Read({
 				.content = result.remoteContent,
-			});
+				});
 			if (!read.image.isNull() && !read.animated) {
 				confirmSendingFiles(
 					std::move(read.image),
@@ -454,9 +454,9 @@ void ScheduledWidget::chooseAttach() {
 }
 
 bool ScheduledWidget::confirmSendingFiles(
-		not_null<const QMimeData*> data,
-		std::optional<bool> overrideSendImagesAsPhotos,
-		const QString &insertTextOnCancel) {
+	not_null<const QMimeData*> data,
+	std::optional<bool> overrideSendImagesAsPhotos,
+	const QString &insertTextOnCancel) {
 	const auto hasImage = data->hasImage();
 	const auto premium = controller()->session().user()->isPremium();
 
@@ -488,8 +488,8 @@ bool ScheduledWidget::confirmSendingFiles(
 }
 
 bool ScheduledWidget::confirmSendingFiles(
-		Ui::PreparedList &&list,
-		const QString &insertTextOnCancel) {
+	Ui::PreparedList &&list,
+	const QString &insertTextOnCancel) {
 	if (_composeControls->confirmMediaEdit(list)) {
 		return true;
 	} else if (showSendingFilesError(list)) {
@@ -507,11 +507,11 @@ bool ScheduledWidget::confirmSendingFiles(
 		SendMenu::Details());
 
 	box->setConfirmedCallback(crl::guard(this, [=](
-			Ui::PreparedList &&list,
-			Ui::SendFilesWay way,
-			TextWithTags &&caption,
-			Api::SendOptions options,
-			bool ctrlShiftEnter) {
+		Ui::PreparedList &&list,
+		Ui::SendFilesWay way,
+		TextWithTags &&caption,
+		Api::SendOptions options,
+		bool ctrlShiftEnter) {
 		sendingFilesConfirmed(
 			std::move(list),
 			way,
@@ -529,11 +529,11 @@ bool ScheduledWidget::confirmSendingFiles(
 }
 
 void ScheduledWidget::sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter) {
+	Ui::PreparedList &&list,
+	Ui::SendFilesWay way,
+	TextWithTags &&caption,
+	Api::SendOptions options,
+	bool ctrlShiftEnter) {
 	Expects(list.filesToProcess.empty());
 
 	if (showSendingFilesError(list, way.sendImagesAsPhotos())) {
@@ -565,10 +565,10 @@ void ScheduledWidget::sendingFilesConfirmed(
 }
 
 bool ScheduledWidget::confirmSendingFiles(
-		QImage &&image,
-		QByteArray &&content,
-		std::optional<bool> overrideSendImagesAsPhotos,
-		const QString &insertTextOnCancel) {
+	QImage &&image,
+	QByteArray &&content,
+	std::optional<bool> overrideSendImagesAsPhotos,
+	const QString &insertTextOnCancel) {
 	if (image.isNull()) {
 		return false;
 	}
@@ -604,8 +604,8 @@ void ScheduledWidget::checkReplyReturns() {
 }
 
 void ScheduledWidget::uploadFile(
-		const QByteArray &fileContent,
-		SendMediaType type) {
+	const QByteArray &fileContent,
+	SendMediaType type) {
 	const auto callback = [=](Api::SendOptions options) {
 		session().api().sendFile(
 			fileContent,
@@ -617,13 +617,13 @@ void ScheduledWidget::uploadFile(
 }
 
 bool ScheduledWidget::showSendingFilesError(
-		const Ui::PreparedList &list) const {
+	const Ui::PreparedList &list) const {
 	return showSendingFilesError(list, std::nullopt);
 }
 
 bool ScheduledWidget::showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const {
+	const Ui::PreparedList &list,
+	std::optional<bool> compress) const {
 	const auto text = [&] {
 		using Error = Ui::PreparedList::Error;
 		const auto peer = _history->peer;
@@ -656,7 +656,7 @@ bool ScheduledWidget::showSendingFilesError(
 }
 
 Api::SendAction ScheduledWidget::prepareSendAction(
-		Api::SendOptions options) const {
+	Api::SendOptions options) const {
 	auto result = Api::SendAction(_history, options);
 	result.options.sendAs = _composeControls->sendAsPeer();
 	if (_forumTopic) {
@@ -716,26 +716,22 @@ void ScheduledWidget::send(Api::SendOptions options) {
 	_composeControls->focus();
 }
 
-void ScheduledWidget::sendVoice(
-		QByteArray bytes,
-		VoiceWaveform waveform,
-		crl::time duration) {
+void ScheduledWidget::sendVoice(const Controls::VoiceToSend &data) {
 	const auto callback = [=](Api::SendOptions options) {
-		sendVoice(bytes, waveform, duration, options);
+		sendVoice(base::duplicate(data), options);
 	};
 	controller()->show(
 		PrepareScheduleBox(this, _show, sendMenuDetails(), callback));
 }
 
 void ScheduledWidget::sendVoice(
-		QByteArray bytes,
-		VoiceWaveform waveform,
-		crl::time duration,
+		const Controls::VoiceToSend &data,
 		Api::SendOptions options) {
 	session().api().sendVoiceMessage(
-		bytes,
-		waveform,
-		duration,
+		data.bytes,
+		data.waveform,
+		data.duration,
+		data.video,
 		prepareSendAction(options));
 	_composeControls->clearListenState();
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 0a7ff39b0..290b11c73 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -47,6 +47,10 @@ namespace InlineBots {
 class Result;
 } // namespace InlineBots
 
+namespace HistoryView::Controls {
+struct VoiceToSend;
+} // namespace HistoryView::Controls
+
 namespace HistoryView {
 
 class Element;
@@ -207,14 +211,9 @@ private:
 		Api::SendOptions options) const;
 	void send();
 	void send(Api::SendOptions options);
+	void sendVoice(const Controls::VoiceToSend &data);
 	void sendVoice(
-		QByteArray bytes,
-		VoiceWaveform waveform,
-		crl::time duration);
-	void sendVoice(
-		QByteArray bytes,
-		VoiceWaveform waveform,
-		crl::time duration,
+		const Controls::VoiceToSend &data,
 		Api::SendOptions options);
 	void edit(
 		not_null<HistoryItem*> item,
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index 1bbf9b10c..cd567f4fd 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -88,13 +88,15 @@ public:
 	void start(
 		Webrtc::DeviceResolvedId id,
 		Fn<void(Update)> updated,
-		Fn<void()> error);
+		Fn<void()> error,
+		Fn<void(Chunk)> externalProcessing);
 	void stop(Fn<void(Result&&)> callback = nullptr);
 	void pause(bool value, Fn<void(Result&&)> callback);
 
 private:
 	void process();
 
+	bool initializeFFmpeg();
 	[[nodiscard]] bool processFrame(int32 offset, int32 framesize);
 	void fail();
 
@@ -104,6 +106,7 @@ private:
 	// Returns number of packets written or -1 on error
 	[[nodiscard]] int writePackets();
 
+	Fn<void(Chunk)> _externalProcessing;
 	Fn<void(Update)> _updated;
 	Fn<void()> _error;
 
@@ -131,7 +134,7 @@ Instance::Instance() : _inner(std::make_unique<Inner>(&_thread)) {
 	_thread.start();
 }
 
-void Instance::start() {
+void Instance::start(Fn<void(Chunk)> externalProcessing) {
 	_updates.fire_done();
 	const auto id = Audio::Current().captureDeviceId();
 	InvokeQueued(_inner.get(), [=] {
@@ -143,7 +146,7 @@ void Instance::start() {
 			crl::on_main(this, [=] {
 				_updates.fire_error({});
 			});
-		});
+		}, externalProcessing);
 		crl::on_main(this, [=] {
 			_started = true;
 		});
@@ -304,7 +307,9 @@ void Instance::Inner::fail() {
 void Instance::Inner::start(
 		Webrtc::DeviceResolvedId id,
 		Fn<void(Update)> updated,
-		Fn<void()> error) {
+		Fn<void()> error,
+		Fn<void(Chunk)> externalProcessing) {
+	_externalProcessing = std::move(externalProcessing);
 	_updated = std::move(updated);
 	_error = std::move(error);
 	if (_paused) {
@@ -329,8 +334,19 @@ void Instance::Inner::start(
 		d->device = nullptr;
 		fail();
 		return;
+	} else if (!_externalProcessing) {
+		if (!initializeFFmpeg()) {
+			fail();
+			return;
+		}
 	}
+	_timer.callEach(50);
+	_captured.clear();
+	_captured.reserve(kCaptureBufferSlice);
+	DEBUG_LOG(("Audio Capture: started!"));
+}
 
+bool Instance::Inner::initializeFFmpeg() {
 	// Create encoding context
 
 	d->ioBuffer = (uchar*)av_malloc(FFmpeg::kAVBlockSize);
@@ -347,14 +363,12 @@ void Instance::Inner::start(
 	}
 	if (!fmt) {
 		LOG(("Audio Error: Unable to find opus AVOutputFormat for capture"));
-		fail();
-		return;
+		return false;
 	}
 
 	if ((res = avformat_alloc_output_context2(&d->fmtContext, (AVOutputFormat*)fmt, 0, 0)) < 0) {
 		LOG(("Audio Error: Unable to avformat_alloc_output_context2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
 	d->fmtContext->pb = d->ioContext;
 	d->fmtContext->flags |= AVFMT_FLAG_CUSTOM_IO;
@@ -364,21 +378,18 @@ void Instance::Inner::start(
 	d->codec = avcodec_find_encoder(fmt->audio_codec);
 	if (!d->codec) {
 		LOG(("Audio Error: Unable to avcodec_find_encoder for capture"));
-		fail();
-		return;
+		return false;
 	}
 	d->stream = avformat_new_stream(d->fmtContext, d->codec);
 	if (!d->stream) {
 		LOG(("Audio Error: Unable to avformat_new_stream for capture"));
-		fail();
-		return;
+		return false;
 	}
 	d->stream->id = d->fmtContext->nb_streams - 1;
 	d->codecContext = avcodec_alloc_context3(d->codec);
 	if (!d->codecContext) {
 		LOG(("Audio Error: Unable to avcodec_alloc_context3 for capture"));
-		fail();
-		return;
+		return false;
 	}
 
 	av_opt_set_int(d->codecContext, "refcounted_frames", 1, 0);
@@ -401,8 +412,7 @@ void Instance::Inner::start(
 	// Open audio stream
 	if ((res = avcodec_open2(d->codecContext, d->codec, nullptr)) < 0) {
 		LOG(("Audio Error: Unable to avcodec_open2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
 
 	// Alloc source samples
@@ -443,39 +453,27 @@ void Instance::Inner::start(
 #endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	if (res < 0 || !d->swrContext) {
 		LOG(("Audio Error: Unable to swr_alloc_set_opts2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	} else if ((res = swr_init(d->swrContext)) < 0) {
 		LOG(("Audio Error: Unable to swr_init for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
-
 	d->maxDstSamples = d->srcSamples;
 	if ((res = av_samples_alloc_array_and_samples(&d->dstSamplesData, 0, d->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0)) < 0) {
 		LOG(("Audio Error: Unable to av_samples_alloc_array_and_samples for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
 	d->dstSamplesSize = av_samples_get_buffer_size(0, d->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0);
-
 	if ((res = avcodec_parameters_from_context(d->stream->codecpar, d->codecContext)) < 0) {
 		LOG(("Audio Error: Unable to avcodec_parameters_from_context for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
-
 	// Write file header
 	if ((res = avformat_write_header(d->fmtContext, 0)) < 0) {
 		LOG(("Audio Error: Unable to avformat_write_header for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
-
-	_timer.callEach(50);
-	_captured.clear();
-	_captured.reserve(kCaptureBufferSlice);
-	DEBUG_LOG(("Audio Capture: started!"));
+	return true;
 }
 
 void Instance::Inner::pause(bool value, Fn<void(Result&&)> callback) {
@@ -559,7 +557,7 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
 	_captured = QByteArray();
 
 	// Finish stream
-	if (needResult && hadDevice) {
+	if (needResult && hadDevice && d->fmtContext) {
 		av_write_trailer(d->fmtContext);
 	}
 
@@ -658,6 +656,13 @@ void Instance::Inner::process() {
 		if (ErrorHappened(d->device)) {
 			fail();
 			return;
+		} else if (_externalProcessing) {
+			_externalProcessing({
+				.finished = crl::now(),
+				.samples = base::take(_captured),
+				.frequency = kCaptureFrequency,
+			});
+			return;
 		}
 
 		// Count new recording level and update view
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.h b/Telegram/SourceFiles/media/audio/media_audio_capture.h
index 2b46bd7fa..fe03dd89c 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.h
@@ -7,10 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include <QtCore/QThread>
 #include <QtCore/QTimer>
 
-struct AVFrame;
-
 namespace Media {
 namespace Capture {
 
@@ -19,6 +18,12 @@ struct Update {
 	ushort level = 0;
 };
 
+struct Chunk {
+	crl::time finished = 0;
+	QByteArray samples;
+	int frequency = 0;
+};
+
 struct Result;
 
 void Start();
@@ -45,7 +50,7 @@ public:
 		return _started.changes();
 	}
 
-	void start();
+	void start(Fn<void(Chunk)> externalProcessing = nullptr);
 	void stop(Fn<void(Result&&)> callback = nullptr);
 	void pause(bool value, Fn<void(Result&&)> callback);
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 136c77b7a..c034d61dc 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -244,6 +244,7 @@ void ReplyArea::sendVoice(VoiceToSend &&data) {
 		data.bytes,
 		data.waveform,
 		data.duration,
+		data.video,
 		std::move(action));
 
 	_controls->clearListenState();
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index 1610aafee..d1dfbbad5 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -1200,6 +1200,7 @@ void ShortcutMessages::sendVoice(ComposeControls::VoiceToSend &&data) {
 		data.bytes,
 		data.waveform,
 		data.duration,
+		data.video,
 		std::move(action));
 
 	_composeControls->cancelReplyMessage();
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 79c4af401..9daeaecdd 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -498,6 +498,7 @@ FileLoadTask::FileLoadTask(
 	const QByteArray &voice,
 	crl::time duration,
 	const VoiceWaveform &waveform,
+	bool video,
 	const FileLoadTo &to,
 	const TextWithTags &caption)
 : _id(base::RandomValue<uint64>())
@@ -507,7 +508,7 @@ FileLoadTask::FileLoadTask(
 , _content(voice)
 , _duration(duration)
 , _waveform(waveform)
-, _type(SendMediaType::Audio)
+, _type(video ? SendMediaType::Round : SendMediaType::Audio)
 , _caption(caption) {
 }
 
@@ -696,6 +697,7 @@ void FileLoadTask::process(Args &&args) {
 	auto isSong = false;
 	auto isVideo = false;
 	auto isVoice = (_type == SendMediaType::Audio);
+	auto isRound = (_type == SendMediaType::Round);
 	auto isSticker = false;
 
 	auto fullimage = QImage();
@@ -711,7 +713,7 @@ void FileLoadTask::process(Args &&args) {
 		// Voice sending is supported only from memory for now.
 		// Because for voice we force mime type and don't read MediaInformation.
 		// For a real file we always read mime type and read MediaInformation.
-		Assert(!isVoice);
+		Assert(!isVoice && !isRound);
 
 		filesize = info.size();
 		filename = info.fileName();
@@ -736,6 +738,9 @@ void FileLoadTask::process(Args &&args) {
 		if (isVoice) {
 			filename = filedialogDefaultName(u"audio"_q, u".ogg"_q, QString(), true);
 			filemime = "audio/ogg";
+		} else if (isRound) {
+			filename = filedialogDefaultName(u"round"_q, u".mp4"_q, QString(), true);
+			filemime = "video/mp4";
 		} else {
 			if (_information) {
 				if (auto image = std::get_if<Ui::PreparedFileInformation::Image>(
@@ -815,7 +820,41 @@ void FileLoadTask::process(Args &&args) {
 	auto photo = MTP_photoEmpty(MTP_long(0));
 	auto document = MTP_documentEmpty(MTP_long(0));
 
-	if (!isVoice) {
+	if (isRound) {
+		_information = readMediaInformation(u"video/mp4"_q);
+		if (auto video = std::get_if<Ui::PreparedFileInformation::Video>(
+			&_information->media)) {
+			isVideo = true;
+			auto coverWidth = video->thumbnail.width();
+			auto coverHeight = video->thumbnail.height();
+			if (video->isGifv && !_album) {
+				attributes.push_back(MTP_documentAttributeAnimated());
+			}
+			auto flags = MTPDdocumentAttributeVideo::Flags(
+				MTPDdocumentAttributeVideo::Flag::f_round_message);
+			if (video->supportsStreaming) {
+				flags |= MTPDdocumentAttributeVideo::Flag::f_supports_streaming;
+			}
+			const auto realSeconds = video->duration / 1000.;
+			attributes.push_back(MTP_documentAttributeVideo(
+				MTP_flags(flags),
+				MTP_double(realSeconds),
+				MTP_int(coverWidth),
+				MTP_int(coverHeight),
+				MTPint(), // preload_prefix_size
+				MTPdouble(), // video_start_ts
+				MTPstring())); // video_codec
+
+			if (args.generateGoodThumbnail) {
+				goodThumbnail = video->thumbnail;
+				{
+					QBuffer buffer(&goodThumbnailBytes);
+					goodThumbnail.save(&buffer, "JPG", kThumbnailQuality);
+				}
+			}
+			thumbnail = PrepareFileThumbnail(std::move(video->thumbnail));
+		}
+	} else if (!isVoice) {
 		if (!_information) {
 			_information = readMediaInformation(filemime);
 			filemime = _information->filemime;
@@ -869,7 +908,7 @@ void FileLoadTask::process(Args &&args) {
 		}
 	}
 
-	if (!fullimage.isNull() && fullimage.width() > 0 && !isSong && !isVideo && !isVoice) {
+	if (!fullimage.isNull() && fullimage.width() > 0 && !isSong && !isVideo && !isVoice && !isRound) {
 		auto w = fullimage.width(), h = fullimage.height();
 		attributes.push_back(MTP_documentAttributeImageSize(MTP_int(w), MTP_int(h)));
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index d4e99177f..ed0dc1c47 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -31,6 +31,7 @@ extern const char kOptionSendLargePhotos[];
 enum class SendMediaType {
 	Photo,
 	Audio,
+	Round,
 	File,
 	ThemeFile,
 	Secure,
@@ -231,6 +232,7 @@ public:
 		const QByteArray &voice,
 		crl::time duration,
 		const VoiceWaveform &waveform,
+		bool video,
 		const FileLoadTo &to,
 		const TextWithTags &caption);
 	~FileLoadTask();
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
new file mode 100644
index 000000000..09b60bb7b
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -0,0 +1,649 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/round_video_recorder.h"
+
+#include "base/debug_log.h"
+#include "ffmpeg/ffmpeg_utility.h"
+#include "media/audio/media_audio_capture.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "webrtc/webrtc_video_track.h"
+#include "styles/style_chat_helpers.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kSide = 400;
+constexpr auto kOutputFilename = "C:\\Tmp\\TestVideo\\output.mp4";
+
+using namespace FFmpeg;
+
+} // namespace
+
+class RoundVideoRecorder::Private final {
+public:
+	Private(crl::weak_on_queue<Private> weak);
+	~Private();
+
+	void push(int64 mcstimestamp, const QImage &frame);
+	void push(const Media::Capture::Chunk &chunk);
+
+	[[nodiscard]] RoundVideoResult finish();
+
+private:
+	static int Write(void *opaque, uint8_t *buf, int buf_size);
+	static int64_t Seek(void *opaque, int64_t offset, int whence);
+
+	int write(uint8_t *buf, int buf_size);
+	int64_t seek(int64_t offset, int whence);
+
+	const crl::weak_on_queue<Private> _weak;
+
+	FormatPointer _format;
+
+	AVStream *_videoStream = nullptr;
+	CodecPointer _videoCodec;
+	FramePointer _videoFrame;
+	SwscalePointer _swsContext;
+	int64_t _videoPts = 0;
+
+	// This is the first recorded frame timestamp in microseconds.
+	int64_t _videoFirstTimestamp = -1;
+
+	// Audio-related members
+	AVStream *_audioStream = nullptr;
+	CodecPointer _audioCodec;
+	FramePointer _audioFrame;
+	SwresamplePointer _swrContext;
+	QByteArray _audioTail;
+	int64_t _audioPts = 0;
+	int _audioChannels = 0;
+
+	// Those timestamps are in 'ms' used for sync between audio and video.
+	crl::time _firstAudioChunkFinished = 0;
+	crl::time _firstVideoFrameTime = 0;
+
+	QByteArray _result;
+	int64_t _resultOffset = 0;
+	crl::time _resultDuration = 0;
+
+	void initEncoding();
+	bool initVideo();
+	bool initAudio();
+	void deinitEncoding();
+	void finishEncoding();
+
+	void encodeVideoFrame(int64 mcstimestamp, const QImage &frame);
+	void encodeAudioFrame(const Media::Capture::Chunk &chunk);
+	bool writeFrame(
+		const FramePointer &frame,
+		const CodecPointer &codec,
+		AVStream *stream);
+
+};
+
+RoundVideoRecorder::Private::Private(crl::weak_on_queue<Private> weak)
+: _weak(std::move(weak)) {
+	initEncoding();
+}
+
+RoundVideoRecorder::Private::~Private() {
+	finishEncoding();
+
+	QFile file(kOutputFilename);
+	if (file.open(QIODevice::WriteOnly)) {
+		file.write(_result);
+	}
+}
+
+int RoundVideoRecorder::Private::Write(void *opaque, uint8_t *buf, int buf_size) {
+	return static_cast<Private*>(opaque)->write(buf, buf_size);
+}
+
+int64_t RoundVideoRecorder::Private::Seek(void *opaque, int64_t offset, int whence) {
+	return static_cast<Private*>(opaque)->seek(offset, whence);
+}
+
+int RoundVideoRecorder::Private::write(uint8_t *buf, int buf_size) {
+	if (const auto total = _resultOffset + int64(buf_size)) {
+		const auto size = int64(_result.size());
+		constexpr auto kReserve = 1024 * 1024;
+		_result.reserve((total / kReserve) * kReserve);
+		const auto overwrite = std::min(
+			size - _resultOffset,
+			int64(buf_size));
+		if (overwrite) {
+			memcpy(_result.data() + _resultOffset, buf, overwrite);
+		}
+		if (const auto append = buf_size - overwrite) {
+			_result.append(
+				reinterpret_cast<const char*>(buf) + overwrite,
+				append);
+		}
+		_resultOffset += buf_size;
+	}
+	return buf_size;
+}
+
+int64_t RoundVideoRecorder::Private::seek(int64_t offset, int whence) {
+	const auto checkedSeek = [&](int64_t offset) {
+		if (offset < 0 || offset > int64(_result.size())) {
+			return int64(-1);
+		}
+		return (_resultOffset = offset);
+	};
+	switch (whence) {
+	case SEEK_SET: return checkedSeek(offset);
+	case SEEK_CUR: return checkedSeek(_resultOffset + offset);
+	case SEEK_END: return checkedSeek(int64(_result.size()) + offset);
+	case AVSEEK_SIZE: return int64(_result.size());
+	}
+	return -1;
+}
+
+void RoundVideoRecorder::Private::initEncoding() {
+	_format = MakeWriteFormatPointer(
+		static_cast<void*>(this),
+		nullptr,
+		&Private::Write,
+		&Private::Seek,
+		"mp4"_q);
+
+	if (!initVideo() || !initAudio()) {
+		deinitEncoding();
+		return;
+	}
+
+	const auto error = AvErrorWrap(avformat_write_header(
+		_format.get(),
+		nullptr));
+	if (error) {
+		LogError("avformat_write_header", error);
+		deinitEncoding();
+	}
+}
+
+bool RoundVideoRecorder::Private::initVideo() {
+	if (!_format) {
+		return false;
+	}
+
+	const auto videoCodec = avcodec_find_encoder_by_name("libopenh264");
+	if (!videoCodec) {
+		LogError("avcodec_find_encoder_by_name", "libopenh264");
+		return false;
+	}
+
+	_videoStream = avformat_new_stream(_format.get(), videoCodec);
+	if (!_videoStream) {
+		LogError("avformat_new_stream", "libopenh264");
+		return false;
+	}
+
+	_videoCodec = CodecPointer(avcodec_alloc_context3(videoCodec));
+	if (!_videoCodec) {
+		LogError("avcodec_alloc_context3", "libopenh264");
+		return false;
+	}
+
+	_videoCodec->codec_id = videoCodec->id;
+	_videoCodec->codec_type = AVMEDIA_TYPE_VIDEO;
+	_videoCodec->width = kSide;
+	_videoCodec->height = kSide;
+	_videoCodec->time_base = AVRational{ 1, 1'000'000 }; // Microseconds.
+	_videoCodec->framerate = AVRational{ 0, 1 }; // Variable frame rate.
+	_videoCodec->pix_fmt = AV_PIX_FMT_YUV420P;
+	_videoCodec->bit_rate = 5 * 1024 * 1024; // 5Mbps
+
+	auto error = AvErrorWrap(avcodec_open2(
+		_videoCodec.get(),
+		videoCodec,
+		nullptr));
+	if (error) {
+		LogError("avcodec_open2", error, "libopenh264");
+		return false;
+	}
+
+	error = AvErrorWrap(avcodec_parameters_from_context(
+		_videoStream->codecpar,
+		_videoCodec.get()));
+	if (error) {
+		LogError("avcodec_parameters_from_context", error, "libopenh264");
+		return false;
+	}
+
+	_videoFrame = MakeFramePointer();
+	if (!_videoFrame) {
+		return false;
+	}
+
+	_videoFrame->format = _videoCodec->pix_fmt;
+	_videoFrame->width = _videoCodec->width;
+	_videoFrame->height = _videoCodec->height;
+
+	error = AvErrorWrap(av_frame_get_buffer(_videoFrame.get(), 0));
+	if (error) {
+		LogError("av_frame_get_buffer", error, "libopenh264");
+		return false;
+	}
+
+	return true;
+}
+
+bool RoundVideoRecorder::Private::initAudio() {
+	if (!_format) {
+		return false;
+	}
+
+	const auto audioCodec = avcodec_find_encoder(AV_CODEC_ID_AAC);
+	if (!audioCodec) {
+		LogError("avcodec_find_encoder", "AAC");
+		return false;
+	}
+
+	_audioStream = avformat_new_stream(_format.get(), audioCodec);
+	if (!_audioStream) {
+		LogError("avformat_new_stream", "AAC");
+		return false;
+	}
+
+	_audioCodec = CodecPointer(avcodec_alloc_context3(audioCodec));
+	if (!_audioCodec) {
+		LogError("avcodec_alloc_context3", "AAC");
+		return false;
+	}
+
+	_audioChannels = 1;
+	_audioCodec->sample_fmt = AV_SAMPLE_FMT_FLTP;
+	_audioCodec->bit_rate = 32000;
+	_audioCodec->sample_rate = 48000;
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	_audioCodec->ch_layout = AV_CHANNEL_LAYOUT_MONO;
+	_audioCodec->channels = _audioCodec->ch_layout.nb_channels;
+#else
+	_audioCodec->channel_layout = AV_CH_LAYOUT_MONO;
+	_audioCodec->channels = _audioChannels;
+#endif
+
+	auto error = AvErrorWrap(avcodec_open2(
+		_audioCodec.get(),
+		audioCodec,
+		nullptr));
+	if (error) {
+		LogError("avcodec_open2", error, "AAC");
+		return false;
+	}
+
+	error = AvErrorWrap(avcodec_parameters_from_context(
+		_audioStream->codecpar,
+		_audioCodec.get()));
+	if (error) {
+		LogError("avcodec_parameters_from_context", error, "AAC");
+		return false;
+	}
+
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	_swrContext = MakeSwresamplePointer(
+		&_audioCodec->ch_layout,
+		AV_SAMPLE_FMT_S16,
+		_audioCodec->sample_rate,
+		&_audioCodec->ch_layout,
+		_audioCodec->sample_fmt,
+		_audioCodec->sample_rate,
+		&_swrContext);
+#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	_swrContext = MakeSwresamplePointer(
+		&_audioCodec->ch_layout,
+		AV_SAMPLE_FMT_S16,
+		_audioCodec->sample_rate,
+		&_audioCodec->ch_layout,
+		_audioCodec->sample_fmt,
+		_audioCodec->sample_rate,
+		&_swrContext);
+#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	if (!_swrContext) {
+		return false;
+	}
+
+	_audioFrame = MakeFramePointer();
+	if (!_audioFrame) {
+		return false;
+	}
+
+	_audioFrame->nb_samples = _audioCodec->frame_size;
+	_audioFrame->format = _audioCodec->sample_fmt;
+	_audioFrame->sample_rate = _audioCodec->sample_rate;
+#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
+	av_channel_layout_copy(&_audioFrame->ch_layout, &_audioCodec->ch_layout);
+#else
+	_audioFrame->channel_layout = _audioCodec->channel_layout;
+	_audioFrame->channels = _audioCodec->channels;
+#endif
+
+	error = AvErrorWrap(av_frame_get_buffer(_audioFrame.get(), 0));
+	if (error) {
+		LogError("av_frame_get_buffer", error, "AAC");
+		return false;
+	}
+
+	return true;
+}
+
+void RoundVideoRecorder::Private::finishEncoding() {
+	if (_format
+		&& writeFrame(nullptr, _videoCodec, _videoStream)
+		&& writeFrame(nullptr, _audioCodec, _audioStream)) {
+		av_write_trailer(_format.get());
+	}
+	deinitEncoding();
+}
+
+RoundVideoResult RoundVideoRecorder::Private::finish() {
+	if (!_format) {
+		return {};
+	}
+	finishEncoding();
+	return {
+		.content = _result,
+		.waveform = QByteArray(),
+		.duration = _resultDuration,
+	};
+};
+
+void RoundVideoRecorder::Private::deinitEncoding() {
+	_swsContext = nullptr;
+	_videoCodec = nullptr;
+	_videoStream = nullptr;
+	_videoFrame = nullptr;
+	_swrContext = nullptr;
+	_audioCodec = nullptr;
+	_audioStream = nullptr;
+	_audioFrame = nullptr;
+	_format = nullptr;
+
+	_videoFirstTimestamp = -1;
+	_videoPts = 0;
+	_audioPts = 0;
+}
+
+void RoundVideoRecorder::Private::push(
+		int64 mcstimestamp,
+		const QImage &frame) {
+	if (!_format) {
+		return;
+	} else if (!_firstAudioChunkFinished) {
+		// Skip frames while we didn't start receiving audio.
+		return;
+	} else if (!_firstVideoFrameTime) {
+		_firstVideoFrameTime = crl::now();
+	}
+	encodeVideoFrame(mcstimestamp, frame);
+}
+
+void RoundVideoRecorder::Private::push(const Media::Capture::Chunk &chunk) {
+	if (!_format) {
+		return;
+	} else if (!_firstAudioChunkFinished || !_firstVideoFrameTime) {
+		_firstAudioChunkFinished = chunk.finished;
+		return;
+	}
+	// We get a chunk roughly every 50ms and need to encode it interleaved.
+	encodeAudioFrame(chunk);
+}
+
+void RoundVideoRecorder::Private::encodeVideoFrame(
+		int64 mcstimestamp,
+		const QImage &frame) {
+	_swsContext = MakeSwscalePointer(
+		QSize(kSide, kSide),
+		AV_PIX_FMT_BGRA,
+		QSize(kSide, kSide),
+		AV_PIX_FMT_YUV420P,
+		&_swsContext);
+	if (!_swsContext) {
+		deinitEncoding();
+		return;
+	}
+
+	if (_videoFirstTimestamp == -1) {
+		_videoFirstTimestamp = mcstimestamp;
+	}
+
+	const auto fwidth = frame.width();
+	const auto fheight = frame.height();
+	const auto fmin = std::min(fwidth, fheight);
+	const auto fx = (fwidth > fheight) ? (fwidth - fheight) / 2 : 0;
+	const auto fy = (fwidth < fheight) ? (fheight - fwidth) / 2 : 0;
+	const auto crop = QRect(fx, fy, fmin, fmin);
+	const auto cropped = frame.copy(crop).scaled(
+		kSide,
+		kSide,
+		Qt::KeepAspectRatio,
+		Qt::SmoothTransformation);
+
+	// Convert QImage to RGB32 format
+//	QImage rgbImage = cropped.convertToFormat(QImage::Format_ARGB32);
+
+	// Prepare source data
+	const uint8_t *srcSlice[1] = { cropped.constBits() };
+	int srcStride[1] = { cropped.bytesPerLine() };
+
+	// Perform the color space conversion
+	sws_scale(
+		_swsContext.get(),
+		srcSlice,
+		srcStride,
+		0,
+		kSide,
+		_videoFrame->data,
+		_videoFrame->linesize);
+
+	_videoFrame->pts = mcstimestamp - _videoFirstTimestamp;
+
+	LOG(("Audio At: %1").arg(_videoFrame->pts / 1'000'000.));
+	if (!writeFrame(_videoFrame, _videoCodec, _videoStream)) {
+		return;
+	}
+}
+
+void RoundVideoRecorder::Private::encodeAudioFrame(const Media::Capture::Chunk &chunk) {
+	if (_audioTail.isEmpty()) {
+		_audioTail = chunk.samples;
+	} else {
+		_audioTail.append(chunk.samples);
+	}
+
+	const int inSamples = _audioTail.size() / sizeof(int16_t);
+	const uint8_t *inData = reinterpret_cast<const uint8_t*>(_audioTail.constData());
+	int samplesProcessed = 0;
+
+	while (samplesProcessed + _audioCodec->frame_size <= inSamples) {
+		int remainingSamples = inSamples - samplesProcessed;
+		int outSamples = av_rescale_rnd(
+			swr_get_delay(_swrContext.get(), 48000) + remainingSamples,
+			_audioCodec->sample_rate,
+			48000,
+			AV_ROUND_UP);
+
+		// Ensure we don't exceed the frame's capacity
+		outSamples = std::min(outSamples, _audioCodec->frame_size);
+
+		const auto process = std::min(remainingSamples, outSamples);
+		auto dataptr = inData + samplesProcessed * sizeof(int16_t);
+		auto error = AvErrorWrap(swr_convert(
+			_swrContext.get(),
+			_audioFrame->data,
+			outSamples,
+			&dataptr,
+			process));
+
+		if (error) {
+			LogError("swr_convert", error);
+			deinitEncoding();
+			return;
+		}
+
+		// Update the actual number of samples in the frame
+		_audioFrame->nb_samples = error.code();
+
+		_audioFrame->pts = _audioPts;
+		_audioPts += _audioFrame->nb_samples;
+
+		LOG(("Audio At: %1").arg(_audioFrame->pts / 48'000.));
+		if (!writeFrame(_audioFrame, _audioCodec, _audioStream)) {
+			return;
+		}
+
+		samplesProcessed += process;
+	}
+	const auto left = inSamples - samplesProcessed;
+	if (left > 0) {
+		memmove(_audioTail.data(), _audioTail.data() + samplesProcessed * sizeof(int16_t), left * sizeof(int16_t));
+		_audioTail.resize(left * sizeof(int16_t));
+	} else {
+		_audioTail.clear();
+	}
+}
+
+bool RoundVideoRecorder::Private::writeFrame(
+		const FramePointer &frame,
+		const CodecPointer &codec,
+		AVStream *stream) {
+	auto error = AvErrorWrap(avcodec_send_frame(codec.get(), frame.get()));
+	if (error) {
+		LogError("avcodec_send_frame", error);
+		deinitEncoding();
+		return false;
+	}
+
+	auto pkt = av_packet_alloc();
+	const auto guard = gsl::finally([&] {
+		av_packet_free(&pkt);
+	});
+	while (true) {
+		error = AvErrorWrap(avcodec_receive_packet(codec.get(), pkt));
+		if (error.code() == AVERROR(EAGAIN)) {
+			return true;  // Need more input
+		} else if (error.code() == AVERROR_EOF) {
+			return true;  // Encoding finished
+		} else if (error) {
+			LogError("avcodec_receive_packet", error);
+			deinitEncoding();
+			return false;
+		}
+
+		pkt->stream_index = stream->index;
+		av_packet_rescale_ts(pkt, codec->time_base, stream->time_base);
+
+		accumulate_max(
+			_resultDuration,
+			PtsToTimeCeil(pkt->pts, stream->time_base));
+
+		error = AvErrorWrap(av_interleaved_write_frame(_format.get(), pkt));
+		if (error) {
+			LogError("av_interleaved_write_frame", error);
+			deinitEncoding();
+			return false;
+		}
+	}
+
+	return true;
+}
+
+RoundVideoRecorder::RoundVideoRecorder(
+	RoundVideoRecorderDescriptor &&descriptor)
+: _descriptor(std::move(descriptor))
+, _preview(std::make_unique<RpWidget>(_descriptor.container))
+, _private() {
+	setup();
+}
+
+RoundVideoRecorder::~RoundVideoRecorder() = default;
+
+Fn<void(Media::Capture::Chunk)> RoundVideoRecorder::audioChunkProcessor() {
+	return [weak = _private.weak()](Media::Capture::Chunk chunk) {
+		weak.with([copy = std::move(chunk)](Private &that) {
+			that.push(copy);
+		});
+	};
+}
+
+void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
+	if (done) {
+		_private.with([done = std::move(done)](Private &that) {
+			done(that.finish());
+		});
+	}
+
+	setPaused(true);
+
+	_preview->hide();
+	if (const auto onstack = _descriptor.hidden) {
+		onstack(this);
+	}
+}
+
+void RoundVideoRecorder::setup() {
+	const auto raw = _preview.get();
+
+	const auto side = style::ConvertScale(kSide * 3 / 4);
+	_descriptor.container->sizeValue(
+	) | rpl::start_with_next([=](QSize outer) {
+		raw->setGeometry(
+			style::centerrect(
+				QRect(QPoint(), outer),
+				QRect(0, 0, side, side)));
+	}, raw->lifetime());
+
+	raw->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(raw);
+		auto hq = PainterHighQualityEnabler(p);
+
+		auto info = _descriptor.track->frameWithInfo(true);
+		if (!info.original.isNull()) {
+			const auto owidth = info.original.width();
+			const auto oheight = info.original.height();
+			const auto omin = std::min(owidth, oheight);
+			const auto ox = (owidth > oheight) ? (owidth - oheight) / 2 : 0;
+			const auto oy = (owidth < oheight) ? (oheight - owidth) / 2 : 0;
+			const auto from = QRect(ox, oy, omin, omin);
+			p.drawImage(QRect(0, 0, side, side), info.original, from);
+		} else {
+			p.setPen(Qt::NoPen);
+			p.setBrush(QColor(0, 0, 0));
+			p.drawEllipse(0, 0, side, side);
+		}
+		_descriptor.track->markFrameShown();
+	}, raw->lifetime());
+
+	_descriptor.track->renderNextFrame() | rpl::start_with_next([=] {
+		const auto info = _descriptor.track->frameWithInfo(true);
+		if (!info.original.isNull() && _lastAddedIndex != info.index) {
+			_lastAddedIndex = info.index;
+			const auto ts = info.mcstimestamp;
+			_private.with([copy = info.original, ts](Private &that) {
+				that.push(ts, copy);
+			});
+		}
+		raw->update();
+	}, raw->lifetime());
+
+	raw->show();
+	raw->raise();
+}
+
+void RoundVideoRecorder::setPaused(bool paused) {
+	if (_paused == paused) {
+		return;
+	}
+	_paused = paused;
+	_preview->update();
+}
+
+
+} // namespace Ui
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
new file mode 100644
index 000000000..1cfb2d289
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -0,0 +1,65 @@
+/*
+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 <crl/crl_object_on_queue.h>
+
+namespace Media::Capture {
+struct Chunk;
+} // namespace Media::Capture
+
+namespace tgcalls {
+class VideoCaptureInterface;
+} // namespace tgcalls
+
+namespace Webrtc {
+class VideoTrack;
+} // namespace Webrtc
+
+namespace Ui {
+
+class RpWidget;
+class RoundVideoRecorder;
+
+struct RoundVideoRecorderDescriptor {
+	not_null<RpWidget*> container;
+	Fn<void(not_null<RoundVideoRecorder*>)> hidden;
+	std::shared_ptr<tgcalls::VideoCaptureInterface> capturer;
+	std::shared_ptr<Webrtc::VideoTrack> track;
+};
+
+struct RoundVideoResult {
+	QByteArray content;
+	QByteArray waveform;
+	crl::time duration = 0;
+};
+
+class RoundVideoRecorder final {
+public:
+	explicit RoundVideoRecorder(RoundVideoRecorderDescriptor &&descriptor);
+	~RoundVideoRecorder();
+
+	[[nodiscard]] Fn<void(Media::Capture::Chunk)> audioChunkProcessor();
+
+	void setPaused(bool paused);
+	void hide(Fn<void(RoundVideoResult)> done = nullptr);
+
+private:
+	class Private;
+
+	void setup();
+
+	const RoundVideoRecorderDescriptor _descriptor;
+	std::unique_ptr<RpWidget> _preview;
+	crl::object_on_queue<Private> _private;
+	int _lastAddedIndex = 0;
+	bool _paused = false;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 7fd873fe6..e42ee37a2 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -366,6 +366,8 @@ PRIVATE
     ui/controls/invite_link_label.h
     ui/controls/peer_list_dummy.cpp
     ui/controls/peer_list_dummy.h
+    ui/controls/round_video_recorder.cpp
+    ui/controls/round_video_recorder.h
     ui/controls/send_as_button.cpp
     ui/controls/send_as_button.h
     ui/controls/send_button.cpp
@@ -500,4 +502,6 @@ PRIVATE
     desktop-app::lib_spellcheck
     desktop-app::lib_stripe
     desktop-app::external_kcoreaddons
+    desktop-app::external_openh264
+    desktop-app::external_webrtc
 )
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index 8751e27d5..fc726486e 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit 8751e27d50d2f26b5d20673e5ddba38e90953570
+Subproject commit fc726486ebd261283583b5cd5f6a97a18b2ab6ca

From ff44f626ba5a9a0ac9a0a919cc6a8ea1de824d30 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Oct 2024 22:43:24 +0400
Subject: [PATCH 017/306] Allow switching between voice/video.

---
 Telegram/Resources/langs/lang.strings         |   3 +-
 .../chat_helpers/chat_helpers.style           |   8 ++
 Telegram/SourceFiles/core/core_settings.cpp   |  11 +-
 Telegram/SourceFiles/core/core_settings.h     |   9 ++
 .../SourceFiles/history/history_widget.cpp    |  39 +++++-
 Telegram/SourceFiles/history/history_widget.h |   4 +
 .../history_view_compose_controls.cpp         |  41 +++++-
 .../controls/history_view_compose_controls.h  |   4 +
 .../history_view_voice_record_bar.cpp         |  19 ++-
 .../history_view_voice_record_button.cpp      |   8 +-
 .../history_view_voice_record_button.h        |   1 +
 .../SourceFiles/media/view/media_view.style   |   4 +
 .../SourceFiles/settings/settings_calls.cpp   |   2 +-
 .../ui/controls/round_video_recorder.cpp      | 120 +++++++++++++-----
 .../ui/controls/round_video_recorder.h        |   4 +
 .../SourceFiles/ui/controls/send_button.cpp   |  15 +++
 .../SourceFiles/ui/controls/send_button.h     |   2 +
 17 files changed, 242 insertions(+), 52 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 66a51005b..3d576fe7c 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3246,7 +3246,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_record_lock_cancel_sure" = "Do you want to stop recording and discard your voice message?";
 "lng_record_listen_cancel_sure" = "Do you want to discard your recorded voice message?";
 "lng_record_lock_discard" = "Discard";
-"lng_record_hold_tip" = "Please hold the mouse button pressed to record a voice message.";
+"lng_record_voice_tip" = "Hold to record audio. Click to switch to video.";
+"lng_record_video_tip" = "Hold to record video. Click to switch to audio.";
 "lng_record_once_first_tooltip" = "Click to set this message to **Play Once**.";
 "lng_record_once_active_tooltip" = "The recipient will be able to listen only once.";
 "lng_will_be_notified" = "Subscribers will be notified when you post.";
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 0c680dd1e..2d3a1cd63 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -150,6 +150,8 @@ SendButton {
 	inner: IconButton;
 	record: icon;
 	recordOver: icon;
+	round: icon;
+	roundOver: icon;
 	sendDisabledFg: color;
 }
 
@@ -1159,6 +1161,10 @@ historyRecordVoiceOnceFg: icon {{ "voice_lock/audio_once_number", windowFgActive
 historyRecordVoiceOnceFgOver: icon {{ "voice_lock/audio_once_number", windowFgActive }};
 historyRecordVoiceOnceInactive: icon {{ "chat/audio_once", windowSubTextFg }};
 historyRecordVoiceActive: icon {{ "chat/input_record_filled", historyRecordVoiceFgActiveIcon }};
+historyRecordRound: icon {{ "info/info_media_round", historyRecordVoiceFg }};
+historyRecordRoundOver: icon {{ "info/info_media_round", historyRecordVoiceFgOver }};
+historyRecordRoundActive: icon {{ "info/info_media_round", historyRecordVoiceFgActiveIcon }};
+historyRecordRoundIconPosition: point(0px, 0px);
 historyRecordSendIconPosition: point(2px, 0px);
 historyRecordVoiceRippleBgActive: lightButtonBgOver;
 historyRecordSignalRadius: 5px;
@@ -1264,6 +1270,8 @@ historySend: SendButton {
 	}
 	record: historyRecordVoice;
 	recordOver: historyRecordVoiceOver;
+	round: historyRecordRound;
+	roundOver: historyRecordRoundOver;
 	sendDisabledFg: historyComposeIconFg;
 }
 
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index af6819f8f..c0293b01a 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -222,7 +222,7 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_customFontFamily)
 		+ sizeof(qint32) * 3
 		+ Serialize::bytearraySize(_tonsiteStorageToken)
-		+ sizeof(qint32) * 3;
+		+ sizeof(qint32) * 4;
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -379,7 +379,8 @@ QByteArray Settings::serialize() const {
 			<< _tonsiteStorageToken
 			<< qint32(_includeMutedCounterFolders ? 1 : 0)
 			<< qint32(_ivZoom.current())
-			<< qint32(_skipToastsInFocus ? 1 : 0);
+			<< qint32(_skipToastsInFocus ? 1 : 0)
+			<< qint32(_recordVideoMessages ? 1 : 0);
 	}
 
 	Ensures(result.size() == size);
@@ -505,6 +506,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	QByteArray tonsiteStorageToken = _tonsiteStorageToken;
 	qint32 ivZoom = _ivZoom.current();
 	qint32 skipToastsInFocus = _skipToastsInFocus ? 1 : 0;
+	qint32 recordVideoMessages = _recordVideoMessages ? 1 : 0;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -820,6 +822,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> skipToastsInFocus;
 	}
+	if (!stream.atEnd()) {
+		stream >> recordVideoMessages;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -1033,6 +1038,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_tonsiteStorageToken = tonsiteStorageToken;
 	_ivZoom = ivZoom;
 	_skipToastsInFocus = (skipToastsInFocus == 1);
+	_recordVideoMessages = (recordVideoMessages == 1);
 }
 
 QString Settings::getSoundPath(const QString &key) const {
@@ -1422,6 +1428,7 @@ void Settings::resetOnLastLogout() {
 	_storiesClickTooltipHidden = false;
 	_ttlVoiceClickTooltipHidden = false;
 	_ivZoom = 100;
+	_recordVideoMessages = false;
 
 	_recentEmojiPreload.clear();
 	_recentEmoji.clear();
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 821f9ec21..b1fce992b 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -628,6 +628,13 @@ public:
 		return _floatPlayerCorner;
 	}
 
+	[[nodiscard]] bool recordVideoMessages() const {
+		return _recordVideoMessages;
+	}
+	void setRecordVideoMessages(bool value) {
+		_recordVideoMessages = value;
+	}
+
 	void updateDialogsWidthRatio(float64 ratio, bool nochat);
 	[[nodiscard]] float64 dialogsWidthRatio(bool nochat) const;
 
@@ -1069,6 +1076,8 @@ private:
 	bool _rememberedFlashBounceNotifyFromTray = false;
 	bool _dialogsWidthSetToZeroWithoutChat = false;
 
+	bool _recordVideoMessages = false;
+
 	QByteArray _photoEditorBrush;
 
 };
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 7f71f6549..3cb539857 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -150,6 +150,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "main/session/send_as_peers.h"
+#include "webrtc/webrtc_environment.h"
 #include "window/notifications_manager.h"
 #include "window/window_adaptive.h"
 #include "window/window_controller.h"
@@ -1068,7 +1069,17 @@ void HistoryWidget::initVoiceRecordBar() {
 
 	_voiceRecordBar->recordingTipRequests(
 	) | rpl::start_with_next([=] {
-		controller()->showToast(tr::lng_record_hold_tip(tr::now));
+		Core::App().settings().setRecordVideoMessages(
+			!Core::App().settings().recordVideoMessages());
+		updateSendButtonType();
+		switch (_send->type()) {
+		case Ui::SendButton::Type::Record:
+			controller()->showToast(tr::lng_record_voice_tip(tr::now));
+			break;
+		case Ui::SendButton::Type::Round:
+			controller()->showToast(tr::lng_record_video_tip(tr::now));
+			break;
+		}
 	}, lifetime());
 
 	_voiceRecordBar->recordingStateChanges(
@@ -2105,6 +2116,7 @@ void HistoryWidget::showHistory(
 		MsgId showAtMsgId,
 		const TextWithEntities &highlightPart,
 		int highlightPartOffsetHint) {
+
 	_pinnedClickedId = FullMsgId();
 	_minPinnedId = std::nullopt;
 	_showAtMsgHighlightPart = {};
@@ -2299,6 +2311,8 @@ void HistoryWidget::showHistory(
 	_contactStatus = nullptr;
 	_businessBotStatus = nullptr;
 
+	updateRecordMediaState();
+
 	if (peerId) {
 		using namespace HistoryView;
 		_peer = session().data().peer(peerId);
@@ -4254,7 +4268,10 @@ auto HistoryWidget::computeSendButtonType() const {
 	} else if (_isInlineBot) {
 		return Type::Cancel;
 	} else if (showRecordButton()) {
-		return Type::Record;
+		return (Core::App().settings().recordVideoMessages()
+			&& _canRecordVideoMessage)
+			? Type::Round
+			: Type::Record;
 	}
 	return Type::Send;
 }
@@ -4588,7 +4605,8 @@ void HistoryWidget::sendButtonClicked() {
 	const auto type = _send->type();
 	if (type == Ui::SendButton::Type::Cancel) {
 		cancelInlineBot();
-	} else if (type != Ui::SendButton::Type::Record) {
+	} else if (type != Ui::SendButton::Type::Record
+		&& type != Ui::SendButton::Type::Round) {
 		send({});
 	}
 }
@@ -4878,7 +4896,7 @@ bool HistoryWidget::isSearching() const {
 }
 
 bool HistoryWidget::showRecordButton() const {
-	return Media::Capture::instance()->available()
+	return _canRecordAudioMessage
 		&& !_voiceRecordBar->isListenState()
 		&& !_voiceRecordBar->isRecordingByAnotherBar()
 		&& !HasSendText(_field)
@@ -4909,7 +4927,9 @@ void HistoryWidget::updateSendButtonType() {
 	}();
 	_send->setSlowmodeDelay(delay);
 	_send->setDisabled(disabledBySlowmode
-		&& (type == Type::Send || type == Type::Record));
+		&& (type == Type::Send
+			|| type == Type::Record
+			|| type == Type::Round));
 
 	if (delay != 0) {
 		base::call_delayed(
@@ -5479,6 +5499,15 @@ void HistoryWidget::inlineBotChanged() {
 	}
 }
 
+void HistoryWidget::updateRecordMediaState() {
+	Media::Capture::instance()->check();
+	_canRecordAudioMessage = Media::Capture::instance()->available();
+
+	const auto environment = &Core::App().mediaDevices();
+	const auto type = Webrtc::DeviceType::Camera;
+	_canRecordVideoMessage = !environment->devices(type).empty();
+}
+
 void HistoryWidget::fieldResized() {
 	moveFieldControls();
 	updateHistoryGeometry();
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 7906fec33..17e836beb 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -497,6 +497,7 @@ private:
 	bool replyToPreviousMessage();
 	bool replyToNextMessage();
 	[[nodiscard]] bool showSlowmodeError();
+	void updateRecordMediaState();
 
 	void hideChildWidgets();
 	void hideSelectorControlsAnimated();
@@ -746,6 +747,9 @@ private:
 	mtpRequestId _inlineBotResolveRequestId = 0;
 	bool _isInlineBot = false;
 
+	bool _canRecordVideoMessage = false;
+	bool _canRecordAudioMessage = false;
+
 	std::unique_ptr<HistoryView::ContactStatus> _contactStatus;
 	std::unique_ptr<HistoryView::BusinessBotStatus> _businessBotStatus;
 
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 47d0b9b6a..0170f1a88 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -81,6 +81,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/silent_toggle.h"
 #include "ui/chat/choose_send_as.h"
 #include "ui/effects/spoiler_mess.h"
+#include "webrtc/webrtc_environment.h"
 #include "window/window_adaptive.h"
 #include "window/window_session_controller.h"
 #include "mainwindow.h"
@@ -1517,7 +1518,7 @@ void ComposeControls::orderControls() {
 }
 
 bool ComposeControls::showRecordButton() const {
-	return ::Media::Capture::instance()->available()
+	return _canRecordAudioMessage
 		&& !_voiceRecordBar->isListenState()
 		&& !_voiceRecordBar->isRecordingByAnotherBar()
 		&& !HasSendText(_field)
@@ -2413,12 +2414,36 @@ void ComposeControls::initVoiceRecordBar() {
 		return false;
 	});
 
+	_voiceRecordBar->recordingTipRequests(
+	) | rpl::start_with_next([=] {
+		Core::App().settings().setRecordVideoMessages(
+			!Core::App().settings().recordVideoMessages());
+		updateSendButtonType();
+		switch (_send->type()) {
+		case Ui::SendButton::Type::Record:
+			_show->showToast(tr::lng_record_voice_tip(tr::now));
+			break;
+		case Ui::SendButton::Type::Round:
+			_show->showToast(tr::lng_record_video_tip(tr::now));
+			break;
+		}
+	}, _wrap->lifetime());
+
 	_voiceRecordBar->updateSendButtonTypeRequests(
 	) | rpl::start_with_next([=] {
 		updateSendButtonType();
 	}, _wrap->lifetime());
 }
 
+void ComposeControls::updateRecordMediaState() {
+	::Media::Capture::instance()->check();
+	_canRecordAudioMessage = ::Media::Capture::instance()->available();
+
+	const auto environment = &Core::App().mediaDevices();
+	const auto type = Webrtc::DeviceType::Camera;
+	_canRecordVideoMessage = !environment->devices(type).empty();
+}
+
 void ComposeControls::updateWrappingVisibility() {
 	const auto hidden = _hidden.current();
 	const auto &restriction = _writeRestriction.current();
@@ -2454,7 +2479,10 @@ auto ComposeControls::computeSendButtonType() const {
 	} else if (_isInlineBot) {
 		return Type::Cancel;
 	} else if (showRecordButton()) {
-		return Type::Record;
+		return (Core::App().settings().recordVideoMessages()
+			&& _canRecordVideoMessage)
+			? Type::Round
+			: Type::Record;
 	}
 	return (_mode == Mode::Normal) ? Type::Send : Type::Schedule;
 }
@@ -2487,7 +2515,9 @@ void ComposeControls::updateSendButtonType() {
 	}();
 	_send->setSlowmodeDelay(delay);
 	_send->setDisabled(_sendDisabledBySlowmode.current()
-		&& (type == Type::Send || type == Type::Record));
+		&& (type == Type::Send
+			|| type == Type::Record
+			|| type == Type::Round));
 }
 
 void ComposeControls::finishAnimating() {
@@ -3149,8 +3179,9 @@ bool ComposeControls::isRecording() const {
 bool ComposeControls::isRecordingPressed() const {
 	return !_voiceRecordBar->isRecordingLocked()
 		&& (!_voiceRecordBar->isHidden()
-			|| (_send->type() == Ui::SendButton::Type::Record
-				&& _send->isDown()));
+			|| (_send->isDown()
+				&& (_send->type() == Ui::SendButton::Type::Record
+					|| _send->type() == Ui::SendButton::Type::Round)));
 }
 
 rpl::producer<bool> ComposeControls::recordingActiveValue() const {
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 fc26079e7..91e7e9d27 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -278,6 +278,7 @@ private:
 	bool updateSendAsButton();
 	void updateAttachBotsMenu();
 	void updateHeight();
+	void updateRecordMediaState();
 	void updateWrappingVisibility();
 	void updateControlsVisibility();
 	void updateControlsGeometry(QSize size);
@@ -437,6 +438,9 @@ private:
 	bool _botCommandShown = false;
 	bool _likeShown = false;
 
+	bool _canRecordVideoMessage = false;
+	bool _canRecordAudioMessage = false;
+
 	FullMsgId _editingId;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
 	bool _canReplaceMedia = false;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 7ed5bf0db..dd5968335 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
@@ -1535,6 +1535,7 @@ void VoiceRecordBar::init() {
 				return;
 			}
 			_recordingTipRequired = true;
+			_recordingVideo = (_send->type() == Ui::SendButton::Type::Round);
 			_startTimer.callOnce(st::universalDuration);
 		} else if (e->type() == QEvent::MouseButtonRelease) {
 			if (base::take(_recordingTipRequired)) {
@@ -1589,6 +1590,11 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 	//	_videoHiding.back()->hide();
 	//}
 	AssertIsDebug();
+	if (_send->type() == Ui::SendButton::Type::Round) {
+		_level->setType(VoiceRecordButton::Type::Round);
+	} else {
+		_level->setType(VoiceRecordButton::Type::Record);
+	}
 	const auto to = show ? 1. : 0.;
 	const auto from = show ? 0. : 1.;
 	auto animationCallback = [=, callback = std::move(callback)](auto value) {
@@ -1656,7 +1662,6 @@ void VoiceRecordBar::startRecording() {
 	if (isRecording()) {
 		return;
 	}
-	_recordingVideo = true; AssertIsDebug();
 	auto appearanceCallback = [=] {
 		if (_showAnimation.animating()) {
 			return;
@@ -1694,6 +1699,15 @@ void VoiceRecordBar::startRecording() {
 		}, [=] {
 			stop(false);
 		}, _recordingLifetime);
+		if (_videoRecorder) {
+			_videoRecorder->updated(
+			) | rpl::start_with_next_error([=](const Update &update) {
+				_recordingTipRequired = (update.samples < kMinSamples);
+				recordUpdated(update.level, update.samples);
+			}, [=] {
+				stop(false);
+			}, _recordingLifetime);
+		}
 		_recordingLifetime.add([=] {
 			_recording = false;
 		});
@@ -2013,7 +2027,8 @@ bool VoiceRecordBar::isListenState() const {
 }
 
 bool VoiceRecordBar::isTypeRecord() const {
-	return (_send->type() == Ui::SendButton::Type::Record);
+	return (_send->type() == Ui::SendButton::Type::Record)
+		|| (_send->type() == Ui::SendButton::Type::Round);
 }
 
 bool VoiceRecordBar::isRecordingByAnotherBar() const {
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 986ea9d6e..b32fa2d96 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
@@ -137,10 +137,14 @@ void VoiceRecordButton::init() {
 			const auto state = *currentState;
 			const auto icon = (state == Type::Send)
 				? st::historySendIcon
-				: st::historyRecordVoiceActive;
+				: (state == Type::Record)
+				? st::historyRecordVoiceActive
+				: st::historyRecordRoundActive;
 			const auto position = (state == Type::Send)
 				? st::historyRecordSendIconPosition
-				: QPoint(0, 0);
+				: (state == Type::Record)
+				? QPoint(0, 0)
+				: st::historyRecordRoundIconPosition;
 			icon.paint(
 				p,
 				-icon.width() / 2 + position.x(),
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
index bd3f0150c..e8e2dd7b6 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
@@ -31,6 +31,7 @@ public:
 	enum class Type {
 		Send,
 		Record,
+		Round,
 	};
 
 	void setType(Type state);
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index e1fb123d7..e25092dbf 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -480,6 +480,8 @@ storiesLike: IconButton(storiesAttach) {
 }
 storiesRecordVoice: icon {{ "chat/input_record", storiesComposeGrayIcon }};
 storiesRecordVoiceOver: icon {{ "chat/input_record", storiesComposeGrayIcon }};
+storiesRecordRound: icon {{ "info/info_media_round", storiesComposeGrayIcon }};
+storiesRecordRoundOver: icon {{ "info/info_media_round", storiesComposeGrayIcon }};
 storiesRemoveSet: IconButton(stickerPanRemoveSet) {
 	icon: icon {{ "simple_close", storiesComposeGrayIcon }};
 	iconOver: icon {{ "simple_close", storiesComposeGrayIcon }};
@@ -686,6 +688,8 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		}
 		record: storiesRecordVoice;
 		recordOver: storiesRecordVoiceOver;
+		round: storiesRecordRound;
+		roundOver: storiesRecordRoundOver;
 		sendDisabledFg: storiesComposeGrayText;
 	}
 	attach: storiesAttach;
diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/settings_calls.cpp
index de7c34e3e..d7e2947bd 100644
--- a/Telegram/SourceFiles/settings/settings_calls.cpp
+++ b/Telegram/SourceFiles/settings/settings_calls.cpp
@@ -679,7 +679,7 @@ object_ptr<Ui::GenericBox> ChooseCameraDeviceBox(
 		const style::Radio *radioSt) {
 	return Box(
 		ChooseMediaDeviceBox,
-		tr::lng_settings_call_device_default(),
+		tr::lng_settings_call_camera(),
 		Core::App().mediaDevices().devicesValue(DeviceType::Camera),
 		std::move(currentId),
 		std::move(chosen),
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 09b60bb7b..ffcd584c3 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -19,7 +19,7 @@ namespace Ui {
 namespace {
 
 constexpr auto kSide = 400;
-constexpr auto kOutputFilename = "C:\\Tmp\\TestVideo\\output.mp4";
+constexpr auto kUpdateEach = crl::time(100);
 
 using namespace FFmpeg;
 
@@ -33,6 +33,9 @@ public:
 	void push(int64 mcstimestamp, const QImage &frame);
 	void push(const Media::Capture::Chunk &chunk);
 
+	using Update = Media::Capture::Update;
+	[[nodiscard]] rpl::producer<Update, rpl::empty_error> updated() const;
+
 	[[nodiscard]] RoundVideoResult finish();
 
 private:
@@ -42,6 +45,23 @@ private:
 	int write(uint8_t *buf, int buf_size);
 	int64_t seek(int64_t offset, int whence);
 
+	void initEncoding();
+	bool initVideo();
+	bool initAudio();
+	void deinitEncoding();
+	void finishEncoding();
+	void fail();
+
+	void encodeVideoFrame(int64 mcstimestamp, const QImage &frame);
+	void encodeAudioFrame(const Media::Capture::Chunk &chunk);
+	bool writeFrame(
+		const FramePointer &frame,
+		const CodecPointer &codec,
+		AVStream *stream);
+
+	void updateMaxLevel(const Media::Capture::Chunk &chunk);
+	void updateResultDuration(int64 pts, AVRational timeBase);
+
 	const crl::weak_on_queue<Private> _weak;
 
 	FormatPointer _format;
@@ -72,18 +92,9 @@ private:
 	int64_t _resultOffset = 0;
 	crl::time _resultDuration = 0;
 
-	void initEncoding();
-	bool initVideo();
-	bool initAudio();
-	void deinitEncoding();
-	void finishEncoding();
-
-	void encodeVideoFrame(int64 mcstimestamp, const QImage &frame);
-	void encodeAudioFrame(const Media::Capture::Chunk &chunk);
-	bool writeFrame(
-		const FramePointer &frame,
-		const CodecPointer &codec,
-		AVStream *stream);
+	ushort _maxLevelSinceLastUpdate = 0;
+	crl::time _lastUpdateDuration = 0;
+	rpl::event_stream<Update, rpl::empty_error> _updates;
 
 };
 
@@ -94,11 +105,6 @@ RoundVideoRecorder::Private::Private(crl::weak_on_queue<Private> weak)
 
 RoundVideoRecorder::Private::~Private() {
 	finishEncoding();
-
-	QFile file(kOutputFilename);
-	if (file.open(QIODevice::WriteOnly)) {
-		file.write(_result);
-	}
 }
 
 int RoundVideoRecorder::Private::Write(void *opaque, uint8_t *buf, int buf_size) {
@@ -155,7 +161,7 @@ void RoundVideoRecorder::Private::initEncoding() {
 		"mp4"_q);
 
 	if (!initVideo() || !initAudio()) {
-		deinitEncoding();
+		fail();
 		return;
 	}
 
@@ -164,7 +170,7 @@ void RoundVideoRecorder::Private::initEncoding() {
 		nullptr));
 	if (error) {
 		LogError("avformat_write_header", error);
-		deinitEncoding();
+		fail();
 	}
 }
 
@@ -343,6 +349,11 @@ void RoundVideoRecorder::Private::finishEncoding() {
 	deinitEncoding();
 }
 
+auto RoundVideoRecorder::Private::updated() const
+-> rpl::producer<Update, rpl::empty_error> {
+	return _updates.events();
+}
+
 RoundVideoResult RoundVideoRecorder::Private::finish() {
 	if (!_format) {
 		return {};
@@ -355,6 +366,11 @@ RoundVideoResult RoundVideoRecorder::Private::finish() {
 	};
 };
 
+void RoundVideoRecorder::Private::fail() {
+	deinitEncoding();
+	_updates.fire_error({});
+}
+
 void RoundVideoRecorder::Private::deinitEncoding() {
 	_swsContext = nullptr;
 	_videoCodec = nullptr;
@@ -406,7 +422,7 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 		AV_PIX_FMT_YUV420P,
 		&_swsContext);
 	if (!_swsContext) {
-		deinitEncoding();
+		fail();
 		return;
 	}
 
@@ -444,14 +460,15 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 		_videoFrame->linesize);
 
 	_videoFrame->pts = mcstimestamp - _videoFirstTimestamp;
-
-	LOG(("Audio At: %1").arg(_videoFrame->pts / 1'000'000.));
 	if (!writeFrame(_videoFrame, _videoCodec, _videoStream)) {
 		return;
 	}
 }
 
-void RoundVideoRecorder::Private::encodeAudioFrame(const Media::Capture::Chunk &chunk) {
+void RoundVideoRecorder::Private::encodeAudioFrame(
+		const Media::Capture::Chunk &chunk) {
+	updateMaxLevel(chunk);
+
 	if (_audioTail.isEmpty()) {
 		_audioTail = chunk.samples;
 	} else {
@@ -459,7 +476,8 @@ void RoundVideoRecorder::Private::encodeAudioFrame(const Media::Capture::Chunk &
 	}
 
 	const int inSamples = _audioTail.size() / sizeof(int16_t);
-	const uint8_t *inData = reinterpret_cast<const uint8_t*>(_audioTail.constData());
+	const uint8_t *inData = reinterpret_cast<const uint8_t*>(
+		_audioTail.constData());
 	int samplesProcessed = 0;
 
 	while (samplesProcessed + _audioCodec->frame_size <= inSamples) {
@@ -484,7 +502,7 @@ void RoundVideoRecorder::Private::encodeAudioFrame(const Media::Capture::Chunk &
 
 		if (error) {
 			LogError("swr_convert", error);
-			deinitEncoding();
+			fail();
 			return;
 		}
 
@@ -493,8 +511,6 @@ void RoundVideoRecorder::Private::encodeAudioFrame(const Media::Capture::Chunk &
 
 		_audioFrame->pts = _audioPts;
 		_audioPts += _audioFrame->nb_samples;
-
-		LOG(("Audio At: %1").arg(_audioFrame->pts / 48'000.));
 		if (!writeFrame(_audioFrame, _audioCodec, _audioStream)) {
 			return;
 		}
@@ -514,10 +530,14 @@ bool RoundVideoRecorder::Private::writeFrame(
 		const FramePointer &frame,
 		const CodecPointer &codec,
 		AVStream *stream) {
+	if (frame) {
+		updateResultDuration(frame->pts, codec->time_base);
+	}
+
 	auto error = AvErrorWrap(avcodec_send_frame(codec.get(), frame.get()));
 	if (error) {
 		LogError("avcodec_send_frame", error);
-		deinitEncoding();
+		fail();
 		return false;
 	}
 
@@ -533,21 +553,19 @@ bool RoundVideoRecorder::Private::writeFrame(
 			return true;  // Encoding finished
 		} else if (error) {
 			LogError("avcodec_receive_packet", error);
-			deinitEncoding();
+			fail();
 			return false;
 		}
 
 		pkt->stream_index = stream->index;
 		av_packet_rescale_ts(pkt, codec->time_base, stream->time_base);
 
-		accumulate_max(
-			_resultDuration,
-			PtsToTimeCeil(pkt->pts, stream->time_base));
+		updateResultDuration(pkt->pts, stream->time_base);
 
 		error = AvErrorWrap(av_interleaved_write_frame(_format.get(), pkt));
 		if (error) {
 			LogError("av_interleaved_write_frame", error);
-			deinitEncoding();
+			fail();
 			return false;
 		}
 	}
@@ -555,6 +573,30 @@ bool RoundVideoRecorder::Private::writeFrame(
 	return true;
 }
 
+void RoundVideoRecorder::Private::updateMaxLevel(
+		const Media::Capture::Chunk &chunk) {
+	const auto &list = chunk.samples;
+	const auto samples = int(list.size() / sizeof(ushort));
+	const auto data = reinterpret_cast<const ushort*>(list.constData());
+	for (const auto value : gsl::make_span(data, samples)) {
+		accumulate_max(_maxLevelSinceLastUpdate, value);
+	}
+}
+
+void RoundVideoRecorder::Private::updateResultDuration(
+		int64 pts,
+		AVRational timeBase) {
+	accumulate_max(_resultDuration, PtsToTimeCeil(pts, timeBase));
+
+	if (_lastUpdateDuration + kUpdateEach >= _resultDuration) {
+		_lastUpdateDuration = _resultDuration;
+		_updates.fire({
+			.samples = int(_resultDuration * 48),
+			.level = base::take(_maxLevelSinceLastUpdate),
+		});
+	}
+}
+
 RoundVideoRecorder::RoundVideoRecorder(
 	RoundVideoRecorderDescriptor &&descriptor)
 : _descriptor(std::move(descriptor))
@@ -573,6 +615,13 @@ Fn<void(Media::Capture::Chunk)> RoundVideoRecorder::audioChunkProcessor() {
 	};
 }
 
+auto RoundVideoRecorder::updated() const
+-> rpl::producer<Update, rpl::empty_error> {
+	return _private.producer_on_main([](const Private &that) {
+		return that.updated();
+	});
+}
+
 void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
 	if (done) {
 		_private.with([done = std::move(done)](Private &that) {
@@ -642,6 +691,9 @@ void RoundVideoRecorder::setPaused(bool paused) {
 		return;
 	}
 	_paused = paused;
+	_descriptor.track->setState(paused
+		? Webrtc::VideoState::Inactive
+		: Webrtc::VideoState::Active);
 	_preview->update();
 }
 
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 1cfb2d289..56af2110a 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Media::Capture {
 struct Chunk;
+struct Update;
 } // namespace Media::Capture
 
 namespace tgcalls {
@@ -49,6 +50,9 @@ public:
 	void setPaused(bool paused);
 	void hide(Fn<void(RoundVideoResult)> done = nullptr);
 
+	using Update = Media::Capture::Update;
+	[[nodiscard]] rpl::producer<Update, rpl::empty_error> updated() const;
+
 private:
 	class Private;
 
diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
index 639c2a75f..e0388c032 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -86,6 +86,7 @@ void SendButton::paintEvent(QPaintEvent *e) {
 	}
 	switch (_type) {
 	case Type::Record: paintRecord(p, over); break;
+	case Type::Round: paintRound(p, over); break;
 	case Type::Save: paintSave(p, over); break;
 	case Type::Cancel: paintCancel(p, over); break;
 	case Type::Send: paintSend(p, over); break;
@@ -108,6 +109,20 @@ void SendButton::paintRecord(QPainter &p, bool over) {
 	icon.paintInCenter(p, rect());
 }
 
+void SendButton::paintRound(QPainter &p, bool over) {
+	if (!isDisabled()) {
+		paintRipple(
+			p,
+			(width() - _st.inner.rippleAreaSize) / 2,
+			_st.inner.rippleAreaPosition.y());
+	}
+
+	const auto &icon = (isDisabled() || !over)
+		? _st.round
+		: _st.roundOver;
+	icon.paintInCenter(p, rect());
+}
+
 void SendButton::paintSave(QPainter &p, bool over) {
 	const auto &saveIcon = over
 		? st::historyEditSaveIconOver
diff --git a/Telegram/SourceFiles/ui/controls/send_button.h b/Telegram/SourceFiles/ui/controls/send_button.h
index 5b3cc104d..835974f51 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.h
+++ b/Telegram/SourceFiles/ui/controls/send_button.h
@@ -26,6 +26,7 @@ public:
 		Schedule,
 		Save,
 		Record,
+		Round,
 		Cancel,
 		Slowmode,
 	};
@@ -47,6 +48,7 @@ private:
 	[[nodiscard]] bool isSlowmode() const;
 
 	void paintRecord(QPainter &p, bool over);
+	void paintRound(QPainter &p, bool over);
 	void paintSave(QPainter &p, bool over);
 	void paintCancel(QPainter &p, bool over);
 	void paintSend(QPainter &p, bool over);

From 6bc1049858839cdbf87185aefe5ceca647d97d24 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Oct 2024 13:54:09 +0400
Subject: [PATCH 018/306] Use nice icon for video message recording.

---
 Telegram/Resources/icons/chat/input_video.png    | Bin 0 -> 621 bytes
 Telegram/Resources/icons/chat/input_video@2x.png | Bin 0 -> 1289 bytes
 Telegram/Resources/icons/chat/input_video@3x.png | Bin 0 -> 2000 bytes
 .../SourceFiles/chat_helpers/chat_helpers.style  |   6 +++---
 Telegram/SourceFiles/media/view/media_view.style |   4 ++--
 5 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 Telegram/Resources/icons/chat/input_video.png
 create mode 100644 Telegram/Resources/icons/chat/input_video@2x.png
 create mode 100644 Telegram/Resources/icons/chat/input_video@3x.png

diff --git a/Telegram/Resources/icons/chat/input_video.png b/Telegram/Resources/icons/chat/input_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..34a71853d435f3852e253d9303512b893ecc5832
GIT binary patch
literal 621
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1SFZ~=vx6P#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93uP|pHJ24*152ohVs1eeuVz>Hvn6jnV;TLV;f-P6S}B!ctp
zG{Y_?Ly@-9*e^V<8P{ytBy`m4?Kie-V)Gm}1hYg-eqfpBv_<d=^NpLU(*q{n<!4s(
zF`9g);g-tL51;<OKkpqEXLK^9=CkAnAoQ5oxMsKB{PWYjmO3p=m=d%8`s0rkyYKeo
zcx||t@#cGV+rREyiw9xrug4y`5pE;Fqc-_u+3r{!vG&7?S-wve2dymG9m~Yue)wg{
zD<Qi}?OW~S`Y&coIeTmQ35^{Odsq^mEYM?Fc{|6fFYsuCg|g!dqkT8q-)zj?8+YF0
zzs>B4PE7(kCvI(iS~N3h)zz$3*?QBHulp~byuz4gSHmiPp@=715}Wor*KXDJ>x=Sb
ziO`#VHm%rh{`xTOIniscRoLWhzdhHleXVGbVy9I_7RTn;wP7<Y;ypL-`2E)}p)=tE
zYs;hsdQ+xMUijMcO^(^+qYVK<*IOq|IyQaF8n&Y$I%2ME&gU8eELuLy$ZI-axOm9|
zA(nkHde1-4%(`@#!Rg_G;6RV213ZE(j{EOl@8%ZJ(sE0RSufakxoYpSww257rypLx
zy+STEc81P3Z~X~7R@S^Zl@heFUTF7Sy*%HrccuGXf5%VT{ehXEapEKwfBEC;4Yfy$
otXFI;xBr%slmCMU1T`dou+MrFal<6f&>R%ip00i_>zopr07*FidjJ3c

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_video@2x.png b/Telegram/Resources/icons/chat/input_video@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0657613a8aae906239676e8bc939d41e5e352daf
GIT binary patch
literal 1289
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51SA=YQ-6V}Aa^H*b?0PW0y!?J5uRzjz6@GG
zHU|S^dnN-5NC^;20Wkvu^8!W&W+2T75?jComkn6Jj9`Nl8b0vxXJB9{_H=O!sbG9N
z>%8__M~UO_cfLF3Bo>yUn7DL}N6;oE?xi087`e4?o|KB#{@)bCt$L(wii+73QPorZ
zyxcb*-SeM!PUZ7IiQ;>fbIuiuJ>T=*`2O?j<<I6;rrrDedV1Xy##9H%05+_Y*PO<f
zjvv|C+0ju^uU@@cwQ7~k8+&{E`*-iooj?En{rlA`#Qm3U+EkR4_3FouA8+5jjXx;g
zlfczHLpP4^-MqH;_WZm&E<fW#3~7e%<UEaxnic1sewvn^zI^%e-sP7sU%q=cmMOJB
zYT<8Iey7^n+Wh?d=;+xOXU(5Kf9A|ae&wIrx_9ohysZEF_3O23*G9HBY4S)twm5Za
z)Bd>=Ckk@Dc=|N8sOZxDfIVtyhI(;EGPghSJ&vB?ccxfcBf7A!&{LxPzGb^%tCtMV
zo{FeVnTE;I%Wp<}*>Gr+B4_%KJI7iZxj(jEw(yCtyxQtgP*fyzE%=^Q--i>wdS35&
zb9#UMzBLoW7fhRUdhXo0dvyM8U$(4m-y#lXFU!)hvTr|r%vkrWFJWc!!X(inTgwHX
z&ELS{tFnFj_LYLds-J%zIpR`YUheAJdT{@~eed4C*Vofqw`R?SYB#ycgFUK6kFA8J
z>HL{{XU>JJS5L0ITC{QF#}6M0Dl2y`U;aFKo5XW5MPG&n)g6mZS{SXH{Bh#if3`B2
z=fuiNOM$^)IBDt2M~{-KtAD?G)pfhAt!>}Feb1hyt+TeW>g(%cV`t~*<74^xc;E5k
z$5SsoQqr@qdi(I9W5Sy{Ha4~#6{lG&%oYph$J*TbX7Bl@{foNuH{J7ZFI}4SMfbBW
z(9CDgmhn1!2s6xLSlqOT_q3OgL1LOFn^vPyPkUS2ym|8;H7(<0Fko1*K%!kIM$RDd
zSxRUBAp^zegA4{oR|e|X*xq(p(IPo#jl++{_m$i?$#NOIOc6P&l75(LN{iQwS59FI
z)~?n4E->=|<6?<*VZ2i}tmIv{e*InHX-~QK1eRYfb!qduak2Je;zFTie$!G`=-t_D
zl(6{Sy4M{%Qw?@Ay-I0XFs+D(HKM-W{=UYdck8~YrmSeW$-GfpK}75L38vG1LJ`5i
z!bKu?w+C#So8q~m<>M(ij~aa)osjTw_2Y~TGZK1|Hg&~kA85JxaihF~j#Xu8si|W6
zEQS+$Orj!xCly}gnqly}apOiq$vHAc#U{d*+XOGMG!!rbL&N(;-HZ*l51&5mT~@Qn
zb_uh&nc0e^8m=jY|903;$zfdlXnN=3up2F$O@DQNGk$Z}G*KbfuB@OZ<(FB>wjW>R
zFTH!tzvSZ0o0e8qyS8sv&z|ZzBf7<e(c|njnG%WX$NGM^*7MK4)$rY6<-ZD@|NH81
zh*royl5{^-y6V0T<D99dvM*k;TBh64^vSBDebuJwt3hS@mtUmZi$B$v9JxntD(8YN
zaUJOe3a3_PRsMbI_-kj#zbi@?(>|Y-Ikx9))Yr-Xw@o=XVcSiu>GsQR&Rp$+E5`$i
efdw2qf7mVB?#^Gkwp0LA40*cxxvX<aXaWHCE=v3W

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_video@3x.png b/Telegram/Resources/icons/chat/input_video@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fb24d542a5c35453165c17288d4256d54f3212b
GIT binary patch
literal 2000
zcmbVNYdjMQ8{cNMi43_9(WqR<nX}qR&CF#krMZ=;<G2)Zi)cbv$fe^h6n=Aw9LqJi
zJJQ^*<s`(3xh->7o2}mY^1koa_x<pH{?FzAd!BF4Kk<@{nW(V5FaQ7$wJ^uq@j2`e
z5D-5$3KdiM1Prz_!vU&?;j8=t@8M+OX>ASA;O7tkF#Z+*d??{Vo(}*(pa=*M;4|>B
zR|NX^G^|MAKlz~$^2MG7035+s;4hNGfa?Vvwj|<lx|FMm%3B+1CgMg+F>JwD<&k;G
ziTAg^_L@k>MI#7fAe>s4vLGTZhOp>gq*9}z0)(o`L!`D}0_F}3H+B{mYiHW9E%!nl
zMx>GCjdNb@J5y7?1bgj&4qpE10Zxt<M}i2Q5Lw{K8~=0h5CARErIitLbY`1FnEhFr
zjx^V{2zF3NNC<SVprF9l&+h?`vp4<PpGYK5Pfx3fxXKlGau)kCdU{NqxC;zZQ<7OJ
z>AGC<V^a9mm!2G5HzhbctSg@?QAq&kKlU{rWhp8uVzJnBS2uVteb|Czb_d)Dg+dt`
zM*N6qeaGYR8X64r&#*If!=MVb?@n!GXy)bR-S+WuPh$rZ8j<(8?46HW{gGG$11V+$
zolc*an0W0!*B<Z>ZqkqXxUuoqO6qv7NSw#@mX7bc45yv*4>)(%KN&;`M}EMUk`yIl
zTiup5*~S%{^e4*WzovID(4P!Up8&5+9osfsW{#r^yRJWpL~XEUTS{qVn+d(6RpQQ5
zJ1}*-@tiZe`}@+v2u-oK-hSpom1R{6`ZG+nexDvw{%8tq$G}c=@9Lug<f^{NHxD^p
z`q)W}5ffN}ukwnsPPicI%1flZsuf=KtW}ytrIYqJRdk1eU~WG%$&Dr;YX{1EDm-;y
zB|tKntW<4T@cVNU*=@W=?d+GuJ&q=glK)W2sp+rt7)(&oN!OvFA#H8#u^5db)SeLr
zgOQabRTFsngh)90&P+l?gKxYyRLA+@qlEXu$Ir-Iz0ukn^)r&c*TlrcW-cWqh0SK)
z+xYxvb@dXemkbLBT^$%^%Eoo&qx}~TzW?Bnk671-2L;)U2qWfKL7uWLH*wFw_{P}x
zC>{G-$#CCYS7@wNu{dkyO*fj;6?+6@gM$qs-wD#ebp_@1t(hMf$r%yIm+#YDe72|B
z+uLPyT}k#mSRmHUtvw=9LcFiOrbcg)!dzQBAIbeVH}{jX$6VCl7K$E2WttHPsD$qB
z?!?5zsi~=vLgO99oGV&>uNxafLqd%1@4hH2Q^yR`ch){=+H5&$MJ<Emu1F{|GOZa&
zG_N^)Zhrnt8qGG84)~=a6?AcY8HTRtOSdUZi88Xi7KX(s<vx9ymJHNQzu@JyytL$5
zD<p#Kmd)u+KN0s>Eqn2VbD<~%rEneLd~36_^MY1<Z$*J%a$wq(IMt$7p5IYQq_R5`
zTLMC(F!3cWeHx_7{8yLmqa4-r8-CkmuC509h^01}wSy5=*9y|f6i}Xz@hyem<koQK
zWOqS$U`{Ni3a&*|fs9tUuW0&u2KBreWyPt5>5W-36u{mNNhL-uSxC3+*T)2BpsJ~u
zCit!!1XTY#K5+e19SRL^lEg=Z1e{yxfPuZ+&N>g;70ypwyc?jmd8qp7c|g;HjH+!!
zH_I^Rf3Pi6E=Etf%lHJ9M?ua6O&kw6mEg2CA2b@pKmXO-VnD9NDI??X(jMSNEEcbs
zMT8YieRDUn%zN8ko~bDO>DepOI~o{B@2UjYJF{lv6vxSJxCN#0t_GCaG;mST;aGMl
zOxQcr(Sw+1&)wPzM8nVas{?>grgZtDYjL!v*g<!^*mx`X8_VbchxEBjYd(f5D>)kO
z;}R3+8sJ3!9Xvfd%V^fQzg5SGadNMUO0Yg{gizlM`XdjvUUj8-*Lzn_jLBjNIh15M
z%Nv(kcVtm&29H8<FD|HuUJeF<Qi>=P!8YPw;&xpe4rgU$Whfs_p+-o+7mo{J+yk=x
zv~i}M54oauWDGyGO&X(b1RNYJCn@D|g9UQObJmxIZXHNhJ>}N6RKA7<sxPaT&u+|h
zWa#0T1DEUSEEV+~sq#})OCrbX*gs31{2#M+7Rt)KnVclxp{?r?0<|2*WJ!6mhBGzZ
zytM0IJ&Jf7FQ)9;5&6K^*UAn3PBlPSU=SIqz^gaZ#yVV1^RMe4yFX+_E0xm7Nkrb;
z+w5QQYFQcEuK$WF&8B~jOkgFFOJ}YYW5Lko?K^+Y@6_j03`1_W@P;J4h2&a_CnTAF
z_+MU{JaA(={^Zf-uVu24>t$qHqrBTT#)KG)nvS*L4{-o>+3{!2N)_Mf=J+8IZrAD9
z*w{DcQ~M1a_RV+!nnB^pdy-L^BtqdyV&7djIn16Aws6ye!g+{FSL4ZWjZ?LURhi!g
zO>)gw*$rO(q?G9X$XB);u|yxaYK1q1zo}7WZz~ekUXW-XN@ZMHOUvO8vM)&ohC#Ga
zyqE}Td}pos(3fRp4(wxH({$kf;XwcGT3p+Cx83jOe~=pdQ}|{IurRg3SL1HP{0pq=
BnY;i1

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 2d3a1cd63..b1bfa2f78 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1161,9 +1161,9 @@ historyRecordVoiceOnceFg: icon {{ "voice_lock/audio_once_number", windowFgActive
 historyRecordVoiceOnceFgOver: icon {{ "voice_lock/audio_once_number", windowFgActive }};
 historyRecordVoiceOnceInactive: icon {{ "chat/audio_once", windowSubTextFg }};
 historyRecordVoiceActive: icon {{ "chat/input_record_filled", historyRecordVoiceFgActiveIcon }};
-historyRecordRound: icon {{ "info/info_media_round", historyRecordVoiceFg }};
-historyRecordRoundOver: icon {{ "info/info_media_round", historyRecordVoiceFgOver }};
-historyRecordRoundActive: icon {{ "info/info_media_round", historyRecordVoiceFgActiveIcon }};
+historyRecordRound: icon {{ "chat/input_video", historyRecordVoiceFg }};
+historyRecordRoundOver: icon {{ "chat/input_video", historyRecordVoiceFgOver }};
+historyRecordRoundActive: icon {{ "chat/input_video", historyRecordVoiceFgActiveIcon }};
 historyRecordRoundIconPosition: point(0px, 0px);
 historyRecordSendIconPosition: point(2px, 0px);
 historyRecordVoiceRippleBgActive: lightButtonBgOver;
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index e25092dbf..c235b7d59 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -480,8 +480,8 @@ storiesLike: IconButton(storiesAttach) {
 }
 storiesRecordVoice: icon {{ "chat/input_record", storiesComposeGrayIcon }};
 storiesRecordVoiceOver: icon {{ "chat/input_record", storiesComposeGrayIcon }};
-storiesRecordRound: icon {{ "info/info_media_round", storiesComposeGrayIcon }};
-storiesRecordRoundOver: icon {{ "info/info_media_round", storiesComposeGrayIcon }};
+storiesRecordRound: icon {{ "chat/input_video", storiesComposeGrayIcon }};
+storiesRecordRoundOver: icon {{ "chat/input_video", storiesComposeGrayIcon }};
 storiesRemoveSet: IconButton(stickerPanRemoveSet) {
 	icon: icon {{ "simple_close", storiesComposeGrayIcon }};
 	iconOver: icon {{ "simple_close", storiesComposeGrayIcon }};

From 17996757fd3a7de2caaed1a955109affc6fc7a4e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Oct 2024 13:54:18 +0400
Subject: [PATCH 019/306] Show round video preview.

---
 .../ui/controls/round_video_recorder.cpp      | 57 ++++++++++++++-----
 .../ui/controls/round_video_recorder.h        |  5 ++
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index ffcd584c3..cf8dda398 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/debug_log.h"
 #include "ffmpeg/ffmpeg_utility.h"
 #include "media/audio/media_audio_capture.h"
+#include "ui/image/image_prepare.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "webrtc/webrtc_video_track.h"
@@ -637,50 +638,76 @@ void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
 	}
 }
 
+void RoundVideoRecorder::prepareFrame() {
+	if (_frameOriginal.isNull() || _preparedIndex == _lastAddedIndex) {
+		return;
+	}
+	_preparedIndex = _lastAddedIndex;
+
+	const auto owidth = _frameOriginal.width();
+	const auto oheight = _frameOriginal.height();
+	const auto omin = std::min(owidth, oheight);
+	const auto ox = (owidth > oheight) ? (owidth - oheight) / 2 : 0;
+	const auto oy = (owidth < oheight) ? (oheight - owidth) / 2 : 0;
+	const auto from = QRect(ox, oy, omin, omin);
+	const auto bytesPerLine = _frameOriginal.bytesPerLine();
+	const auto depth = _frameOriginal.depth() / 8;
+	const auto shift = (bytesPerLine * from.y()) + (from.x() * depth);
+	auto copy = QImage(
+		_frameOriginal.constBits() + shift,
+		omin, omin,
+		bytesPerLine,
+		_frameOriginal.format());
+
+	const auto ratio = style::DevicePixelRatio();
+	_framePrepared = Images::Circle(copy.scaled(
+		_side * ratio,
+		_side * ratio,
+		Qt::KeepAspectRatio,
+		Qt::SmoothTransformation));
+	_framePrepared.setDevicePixelRatio(ratio);
+}
+
 void RoundVideoRecorder::setup() {
 	const auto raw = _preview.get();
 
-	const auto side = style::ConvertScale(kSide * 3 / 4);
+	_side = style::ConvertScale(kSide * 3 / 4);
 	_descriptor.container->sizeValue(
 	) | rpl::start_with_next([=](QSize outer) {
 		raw->setGeometry(
 			style::centerrect(
 				QRect(QPoint(), outer),
-				QRect(0, 0, side, side)));
+				QRect(0, 0, _side, _side)));
 	}, raw->lifetime());
 
 	raw->paintRequest() | rpl::start_with_next([=] {
-		auto p = QPainter(raw);
-		auto hq = PainterHighQualityEnabler(p);
+		prepareFrame();
 
-		auto info = _descriptor.track->frameWithInfo(true);
-		if (!info.original.isNull()) {
-			const auto owidth = info.original.width();
-			const auto oheight = info.original.height();
-			const auto omin = std::min(owidth, oheight);
-			const auto ox = (owidth > oheight) ? (owidth - oheight) / 2 : 0;
-			const auto oy = (owidth < oheight) ? (oheight - owidth) / 2 : 0;
-			const auto from = QRect(ox, oy, omin, omin);
-			p.drawImage(QRect(0, 0, side, side), info.original, from);
+		auto p = QPainter(raw);
+		if (!_framePrepared.isNull()) {
+			p.drawImage(QRect(0, 0, _side, _side), _framePrepared);
 		} else {
+			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(Qt::NoPen);
 			p.setBrush(QColor(0, 0, 0));
-			p.drawEllipse(0, 0, side, side);
+			p.drawEllipse(0, 0, _side, _side);
 		}
-		_descriptor.track->markFrameShown();
 	}, raw->lifetime());
 
 	_descriptor.track->renderNextFrame() | rpl::start_with_next([=] {
 		const auto info = _descriptor.track->frameWithInfo(true);
 		if (!info.original.isNull() && _lastAddedIndex != info.index) {
 			_lastAddedIndex = info.index;
+			_frameOriginal = info.original;
 			const auto ts = info.mcstimestamp;
 			_private.with([copy = info.original, ts](Private &that) {
 				that.push(ts, copy);
 			});
 		}
+		_descriptor.track->markFrameShown();
 		raw->update();
 	}, raw->lifetime());
+	_descriptor.track->markFrameShown();
 
 	raw->show();
 	raw->raise();
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 56af2110a..4d2042fab 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -57,11 +57,16 @@ private:
 	class Private;
 
 	void setup();
+	void prepareFrame();
 
 	const RoundVideoRecorderDescriptor _descriptor;
 	std::unique_ptr<RpWidget> _preview;
 	crl::object_on_queue<Private> _private;
+	QImage _frameOriginal;
+	QImage _framePrepared;
 	int _lastAddedIndex = 0;
+	int _preparedIndex = 0;
+	int _side = 0;
 	bool _paused = false;
 
 };

From 4cf6173d250290aa6ca8b801f2c4d0f737d9df58 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Oct 2024 22:34:42 +0400
Subject: [PATCH 020/306] Cut video messages round with white bg.

---
 .../ui/controls/round_video_recorder.cpp      | 117 ++++++++++++++----
 1 file changed, 90 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index cf8dda398..95b982d2c 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -97,11 +97,17 @@ private:
 	crl::time _lastUpdateDuration = 0;
 	rpl::event_stream<Update, rpl::empty_error> _updates;
 
+	void cutCircleFromYUV420P(not_null<AVFrame*> frame);
+	void initCircleMask();
+
+	std::vector<bool> _circleMask; // Always nice to use vector<bool>! :D
+
 };
 
 RoundVideoRecorder::Private::Private(crl::weak_on_queue<Private> weak)
 : _weak(std::move(weak)) {
 	initEncoding();
+	initCircleMask();
 }
 
 RoundVideoRecorder::Private::~Private() {
@@ -416,8 +422,15 @@ void RoundVideoRecorder::Private::push(const Media::Capture::Chunk &chunk) {
 void RoundVideoRecorder::Private::encodeVideoFrame(
 		int64 mcstimestamp,
 		const QImage &frame) {
+	const auto fwidth = frame.width();
+	const auto fheight = frame.height();
+	const auto fmin = std::min(fwidth, fheight);
+	const auto fx = (fwidth > fheight) ? (fwidth - fheight) / 2 : 0;
+	const auto fy = (fwidth < fheight) ? (fheight - fwidth) / 2 : 0;
+	const auto crop = QRect(fx, fy, fmin, fmin);
+
 	_swsContext = MakeSwscalePointer(
-		QSize(kSide, kSide),
+		QSize(fmin, fmin),
 		AV_PIX_FMT_BGRA,
 		QSize(kSide, kSide),
 		AV_PIX_FMT_YUV420P,
@@ -431,41 +444,91 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 		_videoFirstTimestamp = mcstimestamp;
 	}
 
-	const auto fwidth = frame.width();
-	const auto fheight = frame.height();
-	const auto fmin = std::min(fwidth, fheight);
-	const auto fx = (fwidth > fheight) ? (fwidth - fheight) / 2 : 0;
-	const auto fy = (fwidth < fheight) ? (fheight - fwidth) / 2 : 0;
-	const auto crop = QRect(fx, fy, fmin, fmin);
-	const auto cropped = frame.copy(crop).scaled(
-		kSide,
-		kSide,
-		Qt::KeepAspectRatio,
-		Qt::SmoothTransformation);
+	const auto cdata = frame.constBits()
+		+ (frame.bytesPerLine() * fy)
+		+ (fx * frame.depth() / 8);
 
-	// Convert QImage to RGB32 format
-//	QImage rgbImage = cropped.convertToFormat(QImage::Format_ARGB32);
+	const uint8_t *srcSlice[1] = { cdata };
+	int srcStride[1] = { int(frame.bytesPerLine()) };
 
-	// Prepare source data
-	const uint8_t *srcSlice[1] = { cropped.constBits() };
-	int srcStride[1] = { cropped.bytesPerLine() };
-
-	// Perform the color space conversion
 	sws_scale(
 		_swsContext.get(),
 		srcSlice,
 		srcStride,
 		0,
-		kSide,
+		fmin,
 		_videoFrame->data,
 		_videoFrame->linesize);
 
+	cutCircleFromYUV420P(_videoFrame.get());
+
 	_videoFrame->pts = mcstimestamp - _videoFirstTimestamp;
 	if (!writeFrame(_videoFrame, _videoCodec, _videoStream)) {
 		return;
 	}
 }
 
+void RoundVideoRecorder::Private::initCircleMask() {
+	const auto width = kSide;
+	const auto height = kSide;
+	const auto centerX = width / 2;
+	const auto centerY = height / 2;
+	const auto radius = std::min(centerX, centerY) + 3; // Add some padding.
+	const auto radiusSquared = radius * radius;
+
+	_circleMask.resize(width * height);
+	auto index = 0;
+	for (auto y = 0; y != height; ++y) {
+		for (auto x = 0; x != width; ++x) {
+			const auto dx = x - centerX;
+			const auto dy = y - centerY;
+			_circleMask[index++] = (dx * dx + dy * dy > radiusSquared);
+		}
+	}
+}
+
+void RoundVideoRecorder::Private::cutCircleFromYUV420P(
+		not_null<AVFrame*> frame) {
+	const auto width = frame->width;
+	const auto height = frame->height;
+
+	auto yMaskIndex = 0;
+	auto yData = frame->data[0];
+	const auto ySkip = frame->linesize[0] - width;
+	for (int y = 0; y < height; ++y) {
+		for (int x = 0; x < width; ++x) {
+			if (_circleMask[yMaskIndex]) {
+				*yData = 255;
+			}
+			++yData;
+			++yMaskIndex;
+		}
+		yData += ySkip;
+	}
+
+	const auto whalf = width / 2;
+	const auto hhalf = height / 2;
+
+	auto uvMaskIndex = 0;
+	auto uData = frame->data[1];
+	auto vData = frame->data[2];
+	const auto uSkip = frame->linesize[1] - whalf;
+	for (auto y = 0; y != hhalf; ++y) {
+		for (auto x = 0; x != whalf; ++x) {
+			if (_circleMask[uvMaskIndex]) {
+				*uData = 128;
+				*vData = 128;
+			}
+			++uData;
+			++vData;
+			uvMaskIndex += 2;
+		}
+		uData += uSkip;
+		vData += uSkip;
+		uvMaskIndex += width;
+	}
+}
+
 void RoundVideoRecorder::Private::encodeAudioFrame(
 		const Media::Capture::Chunk &chunk) {
 	updateMaxLevel(chunk);
@@ -476,18 +539,18 @@ void RoundVideoRecorder::Private::encodeAudioFrame(
 		_audioTail.append(chunk.samples);
 	}
 
-	const int inSamples = _audioTail.size() / sizeof(int16_t);
-	const uint8_t *inData = reinterpret_cast<const uint8_t*>(
+	const auto inSamples = int(_audioTail.size() / sizeof(int16_t));
+	const auto inData = reinterpret_cast<const uint8_t*>(
 		_audioTail.constData());
-	int samplesProcessed = 0;
+	auto samplesProcessed = 0;
 
 	while (samplesProcessed + _audioCodec->frame_size <= inSamples) {
-		int remainingSamples = inSamples - samplesProcessed;
-		int outSamples = av_rescale_rnd(
+		const auto remainingSamples = inSamples - samplesProcessed;
+		auto outSamples = int(av_rescale_rnd(
 			swr_get_delay(_swrContext.get(), 48000) + remainingSamples,
 			_audioCodec->sample_rate,
 			48000,
-			AV_ROUND_UP);
+			AV_ROUND_UP));
 
 		// Ensure we don't exceed the frame's capacity
 		outSamples = std::min(outSamples, _audioCodec->frame_size);
@@ -725,4 +788,4 @@ void RoundVideoRecorder::setPaused(bool paused) {
 }
 
 
-} // namespace Ui
\ No newline at end of file
+} // namespace Ui

From 511cfc524f02422f5bc038de28f9d91031e6b38d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Oct 2024 22:52:32 +0400
Subject: [PATCH 021/306] Adjust bitrates for video messages.

---
 .../ui/controls/round_video_recorder.cpp            | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 95b982d2c..a828566e7 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -21,6 +21,9 @@ namespace {
 
 constexpr auto kSide = 400;
 constexpr auto kUpdateEach = crl::time(100);
+constexpr auto kAudioFrequency = 48'000;
+constexpr auto kAudioBitRate = 32'000;
+constexpr auto kVideoBitRate = 3 * 1024 * 1024;
 
 using namespace FFmpeg;
 
@@ -211,7 +214,7 @@ bool RoundVideoRecorder::Private::initVideo() {
 	_videoCodec->time_base = AVRational{ 1, 1'000'000 }; // Microseconds.
 	_videoCodec->framerate = AVRational{ 0, 1 }; // Variable frame rate.
 	_videoCodec->pix_fmt = AV_PIX_FMT_YUV420P;
-	_videoCodec->bit_rate = 5 * 1024 * 1024; // 5Mbps
+	_videoCodec->bit_rate = kVideoBitRate;
 
 	auto error = AvErrorWrap(avcodec_open2(
 		_videoCodec.get(),
@@ -273,8 +276,8 @@ bool RoundVideoRecorder::Private::initAudio() {
 
 	_audioChannels = 1;
 	_audioCodec->sample_fmt = AV_SAMPLE_FMT_FLTP;
-	_audioCodec->bit_rate = 32000;
-	_audioCodec->sample_rate = 48000;
+	_audioCodec->bit_rate = kAudioBitRate;
+	_audioCodec->sample_rate = kAudioFrequency;
 #if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	_audioCodec->ch_layout = AV_CHANNEL_LAYOUT_MONO;
 	_audioCodec->channels = _audioCodec->ch_layout.nb_channels;
@@ -547,9 +550,9 @@ void RoundVideoRecorder::Private::encodeAudioFrame(
 	while (samplesProcessed + _audioCodec->frame_size <= inSamples) {
 		const auto remainingSamples = inSamples - samplesProcessed;
 		auto outSamples = int(av_rescale_rnd(
-			swr_get_delay(_swrContext.get(), 48000) + remainingSamples,
+			swr_get_delay(_swrContext.get(), kAudioFrequency) + remainingSamples,
 			_audioCodec->sample_rate,
-			48000,
+			kAudioFrequency,
 			AV_ROUND_UP));
 
 		// Ensure we don't exceed the frame's capacity

From f74dd3ca1e8449a3aedcbae4de0a04cfcaa9f0e4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Oct 2024 11:32:08 +0400
Subject: [PATCH 022/306] Add author to the top of Reply in Another Chat.

---
 Telegram/Resources/langs/lang.strings         |   2 +
 Telegram/SourceFiles/boxes/boxes.style        |   7 +
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   7 +
 Telegram/SourceFiles/boxes/peer_list_box.h    |  13 ++
 .../controls/history_view_draft_options.cpp   | 137 +++++++++++++++++-
 .../history_view_voice_record_bar.cpp         |   3 +
 .../media/audio/media_audio_capture.h         |   2 +
 .../ui/controls/round_video_recorder.cpp      |  43 ++++--
 8 files changed, 201 insertions(+), 13 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 3d576fe7c..70ad59585 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3684,6 +3684,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_reply_in_another_title" = "Reply in...";
 "lng_reply_in_another_chat" = "Reply in Another Chat";
+"lng_reply_in_author" = "Message author";
+"lng_reply_in_chats_list" = "Your chats";
 "lng_reply_show_in_chat" = "Show in Chat";
 "lng_reply_remove" = "Do Not Reply";
 "lng_reply_about_quote" = "You can select a specific part to quote.";
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 845098628..827b0c0b3 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -878,6 +878,13 @@ peerListWithInviteViaLink: PeerList(peerListBox) {
 peerListSingleRow: PeerList(peerListBox) {
 	padding: margins(0px, 0px, 0px, 0px);
 }
+peerListSmallSkips: PeerList(peerListBox) {
+	padding: margins(
+		0px,
+		defaultVerticalListSkip,
+		0px,
+		defaultVerticalListSkip);
+}
 
 scheduleHeight: 95px;
 scheduleDateTop: 38px;
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index b0f3c0a50..b47d4b203 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1944,6 +1944,13 @@ PeerListContent::SkipResult PeerListContent::selectSkip(int direction) {
 		}
 	}
 
+	if (_controller->overrideKeyboardNavigation(
+			direction,
+			_selected.index.value,
+			newSelectedIndex)) {
+		return { _selected.index.value, _selected.index.value };
+	}
+
 	_selected.index.value = newSelectedIndex;
 	_selected.element = 0;
 	if (newSelectedIndex >= 0) {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 4c4374b84..ce1cc1220 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -357,6 +357,8 @@ public:
 	virtual int peerListPartitionRows(Fn<bool(const PeerListRow &a)> border) = 0;
 	virtual std::shared_ptr<Main::SessionShow> peerListUiShow() = 0;
 
+	virtual void peerListSelectSkip(int direction) = 0;
+
 	virtual void peerListPressLeftToContextMenu(bool shown) = 0;
 	virtual bool peerListTrackRowPressFromGlobal(QPoint globalPosition) = 0;
 
@@ -573,6 +575,13 @@ public:
 		Unexpected("PeerListController::customRowRippleMaskGenerator.");
 	}
 
+	virtual bool overrideKeyboardNavigation(
+			int direction,
+			int fromIndex,
+			int toIndex) {
+		return false;
+	}
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
@@ -1016,6 +1025,10 @@ public:
 		bool highlightRow,
 		Fn<void(not_null<Ui::PopupMenu*>)> destroyed = nullptr) override;
 
+	void peerListSelectSkip(int direction) override {
+		_content->selectSkip(direction);
+	}
+
 	void peerListPressLeftToContextMenu(bool shown) override {
 		_content->pressLeftToContextMenu(shown);
 	}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
index d0c8ca2b8..8b0429c28 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
+#include "boxes/filters/edit_filter_chats_list.h"
 #include "boxes/peer_list_box.h"
 #include "boxes/peer_list_controllers.h"
 #include "chat_helpers/compose/compose_show.h"
@@ -41,6 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
 #include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
@@ -911,6 +913,117 @@ void DraftOptionsBox(
 		}, box->lifetime());
 	}
 }
+
+struct AuthorSelector {
+	object_ptr<Ui::RpWidget> content = { nullptr };
+	Fn<bool(int, int, int)> overrideKey;
+};
+[[nodiscard]] AuthorSelector AuthorRowSelector(
+		not_null<Main::Session*> session,
+		FullReplyTo reply,
+		Fn<void(not_null<Data::Thread*>)> chosen) {
+	const auto item = session->data().message(reply.messageId);
+	if (!item) {
+		return {};
+	}
+	const auto displayFrom = item->displayFrom();
+	const auto from = displayFrom ? displayFrom : item->from().get();
+	if (!from->isUser() || from == item->history()->peer || from->isSelf()) {
+		return {};
+	}
+
+	class AuthorController final : public PeerListController {
+	public:
+		AuthorController(not_null<PeerData*> peer, Fn<void()> click)
+		: _peer(peer)
+		, _click(std::move(click)) {
+		}
+
+		void prepare() override {
+			delegate()->peerListAppendRow(
+				std::make_unique<ChatsListBoxController::Row>(
+					_peer->owner().history(_peer),
+					&computeListSt().item));
+			delegate()->peerListRefreshRows();
+			TrackPremiumRequiredChanges(this, _lifetime);
+		}
+		void loadMoreRows() override {
+		}
+		void rowClicked(not_null<PeerListRow*> row) override {
+			if (RecipientRow::ShowLockedError(this, row, WritePremiumRequiredError)) {
+				return;
+			} else if (const auto onstack = _click) {
+				onstack();
+			}
+		}
+		Main::Session &session() const override {
+			return _peer->session();
+		}
+
+	private:
+		const not_null<PeerData*> _peer;
+		Fn<void()> _click;
+		rpl::lifetime _lifetime;
+
+	};
+
+	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = result.data();
+
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_reply_in_author()));
+	Ui::AddSkip(container);
+
+	const auto delegate = container->lifetime().make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto controller = container->lifetime().make_state<
+		AuthorController
+	>(from, [=] { chosen(from->owner().history(from)); });
+	controller->setStyleOverrides(&st::peerListSingleRow);
+	const auto content = container->add(object_ptr<PeerListContent>(
+		container,
+		controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	Ui::AddSkip(container);
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_reply_in_chats_list()));
+
+	const auto overrideKey = [=](int direction, int from, int to) {
+		if (!content->isVisible()) {
+			return false;
+		} else if (direction > 0 && from < 0 && to >= 0) {
+			if (content->hasSelection()) {
+				const auto was = content->selectedIndex();
+				const auto now = content->selectSkip(1).reallyMovedTo;
+				if (was != now) {
+					return true;
+				}
+				content->clearSelection();
+			} else {
+				content->selectSkip(1);
+				return true;
+			}
+		} else if (direction < 0 && to < 0) {
+			if (!content->hasSelection()) {
+				content->selectLast();
+			} else if (from >= 0 || content->hasSelection()) {
+				content->selectSkip(-1);
+			}
+		}
+		return false;
+	};
+
+	return {
+		.content = std::move(result),
+		.overrideKey = overrideKey,
+	};
+}
+
 } // namespace
 
 void ShowReplyToChatBox(
@@ -921,7 +1034,7 @@ void ShowReplyToChatBox(
 	public:
 		using Chosen = not_null<Data::Thread*>;
 
-		Controller(not_null<Main::Session*> session)
+		Controller(not_null<Main::Session*> session, FullReplyTo reply)
 		: ChooseRecipientBoxController({
 			.session = session,
 			.callback = [=](Chosen thread) {
@@ -929,6 +1042,13 @@ void ShowReplyToChatBox(
 			},
 			.premiumRequiredError = WritePremiumRequiredError,
 		}) {
+			_authorRow = AuthorRowSelector(
+				session,
+				reply,
+				[=](Chosen thread) { _singleChosen.fire_copy(thread); });
+			if (_authorRow.content) {
+				setStyleOverrides(&st::peerListSmallSkips);
+			}
 		}
 
 		[[nodiscard]] rpl::producer<Chosen> singleChosen() const {
@@ -939,13 +1059,26 @@ void ShowReplyToChatBox(
 			return tr::lng_saved_quote_here(tr::now);
 		}
 
+		bool overrideKeyboardNavigation(
+				int direction,
+				int fromIndex,
+				int toIndex) override {
+			return _authorRow.overrideKey
+				&& _authorRow.overrideKey(direction, fromIndex, toIndex);
+		}
+
 	private:
 		void prepareViewHook() override {
+			if (_authorRow.content) {
+				delegate()->peerListSetAboveWidget(
+					std::move(_authorRow.content));
+			}
 			ChooseRecipientBoxController::prepareViewHook();
 			delegate()->peerListSetTitle(tr::lng_reply_in_another_title());
 		}
 
 		rpl::event_stream<Chosen> _singleChosen;
+		AuthorSelector _authorRow;
 
 	};
 
@@ -956,7 +1089,7 @@ void ShowReplyToChatBox(
 	};
 	const auto session = &show->session();
 	const auto state = [&] {
-		auto controller = std::make_unique<Controller>(session);
+		auto controller = std::make_unique<Controller>(session, reply);
 		const auto controllerRaw = controller.get();
 		auto box = Box<PeerListBox>(std::move(controller), [=](
 				not_null<PeerListBox*> box) {
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 dd5968335..bd12a4521 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
@@ -1704,6 +1704,9 @@ void VoiceRecordBar::startRecording() {
 			) | rpl::start_with_next_error([=](const Update &update) {
 				_recordingTipRequired = (update.samples < kMinSamples);
 				recordUpdated(update.level, update.samples);
+				if (update.finished) {
+					stop(true);
+				}
 			}, [=] {
 				stop(false);
 			}, _recordingLifetime);
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.h b/Telegram/SourceFiles/media/audio/media_audio_capture.h
index fe03dd89c..5a48d16a4 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.h
@@ -16,6 +16,8 @@ namespace Capture {
 struct Update {
 	int samples = 0;
 	ushort level = 0;
+
+	bool finished = false;
 };
 
 struct Chunk {
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index a828566e7..b903a27af 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -24,6 +24,7 @@ constexpr auto kUpdateEach = crl::time(100);
 constexpr auto kAudioFrequency = 48'000;
 constexpr auto kAudioBitRate = 32'000;
 constexpr auto kVideoBitRate = 3 * 1024 * 1024;
+constexpr auto kMaxDuration = 10 * crl::time(1000); AssertIsDebug();
 
 using namespace FFmpeg;
 
@@ -52,6 +53,7 @@ private:
 	void initEncoding();
 	bool initVideo();
 	bool initAudio();
+	void notifyFinished();
 	void deinitEncoding();
 	void finishEncoding();
 	void fail();
@@ -66,6 +68,9 @@ private:
 	void updateMaxLevel(const Media::Capture::Chunk &chunk);
 	void updateResultDuration(int64 pts, AVRational timeBase);
 
+	void cutCircleFromYUV420P(not_null<AVFrame*> frame);
+	void initCircleMask();
+
 	const crl::weak_on_queue<Private> _weak;
 
 	FormatPointer _format;
@@ -95,14 +100,12 @@ private:
 	QByteArray _result;
 	int64_t _resultOffset = 0;
 	crl::time _resultDuration = 0;
+	bool _finished = false;
 
 	ushort _maxLevelSinceLastUpdate = 0;
 	crl::time _lastUpdateDuration = 0;
 	rpl::event_stream<Update, rpl::empty_error> _updates;
 
-	void cutCircleFromYUV420P(not_null<AVFrame*> frame);
-	void initCircleMask();
-
 	std::vector<bool> _circleMask; // Always nice to use vector<bool>! :D
 
 };
@@ -400,7 +403,7 @@ void RoundVideoRecorder::Private::deinitEncoding() {
 void RoundVideoRecorder::Private::push(
 		int64 mcstimestamp,
 		const QImage &frame) {
-	if (!_format) {
+	if (!_format || _finished) {
 		return;
 	} else if (!_firstAudioChunkFinished) {
 		// Skip frames while we didn't start receiving audio.
@@ -412,7 +415,7 @@ void RoundVideoRecorder::Private::push(
 }
 
 void RoundVideoRecorder::Private::push(const Media::Capture::Chunk &chunk) {
-	if (!_format) {
+	if (!_format || _finished) {
 		return;
 	} else if (!_firstAudioChunkFinished || !_firstVideoFrameTime) {
 		_firstAudioChunkFinished = chunk.finished;
@@ -425,6 +428,11 @@ void RoundVideoRecorder::Private::push(const Media::Capture::Chunk &chunk) {
 void RoundVideoRecorder::Private::encodeVideoFrame(
 		int64 mcstimestamp,
 		const QImage &frame) {
+	Expects(!_finished);
+
+	if (_videoFirstTimestamp == -1) {
+		_videoFirstTimestamp = mcstimestamp;
+	}
 	const auto fwidth = frame.width();
 	const auto fheight = frame.height();
 	const auto fmin = std::min(fwidth, fheight);
@@ -443,10 +451,6 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 		return;
 	}
 
-	if (_videoFirstTimestamp == -1) {
-		_videoFirstTimestamp = mcstimestamp;
-	}
-
 	const auto cdata = frame.constBits()
 		+ (frame.bytesPerLine() * fy)
 		+ (fx * frame.depth() / 8);
@@ -466,7 +470,10 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 	cutCircleFromYUV420P(_videoFrame.get());
 
 	_videoFrame->pts = mcstimestamp - _videoFirstTimestamp;
-	if (!writeFrame(_videoFrame, _videoCodec, _videoStream)) {
+	if (_videoFrame->pts >= kMaxDuration * int64(1000)) {
+		notifyFinished();
+		return;
+	} else if (!writeFrame(_videoFrame, _videoCodec, _videoStream)) {
 		return;
 	}
 }
@@ -534,6 +541,8 @@ void RoundVideoRecorder::Private::cutCircleFromYUV420P(
 
 void RoundVideoRecorder::Private::encodeAudioFrame(
 		const Media::Capture::Chunk &chunk) {
+	Expects(!_finished);
+
 	updateMaxLevel(chunk);
 
 	if (_audioTail.isEmpty()) {
@@ -578,7 +587,10 @@ void RoundVideoRecorder::Private::encodeAudioFrame(
 
 		_audioFrame->pts = _audioPts;
 		_audioPts += _audioFrame->nb_samples;
-		if (!writeFrame(_audioFrame, _audioCodec, _audioStream)) {
+		if (_audioPts >= kMaxDuration * int64(kAudioFrequency) / 1000) {
+			notifyFinished();
+			return;
+		} else if (!writeFrame(_audioFrame, _audioCodec, _audioStream)) {
 			return;
 		}
 
@@ -593,6 +605,15 @@ void RoundVideoRecorder::Private::encodeAudioFrame(
 	}
 }
 
+void RoundVideoRecorder::Private::notifyFinished() {
+	_finished = true;
+	_updates.fire({
+		.samples = int(_resultDuration * 48),
+		.level = base::take(_maxLevelSinceLastUpdate),
+		.finished = true,
+	});
+}
+
 bool RoundVideoRecorder::Private::writeFrame(
 		const FramePointer &frame,
 		const CodecPointer &codec,

From e59e4afd3e501f8af47d494566ef6268733c4c64 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Oct 2024 15:17:29 +0400
Subject: [PATCH 023/306] Show recording progress.

---
 .../history_view_voice_record_bar.cpp         | 24 ++---
 .../controls/history_view_voice_record_bar.h  |  3 +-
 .../ui/controls/round_video_recorder.cpp      | 87 +++++++++++++++++--
 .../ui/controls/round_video_recorder.h        | 11 ++-
 4 files changed, 105 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index bd12a4521..87c2147e0 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
@@ -1534,13 +1534,11 @@ void VoiceRecordBar::init() {
 			if (_startRecordingFilter && _startRecordingFilter()) {
 				return;
 			}
-			_recordingTipRequired = true;
+			_recordingTipRequire = crl::now();
 			_recordingVideo = (_send->type() == Ui::SendButton::Type::Round);
 			_startTimer.callOnce(st::universalDuration);
 		} else if (e->type() == QEvent::MouseButtonRelease) {
-			if (base::take(_recordingTipRequired)) {
-				_recordingTipRequests.fire({});
-			}
+			checkTipRequired();
 			_startTimer.cancel();
 		}
 	}, lifetime());
@@ -1694,7 +1692,6 @@ void VoiceRecordBar::startRecording() {
 		}
 		instance()->updated(
 		) | rpl::start_with_next_error([=](const Update &update) {
-			_recordingTipRequired = (update.samples < kMinSamples);
 			recordUpdated(update.level, update.samples);
 		}, [=] {
 			stop(false);
@@ -1702,10 +1699,9 @@ void VoiceRecordBar::startRecording() {
 		if (_videoRecorder) {
 			_videoRecorder->updated(
 			) | rpl::start_with_next_error([=](const Update &update) {
-				_recordingTipRequired = (update.samples < kMinSamples);
 				recordUpdated(update.level, update.samples);
 				if (update.finished) {
-					stop(true);
+					stop(update.samples >= kMinSamples);
 				}
 			}, [=] {
 				stop(false);
@@ -1742,14 +1738,22 @@ void VoiceRecordBar::startRecording() {
 			}
 			computeAndSetLockProgress(mouse->globalPos());
 		} else if (type == QEvent::MouseButtonRelease) {
-			if (base::take(_recordingTipRequired)) {
-				_recordingTipRequests.fire({});
-			}
+			checkTipRequired();
 			stop(_inField.current());
 		}
 	}, _recordingLifetime);
 }
 
+void VoiceRecordBar::checkTipRequired() {
+	const auto require = base::take(_recordingTipRequire);
+	const auto duration = st::universalDuration
+		+ (kMinSamples * crl::time(1000)
+			/ ::Media::Player::kDefaultFrequency);
+	if (require && (require + duration > crl::now())) {
+		_recordingTipRequests.fire({});
+	}
+}
+
 void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 	_level->requestPaintLevel(level);
 	_recordingSamples = samples;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 92ac2e6f8..3d6f1a878 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -124,6 +124,7 @@ private:
 	void updateTTLGeometry(TTLAnimationType type, float64 progress);
 
 	void recordUpdated(quint16 level, int samples);
+	void checkTipRequired();
 
 	void stop(bool send);
 	void stopRecording(StopType type, bool ttlBeforeHide = false);
@@ -192,7 +193,7 @@ private:
 	float64 _redCircleProgress = 0.;
 
 	rpl::event_stream<> _recordingTipRequests;
-	bool _recordingTipRequired = false;
+	crl::time _recordingTipRequire = 0;
 	bool _lockFromBottom = false;
 
 	std::unique_ptr<Ui::RoundVideoRecorder> _videoRecorder;
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index b903a27af..c249ecf5b 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ffmpeg/ffmpeg_utility.h"
 #include "media/audio/media_audio_capture.h"
 #include "ui/image/image_prepare.h"
+#include "ui/arc_angles.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "webrtc/webrtc_video_track.h"
@@ -703,10 +704,14 @@ Fn<void(Media::Capture::Chunk)> RoundVideoRecorder::audioChunkProcessor() {
 	};
 }
 
-auto RoundVideoRecorder::updated() const
+auto RoundVideoRecorder::updated()
 -> rpl::producer<Update, rpl::empty_error> {
 	return _private.producer_on_main([](const Private &that) {
 		return that.updated();
+	}) | rpl::before_next([=](const Update &update) {
+		const auto duration = (update.samples * crl::time(1000))
+			/ kAudioFrequency;
+		progressTo(duration / (1. * kMaxDuration));
 	});
 }
 
@@ -725,6 +730,19 @@ void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
 	}
 }
 
+void RoundVideoRecorder::progressTo(float64 progress) {
+	if (_progress == progress) {
+		return;
+	}
+	_progressAnimation.start(
+		[=] { _preview->update(); },
+		progress,
+		_progress,
+		kUpdateEach);
+	_progress = progress;
+	_preview->update();
+}
+
 void RoundVideoRecorder::prepareFrame() {
 	if (_frameOriginal.isNull() || _preparedIndex == _lastAddedIndex) {
 		return;
@@ -755,29 +773,82 @@ void RoundVideoRecorder::prepareFrame() {
 	_framePrepared.setDevicePixelRatio(ratio);
 }
 
+void RoundVideoRecorder::createImages() {
+	const auto ratio = style::DevicePixelRatio();
+	_framePrepared = QImage(
+		QSize(_side, _side) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	_framePrepared.fill(Qt::transparent);
+	_framePrepared.setDevicePixelRatio(ratio);
+	auto p = QPainter(&_framePrepared);
+	auto hq = PainterHighQualityEnabler(p);
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(Qt::black);
+	p.drawEllipse(0, 0, _side, _side);
+
+	const auto side = _side + 2 * _extent;
+	_shadow = QImage(
+		QSize(side, side) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	_shadow.fill(Qt::transparent);
+	_shadow.setDevicePixelRatio(ratio);
+
+	auto sp = QPainter(&_shadow);
+	auto shq = PainterHighQualityEnabler(sp);
+
+	QRadialGradient gradient(
+		QPointF(_extent + _side / 2, _extent + _side / 2),
+		_side / 2 + _extent);
+	gradient.setColorAt(0, QColor(0, 0, 0, 128));
+	gradient.setColorAt(0.8, QColor(0, 0, 0, 64));
+	gradient.setColorAt(1, QColor(0, 0, 0, 0));
+
+	sp.setPen(Qt::NoPen);
+	sp.fillRect(0, 0, side, side, gradient);
+	sp.end();
+}
+
 void RoundVideoRecorder::setup() {
 	const auto raw = _preview.get();
 
 	_side = style::ConvertScale(kSide * 3 / 4);
+	_progressStroke = st::radialLine;
+	_extent = _progressStroke * 8;
+	createImages();
+
 	_descriptor.container->sizeValue(
 	) | rpl::start_with_next([=](QSize outer) {
+		const auto side = _side + 2 * _extent;
 		raw->setGeometry(
 			style::centerrect(
 				QRect(QPoint(), outer),
-				QRect(0, 0, _side, _side)));
+				QRect(0, 0, side, side)));
 	}, raw->lifetime());
 
 	raw->paintRequest() | rpl::start_with_next([=] {
 		prepareFrame();
 
 		auto p = QPainter(raw);
-		if (!_framePrepared.isNull()) {
-			p.drawImage(QRect(0, 0, _side, _side), _framePrepared);
-		} else {
+		p.drawImage(raw->rect(), _shadow);
+		const auto inner = QRect(_extent, _extent, _side, _side);
+		p.drawImage(inner, _framePrepared);
+		if (_progress > 0.) {
 			auto hq = PainterHighQualityEnabler(p);
-			p.setPen(Qt::NoPen);
-			p.setBrush(QColor(0, 0, 0));
-			p.drawEllipse(0, 0, _side, _side);
+			p.setPen(QPen(
+				Qt::white,
+				_progressStroke,
+				Qt::SolidLine,
+				Qt::RoundCap));
+			p.setBrush(Qt::NoBrush);
+			const auto add = _progressStroke * 3 / 2.;
+			const auto full = arc::kFullLength;
+			const auto length = int(base::SafeRound(
+				_progressAnimation.value(_progress) * full));
+			p.drawArc(
+				QRectF(inner).marginsAdded({ add, add, add, add }),
+				(full / 4) - length,
+				length);
 		}
 	}, raw->lifetime());
 
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 4d2042fab..6e9917d76 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "ui/effects/animations.h"
+
 #include <crl/crl_object_on_queue.h>
 
 namespace Media::Capture {
@@ -51,22 +53,29 @@ public:
 	void hide(Fn<void(RoundVideoResult)> done = nullptr);
 
 	using Update = Media::Capture::Update;
-	[[nodiscard]] rpl::producer<Update, rpl::empty_error> updated() const;
+	[[nodiscard]] rpl::producer<Update, rpl::empty_error> updated();
 
 private:
 	class Private;
 
 	void setup();
 	void prepareFrame();
+	void createImages();
+	void progressTo(float64 progress);
 
 	const RoundVideoRecorderDescriptor _descriptor;
 	std::unique_ptr<RpWidget> _preview;
 	crl::object_on_queue<Private> _private;
+	Ui::Animations::Simple _progressAnimation;
+	float64 _progress = 0.;
 	QImage _frameOriginal;
 	QImage _framePrepared;
+	QImage _shadow;
 	int _lastAddedIndex = 0;
 	int _preparedIndex = 0;
 	int _side = 0;
+	int _progressStroke = 0;
+	int _extent = 0;
 	bool _paused = false;
 
 };

From 20a4c7f9f41c102c8115cd5409316c9be37f82d9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Oct 2024 17:36:04 +0400
Subject: [PATCH 024/306] Wait for both audio and video to start.

---
 .../media/audio/media_audio_capture.cpp       |   2 +-
 .../media/audio/media_audio_capture.h         |  13 +-
 .../ui/controls/round_video_recorder.cpp      | 127 +++++++++++++-----
 .../ui/controls/round_video_recorder.h        |  12 +-
 4 files changed, 115 insertions(+), 39 deletions(-)

diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index cd567f4fd..3d6df88c6 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -144,7 +144,7 @@ void Instance::start(Fn<void(Chunk)> externalProcessing) {
 			});
 		}, [=] {
 			crl::on_main(this, [=] {
-				_updates.fire_error({});
+				_updates.fire_error(Error::Other);
 			});
 		}, externalProcessing);
 		crl::on_main(this, [=] {
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.h b/Telegram/SourceFiles/media/audio/media_audio_capture.h
index 5a48d16a4..e588637c1 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.h
@@ -20,6 +20,15 @@ struct Update {
 	bool finished = false;
 };
 
+enum class Error : uchar {
+	Other,
+	AudioInit,
+	VideoInit,
+	AudioTimeout,
+	VideoTimeout,
+	Encoding,
+};
+
 struct Chunk {
 	crl::time finished = 0;
 	QByteArray samples;
@@ -41,7 +50,7 @@ public:
 		return _available;
 	}
 
-	[[nodiscard]] rpl::producer<Update, rpl::empty_error> updated() const {
+	[[nodiscard]] rpl::producer<Update, Error> updated() const {
 		return _updates.events();
 	}
 
@@ -62,7 +71,7 @@ private:
 
 	bool _available = false;
 	rpl::variable<bool> _started = false;
-	rpl::event_stream<Update, rpl::empty_error> _updates;
+	rpl::event_stream<Update, Error> _updates;
 	QThread _thread;
 	std::unique_ptr<Inner> _inner;
 
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index c249ecf5b..26c75ce83 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/controls/round_video_recorder.h"
 
+#include "base/concurrent_timer.h"
 #include "base/debug_log.h"
 #include "ffmpeg/ffmpeg_utility.h"
 #include "media/audio/media_audio_capture.h"
@@ -25,7 +26,8 @@ constexpr auto kUpdateEach = crl::time(100);
 constexpr auto kAudioFrequency = 48'000;
 constexpr auto kAudioBitRate = 32'000;
 constexpr auto kVideoBitRate = 3 * 1024 * 1024;
-constexpr auto kMaxDuration = 10 * crl::time(1000); AssertIsDebug();
+constexpr auto kMaxDuration = 10 * crl::time(1000);
+constexpr auto kInitTimeout = 5 * crl::time(1000);
 
 using namespace FFmpeg;
 
@@ -40,7 +42,7 @@ public:
 	void push(const Media::Capture::Chunk &chunk);
 
 	using Update = Media::Capture::Update;
-	[[nodiscard]] rpl::producer<Update, rpl::empty_error> updated() const;
+	[[nodiscard]] rpl::producer<Update, Error> updated() const;
 
 	[[nodiscard]] RoundVideoResult finish();
 
@@ -57,7 +59,8 @@ private:
 	void notifyFinished();
 	void deinitEncoding();
 	void finishEncoding();
-	void fail();
+	void fail(Error error);
+	void timeout();
 
 	void encodeVideoFrame(int64 mcstimestamp, const QImage &frame);
 	void encodeAudioFrame(const Media::Capture::Chunk &chunk);
@@ -105,16 +108,21 @@ private:
 
 	ushort _maxLevelSinceLastUpdate = 0;
 	crl::time _lastUpdateDuration = 0;
-	rpl::event_stream<Update, rpl::empty_error> _updates;
+	rpl::event_stream<Update, Error> _updates;
 
 	std::vector<bool> _circleMask; // Always nice to use vector<bool>! :D
 
+	base::ConcurrentTimer _timeoutTimer;
+
 };
 
 RoundVideoRecorder::Private::Private(crl::weak_on_queue<Private> weak)
-: _weak(std::move(weak)) {
+: _weak(std::move(weak))
+, _timeoutTimer(_weak, [=] { timeout(); }) {
 	initEncoding();
 	initCircleMask();
+
+	_timeoutTimer.callOnce(kInitTimeout);
 }
 
 RoundVideoRecorder::Private::~Private() {
@@ -174,8 +182,11 @@ void RoundVideoRecorder::Private::initEncoding() {
 		&Private::Seek,
 		"mp4"_q);
 
-	if (!initVideo() || !initAudio()) {
-		fail();
+	if (!initVideo()) {
+		fail(Error::VideoInit);
+		return;
+	} else if (!initAudio()) {
+		fail(Error::AudioInit);
 		return;
 	}
 
@@ -184,7 +195,7 @@ void RoundVideoRecorder::Private::initEncoding() {
 		nullptr));
 	if (error) {
 		LogError("avformat_write_header", error);
-		fail();
+		fail(Error::Encoding);
 	}
 }
 
@@ -364,7 +375,7 @@ void RoundVideoRecorder::Private::finishEncoding() {
 }
 
 auto RoundVideoRecorder::Private::updated() const
--> rpl::producer<Update, rpl::empty_error> {
+-> rpl::producer<Update, Error> {
 	return _updates.events();
 }
 
@@ -380,11 +391,19 @@ RoundVideoResult RoundVideoRecorder::Private::finish() {
 	};
 };
 
-void RoundVideoRecorder::Private::fail() {
+void RoundVideoRecorder::Private::fail(Error error) {
 	deinitEncoding();
 	_updates.fire_error({});
 }
 
+void RoundVideoRecorder::Private::timeout() {
+	if (!_firstAudioChunkFinished) {
+		fail(Error::AudioTimeout);
+	} else if (!_firstVideoFrameTime) {
+		fail(Error::VideoTimeout);
+	}
+}
+
 void RoundVideoRecorder::Private::deinitEncoding() {
 	_swsContext = nullptr;
 	_videoCodec = nullptr;
@@ -448,7 +467,7 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 		AV_PIX_FMT_YUV420P,
 		&_swsContext);
 	if (!_swsContext) {
-		fail();
+		fail(Error::Encoding);
 		return;
 	}
 
@@ -579,7 +598,7 @@ void RoundVideoRecorder::Private::encodeAudioFrame(
 
 		if (error) {
 			LogError("swr_convert", error);
-			fail();
+			fail(Error::Encoding);
 			return;
 		}
 
@@ -619,6 +638,8 @@ bool RoundVideoRecorder::Private::writeFrame(
 		const FramePointer &frame,
 		const CodecPointer &codec,
 		AVStream *stream) {
+	_timeoutTimer.cancel();
+
 	if (frame) {
 		updateResultDuration(frame->pts, codec->time_base);
 	}
@@ -626,7 +647,7 @@ bool RoundVideoRecorder::Private::writeFrame(
 	auto error = AvErrorWrap(avcodec_send_frame(codec.get(), frame.get()));
 	if (error) {
 		LogError("avcodec_send_frame", error);
-		fail();
+		fail(Error::Encoding);
 		return false;
 	}
 
@@ -642,7 +663,7 @@ bool RoundVideoRecorder::Private::writeFrame(
 			return true;  // Encoding finished
 		} else if (error) {
 			LogError("avcodec_receive_packet", error);
-			fail();
+			fail(Error::Encoding);
 			return false;
 		}
 
@@ -654,7 +675,7 @@ bool RoundVideoRecorder::Private::writeFrame(
 		error = AvErrorWrap(av_interleaved_write_frame(_format.get(), pkt));
 		if (error) {
 			LogError("av_interleaved_write_frame", error);
-			fail();
+			fail(Error::Encoding);
 			return false;
 		}
 	}
@@ -677,7 +698,11 @@ void RoundVideoRecorder::Private::updateResultDuration(
 		AVRational timeBase) {
 	accumulate_max(_resultDuration, PtsToTimeCeil(pts, timeBase));
 
-	if (_lastUpdateDuration + kUpdateEach >= _resultDuration) {
+	const auto initial = !_lastUpdateDuration;
+	if (initial) {
+		accumulate_max(_resultDuration, crl::time(1));
+	}
+	if (initial || (_lastUpdateDuration + kUpdateEach < _resultDuration)) {
 		_lastUpdateDuration = _resultDuration;
 		_updates.fire({
 			.samples = int(_resultDuration * 48),
@@ -704,15 +729,14 @@ Fn<void(Media::Capture::Chunk)> RoundVideoRecorder::audioChunkProcessor() {
 	};
 }
 
-auto RoundVideoRecorder::updated()
--> rpl::producer<Update, rpl::empty_error> {
+auto RoundVideoRecorder::updated() -> rpl::producer<Update, Error> {
 	return _private.producer_on_main([](const Private &that) {
 		return that.updated();
-	}) | rpl::before_next([=](const Update &update) {
-		const auto duration = (update.samples * crl::time(1000))
-			/ kAudioFrequency;
-		progressTo(duration / (1. * kMaxDuration));
-	});
+	}) | rpl::before_next(crl::guard(this, [=](const Update &update) {
+		const auto progress = (update.samples * crl::time(1000))
+			/ float64(kAudioFrequency * kMaxDuration);
+		progressTo(progress);
+	}));
 }
 
 void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
@@ -733,12 +757,20 @@ void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
 void RoundVideoRecorder::progressTo(float64 progress) {
 	if (_progress == progress) {
 		return;
+	} else if (_progress > 0.001) {
+		_progressAnimation.start(
+			[=] { _preview->update(); },
+			_progress,
+			progress,
+			kUpdateEach * 1.1);
+	}
+	if (!_progress) {
+		_fadeContentAnimation.start(
+			[=] { _preview->update(); },
+			0.,
+			1.,
+			crl::time(200));
 	}
-	_progressAnimation.start(
-		[=] { _preview->update(); },
-		progress,
-		_progress,
-		kUpdateEach);
 	_progress = progress;
 	_preview->update();
 }
@@ -775,12 +807,12 @@ void RoundVideoRecorder::prepareFrame() {
 
 void RoundVideoRecorder::createImages() {
 	const auto ratio = style::DevicePixelRatio();
-	_framePrepared = QImage(
+	_framePlaceholder = QImage(
 		QSize(_side, _side) * ratio,
 		QImage::Format_ARGB32_Premultiplied);
-	_framePrepared.fill(Qt::transparent);
-	_framePrepared.setDevicePixelRatio(ratio);
-	auto p = QPainter(&_framePrepared);
+	_framePlaceholder.fill(Qt::transparent);
+	_framePlaceholder.setDevicePixelRatio(ratio);
+	auto p = QPainter(&_framePlaceholder);
 	auto hq = PainterHighQualityEnabler(p);
 
 	p.setPen(Qt::NoPen);
@@ -830,10 +862,23 @@ void RoundVideoRecorder::setup() {
 		prepareFrame();
 
 		auto p = QPainter(raw);
+		const auto opacity = _fadeAnimation.value(_visible ? 1. : 0.);
+		if (_fadeAnimation.animating()) {
+			p.setOpacity(opacity);
+		} else if (!_visible) {
+			return;
+		}
 		p.drawImage(raw->rect(), _shadow);
 		const auto inner = QRect(_extent, _extent, _side, _side);
-		p.drawImage(inner, _framePrepared);
-		if (_progress > 0.) {
+		if (!_progress) {
+			p.drawImage(inner, _framePlaceholder);
+		} else {
+			if (_fadeContentAnimation.animating()) {
+				p.drawImage(inner, _framePlaceholder);
+				p.setOpacity(opacity * _fadeContentAnimation.value(1.));
+			}
+			p.drawImage(inner, _framePrepared);
+
 			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(QPen(
 				Qt::white,
@@ -867,10 +912,24 @@ void RoundVideoRecorder::setup() {
 	}, raw->lifetime());
 	_descriptor.track->markFrameShown();
 
+	fade(true);
+
 	raw->show();
 	raw->raise();
 }
 
+void RoundVideoRecorder::fade(bool visible) {
+	if (_visible == visible) {
+		return;
+	}
+	_visible = visible;
+	_fadeAnimation.start(
+		[=] { _preview->update(); },
+		visible ? 0. : 1.,
+		visible ? 1. : 0.,
+		crl::time(200));
+}
+
 void RoundVideoRecorder::setPaused(bool paused) {
 	if (_paused == paused) {
 		return;
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 6e9917d76..661314445 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/weak_ptr.h"
 #include "ui/effects/animations.h"
 
 #include <crl/crl_object_on_queue.h>
@@ -14,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Media::Capture {
 struct Chunk;
 struct Update;
+enum class Error : uchar;
 } // namespace Media::Capture
 
 namespace tgcalls {
@@ -42,7 +44,7 @@ struct RoundVideoResult {
 	crl::time duration = 0;
 };
 
-class RoundVideoRecorder final {
+class RoundVideoRecorder final : public base::has_weak_ptr {
 public:
 	explicit RoundVideoRecorder(RoundVideoRecorderDescriptor &&descriptor);
 	~RoundVideoRecorder();
@@ -53,7 +55,8 @@ public:
 	void hide(Fn<void(RoundVideoResult)> done = nullptr);
 
 	using Update = Media::Capture::Update;
-	[[nodiscard]] rpl::producer<Update, rpl::empty_error> updated();
+	using Error = Media::Capture::Error;
+	[[nodiscard]] rpl::producer<Update, Error> updated();
 
 private:
 	class Private;
@@ -62,13 +65,17 @@ private:
 	void prepareFrame();
 	void createImages();
 	void progressTo(float64 progress);
+	void fade(bool visible);
 
 	const RoundVideoRecorderDescriptor _descriptor;
 	std::unique_ptr<RpWidget> _preview;
 	crl::object_on_queue<Private> _private;
 	Ui::Animations::Simple _progressAnimation;
+	Ui::Animations::Simple _fadeAnimation;
+	Ui::Animations::Simple _fadeContentAnimation;
 	float64 _progress = 0.;
 	QImage _frameOriginal;
+	QImage _framePlaceholder;
 	QImage _framePrepared;
 	QImage _shadow;
 	int _lastAddedIndex = 0;
@@ -76,6 +83,7 @@ private:
 	int _side = 0;
 	int _progressStroke = 0;
 	int _extent = 0;
+	bool _visible = false;
 	bool _paused = false;
 
 };

From 7060c0e6d7fda35caf2f8f1c7f2c0efee4783e4e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Oct 2024 18:06:02 +0400
Subject: [PATCH 025/306] Fix crash in context menu without an item.

Fixes #28552.
---
 Telegram/SourceFiles/history/view/history_view_context_menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index e2eeb2988..82da069a7 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1277,7 +1277,7 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 			HistoryView::EmojiPacksSource::Message,
 			list->controller());
 	}
-	{
+	if (item) {
 		const auto added = (result->actions().size() > wasAmount);
 		if (!added) {
 			result->addSeparator();

From 302e9371c86331fcc1b2afb4f566633d3f309829 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Oct 2024 18:59:47 +0400
Subject: [PATCH 026/306] Show record init errors.

---
 Telegram/Resources/langs/lang.strings          |  2 ++
 .../controls/history_view_compose_controls.cpp | 18 ++++++++++++++++++
 .../controls/history_view_voice_record_bar.cpp | 10 ++++++----
 .../controls/history_view_voice_record_bar.h   |  7 +++++++
 .../ui/controls/round_video_recorder.cpp       |  6 +++++-
 5 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 70ad59585..5478c34fc 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3248,6 +3248,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_record_lock_discard" = "Discard";
 "lng_record_voice_tip" = "Hold to record audio. Click to switch to video.";
 "lng_record_video_tip" = "Hold to record video. Click to switch to audio.";
+"lng_record_audio_problem" = "Could not start audio recording. Please check your microphone.";
+"lng_record_video_problem" = "Could not start video recording. Please check your camera.";
 "lng_record_once_first_tooltip" = "Click to set this message to **Play Once**.";
 "lng_record_once_active_tooltip" = "The recipient will be able to listen only once.";
 "lng_will_be_notified" = "Subscribers will be notified when you post.";
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 0170f1a88..aab9559ca 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2429,6 +2429,24 @@ void ComposeControls::initVoiceRecordBar() {
 		}
 	}, _wrap->lifetime());
 
+	_voiceRecordBar->errors(
+	) | rpl::start_with_next([=](::Media::Capture::Error error) {
+		using Error = ::Media::Capture::Error;
+		switch (error) {
+		case Error::AudioInit:
+		case Error::AudioTimeout:
+			_show->showToast(tr::lng_record_audio_problem(tr::now));
+			break;
+		case Error::VideoInit:
+		case Error::VideoTimeout:
+			_show->showToast(tr::lng_record_video_problem(tr::now));
+			break;
+		default:
+			_show->showToast(u"Unknown error."_q);
+			break;
+		}
+	}, _wrap->lifetime());
+
 	_voiceRecordBar->updateSendButtonTypeRequests(
 	) | rpl::start_with_next([=] {
 		updateSendButtonType();
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 87c2147e0..436e38167 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
@@ -50,9 +50,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace HistoryView::Controls {
 namespace {
 
-using SendActionUpdate = VoiceRecordBar::SendActionUpdate;
-using VoiceToSend = VoiceRecordBar::VoiceToSend;
-
 constexpr auto kAudioVoiceUpdateView = crl::time(200);
 constexpr auto kAudioVoiceMaxLength = 100 * 60; // 100 minutes
 constexpr auto kMaxSamples
@@ -1703,8 +1700,9 @@ void VoiceRecordBar::startRecording() {
 				if (update.finished) {
 					stop(update.samples >= kMinSamples);
 				}
-			}, [=] {
+			}, [=](Error error) {
 				stop(false);
+				_errors.fire_copy(error);
 			}, _recordingLifetime);
 		}
 		_recordingLifetime.add([=] {
@@ -2025,6 +2023,10 @@ rpl::producer<> VoiceRecordBar::recordingTipRequests() const {
 	return _recordingTipRequests.events();
 }
 
+auto VoiceRecordBar::errors() const -> rpl::producer<Error> {
+	return _errors.events();
+}
+
 bool VoiceRecordBar::isLockPresent() const {
 	return _lockShowing.current();
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 3d6f1a878..c2db218bf 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -21,6 +21,10 @@ namespace style {
 struct RecordBar;
 } // namespace style
 
+namespace Media::Capture {
+enum class Error : uchar;
+} // namespace Media::Capture
+
 namespace Ui {
 class AbstractButton;
 class SendButton;
@@ -57,6 +61,7 @@ public:
 	using SendActionUpdate = Controls::SendActionUpdate;
 	using VoiceToSend = Controls::VoiceToSend;
 	using FilterCallback = Fn<bool()>;
+	using Error = ::Media::Capture::Error;
 
 	VoiceRecordBar(
 		not_null<Ui::RpWidget*> parent,
@@ -88,6 +93,7 @@ public:
 	[[nodiscard]] rpl::producer<not_null<QEvent*>> lockViewportEvents() const;
 	[[nodiscard]] rpl::producer<> updateSendButtonTypeRequests() const;
 	[[nodiscard]] rpl::producer<> recordingTipRequests() const;
+	[[nodiscard]] rpl::producer<Error> errors() const;
 
 	void requestToSendWithOptions(Api::SendOptions options);
 
@@ -173,6 +179,7 @@ private:
 	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
 	rpl::event_stream<> _cancelRequests;
 	rpl::event_stream<> _listenChanges;
+	rpl::event_stream<Error> _errors;
 
 	int _centerY = 0;
 	QRect _redCircleRect;
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 26c75ce83..12dc6fd93 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -26,7 +26,8 @@ constexpr auto kUpdateEach = crl::time(100);
 constexpr auto kAudioFrequency = 48'000;
 constexpr auto kAudioBitRate = 32'000;
 constexpr auto kVideoBitRate = 3 * 1024 * 1024;
-constexpr auto kMaxDuration = 10 * crl::time(1000);
+constexpr auto kMinDuration = crl::time(200);
+constexpr auto kMaxDuration = 60 * crl::time(1000);
 constexpr auto kInitTimeout = 5 * crl::time(1000);
 
 using namespace FFmpeg;
@@ -384,6 +385,9 @@ RoundVideoResult RoundVideoRecorder::Private::finish() {
 		return {};
 	}
 	finishEncoding();
+	if (_resultDuration < kMinDuration) {
+		return {};
+	}
 	return {
 		.content = _result,
 		.waveform = QByteArray(),

From c010ecfe383fdc270ad429fd1310b52558d19506 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 19 Oct 2024 11:12:54 +0400
Subject: [PATCH 027/306] Allow sending one-time round videos.

---
 Telegram/SourceFiles/api/api_sending.cpp      | 32 +++++++++----------
 Telegram/SourceFiles/storage/file_upload.cpp  | 18 +++++++----
 .../SourceFiles/storage/localimageloader.cpp  |  2 +-
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index a3003bab4..d0b897a07 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -456,6 +456,7 @@ void SendConfirmedFile(
 		not_null<Main::Session*> session,
 		const std::shared_ptr<FilePrepareResult> &file) {
 	const auto isEditing = (file->type != SendMediaType::Audio)
+		&& (file->type != SendMediaType::Round)
 		&& (file->to.replaceMediaOf != 0);
 	const auto newId = FullMsgId(
 		file->to.peer,
@@ -525,7 +526,8 @@ void SendConfirmedFile(
 		// Shortcut messages have no 'edited' badge.
 		flags |= MessageFlag::HideEdited;
 	}
-	if (file->type == SendMediaType::Audio) {
+	if (file->type == SendMediaType::Audio
+		|| file->type == SendMediaType::Round) {
 		if (!peer->isChannel() || peer->isMegagroup()) {
 			flags |= MessageFlag::MediaIsUnread;
 		}
@@ -551,29 +553,25 @@ void SendConfirmedFile(
 				MTPint());
 		} else if (file->type == SendMediaType::Audio) {
 			const auto ttlSeconds = file->to.options.ttlSeconds;
-			const auto isVoice = [&] {
-				return file->document.match([](const MTPDdocumentEmpty &d) {
-					return false;
-				}, [](const MTPDdocument &d) {
-					return ranges::any_of(d.vattributes().v, [&](
-							const MTPDocumentAttribute &attribute) {
-						using Att = MTPDdocumentAttributeAudio;
-						return attribute.match([](const Att &data) -> bool {
-							return data.vflags().v & Att::Flag::f_voice;
-						}, [](const auto &) {
-							return false;
-						});
-					});
-				});
-			}();
 			using Flag = MTPDmessageMediaDocument::Flag;
 			return MTP_messageMediaDocument(
 				MTP_flags(Flag::f_document
-					| (isVoice ? Flag::f_voice : Flag())
+					| Flag::f_voice
 					| (ttlSeconds ? Flag::f_ttl_seconds : Flag())),
 				file->document,
 				MTPVector<MTPDocument>(), // alt_documents
 				MTP_int(ttlSeconds));
+		} else if (file->type == SendMediaType::Round) {
+			using Flag = MTPDmessageMediaDocument::Flag;
+			const auto ttlSeconds = file->to.options.ttlSeconds;
+			return MTP_messageMediaDocument(
+				MTP_flags(Flag::f_document
+					| Flag::f_round
+					| (ttlSeconds ? Flag::f_ttl_seconds : Flag())
+					| (file->spoiler ? Flag::f_spoiler : Flag())),
+				file->document,
+				MTPVector<MTPDocument>(), // alt_documents
+				MTP_int(ttlSeconds));
 		} else {
 			Unexpected("Type in sendFilesConfirmed.");
 		}
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index 95c4b0a1b..eef376b74 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -124,7 +124,8 @@ Uploader::Entry::Entry(
 		: file->thumbId) {
 	if (file->type == SendMediaType::File
 		|| file->type == SendMediaType::ThemeFile
-		|| file->type == SendMediaType::Audio) {
+		|| file->type == SendMediaType::Audio
+		|| file->type == SendMediaType::Round) {
 		setDocSize(file->filesize);
 	}
 }
@@ -294,7 +295,8 @@ void Uploader::upload(
 			file->partssize);
 	} else if (file->type == SendMediaType::File
 		|| file->type == SendMediaType::ThemeFile
-		|| file->type == SendMediaType::Audio) {
+		|| file->type == SendMediaType::Audio
+		|| file->type == SendMediaType::Round) {
 		const auto document = file->thumb.isNull()
 			? session().data().processDocument(file->document)
 			: session().data().processDocument(
@@ -356,7 +358,8 @@ void Uploader::notifyFailed(const Entry &entry) {
 		_photoFailed.fire_copy(entry.itemId);
 	} else if (type == SendMediaType::File
 		|| type == SendMediaType::ThemeFile
-		|| type == SendMediaType::Audio) {
+		|| type == SendMediaType::Audio
+		|| type == SendMediaType::Round) {
 		const auto document = session().data().document(entry.file->id);
 		if (document->uploading()) {
 			document->status = FileUploadFailed;
@@ -385,7 +388,8 @@ 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->file->type == SendMediaType::Audio
+			|| entry->file->type == SendMediaType::Round)
 			&& entry->docSize <= kUseBigFilesFrom) {
 			entry->md5Hash.feed(result.data(), result.size());
 		}
@@ -756,7 +760,8 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 		_photoProgress.fire_copy(itemId);
 	} else if (entry.file->type == SendMediaType::File
 		|| entry.file->type == SendMediaType::ThemeFile
-		|| entry.file->type == SendMediaType::Audio) {
+		|| entry.file->type == SendMediaType::Audio
+		|| entry.file->type == SendMediaType::Round) {
 		const auto document = session().data().document(entry.file->id);
 		if (document->uploading()) {
 			document->uploadingData->offset = std::min(
@@ -856,7 +861,8 @@ void Uploader::finishFront() {
 		});
 	} else if (entry.file->type == SendMediaType::File
 		|| entry.file->type == SendMediaType::ThemeFile
-		|| entry.file->type == SendMediaType::Audio) {
+		|| entry.file->type == SendMediaType::Audio
+		|| entry.file->type == SendMediaType::Round) {
 		QByteArray docMd5(32, Qt::Uninitialized);
 		hashMd5Hex(entry.md5Hash.result(), docMd5.data());
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 9daeaecdd..8a9869139 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -1014,7 +1014,7 @@ void FileLoadTask::process(Args &&args) {
 			MTPVector<MTPVideoSize>(),
 			MTP_int(_dcId),
 			MTP_vector<MTPDocumentAttribute>(attributes));
-		_type = SendMediaType::File;
+		_type = isRound ? SendMediaType::Round : SendMediaType::File;
 	}
 
 	if (_information) {

From 95e0086eed75e0a8a70ac95e667c082748e99eb5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Oct 2024 10:16:03 +0400
Subject: [PATCH 028/306] Remov unused variable.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 13f52f944..7e4995af3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -57,7 +57,6 @@ namespace {
 
 constexpr auto kCollapsedChannelsCount = 5;
 constexpr auto kProbablyMaxChannels = 1000;
-constexpr auto kProbablyMaxRecommendations = 100;
 constexpr auto kCollapsedAppsCount = 5;
 constexpr auto kProbablyMaxApps = 100;
 

From 343ffc23eb62bf76bf8c9dfa9dc07fd836e997c3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Oct 2024 11:55:17 +0400
Subject: [PATCH 029/306] Add some dir="auto" to IV page.

I hope this fixes #28551.
---
 Telegram/SourceFiles/iv/iv_prepare.cpp | 72 +++++++++++++++++---------
 1 file changed, 48 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp
index 2f8a5398b..6fc891a19 100644
--- a/Telegram/SourceFiles/iv/iv_prepare.cpp
+++ b/Telegram/SourceFiles/iv/iv_prepare.cpp
@@ -389,11 +389,17 @@ QByteArray Parser::block(const MTPDpageBlockUnsupported &data) {
 }
 
 QByteArray Parser::block(const MTPDpageBlockTitle &data) {
-	return tag("h1", { { "class", "title" } }, rich(data.vtext()));
+	return tag("h1", {
+		{ "class", "title" },
+		{ "dir", "auto" },
+	}, rich(data.vtext()));
 }
 
 QByteArray Parser::block(const MTPDpageBlockSubtitle &data) {
-	return tag("h2", { { "class", "subtitle" } }, rich(data.vtext()));
+	return tag("h2", {
+		{ "class", "subtitle" },
+		{ "dir", "auto" },
+	}, rich(data.vtext()));
 }
 
 QByteArray Parser::block(const MTPDpageBlockAuthorDate &data) {
@@ -401,23 +407,29 @@ QByteArray Parser::block(const MTPDpageBlockAuthorDate &data) {
 	if (const auto date = data.vpublished_date().v) {
 		inner += " \xE2\x80\xA2 " + tag("time", Date(date));
 	}
-	return tag("address", inner);
+	return tag("address", { { "dir", "auto" } }, inner);
 }
 
 QByteArray Parser::block(const MTPDpageBlockHeader &data) {
-	return tag("h3", { { "class", "header" } }, rich(data.vtext()));
+	return tag("h3", {
+		{ "class", "header" },
+		{ "dir", "auto" },
+	}, rich(data.vtext()));
 }
 
 QByteArray Parser::block(const MTPDpageBlockSubheader &data) {
-	return tag("h4", { { "class", "subheader" } }, rich(data.vtext()));
+	return tag("h4", {
+		{ "class", "subheader" },
+		{ "dir", "auto" },
+	}, rich(data.vtext()));
 }
 
 QByteArray Parser::block(const MTPDpageBlockParagraph &data) {
-	return tag("p", rich(data.vtext()));
+	return tag("p", { { "dir", "auto" } }, rich(data.vtext()));
 }
 
 QByteArray Parser::block(const MTPDpageBlockPreformatted &data) {
-	auto list = Attributes();
+	auto list = Attributes{ { "dir", "auto" } };
 	const auto language = utf(data.vlanguage());
 	if (!language.isEmpty()) {
 		list.push_back({ "data-language", language });
@@ -428,7 +440,10 @@ QByteArray Parser::block(const MTPDpageBlockPreformatted &data) {
 }
 
 QByteArray Parser::block(const MTPDpageBlockFooter &data) {
-	return tag("footer", { { "class", "footer" } }, rich(data.vtext()));
+	return tag("footer", {
+		{ "class", "footer" },
+		{ "dir", "auto" },
+	}, rich(data.vtext()));
 }
 
 QByteArray Parser::block(const MTPDpageBlockDivider &data) {
@@ -447,19 +462,21 @@ QByteArray Parser::block(const MTPDpageBlockBlockquote &data) {
 	const auto caption = rich(data.vcaption());
 	const auto cite = caption.isEmpty()
 		? QByteArray()
-		: tag("cite", caption);
-	return tag("blockquote", rich(data.vtext()) + cite);
+		: tag("cite", { { "dir", "auto" } }, caption);
+	return tag("blockquote", {
+		{ "dir", "auto" }
+	}, rich(data.vtext()) + cite);
 }
 
 QByteArray Parser::block(const MTPDpageBlockPullquote &data) {
 	const auto caption = rich(data.vcaption());
 	const auto cite = caption.isEmpty()
 		? QByteArray()
-		: tag("cite", caption);
-	return tag(
-		"div",
-		{ { "class", "pullquote" } },
-		rich(data.vtext()) + cite);
+		: tag("cite", { { "dir", "auto" } }, caption);
+	return tag("div", {
+		{ "class", "pullquote" },
+		{ "dir", "auto" },
+	}, rich(data.vtext()) + cite);
 }
 
 QByteArray Parser::block(
@@ -763,7 +780,10 @@ QByteArray Parser::block(const MTPDpageBlockAudio &data) {
 }
 
 QByteArray Parser::block(const MTPDpageBlockKicker &data) {
-	return tag("h5", { { "class", "kicker" } }, rich(data.vtext()));
+	return tag("h5", {
+		{ "class", "kicker" },
+		{ "dir", "auto" },
+	}, rich(data.vtext()));
 }
 
 QByteArray Parser::block(const MTPDpageBlockTable &data) {
@@ -780,7 +800,7 @@ QByteArray Parser::block(const MTPDpageBlockTable &data) {
 	}
 	auto title = rich(data.vtitle());
 	if (!title.isEmpty()) {
-		title = tag("caption", title);
+		title = tag("caption", { { "dir", "auto" } }, title);
 	}
 	auto result = tag("table", attibutes, title + list(data.vrows()));
 	result = tag("figure", { { "class", "table" } }, result);
@@ -800,7 +820,8 @@ QByteArray Parser::block(const MTPDpageBlockDetails &data) {
 	return tag(
 		"details",
 		attributes,
-		tag("summary", rich(data.vtitle())) + list(data.vblocks()));
+		(tag("summary", { { "dir", "auto" } }, rich(data.vtitle()))
+			+ list(data.vblocks())));
 }
 
 QByteArray Parser::block(const MTPDpageBlockRelatedArticles &data) {
@@ -810,7 +831,10 @@ QByteArray Parser::block(const MTPDpageBlockRelatedArticles &data) {
 	}
 	auto title = rich(data.vtitle());
 	if (!title.isEmpty()) {
-		title = tag("h4", { { "class", "related-title" } }, title);
+		title = tag("h4", {
+			{ "class", "related-title" },
+			{ "dir", "auto" },
+		}, title);
 	}
 	return tag("section", { { "class", "related" } }, title + result);
 }
@@ -899,7 +923,7 @@ QByteArray Parser::block(const MTPDpageTableCell &data) {
 	} else {
 		style += "vertical-align:top;";
 	}
-	auto attributes = Attributes{ { "style", style } };
+	auto attributes = Attributes{ { "style", style }, { "dir", "auto" } };
 	if (const auto cs = data.vcolspan()) {
 		attributes.push_back({ "colspan", Number(cs->v) });
 	}
@@ -910,7 +934,7 @@ QByteArray Parser::block(const MTPDpageTableCell &data) {
 }
 
 QByteArray Parser::block(const MTPDpageListItemText &data) {
-	return tag("li", rich(data.vtext()));
+	return tag("li", { { "dir", "auto" } }, rich(data.vtext()));
 }
 
 QByteArray Parser::block(const MTPDpageListItemBlocks &data) {
@@ -920,7 +944,7 @@ QByteArray Parser::block(const MTPDpageListItemBlocks &data) {
 QByteArray Parser::block(const MTPDpageListOrderedItemText &data) {
 	return tag(
 		"li",
-		{ { "value", utf(data.vnum()) } },
+		{ { "value", utf(data.vnum()) }, { "dir", "auto" } },
 		rich(data.vtext()));
 }
 
@@ -1073,11 +1097,11 @@ QByteArray Parser::caption(const MTPPageCaption &caption) {
 	auto text = rich(caption.data().vtext());
 	const auto credit = rich(caption.data().vcredit());
 	if (!credit.isEmpty()) {
-		text += tag("cite", credit);
+		text += tag("cite", { { "dir", "auto" } }, credit);
 	} else if (text.isEmpty()) {
 		return QByteArray();
 	}
-	return tag("figcaption", text);
+	return tag("figcaption", { { "dir", "auto" } }, text);
 }
 
 Photo Parser::parse(const MTPPhoto &photo) {

From e8d87d37bb347795bbb9f0109e23acd77b2a1d75 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Oct 2024 11:55:53 +0400
Subject: [PATCH 030/306] Use a shorter phrase for bot policy.

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

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 5478c34fc..e42eaaf6a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3363,6 +3363,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_settings" = "Settings";
 "lng_bot_open" = "Open Bot";
 "lng_bot_terms" = "Terms of Use";
+"lng_bot_privacy" = "Privacy Policy";
 "lng_bot_reload_page" = "Reload Page";
 "lng_bot_add_to_menu" = "{bot} asks your permission to be added as an option to your attachment 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/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 7dd61c6da..ac8196618 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -2095,7 +2095,6 @@ void ActionsFiller::addBotCommandActions(not_null<UserData*> user) {
 		rpl::single(true),
 		openPrivacyPolicy,
 		nullptr);
-
 }
 
 void ActionsFiller::addReportAction() {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index fafb8d4b5..0081928a8 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -592,7 +592,7 @@ bool Panel::showWebview(
 			callback(tr::lng_bot_terms(tr::now), [=] {
 				File::OpenUrl(tr::lng_mini_apps_tos_url(tr::now));
 			}, &st::menuIconGroupLog);
-			callback(tr::lng_profile_bot_privacy(tr::now), [=] {
+			callback(tr::lng_bot_privacy(tr::now), [=] {
 				_delegate->botOpenPrivacyPolicy();
 			}, &st::menuIconAntispam);
 		}

From d7ffdbd78de978e9d9f520e302eb34ac8e4e2670 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Oct 2024 12:21:59 +0400
Subject: [PATCH 031/306] Prepare for round record pause/resume.

---
 .../icons/voice_lock/input_round_s.png        | Bin 0 -> 498 bytes
 .../icons/voice_lock/input_round_s@2x.png     | Bin 0 -> 1097 bytes
 .../icons/voice_lock/input_round_s@3x.png     | Bin 0 -> 1655 bytes
 .../chat_helpers/chat_helpers.style           |   1 +
 .../history_view_voice_record_bar.cpp         |  97 ++++++++++++------
 .../media/audio/media_audio_capture.cpp       |  35 ++++---
 .../media/audio/media_audio_capture.h         |   2 +-
 .../media/audio/media_audio_capture_common.h  |   3 +-
 .../ui/controls/round_video_recorder.cpp      |  87 +++++++++++-----
 .../ui/controls/round_video_recorder.h        |   9 +-
 10 files changed, 163 insertions(+), 71 deletions(-)
 create mode 100644 Telegram/Resources/icons/voice_lock/input_round_s.png
 create mode 100644 Telegram/Resources/icons/voice_lock/input_round_s@2x.png
 create mode 100644 Telegram/Resources/icons/voice_lock/input_round_s@3x.png

diff --git a/Telegram/Resources/icons/voice_lock/input_round_s.png b/Telegram/Resources/icons/voice_lock/input_round_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..549dd1ab1823cc0fd33cc22bfd130ecfc95a1904
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq00009a7bBm000XU
z000XU0RWnu7ytkPq)9|UR5*>bR6DMtFcdZ8k+TM~fK;TSLLgU8I(Cqnf)!XwM-(Zo
zg_IR!6%jN@i5HMAy<rWGWqArl83KM!(M#rZ+|Tjx;rasbA$ZdeLTEmp&t@}cgHq~t
zyWQ{i?^u&05ke@X?6*)#2_fP*b}M3x?RLBK`FuPcuh;8WXCj0ai^Y1qj^lW<+3ffG
zu@+-YQ52r%xa<_3=M_a^j7gH@DItVtn&w582UpWHLWn1|N~tW%oDCRbjIlG7Wtmb6
zA@uh<2m)(u6h*@#2q9xkO4%DMrDTjj2!}OM6j^J7AOHaT1_1Pbdgv~M@N_y6LJo&R
zRaF20O6hjHT`rfa)yf#tm-Q|G1|<wbYi$^Y4<g2x)|wD9Jf9GvwPuVxBICv>k(82i
zJ~f4NE~Ru5{hC%|jD6qlZ!|(xRle^#y>}4(3=X2M>)N)ZlulEW(zb28u6tEcS(bU8
zPtDHrye!KvRZY!?5Y~0AwdS0sX_}@f=Ui)D*Y$9e#*H5tNB}<gM8F%5_HwyAMc-c|
opI&SaU9Yd&(MtP2%l{qx0XtS$*udFLcK`qY07*qoM6N<$f`{4CFaQ7m

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/voice_lock/input_round_s@2x.png b/Telegram/Resources/icons/voice_lock/input_round_s@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ab801a465afd8bf21ac8effd457514359a4f28b
GIT binary patch
literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00009a7bBm000XU
z000XU0RWnu7ytkR`$<GWR9J=WSTSqrP!v9ScF7<PnIaA%jZ?tMASED976(Bvh=0Jr
zNwSsBwX2hVLDWGgR&;3)L?l@(WHKNvq;}CkT#b3deec%yOf*`3weY^_dil;hU+%r0
zbM687k8cLT35llZU@++QdfjgK0X`Os#bh!WjYjY9?+2KFfFwy#6ct5Ttybozv0AMZ
zMG-}jB*{b6q|<3#*FUdg6S}Ua(`h@u7Dq-9#NFN9&CLy-d47JDBuUrx#bR;5x4GSJ
zpU)SI#X_MFp1i-mzrDRRO>?(>u~@`k(`+_bmOVg(C0LeiHk)|yVzIc}Mi2zVUM`n~
zLg83a)=?-FmdhpbvgPam07#O=_vS=uuqJ$;w%u`26!A%&P7MM+J5dyENs6K%(h={C
z9axq{z7$2VX3#W^7{lT4)M^lh!=Y)KtJR98X*_v>N5Nna4W6E!oG(gI6w9(+uNMF&
zlZmRTv)Rm{tt3gIP>3LiU@(Y-_=h00C;+^@z3p6!AP7Ma^7%Z^^DdVQ&l`r(>-Eaz
za=l*P8Dn%^|I0N1{J<ler*=laKp-#}464;?G#Xu30{||UD;kYftJT3^5C{aeuY(<}
zr^pK%vMsKzt{xs9D2hTqHBIYuIxjCT0O0rg<MBAdFaW@DoGi=9WU}Ay@9W|ha=9G3
z)VW;FjuQw3rqd~+jYgwHBC*LyBod?12yv#<>6U%6^!US$y$OOKDwPV_8%dJF;c%<f
z+N8Bwt#CLjNfH216jiBI2*Od3v$r5Y5IBwl08P_UsnmQvw`0!d^HeIOX&L}<9483E
zNd)Edc{C^#3R~1*O*r{r!($4fD2nHK0MIne@}xG=YPHZN@jQ?J1V<CZvMl<Cx7%%p
zCIHasbO6BRayidMP6grE_4@kiTo4Ke@Mq{dj-Y=Ar-CMv2^#qQe&?%WGB!V&AXQZj
z!vKJIJnmf3_4PFX7>1#$>X8M_X0u+e2LKGiSO(}#Boc|s%S!<0^?J@rfIaR|xm-qr
zQmN$ec(#*09#5%M`pfXhg6j3UEXx4EFifM-*rLhf@iZC@lx1aEuGi})5oDTXHk(D8
zAB)8lMX^h+ilW3~F#wp&X4!1k(c|kk_A5We<8d;XMCAv=FprOqnx?heZ4{i=%MYX`
znM{ty<Goz$T@Us9eU9TQl?qC<48vdr>yTwRo6YX42G)<vvVOC~cs!0oBAHC4+wG!Q
zfMFO$x7*ERGLcARry9!|^<#%{?DF}1JH7(IG|gJAR;$%MQ{-bu)?t&TY1DT4+Go%o
zIIo8yoZ(aY?3xV#kWQ!1s2zjwwGFH9(9%Qrs;1{Qd`VmQTQ$!A<1FzL|H|E;HFwk@
P00000NkvXXu0mjfUSJ0F

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/voice_lock/input_round_s@3x.png b/Telegram/Resources/icons/voice_lock/input_round_s@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..878aa7e6a1369bfe370b2a5ee6749ede84e51aaa
GIT binary patch
literal 1655
zcmV--28j8IP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00009a7bBm000XU
z000XU0RWnu7ytkUDM>^@RA_<io3U#mO%%Xq^$O(>J7w20pn@UA8SbA@2@z8SYZL53
zRv{YV3CC@`A|X}8m=qBth0R6(2Acz$fZ!S|-NnNym(vu^`W1f6H{ZtSI<qD@@mI~P
z&YSmkX5P%anFV0Uk|j$BV91KuY_`vzKeH^$ah%<5HyVvP>I5O|bUKnG$+G<O=g(ii
ze(5NDJRHZx<MC>>3LzZ63J}6-wHlAdIgXo)Nmi>>5QJW@_d51Gr`PKVf?%~;^|UG&
z40gNSw=xN*+wBH}K`lB@A7iOhDxFR<jQXE{{`?U|QIe!irvo7*d0{VLG#c%8JI8S@
zm+RxlkE&mX!{L`NU%r0*N>#`8^|k7q4F-ckq2TlROePbRXbqT5CcocbC=>>Rfl7_*
z>uYkksZ>fOu3Rp=-ERFf*NWTiE|<$HWm2gWiL78Ss3;1O0wIjWVtOk)8?jgn_r{8%
zXdG|<VYOOuZvi3P+}xaxwzILhxry7>?RIDLlY$`Njn4D@+*F+zp67Ah1VPYRlH)jh
zzABf?^VE|Be7yB~J*{(hJRZk=;G1}h$++Ea+)u{iaZSal)ha4eC=}+bBq4=D0V!Fn
zR;L%R*=+de^!a@ASCRyu&xiXqo6R<*fZy*&1s)$CUtty|!(=i&K0YE<{eHjd4<A%{
zd?1RV`1JHdse#AiSzB8hZEyepqs_?O-Cez2rxE+~^dySnr%#_o+2{U4Z5Ye4C@o16
zam8-8I}(X(Y;3Hotc?9btJS)_z0K$IjYfm43Q3ZXVYu4kIX^!~?R$B7Nl+ilvbkLD
z`RZ;ggTWw|%S~5n9G91uNY45Bx$0MgDv$4l3D)d^KtL45ot+(xdupT6xU;h(ieexT
zn6)lkz30`byCMw-2M6E2eKQ!;FH4r?X0ti!*c`_>olaE~SuB<xKYk>W$?xC4>!plt
zh8-Ln93LO!Px}3SHk-Y<xvAA^!{HD;XBfuo^=@x(N25`***tn^Fc>nK48t&)Ohzx2
z{zopCLmfAl%V{hX2n1A7kW#7Sa5yHHayT5NQVA~wA=KU{C#$ONHUzLNTPzk)4;&7M
z$z*bCYpdOEPcGPQx3{*olF1}$PlLfwEEdUpi3%MIOQ+Koiv?v54-Zv+ax%xq$A^c9
zC~L7;(&;q4R%&MLimLT!sZ=7X7w?lASKjmOijhbJx!QiezqhwXCTDMNuix*F(ng~(
z5{XbMMr+u{#s*4fv)QTR>LuFkb~c+GE0zo@!#o}jzGAw$xuKDU7hhRf@pwEm(x?nu
zTU$eES(a<H8jZACttQLzSm6Xv8HW4iX0wUU!UPP5!)CKNRyYAvhT)q9nytWCA(W>O
zI?QA56Dq@We8JC!P<8<-!|<{0bUL3OT+9T+Fixj)tZ)LT47<C#Lur;}y<RVkG_Ti-
zI}BVn0aS+7>-AQvg|ge*+ceVf;;mMTGAKgpJZ^7qQ92rpPTi`!gu~&8Mx$fJl0j=&
zKA%ThbhFufc6LT4=j`kZZ8{-@`Fx&IF<QeKjmFj070QM}p+q7vtB^z@5ekJ+_Uh`2
zICS+Q1UqP!Wgi|MP$@-GX0k1jNZ<!?4-XF-*Bo=-LCdln4u=&*8D$xU5d=YdXh0AI
zG*2js5)Owc9sLM>Rvwi~1>Xe&079YA{r&yP$;tZqx@vx77-oHa{p952{{9~CfdGJH
zGFhoqbWusSDAg#sgooeEX7m33{{H^{)bJYsKv9%;8h!%+WHOn0y<RL9@el|AfMwaq
z!{+zz-{EjrueKVY?uwJct5c~|DlV7n;^IPM6d6KzadF{txd^P99JE#&*6DOm+HSYc
zS{VR9mgU{u-PP6A)6-LYU817ZYMq{*uCA``?(UL#3tT;1?Gfs(sMmtM(P;2I&-478
zj*-BuTY-f+_*3(@9M$3tpy{X<Eb8GpSm5gr3wwbDyzeVVu~-b(ZH6mHV1X}*fpORR
z-n`v-o~OOmH{zXN#5_7WBA58)S7&`bAKBH}DUm>iVUCWD7Vxt3h`;fAx>gqRg95}~
z^a%*nM>`zHu`D~Mk9K5PmL%zwKH6EbWXY0$`3H##KK|A}p^g9m002ovPDHLkV1mlG
B8*~5w

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index b1bfa2f78..25e4852a6 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1210,6 +1210,7 @@ historyRecordLockBody: icon {{ "voice_lock/record_lock_body", historyToDownBg }}
 historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
 historyRecordLockArrow: icon {{ "voice_lock/voice_arrow", historyToDownFg }};
 historyRecordLockInput: icon {{ "voice_lock/input_mic_s", historyToDownFg }};
+historyRecordLockRound: icon {{ "voice_lock/input_round_s", historyToDownFg }};
 historyRecordLockRippleMargin: margins(6px, 6px, 6px, 6px);
 
 historyRecordDelete: IconButton(historyAttach) {
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 436e38167..e1110c770 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
@@ -497,8 +497,7 @@ ListenWrap::ListenWrap(
 , _data(data)
 , _delete(base::make_unique_q<Ui::IconButton>(parent, _st.remove))
 , _durationFont(font)
-, _duration(Ui::FormatDurationText(
-	float64(_data->samples) / ::Media::Player::kDefaultFrequency))
+, _duration(Ui::FormatDurationText(_data->duration / 1000))
 , _durationWidth(_durationFont->width(_duration))
 , _playPauseSt(st::mediaPlayerButton)
 , _playPauseButton(base::make_unique_q<Ui::AbstractButton>(parent))
@@ -634,7 +633,7 @@ void ListenWrap::initPlayButton() {
 
 	_mediaView->setBytes(_data->bytes);
 	_document->size = _data->bytes.size();
-	_document->type = VoiceDocument;
+	_document->type = _data->video ? RoundVideoDocument : VoiceDocument;
 
 	const auto &play = _playPauseSt.playOuter;
 	const auto &width = _waveformBgFinalCenterRect.height();
@@ -833,6 +832,7 @@ public:
 	void requestPaintLockToStopProgress(float64 progress);
 	void requestPaintPauseToInputProgress(float64 progress);
 	void setVisibleTopPart(int part);
+	void setRecordingVideo(bool value);
 
 	[[nodiscard]] rpl::producer<> locks() const;
 	[[nodiscard]] bool isLocked() const;
@@ -861,6 +861,7 @@ private:
 	float64 _pauseToInputProgress = 0.;
 	rpl::variable<float64> _progress = 0.;
 	int _visibleTopPart = -1;
+	bool _recordingVideo = false;
 
 };
 
@@ -884,6 +885,10 @@ void RecordLock::setVisibleTopPart(int part) {
 	_visibleTopPart = part;
 }
 
+void RecordLock::setRecordingVideo(bool value) {
+	_recordingVideo = value;
+}
+
 void RecordLock::init() {
 	shownValue(
 	) | rpl::start_with_next([=](bool shown) {
@@ -974,9 +979,10 @@ void RecordLock::drawProgress(QPainter &p) {
 			p.setBrush(_st.fg);
 			if (_pauseToInputProgress > 0.) {
 				p.setOpacity(_pauseToInputProgress);
-				st::historyRecordLockInput.paintInCenter(
-					p,
-					blockRect.toRect());
+				const auto &icon = _recordingVideo
+					? st::historyRecordLockRound
+					: st::historyRecordLockInput;
+				icon.paintInCenter(p, blockRect.toRect());
 				p.setOpacity(1. - _pauseToInputProgress);
 			}
 			p.drawRoundedRect(
@@ -1533,6 +1539,7 @@ void VoiceRecordBar::init() {
 			}
 			_recordingTipRequire = crl::now();
 			_recordingVideo = (_send->type() == Ui::SendButton::Type::Round);
+			_lock->setRecordingVideo(_recordingVideo);
 			_startTimer.callOnce(st::universalDuration);
 		} else if (e->type() == QEvent::MouseButtonRelease) {
 			checkTipRequired();
@@ -1680,7 +1687,9 @@ void VoiceRecordBar::startRecording() {
 			_paused = false;
 			instance()->pause(false, nullptr);
 			if (_videoRecorder) {
-				_videoRecorder->setPaused(false);
+				_videoRecorder->resume({
+					.content = _data.bytes,
+				});
 			}
 		} else {
 			instance()->start(_videoRecorder
@@ -1809,7 +1818,6 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 	using namespace ::Media::Capture;
 	if (type == StopType::Cancel) {
 		if (_videoRecorder) {
-			_videoRecorder->setPaused(true);
 			_videoRecorder->hide();
 		}
 		instance()->stop(crl::guard(this, [=](Result &&data) {
@@ -1817,29 +1825,54 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 		}));
 	} else if (type == StopType::Listen) {
 		if (_videoRecorder) {
-			_videoRecorder->setPaused(true);
+			const auto weak = Ui::MakeWeak(this);
+			_videoRecorder->pause([=](Ui::RoundVideoResult data) {
+				crl::on_main([=, data = std::move(data)]() mutable {
+					if (weak) {
+						window()->raise();
+						window()->activateWindow();
+
+						_paused = true;
+						_data = ::Media::Capture::Result{
+							.bytes = std::move(data.content),
+							//.waveform = std::move(data.waveform),
+							.duration = data.duration,
+							.video = true,
+						};
+						_listen = std::make_unique<ListenWrap>(
+							this,
+							_st,
+							&_show->session(),
+							&_data,
+							_cancelFont);
+						_listenChanges.fire({});
+					}
+				});
+			});
+			instance()->pause(true);
+		} else {
+			instance()->pause(true, crl::guard(this, [=](Result &&data) {
+				if (data.bytes.isEmpty()) {
+					// Close everything.
+					stop(false);
+					return;
+				}
+				_paused = true;
+				_data = std::move(data);
+
+				window()->raise();
+				window()->activateWindow();
+				_listen = std::make_unique<ListenWrap>(
+					this,
+					_st,
+					&_show->session(),
+					&_data,
+					_cancelFont);
+				_listenChanges.fire({});
+
+				// _lockShowing = false;
+			}));
 		}
-		instance()->pause(true, crl::guard(this, [=](Result &&data) {
-			if (data.bytes.isEmpty()) {
-				// Close everything.
-				stop(false);
-				return;
-			}
-			_paused = true;
-			_data = std::move(data);
-
-			window()->raise();
-			window()->activateWindow();
-			_listen = std::make_unique<ListenWrap>(
-				this,
-				_st,
-				&_show->session(),
-				&_data,
-				_cancelFont);
-			_listenChanges.fire({});
-
-			// _lockShowing = false;
-		}));
 	} else if (type == StopType::Send) {
 		if (_videoRecorder) {
 			const auto weak = Ui::MakeWeak(this);
@@ -1882,7 +1915,7 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 			_sendVoiceRequests.fire({
 				_data.bytes,
 				_data.waveform,
-				Duration(_data.samples),
+				_data.duration,
 				options,
 			});
 		}));
@@ -1949,7 +1982,7 @@ void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
 		_sendVoiceRequests.fire({
 			_data.bytes,
 			_data.waveform,
-			Duration(_data.samples),
+			_data.duration,
 			options,
 		});
 	}
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index 3d6df88c6..d46f8789c 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -170,13 +170,15 @@ void Instance::stop(Fn<void(Result&&)> callback) {
 }
 
 void Instance::pause(bool value, Fn<void(Result&&)> callback) {
-	Expects(callback != nullptr || !value);
 	InvokeQueued(_inner.get(), [=] {
-		_inner->pause(value, [=](Result &&result) {
-			crl::on_main([=, result = std::move(result)]() mutable {
-				callback(std::move(result));
-			});
-		});
+		auto done = callback
+			? [=](Result &&result) {
+				crl::on_main([=, result = std::move(result)]() mutable {
+					callback(std::move(result));
+				});
+			}
+			: std::move(callback);
+		_inner->pause(value, std::move(done));
 	});
 }
 
@@ -481,11 +483,16 @@ void Instance::Inner::pause(bool value, Fn<void(Result&&)> callback) {
 	if (!_paused) {
 		return;
 	}
-	callback({
-		d->fullSamples ? d->data : QByteArray(),
-		d->fullSamples ? CollectWaveform(d->waveform) : VoiceWaveform(),
-		qint32(d->fullSamples),
-	});
+	if (callback) {
+		callback({
+			.bytes = d->fullSamples ? d->data : QByteArray(),
+			.waveform = (d->fullSamples
+				? CollectWaveform(d->waveform)
+				: VoiceWaveform()),
+			.duration = ((d->fullSamples * crl::time(1000))
+				/ int64(kCaptureFrequency)),
+		});
+	}
 }
 
 void Instance::Inner::stop(Fn<void(Result&&)> callback) {
@@ -620,7 +627,11 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
 	}
 
 	if (needResult) {
-		callback({ result, waveform, samples });
+		callback({
+			.bytes = result,
+			.waveform = waveform,
+			.duration = (samples * crl::time(1000)) / kCaptureFrequency,
+		});
 	}
 }
 
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.h b/Telegram/SourceFiles/media/audio/media_audio_capture.h
index e588637c1..fb79b39dd 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.h
@@ -63,7 +63,7 @@ public:
 
 	void start(Fn<void(Chunk)> externalProcessing = nullptr);
 	void stop(Fn<void(Result&&)> callback = nullptr);
-	void pause(bool value, Fn<void(Result&&)> callback);
+	void pause(bool value, Fn<void(Result&&)> callback = nullptr);
 
 private:
 	class Inner;
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture_common.h b/Telegram/SourceFiles/media/audio/media_audio_capture_common.h
index 370259f58..e276ad4e9 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture_common.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture_common.h
@@ -12,7 +12,8 @@ namespace Media::Capture {
 struct Result {
 	QByteArray bytes;
 	VoiceWaveform waveform;
-	int samples = 0;
+	crl::time duration;
+	bool video = false;
 };
 
 } // namespace Media::Capture
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 12dc6fd93..3025a84ab 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -46,6 +46,7 @@ public:
 	[[nodiscard]] rpl::producer<Update, Error> updated() const;
 
 	[[nodiscard]] RoundVideoResult finish();
+	void restart(RoundVideoPartial partial);
 
 private:
 	static int Write(void *opaque, uint8_t *buf, int buf_size);
@@ -111,6 +112,10 @@ private:
 	crl::time _lastUpdateDuration = 0;
 	rpl::event_stream<Update, Error> _updates;
 
+	crl::time _maxDuration = 0;
+	crl::time _previousPartsDuration = 0;
+	QByteArray _previousContent;
+
 	std::vector<bool> _circleMask; // Always nice to use vector<bool>! :D
 
 	base::ConcurrentTimer _timeoutTimer;
@@ -119,6 +124,7 @@ private:
 
 RoundVideoRecorder::Private::Private(crl::weak_on_queue<Private> weak)
 : _weak(std::move(weak))
+, _maxDuration(kMaxDuration)
 , _timeoutTimer(_weak, [=] { timeout(); }) {
 	initEncoding();
 	initCircleMask();
@@ -385,15 +391,31 @@ RoundVideoResult RoundVideoRecorder::Private::finish() {
 		return {};
 	}
 	finishEncoding();
-	if (_resultDuration < kMinDuration) {
+	auto result = RoundVideoResult{
+		.content = base::take(_result),
+		.waveform = QByteArray(),
+		.duration = base::take(_resultDuration),
+	};
+	if (result.duration < kMinDuration) {
 		return {};
 	}
-	return {
-		.content = _result,
-		.waveform = QByteArray(),
-		.duration = _resultDuration,
-	};
-};
+	_previousPartsDuration += result.duration;
+	_maxDuration -= result.duration;
+	return result;
+}
+
+void RoundVideoRecorder::Private::restart(RoundVideoPartial partial) {
+	if (_format) {
+		return;
+	} else if (_maxDuration <= 0) {
+		notifyFinished();
+		return;
+	}
+	_previousContent = std::move(partial.content);
+	_finished = false;
+	initEncoding();
+	_timeoutTimer.callOnce(kInitTimeout);
+}
 
 void RoundVideoRecorder::Private::fail(Error error) {
 	deinitEncoding();
@@ -421,7 +443,17 @@ void RoundVideoRecorder::Private::deinitEncoding() {
 
 	_videoFirstTimestamp = -1;
 	_videoPts = 0;
+	_audioTail = QByteArray();
 	_audioPts = 0;
+	_audioChannels = 0;
+
+	_firstAudioChunkFinished = 0;
+	_firstVideoFrameTime = 0;
+
+	_resultOffset = 0;
+
+	_maxLevelSinceLastUpdate = 0;
+	_lastUpdateDuration = 0;
 }
 
 void RoundVideoRecorder::Private::push(
@@ -494,7 +526,7 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 	cutCircleFromYUV420P(_videoFrame.get());
 
 	_videoFrame->pts = mcstimestamp - _videoFirstTimestamp;
-	if (_videoFrame->pts >= kMaxDuration * int64(1000)) {
+	if (_videoFrame->pts >= _maxDuration * int64(1000)) {
 		notifyFinished();
 		return;
 	} else if (!writeFrame(_videoFrame, _videoCodec, _videoStream)) {
@@ -611,7 +643,7 @@ void RoundVideoRecorder::Private::encodeAudioFrame(
 
 		_audioFrame->pts = _audioPts;
 		_audioPts += _audioFrame->nb_samples;
-		if (_audioPts >= kMaxDuration * int64(kAudioFrequency) / 1000) {
+		if (_audioPts >= _maxDuration * int64(kAudioFrequency) / 1000) {
 			notifyFinished();
 			return;
 		} else if (!writeFrame(_audioFrame, _audioCodec, _audioStream)) {
@@ -632,7 +664,7 @@ void RoundVideoRecorder::Private::encodeAudioFrame(
 void RoundVideoRecorder::Private::notifyFinished() {
 	_finished = true;
 	_updates.fire({
-		.samples = int(_resultDuration * 48),
+		.samples = int((_previousPartsDuration + _resultDuration) * 48),
 		.level = base::take(_maxLevelSinceLastUpdate),
 		.finished = true,
 	});
@@ -709,7 +741,7 @@ void RoundVideoRecorder::Private::updateResultDuration(
 	if (initial || (_lastUpdateDuration + kUpdateEach < _resultDuration)) {
 		_lastUpdateDuration = _resultDuration;
 		_updates.fire({
-			.samples = int(_resultDuration * 48),
+			.samples = int((_previousPartsDuration + _resultDuration) * 48),
 			.level = base::take(_maxLevelSinceLastUpdate),
 		});
 	}
@@ -744,13 +776,7 @@ auto RoundVideoRecorder::updated() -> rpl::producer<Update, Error> {
 }
 
 void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
-	if (done) {
-		_private.with([done = std::move(done)](Private &that) {
-			done(that.finish());
-		});
-	}
-
-	setPaused(true);
+	pause(std::move(done));
 
 	_preview->hide();
 	if (const auto onstack = _descriptor.hidden) {
@@ -934,16 +960,29 @@ void RoundVideoRecorder::fade(bool visible) {
 		crl::time(200));
 }
 
-void RoundVideoRecorder::setPaused(bool paused) {
-	if (_paused == paused) {
+void RoundVideoRecorder::pause(Fn<void(RoundVideoResult)> done) {
+	if (_paused) {
 		return;
+	} else if (done) {
+		_private.with([done = std::move(done)](Private &that) {
+			done(that.finish());
+		});
 	}
-	_paused = paused;
-	_descriptor.track->setState(paused
-		? Webrtc::VideoState::Inactive
-		: Webrtc::VideoState::Active);
+	_paused = true;
+	_descriptor.track->setState(Webrtc::VideoState::Inactive);
 	_preview->update();
 }
 
+void RoundVideoRecorder::resume(RoundVideoPartial partial) {
+	if (!_paused) {
+		return;
+	}
+	_private.with([partial = std::move(partial)](Private &that) mutable {
+		that.restart(std::move(partial));
+	});
+	_paused = false;
+	_descriptor.track->setState(Webrtc::VideoState::Active);
+	_preview->update();
+}
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 661314445..6d7505207 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -44,6 +44,12 @@ struct RoundVideoResult {
 	crl::time duration = 0;
 };
 
+struct RoundVideoPartial {
+	QByteArray content;
+	crl::time from = 0;
+	crl::time till = 0;
+};
+
 class RoundVideoRecorder final : public base::has_weak_ptr {
 public:
 	explicit RoundVideoRecorder(RoundVideoRecorderDescriptor &&descriptor);
@@ -51,7 +57,8 @@ public:
 
 	[[nodiscard]] Fn<void(Media::Capture::Chunk)> audioChunkProcessor();
 
-	void setPaused(bool paused);
+	void pause(Fn<void(RoundVideoResult)> done = nullptr);
+	void resume(RoundVideoPartial partial);
 	void hide(Fn<void(RoundVideoResult)> done = nullptr);
 
 	using Update = Media::Capture::Update;

From 4142ada729b3bef3091d998d69242052a71f44ba Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Oct 2024 17:36:06 +0400
Subject: [PATCH 032/306] Concatenate two recordings.

---
 .../history_view_voice_record_bar.cpp         |   5 +-
 .../ui/controls/round_video_recorder.cpp      | 234 ++++++++++++++++--
 .../ui/controls/round_video_recorder.h        |   2 +-
 3 files changed, 219 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index e1110c770..8d7c9c0ff 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
@@ -1688,7 +1688,10 @@ void VoiceRecordBar::startRecording() {
 			instance()->pause(false, nullptr);
 			if (_videoRecorder) {
 				_videoRecorder->resume({
-					.content = _data.bytes,
+					.video = {
+						.content = _data.bytes,
+						.duration = _data.duration,
+					},
 				});
 			}
 		} else {
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 3025a84ab..ea8540fc4 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -32,6 +32,39 @@ constexpr auto kInitTimeout = 5 * crl::time(1000);
 
 using namespace FFmpeg;
 
+struct ReadBytesWrap {
+	int64 size = 0;
+	int64 offset = 0;
+	const uchar *data = nullptr;
+
+	static int Read(void *opaque, uint8_t *buf, int buf_size) {
+		auto wrap = static_cast<ReadBytesWrap*>(opaque);
+		const auto toRead = std::min(
+			int64(buf_size),
+			wrap->size - wrap->offset);
+		if (toRead > 0) {
+			memcpy(buf, wrap->data + wrap->offset, toRead);
+			wrap->offset += toRead;
+		}
+		return toRead;
+	};
+	static int64 Seek(void *opaque, int64_t offset, int whence) {
+		auto wrap = static_cast<ReadBytesWrap*>(opaque);
+		auto updated = int64(-1);
+		switch (whence) {
+		case SEEK_SET: updated = offset; break;
+		case SEEK_CUR: updated = wrap->offset + offset; break;
+		case SEEK_END: updated = wrap->size + offset; break;
+		case AVSEEK_SIZE: return wrap->size; break;
+		}
+		if (updated < 0 || updated > wrap->size) {
+			return -1;
+		}
+		wrap->offset = updated;
+		return updated;
+	};
+};
+
 } // namespace
 
 class RoundVideoRecorder::Private final {
@@ -49,8 +82,21 @@ public:
 	void restart(RoundVideoPartial partial);
 
 private:
-	static int Write(void *opaque, uint8_t *buf, int buf_size);
-	static int64_t Seek(void *opaque, int64_t offset, int whence);
+	static constexpr auto kMaxStreams = 2;
+
+	struct CopyContext {
+		CopyContext();
+
+		std::array<int64, kMaxStreams> lastPts = { 0 };
+		std::array<int64, kMaxStreams> lastDts = { 0 };
+	};
+
+	static int Write(void *opaque, uint8_t *buf, int buf_size) {
+		return static_cast<Private*>(opaque)->write(buf, buf_size);
+	}
+	static int64_t Seek(void *opaque, int64_t offset, int whence) {
+		return static_cast<Private*>(opaque)->seek(offset, whence);
+	}
 
 	int write(uint8_t *buf, int buf_size);
 	int64_t seek(int64_t offset, int whence);
@@ -77,6 +123,16 @@ private:
 	void cutCircleFromYUV420P(not_null<AVFrame*> frame);
 	void initCircleMask();
 
+	[[nodiscard]] RoundVideoResult appendToPrevious(RoundVideoResult video);
+	[[nodiscard]] static FormatPointer OpenInputContext(
+		not_null<const QByteArray*> data,
+		not_null<ReadBytesWrap*> wrap);
+	[[nodiscard]] bool copyPackets(
+		not_null<AVFormatContext*> input,
+		not_null<AVFormatContext*> output,
+		CopyContext &context,
+		crl::time offset = 0);
+
 	const crl::weak_on_queue<Private> _weak;
 
 	FormatPointer _format;
@@ -113,8 +169,9 @@ private:
 	rpl::event_stream<Update, Error> _updates;
 
 	crl::time _maxDuration = 0;
-	crl::time _previousPartsDuration = 0;
-	QByteArray _previousContent;
+	RoundVideoResult _previous;
+
+	ReadBytesWrap _forConcat1, _forConcat2;
 
 	std::vector<bool> _circleMask; // Always nice to use vector<bool>! :D
 
@@ -122,6 +179,11 @@ private:
 
 };
 
+RoundVideoRecorder::Private::CopyContext::CopyContext() {
+	ranges::fill(lastPts, std::numeric_limits<int64>::min());
+	ranges::fill(lastDts, std::numeric_limits<int64>::min());
+}
+
 RoundVideoRecorder::Private::Private(crl::weak_on_queue<Private> weak)
 : _weak(std::move(weak))
 , _maxDuration(kMaxDuration)
@@ -136,14 +198,6 @@ RoundVideoRecorder::Private::~Private() {
 	finishEncoding();
 }
 
-int RoundVideoRecorder::Private::Write(void *opaque, uint8_t *buf, int buf_size) {
-	return static_cast<Private*>(opaque)->write(buf, buf_size);
-}
-
-int64_t RoundVideoRecorder::Private::Seek(void *opaque, int64_t offset, int whence) {
-	return static_cast<Private*>(opaque)->seek(offset, whence);
-}
-
 int RoundVideoRecorder::Private::write(uint8_t *buf, int buf_size) {
 	if (const auto total = _resultOffset + int64(buf_size)) {
 		const auto size = int64(_result.size());
@@ -376,7 +430,11 @@ void RoundVideoRecorder::Private::finishEncoding() {
 	if (_format
 		&& writeFrame(nullptr, _videoCodec, _videoStream)
 		&& writeFrame(nullptr, _audioCodec, _audioStream)) {
-		av_write_trailer(_format.get());
+		const auto error = AvErrorWrap(av_write_trailer(_format.get()));
+		if (error) {
+			LogError("av_write_trailer", error);
+			fail(Error::Encoding);
+		}
 	}
 	deinitEncoding();
 }
@@ -391,19 +449,153 @@ RoundVideoResult RoundVideoRecorder::Private::finish() {
 		return {};
 	}
 	finishEncoding();
-	auto result = RoundVideoResult{
+	auto result = appendToPrevious({
 		.content = base::take(_result),
 		.waveform = QByteArray(),
 		.duration = base::take(_resultDuration),
-	};
+	});
 	if (result.duration < kMinDuration) {
 		return {};
 	}
-	_previousPartsDuration += result.duration;
-	_maxDuration -= result.duration;
 	return result;
 }
 
+RoundVideoResult RoundVideoRecorder::Private::appendToPrevious(
+		RoundVideoResult video) {
+	if (!_previous.duration) {
+		return video;
+	}
+	const auto cleanup = gsl::finally([&] {
+		_forConcat1 = {};
+		_forConcat2 = {};
+		deinitEncoding();
+	});
+
+	auto input1 = OpenInputContext(&_previous.content, &_forConcat1);
+	auto input2 = OpenInputContext(&video.content, &_forConcat2);
+	if (!input1 || !input2) {
+		return video;
+	}
+
+	auto output = MakeWriteFormatPointer(
+		static_cast<void*>(this),
+		nullptr,
+		&Private::Write,
+		&Private::Seek,
+		"mp4"_q);
+
+	for (auto i = 0; i != input1->nb_streams; ++i) {
+		AVStream *inStream = input1->streams[i];
+		AVStream *outStream = avformat_new_stream(output.get(), nullptr);
+		if (!outStream) {
+			LogError("avformat_new_stream");
+			fail(Error::Encoding);
+			return {};
+		}
+		const auto error = AvErrorWrap(avcodec_parameters_copy(
+			outStream->codecpar,
+			inStream->codecpar));
+		if (error) {
+			LogError("avcodec_parameters_copy", error);
+			fail(Error::Encoding);
+			return {};
+		}
+		outStream->time_base = inStream->time_base;
+	}
+
+	const auto offset = _previous.duration;
+	auto context = CopyContext();
+	auto error = AvErrorWrap(avformat_write_header(
+		output.get(),
+		nullptr));
+	if (error) {
+		LogError("avformat_write_header", error);
+		fail(Error::Encoding);
+		return {};
+	} else if (!copyPackets(input1.get(), output.get(), context)
+		|| !copyPackets(input2.get(), output.get(), context, offset)) {
+		return {};
+	}
+	error = AvErrorWrap(av_write_trailer(output.get()));
+	if (error) {
+		LogError("av_write_trailer", error);
+		fail(Error::Encoding);
+		return {};
+	}
+	return RoundVideoResult{
+		.content = base::take(_result),
+		.waveform = QByteArray(),
+		.duration = _previous.duration + video.duration,
+	};
+}
+
+FormatPointer RoundVideoRecorder::Private::OpenInputContext(
+		not_null<const QByteArray*> data,
+		not_null<ReadBytesWrap*> wrap) {
+	*wrap = ReadBytesWrap{
+		.size = data->size(),
+		.data = reinterpret_cast<const uchar*>(data->constData()),
+	};
+	return MakeFormatPointer(
+		wrap.get(),
+		&ReadBytesWrap::Read,
+		nullptr,
+		&ReadBytesWrap::Seek);
+}
+
+bool RoundVideoRecorder::Private::copyPackets(
+		not_null<AVFormatContext*> input,
+		not_null<AVFormatContext*> output,
+		CopyContext &context,
+		crl::time offset) {
+	AVPacket packet;
+	av_init_packet(&packet);
+
+	auto offsets = std::array<int64, kMaxStreams>{ 0 };
+	while (av_read_frame(input, &packet) >= 0) {
+		const auto index = packet.stream_index;
+		Assert(index >= 0 && index < kMaxStreams);
+		Assert(index < output->nb_streams);
+
+		if (offset) {
+			auto &scaled = offsets[index];
+			if (!scaled) {
+				scaled = av_rescale_q(
+					offset,
+					AVRational{ 1, 1000 },
+					input->streams[index]->time_base);
+			}
+			if (packet.pts != AV_NOPTS_VALUE) {
+				packet.pts += scaled;
+			}
+			if (packet.dts != AV_NOPTS_VALUE) {
+				packet.dts += scaled;
+			}
+		}
+
+		if (packet.pts <= context.lastPts[index]) {
+			packet.pts = context.lastPts[index] + 1;
+		}
+		context.lastPts[index] = packet.pts;
+
+		if (packet.dts <= context.lastDts[index]) {
+			packet.dts = context.lastDts[index] + 1;
+		}
+		context.lastDts[index] = packet.dts;
+
+		const auto error = AvErrorWrap(av_interleaved_write_frame(
+			output,
+			&packet));
+		if (error) {
+			LogError("av_interleaved_write_frame", error);
+			av_packet_unref(&packet);
+			return false;
+		}
+		av_packet_unref(&packet);
+	}
+	return true;
+}
+
 void RoundVideoRecorder::Private::restart(RoundVideoPartial partial) {
 	if (_format) {
 		return;
@@ -411,7 +603,8 @@ void RoundVideoRecorder::Private::restart(RoundVideoPartial partial) {
 		notifyFinished();
 		return;
 	}
-	_previousContent = std::move(partial.content);
+	_previous = std::move(partial.video);
+	_maxDuration = kMaxDuration - _previous.duration;
 	_finished = false;
 	initEncoding();
 	_timeoutTimer.callOnce(kInitTimeout);
@@ -664,7 +857,7 @@ void RoundVideoRecorder::Private::encodeAudioFrame(
 void RoundVideoRecorder::Private::notifyFinished() {
 	_finished = true;
 	_updates.fire({
-		.samples = int((_previousPartsDuration + _resultDuration) * 48),
+		.samples = int((_previous.duration + _resultDuration) * 48),
 		.level = base::take(_maxLevelSinceLastUpdate),
 		.finished = true,
 	});
@@ -741,7 +934,7 @@ void RoundVideoRecorder::Private::updateResultDuration(
 	if (initial || (_lastUpdateDuration + kUpdateEach < _resultDuration)) {
 		_lastUpdateDuration = _resultDuration;
 		_updates.fire({
-			.samples = int((_previousPartsDuration + _resultDuration) * 48),
+			.samples = int((_previous.duration + _resultDuration) * 48),
 			.level = base::take(_maxLevelSinceLastUpdate),
 		});
 	}
@@ -986,3 +1179,4 @@ void RoundVideoRecorder::resume(RoundVideoPartial partial) {
 }
 
 } // namespace Ui
+
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 6d7505207..7c3832eeb 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -45,7 +45,7 @@ struct RoundVideoResult {
 };
 
 struct RoundVideoPartial {
-	QByteArray content;
+	RoundVideoResult video;
 	crl::time from = 0;
 	crl::time till = 0;
 };

From c8d4818d225f495d8869cd4a5b82e7abfc6a2c88 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Oct 2024 18:15:24 +0400
Subject: [PATCH 033/306] Blurred frame while paused.

---
 .../ui/controls/round_video_recorder.cpp      | 61 ++++++++++++++-----
 .../ui/controls/round_video_recorder.h        |  3 +-
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index ea8540fc4..3851f0bf8 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -29,6 +29,7 @@ constexpr auto kVideoBitRate = 3 * 1024 * 1024;
 constexpr auto kMinDuration = crl::time(200);
 constexpr auto kMaxDuration = 60 * crl::time(1000);
 constexpr auto kInitTimeout = 5 * crl::time(1000);
+constexpr auto kBlurredSize = 64;
 
 using namespace FFmpeg;
 
@@ -978,16 +979,16 @@ void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
 }
 
 void RoundVideoRecorder::progressTo(float64 progress) {
-	if (_progress == progress) {
+	if (_progress == progress || _paused) {
 		return;
-	} else if (_progress > 0.001) {
+	} else if (_progressReceived) {
 		_progressAnimation.start(
 			[=] { _preview->update(); },
 			_progress,
 			progress,
 			kUpdateEach * 1.1);
-	}
-	if (!_progress) {
+	} else {
+		_progressReceived = true;
 		_fadeContentAnimation.start(
 			[=] { _preview->update(); },
 			0.,
@@ -998,11 +999,15 @@ void RoundVideoRecorder::progressTo(float64 progress) {
 	_preview->update();
 }
 
-void RoundVideoRecorder::prepareFrame() {
-	if (_frameOriginal.isNull() || _preparedIndex == _lastAddedIndex) {
+void RoundVideoRecorder::prepareFrame(bool blurred) {
+	if (_frameOriginal.isNull()) {
 		return;
+	} else if (!blurred) {
+		if (_preparedIndex == _lastAddedIndex) {
+			return;
+		}
+		_preparedIndex = _lastAddedIndex;
 	}
-	_preparedIndex = _lastAddedIndex;
 
 	const auto owidth = _frameOriginal.width();
 	const auto oheight = _frameOriginal.height();
@@ -1020,12 +1025,27 @@ void RoundVideoRecorder::prepareFrame() {
 		_frameOriginal.format());
 
 	const auto ratio = style::DevicePixelRatio();
-	_framePrepared = Images::Circle(copy.scaled(
-		_side * ratio,
-		_side * ratio,
-		Qt::KeepAspectRatio,
-		Qt::SmoothTransformation));
-	_framePrepared.setDevicePixelRatio(ratio);
+	if (blurred) {
+		static constexpr auto kRadius = 16;
+		_framePlaceholder = Images::Circle(
+			Images::BlurLargeImage(
+				copy.scaled(
+					QSize(kBlurredSize, kBlurredSize),
+					Qt::KeepAspectRatio,
+					Qt::FastTransformation),
+				kRadius
+			).scaled(
+				QSize(_side, _side) * ratio,
+				Qt::KeepAspectRatio,
+				Qt::SmoothTransformation));
+		_framePlaceholder.setDevicePixelRatio(ratio);
+	} else {
+		_framePrepared = Images::Circle(copy.scaled(
+			QSize(_side, _side) * ratio,
+			Qt::KeepAspectRatio,
+			Qt::SmoothTransformation));
+		_framePrepared.setDevicePixelRatio(ratio);
+	}
 }
 
 void RoundVideoRecorder::createImages() {
@@ -1093,12 +1113,14 @@ void RoundVideoRecorder::setup() {
 		}
 		p.drawImage(raw->rect(), _shadow);
 		const auto inner = QRect(_extent, _extent, _side, _side);
-		if (!_progress) {
+		const auto fading = _fadeContentAnimation.animating();
+		if (!_progressReceived && !fading) {
 			p.drawImage(inner, _framePlaceholder);
 		} else {
-			if (_fadeContentAnimation.animating()) {
+			if (fading) {
 				p.drawImage(inner, _framePlaceholder);
-				p.setOpacity(opacity * _fadeContentAnimation.value(1.));
+				const auto to = _progressReceived ? 1. : 0.;
+				p.setOpacity(opacity * _fadeContentAnimation.value(to));
 			}
 			p.drawImage(inner, _framePrepared);
 
@@ -1162,6 +1184,13 @@ void RoundVideoRecorder::pause(Fn<void(RoundVideoResult)> done) {
 		});
 	}
 	_paused = true;
+	prepareFrame(true);
+	_progressReceived = false;
+	_fadeContentAnimation.start(
+		[=] { _preview->update(); },
+		1.,
+		0.,
+		crl::time(200));
 	_descriptor.track->setState(Webrtc::VideoState::Inactive);
 	_preview->update();
 }
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 7c3832eeb..914054435 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -69,7 +69,7 @@ private:
 	class Private;
 
 	void setup();
-	void prepareFrame();
+	void prepareFrame(bool blurred = false);
 	void createImages();
 	void progressTo(float64 progress);
 	void fade(bool visible);
@@ -90,6 +90,7 @@ private:
 	int _side = 0;
 	int _progressStroke = 0;
 	int _extent = 0;
+	bool _progressReceived = false;
 	bool _visible = false;
 	bool _paused = false;
 

From 9514b6eecd9df649b30b8426043492026e526f4d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Oct 2024 09:49:33 +0400
Subject: [PATCH 034/306] Show mini-thumbnails when pausing recording.

---
 .../history_view_voice_record_bar.cpp         | 103 ++++++++++++-----
 .../controls/history_view_voice_record_bar.h  |   3 +-
 .../ui/controls/round_video_recorder.cpp      | 109 ++++++++++++++++--
 .../ui/controls/round_video_recorder.h        |   5 +-
 4 files changed, 178 insertions(+), 42 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 8d7c9c0ff..b24d7ddd8 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
@@ -203,6 +203,44 @@ void PaintWaveform(
 	}
 }
 
+void FillWithMinithumbs(
+		QPainter &p,
+		not_null<const Ui::RoundVideoResult*> data,
+		QRect rect,
+		float64 progress) {
+	if (!data->minithumbsCount || !data->minithumbSize || rect.isEmpty()) {
+		return;
+	}
+	const auto size = rect.height();
+	const auto single = data->minithumbSize;
+	const auto perrow = data->minithumbs.width() / single;
+	const auto thumbs = (rect.width() + size - 1) / size;
+	if (!thumbs || !perrow) {
+		return;
+	}
+	for (auto i = 0; i != thumbs - 1; ++i) {
+		const auto index = (i * data->minithumbsCount) / thumbs;
+		p.drawImage(
+			QRect(rect.x() + i * size, rect.y(), size, size),
+			data->minithumbs,
+			QRect(
+				(index % perrow) * single,
+				(index / perrow) * single,
+				single,
+				single));
+	}
+	const auto last = rect.width() - (thumbs - 1) * size;
+	const auto index = ((thumbs - 1) * data->minithumbsCount) / thumbs;
+	p.drawImage(
+		QRect(rect.x() + (thumbs - 1) * size, rect.y(), last, size),
+		data->minithumbs,
+		QRect(
+			(index % perrow) * single,
+			(index / perrow) * single,
+			(last * single) / size,
+			single));
+}
+
 [[nodiscard]] QRect DrawLockCircle(
 		QPainter &p,
 		const QRect &widgetRect,
@@ -428,7 +466,7 @@ public:
 		not_null<Ui::RpWidget*> parent,
 		const style::RecordBar &st,
 		not_null<Main::Session*> session,
-		::Media::Capture::Result *data,
+		not_null<Ui::RoundVideoResult*> data,
 		const style::font &font);
 
 	void requestPaintProgress(float64 progress);
@@ -456,7 +494,7 @@ private:
 	const not_null<DocumentData*> _document;
 	const std::unique_ptr<VoiceData> _voiceData;
 	const std::shared_ptr<Data::DocumentMedia> _mediaView;
-	const not_null<::Media::Capture::Result*> _data;
+	const not_null<Ui::RoundVideoResult*> _data;
 	const base::unique_qptr<Ui::IconButton> _delete;
 	const style::font &_durationFont;
 	const QString _duration;
@@ -486,7 +524,7 @@ ListenWrap::ListenWrap(
 	not_null<Ui::RpWidget*> parent,
 	const style::RecordBar &st,
 	not_null<Main::Session*> session,
-	::Media::Capture::Result *data,
+	not_null<Ui::RoundVideoResult*> data,
 	const style::font &font)
 : _parent(parent)
 , _st(st)
@@ -604,20 +642,27 @@ void ListenWrap::init() {
 			}
 
 			// Waveform paint.
-			{
-				const auto rect = (progress == 1.)
-					? _waveformFgRect
-					: computeWaveformRect(bgCenterRect);
-				if (rect.width() > 0) {
-					p.translate(rect.topLeft());
+			const auto waveformRect = (progress == 1.)
+				? _waveformFgRect
+				: computeWaveformRect(bgCenterRect);
+			if (!waveformRect.isEmpty()) {
+				const auto playProgress = _playProgress.current();
+				if (_data->minithumbs.isNull()) {
+					p.translate(waveformRect.topLeft());
 					PaintWaveform(
 						p,
 						_voiceData.get(),
-						rect.width(),
+						waveformRect.width(),
 						_activeWaveformBar,
 						_inactiveWaveformBar,
-						_playProgress.current());
+						playProgress);
 					p.resetTransform();
+				} else {
+					FillWithMinithumbs(
+						p,
+						_data,
+						waveformRect,
+						playProgress);
 				}
 			}
 		}
@@ -631,9 +676,11 @@ void ListenWrap::initPlayButton() {
 	using namespace ::Media::Player;
 	using State = TrackState;
 
-	_mediaView->setBytes(_data->bytes);
-	_document->size = _data->bytes.size();
-	_document->type = _data->video ? RoundVideoDocument : VoiceDocument;
+	_mediaView->setBytes(_data->content);
+	_document->size = _data->content.size();
+	_document->type = _data->minithumbs.isNull()
+		? VoiceDocument
+		: RoundVideoDocument;
 
 	const auto &play = _playPauseSt.playOuter;
 	const auto &width = _waveformBgFinalCenterRect.height();
@@ -1688,10 +1735,7 @@ void VoiceRecordBar::startRecording() {
 			instance()->pause(false, nullptr);
 			if (_videoRecorder) {
 				_videoRecorder->resume({
-					.video = {
-						.content = _data.bytes,
-						.duration = _data.duration,
-					},
+					.video = std::move(_data),
 				});
 			}
 		} else {
@@ -1836,12 +1880,7 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 						window()->activateWindow();
 
 						_paused = true;
-						_data = ::Media::Capture::Result{
-							.bytes = std::move(data.content),
-							//.waveform = std::move(data.waveform),
-							.duration = data.duration,
-							.video = true,
-						};
+						_data = std::move(data);
 						_listen = std::make_unique<ListenWrap>(
 							this,
 							_st,
@@ -1861,7 +1900,11 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 					return;
 				}
 				_paused = true;
-				_data = std::move(data);
+				_data = Ui::RoundVideoResult{
+					.content = std::move(data.bytes),
+					.waveform = std::move(data.waveform),
+					.duration = data.duration,
+				};
 
 				window()->raise();
 				window()->activateWindow();
@@ -1906,7 +1949,11 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 				stop(false);
 				return;
 			}
-			_data = std::move(data);
+			_data = Ui::RoundVideoResult{
+				.content = std::move(data.bytes),
+				.waveform = std::move(data.waveform),
+				.duration = data.duration,
+			};
 
 			window()->raise();
 			window()->activateWindow();
@@ -1916,7 +1963,7 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 					: 0),
 			};
 			_sendVoiceRequests.fire({
-				_data.bytes,
+				_data.content,
 				_data.waveform,
 				_data.duration,
 				options,
@@ -1983,7 +2030,7 @@ void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
 			options.ttlSeconds = std::numeric_limits<int>::max();
 		}
 		_sendVoiceRequests.fire({
-			_data.bytes,
+			_data.content,
 			_data.waveform,
 			_data.duration,
 			options,
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index c2db218bf..9c9d66c55 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "history/view/controls/compose_controls_common.h"
 #include "media/audio/media_audio_capture_common.h"
+#include "ui/controls/round_video_recorder.h"
 #include "ui/effects/animations.h"
 #include "ui/round_rect.h"
 #include "ui/rp_widget.h"
@@ -170,7 +171,7 @@ private:
 	std::unique_ptr<Ui::AbstractButton> _ttlButton;
 	std::unique_ptr<ListenWrap> _listen;
 
-	::Media::Capture::Result _data;
+	Ui::RoundVideoResult _data;
 	rpl::variable<bool> _paused;
 
 	base::Timer _startTimer;
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 3851f0bf8..e26e3af6c 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "webrtc/webrtc_video_track.h"
+#include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 
 namespace Ui {
@@ -30,6 +31,8 @@ constexpr auto kMinDuration = crl::time(200);
 constexpr auto kMaxDuration = 60 * crl::time(1000);
 constexpr auto kInitTimeout = 5 * crl::time(1000);
 constexpr auto kBlurredSize = 64;
+constexpr auto kMinithumbsPerSecond = 5;
+constexpr auto kMinithumbsInRow = 16;
 
 using namespace FFmpeg;
 
@@ -66,11 +69,19 @@ struct ReadBytesWrap {
 	};
 };
 
+[[nodiscard]] int MinithumbSize() {
+	const auto full = st::historySendSize.height();
+	const auto margin = st::historyRecordWaveformBgMargins;
+	const auto outer = full - margin.top() - margin.bottom();
+	const auto inner = outer - 2 * st::msgWaveformMin;
+	return inner * style::DevicePixelRatio();
+}
+
 } // namespace
 
 class RoundVideoRecorder::Private final {
 public:
-	Private(crl::weak_on_queue<Private> weak);
+	Private(crl::weak_on_queue<Private> weak, int minithumbSize);
 	~Private();
 
 	void push(int64 mcstimestamp, const QImage &frame);
@@ -103,6 +114,13 @@ private:
 	int64_t seek(int64_t offset, int whence);
 
 	void initEncoding();
+	void initCircleMask();
+	void initMinithumbsCanvas();
+	void maybeSaveMinithumb(
+		not_null<AVFrame*> frame,
+		const QImage &original,
+		QRect crop);
+
 	bool initVideo();
 	bool initAudio();
 	void notifyFinished();
@@ -122,7 +140,6 @@ private:
 	void updateResultDuration(int64 pts, AVRational timeBase);
 
 	void cutCircleFromYUV420P(not_null<AVFrame*> frame);
-	void initCircleMask();
 
 	[[nodiscard]] RoundVideoResult appendToPrevious(RoundVideoResult video);
 	[[nodiscard]] static FormatPointer OpenInputContext(
@@ -169,6 +186,11 @@ private:
 	crl::time _lastUpdateDuration = 0;
 	rpl::event_stream<Update, Error> _updates;
 
+	crl::time _minithumbNextTimestamp = 0;
+	const int _minithumbSize = 0;
+	int _minithumbsCount = 0;
+	QImage _minithumbs;
+
 	crl::time _maxDuration = 0;
 	RoundVideoResult _previous;
 
@@ -185,12 +207,16 @@ RoundVideoRecorder::Private::CopyContext::CopyContext() {
 	ranges::fill(lastDts, std::numeric_limits<int64>::min());
 }
 
-RoundVideoRecorder::Private::Private(crl::weak_on_queue<Private> weak)
+RoundVideoRecorder::Private::Private(
+	crl::weak_on_queue<Private> weak,
+	int minithumbSize)
 : _weak(std::move(weak))
+, _minithumbSize(minithumbSize)
 , _maxDuration(kMaxDuration)
 , _timeoutTimer(_weak, [=] { timeout(); }) {
 	initEncoding();
 	initCircleMask();
+	initMinithumbsCanvas();
 
 	_timeoutTimer.callOnce(kInitTimeout);
 }
@@ -452,8 +478,11 @@ RoundVideoResult RoundVideoRecorder::Private::finish() {
 	finishEncoding();
 	auto result = appendToPrevious({
 		.content = base::take(_result),
-		.waveform = QByteArray(),
 		.duration = base::take(_resultDuration),
+		//.waveform = {},
+		.minithumbs = base::take(_minithumbs),
+		.minithumbsCount = base::take(_minithumbsCount),
+		.minithumbSize = _minithumbSize,
 	});
 	if (result.duration < kMinDuration) {
 		return {};
@@ -523,11 +552,9 @@ RoundVideoResult RoundVideoRecorder::Private::appendToPrevious(
 		fail(Error::Encoding);
 		return {};
 	}
-	return RoundVideoResult{
-		.content = base::take(_result),
-		.waveform = QByteArray(),
-		.duration = _previous.duration + video.duration,
-	};
+	video.content = base::take(_result);
+	video.duration += _previous.duration;
+	return video;
 }
 
 FormatPointer RoundVideoRecorder::Private::OpenInputContext(
@@ -605,7 +632,11 @@ void RoundVideoRecorder::Private::restart(RoundVideoPartial partial) {
 		return;
 	}
 	_previous = std::move(partial.video);
+	_minithumbs = std::move(_previous.minithumbs);
+	_minithumbsCount = _previous.minithumbsCount;
+	Assert(_minithumbSize == _previous.minithumbSize);
 	_maxDuration = kMaxDuration - _previous.duration;
+	_minithumbNextTimestamp = 0;
 	_finished = false;
 	initEncoding();
 	_timeoutTimer.callOnce(kInitTimeout);
@@ -720,6 +751,7 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 	cutCircleFromYUV420P(_videoFrame.get());
 
 	_videoFrame->pts = mcstimestamp - _videoFirstTimestamp;
+	maybeSaveMinithumb(_videoFrame.get(), frame, crop);
 	if (_videoFrame->pts >= _maxDuration * int64(1000)) {
 		notifyFinished();
 		return;
@@ -728,6 +760,49 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 	}
 }
 
+void RoundVideoRecorder::Private::maybeSaveMinithumb(
+		not_null<AVFrame*> frame,
+		const QImage &original,
+		QRect crop) {
+	if (frame->pts < _minithumbNextTimestamp * 1000) {
+		return;
+	}
+	_minithumbNextTimestamp += crl::time(1000) / kMinithumbsPerSecond;
+	const auto perline = original.bytesPerLine();
+	const auto perpixel = original.depth() / 8;
+	const auto cropped = QImage(
+		original.constBits() + (crop.y() * perline) + (crop.x() * perpixel),
+		crop.width(),
+		crop.height(),
+		perline,
+		original.format()
+	).scaled(
+		_minithumbSize,
+		_minithumbSize,
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+
+	const auto row = _minithumbsCount / kMinithumbsInRow;
+	const auto column = _minithumbsCount % kMinithumbsInRow;
+	const auto fromPerLine = cropped.bytesPerLine();
+	auto from = cropped.constBits();
+	const auto toPerLine = _minithumbs.bytesPerLine();
+	const auto toPerPixel = _minithumbs.depth() / 8;
+	auto to = _minithumbs.bits()
+		+ (row * _minithumbSize * toPerLine)
+		+ (column * _minithumbSize * toPerPixel);
+
+	Assert(toPerPixel == perpixel);
+	for (auto y = 0; y != _minithumbSize; ++y) {
+		Assert(to + toPerLine - _minithumbs.constBits()
+			<= _minithumbs.bytesPerLine() * _minithumbs.height());
+		memcpy(to, from, _minithumbSize * toPerPixel);
+		from += fromPerLine;
+		to += toPerLine;
+	}
+	++_minithumbsCount;
+}
+
 void RoundVideoRecorder::Private::initCircleMask() {
 	const auto width = kSide;
 	const auto height = kSide;
@@ -747,6 +822,16 @@ void RoundVideoRecorder::Private::initCircleMask() {
 	}
 }
 
+void RoundVideoRecorder::Private::initMinithumbsCanvas() {
+	const auto width = kMinithumbsInRow * _minithumbSize;
+	const auto seconds = (kMaxDuration + 999) / 1000;
+	const auto persecond = kMinithumbsPerSecond;
+	const auto frames = (seconds + persecond - 1) * persecond;
+	const auto rows = (frames + kMinithumbsInRow - 1) / kMinithumbsInRow;
+	const auto height = rows * _minithumbSize;
+	_minithumbs = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
+}
+
 void RoundVideoRecorder::Private::cutCircleFromYUV420P(
 		not_null<AVFrame*> frame) {
 	const auto width = frame->width;
@@ -888,9 +973,9 @@ bool RoundVideoRecorder::Private::writeFrame(
 	while (true) {
 		error = AvErrorWrap(avcodec_receive_packet(codec.get(), pkt));
 		if (error.code() == AVERROR(EAGAIN)) {
-			return true;  // Need more input
+			return true; // Need more input
 		} else if (error.code() == AVERROR_EOF) {
-			return true;  // Encoding finished
+			return true; // Encoding finished
 		} else if (error) {
 			LogError("avcodec_receive_packet", error);
 			fail(Error::Encoding);
@@ -945,7 +1030,7 @@ RoundVideoRecorder::RoundVideoRecorder(
 	RoundVideoRecorderDescriptor &&descriptor)
 : _descriptor(std::move(descriptor))
 , _preview(std::make_unique<RpWidget>(_descriptor.container))
-, _private() {
+, _private(MinithumbSize()) {
 	setup();
 }
 
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 914054435..51f0e537d 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -40,8 +40,11 @@ struct RoundVideoRecorderDescriptor {
 
 struct RoundVideoResult {
 	QByteArray content;
-	QByteArray waveform;
+	QVector<signed char> waveform;
 	crl::time duration = 0;
+	QImage minithumbs;
+	int minithumbsCount = 0;
+	int minithumbSize = 0;
 };
 
 struct RoundVideoPartial {

From 6cfa053328c9c060ce177760c330e7bdea83c5db Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Oct 2024 15:01:53 +0400
Subject: [PATCH 035/306] Add recorded round video preview.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../history_view_voice_record_bar.cpp         | 155 +++++++++++++-----
 .../media/player/media_player_instance.cpp    |  15 ++
 .../media/player/media_player_instance.h      |   3 +
 .../media_streaming_round_preview.cpp         |  62 +++++++
 .../streaming/media_streaming_round_preview.h |  35 ++++
 .../ui/controls/round_video_recorder.cpp      |  78 ++++++++-
 .../ui/controls/round_video_recorder.h        |  19 +++
 8 files changed, 320 insertions(+), 49 deletions(-)
 create mode 100644 Telegram/SourceFiles/media/streaming/media_streaming_round_preview.cpp
 create mode 100644 Telegram/SourceFiles/media/streaming/media_streaming_round_preview.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index f378d925a..1b640372d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1162,6 +1162,8 @@ PRIVATE
     media/streaming/media_streaming_player.h
     media/streaming/media_streaming_reader.cpp
     media/streaming/media_streaming_reader.h
+    media/streaming/media_streaming_round_preview.cpp
+    media/streaming/media_streaming_round_preview.h
     media/streaming/media_streaming_utility.cpp
     media/streaming/media_streaming_utility.h
     media/streaming/media_streaming_video_track.cpp
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 b24d7ddd8..754f1ab21 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
@@ -28,6 +28,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio_capture.h"
 #include "media/player/media_player_button.h"
 #include "media/player/media_player_instance.h"
+#include "media/streaming/media_streaming_instance.h"
+#include "media/streaming/media_streaming_round_preview.h"
 #include "ui/controls/round_video_recorder.h"
 #include "ui/controls/send_button.h"
 #include "ui/effects/animation_value.h"
@@ -35,6 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "ui/dynamic_image.h"
 #include "ui/painter.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/rect.h"
@@ -71,6 +74,61 @@ enum class FilterType {
 	Cancel,
 };
 
+class SoundedPreview final : public Ui::DynamicImage {
+public:
+	SoundedPreview(
+		not_null<DocumentData*> document,
+		rpl::producer<> repaints);
+	std::shared_ptr<DynamicImage> clone() override;
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	const not_null<DocumentData*> _document;
+	QImage _roundingMask;
+	Fn<void()> _repaint;
+	rpl::lifetime _lifetime;
+
+};
+
+SoundedPreview::SoundedPreview(
+	not_null<DocumentData*> document,
+	rpl::producer<> repaints)
+: _document(document) {
+	std::move(repaints) | rpl::start_with_next([=] {
+		if (const auto onstack = _repaint) {
+			onstack();
+		}
+	}, _lifetime);
+}
+
+std::shared_ptr<Ui::DynamicImage> SoundedPreview::clone() {
+	Unexpected("ListenWrap::videoPreview::clone.");
+}
+
+QImage SoundedPreview::image(int size) {
+	const auto player = ::Media::Player::instance();
+	const auto streamed = player->roundVideoPreview(_document);
+	if (!streamed) {
+		return {};
+	}
+
+	const auto full = QSize(size, size) * style::DevicePixelRatio();
+	if (_roundingMask.size() != full) {
+		_roundingMask = Images::EllipseMask(full);
+	}
+	const auto frame = streamed->frameWithInfo({
+		.resize = full,
+		.outer = full,
+		.mask = _roundingMask,
+	});
+	return frame.image;
+}
+
+void SoundedPreview::subscribeToUpdates(Fn<void()> callback) {
+	_repaint = std::move(callback);
+}
+
 [[nodiscard]] auto InactiveColor(const QColor &c) {
 	return QColor(c.red(), c.green(), c.blue(), kInactiveWaveformBarAlpha);
 }
@@ -470,24 +528,26 @@ public:
 		const style::font &font);
 
 	void requestPaintProgress(float64 progress);
-	rpl::producer<> stopRequests() const;
+	[[nodiscard]] rpl::producer<> stopRequests() const;
 
 	void playPause();
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> videoPreview();
 
-	rpl::lifetime &lifetime();
+	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
 	void init();
 	void initPlayButton();
 	void initPlayProgress();
 
-	bool isInPlayer(const ::Media::Player::TrackState &state) const;
-	bool isInPlayer() const;
+	[[nodiscard]] bool isInPlayer(
+		const ::Media::Player::TrackState &state) const;
+	[[nodiscard]] bool isInPlayer() const;
 
-	int computeTopMargin(int height) const;
-	QRect computeWaveformRect(const QRect &centerRect) const;
+	[[nodiscard]] int computeTopMargin(int height) const;
+	[[nodiscard]] QRect computeWaveformRect(const QRect &centerRect) const;
 
-	not_null<Ui::RpWidget*> _parent;
+	const not_null<Ui::RpWidget*> _parent;
 
 	const style::RecordBar &_st;
 	const not_null<Main::Session*> _session;
@@ -515,6 +575,7 @@ private:
 	anim::value _playProgress;
 
 	rpl::variable<float64> _showProgress = 0.;
+	rpl::event_stream<> _videoRepaints;
 
 	rpl::lifetime _lifetime;
 
@@ -716,6 +777,9 @@ void ListenWrap::initPlayButton() {
 	) | rpl::start_with_next([=](const State &state) {
 		if (isInPlayer(state)) {
 			*showPause = ShowPauseIcon(state.state);
+			if (!_data->minithumbs.isNull()) {
+				_videoRepaints.fire({});
+			}
 		} else if (showPause->current()) {
 			*showPause = false;
 		}
@@ -865,6 +929,12 @@ rpl::producer<> ListenWrap::stopRequests() const {
 	return _delete->clicks() | rpl::to_empty;
 }
 
+std::shared_ptr<Ui::DynamicImage> ListenWrap::videoPreview() {
+	return std::make_shared<SoundedPreview>(
+		_document,
+		_videoRepaints.events());
+}
+
 rpl::lifetime &ListenWrap::lifetime() {
 	return _lifetime;
 }
@@ -1634,11 +1704,6 @@ void VoiceRecordBar::activeAnimate(bool active) {
 }
 
 void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
-	//if (_videoRecorder) {
-	//	_videoHiding.push_back(base::take(_videoRecorder));
-	//	_videoHiding.back()->hide();
-	//}
-	AssertIsDebug();
 	if (_send->type() == Ui::SendButton::Type::Round) {
 		_level->setType(VoiceRecordButton::Type::Round);
 	} else {
@@ -1871,24 +1936,29 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 			_cancelRequests.fire({});
 		}));
 	} else if (type == StopType::Listen) {
-		if (_videoRecorder) {
-			const auto weak = Ui::MakeWeak(this);
-			_videoRecorder->pause([=](Ui::RoundVideoResult data) {
-				crl::on_main([=, data = std::move(data)]() mutable {
-					if (weak) {
-						window()->raise();
-						window()->activateWindow();
+		if (const auto recorder = _videoRecorder.get()) {
+			const auto weak = base::make_weak(recorder);
+			recorder->pause([=](Ui::RoundVideoResult data) {
+				crl::on_main(weak, [=, data = std::move(data)]() mutable {
+					window()->raise();
+					window()->activateWindow();
 
-						_paused = true;
-						_data = std::move(data);
-						_listen = std::make_unique<ListenWrap>(
-							this,
-							_st,
-							&_show->session(),
-							&_data,
-							_cancelFont);
-						_listenChanges.fire({});
-					}
+					_paused = true;
+					_data = std::move(data);
+					_listen = std::make_unique<ListenWrap>(
+						this,
+						_st,
+						&_show->session(),
+						&_data,
+						_cancelFont);
+					_listenChanges.fire({});
+
+					using SilentPreview = ::Media::Streaming::RoundPreview;
+					recorder->showPreview(
+						std::make_shared<SilentPreview>(
+							_data.content,
+							recorder->previewSize()),
+						_listen->videoPreview());
 				});
 			});
 			instance()->pause(true);
@@ -1933,11 +2003,11 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 								: 0),
 						};
 						_sendVoiceRequests.fire({
-							data.content,
-							VoiceWaveform{},
-							data.duration,
-							options,
-							true,
+							.bytes = data.content,
+							//.waveform = {},
+							.duration = data.duration,
+							.options = options,
+							.video = true,
 						});
 					}
 				});
@@ -1963,10 +2033,10 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 					: 0),
 			};
 			_sendVoiceRequests.fire({
-				_data.content,
-				_data.waveform,
-				_data.duration,
-				options,
+				.bytes = _data.content,
+				.waveform = _data.waveform,
+				.duration = _data.duration,
+				.options = options,
 			});
 		}));
 	}
@@ -2030,10 +2100,11 @@ void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
 			options.ttlSeconds = std::numeric_limits<int>::max();
 		}
 		_sendVoiceRequests.fire({
-			_data.content,
-			_data.waveform,
-			_data.duration,
-			options,
+			.bytes = _data.content,
+			.waveform = _data.waveform,
+			.duration = _data.duration,
+			.options = options,
+			.video = !_data.minithumbs.isNull(),
 		});
 	}
 }
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 4dc687a27..2859aa068 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -1200,6 +1200,21 @@ Streaming::Instance *Instance::roundVideoStreamed(HistoryItem *item) const {
 	return nullptr;
 }
 
+Streaming::Instance *Instance::roundVideoPreview(
+		not_null<DocumentData*> document) const {
+	if (const auto data = getData(AudioMsgId::Type::Voice)) {
+		if (const auto streamed = data->streamed.get()) {
+			if (streamed->id.audio() == document) {
+				const auto player = &streamed->instance.player();
+				if (player->ready() && !player->videoSize().isEmpty()) {
+					return &streamed->instance;
+				}
+			}
+		}
+	}
+	return nullptr;
+}
+
 View::PlaybackProgress *Instance::roundVideoPlayback(
 		HistoryItem *item) const {
 	return roundVideoStreamed(item)
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.h b/Telegram/SourceFiles/media/player/media_player_instance.h
index fce26855b..13771ce4c 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.h
+++ b/Telegram/SourceFiles/media/player/media_player_instance.h
@@ -109,6 +109,9 @@ public:
 	[[nodiscard]] View::PlaybackProgress *roundVideoPlayback(
 		HistoryItem *item) const;
 
+	[[nodiscard]] Streaming::Instance *roundVideoPreview(
+		not_null<DocumentData*> document) const;
+
 	[[nodiscard]] AudioMsgId current(AudioMsgId::Type type) const {
 		if (const auto data = getData(type)) {
 			return data->current;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.cpp
new file mode 100644
index 000000000..56beb61ec
--- /dev/null
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.cpp
@@ -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
+*/
+#include "media/streaming/media_streaming_round_preview.h"
+
+namespace Media::Streaming {
+
+RoundPreview::RoundPreview(const QByteArray &bytes, int size)
+: _bytes(bytes)
+, _reader(
+	Clip::MakeReader(_bytes, [=](Clip::Notification update) {
+		clipCallback(update);
+	}))
+, _size(size) {
+}
+
+std::shared_ptr<Ui::DynamicImage> RoundPreview::clone() {
+	Unexpected("RoundPreview::clone.");
+}
+
+QImage RoundPreview::image(int size) {
+	if (!_reader || !_reader->started()) {
+		return QImage();
+	}
+	return _reader->current({
+		.frame = QSize(_size, _size),
+		.factor = style::DevicePixelRatio(),
+		.radius = ImageRoundRadius::Ellipse,
+	}, crl::now());
+}
+
+void RoundPreview::subscribeToUpdates(Fn<void()> callback) {
+	_repaint = std::move(callback);
+}
+
+void RoundPreview::clipCallback(Clip::Notification notification) {
+	switch (notification) {
+	case Clip::Notification::Reinit: {
+		if (_reader->state() == ::Media::Clip::State::Error) {
+			_reader.setBad();
+		} else if (_reader->ready() && !_reader->started()) {
+			_reader->start({
+				.frame = QSize(_size, _size),
+				.factor = style::DevicePixelRatio(),
+				.radius = ImageRoundRadius::Ellipse,
+			});
+		}
+	} break;
+
+	case Clip::Notification::Repaint: break;
+	}
+
+	if (const auto onstack = _repaint) {
+		onstack();
+	}
+}
+
+} // namespace Media::Streaming
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.h b/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.h
new file mode 100644
index 000000000..64440bc49
--- /dev/null
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.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 "ui/dynamic_image.h"
+
+#include "media/clip/media_clip_reader.h"
+
+namespace Media::Streaming {
+
+class RoundPreview final : public Ui::DynamicImage {
+public:
+	RoundPreview(const QByteArray &bytes, int size);
+
+	std::shared_ptr<DynamicImage> clone() override;
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	void clipCallback(Clip::Notification notification);
+
+	const QByteArray _bytes;
+	Clip::ReaderPointer _reader;
+	Fn<void()> _repaint;
+	int _size = 0;
+
+};
+
+} // namespace Media::Streaming
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index e26e3af6c..7d9cf9689 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio_capture.h"
 #include "ui/image/image_prepare.h"
 #include "ui/arc_angles.h"
+#include "ui/dynamic_image.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "webrtc/webrtc_video_track.h"
@@ -33,6 +34,7 @@ constexpr auto kInitTimeout = 5 * crl::time(1000);
 constexpr auto kBlurredSize = 64;
 constexpr auto kMinithumbsPerSecond = 5;
 constexpr auto kMinithumbsInRow = 16;
+constexpr auto kFadeDuration = crl::time(150);
 
 using namespace FFmpeg;
 
@@ -1044,6 +1046,10 @@ Fn<void(Media::Capture::Chunk)> RoundVideoRecorder::audioChunkProcessor() {
 	};
 }
 
+int RoundVideoRecorder::previewSize() const {
+	return _side;
+}
+
 auto RoundVideoRecorder::updated() -> rpl::producer<Update, Error> {
 	return _private.producer_on_main([](const Private &that) {
 		return that.updated();
@@ -1078,7 +1084,7 @@ void RoundVideoRecorder::progressTo(float64 progress) {
 			[=] { _preview->update(); },
 			0.,
 			1.,
-			crl::time(200));
+			kFadeDuration);
 	}
 	_progress = progress;
 	_preview->update();
@@ -1225,6 +1231,30 @@ void RoundVideoRecorder::setup() {
 				(full / 4) - length,
 				length);
 		}
+
+		const auto preview = _fadePreviewAnimation.value(
+			_silentPreview ? 1. : 0.);
+		const auto frame = _silentPreview
+			? lookupPreviewFrame()
+			: _cachedPreviewFrame;
+		if (preview > 0. && !frame.image.isNull()) {
+			p.setOpacity(preview);
+			p.drawImage(inner, frame.image);
+			if (frame.silent) {
+				const auto iconSize = st::historyVideoMessageMuteSize;
+				const auto iconRect = style::rtlrect(
+					inner.x() + (inner.width() - iconSize) / 2,
+					inner.y() + st::msgDateImgDelta,
+					iconSize,
+					iconSize,
+					raw->width());
+				p.setPen(Qt::NoPen);
+				p.setBrush(st::msgDateImgBg);
+				auto hq = PainterHighQualityEnabler(p);
+				p.drawEllipse(iconRect);
+				st::historyVideoMessageMute.paintInCenter(p, iconRect);
+			}
+		}
 	}, raw->lifetime());
 
 	_descriptor.track->renderNextFrame() | rpl::start_with_next([=] {
@@ -1257,7 +1287,24 @@ void RoundVideoRecorder::fade(bool visible) {
 		[=] { _preview->update(); },
 		visible ? 0. : 1.,
 		visible ? 1. : 0.,
-		crl::time(200));
+		kFadeDuration);
+}
+
+auto RoundVideoRecorder::lookupPreviewFrame() const -> PreviewFrame {
+	auto sounded = _soundedPreview
+		? _soundedPreview->image(_side)
+		: QImage();
+	const auto silent = (_silentPreview && sounded.isNull());
+	return {
+		.image = silent ? _silentPreview->image(_side) : std::move(sounded),
+		.silent = silent,
+	};
+}
+
+Fn<void()> RoundVideoRecorder::updater() const {
+	return [=] {
+		_preview->update();
+	};
 }
 
 void RoundVideoRecorder::pause(Fn<void(RoundVideoResult)> done) {
@@ -1271,15 +1318,22 @@ void RoundVideoRecorder::pause(Fn<void(RoundVideoResult)> done) {
 	_paused = true;
 	prepareFrame(true);
 	_progressReceived = false;
-	_fadeContentAnimation.start(
-		[=] { _preview->update(); },
-		1.,
-		0.,
-		crl::time(200));
+	_fadeContentAnimation.start(updater(), 1., 0., kFadeDuration);
 	_descriptor.track->setState(Webrtc::VideoState::Inactive);
 	_preview->update();
 }
 
+void RoundVideoRecorder::showPreview(
+		std::shared_ptr<Ui::DynamicImage> silent,
+		std::shared_ptr<Ui::DynamicImage> sounded) {
+	_silentPreview = std::move(silent);
+	_soundedPreview = std::move(sounded);
+	_silentPreview->subscribeToUpdates(updater());
+	_soundedPreview->subscribeToUpdates(updater());
+	_fadePreviewAnimation.start(updater(), 0., 1., kFadeDuration);
+	_preview->update();
+}
+
 void RoundVideoRecorder::resume(RoundVideoPartial partial) {
 	if (!_paused) {
 		return;
@@ -1288,6 +1342,16 @@ void RoundVideoRecorder::resume(RoundVideoPartial partial) {
 		that.restart(std::move(partial));
 	});
 	_paused = false;
+	_cachedPreviewFrame = lookupPreviewFrame();
+	if (const auto preview = base::take(_silentPreview)) {
+		preview->subscribeToUpdates(nullptr);
+	}
+	if (const auto preview = base::take(_soundedPreview)) {
+		preview->subscribeToUpdates(nullptr);
+	}
+	if (!_cachedPreviewFrame.image.isNull()) {
+		_fadePreviewAnimation.start(updater(), 1., 0., kFadeDuration);
+	}
 	_descriptor.track->setState(Webrtc::VideoState::Active);
 	_preview->update();
 }
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 51f0e537d..ecef3e425 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -29,6 +29,7 @@ class VideoTrack;
 namespace Ui {
 
 class RpWidget;
+class DynamicImage;
 class RoundVideoRecorder;
 
 struct RoundVideoRecorderDescriptor {
@@ -58,18 +59,27 @@ public:
 	explicit RoundVideoRecorder(RoundVideoRecorderDescriptor &&descriptor);
 	~RoundVideoRecorder();
 
+	[[nodiscard]] int previewSize() const;
 	[[nodiscard]] Fn<void(Media::Capture::Chunk)> audioChunkProcessor();
 
 	void pause(Fn<void(RoundVideoResult)> done = nullptr);
 	void resume(RoundVideoPartial partial);
 	void hide(Fn<void(RoundVideoResult)> done = nullptr);
 
+	void showPreview(
+		std::shared_ptr<Ui::DynamicImage> silent,
+		std::shared_ptr<Ui::DynamicImage> sounded);
+
 	using Update = Media::Capture::Update;
 	using Error = Media::Capture::Error;
 	[[nodiscard]] rpl::producer<Update, Error> updated();
 
 private:
 	class Private;
+	struct PreviewFrame {
+		QImage image;
+		bool silent = false;
+	};
 
 	void setup();
 	void prepareFrame(bool blurred = false);
@@ -77,12 +87,21 @@ private:
 	void progressTo(float64 progress);
 	void fade(bool visible);
 
+	[[nodiscard]] Fn<void()> updater() const;
+	[[nodiscard]] PreviewFrame lookupPreviewFrame() const;
+
 	const RoundVideoRecorderDescriptor _descriptor;
 	std::unique_ptr<RpWidget> _preview;
 	crl::object_on_queue<Private> _private;
 	Ui::Animations::Simple _progressAnimation;
 	Ui::Animations::Simple _fadeAnimation;
 	Ui::Animations::Simple _fadeContentAnimation;
+
+	std::shared_ptr<Ui::DynamicImage> _silentPreview;
+	std::shared_ptr<Ui::DynamicImage> _soundedPreview;
+	Ui::Animations::Simple _fadePreviewAnimation;
+	PreviewFrame _cachedPreviewFrame;
+
 	float64 _progress = 0.;
 	QImage _frameOriginal;
 	QImage _framePlaceholder;

From 6287d306c24fc89ac2b28a14bf7bea087e2b2fa0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Oct 2024 19:54:58 +0400
Subject: [PATCH 036/306] Add better discard confirmations.

---
 Telegram/Resources/langs/lang.strings         |  3 +++
 .../history_view_compose_controls.cpp         |  1 +
 .../history_view_voice_record_bar.cpp         | 24 ++++++++++++-------
 .../media/player/media_player_instance.cpp    |  5 +++-
 .../media/player/media_player_instance.h      |  2 +-
 .../media/player/media_player_widget.cpp      |  2 ++
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e42eaaf6a..6ffd7dd8f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2152,6 +2152,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_media_cancel" = "Cancel";
 "lng_media_video" = "Video";
 "lng_media_audio" = "Voice message";
+"lng_media_round" = "Video message";
 
 "lng_media_auto_settings" = "Automatic media download";
 "lng_media_auto_in_private" = "In private chats";
@@ -3244,7 +3245,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_record_cancel" = "Release outside this field to cancel";
 "lng_record_cancel_stories" = "Release outside to cancel";
 "lng_record_lock_cancel_sure" = "Do you want to stop recording and discard your voice message?";
+"lng_record_lock_cancel_sure_round" = "Do you want to stop recording and discard your video message?";
 "lng_record_listen_cancel_sure" = "Do you want to discard your recorded voice message?";
+"lng_record_listen_cancel_sure_round" = "Do you want to discard your recorded video message?";
 "lng_record_lock_discard" = "Discard";
 "lng_record_voice_tip" = "Hold to record audio. Click to switch to video.";
 "lng_record_video_tip" = "Hold to record video. Click to switch to audio.";
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 aab9559ca..4314f738c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -964,6 +964,7 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	initWebpageProcess();
 	initWriteRestriction();
 	initForwardProcess();
+	updateRecordMediaState();
 	updateBotCommandShown();
 	updateLikeShown();
 	updateMessagesTTLShown();
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 754f1ab21..7c582784a 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
@@ -790,6 +790,13 @@ void ListenWrap::initPlayButton() {
 	) | rpl::start_with_next([=] {
 		*showPause = false;
 	}, _lifetime);
+
+	_lifetime.add([=] {
+		const auto current = instance()->current(AudioMsgId::Type::Voice);
+		if (current.audio() == _document) {
+			instance()->stop(AudioMsgId::Type::Voice, true);
+		}
+	});
 }
 
 void ListenWrap::initPlayProgress() {
@@ -1369,7 +1376,7 @@ VoiceRecordBar::VoiceRecordBar(
 }
 
 VoiceRecordBar::~VoiceRecordBar() {
-	if (isRecording()) {
+	if (isActive()) {
 		stopRecording(StopType::Cancel);
 	}
 }
@@ -1598,7 +1605,6 @@ void VoiceRecordBar::init() {
 		if (!paused) {
 			return;
 		}
-		// _lockShowing = false;
 
 		const auto to = 1.;
 		auto callback = [=](float64 value) {
@@ -1819,7 +1825,8 @@ void VoiceRecordBar::startRecording() {
 			) | rpl::start_with_next_error([=](const Update &update) {
 				recordUpdated(update.level, update.samples);
 				if (update.finished) {
-					stop(update.samples >= kMinSamples);
+					stopRecording(StopType::Listen);
+					_lockShowing = false;
 				}
 			}, [=](Error error) {
 				stop(false);
@@ -1895,7 +1902,6 @@ void VoiceRecordBar::stop(bool send) {
 		const auto type = send ? StopType::Send : StopType::Cancel;
 		stopRecording(type, ttlBeforeHide);
 	};
-	// _lockShowing = false;
 	visibilityAnimate(false, std::move(disappearanceCallback));
 }
 
@@ -1985,8 +1991,6 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 					&_data,
 					_cancelFont);
 				_listenChanges.fire({});
-
-				// _lockShowing = false;
 			}));
 		}
 	} else if (type == StopType::Send) {
@@ -2313,8 +2317,12 @@ void VoiceRecordBar::showDiscardBox(
 	};
 	_show->showBox(Ui::MakeConfirmBox({
 		.text = (isListenState()
-			? tr::lng_record_listen_cancel_sure
-			: tr::lng_record_lock_cancel_sure)(),
+			? (_recordingVideo
+				? tr::lng_record_listen_cancel_sure_round
+				: tr::lng_record_listen_cancel_sure)
+			: (_recordingVideo
+				? tr::lng_record_lock_cancel_sure_round
+				: tr::lng_record_lock_cancel_sure))(),
 		.confirmed = std::move(sure),
 		.confirmText = tr::lng_record_lock_discard(),
 		.confirmStyle = &st::attentionBoxButton,
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 2859aa068..127009d25 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -869,7 +869,7 @@ void Instance::pause(AudioMsgId::Type type) {
 	}
 }
 
-void Instance::stop(AudioMsgId::Type type) {
+void Instance::stop(AudioMsgId::Type type, bool asFinished) {
 	if (const auto data = getData(type)) {
 		if (data->streamed) {
 			clearStreamed(data);
@@ -877,6 +877,9 @@ void Instance::stop(AudioMsgId::Type type) {
 		data->resumeOnCallEnd = false;
 		_playerStopped.fire_copy({type});
 	}
+	if (asFinished) {
+		_tracksFinished.fire_copy(type);
+	}
 }
 
 void Instance::stopAndClear(not_null<Data*> data) {
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.h b/Telegram/SourceFiles/media/player/media_player_instance.h
index 13771ce4c..ebe7d3d4c 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.h
+++ b/Telegram/SourceFiles/media/player/media_player_instance.h
@@ -72,7 +72,7 @@ public:
 
 	void play(AudioMsgId::Type type);
 	void pause(AudioMsgId::Type type);
-	void stop(AudioMsgId::Type type);
+	void stop(AudioMsgId::Type type, bool asFinished = false);
 	void playPause(AudioMsgId::Type type);
 	bool next(AudioMsgId::Type type);
 	bool previous(AudioMsgId::Type type);
diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp
index f45bda81a..a74be5945 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp
@@ -717,6 +717,8 @@ void Widget::handleSongChange() {
 				0,
 				name.size(),
 				QString()));
+		} else if (document->isVideoMessage()) {
+			textWithEntities.text = tr::lng_media_round(tr::now);
 		} else {
 			textWithEntities.text = tr::lng_media_audio(tr::now);
 		}

From 9ce6636c6a52646a8d5a7a357f7b8a1a427f63e6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Oct 2024 22:16:19 +0400
Subject: [PATCH 037/306] Create nice camera init effect.

---
 .../ui/controls/round_video_recorder.cpp      | 49 ++++++++++++++++++-
 .../ui/controls/round_video_recorder.h        |  4 ++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 7d9cf9689..c7383614a 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -1031,6 +1031,12 @@ void RoundVideoRecorder::Private::updateResultDuration(
 RoundVideoRecorder::RoundVideoRecorder(
 	RoundVideoRecorderDescriptor &&descriptor)
 : _descriptor(std::move(descriptor))
+, _gradientBg(QColor(255, 255, 255, 0))
+, _gradientFg(QColor(255, 255, 255, 48))
+, _gradient(
+	_gradientBg.color(),
+	_gradientFg.color(),
+	[=] { _preview->update(); })
 , _preview(std::make_unique<RpWidget>(_descriptor.container))
 , _private(MinithumbSize()) {
 	setup();
@@ -1192,6 +1198,43 @@ void RoundVideoRecorder::setup() {
 				QRect(0, 0, side, side)));
 	}, raw->lifetime());
 
+	const auto paintPlaceholder = [=](QPainter &p, QRect inner) {
+		p.drawImage(inner, _framePlaceholder);
+		if (_paused) {
+			return;
+		}
+
+		_gradient.startFrame(
+			0,
+			raw->width(),
+			raw->width() * 2 / 3);
+		_gradient.paint([&](const Ui::PathShiftGradient::Background &b) {
+			if (!v::is<QLinearGradient*>(b)) {
+				return true;
+			}
+			auto hq = PainterHighQualityEnabler(p);
+			const auto gradient = v::get<QLinearGradient*>(b);
+
+			auto copy = *gradient;
+			auto stops = copy.stops();
+			for (auto &pair : stops) {
+				if (pair.second.alpha() > 0) {
+					pair.second.setAlpha(255);
+				}
+			}
+			copy.setStops(stops);
+
+			const auto stroke = style::ConvertScaleExact(1.);
+			const auto sub = stroke / 2.;
+			p.setPen(QPen(QBrush(copy), stroke));
+
+			p.setBrush(*gradient);
+			const auto innerf = QRectF(inner);
+			p.drawEllipse(innerf.marginsRemoved({ sub, sub, sub, sub }));
+			return true;
+		});
+	};
+
 	raw->paintRequest() | rpl::start_with_next([=] {
 		prepareFrame();
 
@@ -1202,14 +1245,16 @@ void RoundVideoRecorder::setup() {
 		} else if (!_visible) {
 			return;
 		}
+
 		p.drawImage(raw->rect(), _shadow);
 		const auto inner = QRect(_extent, _extent, _side, _side);
 		const auto fading = _fadeContentAnimation.animating();
 		if (!_progressReceived && !fading) {
-			p.drawImage(inner, _framePlaceholder);
+			paintPlaceholder(p, inner);
 		} else {
 			if (fading) {
-				p.drawImage(inner, _framePlaceholder);
+				paintPlaceholder(p, inner);
+
 				const auto to = _progressReceived ? 1. : 0.;
 				p.setOpacity(opacity * _fadeContentAnimation.value(to));
 			}
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index ecef3e425..e8cd5379f 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/weak_ptr.h"
 #include "ui/effects/animations.h"
+#include "ui/effects/path_shift_gradient.h"
 
 #include <crl/crl_object_on_queue.h>
 
@@ -91,6 +92,9 @@ private:
 	[[nodiscard]] PreviewFrame lookupPreviewFrame() const;
 
 	const RoundVideoRecorderDescriptor _descriptor;
+	style::owned_color _gradientBg;
+	style::owned_color _gradientFg;
+	PathShiftGradient _gradient;
 	std::unique_ptr<RpWidget> _preview;
 	crl::object_on_queue<Private> _private;
 	Ui::Animations::Simple _progressAnimation;

From ccc6c6daa55b769ae74d52de888c1ea4e441b36c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Oct 2024 22:34:12 +0400
Subject: [PATCH 038/306] Save last camera image as a placeholder.

---
 .../history_view_voice_record_bar.cpp         |  7 +++
 .../SourceFiles/storage/storage_account.cpp   | 59 +++++++++++++++++++
 .../SourceFiles/storage/storage_account.h     |  6 ++
 .../ui/controls/round_video_recorder.cpp      | 59 ++++++++++++-------
 .../ui/controls/round_video_recorder.h        |  4 ++
 5 files changed, 113 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 7c582784a..1e2910e60 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/player/media_player_instance.h"
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_round_preview.h"
+#include "storage/storage_account.h"
 #include "ui/controls/round_video_recorder.h"
 #include "ui/controls/send_button.h"
 #include "ui/effects/animation_value.h"
@@ -2362,7 +2363,13 @@ bool VoiceRecordBar::createVideoRecorder() {
 			.hidden = hidden,
 			.capturer = std::move(capturer),
 			.track = std::move(track),
+			.placeholder = _show->session().local().readRoundPlaceholder(),
 		});
+	_videoRecorder->placeholderUpdates(
+	) | rpl::start_with_next([=](QImage &&placeholder) {
+		_show->session().local().writeRoundPlaceholder(placeholder);
+	}, _videoCapturerLifetime);
+
 	return true;
 }
 
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index a24a6e6fc..5af0677c5 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -94,6 +94,7 @@ enum { // Local Storage Keys
 	lskCustomEmojiKeys = 0x17, // no data
 	lskSearchSuggestions = 0x18, // no data
 	lskWebviewTokens = 0x19, // data: QByteArray bots, QByteArray other
+	lskRoundPlaceholder = 0x1a, // no data
 };
 
 auto EmptyMessageDraftSources()
@@ -220,6 +221,7 @@ base::flat_set<QString> Account::collectGoodNames() const {
 		_featuredCustomEmojiKey,
 		_archivedCustomEmojiKey,
 		_searchSuggestionsKey,
+		_roundPlaceholderKey,
 	};
 	auto result = base::flat_set<QString>{
 		"map0",
@@ -306,6 +308,7 @@ Account::ReadMapResult Account::readMapWith(
 	quint64 legacyBackgroundKeyDay = 0, legacyBackgroundKeyNight = 0;
 	quint64 userSettingsKey = 0, recentHashtagsAndBotsKey = 0, exportSettingsKey = 0;
 	quint64 searchSuggestionsKey = 0;
+	quint64 roundPlaceholderKey = 0;
 	QByteArray webviewStorageTokenBots, webviewStorageTokenOther;
 	while (!map.stream.atEnd()) {
 		quint32 keyType;
@@ -415,6 +418,9 @@ Account::ReadMapResult Account::readMapWith(
 		case lskSearchSuggestions: {
 			map.stream >> searchSuggestionsKey;
 		} break;
+		case lskRoundPlaceholder: {
+			map.stream >> roundPlaceholderKey;
+		} break;
 		case lskWebviewTokens: {
 			map.stream
 				>> webviewStorageTokenBots
@@ -456,6 +462,7 @@ Account::ReadMapResult Account::readMapWith(
 	_recentHashtagsAndBotsKey = recentHashtagsAndBotsKey;
 	_exportSettingsKey = exportSettingsKey;
 	_searchSuggestionsKey = searchSuggestionsKey;
+	_roundPlaceholderKey = roundPlaceholderKey;
 	_oldMapVersion = mapData.version;
 	_webviewStorageIdBots.token = webviewStorageTokenBots;
 	_webviewStorageIdOther.token = webviewStorageTokenOther;
@@ -570,6 +577,7 @@ void Account::writeMap() {
 			+ Serialize::bytearraySize(_webviewStorageIdBots.token)
 			+ Serialize::bytearraySize(_webviewStorageIdOther.token);
 	}
+	if (_roundPlaceholderKey) mapSize += sizeof(quint32) + sizeof(quint64);
 
 	EncryptedDescriptor mapData(mapSize);
 	if (!self.isEmpty()) {
@@ -640,6 +648,10 @@ void Account::writeMap() {
 			<< _webviewStorageIdBots.token
 			<< _webviewStorageIdOther.token;
 	}
+	if (_roundPlaceholderKey) {
+		mapData.stream << quint32(lskRoundPlaceholder);
+		mapData.stream << quint64(_roundPlaceholderKey);
+	}
 	map.writeEncrypted(mapData, _localKey);
 
 	_mapChanged = false;
@@ -669,6 +681,7 @@ void Account::reset() {
 	_legacyBackgroundKeyDay = _legacyBackgroundKeyNight = 0;
 	_settingsKey = _recentHashtagsAndBotsKey = _exportSettingsKey = 0;
 	_searchSuggestionsKey = 0;
+	_roundPlaceholderKey = 0;
 	_oldMapVersion = 0;
 	_fileLocations.clear();
 	_fileLocationPairs.clear();
@@ -3178,6 +3191,52 @@ Webview::StorageId Account::resolveStorageIdOther() {
 	return _webviewStorageIdOther;
 }
 
+QImage Account::readRoundPlaceholder() {
+	if (!_roundPlaceholder.isNull()) {
+		return _roundPlaceholder;
+	} else if (!_roundPlaceholderKey) {
+		return QImage();
+	}
+
+	FileReadDescriptor placeholder;
+	if (!ReadEncryptedFile(
+			placeholder,
+			_roundPlaceholderKey,
+			_basePath,
+			_localKey)) {
+		ClearKey(_roundPlaceholderKey, _basePath);
+		_roundPlaceholderKey = 0;
+		writeMapDelayed();
+		return QImage();
+	}
+
+	auto bytes = QByteArray();
+	placeholder.stream >> bytes;
+	_roundPlaceholder = Images::Read({ .content = bytes }).image;
+	return _roundPlaceholder;
+}
+
+void Account::writeRoundPlaceholder(const QImage &placeholder) {
+	if (placeholder.isNull()) {
+		return;
+	}
+	_roundPlaceholder = placeholder;
+
+	auto bytes = QByteArray();
+	auto buffer = QBuffer(&bytes);
+	placeholder.save(&buffer, "JPG", 87);
+
+	quint32 size = Serialize::bytearraySize(bytes);
+	if (!_roundPlaceholderKey) {
+		_roundPlaceholderKey = GenerateKey(_basePath);
+		writeMapQueued();
+	}
+	EncryptedDescriptor data(size);
+	data.stream << bytes;
+	FileWriteDescriptor file(_roundPlaceholderKey, _basePath);
+	file.writeEncrypted(data, _localKey);
+}
+
 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 84533f93d..c0efdefdc 100644
--- a/Telegram/SourceFiles/storage/storage_account.h
+++ b/Telegram/SourceFiles/storage/storage_account.h
@@ -174,6 +174,9 @@ public:
 	[[nodiscard]] Webview::StorageId resolveStorageIdBots();
 	[[nodiscard]] Webview::StorageId resolveStorageIdOther();
 
+	[[nodiscard]] QImage readRoundPlaceholder();
+	void writeRoundPlaceholder(const QImage &placeholder);
+
 	[[nodiscard]] bool encrypt(
 		const void *src,
 		void *dst,
@@ -302,6 +305,7 @@ private:
 	FileKey _featuredCustomEmojiKey = 0;
 	FileKey _archivedCustomEmojiKey = 0;
 	FileKey _searchSuggestionsKey = 0;
+	FileKey _roundPlaceholderKey = 0;
 
 	qint64 _cacheTotalSizeLimit = 0;
 	qint64 _cacheBigFileTotalSizeLimit = 0;
@@ -325,6 +329,8 @@ private:
 	bool _mapChanged = false;
 	bool _locationsChanged = false;
 
+	QImage _roundPlaceholder;
+
 };
 
 [[nodiscard]] Webview::StorageId TonSiteStorageId();
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index c7383614a..5c29cc65e 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -1052,6 +1052,10 @@ Fn<void(Media::Capture::Chunk)> RoundVideoRecorder::audioChunkProcessor() {
 	};
 }
 
+rpl::producer<QImage> RoundVideoRecorder::placeholderUpdates() const {
+	return _placeholderUpdates.events();
+}
+
 int RoundVideoRecorder::previewSize() const {
 	return _side;
 }
@@ -1096,6 +1100,31 @@ void RoundVideoRecorder::progressTo(float64 progress) {
 	_preview->update();
 }
 
+void RoundVideoRecorder::preparePlaceholder(const QImage &placeholder) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto full = QSize(_side, _side) * ratio;
+	if (!placeholder.isNull()) {
+		_framePlaceholder = Images::Circle(
+			placeholder.scaled(
+				full,
+				Qt::KeepAspectRatio,
+				Qt::SmoothTransformation));
+		_framePlaceholder.setDevicePixelRatio(ratio);
+	} else {
+		_framePlaceholder = QImage(
+			full,
+			QImage::Format_ARGB32_Premultiplied);
+		_framePlaceholder.fill(Qt::transparent);
+		_framePlaceholder.setDevicePixelRatio(ratio);
+
+		auto p = QPainter(&_framePlaceholder);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(Qt::black);
+		p.drawEllipse(0, 0, _side, _side);
+	}
+}
+
 void RoundVideoRecorder::prepareFrame(bool blurred) {
 	if (_frameOriginal.isNull()) {
 		return;
@@ -1124,18 +1153,14 @@ void RoundVideoRecorder::prepareFrame(bool blurred) {
 	const auto ratio = style::DevicePixelRatio();
 	if (blurred) {
 		static constexpr auto kRadius = 16;
-		_framePlaceholder = Images::Circle(
-			Images::BlurLargeImage(
-				copy.scaled(
-					QSize(kBlurredSize, kBlurredSize),
-					Qt::KeepAspectRatio,
-					Qt::FastTransformation),
-				kRadius
-			).scaled(
-				QSize(_side, _side) * ratio,
+		auto image = Images::BlurLargeImage(
+			copy.scaled(
+				QSize(kBlurredSize, kBlurredSize),
 				Qt::KeepAspectRatio,
-				Qt::SmoothTransformation));
-		_framePlaceholder.setDevicePixelRatio(ratio);
+				Qt::FastTransformation),
+			kRadius);
+		preparePlaceholder(image);
+		_placeholderUpdates.fire(std::move(image));
 	} else {
 		_framePrepared = Images::Circle(copy.scaled(
 			QSize(_side, _side) * ratio,
@@ -1147,17 +1172,7 @@ void RoundVideoRecorder::prepareFrame(bool blurred) {
 
 void RoundVideoRecorder::createImages() {
 	const auto ratio = style::DevicePixelRatio();
-	_framePlaceholder = QImage(
-		QSize(_side, _side) * ratio,
-		QImage::Format_ARGB32_Premultiplied);
-	_framePlaceholder.fill(Qt::transparent);
-	_framePlaceholder.setDevicePixelRatio(ratio);
-	auto p = QPainter(&_framePlaceholder);
-	auto hq = PainterHighQualityEnabler(p);
-
-	p.setPen(Qt::NoPen);
-	p.setBrush(Qt::black);
-	p.drawEllipse(0, 0, _side, _side);
+	preparePlaceholder(_descriptor.placeholder);
 
 	const auto side = _side + 2 * _extent;
 	_shadow = QImage(
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index e8cd5379f..57f47b8ca 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -38,6 +38,7 @@ struct RoundVideoRecorderDescriptor {
 	Fn<void(not_null<RoundVideoRecorder*>)> hidden;
 	std::shared_ptr<tgcalls::VideoCaptureInterface> capturer;
 	std::shared_ptr<Webrtc::VideoTrack> track;
+	QImage placeholder;
 };
 
 struct RoundVideoResult {
@@ -62,6 +63,7 @@ public:
 
 	[[nodiscard]] int previewSize() const;
 	[[nodiscard]] Fn<void(Media::Capture::Chunk)> audioChunkProcessor();
+	[[nodiscard]] rpl::producer<QImage> placeholderUpdates() const;
 
 	void pause(Fn<void(RoundVideoResult)> done = nullptr);
 	void resume(RoundVideoPartial partial);
@@ -84,6 +86,7 @@ private:
 
 	void setup();
 	void prepareFrame(bool blurred = false);
+	void preparePlaceholder(const QImage &placeholder);
 	void createImages();
 	void progressTo(float64 progress);
 	void fade(bool visible);
@@ -100,6 +103,7 @@ private:
 	Ui::Animations::Simple _progressAnimation;
 	Ui::Animations::Simple _fadeAnimation;
 	Ui::Animations::Simple _fadeContentAnimation;
+	rpl::event_stream<QImage> _placeholderUpdates;
 
 	std::shared_ptr<Ui::DynamicImage> _silentPreview;
 	std::shared_ptr<Ui::DynamicImage> _soundedPreview;

From 9b9c3d788d336d15914413788b4cf5dfceb9d3c9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Oct 2024 11:31:29 +0400
Subject: [PATCH 039/306] Skip some first frames.

---
 .../ui/controls/round_video_recorder.cpp      | 22 ++++++++++++++-----
 .../ui/controls/round_video_recorder.h        |  1 +
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 5c29cc65e..f58eeb2dc 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -35,6 +35,7 @@ constexpr auto kBlurredSize = 64;
 constexpr auto kMinithumbsPerSecond = 5;
 constexpr auto kMinithumbsInRow = 16;
 constexpr auto kFadeDuration = crl::time(150);
+constexpr auto kSkipFrames = 8;
 
 using namespace FFmpeg;
 
@@ -1317,15 +1318,23 @@ void RoundVideoRecorder::setup() {
 		}
 	}, raw->lifetime());
 
+	// Skip some frames, they are sometimes black :(
+	_skipFrames = kSkipFrames;
+	_descriptor.track->setState(Webrtc::VideoState::Active);
+
 	_descriptor.track->renderNextFrame() | rpl::start_with_next([=] {
 		const auto info = _descriptor.track->frameWithInfo(true);
 		if (!info.original.isNull() && _lastAddedIndex != info.index) {
 			_lastAddedIndex = info.index;
-			_frameOriginal = info.original;
-			const auto ts = info.mcstimestamp;
-			_private.with([copy = info.original, ts](Private &that) {
-				that.push(ts, copy);
-			});
+			if (_skipFrames > 0) {
+				--_skipFrames;
+			} else {
+				_frameOriginal = info.original;
+				const auto ts = info.mcstimestamp;
+				_private.with([copy = info.original, ts](Private &that) {
+					that.push(ts, copy);
+				});
+			}
 		}
 		_descriptor.track->markFrameShown();
 		raw->update();
@@ -1412,9 +1421,10 @@ void RoundVideoRecorder::resume(RoundVideoPartial partial) {
 	if (!_cachedPreviewFrame.image.isNull()) {
 		_fadePreviewAnimation.start(updater(), 1., 0., kFadeDuration);
 	}
+	// Skip some frames, they are sometimes black :(
+	_skipFrames = kSkipFrames;
 	_descriptor.track->setState(Webrtc::VideoState::Active);
 	_preview->update();
 }
 
 } // namespace Ui
-
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index 57f47b8ca..b98d313cc 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -120,6 +120,7 @@ private:
 	int _side = 0;
 	int _progressStroke = 0;
 	int _extent = 0;
+	int _skipFrames = 0;
 	bool _progressReceived = false;
 	bool _visible = false;
 	bool _paused = false;

From ae89b65a9882b0fa571a7c05b069441030526373 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Oct 2024 12:38:00 +0400
Subject: [PATCH 040/306] Fix message selection checks position.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 51be68d40..3a84ee927 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1616,7 +1616,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 			const auto &st = st::msgSelectionCheck;
 			const auto right = delegate()->elementIsChatWide()
 				? std::min(
-					(_bubbleWidthLimit
+					int(_bubbleWidthLimit
 						+ st::msgPhotoSkip
 						+ st::msgSelectionOffset
 						+ st::msgPadding.left()
@@ -1624,7 +1624,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 					width())
 				: width();
 			const auto pos = QPoint(
-				(width()
+				(right
 					- (st::msgSelectionOffset * progress - st.size) / 2
 					- st::msgPadding.right() / 2
 					- st.size),

From b01d7ea5b985b9aadb46ebae19391873b481199a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Oct 2024 12:38:16 +0400
Subject: [PATCH 041/306] Show recording init errors.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 3cb539857..6036cd685 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1057,6 +1057,24 @@ void HistoryWidget::initVoiceRecordBar() {
 		_cornerButtons.updateUnreadThingsVisibility();
 	}, lifetime());
 
+	_voiceRecordBar->errors(
+	) | rpl::start_with_next([=](::Media::Capture::Error error) {
+		using Error = ::Media::Capture::Error;
+		switch (error) {
+		case Error::AudioInit:
+		case Error::AudioTimeout:
+			controller()->showToast(tr::lng_record_audio_problem(tr::now));
+			break;
+		case Error::VideoInit:
+		case Error::VideoTimeout:
+			controller()->showToast(tr::lng_record_video_problem(tr::now));
+			break;
+		default:
+			controller()->showToast(u"Unknown error."_q);
+			break;
+		}
+	}, lifetime());
+
 	_voiceRecordBar->updateSendButtonTypeRequests(
 	) | rpl::start_with_next([=] {
 		updateSendButtonType();

From 9e2cf0ed737a0f8586e4d9ed652364443572d8e9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Oct 2024 12:39:12 +0400
Subject: [PATCH 042/306] Nice faded show/hide of round recorder.

---
 .../history_view_voice_record_bar.cpp         |  6 +++
 .../ui/controls/round_video_recorder.cpp      | 39 ++++++++++++-------
 .../ui/controls/round_video_recorder.h        |  1 +
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 1e2910e60..9d64c9ed7 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
@@ -2335,6 +2335,11 @@ bool VoiceRecordBar::createVideoRecorder() {
 	if (_videoRecorder) {
 		return true;
 	}
+	const auto hiding = [=](not_null<Ui::RoundVideoRecorder*> which) {
+		if (_videoRecorder.get() == which) {
+			_videoHiding.push_back(base::take(_videoRecorder));
+		}
+	};
 	const auto hidden = [=](not_null<Ui::RoundVideoRecorder*> which) {
 		if (_videoRecorder.get() == which) {
 			_videoRecorder = nullptr;
@@ -2360,6 +2365,7 @@ bool VoiceRecordBar::createVideoRecorder() {
 	_videoRecorder = std::make_unique<Ui::RoundVideoRecorder>(
 		Ui::RoundVideoRecorderDescriptor{
 			.container = _outerContainer,
+			.hiding = hiding,
 			.hidden = hidden,
 			.capturer = std::move(capturer),
 			.track = std::move(track),
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index f58eeb2dc..3993d089d 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -36,6 +36,7 @@ constexpr auto kMinithumbsPerSecond = 5;
 constexpr auto kMinithumbsInRow = 16;
 constexpr auto kFadeDuration = crl::time(150);
 constexpr auto kSkipFrames = 8;
+constexpr auto kMinScale = 0.7;
 
 using namespace FFmpeg;
 
@@ -647,7 +648,7 @@ void RoundVideoRecorder::Private::restart(RoundVideoPartial partial) {
 
 void RoundVideoRecorder::Private::fail(Error error) {
 	deinitEncoding();
-	_updates.fire_error({});
+	_updates.fire_error_copy(error);
 }
 
 void RoundVideoRecorder::Private::timeout() {
@@ -1072,12 +1073,11 @@ auto RoundVideoRecorder::updated() -> rpl::producer<Update, Error> {
 }
 
 void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
-	pause(std::move(done));
-
-	_preview->hide();
-	if (const auto onstack = _descriptor.hidden) {
+	if (const auto onstack = _descriptor.hiding) {
 		onstack(this);
 	}
+	pause(std::move(done));
+	fade(false);
 }
 
 void RoundVideoRecorder::progressTo(float64 progress) {
@@ -1255,9 +1255,15 @@ void RoundVideoRecorder::setup() {
 		prepareFrame();
 
 		auto p = QPainter(raw);
-		const auto opacity = _fadeAnimation.value(_visible ? 1. : 0.);
+		const auto faded = _fadeAnimation.value(_visible ? 1. : 0.);
 		if (_fadeAnimation.animating()) {
-			p.setOpacity(opacity);
+			p.setOpacity(faded * faded);
+
+			const auto center = raw->rect().center();
+			p.translate(center);
+			const auto scale = kMinScale + (1. - kMinScale) * faded;
+			p.scale(scale, scale);
+			p.translate(-center);
 		} else if (!_visible) {
 			return;
 		}
@@ -1272,7 +1278,7 @@ void RoundVideoRecorder::setup() {
 				paintPlaceholder(p, inner);
 
 				const auto to = _progressReceived ? 1. : 0.;
-				p.setOpacity(opacity * _fadeContentAnimation.value(to));
+				p.setOpacity(faded * _fadeContentAnimation.value(to));
 			}
 			p.drawImage(inner, _framePrepared);
 
@@ -1352,11 +1358,18 @@ void RoundVideoRecorder::fade(bool visible) {
 		return;
 	}
 	_visible = visible;
-	_fadeAnimation.start(
-		[=] { _preview->update(); },
-		visible ? 0. : 1.,
-		visible ? 1. : 0.,
-		kFadeDuration);
+	const auto from = visible ? 0. : 1.;
+	const auto to = visible ? 1. : 0.;
+	_fadeAnimation.start([=] {
+		if (_fadeAnimation.animating() || _visible) {
+			_preview->update();
+		} else {
+			_preview->hide();
+			if (const auto onstack = _descriptor.hidden) {
+				onstack(this);
+			}
+		}
+	}, from, to, kFadeDuration);
 }
 
 auto RoundVideoRecorder::lookupPreviewFrame() const -> PreviewFrame {
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
index b98d313cc..e919c223a 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.h
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -35,6 +35,7 @@ class RoundVideoRecorder;
 
 struct RoundVideoRecorderDescriptor {
 	not_null<RpWidget*> container;
+	Fn<void(not_null<RoundVideoRecorder*>)> hiding;
 	Fn<void(not_null<RoundVideoRecorder*>)> hidden;
 	std::shared_ptr<tgcalls::VideoCaptureInterface> capturer;
 	std::shared_ptr<Webrtc::VideoTrack> track;

From b44b45cca04629033d23f011cbb0d23f9bd77938 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Oct 2024 12:39:24 +0400
Subject: [PATCH 043/306] Fix docker build with openh264 in ffmpeg.

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 7c0edd864..fe0e81036 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -473,6 +473,7 @@ RUN git clone -b n12.1.14.0 --depth=1 {{ GIT }}/FFmpeg/nv-codec-headers.git \
 
 FROM builder AS ffmpeg
 COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
+COPY --link --from=openh264 {{ LibrariesPath }}/openh264-cache /
 COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
 COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache /
 COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache /

From 9713abc002c83674877597dbd2f41d330ff91d08 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Oct 2024 13:18:10 +0400
Subject: [PATCH 044/306] Fix build with GCC.

---
 .../history/view/controls/history_view_voice_record_bar.cpp | 4 ----
 Telegram/SourceFiles/ui/controls/round_video_recorder.cpp   | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 9d64c9ed7..de06fb53e 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
@@ -138,10 +138,6 @@ void SoundedPreview::subscribeToUpdates(Fn<void()> callback) {
 	return std::clamp(float64(low) / high, 0., 1.);
 }
 
-[[nodiscard]] crl::time Duration(int samples) {
-	return samples * crl::time(1000) / ::Media::Player::kDefaultFrequency;
-}
-
 [[nodiscard]] auto FormatVoiceDuration(int samples) {
 	const int duration = kPrecision
 		* (float64(samples) / ::Media::Player::kDefaultFrequency);
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 3993d089d..0009f6214 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -56,7 +56,7 @@ struct ReadBytesWrap {
 		}
 		return toRead;
 	};
-	static int64 Seek(void *opaque, int64_t offset, int whence) {
+	static int64_t Seek(void *opaque, int64_t offset, int whence) {
 		auto wrap = static_cast<ReadBytesWrap*>(opaque);
 		auto updated = int64(-1);
 		switch (whence) {
@@ -253,9 +253,9 @@ int RoundVideoRecorder::Private::write(uint8_t *buf, int buf_size) {
 int64_t RoundVideoRecorder::Private::seek(int64_t offset, int whence) {
 	const auto checkedSeek = [&](int64_t offset) {
 		if (offset < 0 || offset > int64(_result.size())) {
-			return int64(-1);
+			return int64_t(-1);
 		}
-		return (_resultOffset = offset);
+		return int64_t(_resultOffset = offset);
 	};
 	switch (whence) {
 	case SEEK_SET: return checkedSeek(offset);

From 78937d716fe6e8fa3b470d378d2fcb54a643f06c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Oct 2024 13:40:52 +0400
Subject: [PATCH 045/306] Beta version 5.6.4.

- Add recording of video messages in case a camera is available.
- Add "Respect the Focus settings" for custom notifications on Windows.
---
 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 798a9e220..6b9a46d69 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.6.3.0" />
+    Version="5.6.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 bddb3423b..2d9bc821e 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,6,3,0
- PRODUCTVERSION 5,6,3,0
+ FILEVERSION 5,6,4,0
+ PRODUCTVERSION 5,6,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.6.3.0"
+            VALUE "FileVersion", "5.6.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.6.3.0"
+            VALUE "ProductVersion", "5.6.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 84d811fbc..918a473ca 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,6,3,0
- PRODUCTVERSION 5,6,3,0
+ FILEVERSION 5,6,4,0
+ PRODUCTVERSION 5,6,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.6.3.0"
+            VALUE "FileVersion", "5.6.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.6.3.0"
+            VALUE "ProductVersion", "5.6.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index eb198caa5..6d97509ce 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 = 5006003;
-constexpr auto AppVersionStr = "5.6.3";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 5006004;
+constexpr auto AppVersionStr = "5.6.4";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 877b2bf3d..da53e6e51 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5006003
+AppVersion         5006004
 AppVersionStrMajor 5.6
-AppVersionStrSmall 5.6.3
-AppVersionStr      5.6.3
-BetaChannel        0
+AppVersionStrSmall 5.6.4
+AppVersionStr      5.6.4
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 5.6.3
+AppVersionOriginal 5.6.4.beta
diff --git a/changelog.txt b/changelog.txt
index 776affea6..ceb6c9d56 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+5.6.4 beta (24.10.24)
+
+- Add recording of video messages in case a camera is available.
+- Add "Respect the Focus settings" for custom notifications on Windows.
+
 5.6.3 (15.10.24)
 
 - Add ability to change page scale in Instant View pages.

From 6787ea883e2d3c9c43d5dead28b554d031b55668 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 20 Oct 2024 03:55:35 +0300
Subject: [PATCH 046/306] Replaced empty icon buttons with simple circle ripple
 buttons.

---
 Telegram/SourceFiles/iv/iv_controller.cpp     | 63 +++++++------------
 .../SourceFiles/settings/settings_chat.cpp    | 20 +-----
 Telegram/lib_ui                               |  2 +-
 3 files changed, 26 insertions(+), 59 deletions(-)

diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index c17fd8368..606570166 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -83,39 +83,6 @@ public:
 
 		AbstractButton::setDisabled(true);
 
-		class SmallButton final : public Ui::IconButton {
-		public:
-			SmallButton(
-				not_null<Ui::RpWidget*> parent,
-				QChar c,
-				float64 skip,
-				const style::color &color)
-			: Ui::IconButton(parent, st::ivPlusMinusZoom)
-			, _color(color)
-			, _skip(style::ConvertFloatScale(skip))
-			, _c(c) {
-			}
-
-			void paintEvent(QPaintEvent *event) override {
-				auto p = Painter(this);
-				Ui::RippleButton::paintRipple(
-					p,
-					st::ivPlusMinusZoom.rippleAreaPosition);
-				p.setPen(_color);
-				p.setFont(st::normalFont);
-				p.drawText(
-					QRectF(rect()).translated(0, _skip),
-					_c,
-					style::al_center);
-			}
-
-		private:
-			const style::color _color;
-			const float64 _skip;
-			const QChar _c;
-
-		};
-
 		const auto processTooltip = [=, this](not_null<Ui::RpWidget*> w) {
 			w->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
 				if (e->type() == QEvent::Enter) {
@@ -141,11 +108,16 @@ public:
 			_delegate->ivSetZoom(kDefaultZoom);
 		});
 		reset->show();
-		const auto plus = Ui::CreateChild<SmallButton>(
+		const auto plus = Ui::CreateSimpleCircleButton(
 			this,
-			'+',
-			0,
-			_st.itemFg);
+			st::defaultRippleAnimationBgOver);
+		plus->resize(Size(st::ivZoomButtonsSize));
+		plus->paintRequest() | rpl::start_with_next([=, fg = _st.itemFg] {
+			auto p = QPainter(plus);
+			p.setPen(fg);
+			p.setFont(st::normalFont);
+			p.drawText(plus->rect(), QChar('+'), style::al_center);
+		}, plus->lifetime());
 		processTooltip(plus);
 		const auto step = [] {
 			return base::IsAltPressed()
@@ -158,11 +130,20 @@ public:
 			_delegate->ivSetZoom(_delegate->ivZoom() + step());
 		});
 		plus->show();
-		const auto minus = Ui::CreateChild<SmallButton>(
+		const auto minus = Ui::CreateSimpleCircleButton(
 			this,
-			QChar(0x2013),
-			-1,
-			_st.itemFg);
+			st::defaultRippleAnimationBgOver);
+		minus->resize(Size(st::ivZoomButtonsSize));
+		minus->paintRequest() | rpl::start_with_next([=, fg = _st.itemFg] {
+			auto p = QPainter(minus);
+			const auto r = minus->rect();
+			p.setPen(fg);
+			p.setFont(st::normalFont);
+			p.drawText(
+				QRectF(r).translated(0, style::ConvertFloatScale(-1)),
+				QChar(0x2013),
+				style::al_center);
+		}, minus->lifetime());
 		processTooltip(minus);
 		minus->setClickedCallback([this, step] {
 			_delegate->ivSetZoom(_delegate->ivZoom() - step());
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index a45a8787a..a83b75b45 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -896,24 +896,10 @@ void SetupMessages(
 		Quick::React,
 		tr::lng_settings_chat_quick_action_react(tr::now));
 
-	class EmptyButton final : public Ui::IconButton {
-	public:
-		EmptyButton(not_null<Ui::RpWidget*> p, const style::IconButton &st)
-		: Ui::IconButton(p, st)
-		, _rippleAreaPosition(st.rippleAreaPosition) {
-		}
-	protected:
-		void paintEvent(QPaintEvent *e) override {
-			auto p = QPainter(this);
-
-			paintRipple(p, _rippleAreaPosition, nullptr);
-		}
-	private:
-		const QPoint _rippleAreaPosition;
-	};
-	const auto buttonRight = Ui::CreateChild<EmptyButton>(
+	const auto buttonRight = Ui::CreateSimpleCircleButton(
 		inner,
-		st::stickersRemove);
+		st::stickersRemove.ripple);
+	buttonRight->resize(st::stickersRemove.width, st::stickersRemove.height);
 	const auto toggleButtonRight = [=](bool value) {
 		buttonRight->setAttribute(Qt::WA_TransparentForMouseEvents, !value);
 	};
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 0198796f9..cdbde2988 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 0198796f9011aeb8b1449e42a3cae02222df12fc
+Subproject commit cdbde2988aea6a98fb8810d8f7d15b323aa64941

From cd041e8366686e46d7ef17ab2c6763e5a862df5e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 20 Oct 2024 05:33:23 +0300
Subject: [PATCH 047/306] Replaced empty settings button with simple ripple
 button.

---
 .../window/window_main_menu_helpers.cpp       | 90 ++++++++-----------
 1 file changed, 38 insertions(+), 52 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
index bf15aacba..baf22753d 100644
--- a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
@@ -165,43 +165,42 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 		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,
-					(g && !g->amIn())
-						? tr::lng_chat_status_unaccessible(tr::now)
-						: !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 megagroupMark = u"[s] "_q;
+		const auto add = [&](
+				not_null<PeerData*> peer,
+				not_null<Ui::VerticalLayout*> container) {
+			const auto row = container->add(
+				object_ptr<Ui::AbstractButton>::fromRaw(
+					Ui::CreateSimpleSettingsButton(
+						container,
+						st::defaultRippleAnimation,
+						st::defaultSettingsButton.textBgOver)));
+			row->resize(row->width(), st::defaultPeerListItem.height);
+			const auto c = peer->asChannel();
+			const auto g = peer->asChat();
+			const auto count = c ? c->membersCount() : g->count;
+			const auto text = std::make_shared<Ui::Text::String>(
+				st::defaultPeerListItem.nameStyle,
+				((c && c->isMegagroup()) ? megagroupMark : QString())
+					+ peer->name());
+			const auto status = std::make_shared<Ui::Text::String>(
+				st::defaultTextStyle,
+				(g && !g->amIn())
+					? tr::lng_chat_status_unaccessible(tr::now)
+					: !peer->username().isEmpty()
+					? ('@' + peer->username())
+					: (count > 0)
+					? ((c && !c->isMegagroup())
+						? tr::lng_chat_status_subscribers
+						: tr::lng_chat_status_members)(
+							tr::now,
+							lt_count,
+							count)
+					: QString());
+			row->paintRequest() | rpl::start_with_next([=] {
+				auto p = QPainter(row);
 				const auto &st = st::defaultPeerListItem;
-				const auto availableWidth = width()
+				const auto availableWidth = row->width()
 					- st::boxRowPadding.right()
 					- st.namePosition.x();
 				p.setPen(st.nameFg);
@@ -211,24 +210,11 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 					.availableWidth = availableWidth,
 					.elisionLines = 1,
 				};
-				_text.draw(p, context);
+				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,
-				not_null<Ui::VerticalLayout*> container) {
-			const auto row = container->add(
-				object_ptr<Button>(container, rpl::single(QString())));
-			row->setPeer(peer);
+				status->draw(p, context);
+			}, row->lifetime());
 			row->setClickedCallback([=] {
 				controller->showPeerHistory(peer);
 			});

From f48dfb5d812de2faba23471672fb35fc65ed101a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 24 Oct 2024 17:04:05 +0300
Subject: [PATCH 048/306] Added ability to add to contacts phone from text
 phone entity.

---
 .../SourceFiles/core/phone_click_handler.cpp  | 43 ++++++++++++++++---
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
index 19d15b78a..28da63ffa 100644
--- a/Telegram/SourceFiles/core/phone_click_handler.cpp
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "core/phone_click_handler.h"
 
+#include "boxes/add_contact_box.h"
 #include "core/click_handler_types.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -48,6 +49,9 @@ public:
 
 	void handleKeyPress(not_null<QKeyEvent*> e) override;
 
+	[[nodiscard]] QString firstName() const;
+	[[nodiscard]] QString lastName() const;
+
 protected:
 	QPoint prepareRippleStartPosition() const override;
 	QImage prepareRippleMask() const override;
@@ -130,6 +134,18 @@ ResolvePhoneAction::ResolvePhoneAction(
 	prepare();
 }
 
+QString ResolvePhoneAction::firstName() const {
+	const auto peer = _peer.current();
+	const auto user = peer ? peer->asUser() : nullptr;
+	return user ? user->firstName : QString();
+}
+
+QString ResolvePhoneAction::lastName() const {
+	const auto peer = _peer.current();
+	const auto user = peer ? peer->asUser() : nullptr;
+	return user ? user->lastName : QString();
+}
+
 void ResolvePhoneAction::paint(Painter &p) {
 	const auto selected = isSelected() && _peer.current();
 	const auto height = contentHeight();
@@ -314,14 +330,29 @@ void PhoneClickHandler::onClick(ClickContext context) const {
 			TextForMimeData::Simple(phone.trimmed()));
 	}, &st::menuIconCopy);
 
+	auto resolvePhoneAction = base::make_unique_q<ResolvePhoneAction>(
+		menu,
+		menu->st().menu,
+		phone,
+		controller);
+
+	if (Trim(phone) != Trim(controller->session().user()->phone())) {
+		menu->addAction(
+			tr::lng_info_add_as_contact(tr::now),
+			[=, raw = resolvePhoneAction.get()] {
+				controller->show(
+					Box<AddContactBox>(
+						_session,
+						raw->firstName(),
+						raw->lastName(),
+						Trim(phone)));
+			},
+			&st::menuIconInvite);
+	}
+
 	menu->addSeparator(&st::popupMenuExpandedSeparator.menu.separator);
 
-	menu->addAction(
-		base::make_unique_q<ResolvePhoneAction>(
-			menu,
-			menu->st().menu,
-			phone,
-			controller));
+	menu->addAction(std::move(resolvePhoneAction));
 
 	menu->popup(pos);
 }

From e6d661f8eedb2359f8d29d2c40a97863cd7e0843 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 24 Oct 2024 17:43:04 +0300
Subject: [PATCH 049/306] Fixed statistics section of stories from megagroups.

---
 Telegram/SourceFiles/api/api_statistics.cpp            | 10 +++++++---
 .../info/statistics/info_statistics_recent_message.cpp |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index c960aca33..69bbed7fc 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -341,6 +341,10 @@ void PublicForwards::request(
 			.token = nextToken,
 		});
 	};
+	const auto processFail = [=] {
+		_requestId = 0;
+		done({});
+	};
 
 	constexpr auto kLimit = tl::make_int(100);
 	if (_fullId.messageId) {
@@ -349,14 +353,14 @@ void PublicForwards::request(
 			MTP_int(_fullId.messageId.msg),
 			MTP_string(token),
 			kLimit
-		)).done(processResult).fail([=] { _requestId = 0; }).send();
+		)).done(processResult).fail(processFail).send();
 	} else if (_fullId.storyId) {
 		_requestId = makeRequest(MTPstats_GetStoryPublicForwards(
 			channel->input,
 			MTP_int(_fullId.storyId.story),
 			MTP_string(token),
 			kLimit
-		)).done(processResult).fail([=] { _requestId = 0; }).send();
+		)).done(processResult).fail(processFail).send();
 	}
 }
 
@@ -381,7 +385,7 @@ Data::PublicForwardsSlice MessageStatistics::firstSlice() const {
 }
 
 void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
-	if (channel()->isMegagroup()) {
+	if (channel()->isMegagroup() && !_storyId) {
 		return;
 	}
 	const auto requestFirstPublicForwards = [=](
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp
index c09038bee..2f8b1d069 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp
@@ -224,6 +224,7 @@ void MessagePreview::processPreview() {
 			auto image = QImage(
 				rect.size() * style::DevicePixelRatio(),
 				QImage::Format_ARGB32_Premultiplied);
+			image.setDevicePixelRatio(style::DevicePixelRatio());
 			image.fill(Qt::transparent);
 			{
 				auto p = QPainter(&image);

From 0a92b1dc68ec74222e5a1e16d14ec4001a901950 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 24 Oct 2024 18:15:33 +0300
Subject: [PATCH 050/306] Slightly improved subtext in overview from statistics
 section.

---
 .../info/statistics/info_statistics_inner_widget.cpp        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
index 193622135..5412b5886 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
@@ -404,6 +404,9 @@ void FillOverview(
 					- st::statisticsOverviewSubtext.style.font->height
 					+ g.y()
 					+ diffBetweenHeaders);
+			if (container->height() < rect::bottom(sub)) {
+				container->resize(container->width(), rect::bottom(sub));
+			}
 		}, primary->lifetime());
 	};
 
@@ -535,8 +538,7 @@ void FillOverview(
 		}
 	}
 	container->showChildren();
-	container->resize(container->width(), topLeftLabel->height() * 5);
-	container->sizeValue(
+	container->sizeValue() | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](const QSize &s) {
 		const auto halfWidth = s.width() / 2;
 		{

From a8f492a027ee2c3078a6090601de9e26896b56f3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 24 Oct 2024 18:34:11 +0300
Subject: [PATCH 051/306] Improved colors of ministars in buttons from section
 of peer gifts.

---
 .../peer_gifts/info_peer_gifts_common.cpp     | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index d35759154..7d1f5cebe 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -42,7 +42,6 @@ GiftButton::GiftButton(
 : AbstractButton(parent)
 , _delegate(delegate)
 , _stars(this, true, Ui::Premium::MiniStars::Type::SlowStars) {
-	_stars.setColorOverride(Ui::Premium::CreditsIconGradientStops());
 }
 
 GiftButton::~GiftButton() {
@@ -82,7 +81,14 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor) {
 				data.currency,
 				true));
 		_userpic = nullptr;
+		_stars.setColorOverride(QGradientStops{
+			{ 0., anim::with_alpha(st::windowActiveTextFg->c, .3) },
+			{ 1., st::windowActiveTextFg->c },
+		});
 	}, [&](const GiftTypeStars &data) {
+		const auto soldOut = data.limitedCount
+			&& !data.userpic
+			&& !data.limitedLeft;
 		_price.setMarkedText(
 			st::semiboldTextStyle,
 			_delegate->star().append(' ' + QString::number(data.stars)),
@@ -93,6 +99,14 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor) {
 			: data.from
 			? Ui::MakeUserpicThumbnail(data.from)
 			: Ui::MakeHiddenAuthorThumbnail();
+		if (soldOut) {
+			_stars.setColorOverride(QGradientStops{
+				{ 0., Qt::transparent },
+				{ 1., Qt::transparent },
+			});
+		} else {
+			_stars.setColorOverride(Ui::Premium::CreditsIconGradientStops());
+		}
 	});
 	if (const auto document = _delegate->lookupSticker(descriptor)) {
 		setDocument(document);
@@ -110,6 +124,10 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor) {
 	const auto skipx = (width() - inner.width()) / 2;
 	const auto outer = (width() - 2 * skipx);
 	_button = QRect(skipx, skipy, outer, inner.height());
+	{
+		const auto padding = _button.height() / 2;
+		_stars.setCenter(_button - QMargins(padding, 0, padding, 0));
+	}
 }
 
 bool GiftButton::documentResolved() const {

From 9c185a30e0b3bdd6ba7a786bf411e720f667db9c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 24 Oct 2024 19:15:19 +0300
Subject: [PATCH 052/306] Slightly improved position of button for QR of
 username.

---
 Telegram/SourceFiles/info/info.style             | 11 ++++-------
 .../info/profile/info_profile_actions.cpp        | 16 ++++++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 84dca5dec..1838d6f95 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -441,19 +441,16 @@ infoProfileSeparatorPadding: margins(
 	infoProfileSkip,
 	0px,
 	infoProfileSkip);
-infoProfileLabeledButtonCopy: IconButton(defaultIconButton) {
+infoProfileLabeledButtonQr: IconButton(defaultIconButton) {
 	width: 34px;
 	height: 34px;
-	icon: icon {{ "menu/copy", windowBgActive }};
-	iconOver: icon {{ "menu/copy", windowBgActive }};
+	icon: icon {{ "menu/qr_code", windowActiveTextFg }};
+	iconOver: icon {{ "menu/qr_code", windowActiveTextFg }};
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: 34px;
 	ripple: defaultRippleAnimation;
 }
-infoProfileLabeledButtonQr: IconButton(infoProfileLabeledButtonCopy) {
-	icon: icon {{ "menu/qr_code", windowBgActive }};
-	iconOver: icon {{ "menu/qr_code", windowBgActive }};
-}
+infoProfileLabeledButtonQrRightSkip: 10px;
 
 infoIconInformation: icon {{ "info/info_information", infoIconFg }};
 infoIconAddMember: icon {{ "info/info_add_member", infoIconFg }};
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index ac8196618..df05d47c3 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1062,7 +1062,8 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 	};
 	const auto fitLabelToButton = [&](
 			not_null<Ui::RpWidget*> button,
-			not_null<Ui::FlatLabel*> label) {
+			not_null<Ui::FlatLabel*> label,
+			int rightSkip) {
 		const auto parent = label->parentWidget();
 		rpl::combine(
 			label->geometryValue(),
@@ -1070,10 +1071,11 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		) | rpl::start_with_next([=](const QRect &, const QSize &buttonSize) {
 			const auto s = parent->size();
 			button->moveToRight(
-				0,
+				rightSkip,
 				(s.height() - buttonSize.height()) / 2);
 			label->resizeToWidth(
 				s.width()
+					- rightSkip
 					- label->geometry().left()
 					- st::lineWidth * 2
 					- buttonSize.width());
@@ -1195,8 +1197,9 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		const auto qrButton = Ui::CreateChild<Ui::IconButton>(
 			usernameLine.text->parentWidget(),
 			st::infoProfileLabeledButtonQr);
-		fitLabelToButton(qrButton, usernameLine.text);
-		fitLabelToButton(qrButton, usernameLine.subtext);
+		const auto rightSkip = st::infoProfileLabeledButtonQrRightSkip;
+		fitLabelToButton(qrButton, usernameLine.text, rightSkip);
+		fitLabelToButton(qrButton, usernameLine.subtext, rightSkip);
 		qrButton->setClickedCallback([=] {
 			controller->show(
 				Box(Ui::FillPeerQrBox, user, std::nullopt, nullptr));
@@ -1272,8 +1275,9 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			const auto qr = Ui::CreateChild<Ui::IconButton>(
 				linkLine.text->parentWidget(),
 				st::infoProfileLabeledButtonQr);
-			fitLabelToButton(qr, linkLine.text);
-			fitLabelToButton(qr, linkLine.subtext);
+			const auto rightSkip = st::infoProfileLabeledButtonQrRightSkip;
+			fitLabelToButton(qr, linkLine.text, rightSkip);
+			fitLabelToButton(qr, linkLine.subtext, rightSkip);
 			qr->setClickedCallback([=, peer = _peer] {
 				controller->show(
 					Box(Ui::FillPeerQrBox, peer, std::nullopt, nullptr));

From d6863074b2332c2c0f50d073d8800b15805fdd19 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 24 Oct 2024 19:46:35 +0300
Subject: [PATCH 053/306] Fixed error handler of wrong cloud password for
 withdrawal button.

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

diff --git a/Telegram/SourceFiles/api/api_earn.cpp b/Telegram/SourceFiles/api/api_earn.cpp
index f05e5f618..432e1d278 100644
--- a/Telegram/SourceFiles/api/api_earn.cpp
+++ b/Telegram/SourceFiles/api/api_earn.cpp
@@ -89,7 +89,10 @@ void HandleWithdrawalButton(
 					}
 				};
 				const auto fail = [=](const MTP::Error &error) {
-					show->showToast(error.type());
+					const auto message = error.type();
+					if (box && !box->handleCustomCheckError(message)) {
+						show->showToast(message);
+					}
 				};
 				if (channel) {
 					session->api().request(

From 0397006894a5b79188da7ffb85ef4ced8aa453a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Oct 2024 16:37:31 +0400
Subject: [PATCH 054/306] Add more logging on failed top peers reading.

---
 Telegram/SourceFiles/data/components/recent_peers.cpp | 3 +++
 Telegram/SourceFiles/data/components/top_peers.cpp    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
index 58fb7dfcc..0917be2b9 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.cpp
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -112,6 +112,7 @@ void RecentPeers::applyLocal(QByteArray serialized) {
 		).arg(streamAppVersion));
 	_list.reserve(count);
 	for (auto i = 0; i != int(count); ++i) {
+		const auto streamPosition = stream.underlying().device()->pos();
 		const auto peer = Serialize::readPeer(
 			_session,
 			streamAppVersion,
@@ -123,6 +124,8 @@ void RecentPeers::applyLocal(QByteArray serialized) {
 			DEBUG_LOG(("Suggestions: Failed RecentPeers reading %1 / %2."
 				).arg(i + 1
 				).arg(count));
+			DEBUG_LOG(("Failed bytes: %1.").arg(
+				QString::fromUtf8(serialized.mid(streamPosition).toHex())));
 			_list.clear();
 			return;
 		}
diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
index 1d6307220..e068be199 100644
--- a/Telegram/SourceFiles/data/components/top_peers.cpp
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -300,6 +300,7 @@ void TopPeers::applyLocal(QByteArray serialized) {
 	_list.reserve(count);
 	for (auto i = 0; i != int(count); ++i) {
 		auto rating = quint64();
+		const auto streamPosition = stream.underlying().device()->pos();
 		const auto peer = Serialize::readPeer(
 			_session,
 			streamAppVersion,
@@ -313,6 +314,8 @@ void TopPeers::applyLocal(QByteArray serialized) {
 		} else {
 			DEBUG_LOG(("Suggestions: "
 				"Failed TopPeers reading %1 / %2.").arg(i + 1).arg(count));
+			DEBUG_LOG(("Failed bytes: %1.").arg(
+				QString::fromUtf8(serialized.mid(streamPosition).toHex())));
 			_list.clear();
 			return;
 		}

From f89aeb6ad4819fb0d6417d60bae593fa5c630806 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Oct 2024 18:20:10 +0400
Subject: [PATCH 055/306] Implement text -> media message editing.

---
 .../SourceFiles/boxes/edit_caption_box.cpp    |  9 ++++---
 .../chat_helpers/chat_helpers.style           |  7 ++++++
 Telegram/SourceFiles/history/history_item.cpp |  8 +++---
 Telegram/SourceFiles/history/history_item.h   |  1 +
 .../SourceFiles/history/history_widget.cpp    | 25 +++++++++++++------
 Telegram/SourceFiles/history/history_widget.h |  1 +
 .../history_view_compose_controls.cpp         | 23 +++++++++++------
 .../controls/history_view_compose_controls.h  |  1 +
 ...istory_view_compose_media_edit_manager.cpp |  1 +
 9 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 96d8fa782..f6e48b221 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -238,7 +238,7 @@ EditCaptionBox::EditCaptionBox(
 	Fn<void()> saved)
 : _controller(controller)
 , _historyItem(item)
-, _isAllowedEditMedia(item->media() && item->media()->allowsEditMedia())
+, _isAllowedEditMedia(item->allowsEditMedia())
 , _albumType(ComputeAlbumType(item))
 , _controls(base::make_unique_q<Ui::VerticalLayout>(this))
 , _scroll(base::make_unique_q<Ui::ScrollArea>(this, st::boxScroll))
@@ -253,8 +253,8 @@ EditCaptionBox::EditCaptionBox(
 , _initialText(std::move(text))
 , _initialList(std::move(list))
 , _saved(std::move(saved)) {
-	Expects(item->media() != nullptr);
-	Expects(item->media()->allowsEditCaption());
+	Expects(!_initialList.files.empty());
+	Expects(!item->media() || item->media()->allowsEditCaption());
 
 	_mediaEditManager.start(item, spoilered, invertCaption);
 
@@ -422,7 +422,8 @@ void EditCaptionBox::prepare() {
 	setInitialText();
 
 	if (!setPreparedList(std::move(_initialList))) {
-		rebuildPreview();
+		crl::on_main(this, [=] { closeBox(); });
+		return;
 	}
 	setupEditEventHandler();
 	SetupShadowsToScrollContent(this, _scroll, _contentHeight.events());
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 25e4852a6..a7da478ef 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1074,6 +1074,13 @@ historyReplaceMedia: IconButton(historyAttach) {
 		color: lightButtonBgOver;
 	}
 }
+historyAddMedia: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_attach", windowBgActive }};
+	iconOver: icon {{ "chat/input_attach", windowBgActive }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: lightButtonBgOver;
+	}
+}
 
 historyAttachEmojiActive: icon {{ "chat/input_smile_face", windowBgActive }};
 historyEmojiCircle: size(20px, 20px);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index ec57dee50..ddb539d82 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1470,12 +1470,10 @@ void HistoryItem::returnSavedMedia() {
 }
 
 void HistoryItem::savePreviousMedia() {
-	Expects(_media != nullptr);
-
 	AddComponents(HistoryMessageSavedMediaData::Bit());
 	const auto data = Get<HistoryMessageSavedMediaData>();
 	data->text = originalText();
-	data->media = _media->clone(this);
+	data->media = _media ? _media->clone(this) : nullptr;
 }
 
 bool HistoryItem::isEditingMedia() const {
@@ -2231,6 +2229,10 @@ bool HistoryItem::allowsEdit(TimeId now) const {
 		&& !isEditingMedia();
 }
 
+bool HistoryItem::allowsEditMedia() const {
+	return !_media || _media->allowsEditMedia();
+}
+
 bool HistoryItem::canBeEdited() const {
 	if ((!isRegular() && !isScheduled() && !isBusinessShortcut())
 		|| Has<HistoryMessageVia>()
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index bab7f4d7c..169295c92 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -431,6 +431,7 @@ public:
 	[[nodiscard]] bool allowsSendNow() const;
 	[[nodiscard]] bool allowsForward() const;
 	[[nodiscard]] bool allowsEdit(TimeId now) const;
+	[[nodiscard]] bool allowsEditMedia() const;
 	[[nodiscard]] bool canDelete() const;
 	[[nodiscard]] bool canDeleteForEveryone(TimeId now) const;
 	[[nodiscard]] bool suggestReport() const;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 6036cd685..a6c6450e7 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2312,7 +2312,7 @@ void HistoryWidget::showHistory(
 	_processingReplyItem = _replyEditMsg = nullptr;
 	_processingReplyTo = _replyTo = FullReplyTo();
 	_editMsgId = MsgId();
-	_canReplaceMedia = false;
+	_canReplaceMedia = _canAddMedia = false;
 	_photoEditMedia = nullptr;
 	updateReplaceMediaButton();
 	_fieldBarCancel->hide();
@@ -2700,7 +2700,7 @@ void HistoryWidget::setEditMsgId(MsgId msgId) {
 	_editMsgId = msgId;
 	if (!msgId) {
 		_mediaEditManager.cancel();
-		_canReplaceMedia = false;
+		_canReplaceMedia = _canAddMedia = false;
 		if (_preview) {
 			_preview->setDisabled(false);
 		}
@@ -2756,14 +2756,16 @@ void HistoryWidget::clearAllLoadRequests() {
 }
 
 bool HistoryWidget::updateReplaceMediaButton() {
-	if (!_canReplaceMedia) {
+	if (!_canReplaceMedia && !_canAddMedia) {
 		const auto result = (_replaceMedia != nullptr);
 		_replaceMedia.destroy();
 		return result;
 	} else if (_replaceMedia) {
 		return false;
 	}
-	_replaceMedia.create(this, st::historyReplaceMedia);
+	_replaceMedia.create(
+		this,
+		_canReplaceMedia ? st::historyReplaceMedia : st::historyAddMedia);
 	const auto hideDuration = st::historyReplaceMedia.ripple.hideDuration;
 	_replaceMedia->setClickedCallback([=] {
 		base::call_delayed(hideDuration, this, [=] {
@@ -5712,7 +5714,7 @@ bool HistoryWidget::confirmSendingFiles(
 		Ui::PreparedList &&list,
 		const QString &insertTextOnCancel) {
 	if (_editMsgId) {
-		if (_canReplaceMedia) {
+		if (_canReplaceMedia || _canAddMedia) {
 			EditCaptionBox::StartMediaReplace(
 				controller(),
 				{ _history->peer->id, _editMsgId },
@@ -8002,7 +8004,7 @@ void HistoryWidget::cancelEdit() {
 		return;
 	}
 
-	_canReplaceMedia = false;
+	_canReplaceMedia = _canAddMedia = false;
 	_photoEditMedia = nullptr;
 	updateReplaceMediaButton();
 	_replyEditMsg = nullptr;
@@ -8357,7 +8359,16 @@ void HistoryWidget::updateReplyEditTexts(bool force) {
 		if (_editMsgId && _replyEditMsg) {
 			_mediaEditManager.start(_replyEditMsg);
 		}
-		_canReplaceMedia = editMedia && editMedia->allowsEditMedia();
+		_canReplaceMedia = _editMsgId && _replyEditMsg->allowsEditMedia();
+		if (editMedia) {
+			_canAddMedia = false;
+		} else {
+			_canAddMedia = base::take(_canReplaceMedia);
+		}
+		if (_canReplaceMedia || _canAddMedia) {
+			// Invalidate the button, maybe icon has changed.
+			_replaceMedia.destroy();
+		}
 		_photoEditMedia = (_canReplaceMedia
 			&& editMedia->photo()
 			&& !editMedia->photo()->isNull())
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 17e836beb..ec06c0bd6 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -662,6 +662,7 @@ private:
 	MsgId _editMsgId = 0;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
 	bool _canReplaceMedia = false;
+	bool _canAddMedia = false;
 	HistoryView::MediaEditManager _mediaEditManager;
 
 	HistoryItem *_replyEditMsg = nullptr;
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 4314f738c..acef28096 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1153,7 +1153,7 @@ void ComposeControls::setMimeDataHook(MimeDataHook hook) {
 bool ComposeControls::confirmMediaEdit(Ui::PreparedList &list) {
 	if (!isEditingMessage() || !_regularWindow) {
 		return false;
-	} else if (_canReplaceMedia) {
+	} else if (_canReplaceMedia || _canAddMedia) {
 		const auto queryToEdit = _header->queryToEdit();
 		EditCaptionBox::StartMediaReplace(
 			_regularWindow,
@@ -1944,7 +1944,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 			_preview->apply({ .removed = true });
 			_preview->setDisabled(false);
 		}
-		_canReplaceMedia = false;
+		_canReplaceMedia = _canAddMedia = false;
 		_photoEditMedia = nullptr;
 		return;
 	}
@@ -1964,7 +1964,16 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		const auto resolve = [=] {
 			if (const auto item = _history->owner().message(editingId)) {
 				const auto media = item->media();
-				_canReplaceMedia = media && media->allowsEditMedia();
+				_canReplaceMedia = item->allowsEditMedia();
+				if (media) {
+					_canAddMedia = false;
+				} else {
+					_canAddMedia = base::take(_canReplaceMedia);
+				}
+				if (_canReplaceMedia || _canAddMedia) {
+					// Invalidate the button, maybe icon has changed.
+					_replaceMedia = nullptr;
+				}
 				_photoEditMedia = (_canReplaceMedia
 					&& _regularWindow
 					&& media->photo()
@@ -1985,7 +1994,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 				}
 				return true;
 			}
-			_canReplaceMedia = false;
+			_canReplaceMedia = _canAddMedia = false;
 			_photoEditMedia = nullptr;
 			_header->editMessage(editingId, false);
 			return false;
@@ -2006,7 +2015,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		}
 		_header->replyToMessage({});
 	} else {
-		_canReplaceMedia = false;
+		_canReplaceMedia = _canAddMedia = false;
 		_photoEditMedia = nullptr;
 		_header->replyToMessage(draft->reply);
 		if (_header->replyingToMessage()) {
@@ -2931,7 +2940,7 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 }
 
 bool ComposeControls::updateReplaceMediaButton() {
-	if (!_canReplaceMedia || !_regularWindow) {
+	if ((!_canReplaceMedia && !_canAddMedia) || !_regularWindow) {
 		const auto result = (_replaceMedia != nullptr);
 		_replaceMedia = nullptr;
 		return result;
@@ -2940,7 +2949,7 @@ bool ComposeControls::updateReplaceMediaButton() {
 	}
 	_replaceMedia = std::make_unique<Ui::IconButton>(
 		_wrap.get(),
-		st::historyReplaceMedia);
+		_canReplaceMedia ? st::historyReplaceMedia : st::historyAddMedia);
 	const auto hideDuration = st::historyReplaceMedia.ripple.hideDuration;
 	_replaceMedia->setClickedCallback([=] {
 		base::call_delayed(hideDuration, _wrap.get(), [=] {
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 91e7e9d27..f1da1fa6e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -444,6 +444,7 @@ private:
 	FullMsgId _editingId;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
 	bool _canReplaceMedia = false;
+	bool _canAddMedia = false;
 
 	std::unique_ptr<Controls::WebpageProcessor> _preview;
 
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 35fbc2134..45ababebc 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
@@ -29,6 +29,7 @@ void MediaEditManager::start(
 		std::optional<bool> invertCaption) {
 	const auto media = item->media();
 	if (!media) {
+		cancel();
 		return;
 	}
 	_item = item;

From 7ee2e3d8bcf645e4c19a88a72d8a70ab1ccfa0fa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Oct 2024 09:31:03 +0400
Subject: [PATCH 056/306] Support hashtags with mentions.

---
 .../data/data_message_reaction_id.cpp         | 19 +++++++++++++++++++
 .../data/data_message_reaction_id.h           |  7 +++++++
 Telegram/SourceFiles/mainwidget.cpp           | 10 ++++++++++
 .../SourceFiles/storage/storage_account.cpp   |  4 +++-
 .../window/window_session_controller.cpp      |  2 ++
 .../window_session_controller_link_info.h     |  1 +
 6 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_message_reaction_id.cpp b/Telegram/SourceFiles/data/data_message_reaction_id.cpp
index 1deac2bbb..b4a34a7d3 100644
--- a/Telegram/SourceFiles/data/data_message_reaction_id.cpp
+++ b/Telegram/SourceFiles/data/data_message_reaction_id.cpp
@@ -40,6 +40,25 @@ std::vector<ReactionId> SearchTagsFromQuery(
 	return result;
 }
 
+HashtagWithUsername HashtagWithUsernameFromQuery(QStringView query) {
+	const auto match = TextUtilities::RegExpHashtag(true).match(query);
+	if (match.hasMatch()) {
+		const auto username = match.capturedView(2).mid(1).toString();
+		const auto offset = int(match.capturedLength(1));
+		const auto full = int(query.size());
+		const auto length = full
+			- int(username.size())
+			- 1
+			- offset
+			- int(match.capturedLength(3));
+		if (!username.isEmpty() && length > 0 && offset + length <= full) {
+			const auto hashtag = query.mid(offset, length).toString();
+			return { hashtag, username };
+		}
+	}
+	return {};
+}
+
 QString ReactionEntityData(const ReactionId &id) {
 	if (id.empty()) {
 		return {};
diff --git a/Telegram/SourceFiles/data/data_message_reaction_id.h b/Telegram/SourceFiles/data/data_message_reaction_id.h
index c624ef865..5462ba65e 100644
--- a/Telegram/SourceFiles/data/data_message_reaction_id.h
+++ b/Telegram/SourceFiles/data/data_message_reaction_id.h
@@ -65,6 +65,13 @@ struct MessageReaction {
 [[nodiscard]] std::vector<ReactionId> SearchTagsFromQuery(
 	const QString &query);
 
+struct HashtagWithUsername {
+	QString hashtag;
+	QString username;
+};
+[[nodiscard]] HashtagWithUsername HashtagWithUsernameFromQuery(
+	QStringView query);
+
 [[nodiscard]] QString ReactionEntityData(const ReactionId &id);
 
 [[nodiscard]] ReactionId ReactionFromMTP(const MTPReaction &reaction);
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 909415988..ded80eb6d 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -43,6 +43,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_history_hider.h"
 #include "window/window_controller.h"
 #include "window/window_peer_menu.h"
+#include "window/window_session_controller_link_info.h"
 #include "window/themes/window_theme.h"
 #include "chat_helpers/bot_command.h"
 #include "chat_helpers/tabbed_selector.h" // TabbedSelector::refreshStickers
@@ -744,6 +745,15 @@ void MainWidget::hideSingleUseKeyboard(FullMsgId replyToId) {
 }
 
 void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
+	const auto complex = Data::HashtagWithUsernameFromQuery(query);
+	if (!complex.username.isEmpty()) {
+		_controller->showPeerByLink(Window::PeerByLinkInfo{
+			.usernameOrId = complex.username,
+			.text = complex.hashtag,
+			.resolveType = Window::ResolveType::HashtagSearch,
+		});
+		return;
+	}
 	auto tags = Data::SearchTagsFromQuery(query);
 	if (_dialogs) {
 		auto state = Dialogs::SearchState{
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index 5af0677c5..031e61e53 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -2722,7 +2722,9 @@ std::optional<RecentHashtagPack> Account::saveRecentHashtags(
 	auto found = false;
 	auto m = QRegularExpressionMatch();
 	auto recent = getPack();
-	for (auto i = 0, next = 0; (m = TextUtilities::RegExpHashtag(false).match(text, i)).hasMatch(); i = next) {
+	for (auto i = 0, next = 0
+		; (m = TextUtilities::RegExpHashtag(false).match(text, i)).hasMatch()
+		; i = next) {
 		i = m.capturedStart();
 		next = m.capturedEnd();
 		if (m.hasMatch()) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 1442bb90f..f46d7a4d1 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -580,6 +580,8 @@ void SessionNavigation::showPeerByLinkResolved(
 			params);
 	} else if (resolveType == ResolveType::Profile) {
 		showPeerInfo(peer, params);
+	} else if (resolveType == ResolveType::HashtagSearch) {
+		searchMessages(info.text, peer->owner().history(peer));
 	} else if (peer->isForum() && resolveType != ResolveType::Boost) {
 		const auto itemId = info.messageId;
 		if (!itemId) {
diff --git a/Telegram/SourceFiles/window/window_session_controller_link_info.h b/Telegram/SourceFiles/window/window_session_controller_link_info.h
index d64d82c53..329dc4d65 100644
--- a/Telegram/SourceFiles/window/window_session_controller_link_info.h
+++ b/Telegram/SourceFiles/window/window_session_controller_link_info.h
@@ -19,6 +19,7 @@ enum class ResolveType {
 	BotStart,
 	AddToGroup,
 	AddToChannel,
+	HashtagSearch,
 	ShareGame,
 	Mention,
 	Boost,

From f2a92c9122805991855c8da8a83658e3c80db489 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Oct 2024 12:48:02 +0400
Subject: [PATCH 057/306] Update API scheme to layer 191. Sold out gifts.

---
 Telegram/Resources/langs/lang.strings         |  5 ++
 Telegram/SourceFiles/api/api_premium.cpp      |  4 +-
 Telegram/SourceFiles/api/api_premium.h        |  8 +-
 .../SourceFiles/boxes/gift_premium_box.cpp    | 43 +++++++++--
 Telegram/SourceFiles/boxes/star_gift_box.cpp  | 75 ++++++++++++-------
 Telegram/SourceFiles/data/data_credits.h      |  3 +
 .../peer_gifts/info_peer_gifts_common.cpp     | 14 ++--
 .../info/peer_gifts/info_peer_gifts_common.h  |  8 +-
 .../peer_gifts/info_peer_gifts_widget.cpp     |  6 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  4 +-
 .../settings/settings_credits_graphics.cpp    | 26 ++++---
 11 files changed, 129 insertions(+), 67 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6ffd7dd8f..966b61072 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2444,6 +2444,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_box_history_entry_giveaway_name" = "Received Prize";
 "lng_credits_box_history_entry_gift_sent" = "Sent Gift";
 "lng_credits_box_history_entry_gift_converted" = "Converted Gift";
+"lng_credits_box_history_entry_gift_unavailable" = "Unavailable";
+"lng_credits_box_history_entry_gift_sold_out" = "This gift has sold out";
 "lng_credits_box_history_entry_gift_out_about" = "With Stars, **{user}** will be able to unlock content and services on Telegram.\n{link}";
 "lng_credits_box_history_entry_gift_in_about" = "Use Stars to unlock content and services on Telegram. {link}";
 "lng_credits_box_history_entry_gift_about_link" = "See Examples {emoji}";
@@ -2990,6 +2992,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_link_reason_unclaimed" = "Incomplete Giveaway";
 "lng_gift_link_reason_chosen" = "You were selected by the channel";
 "lng_gift_link_label_date" = "Date";
+"lng_gift_link_label_first_sale" = "First Sale";
+"lng_gift_link_label_last_sale" = "Last Sale";
+"lng_gift_link_label_value" = "Value";
 "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";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 84ce45783..4328f04ce 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -776,6 +776,8 @@ std::optional<StarGift> FromTL(
 		.document = document,
 		.limitedLeft = remaining.value_or_empty(),
 		.limitedCount = total.value_or_empty(),
+		.firstSaleDate = data.vfirst_sale_date().value_or_empty(),
+		.lastSaleDate = data.vlast_sale_date().value_or_empty(),
 	};
 }
 
@@ -789,7 +791,7 @@ std::optional<UserStarGift> FromTL(
 		return {};
 	}
 	return UserStarGift{
-		.gift = std::move(*parsed),
+		.info = std::move(*parsed),
 		.message = (data.vmessage()
 			? TextWithEntities{
 				.text = qs(data.vmessage()->data().vtext()),
diff --git a/Telegram/SourceFiles/api/api_premium.h b/Telegram/SourceFiles/api/api_premium.h
index 805b68e03..f0567cbe0 100644
--- a/Telegram/SourceFiles/api/api_premium.h
+++ b/Telegram/SourceFiles/api/api_premium.h
@@ -80,10 +80,16 @@ struct StarGift {
 	not_null<DocumentData*> document;
 	int limitedLeft = 0;
 	int limitedCount = 0;
+	TimeId firstSaleDate = 0;
+	TimeId lastSaleDate = 0;
+
+	friend inline bool operator==(
+		const StarGift &,
+		const StarGift &) = default;
 };
 
 struct UserStarGift {
-	StarGift gift;
+	StarGift info;
 	TextWithEntities message;
 	int64 convertStars = 0;
 	PeerId fromId = 0;
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index fd640e496..0c5f66faf 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -213,11 +213,14 @@ void AddTableRow(
 not_null<Ui::FlatLabel*> AddTableRow(
 		not_null<Ui::TableLayout*> table,
 		rpl::producer<QString> label,
-		rpl::producer<TextWithEntities> value) {
+		rpl::producer<TextWithEntities> value,
+		const Fn<std::any(Fn<void()>)> &makeContext = nullptr) {
 	auto widget = object_ptr<Ui::FlatLabel>(
 		table,
 		std::move(value),
-		st::giveawayGiftCodeValue);
+		st::giveawayGiftCodeValue,
+		st::defaultPopupMenu,
+		std::move(makeContext));
 	const auto result = widget.data();
 	AddTableRow(
 		table,
@@ -946,19 +949,49 @@ void AddStarGiftTable(
 			st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
 	const auto peerId = PeerId(entry.barePeerId);
+	const auto session = &controller->session();
+	const auto makeContext = [session](Fn<void()> update) {
+		return Core::MarkedTextContext{
+			.session = session,
+			.customEmojiRepaint = std::move(update),
+		};
+	};
 	if (peerId) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_peer_in(),
 			controller,
 			peerId);
-	} else {
+	} else if (!entry.soldOutInfo) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_peer_in(),
 			MakeHiddenPeerTableValue(table, controller),
 			st::giveawayGiftCodePeerMargin);
 	}
+	if (!entry.firstSaleDate.isNull()) {
+		AddTableRow(
+			table,
+			tr::lng_gift_link_label_first_sale(),
+			rpl::single(Ui::Text::WithEntities(
+				langDateTime(entry.firstSaleDate))));
+	}
+	if (!entry.lastSaleDate.isNull()) {
+		AddTableRow(
+			table,
+			tr::lng_gift_link_label_last_sale(),
+			rpl::single(Ui::Text::WithEntities(
+				langDateTime(entry.lastSaleDate))));
+	}
+	{
+		auto star = session->data().customEmojiManager().creditsEmoji();
+		AddTableRow(
+			table,
+			tr::lng_gift_link_label_value(),
+			rpl::single(
+				star.append(Lang::FormatCountDecimal(entry.credits))),
+			makeContext);
+	}
 	if (!entry.date.isNull()) {
 		AddTableRow(
 			table,
@@ -967,14 +1000,14 @@ void AddStarGiftTable(
 	}
 	if (entry.limitedCount > 0) {
 		auto amount = rpl::single(TextWithEntities{
-			QString::number(entry.limitedCount)
+			Lang::FormatCountDecimal(entry.limitedCount)
 		});
 		AddTableRow(
 			table,
 			tr::lng_gift_availability(),
 			((entry.limitedLeft > 0)
 				? tr::lng_gift_availability_left(
-					lt_count,
+					lt_count_decimal,
 					rpl::single(entry.limitedLeft * 1.),
 					lt_amount,
 					std::move(amount),
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 5a863f605..6c8203934 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/event_filter.h"
 #include "base/random.h"
+#include "base/unixtime.h"
 #include "api/api_premium.h"
 #include "boxes/peer_list_controllers.h"
 #include "boxes/send_credits_box.h"
@@ -19,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "core/ui_integration.h"
+#include "data/data_credits.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_session.h"
@@ -40,6 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_non_panel_process.h"
 #include "settings/settings_credits.h"
+#include "settings/settings_credits_graphics.h"
 #include "settings/settings_premium.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
@@ -213,7 +216,7 @@ auto GenerateGiftMedia(
 			return tr::lng_action_gift_got_stars_text(
 				tr::now,
 				lt_count,
-				gift.convertStars,
+				gift.info.convertStars,
 				Ui::Text::RichLangValue);
 		});
 		auto description = data.text.empty()
@@ -280,7 +283,7 @@ void ShowSentToast(
 		return tr::lng_gift_sent_about(
 			tr::now,
 			lt_count,
-			gift.stars,
+			gift.info.stars,
 			Ui::Text::RichLangValue);
 	});
 	const auto strong = window->showToast({
@@ -338,7 +341,10 @@ void PreviewWrap::prepare(rpl::producer<GiftDetails> details) {
 		const auto cost = v::match(descriptor, [&](GiftTypePremium data) {
 			return FillAmountAndCurrency(data.cost, data.currency, true);
 		}, [&](GiftTypeStars data) {
-			return tr::lng_gift_stars_title(tr::now, lt_count, data.stars);
+			return tr::lng_gift_stars_title(
+				tr::now,
+				lt_count,
+				data.info.stars);
 		});
 		const auto text = tr::lng_action_gift_received(
 			tr::now,
@@ -508,14 +514,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 			const auto &gifts = api->starGifts();
 			list.reserve(gifts.size());
 			for (auto &gift : gifts) {
-				list.push_back({
-					.id = gift.id,
-					.stars = gift.stars,
-					.convertStars = gift.convertStars,
-					.document = gift.document,
-					.limitedCount = gift.limitedCount,
-					.limitedLeft = gift.limitedLeft,
-				});
+				list.push_back({ .info = gift });
 			}
 			auto &map = Map[session];
 			if (map.last != list) {
@@ -587,7 +586,8 @@ struct GiftPriceTabs {
 		auto sameKey = 0;
 		for (const auto &gift : gifts) {
 			if (same) {
-				const auto key = gift.stars * (gift.limitedCount ? -1 : 1);
+				const auto key = gift.info.stars
+					* (gift.info.limitedCount ? -1 : 1);
 				if (!sameKey) {
 					sameKey = key;
 				} else if (sameKey != key) {
@@ -595,12 +595,12 @@ struct GiftPriceTabs {
 				}
 			}
 
-			if (gift.limitedCount
+			if (gift.info.limitedCount
 				&& (result.size() < 2 || result[1] != kPriceTabLimited)) {
 				result.insert(begin(result) + 1, kPriceTabLimited);
 			}
-			if (!ranges::contains(result, gift.stars)) {
-				result.push_back(gift.stars);
+			if (!ranges::contains(result, gift.info.stars)) {
+				result.push_back(gift.info.stars);
 			}
 		}
 		if (same) {
@@ -838,16 +838,38 @@ void SendGift(
 		const auto processNonPanelPaymentFormFactory
 			= Payments::ProcessNonPanelPaymentFormFactory(window, done);
 		Payments::CheckoutProcess::Start(Payments::InvoiceStarGift{
-			.giftId = gift.id,
+			.giftId = gift.info.id,
 			.randomId = details.randomId,
 			.message = details.text,
 			.user = peer->asUser(),
-			.limitedCount = gift.limitedCount,
+			.limitedCount = gift.info.limitedCount,
 			.anonymous = details.anonymous,
 		}, done, processNonPanelPaymentFormFactory);
 	});
 }
 
+void SoldOutBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> window,
+		const GiftTypeStars &gift) {
+	Settings::ReceiptCreditsBox(
+		box,
+		window,
+		Data::CreditsHistoryEntry{
+			.firstSaleDate = base::unixtime::parse(gift.info.firstSaleDate),
+			.lastSaleDate = base::unixtime::parse(gift.info.lastSaleDate),
+			.credits = uint64(gift.info.stars),
+			.bareGiftStickerId = gift.info.document->id,
+			.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
+			.limitedCount = gift.info.limitedCount,
+			.limitedLeft = gift.info.limitedLeft,
+			.soldOutInfo = true,
+			.gift = true,
+		},
+		Data::SubscriptionEntry());
+
+}
+
 void SendGiftBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Window::SessionController*> window,
@@ -873,7 +895,7 @@ void SendGiftBox(
 			};
 		}, [&](const GiftTypeStars &data) {
 			return Ui::CreditsEmojiSmall(session).append(
-				Lang::FormatCountDecimal(std::abs(data.stars)));
+				Lang::FormatCountDecimal(std::abs(data.info.stars)));
 		});
 	}());
 
@@ -1076,15 +1098,10 @@ void SendGiftBox(
 
 			button->setClickedCallback([=] {
 				const auto star = std::get_if<GiftTypeStars>(&descriptor);
-				if (star && star->limitedCount && !star->limitedLeft) {
-					window->showToast({
-						.title = tr::lng_gift_sold_out_title(tr::now),
-						.text = tr::lng_gift_sold_out_text(
-							tr::now,
-							lt_count_decimal,
-							star->limitedCount,
-							Ui::Text::RichLangValue),
-					});
+				if (star
+					&& star->info.limitedCount
+					&& !star->info.limitedLeft) {
+					window->show(Box(SoldOutBox, window, *star));
 				} else {
 					window->show(
 						Box(SendGiftBox, window, peer, api, descriptor));
@@ -1187,8 +1204,8 @@ void AddBlock(
 	) | rpl::map([=](std::vector<GiftTypeStars> &&gifts, int price) {
 		gifts.erase(ranges::remove_if(gifts, [&](const GiftTypeStars &gift) {
 			return (price == kPriceTabLimited)
-				? (!gift.limitedCount)
-				: (price && gift.stars != price);
+				? (!gift.info.limitedCount)
+				: (price && gift.info.stars != price);
 		}), end(gifts));
 		return GiftsDescriptor{
 			gifts | ranges::to<std::vector<GiftDescriptor>>(),
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 3397cf7ea..3f865b246 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -52,6 +52,8 @@ struct CreditsHistoryEntry final {
 	QString title;
 	TextWithEntities description;
 	QDateTime date;
+	QDateTime firstSaleDate;
+	QDateTime lastSaleDate;
 	PhotoId photoId = 0;
 	std::vector<CreditsHistoryMedia> extended;
 	uint64 credits = 0;
@@ -70,6 +72,7 @@ struct CreditsHistoryEntry final {
 	bool anonymous = false;
 	bool savedToProfile = false;
 	bool fromGiftsList = false;
+	bool soldOutInfo = false;
 	bool reaction = false;
 	bool refunded = false;
 	bool pending = false;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 7d1f5cebe..ebf27afcf 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -86,12 +86,12 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor) {
 			{ 1., st::windowActiveTextFg->c },
 		});
 	}, [&](const GiftTypeStars &data) {
-		const auto soldOut = data.limitedCount
+		const auto soldOut = data.info.limitedCount
 			&& !data.userpic
-			&& !data.limitedLeft;
+			&& !data.info.limitedLeft;
 		_price.setMarkedText(
 			st::semiboldTextStyle,
-			_delegate->star().append(' ' + QString::number(data.stars)),
+			_delegate->star().append(' ' + QString::number(data.info.stars)),
 			kMarkupTextOptions,
 			_delegate->textContext());
 		_userpic = !data.userpic
@@ -282,8 +282,8 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 		}
 		return QString();
 	}, [&](const GiftTypeStars &data) {
-		if (const auto count = data.limitedCount) {
-			const auto soldOut = !data.userpic && !data.limitedLeft;
+		if (const auto count = data.info.limitedCount) {
+			const auto soldOut = !data.userpic && !data.info.limitedLeft;
 			p.setBrush(soldOut
 				? st::attentionButtonFg
 				: st::windowActiveTextFg);
@@ -463,9 +463,7 @@ DocumentData *LookupGiftSticker(
 	return v::match(descriptor, [&](GiftTypePremium data) {
 		return packs.lookup(data.months);
 	}, [&](GiftTypeStars data) {
-		return data.document
-			? data.document
-			: packs.lookup(packs.monthsForStars(data.stars));
+		return data.info.document.get();
 	});
 }
 
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index 47f591e05..f8e094e1b 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "api/api_premium.h"
 #include "ui/abstract_button.h"
 #include "ui/effects/premium_stars_colored.h"
 #include "ui/text/text.h"
@@ -43,13 +44,8 @@ struct GiftTypePremium {
 };
 
 struct GiftTypeStars {
-	uint64 id = 0;
-	int64 stars = 0;
-	int64 convertStars = 0;
-	DocumentData *document = nullptr;
+	Api::StarGift info;
 	PeerData *from = nullptr;
-	int limitedCount = 0;
-	int limitedLeft = 0;
 	bool userpic = false;
 	bool hidden = false;
 	bool mine = false;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 46ec0f1d7..722752f2d 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -34,14 +34,10 @@ constexpr auto kPerPage = 50;
 		not_null<UserData*> to,
 		const Api::UserStarGift &gift) {
 	return GiftTypeStars{
-		.id = gift.gift.id,
-		.stars = gift.gift.stars,
-		.convertStars = gift.gift.convertStars,
-		.document = gift.gift.document,
+		.info = gift.info,
 		.from = ((gift.anonymous || !gift.fromId)
 			? nullptr
 			: to->owner().peer(gift.fromId).get()),
-		.limitedCount = gift.gift.limitedCount,
 		.userpic = true,
 		.hidden = gift.hidden,
 		.mine = to->isSelf(),
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 72acb3884..ebd69c454 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1862,7 +1862,7 @@ starsGiveawayOption#94ce852a flags:# extended:flags.0?true default:flags.1?true
 
 starsGiveawayWinnersOption#54236209 flags:# default:flags.0?true users:int per_user_stars:long = StarsGiveawayWinnersOption;
 
-starGift#aea174ee flags:# limited:flags.0?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int convert_stars:long = StarGift;
+starGift#49c577cd flags:# limited:flags.0?true sold_out:flags.1?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int = StarGift;
 
 payments.starGiftsNotModified#a388a368 = payments.StarGifts;
 payments.starGifts#901689ea hash:int gifts:Vector<StarGift> = payments.StarGifts;
@@ -2565,4 +2565,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 190
+// LAYER 191
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 7e813cf10..c7463400b 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -731,7 +731,7 @@ void ReceiptCreditsBox(
 		const Data::SubscriptionEntry &s) {
 	const auto item = controller->session().data().message(
 		PeerId(e.barePeerId), MsgId(e.bareMsgId));
-	const auto isStarGift = (e.convertStars > 0);
+	const auto isStarGift = (e.convertStars > 0) || e.soldOutInfo;
 	const auto creditsHistoryStarGift = isStarGift && !e.id.isEmpty();
 	const auto sentStarGift = creditsHistoryStarGift && !e.in;
 	const auto convertedStarGift = creditsHistoryStarGift && e.converted;
@@ -880,6 +880,8 @@ void ReceiptCreditsBox(
 				? tr::lng_credits_box_history_entry_subscription(tr::now)
 				: !e.title.isEmpty()
 				? e.title
+				: e.soldOutInfo
+				? tr::lng_credits_box_history_entry_gift_unavailable(tr::now)
 				: sentStarGift
 				? tr::lng_credits_box_history_entry_gift_sent(tr::now)
 				: convertedStarGift
@@ -920,7 +922,11 @@ void ReceiptCreditsBox(
 			.session = session,
 			.customEmojiRepaint = [=] { amount->update(); },
 		};
-		if (s) {
+		if (e.soldOutInfo) {
+			text->setText(
+				st::defaultTextStyle,
+				tr::lng_credits_box_history_entry_gift_sold_out(tr::now));
+		} else if (s) {
 			text->setMarkedText(
 				st::defaultTextStyle,
 				tr::lng_credits_subscription_subtitle(
@@ -960,7 +966,9 @@ void ReceiptCreditsBox(
 		amount->paintRequest(
 		) | rpl::start_with_next([=] {
 			auto p = Painter(amount);
-			p.setPen(s
+			p.setPen(e.soldOutInfo
+				? st::menuIconAttentionColor
+				: s
 				? st::windowSubTextFg
 				: e.pending
 				? st::creditsStroke
@@ -1424,16 +1432,14 @@ void UserStarGiftBox(
 		Data::CreditsHistoryEntry{
 			.description = data.message,
 			.date = base::unixtime::parse(data.date),
-			.credits = uint64(data.gift.stars),
+			.credits = uint64(data.info.stars),
 			.bareMsgId = uint64(data.messageId.bare),
 			.barePeerId = data.fromId.value,
-			.bareGiftStickerId = (data.gift.document
-				? data.gift.document->id
-				: 0),
+			.bareGiftStickerId = data.info.document->id,
 			.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
-			.limitedCount = data.gift.limitedCount,
-			.limitedLeft = data.gift.limitedLeft,
-			.convertStars = int(data.gift.convertStars),
+			.limitedCount = data.info.limitedCount,
+			.limitedLeft = data.info.limitedLeft,
+			.convertStars = int(data.info.convertStars),
 			.converted = false,
 			.anonymous = data.anonymous,
 			.savedToProfile = !data.hidden,

From 21f909dd4b772ab7bb88b2cca8fb09b4b780b5dc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Oct 2024 14:33:21 +0400
Subject: [PATCH 058/306] Improve star gift value table row.

---
 Telegram/SourceFiles/boxes/gift_premium_box.cpp             | 2 +-
 Telegram/SourceFiles/settings/settings_credits_graphics.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 0c5f66faf..1be6cbe8f 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -989,7 +989,7 @@ void AddStarGiftTable(
 			table,
 			tr::lng_gift_link_label_value(),
 			rpl::single(
-				star.append(Lang::FormatCountDecimal(entry.credits))),
+				star.append(' ' + Lang::FormatCountDecimal(entry.credits))),
 			makeContext);
 	}
 	if (!entry.date.isNull()) {
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index c7463400b..dc24d4329 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -897,7 +897,7 @@ void ReceiptCreditsBox(
 
 	Ui::AddSkip(content);
 
-	{
+	if (!isStarGift || creditsHistoryStarGift || e.soldOutInfo) {
 		constexpr auto kMinus = QChar(0x2212);
 		auto &lifetime = content->lifetime();
 		const auto text = lifetime.make_state<Ui::Text::String>();

From 36de2b6ca6ae0f0b64f0332e41803e94bc76f078 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Oct 2024 15:05:41 +0400
Subject: [PATCH 059/306] Improved received star gift box.

---
 Telegram/Resources/langs/lang.strings         |   3 +
 .../SourceFiles/boxes/gift_premium_box.cpp    | 129 +++++++++++++---
 Telegram/SourceFiles/boxes/gift_premium_box.h |   3 +-
 .../boosts/giveaway/giveaway.style            |  20 ++-
 .../settings/settings_credits_graphics.cpp    | 142 +++++++-----------
 5 files changed, 187 insertions(+), 110 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 966b61072..d0eb6dce5 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3061,6 +3061,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_sold_out_title" = "Sold Out!";
 "lng_gift_sold_out_text#one" = "All {count} gift was already sold.";
 "lng_gift_sold_out_text#other" = "All {count} gifts were already sold.";
+"lng_gift_send_small" = "send a gift";
+"lng_gift_sell_small#one" = "sell for {count} Star";
+"lng_gift_sell_small#other" = "sell for {count} Stars";
 
 "lng_accounts_limit_title" = "Limit Reached";
 "lng_accounts_limit1#one" = "You have reached the limit of **{count}** connected account.";
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 1be6cbe8f..3e792bbb6 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -16,6 +16,7 @@ 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 "boxes/star_gift_box.h" // ShowStarGiftBox.
 #include "data/data_boosts.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
@@ -123,7 +124,8 @@ namespace {
 [[nodiscard]] object_ptr<Ui::RpWidget> MakePeerTableValue(
 		not_null<QWidget*> parent,
 		not_null<Window::SessionNavigation*> controller,
-		PeerId id) {
+		PeerId id,
+		bool withSendGiftButton = false) {
 	auto result = object_ptr<Ui::AbstractButton>(parent);
 	const auto raw = result.data();
 
@@ -134,15 +136,40 @@ namespace {
 	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(raw, peer, st);
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		raw,
-		peer->name(),
+		withSendGiftButton ? peer->shortName() : peer->name(),
 		st::giveawayGiftCodeValue);
-	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	const auto send = withSendGiftButton
+		? Ui::CreateChild<Ui::RoundButton>(
+			raw,
+			tr::lng_gift_send_small(),
+			st::starGiftSmallButton)
+		: nullptr;
+	if (send) {
+		send->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+		send->setClickedCallback([=] {
+			Ui::ShowStarGiftBox(controller->parentController(), peer);
+		});
+	}
+	rpl::combine(
+		raw->widthValue(),
+		send ? send->widthValue() : rpl::single(0)
+	) | rpl::start_with_next([=](int width, int sendWidth) {
 		const auto position = st::giveawayGiftCodeNamePosition;
-		label->resizeToNaturalWidth(width - position.x());
+		const auto sendSkip = sendWidth
+			? (st::normalFont->spacew + sendWidth)
+			: 0;
+		label->resizeToNaturalWidth(width - position.x() - sendSkip);
 		label->moveToLeft(position.x(), position.y(), width);
 		const auto top = (raw->height() - userpic->height()) / 2;
 		userpic->moveToLeft(0, top, width);
+		if (send) {
+			send->moveToLeft(
+				position.x() + label->width() + st::normalFont->spacew,
+				(position.y()
+					+ st::giveawayGiftCodeValue.style.font->ascent
+					- st::starGiftSmallButton.style.font->ascent),
+				width);
+		}
 	}, label->lifetime());
 
 	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -210,6 +237,71 @@ void AddTableRow(
 		valueMargins);
 }
 
+object_ptr<Ui::RpWidget> MakeStarGiftStarsValue(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionNavigation*> controller,
+		const Data::CreditsHistoryEntry &entry,
+		Fn<void()> convertToStars) {
+	auto result = object_ptr<Ui::RpWidget>(parent);
+	const auto raw = result.data();
+
+	const auto session = &controller->session();
+	const auto makeContext = [session](Fn<void()> update) {
+		return Core::MarkedTextContext{
+			.session = session,
+			.customEmojiRepaint = std::move(update),
+		};
+	};
+	auto star = session->data().customEmojiManager().creditsEmoji();
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		rpl::single(
+			star.append(' ' + Lang::FormatCountDecimal(entry.credits))),
+		st::giveawayGiftCodeValue,
+		st::defaultPopupMenu,
+		std::move(makeContext));
+
+	const auto convert = convertToStars
+		? Ui::CreateChild<Ui::RoundButton>(
+			raw,
+			tr::lng_gift_sell_small(
+				lt_count_decimal,
+				rpl::single(entry.convertStars * 1.)),
+			st::starGiftSmallButton)
+		: nullptr;
+	if (convert) {
+		convert->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+		convert->setClickedCallback(std::move(convertToStars));
+	}
+	rpl::combine(
+		raw->widthValue(),
+		convert ? convert->widthValue() : rpl::single(0)
+	) | rpl::start_with_next([=](int width, int convertWidth) {
+		const auto convertSkip = convertWidth
+			? (st::normalFont->spacew + convertWidth)
+			: 0;
+		label->resizeToNaturalWidth(width - convertSkip);
+		label->moveToLeft(0, 0, width);
+		if (convert) {
+			convert->moveToLeft(
+				label->width() + st::normalFont->spacew,
+				(st::giveawayGiftCodeValue.style.font->ascent
+					- st::starGiftSmallButton.style.font->ascent),
+				width);
+		}
+	}, label->lifetime());
+
+	label->heightValue() | rpl::start_with_next([=](int height) {
+		raw->resize(
+			raw->width(),
+			height + st::giveawayGiftCodeValueMargin.bottom());
+	}, raw->lifetime());
+
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	return result;
+}
+
 not_null<Ui::FlatLabel*> AddTableRow(
 		not_null<Ui::TableLayout*> table,
 		rpl::producer<QString> label,
@@ -942,7 +1034,8 @@ void ResolveGiveawayInfo(
 void AddStarGiftTable(
 		not_null<Window::SessionNavigation*> controller,
 		not_null<Ui::VerticalLayout*> container,
-		const Data::CreditsHistoryEntry &entry) {
+		const Data::CreditsHistoryEntry &entry,
+		Fn<void()> convertToStars) {
 	auto table = container->add(
 		object_ptr<Ui::TableLayout>(
 			container,
@@ -950,18 +1043,13 @@ void AddStarGiftTable(
 		st::giveawayGiftCodeTableMargin);
 	const auto peerId = PeerId(entry.barePeerId);
 	const auto session = &controller->session();
-	const auto makeContext = [session](Fn<void()> update) {
-		return Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = std::move(update),
-		};
-	};
 	if (peerId) {
+		const auto withSendButton = entry.in;
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_peer_in(),
-			controller,
-			peerId);
+			MakePeerTableValue(table, controller, peerId, withSendButton),
+			st::giveawayGiftCodePeerMargin);
 	} else if (!entry.soldOutInfo) {
 		AddTableRow(
 			table,
@@ -984,13 +1072,17 @@ void AddStarGiftTable(
 				langDateTime(entry.lastSaleDate))));
 	}
 	{
-		auto star = session->data().customEmojiManager().creditsEmoji();
+		const auto margin = st::giveawayGiftCodeValueMargin
+			- QMargins(0, 0, 0, st::giveawayGiftCodeValueMargin.bottom());
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_value(),
-			rpl::single(
-				star.append(' ' + Lang::FormatCountDecimal(entry.credits))),
-			makeContext);
+			MakeStarGiftStarsValue(
+				table,
+				controller,
+				entry,
+				std::move(convertToStars)),
+			margin);
 	}
 	if (!entry.date.isNull()) {
 		AddTableRow(
@@ -1018,7 +1110,6 @@ void AddStarGiftTable(
 					Ui::Text::WithEntities)));
 	}
 	if (!entry.description.empty()) {
-		const auto session = &controller->session();
 		const auto makeContext = [=](Fn<void()> update) {
 			return Core::MarkedTextContext{
 				.session = session,
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.h b/Telegram/SourceFiles/boxes/gift_premium_box.h
index 31ca5fcf2..3a2c20498 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.h
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.h
@@ -57,7 +57,8 @@ void ResolveGiveawayInfo(
 void AddStarGiftTable(
 	not_null<Window::SessionNavigation*> controller,
 	not_null<Ui::VerticalLayout*> container,
-	const Data::CreditsHistoryEntry &entry);
+	const Data::CreditsHistoryEntry &entry,
+	Fn<void()> convertToStars);
 void AddCreditsHistoryEntryTable(
 	not_null<Window::SessionNavigation*> controller,
 	not_null<Ui::VerticalLayout*> container,
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
index d3fb04e8d..226da96f7 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
@@ -208,10 +208,24 @@ startGiveawayButtonLoading: InfiniteRadialAnimation(defaultInfiniteRadialAnimati
 	thickness: 2px;
 }
 
-starGiftBox: Box(giveawayGiftCodeBox) {
-	buttonPadding: margins(22px, 11px, 22px, 52px);
-}
 starConvertButtonLoading: InfiniteRadialAnimation(startGiveawayButtonLoading) {
 	color: windowActiveTextFg;
 	thickness: 2px;
 }
+
+starGiftSmallButton: RoundButton(defaultActiveButton) {
+	textFg: windowActiveTextFg;
+	textFgOver: windowActiveTextFg;
+	textBg: lightButtonBgOver;
+	textBgOver: lightButtonBgOver;
+	width: -12px;
+	height: 18px;
+	radius: 9px;
+	textTop: 0px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: lightButtonBgRipple;
+	}
+}
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index dc24d4329..326eb4837 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -743,7 +743,7 @@ void ReceiptCreditsBox(
 		: nullptr;
 	const auto canConvert = gotStarGift && !e.converted && starGiftSender;
 
-	box->setStyle(canConvert ? st::starGiftBox : st::giveawayGiftCodeBox);
+	box->setStyle(st::giveawayGiftCodeBox);
 	box->setNoContentMargin(true);
 
 	const auto content = box->verticalLayout();
@@ -1091,8 +1091,61 @@ void ReceiptCreditsBox(
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 
+	struct State final {
+		rpl::variable<bool> confirmButtonBusy;
+		rpl::variable<bool> convertButtonBusy;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	const auto weakWindow = base::make_weak(controller);
+
 	if (isStarGift && e.id.isEmpty()) {
-		AddStarGiftTable(controller, content, e);
+		const auto convert = [=, weak = Ui::MakeWeak(box)] {
+			const auto stars = e.convertStars;
+			const auto name = starGiftSender->shortName();
+			ConfirmConvertStarGift(box->uiShow(), name, stars, [=] {
+				if (state->convertButtonBusy.current()
+					|| state->confirmButtonBusy.current()) {
+					return;
+				}
+				state->convertButtonBusy = true;
+				const auto window = weakWindow.get();
+				const auto itemId = MsgId(e.bareMsgId);
+				if (window && stars) {
+					const auto done = [=](bool ok) {
+						if (const auto window = weakWindow.get()) {
+							if (ok) {
+								using GiftAction = Data::GiftUpdate::Action;
+								window->session().data().notifyGiftUpdate({
+									.itemId = FullMsgId(
+										starGiftSender->id,
+										itemId),
+									.action = GiftAction::Convert,
+								});
+							}
+						}
+						if (const auto strong = weak.data()) {
+							if (ok) {
+								strong->closeBox();
+							} else {
+								state->convertButtonBusy = false;
+							}
+						}
+					};
+					ConvertStarGift(
+						window,
+						starGiftSender,
+						itemId,
+						stars,
+						done);
+				}
+			});
+		};
+
+		AddStarGiftTable(
+			controller,
+			content,
+			e,
+			canConvert ? convert : Fn<void()>());
 	} else {
 		AddCreditsHistoryEntryTable(controller, content, e);
 		AddSubscriptionEntryTable(controller, content, s);
@@ -1175,11 +1228,6 @@ void ReceiptCreditsBox(
 	const auto toRenew = (s.cancelled || s.expired)
 		&& !s.inviteHash.isEmpty();
 	const auto toCancel = !toRenew && s;
-	struct State final {
-		rpl::variable<bool> confirmButtonBusy;
-		rpl::variable<bool> convertButtonBusy;
-	};
-	const auto state = box->lifetime().make_state<State>();
 	auto confirmText = rpl::conditional(
 		state->confirmButtonBusy.value(),
 		rpl::single(QString()),
@@ -1192,7 +1240,6 @@ void ReceiptCreditsBox(
 				? tr::lng_gift_display_on_page_hide()
 				: tr::lng_gift_display_on_page())
 			: tr::lng_box_ok()));
-	const auto weakWindow = base::make_weak(controller);
 	const auto send = [=, weak = Ui::MakeWeak(box)] {
 		if (canConvert) {
 			const auto save = !e.savedToProfile;
@@ -1290,85 +1337,6 @@ void ReceiptCreditsBox(
 	}) | rpl::start_with_next([=] {
 		button->resizeToWidth(buttonWidth);
 	}, button->lifetime());
-
-	if (canConvert) {
-		using namespace Ui;
-		auto convertText = rpl::conditional(
-			state->convertButtonBusy.value(),
-			rpl::single(QString()),
-			tr::lng_gift_convert_to_stars(
-				lt_count,
-				rpl::single(e.convertStars * 1.)));
-		const auto convert = CreateChild<RoundButton>(
-			button->parentWidget(),
-			std::move(convertText),
-			st::defaultLightButton);
-		convert->setTextTransform(RoundButton::TextTransform::NoTransform);
-		convert->widthValue() | rpl::filter([=] {
-			return convert->widthNoMargins() != buttonWidth;
-		}) | rpl::start_with_next([=] {
-			convert->resizeToWidth(buttonWidth);
-		}, convert->lifetime());
-		button->positionValue(
-		) | rpl::start_with_next([=](QPoint position) {
-			convert->move(
-				position.x(),
-				(position.y()
-					+ st::starGiftBox.buttonHeight
-					+ st::starGiftBox.buttonPadding.bottom()
-					- st::starGiftBox.buttonPadding.top()
-					- convert->height()));
-		}, convert->lifetime());
-		convert->setClickedCallback([=, weak = Ui::MakeWeak(box)] {
-			const auto stars = e.convertStars;
-			const auto name = starGiftSender->shortName();
-			ConfirmConvertStarGift(box->uiShow(), name, stars, [=] {
-				if (state->convertButtonBusy.current()
-					|| state->confirmButtonBusy.current()) {
-					return;
-				}
-				state->convertButtonBusy = true;
-				const auto window = weakWindow.get();
-				const auto itemId = MsgId(e.bareMsgId);
-				if (window && stars) {
-					const auto done = [=](bool ok) {
-						if (const auto window = weakWindow.get()) {
-							if (ok) {
-								using GiftAction = Data::GiftUpdate::Action;
-								window->session().data().notifyGiftUpdate({
-									.itemId = FullMsgId(
-										starGiftSender->id,
-										itemId),
-									.action = GiftAction::Convert,
-								});
-							}
-						}
-						if (const auto strong = weak.data()) {
-							if (ok) {
-								strong->closeBox();
-							} else {
-								state->convertButtonBusy = false;
-							}
-						}
-					};
-					ConvertStarGift(
-						window,
-						starGiftSender,
-						itemId,
-						stars,
-						done);
-				}
-			});
-		});
-
-		using namespace Info::Statistics;
-		const auto loadingAnimation = InfiniteRadialAnimationWidget(
-			convert,
-			convert->height() / 2,
-			&st::starConvertButtonLoading);
-		AddChildToWidgetCenter(convert, loadingAnimation);
-		loadingAnimation->showOn(state->convertButtonBusy.value());
-	}
 }
 
 void GiftedCreditsBox(

From 9166acbbb98bb52a201f41163c34349fa6bdf747 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Oct 2024 18:31:35 +0400
Subject: [PATCH 060/306] Improve gift convert confirmation.

---
 Telegram/Resources/langs/lang.strings         |  8 ++-
 Telegram/SourceFiles/main/main_app_config.cpp |  6 ++
 Telegram/SourceFiles/main/main_app_config.h   |  1 +
 .../settings/settings_credits_graphics.cpp    | 67 +++++++++++++------
 4 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d0eb6dce5..eb2555768 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1871,6 +1871,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_gift_got_subtitle" = "Gift from {user}";
 "lng_action_gift_got_stars_text#one" = "Display this gift on your page or convert it to **{count}** Star.";
 "lng_action_gift_got_stars_text#other" = "Display this gift on your page or convert it to **{count}** Stars.";
+"lng_action_gift_got_gift_text" = "You can keep this gift on your page.";
 "lng_action_gift_sent_subtitle" = "Gift for {user}";
 "lng_action_gift_sent_text#one" = "{user} can display this gift on their page or convert it to {count} Star.";
 "lng_action_gift_sent_text#other" = "{user} can display this gift on their page or convert it to {count} Stars.";
@@ -3051,8 +3052,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_convert_to_stars#one" = "Convert to {count} Star";
 "lng_gift_convert_to_stars#other" = "Convert to {count} Stars";
 "lng_gift_convert_sure_title" = "Convert Gift to Stars";
-"lng_gift_convert_sure_text#one" = "Do you want to convert this gift from {user} to **{count} Star**?\n\nThis action cannot be undone.";
-"lng_gift_convert_sure_text#other" = "Do you want to convert this gift from {user} to **{count} Stars**?\n\nThis action cannot be undone.";
+"lng_gift_convert_sure_confirm#one" = "Do you want to convert this gift from {user} to **{count} Star**?";
+"lng_gift_convert_sure_confirm#other" = "Do you want to convert this gift from {user} to **{count} Stars**?";
+"lng_gift_convert_sure_limit#one" = "Conversion is available for the next **{count} day**.";
+"lng_gift_convert_sure_limit#other" = "Conversion is available for the next **{count} days**.";
+"lng_gift_convert_sure_caution" = "This action cannot be undone. This will permanently destroy the gift.";
 "lng_gift_convert_sure" = "Convert";
 "lng_gift_display_done" = "The gift is now shown on your profile page.";
 "lng_gift_display_done_hide" = "The gift is now hidden from your profile page.";
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index dc5f6d51f..f325c8ea0 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -42,6 +42,12 @@ int AppConfig::quoteLengthMax() const {
 	return get<int>(u"quote_length_max"_q, 1024);
 }
 
+int AppConfig::stargiftConvertPeriodMax() const {
+	return get<int>(
+		u"stargifts_convert_period_max"_q,
+		_account->mtp().isTestMode() ? 300 : (90 * 86400));
+}
+
 void AppConfig::refresh(bool force) {
 	if (_requestId || !_api) {
 		if (force) {
diff --git a/Telegram/SourceFiles/main/main_app_config.h b/Telegram/SourceFiles/main/main_app_config.h
index fc02858a3..5768ad89a 100644
--- a/Telegram/SourceFiles/main/main_app_config.h
+++ b/Telegram/SourceFiles/main/main_app_config.h
@@ -64,6 +64,7 @@ public:
 	}
 
 	[[nodiscard]] int quoteLengthMax() const;
+	[[nodiscard]] int stargiftConvertPeriodMax() const;
 
 	void refresh(bool force = false);
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 326eb4837..7d106c73f 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -174,17 +174,17 @@ void ToggleStarGiftSaved(
 		sender->inputUser,
 		MTP_int(itemId.bare)
 	)).done([=] {
+		done(true);
 		if (const auto strong = weak.get()) {
 			strong->showToast((save
 				? tr::lng_gift_display_done
 				: tr::lng_gift_display_done_hide)(tr::now));
 		}
-		done(true);
 	}).fail([=](const MTP::Error &error) {
+		done(false);
 		if (const auto strong = weak.get()) {
 			strong->showToast(error.type());
 		}
-		done(false);
 	}).send();
 }
 
@@ -192,14 +192,28 @@ void ConfirmConvertStarGift(
 		std::shared_ptr<Ui::Show> show,
 		QString name,
 		int stars,
+		int daysLeft,
 		Fn<void()> convert) {
-	show->show(Ui::MakeConfirmBox({
-		.text = tr::lng_gift_convert_sure_text(
+	auto text = rpl::combine(
+		tr::lng_gift_convert_sure_confirm(
 			lt_count,
 			rpl::single(stars * 1.),
 			lt_user,
 			rpl::single(Ui::Text::Bold(name)),
 			Ui::Text::RichLangValue),
+		tr::lng_gift_convert_sure_limit(
+			lt_count,
+			rpl::single(daysLeft * 1.),
+			Ui::Text::RichLangValue),
+		tr::lng_gift_convert_sure_caution(Ui::Text::RichLangValue)
+	) | rpl::map([](
+			TextWithEntities &&a,
+			TextWithEntities &&b,
+			TextWithEntities &&c) {
+		return a.append("\n\n").append(b).append("\n\n").append(c);
+	});
+	show->show(Ui::MakeConfirmBox({
+		.text = std::move(text),
 		.confirmed = [=](Fn<void()> close) { close(); convert(); },
 		.confirmText = tr::lng_gift_convert_sure(),
 		.title = tr::lng_gift_convert_sure_title(),
@@ -741,7 +755,13 @@ void ReceiptCreditsBox(
 		: (isStarGift && e.in)
 		? controller->session().data().peer(PeerId(e.barePeerId))->asUser()
 		: nullptr;
-	const auto canConvert = gotStarGift && !e.converted && starGiftSender;
+	const auto convertLast = base::unixtime::serialize(e.date)
+		+ controller->session().appConfig().stargiftConvertPeriodMax();
+	const auto timeLeft = int64(convertLast) - int64(base::unixtime::now());
+	const auto timeExceeded = (timeLeft <= 0);
+	const auto forConvert = gotStarGift && !e.converted && starGiftSender;
+	const auto canConvert = forConvert && !timeExceeded;
+	const auto couldConvert = forConvert && timeExceeded;
 
 	box->setStyle(st::giveawayGiftCodeBox);
 	box->setNoContentMargin(true);
@@ -1034,17 +1054,23 @@ void ReceiptCreditsBox(
 				box,
 				object_ptr<Ui::FlatLabel>(
 					box,
-					rpl::combine(
-						(canConvert
-							? tr::lng_action_gift_got_stars_text
-							: tr::lng_gift_got_stars)(
-								lt_count,
-								rpl::single(e.convertStars * 1.),
-								Ui::Text::RichLangValue),
-						tr::lng_paid_about_link()
-					) | rpl::map([](TextWithEntities text, QString link) {
-						return text.append(' ').append(Ui::Text::Link(link));
-					}),
+					(couldConvert
+						? tr::lng_action_gift_got_gift_text(
+							Ui::Text::WithEntities)
+						: rpl::combine(
+							(canConvert
+								? tr::lng_action_gift_got_stars_text
+								: tr::lng_gift_got_stars)(
+									lt_count,
+									rpl::single(e.convertStars * 1.),
+									Ui::Text::RichLangValue),
+							tr::lng_paid_about_link()
+						) | rpl::map([](
+								TextWithEntities text,
+								QString link) {
+							return text.append(' ').append(
+								Ui::Text::Link(link));
+						})),
 					st::creditsBoxAbout)))->entity();
 		about->setClickHandlerFilter([=](const auto &...) {
 			Core::App().iv().openWithIvPreferred(
@@ -1101,8 +1127,9 @@ void ReceiptCreditsBox(
 	if (isStarGift && e.id.isEmpty()) {
 		const auto convert = [=, weak = Ui::MakeWeak(box)] {
 			const auto stars = e.convertStars;
+			const auto days = canConvert ? ((timeLeft + 86399) / 86400) : 0;
 			const auto name = starGiftSender->shortName();
-			ConfirmConvertStarGift(box->uiShow(), name, stars, [=] {
+			ConfirmConvertStarGift(box->uiShow(), name, stars, days, [=] {
 				if (state->convertButtonBusy.current()
 					|| state->confirmButtonBusy.current()) {
 					return;
@@ -1235,13 +1262,13 @@ void ReceiptCreditsBox(
 			? tr::lng_credits_subscription_off_button()
 			: toCancel
 			? tr::lng_credits_subscription_on_button()
-			: canConvert
+			: (canConvert || couldConvert)
 			? (e.savedToProfile
 				? tr::lng_gift_display_on_page_hide()
 				: tr::lng_gift_display_on_page())
 			: tr::lng_box_ok()));
 	const auto send = [=, weak = Ui::MakeWeak(box)] {
-		if (canConvert) {
+		if (canConvert || couldConvert) {
 			const auto save = !e.savedToProfile;
 			const auto window = weakWindow.get();
 			const auto showSection = !e.fromGiftsList;
@@ -1315,7 +1342,7 @@ void ReceiptCreditsBox(
 			return;
 		}
 		state->confirmButtonBusy = true;
-		if ((toRenew || toCancel || canConvert) && peer) {
+		if ((toRenew || toCancel || canConvert || couldConvert) && peer) {
 			send();
 		} else {
 			box->closeBox();

From 81492b7d3a1f9339fd344d6a7f100f755245a130 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Oct 2024 14:08:04 +0400
Subject: [PATCH 061/306] Add "when edited" context menu information.

---
 .../Resources/icons/menu/edited_status.png    | Bin 0 -> 586 bytes
 .../Resources/icons/menu/edited_status@2x.png | Bin 0 -> 1252 bytes
 .../Resources/icons/menu/edited_status@3x.png | Bin 0 -> 1825 bytes
 Telegram/SourceFiles/api/api_who_reacted.cpp  |  14 +++++++++
 Telegram/SourceFiles/api/api_who_reacted.h    |   3 ++
 .../history/history_inner_widget.cpp          |  16 +++++-----
 .../view/history_view_context_menu.cpp        |  28 ++++++++++++++++++
 .../history/view/history_view_context_menu.h  |   3 ++
 Telegram/SourceFiles/ui/chat/chat.style       |   2 ++
 .../controls/who_reacted_context_action.cpp   |   4 ++-
 .../ui/controls/who_reacted_context_action.h  |   3 +-
 11 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 Telegram/Resources/icons/menu/edited_status.png
 create mode 100644 Telegram/Resources/icons/menu/edited_status@2x.png
 create mode 100644 Telegram/Resources/icons/menu/edited_status@3x.png

diff --git a/Telegram/Resources/icons/menu/edited_status.png b/Telegram/Resources/icons/menu/edited_status.png
new file mode 100644
index 0000000000000000000000000000000000000000..70fb24466a33f9fb18ea1d76d62250f003eb566b
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkP{7FPXR7i=<RUxP<Q4k%!7=(+gHf_RV7jeUaCW{z0Xc4R?yUk+I
zuEk_BD2VBzAS{>#Q8deL7Yt%hSu`zpUir%R>#q9w!W)>dGk509nc2D5MMR(v%CAo*
z|9Jq6G4lC*Z-c-|RaFJ&9Q*wq7uoOk7z_r8#bS=JL<Cy~f*_ElX*3#*=x{htKA$H^
zl1Nb$Di(`mnkLQXbL#baBnZNL3<N=dVHnVL9r1YFwz_CEip64q$z%er*K2p~-l%CB
zbX|7}x+!M4T%zCazXqVHDlE&gt-RaqLYCzlTR0qsWm!-Z<v9T79IaN%w&L}Ajchi1
zXXl)w-EKc0vZ|^y91b0a_DE{A8lBJQhrTNsV+;TwisIW0?DVZgOC%EH_xowL+dcG4
zl0>uFjAU89+HL@j$0HpM2m1Q@x(Rf-TvRTXX*?cNv)QD{WOA3BF-CzvfL5y&F~)9u
zPlw#;bg<oSkxr*=TfsTU>2yLQ5_$hOO{G!@27|WAOQjM3fOG!;7cH4g!m=zFh5^Rd
zYXE{EK-cxBS4Aik!e+C9X_}BE>9tM%6GYQASeAuWtA$J^15p&=cDq4D@OV6!PNx8X
zTrTIt(zykHU)PmN1w@2uwF&^J*Xz&P_}aqI??t>YC=?24G#b}$J9S-9J|#cvP5u}8
Y28d4pK!e(vM*si-07*qoM6N<$f{Bs<3IG5A

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/edited_status@2x.png b/Telegram/Resources/icons/menu/edited_status@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..004167a148f30c34abcc7441be3cff13cb27c7e1
GIT binary patch
literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkSmPtfGRA_<iS=}qUZy3KeW8^VKNs|_nlH@HT2l8^T6E7*L6{1$k
zky?ub4(vam#7-pTK;i&J+453eOE@8^jZCw7SrPNrKHr1iZ%^NmJ<qde`%3xLRZG{)
z=X3A6@7>o;LPVe+4C!|h5Q|>{-;G}Z-;EzHKo+UQ48xF8sU)dXN^ZBCJRT1LkvXvu
z4$I5SLtkGXc6WDie}9jUczu1v#>NIrCKF0aOT$w0e-oELtJPwEfBzF<E^KXWp{c1!
zv;c`;g;1!~YBHP6R8v#K{_XksnXFbTt*xz*!{H#O(@8#`k5W=nNTpIyWo0E*R8){c
zp<rVy77OY1dOANp4}}I1AC(`iy1E*-x3}zS+H5wowY4EWKAtl+HZ~S|y&gwLM{NAV
z!vpH->i$g&wYRt9?d=T!@bdBkgTa89m>9u@qoShF+uMuh=Vt)G+uIvjT3RA2pt`!6
zCGT>%P+ndxx`zu23UGCG1px5*e5kFhjf?=bTFthN%jH5wMuuqee#^?r!o|e}0Knt%
z2+hsU(PFW%Z4-`_|7ay8C3tyx0RXJ8uZLHFR;y(<oWWoaL`<X6U}R(jnVFfKzTMs3
zY#jlcn%l{L&f9D@!5emYc^LpOI5^1ZE0f7^dU^@~I6OQIkAS?qJa$#u+S&xS#`g9$
z0AOrvjF*3FYb#qXKR=(-pYt-;(9l3c|NThK%*=4Pi^j~%3_U$P5fM>yb2Fzur-1tU
zdLkmSTCMc>_$ZPdH=drJXl`zfh=_7?b2<GvZ=*RmIYdOXy1FWknE)7#Msm4aG(JAg
z=^Io4!!X1!3=t7sUS5WU93MCw4(jgi=H(l-g_KGq``PJqiXs&$M06sP$z%aHPoa>@
z<zzOSX<%T0qNAg~^!xINVi<-!(sVkVpyN}eQekUri;eH??G=0k4-XHs@zc}Oq5Tf{
zrz@k;$h&Z3V<YbF?%3k<^Ye&}jTJ1QxVRW+XJ-HatJNBsfZg3)0Kme+0%t+FT#lik
zA(r^->njWf10)iOAmT+uMVOqNL_$IWl9Q7$H8mCNDiS<dUtb>p!0Yt}9az%R(y+I;
z7ck^#G#bIHo|KdXyWI`|I6gi`PEHP2Oz?z!uM!{oH8C+!FnOs|ilwC`{EhzpesKbb
z_+93zs;aQQzK+h$PQk?eW-^%q$S*D~LMoMt7a-<3&DUycYvJ?x*gAH*9Z5+^d}8?(
zh~z+{R;%Ihcv$jYuNQ@dg?!`r7m37385b9agM)*B*6HZz5R!v`u}BQ{6B82w<VQzG
zh2{`eFkH_nM1-!ct^o2oJ3FD|5?)x$!<OI5%F5Uw9st~KH`3G7Ls^K>zIwG<&2H?!
zH{Zg-0*po@bUGa>D=Wb;%%|9tloU7|4mR%n{T($mHKDelxE|(u+`YcO4iFI)6@`_R
zl>ncfo*pqA#0l`*SI_Go1r!z*29TefofTU<JOVx%!!XFs&i>Rwsi~<f`ID0qC=?1&
zbwYk#4;2!Lgu1%A=;GpnHa9ov=H^CRKKjQ3!i^vQPrhFP-;G}Z-;F=u^S}5#RJbz$
O0000<MNUMnLSTYz3r7C{

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/edited_status@3x.png b/Telegram/Resources/icons/menu/edited_status@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1acdf8ea936009cb61fb51706d8d9aa69204759d
GIT binary patch
literal 1825
zcmV++2j2LJP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm000XU
z000XU0RWnu7ytkU(@8`@RCt{2n_p<tUKGbq)6J~Y*)nx7r!oqP1&7Y5qcWWg8D$Tv
zPGtUJ&<X_+|4<7)_~wfbvVjQ0KVTmmTF|Le+*1*&P7t>t+Q8Uk6Ma~R-4K<{t~EKo
zhu^RHd7E}w+MBdLfBC|JCM4&a`^imnbMB1+01$L#6qD}+3SBxN8R>vzqyv(X4oF5i
zAQ|a^WTXR<kq$^kIv^Pp<vRhEWx;B-g2iHiva&KrBogrD%NK}7qcA-^4T2!#J4HY(
z&15oRYild|{eB!DA4i_&F_U<n$FZ?7yn6L29z1vuSFBi}X|Dg6`au|m!S?oc?Ca~p
z+1c5QK;$F{0tSOYbT}M;4j_laf$!eE%Nj~1aU6#(mkSw&Q8j-<k`isz*49F2XD2i@
zHDx@8<2c|r4kjljMH2)8Dk>_VqM`z-s;Z!&p#j#fU!T#(z`y_;J9Z2{eE6V7GXOvZ
z>K=~=<MFuUs`EUL&!0a>uh)xKt98--)~;QPE|&{Kp-|f1G&eVgUawcJ-bBxt(P+dg
zSFWUOM1Oxj*3{JG9HXwT4)5H#gTH?LlEerE0$5yJT$q5&W-|tZK}pg>LqoV{&mQVm
zw!Xd|M@B}{UI>%PR9JwFMq^qy*RNk!<BE#LvMgS@bO{APAmYAw@d8UrOA7~3>TQ)s
zB=F?Pld6G9HMiR>x#e!%x>Xo}JRXk(PD@LRW^j_$*4Bpe^YcV5$B!S+FQD4mTFKK&
z%bt^JM~)mJa*4%aSXWn<KR{2PK9&6E<O@#Hy1ToHoL;|vogY9Bhl5CDXlRJaA2P!*
z=ytpD+_`gTu~-zJzhuc0eDmfFk=y?L`?UqcFpT8&f!3qk=ktj^pFDYzm5=)RdLp-x
zkr6Z+joJY^bm$O~K!1Nf6*vHZckkX6{YInFto=NA@PNqi@ZrPS0qX1P69e-+Pi2Ih
zwBFuc(f7>EOxAujZrn(eQXW5ktPLQO$wZVaLZJ{fI5YtP0P*e?i^XvH^5u$sC@#4+
zH#b9RX{osV=+PskE;Q4<d-ufOEXzV`YpY@(iUB#DPGY-|0o}iUpD5WbRC>uI#ef<c
z8^zxo$HBzJgyNuDX=-YUxPZgM!-{<<D%!Iw3)R)t;&wP3Rvb`kb#!z<M@I)tPftT{
zZ?EF>6#=qZt-vt<cDhI;qBx+|nw_16YuB!2eZHbw%wn+++mn-%SqJ{FND-j2vNB>@
z2lNN3rKJVBy1JmIre@LSEPBvnx7&%~yU*vNI!JW8-NYdD^XJc0{kOHXiN1gS{E04?
zi|$C;X0s81y1KfkB))9fGVJN;!BkPK3gVhIYw-K`?}UGz=W+Aq&GZ1VEK9uK1OkDa
z6W_9B3yzMCO5lXUVJt5%r`m&jJ|89$2_lZ&Zl?zb0C0SKoM=QY37<G|0%Nh51diYD
zr&)AIo6RQvZftDCsi`SMM11)0AsP$@x`6zCKhYQ^6M#uGo6W>aX;MFa{J^6}k5cV5
zXV0F+cs!1$PoEa|tzNwvdwO~n`|_$RpwsCj8s+tR6`j9h#}1sBn2^AE`}Qqv*sy^r
zoZY*36Svgu+qbjnnaYCZQtsHkeY<4l0THpgyBk@Sr3$CAvJxYah$Png_wRA((xvJF
z0?58#cHzPWBH6EBzv6)d2dIJp04y#p#({wW2^>Vk%a<>!+k*fA+uPfTpo=ZJZripE
z=jP@R@$cD&>gsChZ~&wenMu8T`4WqYiqr>`OVPfnstR}R+^O2Sp47Rqq#}_BR#sMK
z<1@QN)SC9m#Wro)ly(JMB9Xv`hK6kYW}i?YO&prdW*i$EOWS+SoH>(=@9dK*l&NQf
z!9YAXeiwz&es0MX!s3PV=g+5w!*QI_M>>5#0Qp`1vUl&^v`dM<efvgh;F)`p`C34=
zZrwVJMx&Crf*|0&efwy|p_8oEOYm5hl`K+7>f*(VG-J_AT8l-TNxO05M%p;RU@(`3
z3hDw%+Cs~KL!pr3Wx%QCcDvKU`Sj@%u3Wj2YFqNYkUSg?LnIOr7m_FUWzyEITjABK
zS5Q(?LhPTPpNCz$cERA_Ahk9mMZE|8ZrOZ_aO%{lw7$yA%kksKk7>{Gcsy#gL0v!q
z%0Fg#_Uu_&KY>6X?eRBn-c&Px^#T2ECX)%BPUnK3LuKkggM)*TV~2-_v81Hr&jFNb
zEX$(JW<$H(j?K-@3qI*m%d|5yGpdzL3I>o8>+I}AM8tSJj-#Wa*woaddQ8=xVrppB
zs#U<UtoYfK7Wz*C%7^}UbMs221Co&rNJcs!8R>vzqyv(X4oF5iAQ}Ay%?W##HIDN>
P00000NkvXXu0mjfzB-0{

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/api/api_who_reacted.cpp b/Telegram/SourceFiles/api/api_who_reacted.cpp
index 6c9df39b2..b0e44cfc9 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.cpp
+++ b/Telegram/SourceFiles/api/api_who_reacted.cpp
@@ -756,5 +756,19 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 		const style::WhoRead &st) {
 	return WhoReacted(item, reaction, context, st, nullptr);
 }
+rpl::producer<Ui::WhoReadContent> WhenEdited(
+		not_null<PeerData*> author,
+		TimeId date) {
+	return rpl::single(Ui::WhoReadContent{
+		.participants = { Ui::WhoReadParticipant{
+			.name = author->name(),
+			.date = FormatReadDate(date, QDateTime::currentDateTime()),
+			.id = author->id.value,
+		} },
+		.type = Ui::WhoReadType::Edited,
+		.fullReadCount = 1,
+	});
+}
+
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_who_reacted.h b/Telegram/SourceFiles/api/api_who_reacted.h
index 9a9100535..0d1cf7234 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.h
+++ b/Telegram/SourceFiles/api/api_who_reacted.h
@@ -61,5 +61,8 @@ struct WhoReadList {
 	const Data::ReactionId &reaction,
 	not_null<QWidget*> context, // Cache results for this lifetime.
 	const style::WhoRead &st);
+[[nodiscard]] rpl::producer<Ui::WhoReadContent> WhenEdited(
+	not_null<PeerData*> author,
+	TimeId date);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index dcc9d77e8..6df845885 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2252,22 +2252,22 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 		return item;
 	};
-	const auto whoReactedItem = groupLeaderOrSelf(_dragStateItem);
-	const auto hasWhoReactedItem = whoReactedItem
-		&& Api::WhoReactedExists(whoReactedItem, Api::WhoReactedList::All);
+	const auto leaderOrSelf = groupLeaderOrSelf(_dragStateItem);
+	const auto hasWhoReactedItem = leaderOrSelf
+		&& Api::WhoReactedExists(leaderOrSelf, Api::WhoReactedList::All);
 	const auto clickedReaction = link
 		? link->property(
 			kReactionsCountEmojiProperty).value<Data::ReactionId>()
 		: Data::ReactionId();
 	_whoReactedMenuLifetime.destroy();
 	if (!clickedReaction.empty()
-		&& whoReactedItem
-		&& Api::WhoReactedExists(whoReactedItem, Api::WhoReactedList::One)) {
+		&& leaderOrSelf
+		&& Api::WhoReactedExists(leaderOrSelf, Api::WhoReactedList::One)) {
 		HistoryView::ShowWhoReactedMenu(
 			&_menu,
 			e->globalPos(),
 			this,
-			whoReactedItem,
+			leaderOrSelf,
 			clickedReaction,
 			_controller,
 			_whoReactedMenuLifetime);
@@ -2954,8 +2954,10 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		HistoryView::AddWhoReactedAction(
 			_menu,
 			this,
-			whoReactedItem,
+			leaderOrSelf,
 			_controller);
+	} else {
+		HistoryView::MaybeAddWhenEditedAction(_menu, leaderOrSelf);
 	}
 
 	if (_menu->empty()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 82da069a7..e34cab589 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_cursor_state.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "history/history_item_text.h"
 #include "history/view/history_view_schedule_box.h"
 #include "history/view/media/history_view_media.h"
@@ -1286,6 +1287,8 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 	}
 	if (hasWhoReactedItem) {
 		AddWhoReactedAction(result, list, item, list->controller());
+	} else if (item) {
+		MaybeAddWhenEditedAction(result, item);
 	}
 
 	return result;
@@ -1441,6 +1444,24 @@ void AddSaveSoundForNotifications(
 	}, &st::menuIconSoundAdd);
 }
 
+void AddWhenEditedActionHelper(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<HistoryItem*> item,
+		bool insertSeparator) {
+	if (item->history()->peer->isUser()) {
+		if (const auto edited = item->Get<HistoryMessageEdited>()) {
+			if (!item->hideEditedBadge()) {
+				if (insertSeparator && !menu->empty()) {
+					menu->addSeparator(&st::expandedMenuSeparator);
+				}
+				menu->addAction(Ui::WhenReadContextAction(
+					menu.get(),
+					Api::WhenEdited(item->from(), edited->date)));
+			}
+		}
+	}
+}
+
 void AddWhoReactedAction(
 		not_null<Ui::PopupMenu*> menu,
 		not_null<QWidget*> context,
@@ -1486,6 +1507,7 @@ void AddWhoReactedAction(
 	if (!menu->empty()) {
 		menu->addSeparator(&st::expandedMenuSeparator);
 	}
+	AddWhenEditedActionHelper(menu, item, false);
 	if (item->history()->peer->isUser()) {
 		menu->addAction(Ui::WhenReadContextAction(
 			menu.get(),
@@ -1501,6 +1523,12 @@ void AddWhoReactedAction(
 	}
 }
 
+void MaybeAddWhenEditedAction(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<HistoryItem*> item) {
+	AddWhenEditedActionHelper(menu, item, true);
+}
+
 void AddEditTagAction(
 		not_null<Ui::PopupMenu*> menu,
 		const Data::ReactionId &id,
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.h b/Telegram/SourceFiles/history/view/history_view_context_menu.h
index 1b14804aa..1d02e64c2 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.h
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.h
@@ -84,6 +84,9 @@ void AddWhoReactedAction(
 	not_null<QWidget*> context,
 	not_null<HistoryItem*> item,
 	not_null<Window::SessionController*> controller);
+void MaybeAddWhenEditedAction(
+	not_null<Ui::PopupMenu*> menu,
+	not_null<HistoryItem*> item);
 void ShowWhoReactedMenu(
 	not_null<base::unique_qptr<Ui::PopupMenu>*> menu,
 	QPoint position,
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 7633eed08..53b2ef183 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -808,6 +808,8 @@ whoReadPlayedDisabled: icon {{ "menu/read_audio", menuFgDisabled }};
 whoReadReactions: icon{{ "menu/read_reactions", windowBoldFg }};
 whoReadReactionsOver: icon{{ "menu/read_reactions", windowBoldFg }};
 whoReadReactionsDisabled: icon{{ "menu/read_reactions", menuFgDisabled }};
+whenEdited: icon {{ "menu/edited_status", windowBoldFg }};
+whenEditedOver: icon {{ "menu/edited_status", windowBoldFg }};
 
 reactionsTabAll: icon {{ "menu/read_reactions", windowFg }};
 reactionsTabAllSelected: icon {{ "menu/read_reactions", activeButtonFg }};
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
index 37a15de62..a2f8f7229 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
@@ -597,7 +597,9 @@ void WhenAction::paint(Painter &p) {
 		p.fillRect(0, 0, width(), _height, _st.itemBg);
 	}
 	p.fillRect(0, 0, width(), _height, _st.itemBg);
-	const auto &icon = loading
+	const auto &icon = (_content.type == WhoReadType::Edited)
+		? (selected ? st::whenEditedOver : st::whenEdited)
+		: loading
 		? st::whoReadChecksDisabled
 		: selected
 		? st::whoReadChecksOver
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
index 74e3f0d54..f0b2545f5 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
@@ -36,6 +36,7 @@ enum class WhoReadType {
 	Listened,
 	Watched,
 	Reacted,
+	Edited,
 };
 
 enum class WhoReadState : uchar {
@@ -65,7 +66,7 @@ struct WhoReadContent {
 [[nodiscard]] base::unique_qptr<Menu::ItemBase> WhenReadContextAction(
 	not_null<PopupMenu*> menu,
 	rpl::producer<WhoReadContent> content,
-	Fn<void()> showOrPremium);
+	Fn<void()> showOrPremium = nullptr);
 
 enum class WhoReactedType : uchar {
 	Viewed,

From cec9688d582372dfb4f34072b2a5536da2c46643 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Oct 2024 22:01:55 +0400
Subject: [PATCH 062/306] Implement public posts hashtag search preview.

---
 .../dialogs/dialogs_inner_widget.cpp          | 328 +++++++--
 .../dialogs/dialogs_inner_widget.h            |  49 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 631 ++++++++++--------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  44 +-
 4 files changed, 684 insertions(+), 368 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index ab6577613..7d63bb597 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -88,6 +88,7 @@ namespace {
 constexpr auto kHashtagResultsLimit = 5;
 constexpr auto kStartReorderThreshold = 30;
 constexpr auto kQueryPreviewLimit = 32;
+constexpr auto kPreviewPostsLimit = 3;
 
 [[nodiscard]] int FixedOnTopDialogsCount(not_null<Dialogs::IndexedList*> list) {
 	auto result = 0;
@@ -555,7 +556,7 @@ int InnerWidget::searchInChatSkip() const {
 	return _searchIn ? _searchIn->height() : 0;
 }
 
-int InnerWidget::searchedOffset() const {
+int InnerWidget::previewOffset() const {
 	auto result = peerSearchOffset();
 	if (!_peerSearchResults.empty()) {
 		result += (_peerSearchResults.size() * st::dialogsRowHeight)
@@ -564,6 +565,15 @@ int InnerWidget::searchedOffset() const {
 	return result;
 }
 
+int InnerWidget::searchedOffset() const {
+	auto result = previewOffset();
+	if (!_previewResults.empty()) {
+		result += (_previewResults.size() * st::dialogsRowHeight)
+			+ st::searchedBarHeight;
+	}
+	return result;
+}
+
 void InnerWidget::changeOpenedFolder(Data::Folder *folder) {
 	Expects(!folder || !_savedSublists);
 
@@ -810,7 +820,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		}
 		if (_searchIn) {
 			p.translate(0, searchInChatSkip());
-			if (_searchResults.empty()) {
+			if (_previewResults.empty() && _searchResults.empty()) {
 				p.fillRect(0, 0, fullWidth, st::lineWidth, st::shadowFg);
 			}
 		}
@@ -924,7 +934,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		}
 
 		const auto showUnreadInSearchResults = uniqueSearchResults();
-		if (_searchResults.empty()) {
+		if (_previewResults.empty() && _searchResults.empty()) {
 			if (_loadingAnimation) {
 				const auto text = tr::lng_contacts_loading(tr::now);
 				p.fillRect(0, 0, fullWidth, st::searchedBarHeight, st::searchedBarBg);
@@ -933,7 +943,68 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 				p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), text);
 				p.translate(0, st::searchedBarHeight);
 			}
-		} else {
+			return;
+		}
+		if (!_previewResults.empty()) {
+			const auto text = tr::lng_search_tab_public_posts(tr::now);
+			p.fillRect(0, 0, fullWidth, st::searchedBarHeight, st::searchedBarBg);
+			p.setFont(st::searchedBarFont);
+			p.setPen(st::searchedBarFg);
+			p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), text);
+			const auto moreFont = (_selectedMorePosts || _pressedMorePosts)
+				? st::searchedBarFont->underline()
+				: st::searchedBarFont;
+			{
+				const auto text = tr::lng_channels_your_more(tr::now);
+				if (!_morePostsWidth) {
+					_morePostsWidth = moreFont->width(text);
+				}
+				p.setFont(moreFont);
+				p.drawTextLeft(
+					width() - st::searchedBarPosition.x() - _morePostsWidth,
+					st::searchedBarPosition.y(),
+					width(),
+					text);
+				p.translate(0, st::searchedBarHeight);
+			}
+			auto skip = previewOffset();
+			auto from = floorclamp(r.y() - skip, _st->height, 0, _previewResults.size());
+			auto to = ceilclamp(r.y() + r.height() - skip, _st->height, 0, _previewResults.size());
+			p.translate(0, from * _st->height);
+			if (from < _previewResults.size()) {
+				for (; from < to; ++from) {
+					const auto &result = _previewResults[from];
+					const auto active = isSearchResultActive(result.get(), activeEntry);
+					const auto selected = _menuRow.key
+						? isSearchResultActive(result.get(), _menuRow)
+						: _chatPreviewRow.key
+						? isSearchResultActive(result.get(), _chatPreviewRow)
+						: (from == (isPressed()
+							? _previewPressed
+							: _previewSelected));
+					Ui::RowPainter::Paint(p, result.get(), {
+						.st = _st,
+						.folder = _openedFolder,
+						.forum = _openedForum,
+						.currentBg = currentBg(),
+						.filter = _filterId,
+						.now = ms,
+						.width = fullWidth,
+						.active = active,
+						.selected = selected,
+						.paused = videoPaused,
+						.search = true,
+						.narrow = (fullWidth < st::columnMinimalWidthLeft / 2),
+						.displayUnreadInfo = showUnreadInSearchResults,
+					});
+					p.translate(0, _st->height);
+				}
+			}
+			if (to < _previewResults.size()) {
+				p.translate(0, (_previewResults.size() - to) * _st->height);
+			}
+		}
+		if (!_searchResults.empty()) {
 			const auto text = showUnreadInSearchResults
 				? u"Search results"_q
 				: tr::lng_search_found_results(
@@ -1330,6 +1401,8 @@ void InnerWidget::clearIrrelevantState() {
 		setFilteredPressed(-1, false);
 		_peerSearchSelected = -1;
 		setPeerSearchPressed(-1);
+		_previewSelected = -1;
+		setPreviewPressed(-1);
 		_searchedSelected = -1;
 		setSearchedPressed(-1);
 	} else if (_state == WidgetState::Filtered) {
@@ -1446,6 +1519,32 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 				updateSelectedRow();
 			}
 		}
+		if (!_previewResults.empty()) {
+			auto skip = previewOffset();
+			auto previewSelected = (mouseY >= skip) ? ((mouseY - skip) / _st->height) : -1;
+			if (previewSelected < 0 || previewSelected >= _previewResults.size()) {
+				previewSelected = -1;
+			}
+			if (_previewSelected != previewSelected) {
+				updateSelectedRow();
+				_previewSelected = previewSelected;
+				updateSelectedRow();
+			}
+			auto selectedMorePosts = false;
+			const auto from = skip - st::searchedBarHeight;
+			if (mouseY <= skip && mouseY >= from) {
+				const auto left = width()
+					- _morePostsWidth
+					- 2 * st::searchedBarPosition.x();
+				if (_morePostsWidth > 0 && local.x() >= left) {
+					selectedMorePosts = true;
+				}
+			}
+			if (_selectedMorePosts != selectedMorePosts) {
+				update(0, from, width(), st::searchedBarHeight);
+				_selectedMorePosts = selectedMorePosts;
+			}
+		}
 		if (!_searchResults.empty()) {
 			auto skip = searchedOffset();
 			auto searchedSelected = (mouseY >= skip) ? ((mouseY - skip) / _st->height) : -1;
@@ -1495,7 +1594,9 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	_hashtagDeletePressed = _hashtagDeleteSelected;
 	setFilteredPressed(_filteredSelected, _selectedTopicJump);
 	setPeerSearchPressed(_peerSearchSelected);
+	setPreviewPressed(_previewSelected);
 	setSearchedPressed(_searchedSelected);
+	_pressedMorePosts = _selectedMorePosts;
 
 	const auto alt = (e->modifiers() & Qt::AltModifier);
 	if (alt && showChatPreview()) {
@@ -1862,8 +1963,12 @@ void InnerWidget::mousePressReleased(
 	setFilteredPressed(-1, false);
 	auto peerSearchPressed = _peerSearchPressed;
 	setPeerSearchPressed(-1);
+	auto previewPressed = _previewPressed;
+	setPreviewPressed(-1);
 	auto searchedPressed = _searchedPressed;
 	setSearchedPressed(-1);
+	const auto pressedMorePosts = _pressedMorePosts;
+	_pressedMorePosts = false;
 	if (wasDragging) {
 		selectByMouse(globalPosition);
 	}
@@ -1879,8 +1984,12 @@ void InnerWidget::mousePressReleased(
 			|| (filteredPressed >= 0 && filteredPressed == _filteredSelected)
 			|| (peerSearchPressed >= 0
 				&& peerSearchPressed == _peerSearchSelected)
+			|| (previewPressed >= 0
+				&& previewPressed == _previewSelected)
 			|| (searchedPressed >= 0
-				&& searchedPressed == _searchedSelected)) {
+				&& searchedPressed == _searchedSelected)
+			|| (pressedMorePosts
+				&& pressedMorePosts == _selectedMorePosts)) {
 			chooseRow(modifiers, pressedTopicRootId);
 		}
 	}
@@ -1955,6 +2064,13 @@ void InnerWidget::setPeerSearchPressed(int pressed) {
 	_peerSearchPressed = pressed;
 }
 
+void InnerWidget::setPreviewPressed(int pressed) {
+	if (base::in_range(_previewPressed, 0, _previewResults.size())) {
+		_previewResults[_previewPressed]->stopLastRipple();
+	}
+	_previewPressed = pressed;
+}
+
 void InnerWidget::setSearchedPressed(int pressed) {
 	if (base::in_range(_searchedPressed, 0, _searchResults.size())) {
 		_searchResults[_searchedPressed]->stopLastRipple();
@@ -2313,6 +2429,8 @@ void InnerWidget::updateSelectedRow(Key key) {
 			}
 		} else if (_peerSearchSelected >= 0) {
 			update(0, peerSearchOffset() + _peerSearchSelected * st::dialogsRowHeight, width(), st::dialogsRowHeight);
+		} else if (_previewSelected >= 0) {
+			update(0, previewOffset() + _previewSelected * _st->height, width(), _st->height);
 		} else if (_searchedSelected >= 0) {
 			update(0, searchedOffset() + _searchedSelected * _st->height, width(), _st->height);
 		}
@@ -2354,9 +2472,11 @@ void InnerWidget::clearSelection() {
 	if (isSelected()) {
 		updateSelectedRow();
 		_collapsedSelected = -1;
+		_selectedMorePosts = false;
 		_selected = nullptr;
 		_filteredSelected
 			= _searchedSelected
+			= _previewSelected
 			= _peerSearchSelected
 			= _hashtagSelected
 			= -1;
@@ -2449,6 +2569,11 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 		} else if (_state == WidgetState::Filtered) {
 			if (base::in_range(_filteredSelected, 0, _filterResults.size())) {
 				return { _filterResults[_filteredSelected].key(), FullMsgId() };
+			} else if (base::in_range(_previewSelected, 0, _previewResults.size())) {
+				return {
+					_previewResults[_previewSelected]->item()->history(),
+					_previewResults[_previewSelected]->item()->fullId()
+				};
 			} else if (base::in_range(_searchedSelected, 0, _searchResults.size())) {
 				return {
 					_searchResults[_searchedSelected]->item()->history(),
@@ -2597,6 +2722,7 @@ void InnerWidget::searchRequested(bool loading) {
 	_searchLoading = loading;
 	if (loading) {
 		clearSearchResults(true);
+		clearPreviewResults();
 	}
 	refresh(true);
 }
@@ -2660,6 +2786,7 @@ void InnerWidget::applySearchState(SearchState state) {
 	}
 	_searchState = std::move(state);
 	_searchHashOrCashtag = IsHashOrCashtagSearchQuery(_searchState.query);
+	_searchWithPostsPreview = computeSearchWithPostsPreview();
 
 	updateSearchIn();
 	moveSearchIn();
@@ -2767,7 +2894,7 @@ void InnerWidget::appendToFiltered(Key key) {
 	const auto height = filteredHeight();
 	_filterResults.emplace_back(i->second.get());
 	_filterResults.back().top = height;
-	trackSearchResultsHistory(key.owningHistory());
+	trackResultsHistory(key.owningHistory());
 }
 
 InnerWidget::~InnerWidget() {
@@ -2780,13 +2907,16 @@ void InnerWidget::clearSearchResults(bool clearPeerSearchResults) {
 		_peerSearchResults.clear();
 	}
 	_searchResults.clear();
-	_searchResultsLifetime.destroy();
-	_searchResultsHistories.clear();
 	_searchedCount = _searchedMigratedCount = 0;
 }
 
-void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
-	if (!_searchResultsHistories.emplace(history).second) {
+void InnerWidget::clearPreviewResults() {
+	_previewResults.clear();
+	_previewCount = 0;
+}
+
+void InnerWidget::trackResultsHistory(not_null<History*> history) {
+	if (!_trackedHistories.emplace(history).second) {
 		return;
 	}
 	const auto channel = history->peer->asChannel();
@@ -2827,7 +2957,7 @@ void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
 			clearMouseSelection(true);
 		}
 		update();
-	}, _searchResultsLifetime);
+	}, _trackedLifetime);
 
 	if (const auto forum = channel->forum()) {
 		forum->topicDestroyed(
@@ -2857,7 +2987,7 @@ void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
 			if (_chatPreviewRow.key.topic() == topic) {
 				_chatPreviewRow = {};
 			}
-		}, _searchResultsLifetime);
+		}, _trackedLifetime);
 	}
 }
 
@@ -2875,6 +3005,13 @@ Data::Thread *InnerWidget::updateFromParentDrag(QPoint globalPosition) {
 		} else if (base::in_range(_peerSearchSelected, 0, _peerSearchResults.size())) {
 			return session().data().history(
 				_peerSearchResults[_peerSearchSelected]->peer);
+		} else if (base::in_range(_previewSelected, 0, _previewResults.size())) {
+			if (const auto item = _previewResults[_previewSelected]->item()) {
+				if (const auto topic = item->topic()) {
+					return topic;
+				}
+				return item->history();
+			}
 		} else if (base::in_range(_searchedSelected, 0, _searchResults.size())) {
 			if (const auto item = _searchResults[_searchedSelected]->item()) {
 				if (const auto topic = item->topic()) {
@@ -3028,12 +3165,14 @@ void InnerWidget::searchReceived(
 	_searchLoading = false;
 
 	const auto uniquePeers = uniqueSearchResults();
-	if (type == SearchRequestType::FromStart
-		|| type == SearchRequestType::PeerFromStart) {
+	const auto withPreview = _searchWithPostsPreview;
+	const auto toPreview = withPreview && type.posts;
+	if (type.start && !type.migrated && (!withPreview || !type.posts)) {
 		clearSearchResults(false);
 	}
-	const auto isMigratedSearch = (type == SearchRequestType::MigratedFromStart)
-		|| (type == SearchRequestType::MigratedFromOffset);
+	if (!withPreview || toPreview) {
+		clearPreviewResults();
+	}
 
 	const auto key = (!_openedForum || _searchState.inChat.topic())
 		? _searchState.inChat
@@ -3042,34 +3181,40 @@ void InnerWidget::searchReceived(
 		&& (!_searchState.inChat
 			|| inject->history() == _searchState.inChat.history())) {
 		Assert(_searchResults.empty());
+		Assert(!toPreview);
 		const auto index = int(_searchResults.size());
 		_searchResults.push_back(
 			std::make_unique<FakeRow>(
 				key,
 				inject,
 				[=] { repaintSearchResult(index); }));
-		trackSearchResultsHistory(inject->history());
+		trackResultsHistory(inject->history());
 		++fullCount;
 	}
+	auto &results = toPreview ? _previewResults : _searchResults;
 	for (const auto &item : messages) {
 		const auto history = item->history();
-		if (!uniquePeers || !hasHistoryInResults(history)) {
-			const auto index = int(_searchResults.size());
-			_searchResults.push_back(
-				std::make_unique<FakeRow>(
-					key,
-					item,
-					[=] { repaintSearchResult(index); }));
-			trackSearchResultsHistory(history);
-			if (uniquePeers && !history->unreadCountKnown()) {
+		if (toPreview || !uniquePeers || !hasHistoryInResults(history)) {
+			const auto index = int(results.size());
+			const auto repaint = toPreview
+				? Fn<void()>([=] { repaintSearchResult(index); })
+				: [=] { repaintPreviewResult(index); };
+			results.push_back(
+				std::make_unique<FakeRow>(key, item, repaint));
+			trackResultsHistory(history);
+			if (!toPreview && uniquePeers && !history->unreadCountKnown()) {
 				history->owner().histories().requestDialogEntry(history);
+			} else if (toPreview && results.size() >= kPreviewPostsLimit) {
+				break;
 			}
 		}
 	}
-	if (isMigratedSearch) {
+	if (type.migrated) {
 		_searchedMigratedCount = fullCount;
-	} else {
+	} else if (!withPreview || !toPreview) {
 		_searchedCount = fullCount;
+	} else {
+		_previewCount = fullCount;
 	}
 
 	refresh();
@@ -3313,6 +3458,7 @@ void InnerWidget::clearMouseSelection(bool clearSelection) {
 		} else if (_state == WidgetState::Filtered) {
 			_filteredSelected
 				= _peerSearchSelected
+				= _previewSelected
 				= _searchedSelected
 				= _hashtagSelected = -1;
 		}
@@ -3416,6 +3562,19 @@ void InnerWidget::repaintSearchResult(int index) {
 		_st->height);
 }
 
+void InnerWidget::repaintPreviewResult(int index) {
+	rtlupdate(
+		0,
+		previewOffset() + index * _st->height,
+		width(),
+		_st->height);
+}
+
+bool InnerWidget::computeSearchWithPostsPreview() const {
+	return 	(_searchHashOrCashtag != HashOrCashtag::None)
+		&& (_searchState.tab == ChatSearchTab::MyMessages);
+}
+
 void InnerWidget::clearFilter() {
 	if (_state == WidgetState::Filtered || _searchState.inChat) {
 		if (_searchState.inChat) {
@@ -3428,6 +3587,9 @@ void InnerWidget::clearFilter() {
 		_filterResultsGlobal.clear();
 		_peerSearchResults.clear();
 		_searchResults.clear();
+		_previewResults.clear();
+		_trackedHistories.clear();
+		_trackedLifetime.destroy();
 		_filter = QString();
 		refresh(true);
 	}
@@ -3474,15 +3636,22 @@ void InnerWidget::selectSkip(int32 direction) {
 		}
 		scrollToDefaultSelected();
 	} else if (_state == WidgetState::Filtered) {
-		if (_hashtagResults.empty() && _filterResults.empty() && _peerSearchResults.empty() && _searchResults.empty()) {
+		if (_hashtagResults.empty()
+			&& _filterResults.empty()
+			&& _peerSearchResults.empty()
+			&& _previewResults.empty()
+			&& _searchResults.empty()) {
 			return;
 		}
-		if ((_hashtagSelected < 0 || _hashtagSelected >= _hashtagResults.size()) &&
-			(_filteredSelected < 0 || _filteredSelected >= _filterResults.size()) &&
-			(_peerSearchSelected < 0 || _peerSearchSelected >= _peerSearchResults.size()) &&
-			(_searchedSelected < 0 || _searchedSelected >= _searchResults.size())) {
-			if (_hashtagResults.empty() && _filterResults.empty() && _peerSearchResults.empty()) {
+		if ((_hashtagSelected < 0 || _hashtagSelected >= _hashtagResults.size())
+			&& (_filteredSelected < 0 || _filteredSelected >= _filterResults.size())
+			&& (_peerSearchSelected < 0 || _peerSearchSelected >= _peerSearchResults.size())
+			&& (_previewSelected < 0 || _previewSelected >= _previewResults.size())
+			&& (_searchedSelected < 0 || _searchedSelected >= _searchResults.size())) {
+			if (_hashtagResults.empty() && _filterResults.empty() && _peerSearchResults.empty() && _previewResults.empty()) {
 				_searchedSelected = 0;
+			} else if (_hashtagResults.empty() && _filterResults.empty() && _peerSearchResults.empty()) {
+				_previewSelected = 0;
 			} else if (_hashtagResults.empty() && _filterResults.empty()) {
 				_peerSearchSelected = 0;
 			} else if (_hashtagResults.empty()) {
@@ -3493,30 +3662,36 @@ void InnerWidget::selectSkip(int32 direction) {
 		} else {
 			int32 cur = base::in_range(_hashtagSelected, 0, _hashtagResults.size())
 				? _hashtagSelected
-				: (base::in_range(_filteredSelected, 0, _filterResults.size())
-					? (_hashtagResults.size() + _filteredSelected)
-					: (base::in_range(_peerSearchSelected, 0, _peerSearchResults.size())
-						? (_peerSearchSelected + _filterResults.size() + _hashtagResults.size())
-						: (_searchedSelected + _peerSearchResults.size() + _filterResults.size() + _hashtagResults.size())));
+				: base::in_range(_filteredSelected, 0, _filterResults.size())
+				? (_hashtagResults.size() + _filteredSelected)
+				: base::in_range(_peerSearchSelected, 0, _peerSearchResults.size())
+				? (_peerSearchSelected + _filterResults.size() + _hashtagResults.size())
+				: base::in_range(_previewSelected, 0, _previewResults.size())
+				? (_previewSelected + _peerSearchResults.size() + _filterResults.size() + _hashtagResults.size())
+				: (_searchedSelected + _previewResults.size() + _peerSearchResults.size() + _filterResults.size() + _hashtagResults.size());
 			cur = std::clamp(
 				cur + direction,
 				0,
 				static_cast<int>(_hashtagResults.size()
 					+ _filterResults.size()
 					+ _peerSearchResults.size()
+					+ _previewResults.size()
 					+ _searchResults.size()) - 1);
 			if (cur < _hashtagResults.size()) {
 				_hashtagSelected = cur;
-				_filteredSelected = _peerSearchSelected = _searchedSelected = -1;
+				_filteredSelected = _peerSearchSelected = _previewSelected = _searchedSelected = -1;
 			} else if (cur < _hashtagResults.size() + _filterResults.size()) {
 				_filteredSelected = cur - _hashtagResults.size();
-				_hashtagSelected = _peerSearchSelected = _searchedSelected = -1;
+				_hashtagSelected = _peerSearchSelected = _previewSelected = _searchedSelected = -1;
 			} else if (cur < _hashtagResults.size() + _filterResults.size() + _peerSearchResults.size()) {
 				_peerSearchSelected = cur - _hashtagResults.size() - _filterResults.size();
-				_hashtagSelected = _filteredSelected = _searchedSelected = -1;
+				_hashtagSelected = _filteredSelected = _previewSelected = _searchedSelected = -1;
+			} else if (cur < _hashtagResults.size() + _filterResults.size() + _peerSearchResults.size() + _previewResults.size()) {
+				_previewSelected = cur - _hashtagResults.size() - _filterResults.size() - _peerSearchResults.size();
+				_hashtagSelected = _filteredSelected = _peerSearchSelected = _searchedSelected = -1;
 			} else {
-				_hashtagSelected = _filteredSelected = _peerSearchSelected = -1;
-				_searchedSelected = cur - _hashtagResults.size() - _filterResults.size() - _peerSearchResults.size();
+				_searchedSelected = cur - _hashtagResults.size() - _filterResults.size() - _peerSearchResults.size() - _previewResults.size();
+				_hashtagSelected = _filteredSelected = _peerSearchSelected = _previewSelected = -1;
 			}
 		}
 		if (base::in_range(_hashtagSelected, 0, _hashtagResults.size())) {
@@ -3533,6 +3708,13 @@ void InnerWidget::selectSkip(int32 direction) {
 			const auto height = st::dialogsRowHeight
 				+ (_peerSearchSelected ? 0 : st::searchedBarHeight);
 			scrollToItem(from, height);
+		} else if (base::in_range(_previewSelected, 0, _previewResults.size())) {
+			const auto from = previewOffset()
+				+ _previewSelected * _st->height
+				+ (_previewSelected ? 0 : -st::searchedBarHeight);
+			const auto height = _st->height
+				+ (_previewSelected ? 0 : st::searchedBarHeight);
+			scrollToItem(from, height);
 		} else {
 			const auto from = searchedOffset()
 				+ _searchedSelected * _st->height
@@ -3551,7 +3733,14 @@ void InnerWidget::scrollToEntry(const RowDescriptor &entry) {
 			scrollToItem(dialogsOffset() + row->top(), row->height());
 		}
 	} else if (_state == WidgetState::Filtered) {
-		for (int32 i = 0, c = _searchResults.size(); i < c; ++i) {
+		for (auto i = 0, c = int(_previewResults.size()); i != c; ++i) {
+			if (isSearchResultActive(_previewResults[i].get(), entry)) {
+				const auto from = previewOffset() + i * _st->height;
+				scrollToItem(from, _st->height);
+				return;
+			}
+		}
+		for (auto i = 0, c = int(_searchResults.size()); i != c; ++i) {
 			if (isSearchResultActive(_searchResults[i].get(), entry)) {
 				const auto from = searchedOffset() + i * _st->height;
 				scrollToItem(from, _st->height);
@@ -3646,33 +3835,45 @@ void InnerWidget::preloadRowsData() {
 		}
 		yTo -= otherStart;
 	} else if (_state == WidgetState::Filtered) {
-		int32 from = (yFrom - filteredOffset()) / _st->height;
+		auto from = (yFrom - filteredOffset()) / _st->height;
 		if (from < 0) from = 0;
 		if (from < _filterResults.size()) {
-			int32 to = (yTo / _st->height) + 1;
-			if (to > _filterResults.size()) to = _filterResults.size();
-
+			const auto to = std::min(
+				((yTo - filteredOffset()) / _st->height) + 1,
+				int(_filterResults.size()));
 			for (; from < to; ++from) {
 				_filterResults[from].key().entry()->chatListPreloadData();
 			}
 		}
 
-		from = (yFrom > filteredOffset() + st::searchedBarHeight ? ((yFrom - filteredOffset() - st::searchedBarHeight) / st::dialogsRowHeight) : 0) - _filterResults.size();
+		from = (yFrom - peerSearchOffset()) / st::dialogsRowHeight;
 		if (from < 0) from = 0;
 		if (from < _peerSearchResults.size()) {
-			int32 to = (yTo > filteredOffset() + st::searchedBarHeight ? ((yTo - filteredOffset() - st::searchedBarHeight) / st::dialogsRowHeight) : 0) - _filterResults.size() + 1;
-			if (to > _peerSearchResults.size()) to = _peerSearchResults.size();
-
+			const auto to = std::min(
+				((yTo - peerSearchOffset()) / st::dialogsRowHeight) + 1,
+				int(_peerSearchResults.size()));
 			for (; from < to; ++from) {
 				_peerSearchResults[from]->peer->loadUserpic();
 			}
 		}
-		from = (yFrom > filteredOffset() + ((_peerSearchResults.empty() ? 0 : st::searchedBarHeight) + st::searchedBarHeight) ? ((yFrom - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) - st::searchedBarHeight) / st::dialogsRowHeight) : 0) - _filterResults.size() - _peerSearchResults.size();
+
+		from = (yFrom - previewOffset()) / _st->height;
+		if (from < 0) from = 0;
+		if (from < _previewResults.size()) {
+			const auto to = std::min(
+				((yTo - previewOffset()) / _st->height) + 1,
+				int(_previewResults.size()));
+			for (; from < to; ++from) {
+				_previewResults[from]->item()->history()->peer->loadUserpic();
+			}
+		}
+
+		from = (yFrom - searchedOffset()) / _st->height;
 		if (from < 0) from = 0;
 		if (from < _searchResults.size()) {
-			int32 to = (yTo > filteredOffset() + (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) + st::searchedBarHeight ? ((yTo - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) - st::searchedBarHeight) / st::dialogsRowHeight) : 0) - _filterResults.size() - _peerSearchResults.size() + 1;
-			if (to > _searchResults.size()) to = _searchResults.size();
-
+			const auto to = std::min(
+				((yTo - searchedOffset()) / _st->height) + 1,
+				int(_searchResults.size()));
 			for (; from < to; ++from) {
 				_searchResults[from]->item()->history()->peer->loadUserpic();
 			}
@@ -3803,6 +4004,14 @@ ChosenRow InnerWidget::computeChosenRow() const {
 				.key = session().data().history(peer),
 				.message = Data::UnreadMessagePosition
 			};
+		} else if (base::in_range(_previewSelected, 0, _previewResults.size())) {
+			const auto result = _previewResults[_previewSelected].get();
+			const auto topic = result->topic();
+			const auto item = result->item();
+			return {
+				.key = (topic ? (Entry*)topic : (Entry*)item->history()),
+				.message = item->position()
+			};
 		} else if (base::in_range(_searchedSelected, 0, _searchResults.size())) {
 			const auto result = _searchResults[_searchedSelected].get();
 			const auto topic = result->topic();
@@ -3832,6 +4041,11 @@ bool InnerWidget::chooseRow(
 		MsgId pressedTopicRootId) {
 	if (chooseHashtag()) {
 		return true;
+	} else if (_selectedMorePosts) {
+		if (_searchHashOrCashtag != HashOrCashtag::None) {
+			_changeSearchTabRequests.fire(ChatSearchTab::PublicPosts);
+		}
+		return true;
 	}
 	const auto modifyChosenRow = [&](
 			ChosenRow row,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index a0b80ef67..a284cca11 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -72,13 +72,18 @@ struct ChosenRow {
 	bool newWindow : 1 = false;
 };
 
-enum class SearchRequestType : uchar {
-	FromStart,
-	FromOffset,
-	PeerFromStart,
-	PeerFromOffset,
-	MigratedFromStart,
-	MigratedFromOffset,
+struct SearchRequestType {
+	bool migrated : 1 = false;
+	bool posts : 1 = false;
+	bool start : 1 = false;
+	bool peer : 1 = false;
+
+	friend inline constexpr auto operator<=>(
+		SearchRequestType a,
+		SearchRequestType b) = default;
+	friend inline constexpr bool operator==(
+		SearchRequestType a,
+		SearchRequestType b) = default;
 };
 
 enum class SearchRequestDelay : uchar {
@@ -283,6 +288,7 @@ private:
 	void setHashtagPressed(int pressed);
 	void setFilteredPressed(int pressed, bool pressedTopicJump);
 	void setPeerSearchPressed(int pressed);
+	void setPreviewPressed(int pressed);
 	void setSearchedPressed(int pressed);
 	bool isPressed() const {
 		return (_collapsedPressed >= 0)
@@ -290,7 +296,9 @@ private:
 			|| (_hashtagPressed >= 0)
 			|| (_filteredPressed >= 0)
 			|| (_peerSearchPressed >= 0)
-			|| (_searchedPressed >= 0);
+			|| (_previewPressed >= 0)
+			|| (_searchedPressed >= 0)
+			|| _pressedMorePosts;
 	}
 	bool isSelected() const {
 		return (_collapsedSelected >= 0)
@@ -298,7 +306,9 @@ private:
 			|| (_hashtagSelected >= 0)
 			|| (_filteredSelected >= 0)
 			|| (_peerSearchSelected >= 0)
-			|| (_searchedSelected >= 0);
+			|| (_previewSelected >= 0)
+			|| (_searchedSelected >= 0)
+			|| _selectedMorePosts;
 	}
 	bool uniqueSearchResults() const;
 	bool hasHistoryInResults(not_null<History*> history) const;
@@ -352,6 +362,7 @@ private:
 	[[nodiscard]] int filteredHeight(int till = -1) const;
 	[[nodiscard]] int peerSearchOffset() const;
 	[[nodiscard]] int searchInChatOffset() const;
+	[[nodiscard]] int previewOffset() const;
 	[[nodiscard]] int searchedOffset() const;
 	[[nodiscard]] int searchInChatSkip() const;
 	[[nodiscard]] int hashtagsOffset() const;
@@ -403,14 +414,18 @@ private:
 	//	const Ui::Text::String &text) const;
 	void updateSearchIn();
 	void repaintSearchResult(int index);
+	void repaintPreviewResult(int index);
+
+	[[nodiscard]] bool computeSearchWithPostsPreview() const;
 
 	Ui::VideoUserpic *validateVideoUserpic(not_null<Row*> row);
 	Ui::VideoUserpic *validateVideoUserpic(not_null<History*> history);
 
 	Row *shownRowByKey(Key key);
 	void clearSearchResults(bool clearPeerSearchResults = true);
+	void clearPreviewResults();
 	void updateSelectedRow(Key key = Key());
-	void trackSearchResultsHistory(not_null<History*> history);
+	void trackResultsHistory(not_null<History*> history);
 
 	[[nodiscard]] QBrush currentBg() const;
 	[[nodiscard]] RowDescriptor computeChatPreviewRow() const;
@@ -449,6 +464,8 @@ private:
 	std::vector<std::unique_ptr<CollapsedRow>> _collapsedRows;
 	not_null<const style::DialogRow*> _st;
 	mutable std::unique_ptr<Ui::TopicJumpCache> _topicJumpCache;
+	bool _selectedMorePosts = false;
+	bool _pressedMorePosts = false;
 	int _collapsedSelected = -1;
 	int _collapsedPressed = -1;
 	bool _skipTopDialog = false;
@@ -487,14 +504,21 @@ private:
 
 	EmptyState _emptyState = EmptyState::None;
 
+	base::flat_set<not_null<History*>> _trackedHistories;
+	rpl::lifetime _trackedLifetime;
+
 	QString _peerSearchQuery;
 	std::vector<std::unique_ptr<PeerSearchResult>> _peerSearchResults;
 	int _peerSearchSelected = -1;
 	int _peerSearchPressed = -1;
 
+	std::vector<std::unique_ptr<FakeRow>> _previewResults;
+	int _previewCount = 0;
+	int _previewSelected = -1;
+	int _previewPressed = -1;
+	int _morePostsWidth = 0;
+
 	std::vector<std::unique_ptr<FakeRow>> _searchResults;
-	base::flat_set<not_null<History*>> _searchResultsHistories;
-	rpl::lifetime _searchResultsLifetime;
 	int _searchedCount = 0;
 	int _searchedMigratedCount = 0;
 	int _searchedSelected = -1;
@@ -516,6 +540,7 @@ private:
 
 	SearchState _searchState;
 	HashOrCashtag _searchHashOrCashtag = {};
+	bool _searchWithPostsPreview = false;
 	History *_searchInMigrated = nullptr;
 	PeerData *_searchFromShown = nullptr;
 	Ui::Text::String _searchFromUserText;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 3d9d1daf4..9cef777db 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -234,7 +234,9 @@ void Widget::BottomButton::radialAnimationCallback() {
 	}
 }
 
-void Widget::BottomButton::onStateChanged(State was, StateChangeSource source) {
+void Widget::BottomButton::onStateChanged(
+		State was,
+		StateChangeSource source) {
 	RippleButton::onStateChanged(was, source);
 	if ((was & StateFlag::Disabled) != (state() & StateFlag::Disabled)) {
 		_loading = isDisabled()
@@ -532,11 +534,11 @@ Widget::Widget(
 		}, lifetime());
 	}
 
-	_cancelSearch->setClickedCallback([this] {
+	_cancelSearch->setClickedCallback([=] {
 		cancelSearch({ .jumpBackToSearchedChat = true });
 	});
-	_jumpToDate->entity()->setClickedCallback([this] { showCalendar(); });
-	_chooseFromUser->entity()->setClickedCallback([this] { showSearchFrom(); });
+	_jumpToDate->entity()->setClickedCallback([=] { showCalendar(); });
+	_chooseFromUser->entity()->setClickedCallback([=] { showSearchFrom(); });
 	rpl::single(rpl::empty) | rpl::then(
 		session().domain().local().localPasscodeChanged()
 	) | rpl::start_with_next([=] {
@@ -576,11 +578,10 @@ Widget::Widget(
 	});
 	_inner->setLoadMoreCallback([=] {
 		const auto state = _inner->state();
+		const auto process = currentSearchProcess();
 		if (state == WidgetState::Filtered
-			&& (!_searchFull
-				|| (_searchInMigrated
-					&& _searchFull
-					&& !_searchFullMigrated))) {
+			&& (!process->full
+				|| (_searchInMigrated && !_migratedProcess.full))) {
 			searchMore();
 		} else if (_openedForum && state == WidgetState::Default) {
 			_openedForum->requestTopics();
@@ -1199,11 +1200,12 @@ void Widget::fullSearchRefreshOn(rpl::producer<> events) {
 		return !_searchQuery.isEmpty();
 	}) | rpl::start_with_next([=] {
 		_searchTimer.cancel();
-		_searchCache.clear();
-		_singleMessageSearch.clear();
-		for (const auto &[requestId, query] : base::take(_searchQueries)) {
+		_searchProcess.cache.clear();
+		const auto queries = base::take(_searchProcess.queries);
+		for (const auto &[requestId, query] : queries) {
 			session().api().request(requestId).cancel();
 		}
+		_singleMessageSearch.clear();
 		_searchQuery = QString();
 		_scroll->scrollToY(0);
 		cancelSearchRequest();
@@ -1529,6 +1531,7 @@ void Widget::changeOpenedForum(Data::Forum *forum, anim::type animated) {
 		_searchState.tab = forum
 			? ChatSearchTab::ThisPeer
 			: ChatSearchTab::MyMessages;
+		_searchWithPostsPreview = computeSearchWithPostsPreview();
 		_api.request(base::take(_topicSearchRequest)).cancel();
 		_inner->changeOpenedForum(forum);
 		storiesToggleExplicitExpand(false);
@@ -2110,12 +2113,18 @@ bool Widget::search(bool inCache, SearchRequestDelay delay) {
 	const auto fromPeer = searchFromPeer();
 	const auto &inTags = searchInTags();
 	const auto tab = _searchState.tab;
-	const auto fromStartType = inPeer
-		? SearchRequestType::PeerFromStart
-		: SearchRequestType::FromStart;
+	const auto fromStartType = SearchRequestType{
+		.start = true,
+		.peer = (inPeer != nullptr),
+	};
 	if (trimmed.isEmpty() && !fromPeer && inTags.empty()) {
 		cancelSearchRequest();
-		searchApplyEmpty(fromStartType, 0);
+		searchApplyEmpty(fromStartType, currentSearchProcess());
+		if (_searchWithPostsPreview) {
+			searchApplyEmpty(
+				{ .posts = true, .start = true },
+				&_postsProcess);
+		}
 		_api.request(base::take(_peerSearchRequest)).cancel();
 		_peerSearchQuery = QString();
 		peerSearchApplyEmpty(0);
@@ -2128,28 +2137,32 @@ bool Widget::search(bool inCache, SearchRequestDelay delay) {
 		if (!success) {
 			return false;
 		}
-		const auto i = _searchCache.find(query);
-		if (i != _searchCache.end()) {
+		const auto process = currentSearchProcess();
+		const auto i = process->cache.find(query);
+		if (i != process->cache.end()) {
 			_searchQuery = query;
 			_searchQueryFrom = fromPeer;
 			_searchQueryTags = inTags;
 			_searchQueryTab = tab;
-			_searchNextRate = 0;
-			_searchFull = _searchFullMigrated = false;
+			process->nextRate = 0;
+			process->full = false;
+			_migratedProcess.full = false;
 			cancelSearchRequest();
-			searchReceived(fromStartType, i->second, 0);
+			searchReceived(fromStartType, i->second, process, true);
 			result = true;
 		}
 	} else if (_searchQuery != query
 		|| _searchQueryFrom != fromPeer
 		|| _searchQueryTags != inTags
 		|| _searchQueryTab != tab) {
+		const auto process = currentSearchProcess();
 		_searchQuery = query;
 		_searchQueryFrom = fromPeer;
 		_searchQueryTags = inTags;
 		_searchQueryTab = tab;
-		_searchNextRate = 0;
-		_searchFull = _searchFullMigrated = false;
+		process->nextRate = 0;
+		process->full = false;
+		_migratedProcess.full = false;
 		cancelSearchRequest();
 		if (inPeer) {
 			const auto topic = searchInTopic();
@@ -2163,83 +2176,55 @@ bool Widget::search(bool inCache, SearchRequestDelay delay) {
 			const auto savedPeer = sublist
 				? sublist->peer().get()
 				: nullptr;
-			_searchInHistoryRequest = histories.sendRequest(history, type, [=](Fn<void()> finish) {
-				const auto type = SearchRequestType::PeerFromStart;
+			_historiesRequest = histories.sendRequest(history, type, [=](
+					Fn<void()> finish) {
+				const auto type = SearchRequestType{
+					.start = true,
+					.peer = true,
+				};
 				using Flag = MTPmessages_Search::Flag;
-				_searchRequest = session().api().request(MTPmessages_Search(
-					MTP_flags((topic ? Flag::f_top_msg_id : Flag())
-						| (fromPeer ? Flag::f_from_id : Flag())
-						| (savedPeer ? Flag::f_saved_peer_id : Flag())
-						| (_searchQueryTags.empty()
-							? Flag()
-							: Flag::f_saved_reaction)),
-					inPeer->input,
-					MTP_string(_searchQuery),
-					(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
-					(savedPeer ? savedPeer->input : MTP_inputPeerEmpty()),
-					MTP_vector_from_range(
-						_searchQueryTags | ranges::views::transform(
-							Data::ReactionToMTP
-						)),
-					MTP_int(topic ? topic->rootId() : 0),
-					MTP_inputMessagesFilterEmpty(),
-					MTP_int(0), // min_date
-					MTP_int(0), // max_date
-					MTP_int(0), // offset_id
-					MTP_int(0), // add_offset
-					MTP_int(kSearchPerPage),
-					MTP_int(0), // max_id
-					MTP_int(0), // min_id
-					MTP_long(0) // hash
-				)).done([=](const MTPmessages_Messages &result) {
-					_searchInHistoryRequest = 0;
-					searchReceived(type, result, _searchRequest);
+				process->requestId = session().api().request(
+					MTPmessages_Search(
+						MTP_flags((topic ? Flag::f_top_msg_id : Flag())
+							| (fromPeer ? Flag::f_from_id : Flag())
+							| (savedPeer ? Flag::f_saved_peer_id : Flag())
+							| (_searchQueryTags.empty()
+								? Flag()
+								: Flag::f_saved_reaction)),
+						inPeer->input,
+						MTP_string(_searchQuery),
+						(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
+						(savedPeer ? savedPeer->input : MTP_inputPeerEmpty()),
+						MTP_vector_from_range(
+							_searchQueryTags | ranges::views::transform(
+								Data::ReactionToMTP
+							)),
+						MTP_int(topic ? topic->rootId() : 0),
+						MTP_inputMessagesFilterEmpty(),
+						MTP_int(0), // min_date
+						MTP_int(0), // max_date
+						MTP_int(0), // offset_id
+						MTP_int(0), // add_offset
+						MTP_int(kSearchPerPage),
+						MTP_int(0), // max_id
+						MTP_int(0), // min_id
+						MTP_long(0)) // hash
+				).done([=](const MTPmessages_Messages &result) {
+					_historiesRequest = 0;
+					searchReceived(type, result, process);
 					finish();
 				}).fail([=](const MTP::Error &error) {
-					_searchInHistoryRequest = 0;
-					searchFailed(type, error, _searchRequest);
+					_historiesRequest = 0;
+					searchFailed(type, error, process);
 					finish();
 				}).send();
-				_searchQueries.emplace(_searchRequest, _searchQuery);
-				return _searchRequest;
+				process->queries.emplace(process->requestId, _searchQuery);
+				return process->requestId;
 			});
 		} else if (_searchState.tab == ChatSearchTab::PublicPosts) {
-			const auto type = SearchRequestType::FromStart;
-			_searchRequest = session().api().request(MTPchannels_SearchPosts(
-				MTP_string(_searchState.query.trimmed().mid(1)),
-				MTP_int(0), // offset_rate
-				MTP_inputPeerEmpty(), // offset_peer
-				MTP_int(0), // offset_id
-				MTP_int(kSearchPerPage)
-			)).done([=](const MTPmessages_Messages &result) {
-				searchReceived(type, result, _searchRequest);
-			}).fail([=](const MTP::Error &error) {
-				searchFailed(type, error, _searchRequest);
-			}).send();
-			_searchQueries.emplace(_searchRequest, _searchQuery);
+			requestPublicPosts(true);
 		} else {
-			const auto type = SearchRequestType::FromStart;
-			const auto flags = session().settings().skipArchiveInSearch()
-				? MTPmessages_SearchGlobal::Flag::f_folder_id
-				: MTPmessages_SearchGlobal::Flag(0);
-			const auto folderId = 0;
-			_searchRequest = session().api().request(MTPmessages_SearchGlobal(
-				MTP_flags(flags),
-				MTP_int(folderId),
-				MTP_string(_searchQuery),
-				MTP_inputMessagesFilterEmpty(),
-				MTP_int(0), // min_date
-				MTP_int(0), // max_date
-				MTP_int(0), // offset_rate
-				MTP_inputPeerEmpty(), // offset_peer
-				MTP_int(0), // offset_id
-				MTP_int(kSearchPerPage)
-			)).done([=](const MTPmessages_Messages &result) {
-				searchReceived(type, result, _searchRequest);
-			}).fail([=](const MTP::Error &error) {
-				searchFailed(type, error, _searchRequest);
-			}).send();
-			_searchQueries.emplace(_searchRequest, _searchQuery);
+			requestMessages(true);
 		}
 		_inner->searchRequested(true);
 	} else {
@@ -2261,7 +2246,9 @@ bool Widget::search(bool inCache, SearchRequestDelay delay) {
 			_peerSearchRequest = _api.request(MTPcontacts_Search(
 				MTP_string(_peerSearchQuery),
 				MTP_int(SearchPeopleLimit)
-			)).done([=](const MTPcontacts_Found &result, mtpRequestId requestId) {
+			)).done([=](
+					const MTPcontacts_Found &result,
+					mtpRequestId requestId) {
 				peerSearchReceived(result, requestId);
 			}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
 				peerSearchFailed(error, requestId);
@@ -2368,11 +2355,12 @@ void Widget::searchTopics() {
 }
 
 void Widget::searchMore() {
-	if (_searchRequest
-		|| _searchInHistoryRequest
+	const auto process = currentSearchProcess();
+	if (process->requestId
+		|| _historiesRequest
 		|| _searchTimer.isActive()) {
 		return;
-	} else if (!_searchFull) {
+	} else if (!process->full) {
 		if (const auto peer = searchInPeer()) {
 			auto &histories = session().data().histories();
 			const auto topic = searchInTopic();
@@ -2385,154 +2373,213 @@ void Widget::searchMore() {
 			const auto savedPeer = sublist
 				? sublist->peer().get()
 				: nullptr;
-			_searchInHistoryRequest = histories.sendRequest(history, type, [=](Fn<void()> finish) {
-				const auto type = _lastSearchId
-					? SearchRequestType::PeerFromOffset
-					: SearchRequestType::PeerFromStart;
+			_historiesRequest = histories.sendRequest(history, type, [=](
+					Fn<void()> finish) {
+				const auto type = SearchRequestType{
+					.start = !process->lastId,
+					.peer = true,
+				};
 				using Flag = MTPmessages_Search::Flag;
-				_searchRequest = session().api().request(MTPmessages_Search(
-					MTP_flags((topic ? Flag::f_top_msg_id : Flag())
-						| (fromPeer ? Flag::f_from_id : Flag())
-						| (savedPeer ? Flag::f_saved_peer_id : Flag())
-						| (_searchQueryTags.empty()
-							? Flag()
-							: Flag::f_saved_reaction)),
-					peer->input,
+				process->requestId = session().api().request(
+					MTPmessages_Search(
+						MTP_flags((topic ? Flag::f_top_msg_id : Flag())
+							| (fromPeer ? Flag::f_from_id : Flag())
+							| (savedPeer ? Flag::f_saved_peer_id : Flag())
+							| (_searchQueryTags.empty()
+								? Flag()
+								: Flag::f_saved_reaction)),
+						peer->input,
+						MTP_string(_searchQuery),
+						(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
+						(savedPeer
+							? savedPeer->input
+							: MTP_inputPeerEmpty()),
+						MTP_vector_from_range(
+							_searchQueryTags | ranges::views::transform(
+								Data::ReactionToMTP
+							)),
+						MTP_int(topic ? topic->rootId() : 0),
+						MTP_inputMessagesFilterEmpty(),
+						MTP_int(0), // min_date
+						MTP_int(0), // max_date
+						MTP_int(process->lastId),
+						MTP_int(0), // add_offset
+						MTP_int(kSearchPerPage),
+						MTP_int(0), // max_id
+						MTP_int(0), // min_id
+						MTP_long(0)) // hash
+				).done([=](const MTPmessages_Messages &result) {
+					searchReceived(type, result, process);
+					_historiesRequest = 0;
+					finish();
+				}).fail([=](const MTP::Error &error) {
+					searchFailed(type, error, process);
+					_historiesRequest = 0;
+					finish();
+				}).send();
+				if (!process->lastId) {
+					process->queries.emplace(
+						process->requestId,
+						_searchQuery);
+				}
+				return process->requestId;
+			});
+		} else if (_searchState.tab == ChatSearchTab::PublicPosts) {
+			requestPublicPosts(false);
+		} else {
+			requestMessages(false);
+		}
+	} else if (_searchInMigrated && !_migratedProcess.full) {
+		auto &histories = session().data().histories();
+		const auto type = Data::Histories::RequestType::History;
+		const auto history = _searchInMigrated;
+		_historiesRequest = histories.sendRequest(history, type, [=](
+				Fn<void()> finish) {
+			const auto type = SearchRequestType{
+				.migrated = true,
+				.start = !_migratedProcess.lastId,
+			};
+			const auto flags = _searchQueryFrom
+				? MTP_flags(MTPmessages_Search::Flag::f_from_id)
+				: MTP_flags(0);
+			_migratedProcess.requestId = session().api().request(
+				MTPmessages_Search(
+					flags,
+					_searchInMigrated->peer->input,
 					MTP_string(_searchQuery),
-					(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
-					(savedPeer ? savedPeer->input : MTP_inputPeerEmpty()),
-					MTP_vector_from_range(
-						_searchQueryTags | ranges::views::transform(
-							Data::ReactionToMTP
-						)),
-					MTP_int(topic ? topic->rootId() : 0),
+					(_searchQueryFrom
+						? _searchQueryFrom->input
+						: MTP_inputPeerEmpty()),
+					MTPInputPeer(), // saved_peer_id
+					MTPVector<MTPReaction>(), // saved_reaction
+					MTPint(), // top_msg_id
 					MTP_inputMessagesFilterEmpty(),
 					MTP_int(0), // min_date
 					MTP_int(0), // max_date
-					MTP_int(_lastSearchId),
+					MTP_int(_migratedProcess.lastId),
 					MTP_int(0), // add_offset
 					MTP_int(kSearchPerPage),
 					MTP_int(0), // max_id
 					MTP_int(0), // min_id
-					MTP_long(0) // hash
-				)).done([=](const MTPmessages_Messages &result) {
-					searchReceived(type, result, _searchRequest);
-					_searchInHistoryRequest = 0;
-					finish();
-				}).fail([=](const MTP::Error &error) {
-					searchFailed(type, error, _searchRequest);
-					_searchInHistoryRequest = 0;
-					finish();
-				}).send();
-				if (!_lastSearchId) {
-					_searchQueries.emplace(_searchRequest, _searchQuery);
-				}
-				return _searchRequest;
-			});
-		} else {
-			const auto type = _lastSearchId
-				? SearchRequestType::FromOffset
-				: SearchRequestType::FromStart;
-			const auto flags = session().settings().skipArchiveInSearch()
-				? MTPmessages_SearchGlobal::Flag::f_folder_id
-				: MTPmessages_SearchGlobal::Flag(0);
-			const auto folderId = 0;
-			_searchRequest = session().api().request(MTPmessages_SearchGlobal(
-				MTP_flags(flags),
-				MTP_int(folderId),
-				MTP_string(_searchQuery),
-				MTP_inputMessagesFilterEmpty(),
-				MTP_int(0), // min_date
-				MTP_int(0), // max_date
-				MTP_int(_searchNextRate),
-				(_lastSearchPeer
-					? _lastSearchPeer->input
-					: MTP_inputPeerEmpty()),
-				MTP_int(_lastSearchId),
-				MTP_int(kSearchPerPage)
-			)).done([=](const MTPmessages_Messages &result) {
-				searchReceived(type, result, _searchRequest);
-			}).fail([=](const MTP::Error &error) {
-				searchFailed(type, error, _searchRequest);
-			}).send();
-			if (!_lastSearchId) {
-				_searchQueries.emplace(_searchRequest, _searchQuery);
-			}
-		}
-	} else if (_searchInMigrated && !_searchFullMigrated) {
-		auto &histories = session().data().histories();
-		const auto type = Data::Histories::RequestType::History;
-		const auto history = _searchInMigrated;
-		_searchInHistoryRequest = histories.sendRequest(history, type, [=](Fn<void()> finish) {
-			const auto type = _lastSearchMigratedId
-				? SearchRequestType::MigratedFromOffset
-				: SearchRequestType::MigratedFromStart;
-			const auto flags = _searchQueryFrom
-				? MTP_flags(MTPmessages_Search::Flag::f_from_id)
-				: MTP_flags(0);
-			_searchRequest = session().api().request(MTPmessages_Search(
-				flags,
-				_searchInMigrated->peer->input,
-				MTP_string(_searchQuery),
-				(_searchQueryFrom
-					? _searchQueryFrom->input
-					: MTP_inputPeerEmpty()),
-				MTPInputPeer(), // saved_peer_id
-				MTPVector<MTPReaction>(), // saved_reaction
-				MTPint(), // top_msg_id
-				MTP_inputMessagesFilterEmpty(),
-				MTP_int(0), // min_date
-				MTP_int(0), // max_date
-				MTP_int(_lastSearchMigratedId),
-				MTP_int(0), // add_offset
-				MTP_int(kSearchPerPage),
-				MTP_int(0), // max_id
-				MTP_int(0), // min_id
-				MTP_long(0) // hash
-			)).done([=](const MTPmessages_Messages &result) {
-				searchReceived(type, result, _searchRequest);
-				_searchInHistoryRequest = 0;
+					MTP_long(0)) // hash
+			).done([=](const MTPmessages_Messages &result) {
+				searchReceived(type, result, &_migratedProcess);
+				_historiesRequest = 0;
 				finish();
 			}).fail([=](const MTP::Error &error) {
-				searchFailed(type, error, _searchRequest);
-				_searchInHistoryRequest = 0;
+				searchFailed(type, error, &_migratedProcess);
+				_historiesRequest = 0;
 				finish();
 			}).send();
-			return _searchRequest;
+			return _migratedProcess.requestId;
 		});
 	}
 }
 
+void Widget::requestPublicPosts(bool fromStart) {
+	if (!_postsProcess.lastId || !_postsProcess.lastPeer) {
+		fromStart = true;
+	}
+	const auto type = SearchRequestType{
+		.posts = true,
+		.start = fromStart,
+	};
+	_postsProcess.requestId = session().api().request(
+		MTPchannels_SearchPosts(
+			MTP_string(_searchState.query.trimmed().mid(1)),
+			MTP_int(fromStart ? 0 : _postsProcess.nextRate),
+			(fromStart
+				? MTP_inputPeerEmpty()
+				: _postsProcess.lastPeer->input),
+			MTP_int(fromStart ? 0 : _postsProcess.lastId),
+			MTP_int(kSearchPerPage))
+	).done([=](const MTPmessages_Messages &result) {
+		searchReceived(type, result, &_postsProcess);
+	}).fail([=](const MTP::Error &error) {
+		searchFailed(type, error, &_postsProcess);
+	}).send();
+	if (fromStart) {
+		_postsProcess.queries.emplace(_postsProcess.requestId, _searchQuery);
+	}
+}
+
+void Widget::requestMessages(bool fromStart) {
+	if (!_searchProcess.lastId || !_searchProcess.lastPeer) {
+		fromStart = true;
+	}
+	const auto type = SearchRequestType{
+		.start = fromStart,
+	};
+	const auto flags = session().settings().skipArchiveInSearch()
+		? MTPmessages_SearchGlobal::Flag::f_folder_id
+		: MTPmessages_SearchGlobal::Flag(0);
+	const auto folderId = 0;
+	_searchProcess.requestId = session().api().request(
+		MTPmessages_SearchGlobal(
+			MTP_flags(flags),
+			MTP_int(folderId),
+			MTP_string(_searchQuery),
+			MTP_inputMessagesFilterEmpty(),
+			MTP_int(0), // min_date
+			MTP_int(0), // max_date
+			MTP_int(fromStart ? 0 : _searchProcess.nextRate),
+			(fromStart
+				? MTP_inputPeerEmpty()
+				: _searchProcess.lastPeer->input),
+			MTP_int(fromStart ? 0 : _searchProcess.lastId),
+			MTP_int(kSearchPerPage))
+	).done([=](const MTPmessages_Messages &result) {
+		searchReceived(type, result, &_searchProcess);
+	}).fail([=](const MTP::Error &error) {
+		searchFailed(type, error, &_searchProcess);
+	}).send();
+	if (!_searchProcess.lastId) {
+		_searchProcess.queries.emplace(
+			_searchProcess.requestId,
+			_searchQuery);
+	}
+	if (fromStart && _searchWithPostsPreview) {
+		requestPublicPosts(true);
+	}
+}
+
+auto Widget::currentSearchProcess() -> not_null<SearchProcessState*> {
+	return (_searchState.tab == ChatSearchTab::PublicPosts)
+		? &_postsProcess
+		: &_searchProcess;
+}
+
+bool Widget::computeSearchWithPostsPreview() const {
+	return 	(_searchHashOrCashtag != HashOrCashtag::None)
+		&& (_searchState.tab == ChatSearchTab::MyMessages);
+}
+
 void Widget::searchReceived(
 		SearchRequestType type,
 		const MTPmessages_Messages &result,
-		mtpRequestId requestId) {
+		not_null<SearchProcessState*> process,
+		bool cacheResults) {
 	const auto state = _inner->state();
-	if (state == WidgetState::Filtered) {
-		if (type == SearchRequestType::FromStart || type == SearchRequestType::PeerFromStart) {
-			auto i = _searchQueries.find(requestId);
-			if (i != _searchQueries.end()) {
-				_searchCache[i->second] = result;
-				_searchQueries.erase(i);
-			}
+	if (!cacheResults
+		&& (state == WidgetState::Filtered)
+		&& type.start) {
+		const auto i = process->queries.find(process->requestId);
+		if (i != process->queries.end()) {
+			process->cache[i->second] = result;
+			process->queries.erase(i);
 		}
 	}
-	const auto inject = (type == SearchRequestType::FromStart
-		|| type == SearchRequestType::PeerFromStart)
+	const auto inject = (type.start && !type.posts)
 		? *_singleMessageSearch.lookup(_searchQuery)
 		: nullptr;
-
-	if (_searchRequest != requestId) {
+	if (cacheResults && process->requestId) {
 		return;
 	}
-	if (type == SearchRequestType::FromStart
-		|| type == SearchRequestType::PeerFromStart) {
-		_lastSearchPeer = nullptr;
-		_lastSearchId = _lastSearchMigratedId = 0;
+	if (type.start) {
+		process->lastPeer = nullptr;
+		process->lastId = 0;
 	}
-	const auto isMigratedSearch = (type == SearchRequestType::MigratedFromStart)
-		|| (type == SearchRequestType::MigratedFromOffset);
-	const auto process = [&](const MTPVector<MTPMessage> &messages) {
+	const auto processList = [&](const MTPVector<MTPMessage> &messages) {
 		auto result = std::vector<not_null<HistoryItem*>>();
 		for (const auto &message : messages.v) {
 			const auto msgId = IdFromMessage(message);
@@ -2546,55 +2593,44 @@ void Widget::searchReceived(
 						NewMessageType::Existing);
 					result.push_back(item);
 				}
-				_lastSearchPeer = peer;
+				process->lastPeer = peer;
 			} else {
 				LOG(("API Error: a search results with not loaded peer %1"
 					).arg(peerId.value));
 			}
-			if (isMigratedSearch) {
-				_lastSearchMigratedId = msgId;
-			} else {
-				_lastSearchId = msgId;
-			}
+			process->lastId = msgId;
 		}
 		return result;
 	};
 	auto fullCount = 0;
 	auto messages = result.match([&](const MTPDmessages_messages &data) {
-		if (_searchRequest != 0) {
+		if (!cacheResults) {
 			// Don't apply cached data!
 			session().data().processUsers(data.vusers());
 			session().data().processChats(data.vchats());
 		}
-		if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-			_searchFullMigrated = true;
-		} else {
-			_searchFull = true;
-		}
-		auto list = process(data.vmessages());
+		process->full = true;
+		auto list = processList(data.vmessages());
 		fullCount = list.size();
 		return list;
 	}, [&](const MTPDmessages_messagesSlice &data) {
-		if (_searchRequest != 0) {
+		if (!cacheResults) {
 			// Don't apply cached data!
 			session().data().processUsers(data.vusers());
 			session().data().processChats(data.vchats());
 		}
-		auto list = process(data.vmessages());
+		auto list = processList(data.vmessages());
 		const auto nextRate = data.vnext_rate();
-		const auto rateUpdated = nextRate && (nextRate->v != _searchNextRate);
-		const auto finished = (type == SearchRequestType::FromStart || type == SearchRequestType::FromOffset)
-			? !rateUpdated
-			: list.empty();
+		const auto rateUpdated = nextRate
+			&& (nextRate->v != process->nextRate);
+		const auto finished = (type.peer || type.migrated || type.posts)
+			? list.empty()
+			: !rateUpdated;
 		if (rateUpdated) {
-			_searchNextRate = nextRate->v;
+			process->nextRate = nextRate->v;
 		}
 		if (finished) {
-			if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-				_searchFullMigrated = true;
-			} else {
-				_searchFull = true;
-			}
+			process->full = true;
 		}
 		fullCount = data.vcount().v;
 		return list;
@@ -2613,33 +2649,26 @@ void Widget::searchReceived(
 				"received messages.channelMessages when no channel "
 				"was passed! (Widget::searchReceived)"));
 		}
-		if (_searchRequest != 0) {
+		if (!cacheResults) {
 			// Don't apply cached data!
 			session().data().processUsers(data.vusers());
 			session().data().processChats(data.vchats());
 		}
-		auto list = process(data.vmessages());
+		auto list = processList(data.vmessages());
 		if (list.empty()) {
-			if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-				_searchFullMigrated = true;
-			} else {
-				_searchFull = true;
-			}
+			process->full = true;
 		}
 		fullCount = data.vcount().v;
 		return list;
 	}, [&](const MTPDmessages_messagesNotModified &) {
-		LOG(("API Error: received messages.messagesNotModified! (Widget::searchReceived)"));
-		if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-			_searchFullMigrated = true;
-		} else {
-			_searchFull = true;
-		}
+		LOG(("API Error: received messages.messagesNotModified! "
+			"(Widget::searchReceived)"));
+		process->full = true;
 		return std::vector<not_null<HistoryItem*>>();
 	});
 	_inner->searchReceived(messages, inject, type, fullCount);
 
-	_searchRequest = 0;
+	process->requestId = 0;
 	listScrollUpdated();
 	update();
 }
@@ -2671,15 +2700,17 @@ void Widget::peerSearchReceived(
 	}
 }
 
-void Widget::searchApplyEmpty(SearchRequestType type, mtpRequestId id) {
-	_searchFull = _searchFullMigrated = true;
+void Widget::searchApplyEmpty(
+		SearchRequestType type,
+		not_null<SearchProcessState*> process) {
+	process->full = true;
 	searchReceived(
 		type,
 		MTP_messages_messages(
 			MTP_vector<MTPMessage>(),
 			MTP_vector<MTPChat>(),
 			MTP_vector<MTPUser>()),
-		id);
+		process);
 }
 
 void Widget::peerSearchApplyEmpty(mtpRequestId id) {
@@ -2696,16 +2727,12 @@ void Widget::peerSearchApplyEmpty(mtpRequestId id) {
 void Widget::searchFailed(
 		SearchRequestType type,
 		const MTP::Error &error,
-		mtpRequestId requestId) {
+		not_null<SearchProcessState*> process) {
 	if (error.type() == u"SEARCH_QUERY_EMPTY"_q) {
-		searchApplyEmpty(type, requestId);
-	} else if (_searchRequest == requestId) {
-		_searchRequest = 0;
-		if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-			_searchFullMigrated = true;
-		} else {
-			_searchFull = true;
-		}
+		searchApplyEmpty(type, process);
+	} else {
+		process->requestId = 0;
+		process->full = true;
 	}
 }
 
@@ -2838,6 +2865,7 @@ QString Widget::validateSearchQuery() {
 	} else {
 		_searchHashOrCashtag = IsHashOrCashtagSearchQuery(query);
 	}
+	_searchWithPostsPreview = computeSearchWithPostsPreview();
 	return query;
 }
 
@@ -3096,6 +3124,7 @@ bool Widget::applySearchState(SearchState state) {
 		? peer->owner().history(migrateFrom).get()
 		: nullptr;
 	_searchState = state;
+	_searchWithPostsPreview = computeSearchWithPostsPreview();
 	if (queryChanged) {
 		updateLockUnlockVisibility(anim::type::normal);
 		updateLoadMoreChatsVisibility();
@@ -3111,16 +3140,20 @@ bool Widget::applySearchState(SearchState state) {
 	updateSearchFromVisibility();
 	updateLockUnlockPosition();
 
-	if ((state.query.isEmpty() && !state.fromPeer && state.tags.empty())
+	const auto searchCleared = state.query.isEmpty()
+		&& !state.fromPeer
+		&& state.tags.empty();
+	if (searchCleared
 		|| inChatChanged
 		|| fromPeerChanged
 		|| tagsChanged
 		|| tabChanged) {
-		clearSearchCache();
+		clearSearchCache(searchCleared);
 	}
 	if (state.query.isEmpty()) {
 		_peerSearchCache.clear();
-		for (const auto &[requestId, query] : base::take(_peerSearchQueries)) {
+		const auto queries = base::take(_peerSearchQueries);
+		for (const auto &[requestId, query] : queries) {
 			_api.request(requestId).cancel();
 		}
 		_peerSearchQuery = QString();
@@ -3158,15 +3191,23 @@ bool Widget::applySearchState(SearchState state) {
 	return true;
 }
 
-void Widget::clearSearchCache() {
-	_searchCache.clear();
+void Widget::clearSearchCache(bool clearPosts) {
+	_searchProcess.cache.clear();
 	_singleMessageSearch.clear();
-	for (const auto &[requestId, query] : base::take(_searchQueries)) {
+	const auto queries = base::take(_searchProcess.queries);
+	for (const auto &[requestId, query] : queries) {
 		session().api().request(requestId).cancel();
 	}
 	_searchQuery = QString();
 	_searchQueryFrom = nullptr;
 	_searchQueryTags.clear();
+	if (clearPosts) {
+		_postsProcess.cache.clear();
+		const auto queries = base::take(_postsProcess.queries);
+		for (const auto &[requestId, query] : queries) {
+			session().api().request(requestId).cancel();
+		}
+	}
 	_topicSearchQuery = QString();
 	_topicSearchOffsetDate = 0;
 	_topicSearchOffsetId = _topicSearchOffsetTopicId = 0;
@@ -3241,10 +3282,17 @@ void Widget::completeHashtag(QString tag) {
 			if (cur == start + 1
 				|| base::StringViewMid(t, start + 1, cur - start - 1)
 					== base::StringViewMid(tag, 0, cur - start - 1)) {
-				for (; cur < t.size() && cur - start - 1 < tag.size(); ++cur) {
-					if (t.at(cur) != tag.at(cur - start - 1)) break;
+				while (cur < t.size() && cur - start - 1 < tag.size()) {
+					if (t.at(cur) != tag.at(cur - start - 1)) {
+						break;
+					}
+					++cur;
+				}
+				if (cur - start - 1 == tag.size()
+					&& cur < t.size()
+					&& t.at(cur) == ' ') {
+					++cur;
 				}
-				if (cur - start - 1 == tag.size() && cur < t.size() && t.at(cur) == ' ') ++cur;
 				hashtag = t.mid(0, start + 1) + tag + ' ' + t.mid(cur);
 				setSearchQuery(hashtag, start + 1 + tag.size() + 1);
 				applySearchUpdate();
@@ -3356,7 +3404,8 @@ void Widget::updateControlsGeometry() {
 		? st::dialogsFilterSkip
 		: (st::dialogsFilterPadding.x() + _mainMenu.toggle->width()))
 		+ st::dialogsFilterPadding.x();
-	const auto filterRight = st::dialogsFilterSkip + st::dialogsFilterPadding.x();
+	const auto filterRight = st::dialogsFilterSkip
+		+ st::dialogsFilterPadding.x();
 	const auto filterWidth = qMax(ratiow, smallw) - filterLeft - filterRight;
 	const auto filterAreaHeight = st::topBarHeight;
 	_searchControls->setGeometry(0, filterAreaTop, ratiow, filterAreaHeight);
@@ -3369,7 +3418,11 @@ void Widget::updateControlsGeometry() {
 
 	auto filterTop = (filterAreaHeight - _search->height()) / 2;
 	filterLeft = anim::interpolate(filterLeft, _narrowWidth, narrowRatio);
-	_search->setGeometryToLeft(filterLeft, filterTop, filterWidth, _search->height());
+	_search->setGeometryToLeft(
+		filterLeft,
+		filterTop,
+		filterWidth,
+		_search->height());
 
 	auto mainMenuLeft = anim::interpolate(
 		st::dialogsFilterPadding.x(),
@@ -3387,12 +3440,16 @@ void Widget::updateControlsGeometry() {
 		-_searchForNarrowLayout->width(),
 		(_narrowWidth - _searchForNarrowLayout->width()) / 2,
 		narrowRatio);
-	_searchForNarrowLayout->moveToLeft(searchLeft, st::dialogsFilterPadding.y());
+	_searchForNarrowLayout->moveToLeft(
+		searchLeft,
+		st::dialogsFilterPadding.y());
 
 	auto right = filterLeft + filterWidth;
 	_cancelSearch->moveToLeft(right - _cancelSearch->width(), _search->y());
-	right -= _jumpToDate->width(); _jumpToDate->moveToLeft(right, _search->y());
-	right -= _chooseFromUser->width(); _chooseFromUser->moveToLeft(right, _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;
@@ -3691,9 +3748,11 @@ void Widget::scrollToEntry(const RowDescriptor &entry) {
 }
 
 void Widget::cancelSearchRequest() {
-	session().api().request(base::take(_searchRequest)).cancel();
+	session().api().request(base::take(_searchProcess.requestId)).cancel();
+	session().api().request(base::take(_migratedProcess.requestId)).cancel();
+	session().api().request(base::take(_postsProcess.requestId)).cancel();
 	session().data().histories().cancelRequest(
-		base::take(_searchInHistoryRequest));
+		base::take(_historiesRequest));
 }
 
 PeerData *Widget::searchInPeer() const {
@@ -3810,8 +3869,12 @@ bool Widget::cancelSearch(CancelSearchOptions options) {
 		// Don't create suggestions in unfocus case.
 		setInnerFocus(true);
 	}
-	_lastSearchPeer = nullptr;
-	_lastSearchId = _lastSearchMigratedId = 0;
+	_searchProcess.lastPeer = nullptr;
+	_searchProcess.lastId = 0;
+	_migratedProcess.lastPeer = nullptr;
+	_migratedProcess.lastId = 0;
+	_postsProcess.lastPeer = nullptr;
+	_postsProcess.lastId = 0;
 	_inner->clearFilter();
 	applySearchState(std::move(updatedState));
 	if (_suggestions && clearSearchFocus) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index a1ee3950d..ff751c714 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -75,7 +75,7 @@ class FakeRow;
 class Key;
 struct ChosenRow;
 class InnerWidget;
-enum class SearchRequestType : uchar;
+struct SearchRequestType;
 enum class SearchRequestDelay : uchar;
 class Suggestions;
 class ChatSearchIn;
@@ -151,10 +151,26 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 
 private:
+	struct SearchProcessState {
+		base::flat_map<QString, MTPmessages_Messages> cache;
+		base::flat_map<mtpRequestId, QString> queries;
+
+		PeerData *lastPeer = nullptr;
+		MsgId lastId = 0;
+		int32 nextRate = 0;
+		mtpRequestId requestId = 0;
+		bool full = false;
+	};
+
 	void chosenRow(const ChosenRow &row);
 	void listScrollUpdated();
 	void searchCursorMoved();
 	void completeHashtag(QString tag);
+	void requestPublicPosts(bool fromStart);
+	void requestMessages(bool fromStart);
+	[[nodiscard]] not_null<SearchProcessState*> currentSearchProcess();
+
+	[[nodiscard]] bool computeSearchWithPostsPreview() const;
 
 	[[nodiscard]] QString currentSearchQuery() const;
 	[[nodiscard]] int currentSearchQueryCursorPosition() const;
@@ -168,7 +184,8 @@ private:
 	void searchReceived(
 		SearchRequestType type,
 		const MTPmessages_Messages &result,
-		mtpRequestId requestId);
+		not_null<SearchProcessState*> process,
+		bool cacheResults = false);
 	void peerSearchReceived(
 		const MTPcontacts_Found &result,
 		mtpRequestId requestId);
@@ -201,7 +218,7 @@ private:
 	void showCalendar();
 	void showSearchFrom();
 	void showMainMenu();
-	void clearSearchCache();
+	void clearSearchCache(bool clearPosts);
 	void setSearchQuery(const QString &query, int cursorPosition = -1);
 	void updateControlsVisibility(bool fast = false);
 	void updateLockUnlockVisibility(
@@ -244,9 +261,11 @@ private:
 	void searchFailed(
 		SearchRequestType type,
 		const MTP::Error &error,
-		mtpRequestId requestId);
+		not_null<SearchProcessState*> process);
 	void peerSearchFailed(const MTP::Error &error, mtpRequestId requestId);
-	void searchApplyEmpty(SearchRequestType type, mtpRequestId id);
+	void searchApplyEmpty(
+		SearchRequestType type,
+		not_null<SearchProcessState*> process);
 	void peerSearchApplyEmpty(mtpRequestId id);
 
 	void updateForceDisplayWide();
@@ -318,6 +337,7 @@ private:
 	bool _scrollToTopIsShown = false;
 	bool _forumSearchRequested = false;
 	HashOrCashtag _searchHashOrCashtag = {};
+	bool _searchWithPostsPreview = false;
 
 	Data::Folder *_openedFolder = nullptr;
 	Data::Forum *_openedForum = nullptr;
@@ -358,19 +378,13 @@ private:
 	PeerData *_searchQueryFrom = nullptr;
 	std::vector<Data::ReactionId> _searchQueryTags;
 	ChatSearchTab _searchQueryTab = {};
-	int32 _searchNextRate = 0;
-	bool _searchFull = false;
-	bool _searchFullMigrated = false;
-	int _searchInHistoryRequest = 0; // Not real mtpRequestId.
-	mtpRequestId _searchRequest = 0;
 
-	PeerData *_lastSearchPeer = nullptr;
-	MsgId _lastSearchId = 0;
-	MsgId _lastSearchMigratedId = 0;
+	SearchProcessState _searchProcess;
+	SearchProcessState _migratedProcess;
+	SearchProcessState _postsProcess;
+	int _historiesRequest = 0; // Not real mtpRequestId.
 
-	base::flat_map<QString, MTPmessages_Messages> _searchCache;
 	Api::SingleMessageSearch _singleMessageSearch;
-	base::flat_map<mtpRequestId, QString> _searchQueries;
 	base::flat_map<QString, MTPcontacts_Found> _peerSearchCache;
 	base::flat_map<mtpRequestId, QString> _peerSearchQueries;
 

From 75a75626cefed6abaccbaa6ed4a2686a8b09f696 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Oct 2024 11:29:34 +0400
Subject: [PATCH 063/306] Show info about popular apps section.

---
 Telegram/Resources/langs/lang.strings         |  9 +++++
 .../SourceFiles/core/local_url_handlers.cpp   | 15 +++++++++
 Telegram/SourceFiles/dialogs/dialogs.style    |  4 +++
 .../dialogs/ui/dialogs_suggestions.cpp        | 33 ++++++++++++++++++-
 .../dialogs/ui/dialogs_suggestions.h          |  3 ++
 5 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index eb2555768..e00d24f3f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5623,6 +5623,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channels_recommended" = "Similar channels";
 "lng_bot_apps_your" = "Apps you use";
 "lng_bot_apps_popular" = "Grossing apps";
+"lng_bot_apps_which" = "Which apps are included here? {link}";
+"lng_bot_apps_which_link" = "Learn >";
+
+"lng_popular_apps_info_title" = "Top Mini Apps";
+"lng_popular_apps_info_text" = "This catalogue ranks mini apps based on their daily revenue, measured in Stars. To be listed, developers must set their main mini apps in {bot} (as described {link}), have over **1,000** daily users, and earn a daily revenue above **1,000** Stars, based on the weekly average.";
+"lng_popular_apps_info_bot" = "@botfather";
+"lng_popular_apps_info_here" = "here";
+"lng_popular_apps_info_url" = "https://core.telegram.org/bots/webapps#launching-the-main-mini-app";
+"lng_popular_apps_info_confirm" = "Understood";
 
 "lng_font_box_title" = "Choose font family";
 "lng_font_default" = "Default";
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index c07832e9a..1c4add992 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -965,6 +965,17 @@ bool ShowStarsExamples(
 	return true;
 }
 
+bool ShowPopularAppsAbout(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	controller->show(Dialogs::PopularAppsAboutBox(controller));
+	return true;
+}
+
 void ExportTestChatTheme(
 		not_null<Window::SessionController*> controller,
 		not_null<const Data::CloudTheme*> theme) {
@@ -1431,6 +1442,10 @@ const std::vector<LocalUrlHandler> &InternalUrlHandlers() {
 			u"^stars_examples$"_q,
 			ShowStarsExamples,
 		},
+		{
+			u"^about_popular_apps$"_q,
+			ShowPopularAppsAbout,
+		},
 	};
 	return Result;
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index d039869b7..8dea08276 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -743,3 +743,7 @@ dialogsSearchTagPromoLeft: 6px;
 dialogsSearchTagPromoRight: 1px;
 dialogsSearchTagPromoSkip: 6px;
 
+dialogsPopularAppsPadding: margins(10px, 8px, 10px, 12px);
+dialogsPopularAppsAbout: FlatLabel(boxDividerLabel) {
+	minWidth: 128px;
+}
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 7e4995af3..43b5c5882 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -1162,8 +1162,22 @@ void PopularAppsController::fill() {
 			appendRow(bot);
 		}
 	}
+	const auto count = delegate()->peerListFullRowsCount();
+	setCount(count);
+	if (count > 0) {
+		delegate()->peerListSetBelowWidget(object_ptr<Ui::DividerLabel>(
+			(QWidget*)nullptr,
+			object_ptr<Ui::FlatLabel>(
+				(QWidget*)nullptr,
+				tr::lng_bot_apps_which(
+					lt_link,
+					tr::lng_bot_apps_which_link(
+					) | Ui::Text::ToLink(u"internal:about_popular_apps"_q),
+					Ui::Text::WithEntities),
+				st::dialogsPopularAppsAbout),
+			st::dialogsPopularAppsPadding));
+	}
 	delegate()->peerListRefreshRows();
-	setCount(delegate()->peerListFullRowsCount());
 }
 
 void PopularAppsController::appendRow(not_null<UserData*> bot) {
@@ -2325,4 +2339,21 @@ object_ptr<Ui::BoxContent> StarsExamplesBox(
 	return Box<PeerListBox>(std::move(controller), std::move(initBox));
 }
 
+object_ptr<Ui::BoxContent> PopularAppsAboutBox(
+		not_null<Window::SessionController*> window) {
+	return Ui::MakeInformBox({
+		.text = tr::lng_popular_apps_info_text(
+			lt_bot,
+			rpl::single(Ui::Text::Link(
+				u"@botfather"_q,
+				u"https://t.me/botfather"_q)),
+			lt_link,
+			tr::lng_popular_apps_info_here(
+			) | Ui::Text::ToLink(tr::lng_popular_apps_info_url(tr::now)),
+			Ui::Text::RichLangValue),
+		.confirmText = tr::lng_popular_apps_info_confirm(),
+		.title = tr::lng_popular_apps_info_title(),
+	});
+}
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index be868b77a..32998519f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -219,4 +219,7 @@ private:
 [[nodiscard]] object_ptr<Ui::BoxContent> StarsExamplesBox(
 	not_null<Window::SessionController*> window);
 
+[[nodiscard]] object_ptr<Ui::BoxContent> PopularAppsAboutBox(
+	not_null<Window::SessionController*> window);
+
 } // namespace Dialogs

From 78f2e709565bb4e10f6a4914cfa500a43840059d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Oct 2024 08:50:55 +0400
Subject: [PATCH 064/306] Update API scheme to layer 192.

---
 Telegram/SourceFiles/api/api_credits.cpp      |  2 ++
 Telegram/SourceFiles/api/api_earn.cpp         |  4 +--
 Telegram/SourceFiles/api/api_statistics.cpp   |  4 +--
 .../data/components/sponsored_messages.cpp    | 16 ++++-----
 Telegram/SourceFiles/data/data_credits.h      |  1 +
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 33 ++++++++++---------
 6 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 4ef4b09c8..8f67c0335 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -101,6 +101,8 @@ constexpr auto kTransactionsLimit = 100;
 			return Data::CreditsHistoryEntry::PeerType::PremiumBot;
 		}, [](const MTPDstarsTransactionPeerAds &) {
 			return Data::CreditsHistoryEntry::PeerType::Ads;
+		}, [](const MTPDstarsTransactionPeerAPI &) {
+			return Data::CreditsHistoryEntry::PeerType::API;
 		}),
 		.subscriptionUntil = tl.data().vsubscription_period()
 			? base::unixtime::parse(base::unixtime::now()
diff --git a/Telegram/SourceFiles/api/api_earn.cpp b/Telegram/SourceFiles/api/api_earn.cpp
index 432e1d278..14615514b 100644
--- a/Telegram/SourceFiles/api/api_earn.cpp
+++ b/Telegram/SourceFiles/api/api_earn.cpp
@@ -97,7 +97,7 @@ void HandleWithdrawalButton(
 				if (channel) {
 					session->api().request(
 						MTPstats_GetBroadcastRevenueWithdrawalUrl(
-							channel->inputChannel,
+							channel->input,
 							result.result
 					)).done([=](const ChannelOutUrl &r) {
 						done(qs(r.data().vurl()));
@@ -137,7 +137,7 @@ void HandleWithdrawalButton(
 		if (channel) {
 			session->api().request(
 				MTPstats_GetBroadcastRevenueWithdrawalUrl(
-					channel->inputChannel,
+					channel->input,
 					MTP_inputCheckPasswordEmpty()
 			)).fail(fail).send();
 		} else if (peer) {
diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index 69bbed7fc..a51c2c590 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -695,7 +695,7 @@ rpl::producer<rpl::no_value, QString> ChannelEarnStatistics::request() {
 
 		makeRequest(MTPstats_GetBroadcastRevenueStats(
 			MTP_flags(0),
-			channel()->inputChannel
+			channel()->input
 		)).done([=](const MTPstats_BroadcastRevenueStats &result) {
 			const auto &data = result.data();
 			const auto &balances = data.vbalances().data();
@@ -742,7 +742,7 @@ void ChannelEarnStatistics::requestHistory(
 	constexpr auto kTlFirstSlice = tl::make_int(kFirstSlice);
 	constexpr auto kTlLimit = tl::make_int(kLimit);
 	_requestId = api().request(MTPstats_GetBroadcastRevenueTransactions(
-		channel()->inputChannel,
+		channel()->input,
 		MTP_int(token),
 		(!token) ? kTlFirstSlice : kTlLimit
 	)).done([=](const MTPstats_BroadcastRevenueTransactions &result) {
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index f4ec3a356..2d8dfcba1 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -221,7 +221,7 @@ void SponsoredMessages::request(not_null<History*> history, Fn<void()> done) {
 	const auto channel = history->peer->asChannel();
 	Assert(channel != nullptr);
 	request.requestId = _session->api().request(
-		MTPchannels_GetSponsoredMessages(channel->inputChannel)
+		MTPmessages_GetSponsoredMessages(channel->input)
 	).done([=](const MTPmessages_sponsoredMessages &result) {
 		parse(history, result);
 		if (done) {
@@ -437,8 +437,8 @@ void SponsoredMessages::view(const FullMsgId &fullId) {
 	const auto channel = entryPtr->item->history()->peer->asChannel();
 	Assert(channel != nullptr);
 	request.requestId = _session->api().request(
-		MTPchannels_ViewSponsoredMessage(
-			channel->inputChannel,
+		MTPmessages_ViewSponsoredMessage(
+			channel->input	,
 			MTP_bytes(randomId))
 	).done([=] {
 		auto &request = _viewRequests[randomId];
@@ -491,12 +491,12 @@ void SponsoredMessages::clicked(
 	const auto randomId = entryPtr->sponsored.randomId;
 	const auto channel = entryPtr->item->history()->peer->asChannel();
 	Assert(channel != nullptr);
-	using Flag = MTPchannels_ClickSponsoredMessage::Flag;
-	_session->api().request(MTPchannels_ClickSponsoredMessage(
+	using Flag = MTPmessages_ClickSponsoredMessage::Flag;
+	_session->api().request(MTPmessages_ClickSponsoredMessage(
 		MTP_flags(Flag(0)
 			| (isMedia ? Flag::f_media : Flag(0))
 			| (isFullscreen ? Flag::f_fullscreen : Flag(0))),
-		channel->inputChannel,
+		channel->input,
 		MTP_bytes(randomId)
 	)).send();
 }
@@ -548,8 +548,8 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 		}
 
 		state->requestId = _session->api().request(
-			MTPchannels_ReportSponsoredMessage(
-				channel->inputChannel,
+			MTPmessages_ReportSponsoredMessage(
+				channel->input,
 				MTP_bytes(entry->sponsored.randomId),
 				MTP_bytes(optionId))
 		).done([=](
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 3f865b246..71e531001 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -46,6 +46,7 @@ struct CreditsHistoryEntry final {
 		Unsupported,
 		PremiumBot,
 		Ads,
+		API,
 	};
 
 	QString id;
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index ebd69c454..295b549ab 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -116,7 +116,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#94345242 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 effect:flags2.2?long factcheck:flags2.3?FactCheck = Message;
+message#94345242 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 video_processing_pending:flags2.4?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 effect:flags2.2?long factcheck:flags2.3?FactCheck = 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;
@@ -235,7 +235,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#1f58e369 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 stargifts_count:flags2.8?int = UserFull;
+userFull#1f58e369 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 can_view_revenue:flags2.9?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 stargifts_count:flags2.8?int = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -1821,10 +1821,11 @@ starsTransactionPeerPremiumBot#250dbaf8 = StarsTransactionPeer;
 starsTransactionPeerFragment#e92fd902 = StarsTransactionPeer;
 starsTransactionPeer#d80da15d peer:Peer = StarsTransactionPeer;
 starsTransactionPeerAds#60682812 = StarsTransactionPeer;
+starsTransactionPeerAPI#f9677aad = StarsTransactionPeer;
 
 starsTopupOption#bd915c0 flags:# extended:flags.1?true stars:long store_product:flags.0?string currency:string amount:long = StarsTopupOption;
 
-starsTransaction#a9ee4c2 flags:# refund:flags.3?true pending:flags.4?true failed:flags.6?true gift:flags.10?true reaction:flags.11?true id:string stars:long date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument transaction_date:flags.5?int transaction_url:flags.5?string bot_payload:flags.7?bytes msg_id:flags.8?int extended_media:flags.9?Vector<MessageMedia> subscription_period:flags.12?int giveaway_post_id:flags.13?int stargift:flags.14?StarGift = StarsTransaction;
+starsTransaction#35d4f276 flags:# refund:flags.3?true pending:flags.4?true failed:flags.6?true gift:flags.10?true reaction:flags.11?true id:string stars:long date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument transaction_date:flags.5?int transaction_url:flags.5?string bot_payload:flags.7?bytes msg_id:flags.8?int extended_media:flags.9?Vector<MessageMedia> subscription_period:flags.12?int giveaway_post_id:flags.13?int stargift:flags.14?StarGift floodskip_number:flags.15?int = StarsTransaction;
 
 payments.starsStatus#bbfa316c flags:# balance:long subscriptions:flags.1?Vector<StarsSubscription> subscriptions_next_offset:flags.2?string subscriptions_missing_balance:flags.4?long history:flags.3?Vector<StarsTransaction> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.StarsStatus;
 
@@ -2068,9 +2069,9 @@ messages.deleteHistory#b08f922a flags:# just_clear:flags.0?true revoke:flags.1?t
 messages.deleteMessages#e58e95d2 flags:# revoke:flags.0?true id:Vector<int> = messages.AffectedMessages;
 messages.receivedMessages#5a954c0 max_id:int = Vector<ReceivedNotifyMessage>;
 messages.setTyping#58943ee2 flags:# peer:InputPeer top_msg_id:flags.0?int action:SendMessageAction = Bool;
-messages.sendMessage#983f9745 flags:# no_webpage:flags.1?true silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true peer:InputPeer reply_to:flags.0?InputReplyTo message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long = Updates;
-messages.sendMedia#7852834e flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true peer:InputPeer reply_to:flags.0?InputReplyTo media:InputMedia message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long = Updates;
-messages.forwardMessages#d5039208 flags:# silent:flags.5?true background:flags.6?true with_my_score:flags.8?true drop_author:flags.11?true drop_media_captions:flags.12?true noforwards:flags.14?true from_peer:InputPeer id:Vector<int> random_id:Vector<long> to_peer:InputPeer top_msg_id:flags.9?int schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut = Updates;
+messages.sendMessage#983f9745 flags:# no_webpage:flags.1?true silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true allow_paid_floodskip:flags.19?true peer:InputPeer reply_to:flags.0?InputReplyTo message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long = Updates;
+messages.sendMedia#7852834e flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true allow_paid_floodskip:flags.19?true peer:InputPeer reply_to:flags.0?InputReplyTo media:InputMedia message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long = Updates;
+messages.forwardMessages#d5039208 flags:# silent:flags.5?true background:flags.6?true with_my_score:flags.8?true drop_author:flags.11?true drop_media_captions:flags.12?true noforwards:flags.14?true allow_paid_floodskip:flags.19?true from_peer:InputPeer id:Vector<int> random_id:Vector<long> to_peer:InputPeer top_msg_id:flags.9?int schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut = Updates;
 messages.reportSpam#cf1592db peer:InputPeer = Bool;
 messages.getPeerSettings#efd9a6a2 peer:InputPeer = messages.PeerSettings;
 messages.report#fc78af9b peer:InputPeer id:Vector<int> option:bytes message:string = ReportResult;
@@ -2148,7 +2149,7 @@ messages.faveSticker#b9ffc55b id:InputDocument unfave:Bool = Bool;
 messages.getUnreadMentions#f107e790 flags:# peer:InputPeer top_msg_id:flags.0?int offset_id:int add_offset:int limit:int max_id:int min_id:int = messages.Messages;
 messages.readMentions#36e5bf4d flags:# peer:InputPeer top_msg_id:flags.0?int = messages.AffectedHistory;
 messages.getRecentLocations#702a40e0 peer:InputPeer limit:int hash:long = messages.Messages;
-messages.sendMultiMedia#37b74355 flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true peer:InputPeer reply_to:flags.0?InputReplyTo multi_media:Vector<InputSingleMedia> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long = Updates;
+messages.sendMultiMedia#37b74355 flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true allow_paid_floodskip:flags.19?true peer:InputPeer reply_to:flags.0?InputReplyTo multi_media:Vector<InputSingleMedia> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long = Updates;
 messages.uploadEncryptedFile#5057c497 peer:InputEncryptedChat file:InputEncryptedFile = EncryptedFile;
 messages.searchStickerSets#35705b8a flags:# exclude_featured:flags.0?true q:string hash:long = messages.FoundStickerSets;
 messages.getSplitRanges#1cff7e08 = Vector<MessageRange>;
@@ -2276,6 +2277,10 @@ messages.requestMainWebView#c9e01e7b flags:# compact:flags.7?true peer:InputPeer
 messages.sendPaidReaction#9dd6a67b flags:# peer:InputPeer msg_id:int count:int random_id:long private:flags.0?Bool = Updates;
 messages.togglePaidReactionPrivacy#849ad397 peer:InputPeer msg_id:int private:Bool = Bool;
 messages.getPaidReactionPrivacy#472455aa = Updates;
+messages.viewSponsoredMessage#673ad8f1 peer:InputPeer random_id:bytes = Bool;
+messages.clickSponsoredMessage#f093465 flags:# media:flags.0?true fullscreen:flags.1?true peer:InputPeer random_id:bytes = Bool;
+messages.reportSponsoredMessage#1af3dbb8 peer:InputPeer random_id:bytes option:bytes = channels.SponsoredMessageReportResult;
+messages.getSponsoredMessages#9bd2f439 peer:InputPeer = messages.SponsoredMessages;
 
 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;
@@ -2357,8 +2362,6 @@ channels.editLocation#58e63f6d channel:InputChannel geo_point:InputGeoPoint addr
 channels.toggleSlowMode#edd49ef0 channel:InputChannel seconds:int = Updates;
 channels.getInactiveChannels#11e831ee = messages.InactiveChats;
 channels.convertToGigagroup#b290c69 channel:InputChannel = Updates;
-channels.viewSponsoredMessage#beaedb94 channel:InputChannel random_id:bytes = Bool;
-channels.getSponsoredMessages#ec210fbf channel:InputChannel = messages.SponsoredMessages;
 channels.getSendAs#dc770ee peer:InputPeer = channels.SendAsPeers;
 channels.deleteParticipantHistory#367544db channel:InputChannel participant:InputPeer = messages.AffectedHistory;
 channels.toggleJoinToSend#e4cb9580 channel:InputChannel enabled:Bool = Updates;
@@ -2377,14 +2380,12 @@ channels.reorderPinnedForumTopics#2950a18f flags:# force:flags.0?true channel:In
 channels.toggleAntiSpam#68f3e4eb channel:InputChannel enabled:Bool = Updates;
 channels.reportAntiSpamFalsePositive#a850a693 channel:InputChannel msg_id:int = Bool;
 channels.toggleParticipantsHidden#6a6e7854 channel:InputChannel enabled:Bool = Updates;
-channels.clickSponsoredMessage#1445d75 flags:# media:flags.0?true fullscreen:flags.1?true 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#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;
-channels.reportSponsoredMessage#af8ff6b9 channel:InputChannel random_id:bytes option:bytes = channels.SponsoredMessageReportResult;
 channels.restrictSponsoredMessages#9ae91519 channel:InputChannel restricted:Bool = Updates;
 channels.searchPosts#d19f987b hashtag:string offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 
@@ -2506,9 +2507,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;
+stats.getBroadcastRevenueStats#f788ee19 flags:# dark:flags.0?true peer:InputPeer = stats.BroadcastRevenueStats;
+stats.getBroadcastRevenueWithdrawalUrl#9df4faad peer:InputPeer password:InputCheckPasswordSRP = stats.BroadcastRevenueWithdrawalUrl;
+stats.getBroadcastRevenueTransactions#70990b6d peer:InputPeer 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;
@@ -2547,7 +2548,7 @@ 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;
-stories.searchPosts#6cea116a flags:# hashtag:flags.0?string area:flags.1?MediaArea offset:string limit:int = stories.FoundStories;
+stories.searchPosts#d1810907 flags:# hashtag:flags.0?string area:flags.1?MediaArea peer:flags.2?InputPeer offset:string limit:int = stories.FoundStories;
 
 premium.getBoostsList#60f67660 flags:# gifts:flags.0?true peer:InputPeer offset:string limit:int = premium.BoostsList;
 premium.getMyBoosts#be77b4a = premium.MyBoosts;
@@ -2565,4 +2566,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 191
+// LAYER 192

From bbdcb047d0f321647ca90204f238ef4b35cbb9b5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Oct 2024 04:14:01 +0300
Subject: [PATCH 065/306] Added ability to request sponsored messages not only
 for channels.

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

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 2d8dfcba1..d08cde1b4 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -194,7 +194,12 @@ void SponsoredMessages::inject(
 }
 
 bool SponsoredMessages::canHaveFor(not_null<History*> history) const {
-	return history->peer->isChannel();
+	if (history->peer->isChannel()) {
+		return true;
+	} else if (const auto user = history->peer->asUser()) {
+		return user->isBot();
+	}
+	return false;
 }
 
 void SponsoredMessages::request(not_null<History*> history, Fn<void()> done) {
@@ -218,10 +223,8 @@ void SponsoredMessages::request(not_null<History*> history, Fn<void()> done) {
 			}
 		}
 	}
-	const auto channel = history->peer->asChannel();
-	Assert(channel != nullptr);
 	request.requestId = _session->api().request(
-		MTPmessages_GetSponsoredMessages(channel->input)
+		MTPmessages_GetSponsoredMessages(history->peer->input)
 	).done([=](const MTPmessages_sponsoredMessages &result) {
 		parse(history, result);
 		if (done) {
@@ -406,7 +409,7 @@ void SponsoredMessages::clearItems(not_null<History*> history) {
 
 const SponsoredMessages::Entry *SponsoredMessages::find(
 		const FullMsgId &fullId) const {
-	if (!peerIsChannel(fullId.peer)) {
+	if (!peerIsChannel(fullId.peer) && !peerIsUser(fullId.peer)) {
 		return nullptr;
 	}
 	const auto history = _session->data().history(fullId.peer);
@@ -434,11 +437,9 @@ void SponsoredMessages::view(const FullMsgId &fullId) {
 	if (request.requestId || TooEarlyForRequest(request.lastReceived)) {
 		return;
 	}
-	const auto channel = entryPtr->item->history()->peer->asChannel();
-	Assert(channel != nullptr);
 	request.requestId = _session->api().request(
 		MTPmessages_ViewSponsoredMessage(
-			channel->input	,
+			entryPtr->item->history()->peer->input,
 			MTP_bytes(randomId))
 	).done([=] {
 		auto &request = _viewRequests[randomId];
@@ -489,14 +490,12 @@ void SponsoredMessages::clicked(
 		return;
 	}
 	const auto randomId = entryPtr->sponsored.randomId;
-	const auto channel = entryPtr->item->history()->peer->asChannel();
-	Assert(channel != nullptr);
 	using Flag = MTPmessages_ClickSponsoredMessage::Flag;
 	_session->api().request(MTPmessages_ClickSponsoredMessage(
 		MTP_flags(Flag(0)
 			| (isMedia ? Flag::f_media : Flag(0))
 			| (isFullscreen ? Flag::f_fullscreen : Flag(0))),
-		channel->input,
+		entryPtr->item->history()->peer->input,
 		MTP_bytes(randomId)
 	)).send();
 }
@@ -526,10 +525,6 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 		}
 
 		const auto history = entry->item->history();
-		const auto channel = history->peer->asChannel();
-		if (!channel) {
-			return;
-		}
 
 		const auto erase = [=] {
 			const auto it = _data.find(history);
@@ -549,7 +544,7 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 
 		state->requestId = _session->api().request(
 			MTPmessages_ReportSponsoredMessage(
-				channel->input,
+				history->peer->input,
 				MTP_bytes(entry->sponsored.randomId),
 				MTP_bytes(optionId))
 		).done([=](

From c857c24a648e08c3c9e64bfb447ea7a6eb4ef474 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Oct 2024 12:10:13 +0300
Subject: [PATCH 066/306] Added util functions to process photo and document as
 dynamic images.

---
 .../SourceFiles/ui/dynamic_thumbnails.cpp     | 85 +++++++++++++------
 Telegram/SourceFiles/ui/dynamic_thumbnails.h  |  9 ++
 2 files changed, 67 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
index 868e95cb5..67cda874c 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
@@ -61,7 +61,7 @@ private:
 
 class StoryThumbnail : public DynamicImage {
 public:
-	explicit StoryThumbnail(FullStoryId id);
+	explicit StoryThumbnail(Data::FileOrigin origin, bool forceRound);
 
 	QImage image(int size) override;
 	void subscribeToUpdates(Fn<void()> callback) override;
@@ -72,14 +72,16 @@ protected:
 		bool blurred = false;
 	};
 
-	[[nodiscard]] FullStoryId id() const;
+	[[nodiscard]] Data::FileOrigin origin() const;
+	[[nodiscard]] bool forceRound() const;
 
 	[[nodiscard]] virtual Main::Session &session() = 0;
-	[[nodiscard]] virtual Thumb loaded(FullStoryId id) = 0;
+	[[nodiscard]] virtual Thumb loaded(Data::FileOrigin origin) = 0;
 	virtual void clear() = 0;
 
 private:
-	const FullStoryId _id;
+	const Data::FileOrigin _origin;
+	const bool _forceRound;
 	QImage _full;
 	rpl::lifetime _subscription;
 	QImage _prepared;
@@ -89,13 +91,16 @@ private:
 
 class PhotoThumbnail final : public StoryThumbnail {
 public:
-	PhotoThumbnail(not_null<PhotoData*> photo, FullStoryId id);
+	PhotoThumbnail(
+		not_null<PhotoData*> photo,
+		Data::FileOrigin origin,
+		bool forceRound);
 
 	std::shared_ptr<DynamicImage> clone() override;
 
 private:
 	Main::Session &session() override;
-	Thumb loaded(FullStoryId id) override;
+	Thumb loaded(Data::FileOrigin origin) override;
 	void clear() override;
 
 	const not_null<PhotoData*> _photo;
@@ -105,13 +110,16 @@ private:
 
 class VideoThumbnail final : public StoryThumbnail {
 public:
-	VideoThumbnail(not_null<DocumentData*> video, FullStoryId id);
+	VideoThumbnail(
+		not_null<DocumentData*> video,
+		Data::FileOrigin origin,
+		bool forceRound);
 
 	std::shared_ptr<DynamicImage> clone() override;
 
 private:
 	Main::Session &session() override;
-	Thumb loaded(FullStoryId id) override;
+	Thumb loaded(Data::FileOrigin origin) override;
 	void clear() override;
 
 	const not_null<DocumentData*> _video;
@@ -296,8 +304,9 @@ void PeerUserpic::processNewPhoto() {
 	}, _subscribed->downloadLifetime);
 }
 
-StoryThumbnail::StoryThumbnail(FullStoryId id)
-: _id(id) {
+StoryThumbnail::StoryThumbnail(Data::FileOrigin origin, bool forceRound)
+: _origin(origin)
+, _forceRound(forceRound) {
 }
 
 QImage StoryThumbnail::image(int size) {
@@ -316,7 +325,9 @@ QImage StoryThumbnail::image(int size) {
 				Qt::IgnoreAspectRatio,
 				Qt::SmoothTransformation);
 		}
-		_prepared = Images::Circle(std::move(_prepared));
+		if (_forceRound) {
+			_prepared = Images::Circle(std::move(_prepared));
+		}
 		_prepared.setDevicePixelRatio(ratio);
 	}
 	return _prepared;
@@ -330,7 +341,7 @@ void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
 	} else if (!_full.isNull() && !_blurred) {
 		return;
 	}
-	const auto thumbnail = loaded(_id);
+	const auto thumbnail = loaded(_origin);
 	if (const auto image = thumbnail.image) {
 		_full = image->original();
 	}
@@ -340,7 +351,7 @@ void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
 	} else {
 		_subscription = session().downloaderTaskFinished(
 		) | rpl::filter([=] {
-			const auto thumbnail = loaded(_id);
+			const auto thumbnail = loaded(_origin);
 			if (!thumbnail.blurred) {
 				_full = thumbnail.image->original();
 				_prepared = QImage();
@@ -352,27 +363,34 @@ void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
 	}
 }
 
-FullStoryId StoryThumbnail::id() const {
-	return _id;
+Data::FileOrigin StoryThumbnail::origin() const {
+	return _origin;
 }
 
-PhotoThumbnail::PhotoThumbnail(not_null<PhotoData*> photo, FullStoryId id)
-: StoryThumbnail(id)
+bool StoryThumbnail::forceRound() const {
+	return _forceRound;
+}
+
+PhotoThumbnail::PhotoThumbnail(
+	not_null<PhotoData*> photo,
+	Data::FileOrigin origin,
+	bool forceRound)
+: StoryThumbnail(origin, forceRound)
 , _photo(photo) {
 }
 
 std::shared_ptr<DynamicImage> PhotoThumbnail::clone() {
-	return std::make_shared<PhotoThumbnail>(_photo, id());
+	return std::make_shared<PhotoThumbnail>(_photo, origin(), forceRound());
 }
 
 Main::Session &PhotoThumbnail::session() {
 	return _photo->session();
 }
 
-StoryThumbnail::Thumb PhotoThumbnail::loaded(FullStoryId id) {
+StoryThumbnail::Thumb PhotoThumbnail::loaded(Data::FileOrigin origin) {
 	if (!_media) {
 		_media = _photo->createMediaView();
-		_media->wanted(Data::PhotoSize::Small, id);
+		_media->wanted(Data::PhotoSize::Small, origin);
 	}
 	if (const auto small = _media->image(Data::PhotoSize::Small)) {
 		return { .image = small };
@@ -386,23 +404,24 @@ void PhotoThumbnail::clear() {
 
 VideoThumbnail::VideoThumbnail(
 	not_null<DocumentData*> video,
-	FullStoryId id)
-: StoryThumbnail(id)
+	Data::FileOrigin origin,
+	bool forceRound)
+: StoryThumbnail(origin, forceRound)
 , _video(video) {
 }
 
 std::shared_ptr<DynamicImage> VideoThumbnail::clone() {
-	return std::make_shared<VideoThumbnail>(_video, id());
+	return std::make_shared<VideoThumbnail>(_video, origin(), forceRound());
 }
 
 Main::Session &VideoThumbnail::session() {
 	return _video->session();
 }
 
-StoryThumbnail::Thumb VideoThumbnail::loaded(FullStoryId id) {
+StoryThumbnail::Thumb VideoThumbnail::loaded(Data::FileOrigin origin) {
 	if (!_media) {
 		_media = _video->createMediaView();
-		_media->thumbnailWanted(id);
+		_media->thumbnailWanted(origin);
 	}
 	if (const auto small = _media->thumbnail()) {
 		return { .image = small };
@@ -634,9 +653,9 @@ std::shared_ptr<DynamicImage> MakeStoryThumbnail(
 	return v::match(story->media().data, [](v::null_t) -> Result {
 		return std::make_shared<EmptyThumbnail>();
 	}, [&](not_null<PhotoData*> photo) -> Result {
-		return std::make_shared<PhotoThumbnail>(photo, id);
+		return std::make_shared<PhotoThumbnail>(photo, id, true);
 	}, [&](not_null<DocumentData*> video) -> Result {
-		return std::make_shared<VideoThumbnail>(video, id);
+		return std::make_shared<VideoThumbnail>(video, id, true);
 	});
 }
 
@@ -650,4 +669,16 @@ std::shared_ptr<DynamicImage> MakeEmojiThumbnail(
 	return std::make_shared<EmojiThumbnail>(owner, data);
 }
 
+std::shared_ptr<DynamicImage> MakePhotoThumbnail(
+		not_null<PhotoData*> photo,
+		FullMsgId fullId) {
+	return std::make_shared<PhotoThumbnail>(photo, fullId, false);
+}
+
+std::shared_ptr<DynamicImage> MakeDocumentThumbnail(
+		not_null<DocumentData*> document,
+		FullMsgId fullId) {
+	return std::make_shared<VideoThumbnail>(document, fullId, false);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.h b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
index 9876d3df8..3f4bd4337 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.h
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
@@ -7,7 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+class DocumentData;
 class PeerData;
+class PhotoData;
 
 namespace Data {
 class Story;
@@ -32,4 +34,11 @@ class DynamicImage;
 	not_null<Data::Session*> owner,
 	const QString &data);
 
+[[nodiscard]] std::shared_ptr<DynamicImage> MakePhotoThumbnail(
+	not_null<PhotoData*> photo,
+	FullMsgId fullId);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeDocumentThumbnail(
+	not_null<DocumentData*> document,
+	FullMsgId fullId);
+
 } // namespace Ui

From 8a1cf2bb3a831062687e1c96faf9c839ee6a051c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Oct 2024 11:00:44 +0300
Subject: [PATCH 067/306] Added initial implementation of top bar for sponsored
 messages.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../data/components/sponsored_messages.cpp    |  24 ++-
 .../data/components/sponsored_messages.h      |   8 +
 .../SourceFiles/history/history_widget.cpp    |  51 ++++-
 Telegram/SourceFiles/history/history_widget.h |   5 +
 Telegram/SourceFiles/ui/chat/chat.style       |   2 +
 .../ui/chat/sponsored_message_bar.cpp         | 203 ++++++++++++++++++
 .../ui/chat/sponsored_message_bar.h           |  29 +++
 8 files changed, 322 insertions(+), 2 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/sponsored_message_bar.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 1b640372d..9656eda27 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1503,6 +1503,8 @@ PRIVATE
     ui/chat/choose_send_as.h
     ui/chat/choose_theme_controller.cpp
     ui/chat/choose_theme_controller.h
+    ui/chat/sponsored_message_bar.cpp
+    ui/chat/sponsored_message_bar.h
     ui/controls/emoji_button_factory.cpp
     ui/controls/emoji_button_factory.h
     ui/controls/location_picker.cpp
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index d08cde1b4..7d89b8f20 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_element.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "ui/chat/sponsored_message_bar.h"
 #include "ui/text/text_utilities.h" // Ui::Text::RichLangValue.
 
 namespace Data {
@@ -260,12 +261,33 @@ void SponsoredMessages::parse(
 			list.postsBetween = postsBetween->v;
 			list.state = State::InjectToMiddle;
 		} else {
-			list.state = State::AppendToEnd;
+			list.state = history->peer->isChannel()
+				? State::AppendToEnd
+				: State::AppendToTopBar;
 		}
 	}, [](const MTPDmessages_sponsoredMessagesEmpty &) {
 	});
 }
 
+void SponsoredMessages::fillTopBar(
+		not_null<History*> history,
+		not_null<Ui::RpWidget*> widget) {
+	const auto it = _data.find(history);
+	if (it == end(_data)) {
+		return;
+	}
+	const auto &list = it->second;
+	if (list.entries.empty()) {
+		return;
+	}
+	Ui::FillSponsoredMessageBar(
+		widget,
+		_session,
+		list.entries.front().itemFullId,
+		list.entries.front().sponsored.from,
+		list.entries.front().sponsored.textWithEntities);
+}
+
 void SponsoredMessages::append(
 		not_null<History*> history,
 		List &list,
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.h b/Telegram/SourceFiles/data/components/sponsored_messages.h
index 028861af9..ceb43f588 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.h
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.h
@@ -18,6 +18,10 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
 namespace Data {
 
 class MediaPreload;
@@ -76,6 +80,7 @@ public:
 		None,
 		AppendToEnd,
 		InjectToMiddle,
+		AppendToTopBar,
 	};
 	struct Details {
 		std::vector<TextWithEntities> info;
@@ -98,6 +103,9 @@ public:
 	void clearItems(not_null<History*> history);
 	[[nodiscard]] Details lookupDetails(const FullMsgId &fullId) const;
 	void clicked(const FullMsgId &fullId, bool isMedia, bool isFullscreen);
+	void fillTopBar(
+		not_null<History*> history,
+		not_null<Ui::RpWidget*> widget);
 
 	[[nodiscard]] AppendResult append(not_null<History*> history);
 	void inject(
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index a6c6450e7..32f318605 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1611,6 +1611,9 @@ void HistoryWidget::orderWidgets() {
 	if (_translateBar) {
 		_translateBar->raise();
 	}
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->raise();
+	}
 	if (_pinnedBar) {
 		_pinnedBar->raise();
 	}
@@ -2284,6 +2287,7 @@ void HistoryWidget::showHistory(
 		_history->showAtMsgId = _showAtMsgId;
 
 		destroyUnreadBarOnClose();
+		_sponsoredMessageBar = nullptr;
 		_pinnedBar = nullptr;
 		_translateBar = nullptr;
 		_pinnedTracker = nullptr;
@@ -2520,6 +2524,26 @@ void HistoryWidget::showHistory(
 						session().sponsoredMessages().canHaveFor(_history));
 				} else if (state == State::InjectToMiddle) {
 					injectSponsoredMessages();
+				} else if (state == State::AppendToTopBar) {
+					_sponsoredMessageBar
+						= base::make_unique_q<Ui::SlideWrap<>>(
+							this,
+							object_ptr<Ui::RpWidget>(this));
+					session().sponsoredMessages().fillTopBar(
+						_history,
+						_sponsoredMessageBar->entity());
+					_sponsoredMessageBarHeight = 0;
+					_sponsoredMessageBar->heightValue(
+					) | rpl::start_with_next([=](int height) {
+						_topDelta = _preserveScrollTop
+							? 0
+							: (height - _sponsoredMessageBarHeight);
+						_sponsoredMessageBarHeight = height;
+						updateHistoryGeometry();
+						updateControlsGeometry();
+						_topDelta = 0;
+					}, _sponsoredMessageBar->lifetime());
+					_sponsoredMessageBar->show(anim::type::normal);
 				}
 			});
 			session().sponsoredMessages().request(_history, checkState);
@@ -2931,6 +2955,9 @@ void HistoryWidget::updateControlsVisibility() {
 	if (_pinnedBar) {
 		_pinnedBar->show();
 	}
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->show(anim::type::instant);
+	}
 	if (_translateBar) {
 		_translateBar->show();
 	}
@@ -4128,6 +4155,9 @@ void HistoryWidget::hideChildWidgets() {
 	if (_pinnedBar) {
 		_pinnedBar->hide();
 	}
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->hide(anim::type::instant);
+	}
 	if (_translateBar) {
 		_translateBar->hide();
 	}
@@ -4414,6 +4444,9 @@ void HistoryWidget::showAnimated(
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->finishAnimating();
+	}
 	if (_translateBar) {
 		_translateBar->finishAnimating();
 	}
@@ -4452,6 +4485,9 @@ void HistoryWidget::showFinished() {
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->finishAnimating();
+	}
 	if (_translateBar) {
 		_translateBar->finishAnimating();
 	}
@@ -4484,6 +4520,9 @@ void HistoryWidget::doneShow() {
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->finishAnimating();
+	}
 	if (_translateBar) {
 		_translateBar->finishAnimating();
 	}
@@ -5999,8 +6038,14 @@ void HistoryWidget::updateControlsGeometry() {
 		_pinnedBar->move(0, pinnedBarTop);
 		_pinnedBar->resizeToWidth(width());
 	}
-	const auto translateTop = pinnedBarTop
+	const auto sponsoredMessageBarTop = pinnedBarTop
 		+ (_pinnedBar ? _pinnedBar->height() : 0);
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->move(0, sponsoredMessageBarTop);
+		_sponsoredMessageBar->resizeToWidth(width());
+	}
+	const auto translateTop = sponsoredMessageBarTop
+		+ (_sponsoredMessageBar ? _sponsoredMessageBar->height() : 0);
 	if (_translateBar) {
 		_translateBar->move(0, translateTop);
 		_translateBar->resizeToWidth(width());
@@ -6245,6 +6290,9 @@ void HistoryWidget::updateHistoryGeometry(
 	if (_translateBar) {
 		newScrollHeight -= _translateBar->height();
 	}
+	if (_sponsoredMessageBar) {
+		newScrollHeight -= _sponsoredMessageBar->height();
+	}
 	if (_pinnedBar) {
 		newScrollHeight -= _pinnedBar->height();
 	}
@@ -6662,6 +6710,7 @@ int HistoryWidget::computeMaxFieldHeight() const {
 		- _topBar->height()
 		- (_contactStatus ? _contactStatus->bar().height() : 0)
 		- (_businessBotStatus ? _businessBotStatus->bar().height() : 0)
+		- (_sponsoredMessageBar ? _sponsoredMessageBar->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 ec06c0bd6..94bf0fff9 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -73,6 +73,8 @@ class SpoilerAnimation;
 class ChooseThemeController;
 class ContinuousScroll;
 struct ChatPaintHighlight;
+template <typename Widget>
+class SlideWrap;
 } // namespace Ui
 
 namespace Ui::Emoji {
@@ -687,6 +689,9 @@ private:
 	std::unique_ptr<Ui::RequestsBar> _requestsBar;
 	int _requestsBarHeight = 0;
 
+	base::unique_qptr<Ui::SlideWrap<Ui::RpWidget>> _sponsoredMessageBar;
+	int _sponsoredMessageBarHeight = 0;
+
 	bool _preserveScrollTop = false;
 	bool _repaintFieldScheduled = false;
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 53b2ef183..ec1f9c2f6 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1153,3 +1153,5 @@ purchasedTagPadding: margins(3px, 2px, 6px, 2px);
 msgSelectionCheck: RoundCheckbox(defaultPeerListCheck) {
 	bgActive: boxTextFgGood;
 }
+
+sponsoredMessageBarMaxHeight: 156px;
diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
new file mode 100644
index 000000000..483ae3852
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
@@ -0,0 +1,203 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/sponsored_message_bar.h"
+
+#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "data/components/sponsored_messages.h"
+#include "data/data_session.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/image/image_prepare.h"
+#include "ui/rect.h"
+#include "ui/rp_widget.h"
+#include "ui/widgets/shadow.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+
+namespace Ui {
+
+void FillSponsoredMessageBar(
+		not_null<RpWidget*> widget,
+		not_null<Main::Session*> session,
+		FullMsgId fullId,
+		Data::SponsoredFrom from,
+		const TextWithEntities &textWithEntities) {
+	struct State final {
+		Ui::Text::String title;
+		Ui::Text::String contentTitle;
+		Ui::Text::String contentText;
+		rpl::variable<int> lastPaintedContentLineAmount = 0;
+		rpl::variable<int> lastPaintedContentTop = 0;
+
+		std::shared_ptr<Ui::DynamicImage> rightPhoto;
+		QImage rightPhotoImage;
+	};
+	const auto state = widget->lifetime().make_state<State>();
+	state->title.setText(
+		st::semiboldTextStyle,
+		from.isRecommended
+			? tr::lng_recommended_message_title(tr::now)
+			: tr::lng_sponsored_message_title(tr::now));
+	state->contentTitle.setText(st::semiboldTextStyle, from.title);
+	state->contentText.setMarkedText(
+		st::defaultTextStyle,
+		textWithEntities,
+		kMarkupTextOptions,
+		Core::MarkedTextContext{
+			.session = session,
+			.customEmojiRepaint = [=] { widget->update(); },
+		});
+	const auto kLinesForPhoto = 3;
+	const auto rightPhotoSize = state->title.style()->font->ascent
+		* kLinesForPhoto;
+	const auto rightPhotoPlaceholder = state->title.style()->font->height
+		* kLinesForPhoto;
+	const auto hasRightPhoto = from.photoId > 0;
+	if (hasRightPhoto) {
+		state->rightPhoto = Ui::MakePhotoThumbnail(
+			session->data().photo(from.photoId),
+			fullId);
+		const auto callback = [=] {
+			state->rightPhotoImage = Images::Round(
+				state->rightPhoto->image(rightPhotoSize),
+				ImageRoundRadius::Small);
+			widget->update();
+		};
+		state->rightPhoto->subscribeToUpdates(callback);
+		callback();
+	}
+	widget->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(widget);
+		const auto r = widget->rect();
+		p.fillRect(r, st::historyPinnedBg);
+		const auto leftPadding = st::msgReplyBarSkip + st::msgReplyBarSkip;
+		const auto rightPadding = st::msgReplyBarSkip;
+		const auto topPadding = st::msgReplyPadding.top();
+		const auto availableWidthNoPhoto = r.width()
+			- leftPadding
+			- rightPadding;
+		const auto availableWidth = availableWidthNoPhoto
+			- (hasRightPhoto ? (rightPadding + rightPhotoSize) : 0);
+		const auto titleRight = leftPadding
+			+ state->title.maxWidth()
+			+ state->title.style()->font->spacew * 2;
+		const auto hasSecondLineTitle
+			= (availableWidth - state->contentTitle.maxWidth() < titleRight);
+		p.setPen(st::windowActiveTextFg);
+		state->title.draw(p, {
+			.position = QPoint(leftPadding, topPadding),
+			.outerWidth = availableWidth,
+			.availableWidth = availableWidth,
+		});
+		p.setPen(st::windowFg);
+		{
+			const auto left = hasSecondLineTitle ? leftPadding : titleRight;
+			const auto top = hasSecondLineTitle
+				? (topPadding + state->title.style()->font->height)
+				: topPadding;
+			state->contentTitle.draw(p, {
+				.position = QPoint(left, top),
+				.outerWidth = hasSecondLineTitle
+					? availableWidth
+					: (availableWidth - titleRight),
+				.availableWidth = availableWidth,
+				.elisionLines = 1,
+			});
+		}
+		{
+			const auto left = leftPadding;
+			const auto top = hasSecondLineTitle
+				? (topPadding
+					+ state->title.style()->font->height
+					+ state->contentTitle.style()->font->height)
+				: topPadding + state->title.style()->font->height;
+			auto lastContentLineAmount = 0;
+			const auto lineHeight = state->contentText.style()->font->height;
+			const auto lineLayout = [&](int line) -> Ui::Text::LineGeometry {
+				line++;
+				lastContentLineAmount = line;
+				const auto diff = (st::sponsoredMessageBarMaxHeight)
+					- line * lineHeight;
+				if (diff < 3 * lineHeight) {
+					return {
+						.width = availableWidthNoPhoto,
+						.elided = true,
+					};
+				} else if (diff < 2 * lineHeight) {
+					return {};
+				}
+				if (hasRightPhoto) {
+					line += (hasSecondLineTitle ? 2 : 1);
+					return {
+						.width = (line > kLinesForPhoto)
+							? availableWidthNoPhoto
+							: availableWidth,
+					};
+				} else {
+					return { .width = availableWidth };
+				}
+			};
+			state->contentText.draw(p, {
+				.position = QPoint(left, top),
+				.outerWidth = availableWidth,
+				.availableWidth = availableWidth,
+				.geometry = Ui::Text::GeometryDescriptor{
+					.layout = std::move(lineLayout),
+				},
+			});
+			state->lastPaintedContentTop = top;
+			state->lastPaintedContentLineAmount = lastContentLineAmount;
+		}
+		if (hasRightPhoto) {
+			p.drawImage(
+				r.width() - rightPadding - rightPhotoSize,
+				topPadding + (rightPhotoPlaceholder - rightPhotoSize) / 2,
+				state->rightPhotoImage);
+		}
+	}, widget->lifetime());
+	rpl::combine(
+		state->lastPaintedContentTop.value(),
+		state->lastPaintedContentLineAmount.value()
+	) | rpl::distinct_until_changed() | rpl::start_with_next([=](
+			int lastTop,
+			int lastLines) {
+		const auto bottomPadding = st::msgReplyPadding.top();
+		const auto desiredHeight = lastTop
+			+ (lastLines * state->contentText.style()->font->height)
+			+ bottomPadding;
+		const auto minHeight = hasRightPhoto
+			? (rightPhotoPlaceholder + bottomPadding * 2)
+			: desiredHeight;
+		widget->resize(
+			widget->width(),
+			std::clamp(
+				desiredHeight,
+				minHeight,
+				st::sponsoredMessageBarMaxHeight));
+	}, widget->lifetime());
+	widget->resize(widget->width(), 1);
+
+	{
+		const auto top = Ui::CreateChild<PlainShadow>(widget);
+		const auto bottom = Ui::CreateChild<PlainShadow>(widget);
+		widget->sizeValue() | rpl::start_with_next([=] (const QSize &s) {
+			top->show();
+			top->raise();
+			top->resizeToWidth(s.width());
+			bottom->show();
+			bottom->raise();
+			bottom->resizeToWidth(s.width());
+			bottom->moveToLeft(0, s.height() - bottom->height());
+		}, top->lifetime());
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.h b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.h
new file mode 100644
index 000000000..d18ec9b05
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.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
+
+namespace Data {
+struct SponsoredFrom;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+
+class RpWidget;
+
+void FillSponsoredMessageBar(
+	not_null<RpWidget*> widget,
+	not_null<Main::Session*> session,
+	FullMsgId fullId,
+	Data::SponsoredFrom from,
+	const TextWithEntities &textWithEntities);
+
+} // namespace Ui

From 304bcfd343ffb072c2c862cbe1ede52ad85f7a5e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Oct 2024 12:48:30 +0300
Subject: [PATCH 068/306] Added initial button to top bar of sponsored messages
 to hide it.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 .../ui/chat/sponsored_message_bar.cpp         | 154 ++++++++++++++++--
 2 files changed, 140 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e00d24f3f..d6295d9d9 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5201,6 +5201,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "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_sponsored_top_bar_hide" = "remove";
 
 "lng_telegram_features_url" = "https://t.me/TelegramTips";
 
diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
index 483ae3852..ea19c723c 100644
--- a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
@@ -7,21 +7,118 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/chat/sponsored_message_bar.h"
 
+#include "core/application.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/components/sponsored_messages.h"
 #include "data/data_session.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/dynamic_image.h"
 #include "ui/dynamic_thumbnails.h"
+#include "ui/effects/animation_value.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/image/image_prepare.h"
 #include "ui/rect.h"
-#include "ui/rp_widget.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.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"
 
 namespace Ui {
+namespace {
+
+struct Colors final {
+	QColor bg;
+	QColor fg;
+};
+
+using ColorFactory = Fn<Colors()>;
+
+class RemoveButton final : public Ui::RippleButton {
+public:
+	RemoveButton(
+		not_null<Ui::RpWidget*> parent,
+		ColorFactory cache)
+	: Ui::RippleButton(parent, st::defaultRippleAnimation) {
+		tr::lng_sponsored_top_bar_hide(
+		) | rpl::start_with_next([this](const QString &t) {
+			const auto height = st::stickersHeaderBadgeFont->height;
+			resize(
+				st::stickersHeaderBadgeFont->width(t) + height,
+				height);
+			update();
+		}, lifetime());
+		paintRequest() | rpl::start_with_next([this, cache] {
+			auto p = QPainter(this);
+			const auto colors = cache();
+			const auto r = rect();
+			const auto rippleColor = anim::with_alpha(colors.fg, .15);
+			Ui::RippleButton::paintRipple(
+				p,
+				QPoint(),
+				&rippleColor);
+			p.setBrush(colors.bg);
+			p.setPen(Qt::NoPen);
+			p.drawRoundedRect(r, r.height() / 2, r.height() / 2);
+			p.setFont(st::stickersHeaderBadgeFont);
+			p.setPen(colors.fg);
+			p.drawText(
+				r,
+				tr::lng_sponsored_top_bar_hide(tr::now),
+				style::al_center);
+		}, lifetime());
+	}
+
+	QImage prepareRippleMask() const override {
+		return Ui::RippleAnimation::RoundRectMask(size(), height() / 2);
+	}
+
+};
+
+[[nodiscard]] ColorFactory GenerateReplyColorCallback(
+		not_null<RpWidget*> widget,
+		FullMsgId fullId,
+		int colorIndex) {
+	const auto window = Core::App().findWindow(widget);
+	const auto controller = window ? window->sessionController() : nullptr;
+	if (!controller) {
+		return [] -> Colors {
+			return { st::windowBgActive->c, st::windowActiveTextFg->c };
+		};
+	}
+	const auto peer = controller->session().data().peer(fullId.peer);
+	struct State final {
+		std::shared_ptr<Ui::ChatTheme> theme;
+	};
+	const auto state = widget->lifetime().make_state<State>();
+	Window::ChatThemeValueFromPeer(
+		controller,
+		peer
+	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+		state->theme = std::move(theme);
+	}, widget->lifetime());
+
+	return [=] -> Colors {
+		if (!state->theme) {
+			return { st::windowBgActive->c, st::windowActiveTextFg->c };
+		}
+		const auto context = controller->preparePaintContext({
+			.theme = state->theme.get(),
+		});
+		const auto selected = false;
+		const auto cache = context.st->coloredReplyCache(
+			selected,
+			colorIndex);
+		return { cache->bg, cache->icon };
+	};
+}
+
+} // namespace
 
 void FillSponsoredMessageBar(
 		not_null<RpWidget*> widget,
@@ -40,14 +137,17 @@ void FillSponsoredMessageBar(
 		QImage rightPhotoImage;
 	};
 	const auto state = widget->lifetime().make_state<State>();
+	const auto &titleSt = st::semiboldTextStyle;
+	const auto &contentTitleSt = st::semiboldTextStyle;
+	const auto &contentTextSt = st::defaultTextStyle;
 	state->title.setText(
-		st::semiboldTextStyle,
+		titleSt,
 		from.isRecommended
 			? tr::lng_recommended_message_title(tr::now)
 			: tr::lng_sponsored_message_title(tr::now));
-	state->contentTitle.setText(st::semiboldTextStyle, from.title);
+	state->contentTitle.setText(contentTitleSt, from.title);
 	state->contentText.setMarkedText(
-		st::defaultTextStyle,
+		contentTextSt,
 		textWithEntities,
 		kMarkupTextOptions,
 		Core::MarkedTextContext{
@@ -55,9 +155,9 @@ void FillSponsoredMessageBar(
 			.customEmojiRepaint = [=] { widget->update(); },
 		});
 	const auto kLinesForPhoto = 3;
-	const auto rightPhotoSize = state->title.style()->font->ascent
+	const auto rightPhotoSize = titleSt.font->ascent
 		* kLinesForPhoto;
-	const auto rightPhotoPlaceholder = state->title.style()->font->height
+	const auto rightPhotoPlaceholder = titleSt.font->height
 		* kLinesForPhoto;
 	const auto hasRightPhoto = from.photoId > 0;
 	if (hasRightPhoto) {
@@ -73,6 +173,14 @@ void FillSponsoredMessageBar(
 		state->rightPhoto->subscribeToUpdates(callback);
 		callback();
 	}
+	const auto removeButton = Ui::CreateChild<RemoveButton>(
+		widget,
+		GenerateReplyColorCallback(
+			widget,
+			fullId,
+			from.colorIndex ? from.colorIndex : 4/*blue*/));
+	removeButton->show();
+
 	widget->paintRequest(
 	) | rpl::start_with_next([=] {
 		auto p = QPainter(widget);
@@ -88,20 +196,36 @@ void FillSponsoredMessageBar(
 			- (hasRightPhoto ? (rightPadding + rightPhotoSize) : 0);
 		const auto titleRight = leftPadding
 			+ state->title.maxWidth()
-			+ state->title.style()->font->spacew * 2;
-		const auto hasSecondLineTitle
-			= (availableWidth - state->contentTitle.maxWidth() < titleRight);
+			+ titleSt.font->spacew * 2;
+		const auto hasSecondLineTitle = (titleRight
+			> (availableWidth
+				- state->contentTitle.maxWidth()
+				- removeButton->width()));
 		p.setPen(st::windowActiveTextFg);
 		state->title.draw(p, {
 			.position = QPoint(leftPadding, topPadding),
 			.outerWidth = availableWidth,
 			.availableWidth = availableWidth,
 		});
+		removeButton->moveToLeft(
+			hasSecondLineTitle
+				? titleRight
+				: std::min(
+					titleRight
+						+ state->contentTitle.maxWidth()
+						+ titleSt.font->spacew * 2,
+					r.width()
+						- (hasRightPhoto
+							? (rightPadding + rightPhotoSize)
+							: 0)
+						- rightPadding),
+			topPadding
+				+ (titleSt.font->height - removeButton->height()) / 2);
 		p.setPen(st::windowFg);
 		{
 			const auto left = hasSecondLineTitle ? leftPadding : titleRight;
 			const auto top = hasSecondLineTitle
-				? (topPadding + state->title.style()->font->height)
+				? (topPadding + titleSt.font->height)
 				: topPadding;
 			state->contentTitle.draw(p, {
 				.position = QPoint(left, top),
@@ -116,11 +240,11 @@ void FillSponsoredMessageBar(
 			const auto left = leftPadding;
 			const auto top = hasSecondLineTitle
 				? (topPadding
-					+ state->title.style()->font->height
-					+ state->contentTitle.style()->font->height)
-				: topPadding + state->title.style()->font->height;
+					+ titleSt.font->height
+					+ contentTitleSt.font->height)
+				: topPadding + titleSt.font->height;
 			auto lastContentLineAmount = 0;
-			const auto lineHeight = state->contentText.style()->font->height;
+			const auto lineHeight = contentTextSt.font->height;
 			const auto lineLayout = [&](int line) -> Ui::Text::LineGeometry {
 				line++;
 				lastContentLineAmount = line;
@@ -171,7 +295,7 @@ void FillSponsoredMessageBar(
 			int lastLines) {
 		const auto bottomPadding = st::msgReplyPadding.top();
 		const auto desiredHeight = lastTop
-			+ (lastLines * state->contentText.style()->font->height)
+			+ (lastLines * contentTextSt.font->height)
 			+ bottomPadding;
 		const auto minHeight = hasRightPhoto
 			? (rightPhotoPlaceholder + bottomPadding * 2)

From 2db30690cef9cf1e7e47cfff589ea8457dbf2b4e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Oct 2024 12:55:22 +0300
Subject: [PATCH 069/306] Added ability to open menu for sponsored messages
 without history item.

---
 .../history/history_item_helpers.cpp          |  2 +-
 .../media/view/media_view_overlay_widget.cpp  |  3 ++-
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 22 +++++++------------
 Telegram/SourceFiles/menu/menu_sponsored.h    |  4 ++--
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index dabd0ee83..ea8f19eda 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -409,7 +409,7 @@ ClickHandlerPtr ReportSponsoredClickHandler(not_null<HistoryItem*> item) {
 			Menu::ShowSponsored(
 				controller->widget(),
 				controller->uiShow(),
-				item);
+				item->fullId());
 		}
 	});
 }
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 9362819b3..96dcdc445 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1574,7 +1574,8 @@ void OverlayWidget::fillContextMenuActions(
 	if (_message && _message->isSponsored()) {
 		if (const auto window = findWindow()) {
 			const auto show = window->uiShow();
-			Menu::FillSponsored(_body, addAction, show, _message, true);
+			const auto fullId = _message->fullId();
+			Menu::FillSponsored(_body, addAction, show, fullId, true);
 		}
 		return;
 	}
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 7e4927544..4d5564793 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -218,10 +218,8 @@ void AboutBox(
 
 void ShowReportSponsoredBox(
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<HistoryItem*> item) {
-	const auto peer = item->history()->peer;
-	auto &sponsoredMessages = peer->session().sponsoredMessages();
-	const auto fullId = item->fullId();
+		const FullMsgId &fullId) {
+	auto &sponsoredMessages = show->session().sponsoredMessages();
 	const auto report = sponsoredMessages.createReportCallback(fullId);
 	const auto guideLink = Ui::Text::Link(
 		tr::lng_report_sponsored_reported_link(tr::now),
@@ -306,18 +304,16 @@ void FillSponsored(
 		not_null<Ui::RpWidget*> parent,
 		const Ui::Menu::MenuCallback &addAction,
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<HistoryItem*> item,
+		const FullMsgId &fullId,
 		bool mediaViewer) {
-	Expects(item->isSponsored());
-
-	const auto session = &item->history()->session();
+	const auto session = &show->session();
 
 	addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
 		show->show(Box(AboutBox, show));
 	}, (mediaViewer ? &st::mediaMenuIconInfo : &st::menuIconInfo));
 
 	addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
-		ShowReportSponsoredBox(show, item);
+		ShowReportSponsoredBox(show, fullId);
 	}, (mediaViewer ? &st::mediaMenuIconBlock : &st::menuIconBlock));
 
 	addAction({
@@ -331,7 +327,7 @@ void FillSponsored(
 		if (session->premium()) {
 			using Result = Data::SponsoredReportResult;
 			session->sponsoredMessages().createReportCallback(
-				item->fullId())(Result::Id("-1"), [](const auto &) {});
+				fullId)(Result::Id("-1"), [](const auto &) {});
 		} else {
 			ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
 		}
@@ -341,9 +337,7 @@ void FillSponsored(
 void ShowSponsored(
 		not_null<Ui::RpWidget*> parent,
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<HistoryItem*> item) {
-	Expects(item->isSponsored());
-
+		const FullMsgId &fullId) {
 	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
 		parent.get(),
 		st::popupMenuWithIcons);
@@ -352,7 +346,7 @@ void ShowSponsored(
 		parent,
 		Ui::Menu::CreateAddActionCallback(menu),
 		show,
-		item,
+		fullId,
 		false);
 
 	menu->popup(QCursor::pos());
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.h b/Telegram/SourceFiles/menu/menu_sponsored.h
index 3085aad95..a1dc05be3 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.h
+++ b/Telegram/SourceFiles/menu/menu_sponsored.h
@@ -26,13 +26,13 @@ void FillSponsored(
 	not_null<Ui::RpWidget*> parent,
 	const Ui::Menu::MenuCallback &addAction,
 	std::shared_ptr<ChatHelpers::Show> show,
-	not_null<HistoryItem*> item,
+	const FullMsgId &fullId,
 	bool mediaViewer);
 
 void ShowSponsored(
 	not_null<Ui::RpWidget*> parent,
 	std::shared_ptr<ChatHelpers::Show> show,
-	not_null<HistoryItem*> item);
+	const FullMsgId &fullId);
 
 void ShowSponsoredAbout(std::shared_ptr<ChatHelpers::Show> show);
 

From 84055ed74e812ed69ce5bcddfc257c28e7c0f144 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Oct 2024 14:09:19 +0300
Subject: [PATCH 070/306] Added context menu to top bar of sponsored messages.

---
 .../data/components/sponsored_messages.cpp    | 35 ++++++++++---
 .../data/components/sponsored_messages.h      |  4 +-
 .../SourceFiles/history/history_widget.cpp    |  8 ++-
 .../ui/chat/sponsored_message_bar.cpp         | 51 +++++++++++++++++--
 .../ui/chat/sponsored_message_bar.h           |  2 +-
 5 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 7d89b8f20..8e16827df 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -271,21 +271,36 @@ void SponsoredMessages::parse(
 
 void SponsoredMessages::fillTopBar(
 		not_null<History*> history,
-		not_null<Ui::RpWidget*> widget) {
+		not_null<Ui::RpWidget*> widget,
+		Fn<void()> hide) {
 	const auto it = _data.find(history);
 	if (it == end(_data)) {
 		return;
 	}
-	const auto &list = it->second;
+	auto &list = it->second;
 	if (list.entries.empty()) {
 		return;
 	}
+	auto &entry = list.entries.front();
+	if (!entry.optionalDestructionNotifier) {
+		entry.optionalDestructionNotifier = std::make_unique<rpl::lifetime>();
+	}
+	const auto fullId = entry.itemFullId;
+	entry.optionalDestructionNotifier->add(std::move(hide));
 	Ui::FillSponsoredMessageBar(
 		widget,
 		_session,
-		list.entries.front().itemFullId,
-		list.entries.front().sponsored.from,
-		list.entries.front().sponsored.textWithEntities);
+		fullId,
+		entry.sponsored.from,
+		entry.sponsored.textWithEntities);
+
+	const auto viewLifetime = std::make_shared<rpl::lifetime>();
+	widget->shownValue() | rpl::filter(
+		rpl::mappers::_1
+	) | rpl::start_with_next([=, this](bool shown) {
+		view(fullId);
+		viewLifetime->destroy();
+	}, *viewLifetime);
 }
 
 void SponsoredMessages::append(
@@ -461,7 +476,9 @@ void SponsoredMessages::view(const FullMsgId &fullId) {
 	}
 	request.requestId = _session->api().request(
 		MTPmessages_ViewSponsoredMessage(
-			entryPtr->item->history()->peer->input,
+			entryPtr->item
+				? entryPtr->item->history()->peer->input
+				: _session->data().peer(fullId.peer)->input,
 			MTP_bytes(randomId))
 	).done([=] {
 		auto &request = _viewRequests[randomId];
@@ -517,7 +534,9 @@ void SponsoredMessages::clicked(
 		MTP_flags(Flag(0)
 			| (isMedia ? Flag::f_media : Flag(0))
 			| (isFullscreen ? Flag::f_fullscreen : Flag(0))),
-		entryPtr->item->history()->peer->input,
+		entryPtr->item
+			? entryPtr->item->history()->peer->input
+			: _session->data().peer(fullId.peer)->input,
 		MTP_bytes(randomId)
 	)).send();
 }
@@ -546,7 +565,7 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 			return;
 		}
 
-		const auto history = entry->item->history();
+		const auto history = _session->data().history(fullId.peer);
 
 		const auto erase = [=] {
 			const auto it = _data.find(history);
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.h b/Telegram/SourceFiles/data/components/sponsored_messages.h
index ceb43f588..62553c39c 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.h
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.h
@@ -105,7 +105,8 @@ public:
 	void clicked(const FullMsgId &fullId, bool isMedia, bool isFullscreen);
 	void fillTopBar(
 		not_null<History*> history,
-		not_null<Ui::RpWidget*> widget);
+		not_null<Ui::RpWidget*> widget,
+		Fn<void()> hide);
 
 	[[nodiscard]] AppendResult append(not_null<History*> history);
 	void inject(
@@ -130,6 +131,7 @@ private:
 		FullMsgId itemFullId;
 		SponsoredMessage sponsored;
 		std::unique_ptr<MediaPreload> preload;
+		std::unique_ptr<rpl::lifetime> optionalDestructionNotifier;
 	};
 	struct List {
 		std::vector<Entry> entries;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 32f318605..ae91eae35 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2529,9 +2529,15 @@ void HistoryWidget::showHistory(
 						= base::make_unique_q<Ui::SlideWrap<>>(
 							this,
 							object_ptr<Ui::RpWidget>(this));
+					auto destruction = [this] {
+						if (_sponsoredMessageBar) {
+							_sponsoredMessageBar->hide(anim::type::normal);
+						}
+					};
 					session().sponsoredMessages().fillTopBar(
 						_history,
-						_sponsoredMessageBar->entity());
+						_sponsoredMessageBar->entity(),
+						std::move(destruction));
 					_sponsoredMessageBarHeight = 0;
 					_sponsoredMessageBar->heightValue(
 					) | rpl::start_with_next([=](int height) {
diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
index ea19c723c..0668bff20 100644
--- a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
@@ -8,11 +8,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/sponsored_message_bar.h"
 
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
+#include "history/history_item_helpers.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "menu/menu_sponsored.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/dynamic_image.h"
@@ -80,12 +83,17 @@ public:
 
 };
 
+[[nodiscard]] Window::SessionController *FindSessionController(
+		not_null<RpWidget*> widget) {
+	const auto window = Core::App().findWindow(widget);
+	return window ? window->sessionController() : nullptr;
+}
+
 [[nodiscard]] ColorFactory GenerateReplyColorCallback(
 		not_null<RpWidget*> widget,
 		FullMsgId fullId,
 		int colorIndex) {
-	const auto window = Core::App().findWindow(widget);
-	const auto controller = window ? window->sessionController() : nullptr;
+	const auto controller = FindSessionController(widget);
 	if (!controller) {
 		return [] -> Colors {
 			return { st::windowBgActive->c, st::windowActiveTextFg->c };
@@ -121,11 +129,31 @@ public:
 } // namespace
 
 void FillSponsoredMessageBar(
-		not_null<RpWidget*> widget,
+		not_null<RpWidget*> container,
 		not_null<Main::Session*> session,
 		FullMsgId fullId,
 		Data::SponsoredFrom from,
 		const TextWithEntities &textWithEntities) {
+	const auto widget = CreateSimpleRectButton(
+		container,
+		st::defaultRippleAnimationBgOver);
+	widget->show();
+	container->sizeValue() | rpl::start_with_next([=](const QSize &s) {
+		widget->resize(s);
+	}, widget->lifetime());
+	widget->setAcceptBoth();
+
+	widget->addClickHandler([=](Qt::MouseButton button) {
+		if (button == Qt::RightButton) {
+			if (const auto controller = FindSessionController(widget)) {
+				::Menu::ShowSponsored(widget, controller->uiShow(), fullId);
+			}
+		} else if (button == Qt::LeftButton) {
+			session->sponsoredMessages().clicked(fullId, false, false);
+			UrlClickHandler::Open(from.link);
+		}
+	});
+
 	struct State final {
 		Ui::Text::String title;
 		Ui::Text::String contentTitle;
@@ -179,6 +207,18 @@ void FillSponsoredMessageBar(
 			widget,
 			fullId,
 			from.colorIndex ? from.colorIndex : 4/*blue*/));
+	const auto handler = HideSponsoredClickHandler();
+	removeButton->setClickedCallback([=] {
+		if (const auto controller = FindSessionController(widget)) {
+			ActivateClickHandler(widget, handler, {
+				.other = QVariant::fromValue(ClickHandlerContext{
+					.itemId = fullId,
+					.sessionWindow = base::make_weak(controller),
+					.show = controller->uiShow(),
+				})
+			});
+		}
+	});
 	removeButton->show();
 
 	widget->paintRequest(
@@ -186,6 +226,7 @@ void FillSponsoredMessageBar(
 		auto p = QPainter(widget);
 		const auto r = widget->rect();
 		p.fillRect(r, st::historyPinnedBg);
+		widget->paintRipple(p, 0, 0);
 		const auto leftPadding = st::msgReplyBarSkip + st::msgReplyBarSkip;
 		const auto rightPadding = st::msgReplyBarSkip;
 		const auto topPadding = st::msgReplyPadding.top();
@@ -300,14 +341,14 @@ void FillSponsoredMessageBar(
 		const auto minHeight = hasRightPhoto
 			? (rightPhotoPlaceholder + bottomPadding * 2)
 			: desiredHeight;
-		widget->resize(
+		container->resize(
 			widget->width(),
 			std::clamp(
 				desiredHeight,
 				minHeight,
 				st::sponsoredMessageBarMaxHeight));
 	}, widget->lifetime());
-	widget->resize(widget->width(), 1);
+	container->resize(widget->width(), 1);
 
 	{
 		const auto top = Ui::CreateChild<PlainShadow>(widget);
diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.h b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.h
index d18ec9b05..e127fb1e4 100644
--- a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.h
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.h
@@ -20,7 +20,7 @@ namespace Ui {
 class RpWidget;
 
 void FillSponsoredMessageBar(
-	not_null<RpWidget*> widget,
+	not_null<RpWidget*> container,
 	not_null<Main::Session*> session,
 	FullMsgId fullId,
 	Data::SponsoredFrom from,

From 08fda055fc1466e791ae33ec2e01da426a6a54be Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Oct 2024 19:09:13 +0300
Subject: [PATCH 071/306] Renamed Api::ChannelEarnStatistics with
 Api::EarnStatistics.

---
 Telegram/SourceFiles/api/api_credits.h        |  2 +-
 Telegram/SourceFiles/api/api_statistics.cpp   | 42 +++++++++++--------
 Telegram/SourceFiles/api/api_statistics.h     |  5 ++-
 .../earn/info_channel_earn_list.cpp           |  6 +--
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.h b/Telegram/SourceFiles/api/api_credits.h
index d2e819e08..e178cb866 100644
--- a/Telegram/SourceFiles/api/api_credits.h
+++ b/Telegram/SourceFiles/api/api_credits.h
@@ -99,8 +99,8 @@ public:
 	[[nodiscard]] Data::CreditsEarnStatistics data() const;
 
 private:
+	const bool _isUser = false;
 	Data::CreditsEarnStatistics _data;
-	bool _isUser = false;
 
 	mtpRequestId _requestId = 0;
 
diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index a51c2c590..daed8f1ee 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_story.h"
+#include "data/data_user.h"
 #include "history/history.h"
 #include "main/main_session.h"
 
@@ -685,17 +686,18 @@ Data::BoostStatus Boosts::boostStatus() const {
 	return _boostStatus;
 }
 
-ChannelEarnStatistics::ChannelEarnStatistics(not_null<ChannelData*> channel)
-: StatisticsRequestSender(channel) {
+EarnStatistics::EarnStatistics(not_null<PeerData*> peer)
+: StatisticsRequestSender(peer)
+, _isUser(peer->isUser()) {
 }
 
-rpl::producer<rpl::no_value, QString> ChannelEarnStatistics::request() {
+rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
 	return [=](auto consumer) {
 		auto lifetime = rpl::lifetime();
 
 		makeRequest(MTPstats_GetBroadcastRevenueStats(
 			MTP_flags(0),
-			channel()->input
+			(_isUser ? user()->input : channel()->input)
 		)).done([=](const MTPstats_BroadcastRevenueStats &result) {
 			const auto &data = result.data();
 			const auto &balances = data.vbalances().data();
@@ -712,18 +714,22 @@ rpl::producer<rpl::no_value, QString> ChannelEarnStatistics::request() {
 			requestHistory({}, [=](Data::EarnHistorySlice &&slice) {
 				_data.firstHistorySlice = std::move(slice);
 
-				api().request(
-					MTPchannels_GetFullChannel(channel()->inputChannel)
-				).done([=](const MTPmessages_ChatFull &result) {
-					result.data().vfull_chat().match([&](
-							const MTPDchannelFull &d) {
-						_data.switchedOff = d.is_restricted_sponsored();
-					}, [](const auto &) {
-					});
+				if (!_isUser) {
+					api().request(
+						MTPchannels_GetFullChannel(channel()->inputChannel)
+					).done([=](const MTPmessages_ChatFull &result) {
+						result.data().vfull_chat().match([&](
+								const MTPDchannelFull &d) {
+							_data.switchedOff = d.is_restricted_sponsored();
+						}, [](const auto &) {
+						});
+						consumer.put_done();
+					}).fail([=](const MTP::Error &error) {
+						consumer.put_error_copy(error.type());
+					}).send();
+				} else {
 					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());
@@ -733,7 +739,7 @@ rpl::producer<rpl::no_value, QString> ChannelEarnStatistics::request() {
 	};
 }
 
-void ChannelEarnStatistics::requestHistory(
+void EarnStatistics::requestHistory(
 		const Data::EarnHistorySlice::OffsetToken &token,
 		Fn<void(Data::EarnHistorySlice)> done) {
 	if (_requestId) {
@@ -742,7 +748,7 @@ void ChannelEarnStatistics::requestHistory(
 	constexpr auto kTlFirstSlice = tl::make_int(kFirstSlice);
 	constexpr auto kTlLimit = tl::make_int(kLimit);
 	_requestId = api().request(MTPstats_GetBroadcastRevenueTransactions(
-		channel()->input,
+		(_isUser ? user()->input : channel()->input),
 		MTP_int(token),
 		(!token) ? kTlFirstSlice : kTlLimit
 	)).done([=](const MTPstats_BroadcastRevenueTransactions &result) {
@@ -803,7 +809,7 @@ void ChannelEarnStatistics::requestHistory(
 	}).send();
 }
 
-Data::EarnStatistics ChannelEarnStatistics::data() const {
+Data::EarnStatistics EarnStatistics::data() const {
 	return _data;
 }
 
diff --git a/Telegram/SourceFiles/api/api_statistics.h b/Telegram/SourceFiles/api/api_statistics.h
index 213ab9293..b419b8841 100644
--- a/Telegram/SourceFiles/api/api_statistics.h
+++ b/Telegram/SourceFiles/api/api_statistics.h
@@ -79,9 +79,9 @@ private:
 
 };
 
-class ChannelEarnStatistics final : public StatisticsRequestSender {
+class EarnStatistics final : public StatisticsRequestSender {
 public:
-	explicit ChannelEarnStatistics(not_null<ChannelData*> channel);
+	explicit EarnStatistics(not_null<PeerData*> peer);
 
 	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
 	void requestHistory(
@@ -94,6 +94,7 @@ public:
 	static constexpr auto kLimit = int(10);
 
 private:
+	const bool _isUser = false;
 	Data::EarnStatistics _data;
 
 	mtpRequestId _requestId = 0;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 51cf9506a..91ed54be6 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -269,11 +269,11 @@ InnerWidget::InnerWidget(
 void InnerWidget::load() {
 	struct State final {
 		State(not_null<PeerData*> peer)
-		: api(peer->asChannel())
+		: api(peer)
 		, apiCredits(peer)
 		, apiCreditsHistory(peer, true, true) {
 		}
-		Api::ChannelEarnStatistics api;
+		Api::EarnStatistics api;
 		Api::CreditsEarnStatistics apiCredits;
 		Api::CreditsHistory apiCreditsHistory;
 		rpl::lifetime apiLifetime;
@@ -1375,7 +1375,7 @@ void InnerWidget::fill() {
 					ShowMoreState(not_null<ChannelData*> channel)
 					: api(channel) {
 					}
-					Api::ChannelEarnStatistics api;
+					Api::EarnStatistics api;
 					bool loading = false;
 					Data::EarnHistorySlice::OffsetToken token;
 					rpl::variable<int> showed = 0;

From b23a877d7e4271ff5799a5688826ccfbb8458e15 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Oct 2024 19:09:37 +0300
Subject: [PATCH 072/306] Added ability to cache currency balance by peer.

---
 Telegram/SourceFiles/data/components/credits.cpp | 9 +++++++++
 Telegram/SourceFiles/data/components/credits.h   | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/Telegram/SourceFiles/data/components/credits.cpp b/Telegram/SourceFiles/data/components/credits.cpp
index 4c2379a95..e213fcf9a 100644
--- a/Telegram/SourceFiles/data/components/credits.cpp
+++ b/Telegram/SourceFiles/data/components/credits.cpp
@@ -74,6 +74,11 @@ uint64 Credits::balance(PeerId peerId) const {
 	return (it != _cachedPeerBalances.end()) ? it->second : 0;
 }
 
+uint64 Credits::balanceCurrency(PeerId peerId) const {
+	const auto it = _cachedPeerCurrencyBalances.find(peerId);
+	return (it != _cachedPeerCurrencyBalances.end()) ? it->second : 0;
+}
+
 rpl::producer<uint64> Credits::balanceValue() const {
 	return _nonLockedBalance.value();
 }
@@ -128,4 +133,8 @@ void Credits::apply(PeerId peerId, uint64 balance) {
 	_cachedPeerBalances[peerId] = balance;
 }
 
+void Credits::applyCurrency(PeerId peerId, uint64 balance) {
+	_cachedPeerCurrencyBalances[peerId] = balance;
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/credits.h b/Telegram/SourceFiles/data/components/credits.h
index 62fefcc3c..da953b29b 100644
--- a/Telegram/SourceFiles/data/components/credits.h
+++ b/Telegram/SourceFiles/data/components/credits.h
@@ -35,6 +35,9 @@ public:
 	[[nodiscard]] rpl::producer<float64> rateValue(
 		not_null<PeerData*> ownedBotOrChannel);
 
+	void applyCurrency(PeerId peerId, uint64 balance);
+	[[nodiscard]] uint64 balanceCurrency(PeerId peerId) const;
+
 	void lock(int count);
 	void unlock(int count);
 	void withdrawLocked(int count);
@@ -50,6 +53,7 @@ private:
 	std::unique_ptr<Api::CreditsStatus> _loader;
 
 	base::flat_map<PeerId, uint64> _cachedPeerBalances;
+	base::flat_map<PeerId, uint64> _cachedPeerCurrencyBalances;
 
 	uint64 _balance = 0;
 	uint64 _locked = 0;

From e306d9ba35c1f1b46a67211206dbe13bb04ede80 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Oct 2024 19:09:56 +0300
Subject: [PATCH 073/306] Added loading of balances on receiving full user for
 owned bots.

---
 Telegram/SourceFiles/data/data_user.cpp | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 440cffcda..2456567d3 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -7,12 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_user.h"
 
+#include "api/api_credits.h"
 #include "api/api_sensitive_content.h"
+#include "api/api_statistics.h"
 #include "storage/localstorage.h"
 #include "storage/storage_user_photos.h"
 #include "main/main_session.h"
 #include "data/business/data_business_common.h"
 #include "data/business/data_business_info.h"
+#include "data/components/credits.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_peer_bot_command.h"
@@ -635,6 +638,35 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 				user,
 				Data::PeerUpdate::Flag::Rights);
 		}
+		if (info->canEditInformation) {
+			const auto id = user->id;
+			const auto weak = base::make_weak(&user->session());
+			const auto creditsLoadLifetime
+				= std::make_shared<rpl::lifetime>();
+			const auto creditsLoad
+				= creditsLoadLifetime->make_state<Api::CreditsStatus>(user);
+			creditsLoad->request({}, [=](Data::CreditsStatusSlice slice) {
+				if (const auto strong = weak.get()) {
+					strong->credits().apply(id, slice.balance);
+					creditsLoadLifetime->destroy();
+				}
+			});
+			const auto currencyLoadLifetime
+				= std::make_shared<rpl::lifetime>();
+			const auto currencyLoad
+				= currencyLoadLifetime->make_state<Api::EarnStatistics>(user);
+			currencyLoad->request(
+			) | rpl::start_with_error_done([=](const QString &error) {
+				currencyLoadLifetime->destroy();
+			}, [=] {
+				if (const auto strong = weak.get()) {
+					strong->credits().applyCurrency(
+						id,
+						currencyLoad->data().currentBalance);
+					currencyLoadLifetime->destroy();
+				}
+			}, *currencyLoadLifetime);
+		}
 	}
 
 	if (const auto paper = update.vwallpaper()) {

From 3af288c74eb6abfe032baec49714ccce81d2f213 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Oct 2024 19:10:19 +0300
Subject: [PATCH 074/306] Added currency balance to profile section of owned
 bots.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 .../info/profile/info_profile_actions.cpp     | 85 ++++++++++++++++++-
 2 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d6295d9d9..a21992a28 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1594,6 +1594,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_peer_bot_public_link" = "Public Link";
 "lng_manage_peer_bot_public_links" = "Public Links";
 "lng_manage_peer_bot_balance" = "Balance";
+"lng_manage_peer_bot_balance_currency" = "Toncoin";
+"lng_manage_peer_bot_balance_credits" = "Stars";
 "lng_manage_peer_bot_edit_intro" = "Edit Intro";
 "lng_manage_peer_bot_edit_commands" = "Edit Commands";
 "lng_manage_peer_bot_edit_settings" = "Change Bot Settings";
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index df05d47c3..ffcab486e 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_blocked_peers.h"
 #include "api/api_chat_participants.h"
 #include "api/api_credits.h"
+#include "api/api_statistics.h"
 #include "apiwrap.h"
 #include "base/options.h"
 #include "base/timer_rpl.h"
@@ -45,13 +46,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_helpers.h"
 #include "history/view/history_view_item_preview.h"
 #include "info/bot/earn/info_bot_earn_widget.h"
-#include "info/info_controller.h"
-#include "info/info_memento.h"
+#include "info/channel_statistics/earn/earn_format.h"
+#include "info/channel_statistics/earn/info_channel_earn_list.h" // IconCurrency.
 #include "info/profile/info_profile_icon.h"
 #include "info/profile/info_profile_phone_menu.h"
 #include "info/profile/info_profile_text.h"
 #include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_widget.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
 #include "inline_bots/bot_attach_web_view.h"
 #include "iv/iv_instance.h"
 #include "lang/lang_keys.h"
@@ -79,6 +82,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_controller.h" // Window::Controller::show.
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
+#include "styles/style_channel_earn.h" // st::channelEarnCurrencyCommonMargins
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
@@ -835,6 +839,7 @@ public:
 
 private:
 	void addInviteToGroupAction(not_null<UserData*> user);
+	void addCurrencyAction(not_null<UserData*> user);
 	void addCreditsAction(not_null<UserData*> user);
 	void addShareContactAction(not_null<UserData*> user);
 	void addEditContactAction(not_null<UserData*> user);
@@ -1935,6 +1940,77 @@ void ActionsFiller::addInviteToGroupAction(not_null<UserData*> user) {
 	about->finishAnimating();
 }
 
+void ActionsFiller::addCurrencyAction(not_null<UserData*> user) {
+	struct State final {
+		rpl::variable<uint64> balance;
+	};
+	const auto state = _wrap->lifetime().make_state<State>();
+	const auto controller = _controller->parentController();
+	const auto wrap = AddActionButton(
+		_wrap,
+		tr::lng_manage_peer_bot_balance_currency(),
+		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
+		[=] { controller->showSection(Info::BotEarn::Make(user)); },
+		&st::infoIconBotBalance);
+	const auto balance = user->session().credits().balanceCurrency(user->id);
+	if (balance) {
+		state->balance = balance;
+	}
+	{
+		const auto weak = Ui::MakeWeak(_wrap.data());
+		const auto currencyLoadLifetime
+			= std::make_shared<rpl::lifetime>();
+		const auto currencyLoad
+			= currencyLoadLifetime->make_state<Api::EarnStatistics>(user);
+		currencyLoad->request(
+		) | rpl::start_with_error_done([=](const QString &error) {
+			currencyLoadLifetime->destroy();
+		}, [=] {
+			if (const auto strong = weak.get()) {
+				state->balance = currencyLoad->data().currentBalance;
+				currencyLoadLifetime->destroy();
+			}
+		}, *currencyLoadLifetime);
+	}
+	const auto &st = st::infoSharedMediaButton;
+	const auto button = wrap->entity();
+	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
+	const auto icon = Ui::Text::SingleCustomEmoji(
+		user->owner().customEmojiManager().registerInternalEmoji(
+			Info::ChannelEarn::IconCurrency(
+				st.rightLabel,
+				st.rightLabel.textFg->c),
+			st::channelEarnCurrencyCommonMargins,
+			false));
+	name->show();
+	rpl::combine(
+		button->widthValue(),
+		tr::lng_manage_peer_bot_balance_currency(),
+		state->balance.value()
+	) | rpl::start_with_next([=, &st](
+			int width,
+			const QString &button,
+			uint64 balance) {
+		const auto available = width
+			- rect::m::sum::h(st.padding)
+			- st.style.font->width(button)
+			- st::settingsButtonRightSkip;
+		name->setMarkedText(
+			base::duplicate(icon)
+				.append(QChar(' '))
+				.append(Info::ChannelEarn::MajorPart(balance))
+				.append(Info::ChannelEarn::MinorPart(balance)),
+			Core::MarkedTextContext{
+				.session = &user->session(),
+				.customEmojiRepaint = [=] { name->update(); },
+			});
+		name->resizeToNaturalWidth(available);
+		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
+	}, name->lifetime());
+	name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	wrap->finishAnimating();
+}
+
 void ActionsFiller::addCreditsAction(not_null<UserData*> user) {
 	struct State final {
 		rpl::variable<uint64> balance;
@@ -1943,7 +2019,7 @@ void ActionsFiller::addCreditsAction(not_null<UserData*> user) {
 	const auto controller = _controller->parentController();
 	const auto wrap = AddActionButton(
 		_wrap,
-		tr::lng_manage_peer_bot_balance(),
+		tr::lng_manage_peer_bot_balance_credits(),
 		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
 		[=] { controller->showSection(Info::BotEarn::Make(user)); },
 		&st::infoIconBotBalance);
@@ -1963,7 +2039,7 @@ void ActionsFiller::addCreditsAction(not_null<UserData*> user) {
 	name->show();
 	rpl::combine(
 		button->widthValue(),
-		tr::lng_manage_peer_bot_balance(),
+		tr::lng_manage_peer_bot_balance_credits(),
 		state->balance.value()
 	) | rpl::start_with_next([=, &st](
 			int width,
@@ -2209,6 +2285,7 @@ void ActionsFiller::addJoinChannelAction(
 
 void ActionsFiller::fillUserActions(not_null<UserData*> user) {
 	if (user->isBot()) {
+		addCurrencyAction(user);
 		addCreditsAction(user);
 		addInviteToGroupAction(user);
 	}

From bf55c325ced85ca476086af326cc77069c94b394 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Oct 2024 05:01:25 +0300
Subject: [PATCH 075/306] Fixed hotkey to reset IV zoom.

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

diff --git a/Telegram/Resources/iv_html/page.js b/Telegram/Resources/iv_html/page.js
index fda34772f..9bd67163a 100644
--- a/Telegram/Resources/iv_html/page.js
+++ b/Telegram/Resources/iv_html/page.js
@@ -72,6 +72,9 @@ var IV = {
 		}
 	},
 	frameKeyDown: function (e) {
+		const key0 = (e.key === '0')
+			|| (e.code === 'Key0')
+			|| (e.keyCode === 48);
 		const keyW = (e.key === 'w')
 			|| (e.code === 'KeyW')
 			|| (e.keyCode === 87);
@@ -81,12 +84,12 @@ var IV = {
 		const keyM = (e.key === 'm')
 			|| (e.code === 'KeyM')
 			|| (e.keyCode === 77);
-		if ((e.metaKey || e.ctrlKey) && (keyW || keyQ || keyM)) {
+		if ((e.metaKey || e.ctrlKey) && (keyW || keyQ || keyM || key0)) {
 			e.preventDefault();
 			IV.notify({
 				event: 'keydown',
 				modifier: e.ctrlKey ? 'ctrl' : 'cmd',
-				key: keyW ? 'w' : keyQ ? 'q' : 'm',
+				key: key0 ? '0' : keyW ? 'w' : keyQ ? 'q' : 'm',
 			});
 		} else if (e.key === 'Escape' || e.keyCode === 27) {
 			e.preventDefault();
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 606570166..62348a986 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -957,6 +957,8 @@ void Controller::processKey(const QString &key, const QString &modifier) {
 		minimize();
 	} else if (key == u"q"_q && modifier == ctrl) {
 		quit();
+	} else if (key == u"0"_q && modifier == ctrl) {
+		_delegate->ivSetZoom(kDefaultZoom);
 	}
 }
 

From 32b8d83c045a27812cd2912febb4f3d3d5f73810 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Oct 2024 06:45:09 +0300
Subject: [PATCH 076/306] Moved out Info::Statistics::Tag to separated file.

---
 Telegram/CMakeLists.txt                       |  1 +
 .../info/bot/earn/info_bot_earn_widget.cpp    | 10 ++----
 .../boosts/info_boosts_widget.cpp             | 10 ++----
 .../earn/info_channel_earn_widget.cpp         | 10 ++----
 .../SourceFiles/info/info_content_widget.cpp  | 12 ++-----
 .../SourceFiles/info/info_content_widget.h    | 17 +++-------
 Telegram/SourceFiles/info/info_controller.cpp | 22 +++---------
 Telegram/SourceFiles/info/info_controller.h   | 34 +++----------------
 .../SourceFiles/info/info_wrap_widget.cpp     |  2 +-
 .../info/statistics/info_statistics_tag.h     | 31 +++++++++++++++++
 .../statistics/info_statistics_widget.cpp     | 20 +++++------
 11 files changed, 65 insertions(+), 104 deletions(-)
 create mode 100644 Telegram/SourceFiles/info/statistics/info_statistics_tag.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 9656eda27..c627861b3 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -995,6 +995,7 @@ PRIVATE
     info/statistics/info_statistics_list_controllers.h
     info/statistics/info_statistics_recent_message.cpp
     info/statistics/info_statistics_recent_message.h
+    info/statistics/info_statistics_tag.h
     info/statistics/info_statistics_widget.cpp
     info/statistics/info_statistics_widget.h
     info/stories/info_stories_inner_widget.cpp
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
index 7eab7cf7b..b38c436c6 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
@@ -16,11 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Info::BotEarn {
 
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Info::Statistics::Tag{
-	controller->statisticsPeer(),
-	{},
-	{},
-}) {
+: ContentMemento(controller->statisticsTag()) {
 }
 
 Memento::Memento(not_null<PeerData*> peer)
@@ -58,7 +54,7 @@ Widget::Widget(
 	object_ptr<InnerWidget>(
 		this,
 		controller,
-		controller->statisticsPeer()))) {
+		controller->statisticsTag().peer))) {
 	_inner->showRequests(
 	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());
@@ -73,7 +69,7 @@ not_null<PeerData*> Widget::peer() const {
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
-	return (memento->statisticsPeer() == peer());
+	return (memento->statisticsTag().peer == peer());
 }
 
 rpl::producer<QString> Widget::title() {
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
index 60b37cb86..447897dff 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
@@ -16,11 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Info::Boosts {
 
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Info::Statistics::Tag{
-	controller->statisticsPeer(),
-	{},
-	{},
-}) {
+: ContentMemento(controller->statisticsTag()) {
 }
 
 Memento::Memento(not_null<PeerData*> peer)
@@ -58,7 +54,7 @@ Widget::Widget(
 	object_ptr<InnerWidget>(
 		this,
 		controller,
-		controller->statisticsPeer()))) {
+		controller->statisticsTag().peer))) {
 	_inner->showRequests(
 	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());
@@ -73,7 +69,7 @@ not_null<PeerData*> Widget::peer() const {
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
-	return (memento->statisticsPeer() == peer());
+	return (memento->statisticsTag().peer == peer());
 }
 
 rpl::producer<QString> Widget::title() {
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp
index 3074468b6..99424a19d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp
@@ -16,11 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Info::ChannelEarn {
 
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Info::Statistics::Tag{
-	controller->statisticsPeer(),
-	{},
-	{},
-}) {
+: ContentMemento(controller->statisticsTag()) {
 }
 
 Memento::Memento(not_null<PeerData*> peer)
@@ -58,7 +54,7 @@ Widget::Widget(
 	object_ptr<InnerWidget>(
 		this,
 		controller,
-		controller->statisticsPeer()))) {
+		controller->statisticsTag().peer))) {
 	_inner->showRequests(
 	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());
@@ -73,7 +69,7 @@ not_null<PeerData*> Widget::peer() const {
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
-	return (memento->statisticsPeer() == peer());
+	return (memento->statisticsTag().peer == peer());
 }
 
 rpl::producer<QString> Widget::title() {
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index 507ce0f15..942864710 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -375,12 +375,8 @@ Key ContentMemento::key() const {
 		return Settings::Tag{ self };
 	} else if (const auto peer = storiesPeer()) {
 		return Stories::Tag{ peer, storiesTab() };
-	} else if (const auto peer = statisticsPeer()) {
-		return Statistics::Tag{
-			peer,
-			statisticsContextId(),
-			statisticsStoryId(),
-		};
+	} else if (const auto peer = statisticsTag().peer) {
+		return statisticsTag();
 	} else {
 		return Downloads::Tag();
 	}
@@ -418,9 +414,7 @@ ContentMemento::ContentMemento(Stories::Tag stories)
 }
 
 ContentMemento::ContentMemento(Statistics::Tag statistics)
-: _statisticsPeer(statistics.peer)
-, _statisticsContextId(statistics.contextId)
-, _statisticsStoryId(statistics.storyId) {
+: _statisticsTag(statistics) {
 }
 
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index 7f7cd0f2f..fd39d7384 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -7,9 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include <rpl/variable.h>
-#include "ui/rp_widget.h"
 #include "info/info_wrap_widget.h"
+#include "info/statistics/info_statistics_tag.h"
 
 namespace Dialogs::Stories {
 struct Content;
@@ -216,14 +215,8 @@ public:
 	Stories::Tab storiesTab() const {
 		return _storiesTab;
 	}
-	PeerData *statisticsPeer() const {
-		return _statisticsPeer;
-	}
-	FullMsgId statisticsContextId() const {
-		return _statisticsContextId;
-	}
-	FullStoryId statisticsStoryId() const {
-		return _statisticsStoryId;
+	Statistics::Tag statisticsTag() const {
+		return _statisticsTag;
 	}
 	PollData *poll() const {
 		return _poll;
@@ -269,9 +262,7 @@ private:
 	UserData * const _settingsSelf = nullptr;
 	PeerData * const _storiesPeer = nullptr;
 	Stories::Tab _storiesTab = {};
-	PeerData * const _statisticsPeer = nullptr;
-	const FullMsgId _statisticsContextId;
-	const FullStoryId _statisticsStoryId;
+	Statistics::Tag _statisticsTag;
 	PollData * const _poll = nullptr;
 	const FullMsgId _pollContextId;
 
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 0cdd4bd61..7470b1d09 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -92,25 +92,11 @@ Stories::Tab Key::storiesTab() const {
 	return Stories::Tab();
 }
 
-PeerData *Key::statisticsPeer() const {
+Statistics::Tag Key::statisticsTag() const {
 	if (const auto tag = std::get_if<Statistics::Tag>(&_value)) {
-		return tag->peer;
+		return *tag;
 	}
-	return nullptr;
-}
-
-FullMsgId Key::statisticsContextId() const {
-	if (const auto tag = std::get_if<Statistics::Tag>(&_value)) {
-		return tag->contextId;
-	}
-	return {};
-}
-
-FullStoryId Key::statisticsStoryId() const {
-	if (const auto tag = std::get_if<Statistics::Tag>(&_value)) {
-		return tag->storyId;
-	}
-	return {};
+	return Statistics::Tag();
 }
 
 PollData *Key::poll() const {
@@ -292,7 +278,7 @@ bool Controller::validateMementoPeer(
 		&& memento->migratedPeerId() == migratedPeerId()
 		&& memento->settingsSelf() == settingsSelf()
 		&& memento->storiesPeer() == storiesPeer()
-		&& memento->statisticsPeer() == statisticsPeer();
+		&& memento->statisticsTag().peer == statisticsTag().peer;
 }
 
 void Controller::setSection(not_null<ContentMemento*> memento) {
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index ee4a7fc33..f321e6956 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_search_controller.h"
+#include "info/statistics/info_statistics_tag.h"
 #include "window/window_session_controller.h"
 
 namespace Data {
@@ -55,25 +56,6 @@ struct Tag {
 
 } // namespace Info::Stories
 
-namespace Info::Statistics {
-
-struct Tag {
-	explicit Tag(
-		not_null<PeerData*> peer,
-		FullMsgId contextId,
-		FullStoryId storyId)
-	: peer(peer)
-	, contextId(contextId)
-	, storyId(storyId) {
-	}
-
-	not_null<PeerData*> peer;
-	FullMsgId contextId;
-	FullStoryId storyId;
-};
-
-} // namespace Info::Statistics
-
 namespace Info {
 
 class Key {
@@ -92,9 +74,7 @@ public:
 	bool isDownloads() const;
 	PeerData *storiesPeer() const;
 	Stories::Tab storiesTab() const;
-	PeerData *statisticsPeer() const;
-	FullMsgId statisticsContextId() const;
-	FullStoryId statisticsStoryId() const;
+	Statistics::Tag statisticsTag() const;
 	PollData *poll() const;
 	FullMsgId pollContextId() const;
 
@@ -199,14 +179,8 @@ public:
 	[[nodiscard]] Stories::Tab storiesTab() const {
 		return key().storiesTab();
 	}
-	[[nodiscard]] PeerData *statisticsPeer() const {
-		return key().statisticsPeer();
-	}
-	[[nodiscard]] FullMsgId statisticsContextId() const {
-		return key().statisticsContextId();
-	}
-	[[nodiscard]] FullStoryId statisticsStoryId() const {
-		return key().statisticsStoryId();
+	[[nodiscard]] Statistics::Tag statisticsTag() const {
+		return key().statisticsTag();
 	}
 	[[nodiscard]] PollData *poll() const;
 	[[nodiscard]] FullMsgId pollContextId() const {
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 992f9f495..363558e59 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -290,7 +290,7 @@ Dialogs::RowDescriptor WrapWidget::activeChat() const {
 	} else if (key().settingsSelf()
 			|| key().isDownloads()
 			|| key().poll()
-			|| key().statisticsPeer()) {
+			|| key().statisticsTag().peer) {
 		return Dialogs::RowDescriptor();
 	}
 	Unexpected("Owner in WrapWidget::activeChat().");
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_tag.h b/Telegram/SourceFiles/info/statistics/info_statistics_tag.h
new file mode 100644
index 000000000..e2bc2760f
--- /dev/null
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_tag.h
@@ -0,0 +1,31 @@
+/*
+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 PeerData;
+
+namespace Info::Statistics {
+
+struct Tag final {
+	explicit Tag() = default;
+	explicit Tag(
+		PeerData *peer,
+		FullMsgId contextId,
+		FullStoryId storyId)
+	: peer(peer)
+	, contextId(contextId)
+	, storyId(storyId) {
+	}
+
+	PeerData *peer = nullptr;
+	FullMsgId contextId;
+	FullStoryId storyId;
+
+};
+
+} // namespace Info::Statistics
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp
index fc40d9e09..087d3dd11 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp
@@ -19,11 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Info::Statistics {
 
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Tag{
-	controller->statisticsPeer(),
-	controller->statisticsContextId(),
-	controller->statisticsStoryId(),
-}) {
+: ContentMemento(controller->statisticsTag()) {
 }
 
 Memento::Memento(not_null<PeerData*> peer, FullMsgId contextId)
@@ -65,9 +61,9 @@ Widget::Widget(
 	object_ptr<InnerWidget>(
 		this,
 		controller,
-		controller->statisticsPeer(),
-		controller->statisticsContextId(),
-		controller->statisticsStoryId()))) {
+		controller->statisticsTag().peer,
+		controller->statisticsTag().contextId,
+		controller->statisticsTag().storyId))) {
 	_inner->showRequests(
 	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
 		if (request.history) {
@@ -79,7 +75,7 @@ Widget::Widget(
 			controller->showPeerInfo(request.info);
 		} else if (request.messageStatistic || request.storyStatistic) {
 			controller->showSection(Make(
-				controller->statisticsPeer(),
+				controller->statisticsTag().peer,
 				request.messageStatistic,
 				request.storyStatistic));
 		} else if (const auto &s = request.story) {
@@ -92,7 +88,7 @@ Widget::Widget(
 		}
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::start_with_next([this](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
@@ -102,9 +98,9 @@ bool Widget::showInternal(not_null<ContentMemento*> memento) {
 }
 
 rpl::producer<QString> Widget::title() {
-	return controller()->statisticsContextId()
+	return controller()->statisticsTag().contextId
 		? tr::lng_stats_message_title()
-		: controller()->statisticsStoryId()
+		: controller()->statisticsTag().storyId
 		? tr::lng_stats_story_title()
 		: tr::lng_stats_title();
 }

From 24aaed44b92f90b8f5418defd3a45e41bf23917a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Oct 2024 07:34:51 +0300
Subject: [PATCH 077/306] Slightly simplified constructor of
 Info::BotEarn::InnerWidget.

---
 .../info/bot/earn/info_bot_earn_list.cpp      | 22 ++++++++-----------
 .../info/bot/earn/info_bot_earn_list.h        |  6 +----
 .../info/bot/earn/info_bot_earn_widget.cpp    |  6 +----
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
index 84910f9ab..312abc864 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
@@ -60,13 +60,9 @@ void AddHeader(
 
 } // namespace
 
-InnerWidget::InnerWidget(
-	QWidget *parent,
-	not_null<Controller*> controller,
-	not_null<PeerData*> peer)
+InnerWidget::InnerWidget(QWidget *parent, not_null<Controller*> controller)
 : VerticalLayout(parent)
 , _controller(controller)
-, _peer(peer)
 , _show(controller->uiShow()) {
 }
 
@@ -75,7 +71,7 @@ void InnerWidget::load() {
 
 	const auto request = [=](Fn<void(Data::CreditsEarnStatistics)> done) {
 		const auto api = apiLifetime->make_state<Api::CreditsEarnStatistics>(
-			_peer->asUser());
+			peer()->asUser());
 		api->request(
 		) | rpl::start_with_error_done([show = _show](const QString &error) {
 			show->showToast(error);
@@ -92,18 +88,18 @@ void InnerWidget::load() {
 		_showFinished.events());
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::start_with_next([=, this, peer = peer()] {
 		request([=](Data::CreditsEarnStatistics state) {
 			_state = state;
 			_loaded.fire(true);
 			fill();
 
-			_peer->session().account().mtpUpdates(
+			peer->session().account().mtpUpdates(
 			) | rpl::start_with_next([=](const MTPUpdates &updates) {
 				using TL = MTPDupdateStarsRevenueStatus;
 				Api::PerformForUpdate<TL>(updates, [&](const TL &d) {
 					const auto peerId = peerFromMTP(d.vpeer());
-					if (peerId == _peer->id) {
+					if (peerId == peer->id) {
 						request([=](Data::CreditsEarnStatistics state) {
 							_state = state;
 							_stateUpdated.fire({});
@@ -233,7 +229,7 @@ void InnerWidget::fill() {
 		::Settings::AddWithdrawalWidget(
 			container,
 			_controller->parentController(),
-			_peer,
+			peer(),
 			rpl::single(
 				data.buyAdsUrl
 			) | rpl::then(
@@ -262,7 +258,7 @@ void InnerWidget::fillHistory() {
 
 	const auto sectionIndex = history->lifetime().make_state<int>(0);
 
-	const auto fill = [=, peer = _peer](
+	const auto fill = [=, peer = peer()](
 			not_null<PeerData*> premiumBot,
 			const Data::CreditsStatusSlice &fullSlice,
 			const Data::CreditsStatusSlice &inSlice,
@@ -395,7 +391,7 @@ void InnerWidget::fillHistory() {
 	const auto apiLifetime = history->lifetime().make_state<rpl::lifetime>();
 	rpl::single(rpl::empty) | rpl::then(
 		_stateUpdated.events()
-	) | rpl::start_with_next([=, peer = _peer] {
+	) | rpl::start_with_next([=, peer = peer()] {
 		using Api = Api::CreditsHistory;
 		const auto apiFull = apiLifetime->make_state<Api>(peer, true, true);
 		const auto apiIn = apiLifetime->make_state<Api>(peer, true, false);
@@ -450,7 +446,7 @@ void InnerWidget::setInnerFocus() {
 }
 
 not_null<PeerData*> InnerWidget::peer() const {
-	return _peer;
+	return _controller->statisticsTag().peer;
 }
 
 } // namespace Info::BotEarn
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.h b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.h
index 7157c4f02..1d89d4aa9 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.h
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.h
@@ -32,10 +32,7 @@ public:
 	struct ShowRequest final {
 	};
 
-	InnerWidget(
-		QWidget *parent,
-		not_null<Controller*> controller,
-		not_null<PeerData*> peer);
+	InnerWidget(QWidget *parent, not_null<Controller*> controller);
 
 	[[nodiscard]] not_null<PeerData*> peer() const;
 
@@ -54,7 +51,6 @@ private:
 	void fillHistory();
 
 	not_null<Controller*> _controller;
-	not_null<PeerData*> _peer;
 	std::shared_ptr<Ui::Show> _show;
 
 	Data::CreditsEarnStatistics _state;
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
index b38c436c6..123c8e307 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
@@ -50,11 +50,7 @@ Widget::Widget(
 	QWidget *parent,
 	not_null<Controller*> controller)
 : ContentWidget(parent, controller)
-, _inner(setInnerWidget(
-	object_ptr<InnerWidget>(
-		this,
-		controller,
-		controller->statisticsTag().peer))) {
+, _inner(setInnerWidget(object_ptr<InnerWidget>(this, controller))) {
 	_inner->showRequests(
 	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());

From dbb0a5ad288d7121457f98bffd67cf9f44da48ad Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Oct 2024 09:42:03 +0300
Subject: [PATCH 078/306] Added ability to open currency earn section for owned
 bots.

---
 Telegram/Resources/langs/lang.strings         |  3 ++
 .../earn/info_channel_earn_list.cpp           | 37 ++++++++++++-------
 .../info/profile/info_profile_actions.cpp     |  2 +-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index a21992a28..e500f0cb8 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5507,6 +5507,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_channel_earn_title" = "Monetization";
 "lng_channel_earn_about" = "Telegram shares 50% of the revenue from ads displayed in your channel as rewards. {link}";
+"lng_channel_earn_about_bot" = "Telegram shares 50% of the revenue from ads displayed in your bot. {link}";
 "lng_channel_earn_about_link" = "Learn more {emoji}";
 "lng_channel_earn_overview_title" = "Rewards overview";
 "lng_channel_earn_available" = "Rewards available for collection";
@@ -5539,8 +5540,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "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_bot_learn_title" = "Earn From Your Bot";
 "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_bot_in_about" = "Telegram can display ads in your bot.";
 "lng_channel_earn_learn_split_subtitle" = "50:50 revenue split";
 "lng_channel_earn_learn_split_about" = "You can receive 50% of the ad revenue as rewards in TON.";
 "lng_channel_earn_learn_out_subtitle" = "Flexible withdrawals";
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 91ed54be6..49f4c236c 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
+#include "data/data_user.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"
@@ -386,6 +387,9 @@ void InnerWidget::load() {
 
 void InnerWidget::fill() {
 	const auto container = this;
+	const auto bot = (peerIsUser(_peer->id) && _peer->asUser()->botInfo)
+		? _peer->asUser()
+		: nullptr;
 	const auto channel = _peer->asChannel();
 	const auto canViewCurrencyEarn = channel
 		? (channel->flags() & ChannelDataFlag::CanViewRevenue)
@@ -393,7 +397,9 @@ void InnerWidget::fill() {
 	const auto &data = canViewCurrencyEarn
 		? _state.currencyEarn
 		: Data::EarnStatistics();
-	const auto &creditsData = _state.creditsEarn;
+	const auto &creditsData = bot
+		? Data::CreditsEarnStatistics()
+		: _state.creditsEarn;
 
 	auto currencyStateValue = rpl::single(
 		data
@@ -403,11 +409,12 @@ void InnerWidget::fill() {
 		})
 	);
 
-	auto creditsStateValue = rpl::single(
-		creditsData
-	) | rpl::then(
-		_stateUpdated.events() | rpl::map([=] { return _state.creditsEarn; })
-	);
+	auto creditsStateValue = bot
+		? rpl::single(Data::CreditsEarnStatistics())
+		: rpl::single(creditsData) | rpl::then(
+			_stateUpdated.events(
+			) | rpl::map([this] { return _state.creditsEarn; })
+		);
 
 	constexpr auto kMinus = QChar(0x2212);
 	//constexpr auto kApproximately = QChar(0x2248);
@@ -419,12 +426,8 @@ void InnerWidget::fill() {
 		return c ? ToUsd(c, creditsMultiplier) : QString();
 	};
 
-	constexpr auto kNonInteractivePeriod = 1717200000;
-	const auto nonInteractive = base::unixtime::now() < kNonInteractivePeriod;
-
 	const auto session = &_peer->session();
-	const auto withdrawalEnabled = WithdrawalEnabled(session)
-		&& !nonInteractive;
+	const auto withdrawalEnabled = WithdrawalEnabled(session);
 	const auto makeContext = [=](not_null<Ui::FlatLabel*> l) {
 		return Core::MarkedTextContext{
 			.session = session,
@@ -520,7 +523,9 @@ void InnerWidget::fill() {
 					content,
 					object_ptr<Ui::FlatLabel>(
 						content,
-						tr::lng_channel_earn_learn_title(),
+						bot
+							? tr::lng_channel_earn_bot_learn_title()
+							: tr::lng_channel_earn_learn_title(),
 						st::boxTitle)));
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);
@@ -566,7 +571,9 @@ void InnerWidget::fill() {
 					};
 					addEntry(
 						tr::lng_channel_earn_learn_in_subtitle(),
-						tr::lng_channel_earn_learn_in_about(),
+						bot
+							? tr::lng_channel_earn_learn_bot_in_about()
+							: tr::lng_channel_earn_learn_in_about(),
 						st::channelEarnLearnChannelIcon);
 					Ui::AddSkip(content);
 					Ui::AddSkip(content);
@@ -662,7 +669,9 @@ void InnerWidget::fill() {
 			st::defaultBoxDividerLabelPadding,
 			RectPart::Top | RectPart::Bottom));
 	};
-	addAboutWithLearn(tr::lng_channel_earn_about);
+	addAboutWithLearn(bot
+		? tr::lng_channel_earn_about_bot
+		: tr::lng_channel_earn_about);
 	{
 		using Type = Statistic::ChartViewType;
 		Ui::AddSkip(container);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index ffcab486e..a904703a4 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1950,7 +1950,7 @@ void ActionsFiller::addCurrencyAction(not_null<UserData*> user) {
 		_wrap,
 		tr::lng_manage_peer_bot_balance_currency(),
 		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
-		[=] { controller->showSection(Info::BotEarn::Make(user)); },
+		[=] { controller->showSection(Info::ChannelEarn::Make(user)); },
 		&st::infoIconBotBalance);
 	const auto balance = user->session().credits().balanceCurrency(user->id);
 	if (balance) {

From 187139473d8084c2b9bdc0bde222534079ddc600 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Oct 2024 10:29:01 +0300
Subject: [PATCH 079/306] Added subsection title to earn buttons in profile of
 owned bots.

---
 .../info/profile/info_profile_actions.cpp     | 282 ++++++++++--------
 1 file changed, 154 insertions(+), 128 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index a904703a4..dae6a8298 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -775,6 +775,139 @@ template <typename Text, typename ToggleOn, typename Callback>
 		st));
 }
 
+rpl::producer<uint64> AddCurrencyAction(
+		not_null<UserData*> user,
+		not_null<Ui::VerticalLayout*> wrap,
+		not_null<Controller*> controller) {
+	struct State final {
+		rpl::variable<uint64> balance;
+	};
+	const auto state = wrap->lifetime().make_state<State>();
+	const auto parentController = controller->parentController();
+	const auto wrapButton = AddActionButton(
+		wrap,
+		tr::lng_manage_peer_bot_balance_currency(),
+		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
+		[=] { parentController->showSection(Info::ChannelEarn::Make(user)); },
+		&st::infoIconBotBalance);
+	const auto balance = user->session().credits().balanceCurrency(user->id);
+	if (balance) {
+		state->balance = balance;
+	}
+	{
+		const auto weak = Ui::MakeWeak(wrap);
+		const auto currencyLoadLifetime
+			= std::make_shared<rpl::lifetime>();
+		const auto currencyLoad
+			= currencyLoadLifetime->make_state<Api::EarnStatistics>(user);
+		currencyLoad->request(
+		) | rpl::start_with_error_done([=](const QString &error) {
+			currencyLoadLifetime->destroy();
+		}, [=] {
+			if (const auto strong = weak.get()) {
+				state->balance = currencyLoad->data().currentBalance;
+				currencyLoadLifetime->destroy();
+			}
+		}, *currencyLoadLifetime);
+	}
+	const auto &st = st::infoSharedMediaButton;
+	const auto button = wrapButton->entity();
+	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
+	const auto icon = Ui::Text::SingleCustomEmoji(
+		user->owner().customEmojiManager().registerInternalEmoji(
+			Info::ChannelEarn::IconCurrency(
+				st.rightLabel,
+				st.rightLabel.textFg->c),
+			st::channelEarnCurrencyCommonMargins,
+			false));
+	name->show();
+	rpl::combine(
+		button->widthValue(),
+		tr::lng_manage_peer_bot_balance_currency(),
+		state->balance.value()
+	) | rpl::start_with_next([=, &st](
+			int width,
+			const QString &button,
+			uint64 balance) {
+		const auto available = width
+			- rect::m::sum::h(st.padding)
+			- st.style.font->width(button)
+			- st::settingsButtonRightSkip;
+		name->setMarkedText(
+			base::duplicate(icon)
+				.append(QChar(' '))
+				.append(Info::ChannelEarn::MajorPart(balance))
+				.append(Info::ChannelEarn::MinorPart(balance)),
+			Core::MarkedTextContext{
+				.session = &user->session(),
+				.customEmojiRepaint = [=] { name->update(); },
+			});
+		name->resizeToNaturalWidth(available);
+		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
+	}, name->lifetime());
+	name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	wrapButton->finishAnimating();
+	return state->balance.value();
+}
+
+rpl::producer<uint64> AddCreditsAction(
+		not_null<UserData*> user,
+		not_null<Ui::VerticalLayout*> wrap,
+		not_null<Controller*> controller) {
+	struct State final {
+		rpl::variable<uint64> balance;
+	};
+	const auto state = wrap->lifetime().make_state<State>();
+	const auto parentController = controller->parentController();
+	const auto wrapButton = AddActionButton(
+		wrap,
+		tr::lng_manage_peer_bot_balance_credits(),
+		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
+		[=] { parentController->showSection(Info::BotEarn::Make(user)); },
+		&st::infoIconBotBalance);
+	if (const auto balance = user->session().credits().balance(user->id)) {
+		state->balance = balance;
+	}
+	{
+		const auto api = wrap->lifetime().make_state<Api::CreditsStatus>(
+			user);
+		api->request({}, [=](Data::CreditsStatusSlice data) {
+			state->balance = data.balance;
+		});
+	}
+	const auto &st = st::infoSharedMediaButton;
+	const auto button = wrapButton->entity();
+	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
+	const auto icon = user->owner().customEmojiManager().creditsEmoji();
+	name->show();
+	rpl::combine(
+		button->widthValue(),
+		tr::lng_manage_peer_bot_balance_credits(),
+		state->balance.value()
+	) | rpl::start_with_next([=, &st](
+			int width,
+			const QString &button,
+			uint64 balance) {
+		const auto available = width
+			- rect::m::sum::h(st.padding)
+			- st.style.font->width(button)
+			- st::settingsButtonRightSkip;
+		name->setMarkedText(
+			base::duplicate(icon)
+				.append(QChar(' '))
+				.append(QString::number(balance)),
+			Core::MarkedTextContext{
+				.session = &user->session(),
+				.customEmojiRepaint = [=] { name->update(); },
+			});
+		name->resizeToNaturalWidth(available);
+		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
+	}, name->lifetime());
+	name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	wrapButton->finishAnimating();
+	return state->balance.value();
+}
+
 class DetailsFiller {
 public:
 	DetailsFiller(
@@ -838,9 +971,8 @@ public:
 	object_ptr<Ui::RpWidget> fill();
 
 private:
+	void addBalanceActions(not_null<UserData*> user);
 	void addInviteToGroupAction(not_null<UserData*> user);
-	void addCurrencyAction(not_null<UserData*> user);
-	void addCreditsAction(not_null<UserData*> user);
 	void addShareContactAction(not_null<UserData*> user);
 	void addEditContactAction(not_null<UserData*> user);
 	void addDeleteContactAction(not_null<UserData*> user);
@@ -1916,6 +2048,25 @@ ActionsFiller::ActionsFiller(
 , _peer(peer) {
 }
 
+void ActionsFiller::addBalanceActions(not_null<UserData*> user) {
+	const auto wrap = _wrap->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			_wrap.data(),
+			object_ptr<Ui::VerticalLayout>(_wrap.data())));
+	const auto inner = wrap->entity();
+	Ui::AddSubsectionTitle(inner, tr::lng_manage_peer_bot_balance());
+	auto currencyBalance = AddCurrencyAction(user, inner, _controller);
+	auto creditsBalance = AddCreditsAction(user, inner, _controller);
+	Ui::AddSkip(inner);
+	Ui::AddDivider(inner);
+	Ui::AddSkip(inner);
+	wrap->toggleOn(
+		rpl::combine(
+			std::move(currencyBalance),
+			std::move(creditsBalance)
+		) | rpl::map((rpl::mappers::_1 + rpl::mappers::_2) > 0));
+}
+
 void ActionsFiller::addInviteToGroupAction(not_null<UserData*> user) {
 	const auto notEmpty = [](const QString &value) {
 		return !value.isEmpty();
@@ -1940,130 +2091,6 @@ void ActionsFiller::addInviteToGroupAction(not_null<UserData*> user) {
 	about->finishAnimating();
 }
 
-void ActionsFiller::addCurrencyAction(not_null<UserData*> user) {
-	struct State final {
-		rpl::variable<uint64> balance;
-	};
-	const auto state = _wrap->lifetime().make_state<State>();
-	const auto controller = _controller->parentController();
-	const auto wrap = AddActionButton(
-		_wrap,
-		tr::lng_manage_peer_bot_balance_currency(),
-		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
-		[=] { controller->showSection(Info::ChannelEarn::Make(user)); },
-		&st::infoIconBotBalance);
-	const auto balance = user->session().credits().balanceCurrency(user->id);
-	if (balance) {
-		state->balance = balance;
-	}
-	{
-		const auto weak = Ui::MakeWeak(_wrap.data());
-		const auto currencyLoadLifetime
-			= std::make_shared<rpl::lifetime>();
-		const auto currencyLoad
-			= currencyLoadLifetime->make_state<Api::EarnStatistics>(user);
-		currencyLoad->request(
-		) | rpl::start_with_error_done([=](const QString &error) {
-			currencyLoadLifetime->destroy();
-		}, [=] {
-			if (const auto strong = weak.get()) {
-				state->balance = currencyLoad->data().currentBalance;
-				currencyLoadLifetime->destroy();
-			}
-		}, *currencyLoadLifetime);
-	}
-	const auto &st = st::infoSharedMediaButton;
-	const auto button = wrap->entity();
-	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
-	const auto icon = Ui::Text::SingleCustomEmoji(
-		user->owner().customEmojiManager().registerInternalEmoji(
-			Info::ChannelEarn::IconCurrency(
-				st.rightLabel,
-				st.rightLabel.textFg->c),
-			st::channelEarnCurrencyCommonMargins,
-			false));
-	name->show();
-	rpl::combine(
-		button->widthValue(),
-		tr::lng_manage_peer_bot_balance_currency(),
-		state->balance.value()
-	) | rpl::start_with_next([=, &st](
-			int width,
-			const QString &button,
-			uint64 balance) {
-		const auto available = width
-			- rect::m::sum::h(st.padding)
-			- st.style.font->width(button)
-			- st::settingsButtonRightSkip;
-		name->setMarkedText(
-			base::duplicate(icon)
-				.append(QChar(' '))
-				.append(Info::ChannelEarn::MajorPart(balance))
-				.append(Info::ChannelEarn::MinorPart(balance)),
-			Core::MarkedTextContext{
-				.session = &user->session(),
-				.customEmojiRepaint = [=] { name->update(); },
-			});
-		name->resizeToNaturalWidth(available);
-		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
-	}, name->lifetime());
-	name->setAttribute(Qt::WA_TransparentForMouseEvents);
-	wrap->finishAnimating();
-}
-
-void ActionsFiller::addCreditsAction(not_null<UserData*> user) {
-	struct State final {
-		rpl::variable<uint64> balance;
-	};
-	const auto state = _wrap->lifetime().make_state<State>();
-	const auto controller = _controller->parentController();
-	const auto wrap = AddActionButton(
-		_wrap,
-		tr::lng_manage_peer_bot_balance_credits(),
-		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
-		[=] { controller->showSection(Info::BotEarn::Make(user)); },
-		&st::infoIconBotBalance);
-	if (const auto balance = user->session().credits().balance(user->id)) {
-		state->balance = balance;
-	}
-	{
-		const auto api = _wrap->lifetime().make_state<Api::CreditsStatus>(
-			user);
-		api->request({}, [=](Data::CreditsStatusSlice data) {
-			state->balance = data.balance;
-		});
-	}
-	const auto &st = st::infoSharedMediaButton;
-	const auto button = wrap->entity();
-	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
-	name->show();
-	rpl::combine(
-		button->widthValue(),
-		tr::lng_manage_peer_bot_balance_credits(),
-		state->balance.value()
-	) | rpl::start_with_next([=, &st](
-			int width,
-			const QString &button,
-			uint64 balance) {
-		const auto available = width
-			- rect::m::sum::h(st.padding)
-			- st.style.font->width(button)
-			- st::settingsButtonRightSkip;
-		name->setMarkedText(
-			user->owner().customEmojiManager().creditsEmoji()
-				.append(QChar(' '))
-				.append(QString::number(balance)),
-			Core::MarkedTextContext{
-				.session = &user->session(),
-				.customEmojiRepaint = [=] { name->update(); },
-			});
-		name->resizeToNaturalWidth(available);
-		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
-	}, name->lifetime());
-	name->setAttribute(Qt::WA_TransparentForMouseEvents);
-	wrap->finishAnimating();
-}
-
 void ActionsFiller::addShareContactAction(not_null<UserData*> user) {
 	const auto controller = _controller->parentController();
 	AddActionButton(
@@ -2285,8 +2312,7 @@ void ActionsFiller::addJoinChannelAction(
 
 void ActionsFiller::fillUserActions(not_null<UserData*> user) {
 	if (user->isBot()) {
-		addCurrencyAction(user);
-		addCreditsAction(user);
+		addBalanceActions(user);
 		addInviteToGroupAction(user);
 	}
 	addShareContactAction(user);

From 2e0e4006a1984eb17b902de6f04d3e0590a52791 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Oct 2024 11:03:57 +0300
Subject: [PATCH 080/306] Moved out generation of currency icon from svg to
 td_ui.

---
 .../channel_statistics/earn/earn_icons.cpp    | 61 +++++++++++++++++++
 .../info/channel_statistics/earn/earn_icons.h | 16 +++++
 .../earn/info_channel_earn_list.cpp           | 52 ++--------------
 .../earn/info_channel_earn_list.h             |  4 --
 .../info/profile/info_profile_actions.cpp     |  7 ++-
 .../window/window_session_controller.cpp      |  5 +-
 Telegram/cmake/td_ui.cmake                    |  2 +
 7 files changed, 92 insertions(+), 55 deletions(-)
 create mode 100644 Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
 create mode 100644 Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
new file mode 100644
index 000000000..47616dff4
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
@@ -0,0 +1,61 @@
+/*
+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_icons.h"
+
+#include "ui/rect.h"
+
+#include <QtSvg/QSvgRenderer>
+
+namespace Ui::Earn {
+namespace {
+
+[[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>)";
+}
+
+} // namespace
+
+QImage IconCurrencyColored(
+		const style::font &font,
+		const QColor &c) {
+	const auto s = Size(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;
+}
+
+} // namespace Ui::Earn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
new file mode 100644
index 000000000..e7f7f7d34
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.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
+
+namespace Ui::Earn {
+
+[[nodiscard]] QImage IconCurrencyColored(
+	const style::font &font,
+	const QColor &c);
+
+} // namespace Ui::Earn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 49f4c236c..d4071225d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #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/earn_icons.h"
 #include "info/channel_statistics/earn/info_channel_earn_widget.h"
 #include "info/info_controller.h"
 #include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
@@ -64,7 +65,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_credits.h"
 #include "styles/style_window.h" // mainMenuToggleFourStrokes.
 
-#include <QtSvg/QSvgRenderer>
 #include <QtWidgets/QApplication>
 
 namespace Info::ChannelEarn {
@@ -119,31 +119,6 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
 	});
 }
 
-[[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());
 	arrow->paintRequest(
@@ -240,23 +215,6 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 
 } // namespace
 
-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;
-}
-
 InnerWidget::InnerWidget(
 	QWidget *parent,
 	not_null<Controller*> controller,
@@ -442,8 +400,8 @@ void InnerWidget::fill() {
 		const auto &st = label->st();
 		auto icon = Ui::Text::SingleCustomEmoji(
 			session->data().customEmojiManager().registerInternalEmoji(
-				IconCurrency(
-					st,
+				Ui::Earn::IconCurrencyColored(
+					st.style.font,
 					!isIn
 						? st::activeButtonBg->c
 						: (*isIn)
@@ -465,7 +423,9 @@ void InnerWidget::fill() {
 
 	const auto bigCurrencyIcon = Ui::Text::SingleCustomEmoji(
 		session->data().customEmojiManager().registerInternalEmoji(
-			IconCurrency(st::boxTitle, st::activeButtonBg->c),
+			Ui::Earn::IconCurrencyColored(
+				st::boxTitle.style.font,
+				st::activeButtonBg->c),
 			st::channelEarnCurrencyLearnMargins,
 			false));
 
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h
index 061d69b7e..d67eba323 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h
@@ -23,10 +23,6 @@ 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 dae6a8298..0e3a6e9c2 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -47,7 +47,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_item_preview.h"
 #include "info/bot/earn/info_bot_earn_widget.h"
 #include "info/channel_statistics/earn/earn_format.h"
-#include "info/channel_statistics/earn/info_channel_earn_list.h" // IconCurrency.
+#include "info/channel_statistics/earn/earn_icons.h"
+#include "info/channel_statistics/earn/info_channel_earn_list.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/profile/info_profile_phone_menu.h"
 #include "info/profile/info_profile_text.h"
@@ -815,8 +816,8 @@ rpl::producer<uint64> AddCurrencyAction(
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
 	const auto icon = Ui::Text::SingleCustomEmoji(
 		user->owner().customEmojiManager().registerInternalEmoji(
-			Info::ChannelEarn::IconCurrency(
-				st.rightLabel,
+			Ui::Earn::IconCurrencyColored(
+				st.rightLabel.style.font,
 				st.rightLabel.textFg->c),
 			st::channelEarnCurrencyCommonMargins,
 			false));
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index f46d7a4d1..b9d1fc876 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -57,6 +57,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/click_handler_types.h"
 #include "core/ui_integration.h"
 #include "base/unixtime.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/format_values.h" // Ui::FormatPhone.
@@ -178,8 +179,8 @@ private:
 	return {
 		.tonEmoji = Ui::Text::SingleCustomEmoji(
 			session->data().customEmojiManager().registerInternalEmoji(
-				Info::ChannelEarn::IconCurrency(
-					st::collectibleInfo,
+				Ui::Earn::IconCurrencyColored(
+					st::collectibleInfo.style.font,
 					st::collectibleInfo.textFg->c),
 				st::collectibleInfoTonMargins,
 				true)),
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index e42ee37a2..3da81f9d2 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -153,6 +153,8 @@ PRIVATE
 
     info/channel_statistics/earn/earn_format.cpp
     info/channel_statistics/earn/earn_format.h
+    info/channel_statistics/earn/earn_icons.cpp
+    info/channel_statistics/earn/earn_icons.h
 
     intro/intro_code_input.cpp
     intro/intro_code_input.h

From 9e0c731b32a4eed70038e1d68c71d3847814ca2e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Oct 2024 11:25:53 +0300
Subject: [PATCH 081/306] Moved out generation of credits menu icon from svg to
 td_ui.

---
 .../boxes/peers/edit_peer_info_box.cpp        | 35 +++--------------
 .../channel_statistics/earn/earn_icons.cpp    | 39 +++++++++++++++++++
 .../info/channel_statistics/earn/earn_icons.h |  2 +
 3 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 4b11e3745..a9b892ae6 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -46,6 +46,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/admin_log/history_admin_log_section.h"
 #include "info/bot/earn/info_bot_earn_widget.h"
 #include "info/channel_statistics/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "info/profile/info_profile_values.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
@@ -1622,42 +1623,18 @@ void Controller::fillBotBalanceButton() {
 		});
 	}
 	{
-		constexpr auto kSizeShift = 3;
-		constexpr auto kStrokeWidth = 5;
-
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
-		icon->resize(Size(st::menuIconLinks.width() - kSizeShift));
-
-		auto colorized = [&] {
-			auto f = QFile(Ui::Premium::Svg());
-			if (!f.open(QIODevice::ReadOnly)) {
-				return QString();
-			}
-			return QString::fromUtf8(
-				f.readAll()).replace(u"#fff"_q, u"#ffffff00"_q);
-		}();
-		colorized.replace(
-			u"stroke=\"none\""_q,
-			u"stroke=\"%1\""_q.arg(st::menuIconColor->c.name()));
-		colorized.replace(
-			u"stroke-width=\"1\""_q,
-			u"stroke-width=\"%1\""_q.arg(kStrokeWidth));
-		const auto svg = icon->lifetime().make_state<QSvgRenderer>(
-			colorized.toUtf8());
-		svg->setViewBox(svg->viewBox() + Margins(kStrokeWidth));
-
-		const auto starSize = Size(icon->height());
-
-		icon->paintRequest(
-		) | rpl::start_with_next([=] {
+		const auto image = Ui::Earn::MenuIconCredits();
+		icon->resize(image.size() / style::DevicePixelRatio());
+		icon->paintRequest() | rpl::start_with_next([=] {
 			auto p = QPainter(icon);
-			svg->render(&p, Rect(starSize));
+			p.drawImage(0, 0, image);
 		}, icon->lifetime());
 
 		button->sizeValue(
 		) | rpl::start_with_next([=](const QSize &size) {
 			icon->moveToLeft(
-				button->st().iconLeft + kSizeShift / 2.,
+				button->st().iconLeft,
 				(size.height() - icon->height()) / 2);
 		}, icon->lifetime());
 	}
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
index 47616dff4..cc32bf31f 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
@@ -7,8 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/channel_statistics/earn/earn_icons.h"
 
+#include "ui/effects/premium_graphics.h"
 #include "ui/rect.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_widgets.h"
 
+#include <QFile>
 #include <QtSvg/QSvgRenderer>
 
 namespace Ui::Earn {
@@ -58,4 +62,39 @@ QImage IconCurrencyColored(
 	return image;
 }
 
+QImage MenuIconCredits() {
+	constexpr auto kStrokeWidth = 5;
+	const auto sizeShift = st::lineWidth * 1.5;
+
+	auto colorized = [&] {
+		auto f = QFile(Ui::Premium::Svg());
+		if (!f.open(QIODevice::ReadOnly)) {
+			return QString();
+		}
+		return QString::fromUtf8(f.readAll()).replace(
+			u"#fff"_q,
+			u"#ffffff00"_q);
+	}();
+	colorized.replace(
+		u"stroke=\"none\""_q,
+		u"stroke=\"%1\""_q.arg(st::menuIconColor->c.name()));
+	colorized.replace(
+		u"stroke-width=\"1\""_q,
+		u"stroke-width=\"%1\""_q.arg(kStrokeWidth));
+	auto svg = QSvgRenderer(colorized.toUtf8());
+	svg.setViewBox(svg.viewBox()
+		+ Margins(style::ConvertScale(kStrokeWidth)));
+
+	auto image = QImage(
+		st::menuIconLinks.size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	{
+		auto p = QPainter(&image);
+		svg.render(&p, Rect(st::menuIconLinks.size()) - Margins(sizeShift));
+	}
+	return image;
+}
+
 } // namespace Ui::Earn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
index e7f7f7d34..72817de9d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
@@ -13,4 +13,6 @@ namespace Ui::Earn {
 	const style::font &font,
 	const QColor &c);
 
+[[nodiscard]] QImage MenuIconCredits();
+
 } // namespace Ui::Earn

From 7a2562e5bb950917e4a65be21ee6c76f72981010 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Oct 2024 13:39:24 +0300
Subject: [PATCH 082/306] Added icons to earn buttons in profile sections of
 owned bots.

---
 Telegram/SourceFiles/info/info.style          |  2 +
 .../info/profile/info_profile_actions.cpp     | 64 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 1838d6f95..ae7037a2c 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -485,6 +485,8 @@ infoSharedMediaButtonIconPosition: point(20px, 3px);
 infoGroupMembersIconPosition: point(20px, 10px);
 infoChannelMembersIconPosition: point(20px, 4px);
 infoChannelAdminsIconPosition: point(24px, 7px);
+infoEarnCreditsIconPosition: point(24px, 7px);
+infoEarnCurrencyIconPosition: point(20px, 3px);
 
 infoOpenApp: RoundButton(defaultActiveButton) {
 	textTop: 11px;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 0e3a6e9c2..6ba286fe7 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -790,7 +790,52 @@ rpl::producer<uint64> AddCurrencyAction(
 		tr::lng_manage_peer_bot_balance_currency(),
 		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
 		[=] { parentController->showSection(Info::ChannelEarn::Make(user)); },
-		&st::infoIconBotBalance);
+		nullptr);
+	{
+		const auto button = wrapButton->entity();
+		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
+		icon->resize(st::infoIconReport.size());
+		const auto image = [&] {
+			auto image = QImage(
+				icon->size() * style::DevicePixelRatio(),
+				QImage::Format_ARGB32_Premultiplied);
+			image.setDevicePixelRatio(style::DevicePixelRatio());
+			image.fill(Qt::transparent);
+			auto p = QPainter(&image);
+			st::infoIconReport.paintInCenter(
+				p,
+				icon->rect(),
+				st::infoIconFg->c);
+			p.setCompositionMode(QPainter::CompositionMode_Clear);
+			const auto w = st::lineWidth * 6;
+			p.fillRect(
+				QRect(
+					rect::center(icon->rect()).x() - w / 2,
+					rect::center(icon->rect()).y() - w,
+					w,
+					w * 2),
+				Qt::white);
+			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+			const auto i = Ui::Earn::IconCurrencyColored(
+				st::inviteLinkSubscribeBoxTerms.style.font,
+				st::infoIconFg->c);
+			p.drawImage(
+				(icon->width() - i.width() / style::DevicePixelRatio()) / 2,
+				(icon->height() - i.height() / style::DevicePixelRatio()) / 2,
+				i);
+			return image;
+		}();
+		icon->paintRequest() | rpl::start_with_next([=] {
+			auto p = QPainter(icon);
+			auto hq = PainterHighQualityEnabler(p);
+			p.drawImage(0, 0, image);
+		}, icon->lifetime());
+
+		button->sizeValue(
+		) | rpl::start_with_next([=](const QSize &size) {
+			icon->move(st::infoEarnCurrencyIconPosition);
+		}, icon->lifetime());
+	}
 	const auto balance = user->session().credits().balanceCurrency(user->id);
 	if (balance) {
 		state->balance = balance;
@@ -865,7 +910,22 @@ rpl::producer<uint64> AddCreditsAction(
 		tr::lng_manage_peer_bot_balance_credits(),
 		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
 		[=] { parentController->showSection(Info::BotEarn::Make(user)); },
-		&st::infoIconBotBalance);
+		nullptr);
+	{
+		const auto button = wrapButton->entity();
+		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
+		const auto image = Ui::Earn::MenuIconCredits();
+		icon->resize(image.size() / style::DevicePixelRatio());
+		icon->paintRequest() | rpl::start_with_next([=] {
+			auto p = QPainter(icon);
+			p.drawImage(0, 0, image);
+		}, icon->lifetime());
+
+		button->sizeValue(
+		) | rpl::start_with_next([=](const QSize &size) {
+			icon->move(st::infoEarnCreditsIconPosition);
+		}, icon->lifetime());
+	}
 	if (const auto balance = user->session().credits().balance(user->id)) {
 		state->balance = balance;
 	}

From 6bc8daaedab6eb0c0cf20bdb4343dde0194c04d7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Oct 2024 14:15:03 +0300
Subject: [PATCH 083/306] Added earn button to section of bot settings.

---
 .../boxes/peers/edit_peer_info_box.cpp        | 78 ++++++++++++++++++-
 .../channel_statistics/earn/earn_icons.cpp    | 32 ++++++++
 .../info/channel_statistics/earn/earn_icons.h |  1 +
 .../info/profile/info_profile_actions.cpp     | 32 +-------
 4 files changed, 108 insertions(+), 35 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index a9b892ae6..3ad60a265 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "api/api_credits.h"
 #include "api/api_peer_photo.h"
+#include "api/api_statistics.h"
 #include "api/api_user_names.h"
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
@@ -46,7 +47,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/admin_log/history_admin_log_section.h"
 #include "info/bot/earn/info_bot_earn_widget.h"
 #include "info/channel_statistics/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/earn/earn_format.h"
 #include "info/channel_statistics/earn/earn_icons.h"
+#include "info/channel_statistics/earn/info_channel_earn_widget.h"
 #include "info/profile/info_profile_values.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
@@ -353,7 +356,8 @@ private:
 	void fillPendingRequestsButton();
 
 	void fillBotUsernamesButton();
-	void fillBotBalanceButton();
+	void fillBotCurrencyButton();
+	void fillBotCreditsButton();
 	void fillBotEditIntroButton();
 	void fillBotEditCommandsButton();
 	void fillBotEditSettingsButton();
@@ -1175,7 +1179,8 @@ void Controller::fillManageSection() {
 
 		::AddSkip(container, 0);
 		fillBotUsernamesButton();
-		fillBotBalanceButton();
+		fillBotCurrencyButton();
+		fillBotCreditsButton();
 		fillBotEditIntroButton();
 		fillBotEditCommandsButton();
 		fillBotEditSettingsButton();
@@ -1584,7 +1589,72 @@ void Controller::fillBotUsernamesButton() {
 		{ &st::menuIconLinks });
 }
 
-void Controller::fillBotBalanceButton() {
+void Controller::fillBotCurrencyButton() {
+	Expects(_isBot);
+
+	struct State final {
+		rpl::variable<QString> balance;
+	};
+
+	auto &lifetime = _controls.buttonsLayout->lifetime();
+	const auto state = lifetime.make_state<State>();
+	const auto format = [=](uint64 balance) {
+		return Info::ChannelEarn::MajorPart(balance)
+			+ Info::ChannelEarn::MinorPart(balance);
+	};
+	const auto was = _peer->session().credits().balanceCurrency(
+		_peer->id);
+	if (was) {
+		state->balance = format(was);
+	}
+
+	const auto wrap = _controls.buttonsLayout->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			_controls.buttonsLayout,
+			EditPeerInfoBox::CreateButton(
+				_controls.buttonsLayout,
+				tr::lng_manage_peer_bot_balance_currency(),
+				state->balance.value(),
+				[controller = _navigation->parentController(), peer = _peer] {
+					controller->showSection(Info::ChannelEarn::Make(peer));
+				},
+				st::manageGroupButton,
+				{})));
+	wrap->toggle(!state->balance.current().isEmpty(), anim::type::instant);
+
+	const auto button = wrap->entity();
+	{
+		const auto currencyLoad
+			= button->lifetime().make_state<Api::EarnStatistics>(_peer);
+		currencyLoad->request(
+		) | rpl::start_with_error_done([=](const QString &error) {
+		}, [=] {
+			const auto balance = currencyLoad->data().currentBalance;
+			if (balance) {
+				wrap->toggle(true, anim::type::normal);
+			}
+			state->balance = format(balance);
+		}, button->lifetime());
+	}
+	{
+		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
+		icon->resize(st::menuIconLinks.size());
+		const auto image = Ui::Earn::MenuIconCurrency(icon->size());
+		icon->paintRequest() | rpl::start_with_next([=] {
+			auto p = QPainter(icon);
+			p.drawImage(0, 0, image);
+		}, icon->lifetime());
+
+		button->sizeValue(
+		) | rpl::start_with_next([=](const QSize &size) {
+			icon->moveToLeft(
+				button->st().iconLeft,
+				(size.height() - icon->height()) / 2);
+		}, icon->lifetime());
+	}
+}
+
+void Controller::fillBotCreditsButton() {
 	Expects(_isBot);
 
 	struct State final {
@@ -1602,7 +1672,7 @@ void Controller::fillBotBalanceButton() {
 			_controls.buttonsLayout,
 			EditPeerInfoBox::CreateButton(
 				_controls.buttonsLayout,
-				tr::lng_manage_peer_bot_balance(),
+				tr::lng_manage_peer_bot_balance_credits(),
 				state->balance.value(),
 				[controller = _navigation->parentController(), peer = _peer] {
 					controller->showSection(Info::BotEarn::Make(peer));
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
index cc32bf31f..0a57f9288 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rect.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_widgets.h"
+#include "styles/style_info.h" // infoIconReport.
 
 #include <QFile>
 #include <QtSvg/QSvgRenderer>
@@ -62,6 +63,37 @@ QImage IconCurrencyColored(
 	return image;
 }
 
+QImage MenuIconCurrency(const QSize &size) {
+	auto image = QImage(
+		size * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	auto p = QPainter(&image);
+	st::infoIconReport.paintInCenter(
+		p,
+		Rect(size),
+		st::infoIconFg->c);
+	p.setCompositionMode(QPainter::CompositionMode_Clear);
+	const auto w = st::lineWidth * 6;
+	p.fillRect(
+		QRect(
+			rect::center(Rect(size)).x() - w / 2,
+			rect::center(Rect(size)).y() - w,
+			w,
+			w * 2),
+		Qt::white);
+	p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+	const auto i = IconCurrencyColored(
+		st::inviteLinkSubscribeBoxTerms.style.font,
+		st::infoIconFg->c);
+	p.drawImage(
+		(size.width() - i.width() / style::DevicePixelRatio()) / 2,
+		(size.height() - i.height() / style::DevicePixelRatio()) / 2,
+		i);
+	return image;
+}
+
 QImage MenuIconCredits() {
 	constexpr auto kStrokeWidth = 5;
 	const auto sizeShift = st::lineWidth * 1.5;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
index 72817de9d..ccc2ca7f8 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
@@ -13,6 +13,7 @@ namespace Ui::Earn {
 	const style::font &font,
 	const QColor &c);
 
+[[nodiscard]] QImage MenuIconCurrency(const QSize &size);
 [[nodiscard]] QImage MenuIconCredits();
 
 } // namespace Ui::Earn
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 6ba286fe7..5a44d9916 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -795,39 +795,9 @@ rpl::producer<uint64> AddCurrencyAction(
 		const auto button = wrapButton->entity();
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
 		icon->resize(st::infoIconReport.size());
-		const auto image = [&] {
-			auto image = QImage(
-				icon->size() * style::DevicePixelRatio(),
-				QImage::Format_ARGB32_Premultiplied);
-			image.setDevicePixelRatio(style::DevicePixelRatio());
-			image.fill(Qt::transparent);
-			auto p = QPainter(&image);
-			st::infoIconReport.paintInCenter(
-				p,
-				icon->rect(),
-				st::infoIconFg->c);
-			p.setCompositionMode(QPainter::CompositionMode_Clear);
-			const auto w = st::lineWidth * 6;
-			p.fillRect(
-				QRect(
-					rect::center(icon->rect()).x() - w / 2,
-					rect::center(icon->rect()).y() - w,
-					w,
-					w * 2),
-				Qt::white);
-			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-			const auto i = Ui::Earn::IconCurrencyColored(
-				st::inviteLinkSubscribeBoxTerms.style.font,
-				st::infoIconFg->c);
-			p.drawImage(
-				(icon->width() - i.width() / style::DevicePixelRatio()) / 2,
-				(icon->height() - i.height() / style::DevicePixelRatio()) / 2,
-				i);
-			return image;
-		}();
+		const auto image = Ui::Earn::MenuIconCurrency(icon->size());
 		icon->paintRequest() | rpl::start_with_next([=] {
 			auto p = QPainter(icon);
-			auto hq = PainterHighQualityEnabler(p);
 			p.drawImage(0, 0, image);
 		}, icon->lifetime());
 

From 8b535c58faf4d183fb6549f147c45591588f49b3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Oct 2024 12:15:48 +0300
Subject: [PATCH 084/306] Slightly improved sponsored message bar for instant
 display.

---
 .../ui/chat/sponsored_message_bar.cpp         | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
index 0668bff20..5abf8f556 100644
--- a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
@@ -95,7 +95,7 @@ public:
 		int colorIndex) {
 	const auto controller = FindSessionController(widget);
 	if (!controller) {
-		return [] -> Colors {
+		return []() -> Colors {
 			return { st::windowBgActive->c, st::windowActiveTextFg->c };
 		};
 	}
@@ -111,7 +111,7 @@ public:
 		state->theme = std::move(theme);
 	}, widget->lifetime());
 
-	return [=] -> Colors {
+	return [=]() -> Colors {
 		if (!state->theme) {
 			return { st::windowBgActive->c, st::windowActiveTextFg->c };
 		}
@@ -183,10 +183,8 @@ void FillSponsoredMessageBar(
 			.customEmojiRepaint = [=] { widget->update(); },
 		});
 	const auto kLinesForPhoto = 3;
-	const auto rightPhotoSize = titleSt.font->ascent
-		* kLinesForPhoto;
-	const auto rightPhotoPlaceholder = titleSt.font->height
-		* kLinesForPhoto;
+	const auto rightPhotoSize = titleSt.font->ascent * kLinesForPhoto;
+	const auto rightPhotoPlaceholder = titleSt.font->height * kLinesForPhoto;
 	const auto hasRightPhoto = from.photoId > 0;
 	if (hasRightPhoto) {
 		state->rightPhoto = Ui::MakePhotoThumbnail(
@@ -221,9 +219,7 @@ void FillSponsoredMessageBar(
 	});
 	removeButton->show();
 
-	widget->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(widget);
+	const auto draw = [=](QPainter &p) {
 		const auto r = widget->rect();
 		p.fillRect(r, st::historyPinnedBg);
 		widget->paintRipple(p, 0, 0);
@@ -327,6 +323,10 @@ void FillSponsoredMessageBar(
 				topPadding + (rightPhotoPlaceholder - rightPhotoSize) / 2,
 				state->rightPhotoImage);
 		}
+	};
+	widget->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(widget);
+		draw(p);
 	}, widget->lifetime());
 	rpl::combine(
 		state->lastPaintedContentTop.value(),
@@ -348,7 +348,11 @@ void FillSponsoredMessageBar(
 				minHeight,
 				st::sponsoredMessageBarMaxHeight));
 	}, widget->lifetime());
-	container->resize(widget->width(), 1);
+	{ // Calculate a good size for container.
+		auto dummy = QImage(1, 1, QImage::Format_ARGB32);
+		auto p = QPainter(&dummy);
+		draw(p);
+	}
 
 	{
 		const auto top = Ui::CreateChild<PlainShadow>(widget);

From b7ef5325ac56d1ac1c0a9f1e8ac8bc710a768ee5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Oct 2024 12:15:37 +0300
Subject: [PATCH 085/306] Improved display of sponsored message bar for
 preloaded messages.

---
 .../data/components/sponsored_messages.cpp    |   9 +-
 .../data/components/sponsored_messages.h      |   1 +
 .../SourceFiles/history/history_widget.cpp    | 153 +++++++++++++-----
 Telegram/SourceFiles/history/history_widget.h |   5 +
 4 files changed, 126 insertions(+), 42 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 8e16827df..57c9c0688 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -203,6 +203,13 @@ bool SponsoredMessages::canHaveFor(not_null<History*> history) const {
 	return false;
 }
 
+bool SponsoredMessages::isTopBarFor(not_null<History*> history) const {
+	if (const auto user = history->peer->asUser()) {
+		return user->isBot();
+	}
+	return false;
+}
+
 void SponsoredMessages::request(not_null<History*> history, Fn<void()> done) {
 	if (!canHaveFor(history)) {
 		return;
@@ -294,7 +301,7 @@ void SponsoredMessages::fillTopBar(
 		entry.sponsored.from,
 		entry.sponsored.textWithEntities);
 
-	const auto viewLifetime = std::make_shared<rpl::lifetime>();
+	const auto viewLifetime = widget->lifetime().make_state<rpl::lifetime>();
 	widget->shownValue() | rpl::filter(
 		rpl::mappers::_1
 	) | rpl::start_with_next([=, this](bool shown) {
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.h b/Telegram/SourceFiles/data/components/sponsored_messages.h
index 62553c39c..1f5715e6c 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.h
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.h
@@ -99,6 +99,7 @@ public:
 	~SponsoredMessages();
 
 	[[nodiscard]] bool canHaveFor(not_null<History*> history) const;
+	[[nodiscard]] bool isTopBarFor(not_null<History*> history) const;
 	void request(not_null<History*> history, Fn<void()> done);
 	void clearItems(not_null<History*> history);
 	[[nodiscard]] Details lookupDetails(const FullMsgId &fullId) const;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index ae91eae35..10a41d76b 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2509,12 +2509,9 @@ void HistoryWidget::showHistory(
 		unreadCountUpdated(); // set _historyDown badge.
 		showAboutTopPromotion();
 
-		{
+		if (!session().sponsoredMessages().isTopBarFor(_history)) {
 			_scroll->setTrackingContent(false);
-			const auto checkState = crl::guard(this, [=, history = _history] {
-				if (history != _history) {
-					return;
-				}
+			const auto checkState = [=] {
 				using State = Data::SponsoredMessages::State;
 				const auto state = session().sponsoredMessages().state(
 					_history);
@@ -2525,34 +2522,16 @@ void HistoryWidget::showHistory(
 				} else if (state == State::InjectToMiddle) {
 					injectSponsoredMessages();
 				} else if (state == State::AppendToTopBar) {
-					_sponsoredMessageBar
-						= base::make_unique_q<Ui::SlideWrap<>>(
-							this,
-							object_ptr<Ui::RpWidget>(this));
-					auto destruction = [this] {
-						if (_sponsoredMessageBar) {
-							_sponsoredMessageBar->hide(anim::type::normal);
-						}
-					};
-					session().sponsoredMessages().fillTopBar(
-						_history,
-						_sponsoredMessageBar->entity(),
-						std::move(destruction));
-					_sponsoredMessageBarHeight = 0;
-					_sponsoredMessageBar->heightValue(
-					) | rpl::start_with_next([=](int height) {
-						_topDelta = _preserveScrollTop
-							? 0
-							: (height - _sponsoredMessageBarHeight);
-						_sponsoredMessageBarHeight = height;
-						updateHistoryGeometry();
-						updateControlsGeometry();
-						_topDelta = 0;
-					}, _sponsoredMessageBar->lifetime());
-					_sponsoredMessageBar->show(anim::type::normal);
 				}
-			});
-			session().sponsoredMessages().request(_history, checkState);
+			};
+			const auto history = _history;
+			session().sponsoredMessages().request(
+				_history,
+				crl::guard(this, [=, this] {
+					if (history == _history) {
+						checkState();
+					}
+				}));
 			checkState();
 		}
 	} else {
@@ -2961,8 +2940,8 @@ void HistoryWidget::updateControlsVisibility() {
 	if (_pinnedBar) {
 		_pinnedBar->show();
 	}
-	if (_sponsoredMessageBar) {
-		_sponsoredMessageBar->show(anim::type::instant);
+	if (_sponsoredMessageBar && checkSponsoredMessageBarVisibility()) {
+		_sponsoredMessageBar->toggle(true, anim::type::normal);
 	}
 	if (_translateBar) {
 		_translateBar->show();
@@ -4162,7 +4141,7 @@ void HistoryWidget::hideChildWidgets() {
 		_pinnedBar->hide();
 	}
 	if (_sponsoredMessageBar) {
-		_sponsoredMessageBar->hide(anim::type::instant);
+		_sponsoredMessageBar->toggle(false, anim::type::instant);
 	}
 	if (_translateBar) {
 		_translateBar->hide();
@@ -4450,9 +4429,7 @@ void HistoryWidget::showAnimated(
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
-	if (_sponsoredMessageBar) {
-		_sponsoredMessageBar->finishAnimating();
-	}
+	checkSponsoredMessageBar();
 	if (_translateBar) {
 		_translateBar->finishAnimating();
 	}
@@ -4491,9 +4468,6 @@ void HistoryWidget::showFinished() {
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
-	if (_sponsoredMessageBar) {
-		_sponsoredMessageBar->finishAnimating();
-	}
 	if (_translateBar) {
 		_translateBar->finishAnimating();
 	}
@@ -4506,6 +4480,7 @@ void HistoryWidget::showFinished() {
 	_showAnimation = nullptr;
 	doneShow();
 	synteticScrollToY(_scroll->scrollTop());
+	requestSponsoredMessageBar();
 }
 
 void HistoryWidget::doneShow() {
@@ -7605,6 +7580,102 @@ void HistoryWidget::requestMessageData(MsgId msgId) {
 	session().api().requestMessageData(_peer, msgId, callback);
 }
 
+bool HistoryWidget::checkSponsoredMessageBarVisibility() const {
+	const auto h = _list->height()
+		- (_kbScroll->isHidden() ? 0 : _kbScroll->height());
+	return (h > _scroll->height());
+}
+
+void HistoryWidget::requestSponsoredMessageBar() {
+	if (!_history || !session().sponsoredMessages().isTopBarFor(_history)) {
+		return;
+	}
+	const auto checkState = [=, this] {
+		using State = Data::SponsoredMessages::State;
+		const auto state = session().sponsoredMessages().state(
+			_history);
+		_sponsoredMessagesStateKnown = (state != State::None);
+		if (state == State::AppendToTopBar) {
+			createSponsoredMessageBar();
+			if (checkSponsoredMessageBarVisibility()) {
+				_sponsoredMessageBar->toggle(true, anim::type::normal);
+			} else {
+				auto &lifetime = _sponsoredMessageBar->lifetime();
+				const auto heightLifetime
+					= lifetime.make_state<rpl::lifetime>();
+				_list->heightValue(
+				) | rpl::start_with_next([=, this] {
+					if (_sponsoredMessageBar->toggled()) {
+						heightLifetime->destroy();
+					} else if (checkSponsoredMessageBarVisibility()) {
+						_sponsoredMessageBar->toggle(
+							true,
+							anim::type::normal);
+						heightLifetime->destroy();
+					}
+				}, *heightLifetime);
+			}
+		}
+	};
+	const auto history = _history;
+	session().sponsoredMessages().request(
+		_history,
+		crl::guard(this, [=, this] {
+			if (history == _history) {
+				checkState();
+			}
+		}));
+}
+
+void HistoryWidget::checkSponsoredMessageBar() {
+	if (!_history) {
+		return;
+	}
+	const auto state = session().sponsoredMessages().state(_history);
+	if (state == Data::SponsoredMessages::State::AppendToTopBar) {
+		if (checkSponsoredMessageBarVisibility()) {
+			createSponsoredMessageBar();
+			_sponsoredMessageBar->toggle(true, anim::type::instant);
+		}
+	}
+}
+
+void HistoryWidget::createSponsoredMessageBar() {
+	_sponsoredMessageBar = base::make_unique_q<Ui::SlideWrap<>>(
+		this,
+		object_ptr<Ui::RpWidget>(this));
+
+	_sponsoredMessageBar->entity()->resizeToWidth(_scroll->width());
+	auto destruction = [this] {
+		if (_sponsoredMessageBar) {
+			_sponsoredMessageBar->toggle(false, anim::type::normal);
+			_sponsoredMessageBar->shownValue(
+			) | rpl::start_with_next([=](bool shown) {
+				if (!shown) {
+					_sponsoredMessageBar = nullptr;
+				}
+			}, _sponsoredMessageBar->lifetime());
+		}
+	};
+	session().sponsoredMessages().fillTopBar(
+		_history,
+		_sponsoredMessageBar->entity(),
+		std::move(destruction));
+
+	_sponsoredMessageBarHeight = 0;
+	_sponsoredMessageBar->heightValue(
+	) | rpl::start_with_next([=](int height) {
+		_topDelta = _preserveScrollTop
+			? 0
+			: (height - _sponsoredMessageBarHeight);
+		_sponsoredMessageBarHeight = height;
+		updateHistoryGeometry();
+		updateControlsGeometry();
+		_topDelta = 0;
+	}, _sponsoredMessageBar->lifetime());
+	_sponsoredMessageBar->toggle(false, anim::type::instant);
+}
+
 bool HistoryWidget::sendExistingDocument(
 		not_null<DocumentData*> document,
 		Api::MessageToSend messageToSend,
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 94bf0fff9..89e5b63c9 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -531,6 +531,11 @@ private:
 	void setupGroupCallBar();
 	void setupRequestsBar();
 
+	void checkSponsoredMessageBar();
+	[[nodiscard]] bool checkSponsoredMessageBarVisibility() const;
+	void requestSponsoredMessageBar();
+	void createSponsoredMessageBar();
+
 	void sendInlineResult(InlineBots::ResultSelected result);
 
 	void drawField(Painter &p, const QRect &rect);

From c076daa91f4d952aa699485080f8c9271ea4ae1e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Oct 2024 15:28:41 +0300
Subject: [PATCH 086/306] Added ability to implement platform-dependent zoom
 controller for IV.

---
 Telegram/SourceFiles/core/core_settings.cpp |  5 ++++
 Telegram/SourceFiles/iv/iv_controller.cpp   | 27 ++++++++++++++++++---
 Telegram/lib_webview                        |  2 +-
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index c0293b01a..d3f090230 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -1583,8 +1583,13 @@ rpl::producer<int> Settings::ivZoomValue() const {
 	return _ivZoom.value();
 }
 void Settings::setIvZoom(int value) {
+#ifdef Q_OS_WIN
+	constexpr auto kMin = 25;
+	constexpr auto kMax = 500;
+#else
 	constexpr auto kMin = 30;
 	constexpr auto kMax = 200;
+#endif
 	_ivZoom = std::clamp(value, kMin, kMax);
 }
 
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 62348a986..01e955674 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -369,10 +369,16 @@ Controller::Controller(
 	Fn<ShareBoxResult(ShareBoxDescriptor)> showShareBox)
 : _delegate(delegate)
 , _updateStyles([=] {
-	const auto zoom = _delegate->ivZoom();
-	const auto str = Ui::EscapeForScriptString(ComputeStyles(zoom));
 	if (_webview) {
+		const auto webviewZoomController = _webview->zoomController();
+		const auto styleZoom = webviewZoomController
+			? kDefaultZoom
+			: _delegate->ivZoom();
+		const auto str = Ui::EscapeForScriptString(ComputeStyles(styleZoom));
 		_webview->eval("IV.updateStyles('" + str + "');");
+		if (webviewZoomController) {
+			webviewZoomController->setZoom(_delegate->ivZoom());
+		}
 	}
 })
 , _showShareBox(std::move(showShareBox)) {
@@ -634,6 +640,17 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 		});
 	const auto raw = _webview.get();
 
+	if (const auto webviewZoomController = raw->zoomController()) {
+		webviewZoomController->zoomValue(
+		) | rpl::start_with_next([this](int value) {
+			_delegate->ivSetZoom(value);
+		}, lifetime());
+		_delegate->ivZoomValue(
+		) | rpl::start_with_next([=, this](int value) {
+			webviewZoomController->setZoom(value);
+		}, lifetime());
+	}
+
 	window->lifetime().add([=] {
 		_ready = false;
 		base::take(_webview);
@@ -785,8 +802,12 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 				|| index >= _pages.size()) {
 				return Webview::DataResult::Failed;
 			}
+			const auto webviewZoomController = _webview->zoomController();
+			const auto styleZoom = webviewZoomController
+				? kDefaultZoom
+				: _delegate->ivZoom();
 			return finishWith(
-				WrapPage(_pages[index], _delegate->ivZoom()),
+				WrapPage(_pages[index], styleZoom),
 				"text/html; charset=utf-8");
 		} else if (id.starts_with("page") && id.ends_with(".json")) {
 			auto index = 0;
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index e9e85a10e..d5337d58e 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit e9e85a10e6864e18ffd540df04d7965d0af39500
+Subproject commit d5337d58ebe39cffe421c7ce7725d2bfe9d03159

From 23a77b1ba492c112380b8f4df91b3e56d03ba2c2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Oct 2024 15:54:45 +0300
Subject: [PATCH 087/306] Fixed width of menu item for IV zoom.

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

diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 01e955674..8b4b0206c 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -150,6 +150,18 @@ public:
 		});
 		minus->show();
 
+		{
+			const auto maxWidthText = u"000%"_q;
+			_text.setText(_st.itemStyle, maxWidthText);
+			Ui::Menu::ItemBase::setMinWidth(
+				_text.maxWidth()
+					+ st::ivResetZoomInnerPadding
+					+ resetLabel->width()
+					+ plus->width()
+					+ minus->width()
+					+ _st.itemPadding.right() * 2);
+		}
+
 		_delegate->ivZoomValue(
 		) | rpl::start_with_next([this](int value) {
 			_text.setText(_st.itemStyle, QString::number(value) + '%');

From 119f1099040e95f7476bdf548b57f5ac25fbb7dd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Oct 2024 17:41:43 +0300
Subject: [PATCH 088/306] Added api support of paid credits transactions from
 bots.

---
 Telegram/Resources/langs/lang.strings         |  4 ++
 Telegram/SourceFiles/api/api_credits.cpp      |  1 +
 .../SourceFiles/boxes/gift_premium_box.cpp    |  8 +++
 Telegram/SourceFiles/data/data_credits.h      |  1 +
 .../info_statistics_list_controllers.cpp      |  9 ++-
 .../ui/effects/credits_graphics.cpp           | 62 ++++++++++++++++++-
 6 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e500f0cb8..be8a9d21e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2455,6 +2455,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_box_history_entry_gift_examples" = "Examples";
 "lng_credits_box_history_entry_ads" = "Ads Platform";
 "lng_credits_box_history_entry_premium_bot" = "Stars Top-Up";
+"lng_credits_box_history_entry_api" = "Paid Broadcast";
+"lng_credits_box_history_entry_floodskip_about#one" = "{count} Message";
+"lng_credits_box_history_entry_floodskip_about#other" = "{count} Messages";
+"lng_credits_box_history_entry_floodskip_row" = "Messages";
 "lng_credits_box_history_entry_via_premium_bot" = "Premium Bot";
 "lng_credits_box_history_entry_id" = "Transaction ID";
 "lng_credits_box_history_entry_id_copied" = "Transaction ID copied to clipboard.";
diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 8f67c0335..0453cfc4f 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -115,6 +115,7 @@ constexpr auto kTransactionsLimit = 100;
 		.convertStars = int(stargift
 			? stargift->data().vconvert_stars().v
 			: 0),
+		.floodSkip = int(tl.data().vfloodskip_number().value_or(0)),
 		.converted = stargift && incoming,
 		.reaction = tl.data().is_reaction(),
 		.refunded = tl.data().is_refund(),
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 3e792bbb6..e9e126b90 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -1262,6 +1262,14 @@ void AddCreditsHistoryEntryTable(
 			std::move(label),
 			st::giveawayGiftCodeValueMargin);
 	}
+	if (entry.floodSkip) {
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_floodskip_row(),
+			rpl::single(
+				Ui::Text::WithEntities(
+					Lang::FormatCountDecimal(entry.floodSkip))));
+	}
 	if (!entry.date.isNull()) {
 		AddTableRow(
 			table,
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 71e531001..3b99031f8 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -69,6 +69,7 @@ struct CreditsHistoryEntry final {
 	int limitedCount = 0;
 	int limitedLeft = 0;
 	int convertStars = 0;
+	int floodSkip = 0;
 	bool converted = false;
 	bool anonymous = false;
 	bool savedToProfile = false;
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 0dc51cb07..962096502 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -854,7 +854,12 @@ void CreditsRow::init() {
 	setSkipPeerBadge(true);
 	PeerListRow::setCustomStatus(
 		langDateTime(_entry.date)
-		+ (_entry.refunded
+		+ (_entry.floodSkip
+			? (joiner + tr::lng_credits_box_history_entry_floodskip_about(
+				tr::now,
+				lt_count_decimal,
+				_entry.floodSkip))
+			: _entry.refunded
 			? (joiner + tr::lng_channel_earn_history_return(tr::now))
 			: _entry.pending
 			? (joiner + tr::lng_channel_earn_history_pending(tr::now))
@@ -931,7 +936,7 @@ QSize CreditsRow::rightActionSize() const {
 			_rowHeight);
 	} else if (_subscription || _entry) {
 		return QSize(
-			_rightText.maxWidth() + st::boxRowPadding.right(),
+			_rightText.maxWidth() + st::boxRowPadding.right() / 2,
 			_rowHeight);
 	} else if (!_entry && !_subscription) {
 		return QSize();
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
index c855fac0d..97b6a744c 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -216,6 +216,8 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 	}
 	const auto bg = [&]() -> EmptyUserpic::BgColors {
 		switch (entry.peerType) {
+		case Data::CreditsHistoryEntry::PeerType::API:
+			return { st::historyPeer2UserpicBg, st::historyPeer2UserpicBg2 };
 		case Data::CreditsHistoryEntry::PeerType::Peer:
 			return EmptyUserpic::UserpicColor(0);
 		case Data::CreditsHistoryEntry::PeerType::AppStore:
@@ -237,6 +239,62 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 		Unexpected("Unknown peer type.");
 	}();
 	const auto userpic = std::make_shared<EmptyUserpic>(bg, QString());
+	if (entry.peerType == PeerType::API) {
+		const auto svg = std::make_shared<QSvgRenderer>(Ui::Premium::Svg());
+		const auto image = std::make_shared<QImage>();
+		return [=](Painter &p, int x, int y, int outer, int size) mutable {
+			userpic->paintCircle(p, x, y, outer, size);
+			if (image->isNull()) {
+				*image = QImage(
+					Size(size) * style::DevicePixelRatio(),
+					QImage::Format_ARGB32_Premultiplied);
+				image->setDevicePixelRatio(style::DevicePixelRatio());
+				image->fill(Qt::transparent);
+				constexpr auto kSize = 126.;
+				constexpr auto kBubbleRatio = kSize / ((kSize - 70) / 2.);
+				const auto rect = QRectF(0, 0, size, size)
+					- Margins(size / kBubbleRatio);
+
+				auto q = QPainter(image.get());
+				const auto hq = PainterHighQualityEnabler(q);
+				q.setPen(Qt::NoPen);
+				q.setBrush(st::historyPeerUserpicFg);
+				q.drawEllipse(rect);
+				constexpr auto kTailX1 = 4;
+				constexpr auto kTailY1 = 8;
+				constexpr auto kTailX2 = 2;
+				constexpr auto kTailY2 = 0;
+				constexpr auto kTailX3 = 9;
+				constexpr auto kTailY3 = 4;
+				auto path = QPainterPath();
+				path.moveTo(
+					st::lineWidth * kTailX1,
+					rect.height() - st::lineWidth * kTailY1);
+				path.lineTo(
+					st::lineWidth * kTailX2,
+					rect.height() - st::lineWidth * kTailY2);
+				path.lineTo(
+					st::lineWidth * kTailX3,
+					rect.height() - st::lineWidth * kTailY3);
+				path.translate(rect.x(), rect.y());
+				q.strokePath(
+					path,
+					QPen(
+						st::historyPeerUserpicFg,
+						st::lineWidth * 2,
+						Qt::SolidLine,
+						Qt::RoundCap,
+						Qt::RoundJoin));
+				q.fillPath(path, st::historyPeerUserpicFg);
+				q.setCompositionMode(QPainter::CompositionMode_Clear);
+				constexpr auto kStarRatio = kSize / ((kSize - 44) / 2.);
+				svg->render(
+					&q,
+					QRectF(0, 0, size, size) - Margins(size / kStarRatio));
+			}
+			p.drawImage(x, y, *image);
+		};
+	}
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		userpic->paintCircle(p, x, y, outerWidth, size);
 		const auto rect = QRect(x, y, size, size);
@@ -487,7 +545,9 @@ Fn<PaintRoundImageCallback(Fn<void()>)> PaintPreviewCallback(
 }
 
 TextWithEntities GenerateEntryName(const Data::CreditsHistoryEntry &entry) {
-	return (entry.reaction
+	return (entry.floodSkip
+		? tr::lng_credits_box_history_entry_api
+		: entry.reaction
 		? tr::lng_credits_box_history_entry_reaction_name
 		: entry.bareGiveawayMsgId
 		? tr::lng_credits_box_history_entry_giveaway_name

From 057222757bf7c800d16a6693cbf096c82b9bc437 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Oct 2024 17:46:42 +0300
Subject: [PATCH 089/306] Added decimal separators to count of credits in
 balances of owned bot.

---
 Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp    | 4 ++--
 Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp  | 2 +-
 Telegram/SourceFiles/info/profile/info_profile_actions.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 3ad60a265..76fd9856b 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1664,7 +1664,7 @@ void Controller::fillBotCreditsButton() {
 	auto &lifetime = _controls.buttonsLayout->lifetime();
 	const auto state = lifetime.make_state<State>();
 	if (const auto balance = _peer->session().credits().balance(_peer->id)) {
-		state->balance = QString::number(balance);
+		state->balance = Lang::FormatCountDecimal(balance);
 	}
 
 	const auto wrap = _controls.buttonsLayout->add(
@@ -1689,7 +1689,7 @@ void Controller::fillBotCreditsButton() {
 			if (data.balance) {
 				wrap->toggle(true, anim::type::normal);
 			}
-			state->balance = QString::number(data.balance);
+			state->balance = Lang::FormatCountDecimal(data.balance);
 		});
 	}
 	{
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
index 312abc864..8f612343e 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
@@ -124,7 +124,7 @@ void InnerWidget::fill() {
 			return _state.availableBalance;
 		})
 	);
-	auto valueToString = [](uint64 v) { return QString::number(v); };
+	auto valueToString = [](uint64 v) { return Lang::FormatCountDecimal(v); };
 
 	if (data.revenueGraph.chart) {
 		Ui::AddSkip(container);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 5a44d9916..a4a84021c 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -926,7 +926,7 @@ rpl::producer<uint64> AddCreditsAction(
 		name->setMarkedText(
 			base::duplicate(icon)
 				.append(QChar(' '))
-				.append(QString::number(balance)),
+				.append(Lang::FormatCountDecimal(balance)),
 			Core::MarkedTextContext{
 				.session = &user->session(),
 				.customEmojiRepaint = [=] { name->update(); },

From ae3f16ccbd7ec289819ce225bee47d2c5ba0aa88 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Oct 2024 19:34:27 +0300
Subject: [PATCH 090/306] Changed behavior to show earlier button in dialog
 list to jump to top.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 9cef777db..73f8f598e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -932,7 +932,7 @@ void Widget::updateScrollUpVisibility() {
 	}
 
 	startScrollUpButtonAnimation(
-		(_scroll->scrollTop() > st::historyToDownShownAfter)
+		(_scroll->scrollTop() > (st::historyToDownShownAfter / 2))
 		&& (_scroll->scrollTop() < _scroll->scrollTopMax()));
 }
 
@@ -1676,11 +1676,7 @@ QPixmap Widget::grabForFolderSlideAnimation() {
 		_scrollToTop->hide();
 	}
 
-	const auto rect = QRect(
-		0,
-		0,
-		width(),
-		_scroll->y() + _scroll->height());
+	const auto rect = QRect(0, 0, width(), rect::bottom(_scroll));
 	auto result = Ui::GrabWidget(this, rect);
 
 	if (!hidden) {

From 7d52787e5484b5ef605e8ddecd847a2a8db6c3e5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 29 Oct 2024 13:27:20 +0300
Subject: [PATCH 091/306] Added support of sponsored messages with revenue to
 bar.

---
 Telegram/Resources/langs/lang.strings         |  4 ++
 .../history/history_item_helpers.cpp          | 10 +++
 .../history/history_item_helpers.h            |  1 +
 .../view/media/history_view_web_page.cpp      | 10 +--
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 70 ++++++++++++-------
 Telegram/SourceFiles/menu/menu_sponsored.h    |  4 +-
 .../ui/chat/sponsored_message_bar.cpp         | 33 +++++----
 7 files changed, 80 insertions(+), 52 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index be8a9d21e..f72f4cbd3 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5200,13 +5200,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "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 based on the channel in which you see them.";
+"lng_sponsored_revenued_info1_bot_description" = "Ads on Telegram do not use your personal information and are based on the mini app 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_info2_bot_description" = "50% of the revenue from Telegram Ads goes to the developer of the mini app 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_info3_bot_description" = "You can turn off ads in mini apps by subscribing to {link}.";
 "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_sponsored_revenued_footer_bot_description" = "Anyone can create an ad to display in this bot — with minimal budgets. Check out the **Telegram Ad Platform** for details. {link}";
 "lng_sponsored_top_bar_hide" = "remove";
 
 "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 ea8f19eda..751a81f39 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -414,6 +414,16 @@ ClickHandlerPtr ReportSponsoredClickHandler(not_null<HistoryItem*> item) {
 	});
 }
 
+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(), my.itemId);
+		}
+	});
+}
+
+
 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 dd5121dbe..ba5bd2cda 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.h
+++ b/Telegram/SourceFiles/history/history_item_helpers.h
@@ -148,6 +148,7 @@ ClickHandlerPtr JumpToStoryClickHandler(
 [[nodiscard]] ClickHandlerPtr HideSponsoredClickHandler();
 [[nodiscard]] ClickHandlerPtr ReportSponsoredClickHandler(
 	not_null<HistoryItem*> item);
+[[nodiscard]] ClickHandlerPtr AboutSponsoredClickHandler();
 
 [[nodiscard]] not_null<HistoryItem*> GenerateJoinedMessage(
 	not_null<History*> history,
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 65f9a8cb0..960cc51a0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_sponsored_click_handler.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "menu/menu_sponsored.h"
@@ -144,15 +145,6 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 	});
 }
 
-[[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]] QString LookupFactcheckCountryIso2(
 		not_null<HistoryItem*> item) {
 	const auto info = item->Get<HistoryMessageFactcheck>();
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 4d5564793..274a8ddc0 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -41,11 +41,13 @@ namespace {
 
 void AboutBox(
 		not_null<Ui::GenericBox*> box,
-		std::shared_ptr<ChatHelpers::Show> show) {
+		std::shared_ptr<ChatHelpers::Show> show,
+		const FullMsgId &fullId) {
 	constexpr auto kUrl = "https://promote.telegram.org"_cs;
 
 	box->setNoContentMargin(true);
 
+	const auto isChannel = peerIsChannel(fullId.peer);
 	const auto session = &show->session();
 
 	const auto content = box->verticalLayout().get();
@@ -131,29 +133,39 @@ void AboutBox(
 		};
 		addEntry(
 			tr::lng_sponsored_revenued_info1_title(),
-			tr::lng_sponsored_revenued_info1_description(
-				Ui::Text::RichLangValue),
+			(isChannel
+				? tr::lng_sponsored_revenued_info1_description
+				: tr::lng_sponsored_revenued_info1_bot_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),
+			(isChannel
+				? tr::lng_sponsored_revenued_info2_description
+				: tr::lng_sponsored_revenued_info2_bot_description)(
+					Ui::Text::RichLangValue),
 			st::sponsoredAboutSplitIcon);
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
+		auto link = tr::lng_settings_privacy_premium_link(
+		) | rpl::map([](QString t) {
+			return Ui::Text::Link(std::move(t), u"internal:"_q);
+		});
 		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(std::move(t), u"internal:"_q);
-				}),
-				Ui::Text::RichLangValue),
+			isChannel
+				? tr::lng_sponsored_revenued_info3_description(
+					lt_count,
+					rpl::single(float64(levels)),
+					lt_link,
+					std::move(link),
+					Ui::Text::RichLangValue)
+				: tr::lng_sponsored_revenued_info3_bot_description(
+					lt_link,
+					std::move(link),
+					Ui::Text::RichLangValue),
 			st::sponsoredAboutRemoveIcon)->setClickHandlerFilter([=](
 					const auto &...) {
 				ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
@@ -185,16 +197,18 @@ void AboutBox(
 		box->addRow(
 			Ui::CreateLabelWithCustomEmoji(
 				content,
-				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),
+				(isChannel
+					? tr::lng_sponsored_revenued_footer_description
+					: tr::lng_sponsored_revenued_footer_bot_description)(
+						lt_link,
+						tr::lng_channel_earn_about_link(
+							lt_emoji,
+							rpl::single(arrow),
+							Ui::Text::RichLangValue
+						) | rpl::map([=](TextWithEntities t) {
+							return Ui::Text::Link(std::move(t), kUrl.utf16());
+						}),
+						Ui::Text::RichLangValue),
 				{ .session = session },
 				st::channelEarnLearnDescription))->resizeToWidth(available);
 	}
@@ -309,7 +323,7 @@ void FillSponsored(
 	const auto session = &show->session();
 
 	addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
-		show->show(Box(AboutBox, show));
+		show->show(Box(AboutBox, show, fullId));
 	}, (mediaViewer ? &st::mediaMenuIconInfo : &st::menuIconInfo));
 
 	addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
@@ -352,9 +366,11 @@ void ShowSponsored(
 	menu->popup(QCursor::pos());
 }
 
-void ShowSponsoredAbout(std::shared_ptr<ChatHelpers::Show> show) {
+void ShowSponsoredAbout(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const FullMsgId &fullId) {
 	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
-		AboutBox(box, show);
+		AboutBox(box, show, fullId);
 	}));
 }
 
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.h b/Telegram/SourceFiles/menu/menu_sponsored.h
index a1dc05be3..12323047e 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.h
+++ b/Telegram/SourceFiles/menu/menu_sponsored.h
@@ -34,6 +34,8 @@ void ShowSponsored(
 	std::shared_ptr<ChatHelpers::Show> show,
 	const FullMsgId &fullId);
 
-void ShowSponsoredAbout(std::shared_ptr<ChatHelpers::Show> show);
+void ShowSponsoredAbout(
+	std::shared_ptr<ChatHelpers::Show> show,
+	const FullMsgId &fullId);
 
 } // namespace Menu
diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
index 5abf8f556..e16268c8a 100644
--- a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
@@ -42,13 +42,14 @@ struct Colors final {
 
 using ColorFactory = Fn<Colors()>;
 
-class RemoveButton final : public Ui::RippleButton {
+class BadgeButton final : public Ui::RippleButton {
 public:
-	RemoveButton(
+	BadgeButton(
 		not_null<Ui::RpWidget*> parent,
+		tr::phrase<> text,
 		ColorFactory cache)
 	: Ui::RippleButton(parent, st::defaultRippleAnimation) {
-		tr::lng_sponsored_top_bar_hide(
+		text(
 		) | rpl::start_with_next([this](const QString &t) {
 			const auto height = st::stickersHeaderBadgeFont->height;
 			resize(
@@ -56,7 +57,7 @@ public:
 				height);
 			update();
 		}, lifetime());
-		paintRequest() | rpl::start_with_next([this, cache] {
+		paintRequest() | rpl::start_with_next([this, cache, text] {
 			auto p = QPainter(this);
 			const auto colors = cache();
 			const auto r = rect();
@@ -70,10 +71,7 @@ public:
 			p.drawRoundedRect(r, r.height() / 2, r.height() / 2);
 			p.setFont(st::stickersHeaderBadgeFont);
 			p.setPen(colors.fg);
-			p.drawText(
-				r,
-				tr::lng_sponsored_top_bar_hide(tr::now),
-				style::al_center);
+			p.drawText(r, text(tr::now), style::al_center);
 		}, lifetime());
 	}
 
@@ -199,14 +197,19 @@ void FillSponsoredMessageBar(
 		state->rightPhoto->subscribeToUpdates(callback);
 		callback();
 	}
-	const auto removeButton = Ui::CreateChild<RemoveButton>(
+	const auto badgeButton = Ui::CreateChild<BadgeButton>(
 		widget,
+		from.canReport
+			? tr::lng_sponsored_message_revenue_button
+			: tr::lng_sponsored_top_bar_hide,
 		GenerateReplyColorCallback(
 			widget,
 			fullId,
 			from.colorIndex ? from.colorIndex : 4/*blue*/));
-	const auto handler = HideSponsoredClickHandler();
-	removeButton->setClickedCallback([=] {
+	const auto handler = from.canReport
+		? AboutSponsoredClickHandler()
+		: HideSponsoredClickHandler();
+	badgeButton->setClickedCallback([=] {
 		if (const auto controller = FindSessionController(widget)) {
 			ActivateClickHandler(widget, handler, {
 				.other = QVariant::fromValue(ClickHandlerContext{
@@ -217,7 +220,7 @@ void FillSponsoredMessageBar(
 			});
 		}
 	});
-	removeButton->show();
+	badgeButton->show();
 
 	const auto draw = [=](QPainter &p) {
 		const auto r = widget->rect();
@@ -237,14 +240,14 @@ void FillSponsoredMessageBar(
 		const auto hasSecondLineTitle = (titleRight
 			> (availableWidth
 				- state->contentTitle.maxWidth()
-				- removeButton->width()));
+				- badgeButton->width()));
 		p.setPen(st::windowActiveTextFg);
 		state->title.draw(p, {
 			.position = QPoint(leftPadding, topPadding),
 			.outerWidth = availableWidth,
 			.availableWidth = availableWidth,
 		});
-		removeButton->moveToLeft(
+		badgeButton->moveToLeft(
 			hasSecondLineTitle
 				? titleRight
 				: std::min(
@@ -257,7 +260,7 @@ void FillSponsoredMessageBar(
 							: 0)
 						- rightPadding),
 			topPadding
-				+ (titleSt.font->height - removeButton->height()) / 2);
+				+ (titleSt.font->height - badgeButton->height()) / 2);
 		p.setPen(st::windowFg);
 		{
 			const auto left = hasSecondLineTitle ? leftPadding : titleRight;

From b2d340cbfb09660e01b6f60c72e67c0ab9afdb33 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 29 Oct 2024 14:05:08 +0300
Subject: [PATCH 092/306] Added top button to box about sponsored messages for
 bots.

---
 Telegram/SourceFiles/menu/menu_sponsored.cpp | 65 ++++++++++++++++++--
 Telegram/SourceFiles/menu/menu_sponsored.h   |  3 +-
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 274a8ddc0..c125ab015 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -24,12 +24,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
+#include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_media_view.h"
 #include "styles/style_menu_icons.h"
@@ -228,6 +230,58 @@ void AboutBox(
 		box->addButton(std::move(button));
 	}
 
+	if (!isChannel) {
+		const auto top = Ui::CreateChild<Ui::IconButton>(
+			box,
+			st::infoTopBarMenu);
+		box->widthValue(
+		) | rpl::start_with_next([=](int width) {
+			top->raise();
+			top->moveToLeft(
+				width - top->width() - st::defaultScrollArea.width,
+				0);
+		}, top->lifetime());
+		using MenuPtr = base::unique_qptr<Ui::DropdownMenu>;
+		const auto menu = top->lifetime().make_state<MenuPtr>();
+		top->setClickedCallback([=] {
+			if (const auto raw = menu->get()) {
+				raw->hideAnimated();
+				return true;
+			}
+			*menu = base::make_unique_q<Ui::DropdownMenu>(
+				box->window(),
+				st::dropdownMenuWithIcons);
+			const auto raw = menu->get();
+			top->installEventFilter(raw);
+			raw->setHiddenCallback([=] {
+				raw->deleteLater();
+				top->setForceRippled(false);
+			});
+			raw->setShowStartCallback([=] {
+				top->setForceRippled(true);
+			});
+			raw->setHideStartCallback([=] {
+				top->setForceRippled(false);
+			});
+			FillSponsored(
+				top,
+				Ui::Menu::CreateAddActionCallback(menu->get()),
+				show,
+				fullId,
+				false,
+				true);
+			const auto global = box->mapToGlobal(
+				QPoint(
+					st::defaultScrollArea.width - st::lineWidth * 2,
+					top->height() / 2));
+			const auto local = box->window()->mapFromGlobal(global);
+			raw->moveToRight(local.x(), local.y());
+			raw->raise();
+			raw->showAnimated(Ui::PanelAnimation::Origin::TopRight);
+			return true;
+		});
+	}
+
 }
 
 void ShowReportSponsoredBox(
@@ -319,12 +373,15 @@ void FillSponsored(
 		const Ui::Menu::MenuCallback &addAction,
 		std::shared_ptr<ChatHelpers::Show> show,
 		const FullMsgId &fullId,
-		bool mediaViewer) {
+		bool mediaViewer,
+		bool skipAbout) {
 	const auto session = &show->session();
 
-	addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
-		show->show(Box(AboutBox, show, fullId));
-	}, (mediaViewer ? &st::mediaMenuIconInfo : &st::menuIconInfo));
+	if (!skipAbout) {
+		addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
+			show->show(Box(AboutBox, show, fullId));
+		}, (mediaViewer ? &st::mediaMenuIconInfo : &st::menuIconInfo));
+	}
 
 	addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
 		ShowReportSponsoredBox(show, fullId);
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.h b/Telegram/SourceFiles/menu/menu_sponsored.h
index 12323047e..4061271a9 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.h
+++ b/Telegram/SourceFiles/menu/menu_sponsored.h
@@ -27,7 +27,8 @@ void FillSponsored(
 	const Ui::Menu::MenuCallback &addAction,
 	std::shared_ptr<ChatHelpers::Show> show,
 	const FullMsgId &fullId,
-	bool mediaViewer);
+	bool mediaViewer,
+	bool skipAbout = false);
 
 void ShowSponsored(
 	not_null<Ui::RpWidget*> parent,

From 1dc30caee98dc4f7bcb5967620ff3284808a2fab Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 29 Oct 2024 14:54:03 +0300
Subject: [PATCH 093/306] Added hide button to bar for sponsored messages
 without photo.

---
 .../ui/chat/sponsored_message_bar.cpp         | 66 ++++++++++++-------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
index e16268c8a..89a71b14c 100644
--- a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
@@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
 
 namespace Ui {
 namespace {
@@ -180,6 +181,19 @@ void FillSponsoredMessageBar(
 			.session = session,
 			.customEmojiRepaint = [=] { widget->update(); },
 		});
+	const auto hostedClick = [=](ClickHandlerPtr handler) {
+		return [=] {
+			if (const auto controller = FindSessionController(widget)) {
+				ActivateClickHandler(widget, handler, {
+					.other = QVariant::fromValue(ClickHandlerContext{
+						.itemId = fullId,
+						.sessionWindow = base::make_weak(controller),
+						.show = controller->uiShow(),
+					})
+				});
+			}
+		};
+	};
 	const auto kLinesForPhoto = 3;
 	const auto rightPhotoSize = titleSt.font->ascent * kLinesForPhoto;
 	const auto rightPhotoPlaceholder = titleSt.font->height * kLinesForPhoto;
@@ -197,6 +211,19 @@ void FillSponsoredMessageBar(
 		state->rightPhoto->subscribeToUpdates(callback);
 		callback();
 	}
+	const auto rightHide = hasRightPhoto
+		? nullptr
+		: Ui::CreateChild<Ui::IconButton>(
+			container,
+			st::dialogsCancelSearchInPeer);
+	if (rightHide) {
+		container->sizeValue(
+		) | rpl::start_with_next([=](const QSize &s) {
+			rightHide->moveToRight(st::buttonRadius, st::lineWidth);
+		}, rightHide->lifetime());
+		rightHide->setClickedCallback(
+			hostedClick(HideSponsoredClickHandler()));
+	}
 	const auto badgeButton = Ui::CreateChild<BadgeButton>(
 		widget,
 		from.canReport
@@ -206,20 +233,10 @@ void FillSponsoredMessageBar(
 			widget,
 			fullId,
 			from.colorIndex ? from.colorIndex : 4/*blue*/));
-	const auto handler = from.canReport
-		? AboutSponsoredClickHandler()
-		: HideSponsoredClickHandler();
-	badgeButton->setClickedCallback([=] {
-		if (const auto controller = FindSessionController(widget)) {
-			ActivateClickHandler(widget, handler, {
-				.other = QVariant::fromValue(ClickHandlerContext{
-					.itemId = fullId,
-					.sessionWindow = base::make_weak(controller),
-					.show = controller->uiShow(),
-				})
-			});
-		}
-	});
+	badgeButton->setClickedCallback(
+		hostedClick(from.canReport
+			? AboutSponsoredClickHandler()
+			: HideSponsoredClickHandler()));
 	badgeButton->show();
 
 	const auto draw = [=](QPainter &p) {
@@ -233,7 +250,8 @@ void FillSponsoredMessageBar(
 			- leftPadding
 			- rightPadding;
 		const auto availableWidth = availableWidthNoPhoto
-			- (hasRightPhoto ? (rightPadding + rightPhotoSize) : 0);
+			- (hasRightPhoto ? (rightPadding + rightPhotoSize) : 0)
+			- (rightHide ? rightHide->width() : 0);
 		const auto titleRight = leftPadding
 			+ state->title.maxWidth()
 			+ titleSt.font->spacew * 2;
@@ -258,6 +276,7 @@ void FillSponsoredMessageBar(
 						- (hasRightPhoto
 							? (rightPadding + rightPhotoSize)
 							: 0)
+						- (rightHide ? rightHide->width() : 0)
 						- rightPadding),
 			topPadding
 				+ (titleSt.font->height - badgeButton->height()) / 2);
@@ -298,16 +317,13 @@ void FillSponsoredMessageBar(
 				} else if (diff < 2 * lineHeight) {
 					return {};
 				}
-				if (hasRightPhoto) {
-					line += (hasSecondLineTitle ? 2 : 1);
-					return {
-						.width = (line > kLinesForPhoto)
-							? availableWidthNoPhoto
-							: availableWidth,
-					};
-				} else {
-					return { .width = availableWidth };
-				}
+				line += (hasSecondLineTitle ? 2 : 1)
+					+ (hasRightPhoto ? 0 : 1);
+				return {
+					.width = (line > kLinesForPhoto)
+						? availableWidthNoPhoto
+						: availableWidth,
+				};
 			};
 			state->contentText.draw(p, {
 				.position = QPoint(left, top),

From 30dae049ff50bf94197208c021f6cec4f6a81efb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 30 Oct 2024 05:04:04 +0300
Subject: [PATCH 094/306] Fixed non-animated display of top bar for sponsored
 messages.

---
 .../SourceFiles/data/components/sponsored_messages.cpp    | 6 ++++--
 Telegram/SourceFiles/history/history_widget.cpp           | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 57c9c0688..ccd7ead26 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -204,8 +204,10 @@ bool SponsoredMessages::canHaveFor(not_null<History*> history) const {
 }
 
 bool SponsoredMessages::isTopBarFor(not_null<History*> history) const {
-	if (const auto user = history->peer->asUser()) {
-		return user->isBot();
+	if (peerIsUser(history->peer->id)) {
+		if (const auto user = history->peer->asUser()) {
+			return user->isBot();
+		}
 	}
 	return false;
 }
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 10a41d76b..81e160e85 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4429,7 +4429,6 @@ void HistoryWidget::showAnimated(
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
-	checkSponsoredMessageBar();
 	if (_translateBar) {
 		_translateBar->finishAnimating();
 	}
@@ -4501,6 +4500,7 @@ void HistoryWidget::doneShow() {
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
+	checkSponsoredMessageBar();
 	if (_sponsoredMessageBar) {
 		_sponsoredMessageBar->finishAnimating();
 	}
@@ -7628,13 +7628,15 @@ void HistoryWidget::requestSponsoredMessageBar() {
 }
 
 void HistoryWidget::checkSponsoredMessageBar() {
-	if (!_history) {
+	if (!_history || !session().sponsoredMessages().isTopBarFor(_history)) {
 		return;
 	}
 	const auto state = session().sponsoredMessages().state(_history);
 	if (state == Data::SponsoredMessages::State::AppendToTopBar) {
 		if (checkSponsoredMessageBarVisibility()) {
-			createSponsoredMessageBar();
+			if (!_sponsoredMessageBar) {
+				createSponsoredMessageBar();
+			}
 			_sponsoredMessageBar->toggle(true, anim::type::instant);
 		}
 	}

From 62376757444400d6b1b54aeeeb12ca3e5c1b0441 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 30 Oct 2024 06:37:58 +0300
Subject: [PATCH 095/306] Moved out ui callbacks of bar from data class from
 sponsored messages.

---
 .../data/components/sponsored_messages.cpp    | 64 +++++++++++--------
 .../data/components/sponsored_messages.h      |  8 ++-
 .../SourceFiles/history/history_widget.cpp    | 40 ++++++++----
 3 files changed, 70 insertions(+), 42 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index ccd7ead26..7de46e59f 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -278,38 +278,52 @@ void SponsoredMessages::parse(
 	});
 }
 
-void SponsoredMessages::fillTopBar(
+FullMsgId SponsoredMessages::fillTopBar(
 		not_null<History*> history,
-		not_null<Ui::RpWidget*> widget,
-		Fn<void()> hide) {
+		not_null<Ui::RpWidget*> widget) {
+	const auto it = _data.find(history);
+	if (it != end(_data)) {
+		auto &list = it->second;
+		if (!list.entries.empty()) {
+			const auto &entry = list.entries.front();
+			const auto fullId = entry.itemFullId;
+			Ui::FillSponsoredMessageBar(
+				widget,
+				_session,
+				fullId,
+				entry.sponsored.from,
+				entry.sponsored.textWithEntities);
+			return fullId;
+		}
+	}
+	return {};
+}
+
+rpl::producer<> SponsoredMessages::itemRemoved(const FullMsgId &fullId) {
+	if (IsServerMsgId(fullId.msg) || !fullId) {
+		return rpl::never<>();
+	}
+	const auto history = _session->data().history(fullId.peer);
 	const auto it = _data.find(history);
 	if (it == end(_data)) {
-		return;
+		return rpl::never<>();
 	}
 	auto &list = it->second;
-	if (list.entries.empty()) {
-		return;
+	const auto entryIt = ranges::find_if(list.entries, [&](const Entry &e) {
+		return e.itemFullId == fullId;
+	});
+	if (entryIt == end(list.entries)) {
+		return rpl::never<>();
 	}
-	auto &entry = list.entries.front();
-	if (!entry.optionalDestructionNotifier) {
-		entry.optionalDestructionNotifier = std::make_unique<rpl::lifetime>();
+	if (!entryIt->optionalDestructionNotifier) {
+		entryIt->optionalDestructionNotifier
+			= std::make_unique<rpl::lifetime>();
+		entryIt->optionalDestructionNotifier->add([this, fullId] {
+			_itemRemoved.fire_copy(fullId);
+		});
 	}
-	const auto fullId = entry.itemFullId;
-	entry.optionalDestructionNotifier->add(std::move(hide));
-	Ui::FillSponsoredMessageBar(
-		widget,
-		_session,
-		fullId,
-		entry.sponsored.from,
-		entry.sponsored.textWithEntities);
-
-	const auto viewLifetime = widget->lifetime().make_state<rpl::lifetime>();
-	widget->shownValue() | rpl::filter(
-		rpl::mappers::_1
-	) | rpl::start_with_next([=, this](bool shown) {
-		view(fullId);
-		viewLifetime->destroy();
-	}, *viewLifetime);
+	return _itemRemoved.events(
+	) | rpl::filter(rpl::mappers::_1 == fullId) | rpl::to_empty;
 }
 
 void SponsoredMessages::append(
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.h b/Telegram/SourceFiles/data/components/sponsored_messages.h
index 1f5715e6c..ebcefb9e2 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.h
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.h
@@ -104,10 +104,10 @@ public:
 	void clearItems(not_null<History*> history);
 	[[nodiscard]] Details lookupDetails(const FullMsgId &fullId) const;
 	void clicked(const FullMsgId &fullId, bool isMedia, bool isFullscreen);
-	void fillTopBar(
+	[[nodiscard]] FullMsgId fillTopBar(
 		not_null<History*> history,
-		not_null<Ui::RpWidget*> widget,
-		Fn<void()> hide);
+		not_null<Ui::RpWidget*> widget);
+	[[nodiscard]] rpl::producer<> itemRemoved(const FullMsgId &);
 
 	[[nodiscard]] AppendResult append(not_null<History*> history);
 	void inject(
@@ -167,6 +167,8 @@ private:
 	base::flat_map<not_null<History*>, Request> _requests;
 	base::flat_map<RandomId, Request> _viewRequests;
 
+	rpl::event_stream<FullMsgId> _itemRemoved;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 81e160e85..2a9ced8b2 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -7648,21 +7648,33 @@ void HistoryWidget::createSponsoredMessageBar() {
 		object_ptr<Ui::RpWidget>(this));
 
 	_sponsoredMessageBar->entity()->resizeToWidth(_scroll->width());
-	auto destruction = [this] {
-		if (_sponsoredMessageBar) {
-			_sponsoredMessageBar->toggle(false, anim::type::normal);
-			_sponsoredMessageBar->shownValue(
-			) | rpl::start_with_next([=](bool shown) {
-				if (!shown) {
-					_sponsoredMessageBar = nullptr;
-				}
-			}, _sponsoredMessageBar->lifetime());
-		}
-	};
-	session().sponsoredMessages().fillTopBar(
+	const auto maybeFullId = session().sponsoredMessages().fillTopBar(
 		_history,
-		_sponsoredMessageBar->entity(),
-		std::move(destruction));
+		_sponsoredMessageBar->entity());
+	session().sponsoredMessages().itemRemoved(
+		maybeFullId
+	) | rpl::start_with_next([this] {
+		_sponsoredMessageBar->shownValue() | rpl::filter(
+			!rpl::mappers::_1
+		) | rpl::start_with_next([this] {
+			_sponsoredMessageBar = nullptr;
+		}, _sponsoredMessageBar->lifetime());
+		_sponsoredMessageBar->toggle(false, anim::type::normal);
+	}, _sponsoredMessageBar->lifetime());
+
+	if (maybeFullId) {
+		const auto viewLifetime
+			= _sponsoredMessageBar->lifetime().make_state<rpl::lifetime>();
+		rpl::combine(
+			_sponsoredMessageBar->entity()->heightValue(),
+			_sponsoredMessageBar->heightValue()
+		) | rpl::filter(
+			rpl::mappers::_1 == rpl::mappers::_2
+		) | rpl::start_with_next([=] {
+			session().sponsoredMessages().view(maybeFullId);
+			viewLifetime->destroy();
+		}, *viewLifetime);
+	}
 
 	_sponsoredMessageBarHeight = 0;
 	_sponsoredMessageBar->heightValue(

From 24cf3984c8c8941bb5772a1208c7f6dfc26ac4be Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 30 Oct 2024 06:44:26 +0300
Subject: [PATCH 096/306] Implemented operator<< for FullMsgId to enable qDebug
 output.

---
 Telegram/SourceFiles/data/data_msg_id.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Telegram/SourceFiles/data/data_msg_id.h b/Telegram/SourceFiles/data/data_msg_id.h
index b3ecb27b0..b2faef165 100644
--- a/Telegram/SourceFiles/data/data_msg_id.h
+++ b/Telegram/SourceFiles/data/data_msg_id.h
@@ -156,6 +156,18 @@ struct FullMsgId {
 	MsgId msg = 0;
 };
 
+#ifdef _DEBUG
+inline QDebug operator<<(QDebug debug, const FullMsgId &fullMsgId) {
+	debug.nospace()
+		<< "FullMsgId(peer: "
+		<< fullMsgId.peer.value
+		<< ", msg: "
+		<< fullMsgId.msg.bare
+		<< ")";
+	return debug;
+}
+#endif // _DEBUG
+
 Q_DECLARE_METATYPE(FullMsgId);
 
 struct FullReplyTo {

From 3895e6d95844ab6ca2ab93025449459dc000cda5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 30 Oct 2024 10:48:19 +0300
Subject: [PATCH 097/306] Fixed empty context menu from space of sponsored
 messages.

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

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 6df845885..423ae4bf1 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2751,8 +2751,13 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			? link->copyToClipboardContextItemText()
 			: QString();
 
-		if (item && item->isSponsored()) {
-			FillSponsoredMessagesMenu(controller, item->fullId(), _menu);
+		const auto sponsored = (item && item->isSponsored())
+			? item
+			: (Element::Moused() && Element::Moused()->data()->isSponsored())
+			? Element::Moused()->data()
+			: nullptr;
+		if (sponsored) {
+			FillSponsoredMessagesMenu(controller, sponsored->fullId(), _menu);
 		}
 		if (isUponSelected > 0) {
 			addReplyAction(item);
@@ -2860,7 +2865,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				HistoryView::CopyPostLink(controller, itemId, HistoryView::Context::History);
 			}, &st::menuIconLink);
 		}
-		if (item && item->isSponsored()) {
+		if (sponsored) {
 			if (!_menu->empty()) {
 				_menu->addSeparator(&st::expandedMenuSeparator);
 			}

From e25cf27ba5f7966b0989e123f21bbe8d11f2de9c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 30 Oct 2024 11:57:41 +0300
Subject: [PATCH 098/306] Replaced dropdown menu with popup in box for revenue
 sponsored messages.

---
 Telegram/SourceFiles/menu/menu_sponsored.cpp | 40 +++++++-------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index c125ab015..9494bb9f3 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
@@ -241,28 +240,18 @@ void AboutBox(
 				width - top->width() - st::defaultScrollArea.width,
 				0);
 		}, top->lifetime());
-		using MenuPtr = base::unique_qptr<Ui::DropdownMenu>;
+		using MenuPtr = base::unique_qptr<Ui::PopupMenu>;
 		const auto menu = top->lifetime().make_state<MenuPtr>();
 		top->setClickedCallback([=] {
-			if (const auto raw = menu->get()) {
-				raw->hideAnimated();
-				return true;
-			}
-			*menu = base::make_unique_q<Ui::DropdownMenu>(
+			*menu = base::make_unique_q<Ui::PopupMenu>(
 				box->window(),
-				st::dropdownMenuWithIcons);
+				st::popupMenuWithIcons);
 			const auto raw = menu->get();
-			top->installEventFilter(raw);
-			raw->setHiddenCallback([=] {
-				raw->deleteLater();
-				top->setForceRippled(false);
-			});
-			raw->setShowStartCallback([=] {
-				top->setForceRippled(true);
-			});
-			raw->setHideStartCallback([=] {
-				top->setForceRippled(false);
-			});
+			raw->animatePhaseValue(
+			) | rpl::start_with_next([=](Ui::PopupMenu::AnimatePhase phase) {
+				top->setForceRippled(phase == Ui::PopupMenu::AnimatePhase::Shown
+					|| phase == Ui::PopupMenu::AnimatePhase::StartShow);
+			}, top->lifetime());
 			FillSponsored(
 				top,
 				Ui::Menu::CreateAddActionCallback(menu->get()),
@@ -270,14 +259,13 @@ void AboutBox(
 				fullId,
 				false,
 				true);
-			const auto global = box->mapToGlobal(
+			const auto global = top->mapToGlobal(
+				QPoint(top->width() / 4 * 3, top->height() / 2));
+			raw->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+			raw->popup(
 				QPoint(
-					st::defaultScrollArea.width - st::lineWidth * 2,
-					top->height() / 2));
-			const auto local = box->window()->mapFromGlobal(global);
-			raw->moveToRight(local.x(), local.y());
-			raw->raise();
-			raw->showAnimated(Ui::PanelAnimation::Origin::TopRight);
+					global.x(),
+					std::max(global.y(), QCursor::pos().y())));
 			return true;
 		});
 	}

From 68cc42047e2a80a33f7cc6f8ca45ff4cfe2ea50c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 30 Oct 2024 11:40:40 +0300
Subject: [PATCH 099/306] Unified context menu creation for different types of
 sponsored messages.

---
 .../history/history_inner_widget.cpp          | 103 +++++-------------
 Telegram/SourceFiles/menu/menu_sponsored.cpp  |  70 +++++++++---
 2 files changed, 85 insertions(+), 88 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 423ae4bf1..84eff2577 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/click_handler_types.h"
 #include "history/history_item_helpers.h"
 #include "history/view/controls/history_view_forward_panel.h"
-#include "api/api_report.h"
 #include "history/view/controls/history_view_draft_options.h"
 #include "boxes/moderate_messages_box.h"
 #include "history/view/media/history_view_sticker.h"
@@ -36,12 +35,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/path_shift_gradient.h"
 #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/confirm_box.h"
 #include "ui/boxes/edit_factcheck_box.h"
 #include "ui/boxes/report_box_graphics.h"
-#include "ui/layers/generic_box.h"
 #include "ui/controls/delete_message_context_action.h"
 #include "ui/inactive_press.h"
 #include "ui/painter.h"
@@ -57,7 +53,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/delete_messages_box.h"
 #include "boxes/report_messages_box.h"
 #include "boxes/sticker_set_box.h"
-#include "boxes/premium_preview_box.h"
 #include "boxes/translate_box.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/emoji_interactions.h"
@@ -72,6 +67,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session_settings.h"
 #include "mainwidget.h"
 #include "menu/menu_item_download_files.h"
+#include "menu/menu_sponsored.h"
 #include "core/application.h"
 #include "apiwrap.h"
 #include "api/api_attached_stickers.h"
@@ -135,60 +131,6 @@ int BinarySearchBlocksOrItems(const T &list, int edge) {
 			&& (!peer->isChannel() || peer->asChannel()->amIn()));
 }
 
-void FillSponsoredMessagesMenu(
-		not_null<Window::SessionController*> controller,
-		FullMsgId itemId,
-		not_null<Ui::PopupMenu*> menu) {
-	const auto &data = controller->session().sponsoredMessages();
-	const auto info = data.lookupDetails(itemId).info;
-	const auto show = controller->uiShow();
-	if (!info.empty()) {
-		auto fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
-			const auto allText = ranges::accumulate(
-				info,
-				TextWithEntities(),
-				[](TextWithEntities a, TextWithEntities b) {
-					return a.text.isEmpty() ? b : a.append('\n').append(b);
-				}).text;
-			const auto callback = [=] {
-				QGuiApplication::clipboard()->setText(allText);
-				show->showToast(tr::lng_text_copied(tr::now));
-			};
-			for (const auto &i : info) {
-				auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
-					menu,
-					st::defaultMenu,
-					st::historySponsorInfoItem,
-					st::historyHasCustomEmojiPosition,
-					base::duplicate(i));
-				item->clicks(
-				) | rpl::start_with_next(callback, menu->lifetime());
-				menu->addAction(std::move(item));
-				if (i != info.back()) {
-					menu->addSeparator();
-				}
-			}
-		};
-		using namespace Ui::Menu;
-		CreateAddActionCallback(menu)(MenuCallback::Args{
-			.text = tr::lng_sponsored_info_menu(tr::now),
-			.handler = nullptr,
-			.icon = &st::menuIconChannel,
-			.fillSubmenu = std::move(fillSubmenu),
-		});
-		menu->addSeparator(&st::expandedMenuSeparator);
-	}
-	menu->addAction(tr::lng_sponsored_hide_ads(tr::now), [=] {
-		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);
-}
-
 } // namespace
 
 // flick scroll taken from http://qt-project.org/doc/qt-4.8/demos-embedded-anomaly-src-flickcharm-cpp.html
@@ -2757,7 +2699,12 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			? Element::Moused()->data()
 			: nullptr;
 		if (sponsored) {
-			FillSponsoredMessagesMenu(controller, sponsored->fullId(), _menu);
+			Menu::FillSponsored(
+				this,
+				Ui::Menu::CreateAddActionCallback(_menu),
+				controller->uiShow(),
+				sponsored->fullId(),
+				false);
 		}
 		if (isUponSelected > 0) {
 			addReplyAction(item);
@@ -2866,21 +2813,29 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			}, &st::menuIconLink);
 		}
 		if (sponsored) {
-			if (!_menu->empty()) {
-				_menu->addSeparator(&st::expandedMenuSeparator);
+			const auto hasAbout = ranges::any_of(
+				_menu->actions(),
+				[about = tr::lng_sponsored_menu_revenued_about(tr::now)](
+						const QAction *action) {
+					return action->text() == about;
+				});
+			if (!hasAbout) {
+				if (!_menu->empty()) {
+					_menu->addSeparator(&st::expandedMenuSeparator);
+				}
+				auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
+					_menu,
+					st::menuWithIcons,
+					st::historyHasCustomEmoji,
+					st::historySponsoredAboutMenuLabelPosition,
+					TextWithEntities{ tr::lng_sponsored_title(tr::now) },
+					&st::menuIconInfo);
+				item->clicks(
+				) | rpl::start_with_next([=] {
+					controller->show(Box(Ui::AboutSponsoredBox));
+				}, item->lifetime());
+				_menu->addAction(std::move(item));
 			}
-			auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
-				_menu,
-				st::menuWithIcons,
-				st::historyHasCustomEmoji,
-				st::historySponsoredAboutMenuLabelPosition,
-				TextWithEntities{ tr::lng_sponsored_title(tr::now) },
-				&st::menuIconInfo);
-			item->clicks(
-			) | rpl::start_with_next([=] {
-				controller->show(Box(Ui::AboutSponsoredBox));
-			}, item->lifetime());
-			_menu->addAction(std::move(item));
 		}
 		if (isUponSelected > 1) {
 			if (selectedState.count > 0 && selectedState.count == selectedState.canForwardCount) {
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 9494bb9f3..349ab26e4 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
 #include "ui/widgets/popup_menu.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
@@ -364,24 +365,65 @@ void FillSponsored(
 		bool mediaViewer,
 		bool skipAbout) {
 	const auto session = &show->session();
+	const auto details = session->sponsoredMessages().lookupDetails(fullId);
+	const auto &info = details.info;
 
-	if (!skipAbout) {
-		addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
-			show->show(Box(AboutBox, show, fullId));
-		}, (mediaViewer ? &st::mediaMenuIconInfo : &st::menuIconInfo));
+	if (!mediaViewer && !details.info.empty()) {
+		auto fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
+			const auto allText = ranges::accumulate(
+				details.info,
+				TextWithEntities(),
+				[](TextWithEntities a, TextWithEntities b) {
+					return a.text.isEmpty() ? b : a.append('\n').append(b);
+				}).text;
+			const auto callback = [=] {
+				TextUtilities::SetClipboardText({ allText });
+				show->showToast(tr::lng_text_copied(tr::now));
+			};
+			for (const auto &i : details.info) {
+				auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
+					menu,
+					st::defaultMenu,
+					st::historySponsorInfoItem,
+					st::historyHasCustomEmojiPosition,
+					base::duplicate(i));
+				item->clicks(
+				) | rpl::start_with_next(callback, menu->lifetime());
+				menu->addAction(std::move(item));
+				if (i != details.info.back()) {
+					menu->addSeparator();
+				}
+			}
+		};
+		addAction({
+			.text = tr::lng_sponsored_info_menu(tr::now),
+			.handler = nullptr,
+			.icon = &st::menuIconChannel,
+			.fillSubmenu = std::move(fillSubmenu),
+		});
+		addAction({
+			.separatorSt = &st::expandedMenuSeparator,
+			.isSeparator = true,
+		});
 	}
+	if (details.canReport) {
+		if (!skipAbout) {
+			addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
+				show->show(Box(AboutBox, show, fullId));
+			}, (mediaViewer ? &st::mediaMenuIconInfo : &st::menuIconInfo));
+		}
 
-	addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
-		ShowReportSponsoredBox(show, fullId);
-	}, (mediaViewer ? &st::mediaMenuIconBlock : &st::menuIconBlock));
-
-	addAction({
-		.separatorSt = (mediaViewer
-			? &st::mediaviewMenuSeparator
-			: &st::expandedMenuSeparator),
-		.isSeparator = true,
-	});
+		addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
+			ShowReportSponsoredBox(show, fullId);
+		}, (mediaViewer ? &st::mediaMenuIconBlock : &st::menuIconBlock));
 
+		addAction({
+			.separatorSt = (mediaViewer
+				? &st::mediaviewMenuSeparator
+				: &st::expandedMenuSeparator),
+			.isSeparator = true,
+		});
+	}
 	addAction(tr::lng_sponsored_hide_ads(tr::now), [=] {
 		if (session->premium()) {
 			using Result = Data::SponsoredReportResult;

From 46ab553fa54f8259333432fbe50d007dd059dfe0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Oct 2024 16:04:30 +0300
Subject: [PATCH 100/306] Rounded earn values from overview to two decimal
 digits.

---
 .../info/bot/earn/info_bot_earn_list.cpp            |  5 +++--
 .../info/channel_statistics/earn/earn_format.cpp    |  9 +++++++--
 .../info/channel_statistics/earn/earn_format.h      |  5 ++++-
 .../earn/info_channel_earn_list.cpp                 | 13 +++++++++----
 .../statistics/view/chart_rulers_view.cpp           |  2 +-
 .../statistics/widgets/point_details_widget.cpp     |  7 +++++--
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
index 8f612343e..a1ec88936 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
@@ -116,6 +116,7 @@ void InnerWidget::fill() {
 	const auto container = this;
 	const auto &data = _state;
 	const auto multiplier = data.usdRate * Data::kEarnMultiplier;
+	constexpr auto kMinorLength = 3;
 
 	auto availableBalanceValue = rpl::single(
 		data.availableBalance
@@ -166,7 +167,7 @@ void InnerWidget::fill() {
 				std::move(
 					value
 				) | rpl::map([=](uint64 v) {
-					return v ? ToUsd(v, multiplier) : QString();
+					return v ? ToUsd(v, multiplier, kMinorLength) : QString();
 				}),
 				st::channelEarnOverviewSubMinorLabel);
 			rpl::combine(
@@ -243,7 +244,7 @@ void InnerWidget::fill() {
 				return !dt.isNull() || (!_state.isWithdrawalEnabled);
 			}),
 			rpl::duplicate(availableBalanceValue) | rpl::map([=](uint64 v) {
-				return v ? ToUsd(v, multiplier) : QString();
+				return v ? ToUsd(v, multiplier, kMinorLength) : QString();
 			}));
 	}
 
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
index 4f87fa505..11f17b8b3 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
@@ -46,7 +46,10 @@ QString MinorPart(EarnInt value) {
 	return result.chopped(zeroCount);
 }
 
-QString ToUsd(EarnInt value, float64 rate) {
+QString ToUsd(
+		Data::EarnInt value,
+		float64 rate,
+		int afterFloat) {
 	constexpr auto kApproximately = QChar(0x2248);
 
 	const auto result = value
@@ -56,7 +59,9 @@ QString ToUsd(EarnInt value, float64 rate) {
 	return QString(kApproximately)
 		+ QChar('$')
 		+ MajorPart(result)
-		+ MinorPart(result);
+		+ ((afterFloat > 0)
+			? MinorPart(result).left(afterFloat)
+			: 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
index 4a7b401ab..7fcd19b4d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h
@@ -13,6 +13,9 @@ namespace Info::ChannelEarn {
 
 [[nodiscard]] QString MajorPart(Data::EarnInt value);
 [[nodiscard]] QString MinorPart(Data::EarnInt value);
-[[nodiscard]] QString ToUsd(Data::EarnInt value, float64 rate);
+[[nodiscard]] QString ToUsd(
+	Data::EarnInt value,
+	float64 rate,
+	int afterFloat);
 
 } // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index d4071225d..c7b2806e4 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -374,6 +374,7 @@ void InnerWidget::fill() {
 			) | rpl::map([this] { return _state.creditsEarn; })
 		);
 
+	constexpr auto kMinorLength = 3;
 	constexpr auto kMinus = QChar(0x2212);
 	//constexpr auto kApproximately = QChar(0x2248);
 	const auto multiplier = data.usdRate;
@@ -381,7 +382,7 @@ void InnerWidget::fill() {
 	const auto creditsToUsdMap = [=](EarnInt c) {
 		const auto creditsMultiplier = _state.creditsEarn.usdRate
 			* Data::kEarnMultiplier;
-		return c ? ToUsd(c, creditsMultiplier) : QString();
+		return c ? ToUsd(c, creditsMultiplier, 0) : QString();
 	};
 
 	const auto session = &_peer->session();
@@ -715,14 +716,18 @@ void InnerWidget::fill() {
 				{});
 			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
-				rpl::duplicate(currencyValue) | rpl::map(MinorPart),
+				rpl::duplicate(currencyValue) | rpl::map([=](EarnInt v) {
+					return MinorPart(v).left(kMinorLength);
+				}),
 				st::channelEarnOverviewMinorLabel);
 			const auto secondMinorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
 				std::move(
 					currencyValue
 				) | rpl::map([=](EarnInt value) {
-					return value ? ToUsd(value, multiplier) : QString();
+					return value
+						? ToUsd(value, multiplier, kMinorLength)
+						: QString();
 				}),
 				st::channelEarnOverviewSubMinorLabel);
 
@@ -883,7 +888,7 @@ void InnerWidget::fill() {
 				container,
 				object_ptr<Ui::FlatLabel>(
 					container,
-					ToUsd(value, multiplier),
+					ToUsd(value, multiplier, 0),
 					st::channelEarnOverviewSubMinorLabel)));
 
 		Ui::AddSkip(container);
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
index ac9dc4582..8a94d1084 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
@@ -43,7 +43,7 @@ void ChartRulersView::setChartData(
 			return FormatF(value / float64(Data::kEarnMultiplier));
 		};
 		_rightCustomCaption = [=, rate = chartData.currencyRate](float64 v) {
-			return Info::ChannelEarn::ToUsd(v, rate);
+			return Info::ChannelEarn::ToUsd(v, rate, 0);
 		};
 		_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 dc0668e9a..1091c99f1 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
@@ -186,7 +186,10 @@ PointDetailsWidget::PointDetailsWidget(
 					QString::number(value / multiplier));
 				const auto usdText = Ui::Text::String(
 					_textStyle,
-					Info::ChannelEarn::ToUsd(value, _chartData.currencyRate));
+					Info::ChannelEarn::ToUsd(
+						value,
+						_chartData.currencyRate,
+						0));
 				const auto width = std::max(
 					usdText.maxWidth(),
 					valueText.maxWidth());
@@ -351,7 +354,7 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 				_textStyle,
 				Info::ChannelEarn::ToUsd(
 					dataLine.y[xIndex],
-					_chartData.currencyRate));
+					_chartData.currencyRate, 0));
 		}
 		_lines.push_back(std::move(textLine));
 	}

From 19afb49fceb0da4a52de28769c5ac8c10b783ab1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Oct 2024 16:12:25 +0300
Subject: [PATCH 101/306] Fixed display of empty context menu in section of
 history widget.

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

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 84eff2577..23495d24c 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2902,7 +2902,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			HistoryView::EmojiPacksSource::Message,
 			_controller);
 		const auto added = (_menu->actions().size() > wasAmount);
-		if (!added) {
+		if (!added && !_menu->empty()) {
 			_menu->addSeparator();
 		}
 		HistoryView::AddSelectRestrictionAction(
@@ -2916,7 +2916,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			this,
 			leaderOrSelf,
 			_controller);
-	} else {
+	} else if (leaderOrSelf) {
 		HistoryView::MaybeAddWhenEditedAction(_menu, leaderOrSelf);
 	}
 

From 7ba78540ace73170e4a995be74d63d43fe10746d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Oct 2024 10:01:26 +0400
Subject: [PATCH 102/306] Keep alternative video qualities list.

---
 Telegram/SourceFiles/api/api_credits.cpp      | 12 +--
 .../data/components/sponsored_messages.cpp    |  4 +-
 Telegram/SourceFiles/data/data_document.cpp   | 89 ++++++++++++++++++-
 Telegram/SourceFiles/data/data_document.h     | 10 +++
 .../SourceFiles/data/data_file_origin.cpp     |  1 +
 Telegram/SourceFiles/data/data_session.cpp    | 13 ++-
 Telegram/SourceFiles/data/data_session.h      |  8 +-
 Telegram/SourceFiles/data/data_stories.cpp    |  4 +-
 Telegram/SourceFiles/history/history_item.cpp |  4 +-
 9 files changed, 129 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 0453cfc4f..6c0a7324a 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -39,8 +39,8 @@ constexpr auto kTransactionsLimit = 100;
 	if (const auto list = tl.data().vextended_media()) {
 		extended.reserve(list->v.size());
 		for (const auto &media : list->v) {
-			media.match([&](const MTPDmessageMediaPhoto &photo) {
-				if (const auto inner = photo.vphoto()) {
+			media.match([&](const MTPDmessageMediaPhoto &data) {
+				if (const auto inner = data.vphoto()) {
 					const auto photo = owner->processPhoto(*inner);
 					if (!photo->isNull()) {
 						extended.push_back(CreditsHistoryMedia{
@@ -49,9 +49,11 @@ constexpr auto kTransactionsLimit = 100;
 						});
 					}
 				}
-			}, [&](const MTPDmessageMediaDocument &document) {
-				if (const auto inner = document.vdocument()) {
-					const auto document = owner->processDocument(*inner);
+			}, [&](const MTPDmessageMediaDocument &data) {
+				if (const auto inner = data.vdocument()) {
+					const auto document = owner->processDocument(
+						*inner,
+						data.valt_documents());
 					if (document->isAnimation()
 						|| document->isVideoFile()
 						|| document->isGifv()) {
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 7de46e59f..d2746ad9a 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -346,7 +346,9 @@ void SponsoredMessages::append(
 			}, [&](const MTPDmessageMediaDocument &media) {
 				if (const auto tlDocument = media.vdocument()) {
 					tlDocument->match([&](const MTPDdocument &data) {
-						const auto d = history->owner().processDocument(data);
+						const auto d = history->owner().processDocument(
+							data,
+							media.valt_documents());
 						if (d->isVideoFile()
 							|| d->isSilentVideo()
 							|| d->isAnimation()
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 5456ef280..d4306b2fb 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -332,6 +332,8 @@ void DocumentData::setattributes(
 
 	validateLottieSticker();
 
+	auto wasVideoData = isVideoFile() ? std::move(_additional) : nullptr;
+
 	_videoPreloadPrefix = 0;
 	for (const auto &attribute : attributes) {
 		attribute.match([&](const MTPDdocumentAttributeImageSize &data) {
@@ -388,11 +390,21 @@ void DocumentData::setattributes(
 					: VideoDocument;
 				if (data.is_round_message()) {
 					_additional = std::make_unique<RoundData>();
-				} else if (const auto size = data.vpreload_prefix_size()) {
-					if (size->v > 0 && size->v < kMaxAllowedPreloadPrefix) {
-						_videoPreloadPrefix = size->v;
+				} else {
+					if (const auto size = data.vpreload_prefix_size()) {
+						if (size->v > 0
+							&& size->v < kMaxAllowedPreloadPrefix) {
+							_videoPreloadPrefix = size->v;
+						}
 					}
+					_additional = wasVideoData
+						? std::move(wasVideoData)
+						: std::make_unique<VideoData>();
+					video()->codec = qs(
+						data.vvideo_codec().value_or_empty());
 				}
+			} else if (type == VideoDocument && wasVideoData) {
+				_additional = std::move(wasVideoData);
 			} else if (const auto info = sticker()) {
 				info->type = StickerType::Webm;
 			}
@@ -511,6 +523,67 @@ void DocumentData::setattributes(
 	}
 }
 
+void DocumentData::setVideoQualities(const QVector<MTPDocument> &list) {
+	auto qualities = std::vector<not_null<DocumentData*>>();
+	qualities.reserve(list.size());
+	for (const auto &document : list) {
+		qualities.push_back(owner().processDocument(document));
+	}
+	setVideoQualities(std::move(qualities));
+}
+
+void DocumentData::setVideoQualities(
+		std::vector<not_null<DocumentData*>> qualities) {
+	const auto data = video();
+	if (!data) {
+		return;
+	}
+	auto count = int(qualities.size());
+	if (qualities.empty()) {
+		return;
+	}
+	const auto good = [&](not_null<DocumentData*> document) {
+		return document->isVideoFile()
+			&& !document->dimensions.isEmpty()
+			&& !document->inappPlaybackFailed()
+			&& document->useStreamingLoader()
+			&& document->canBeStreamed(nullptr);
+	};
+	ranges::sort(
+		qualities,
+		ranges::greater(),
+		&DocumentData::resolveVideoQuality);
+	for (auto i = 0; i != count - 1;) {
+		const auto my = qualities[i];
+		const auto next = qualities[i + 1];
+		const auto myQuality = my->resolveVideoQuality();
+		const auto nextQuality = next->resolveVideoQuality();
+		const auto myGood = good(my);
+		const auto nextGood = good(next);
+		if (!myGood || !nextGood || myQuality == nextQuality) {
+			const auto removeMe = !myGood
+				|| (nextGood && (my->size > next->size));
+			const auto from = i + (removeMe ? 1 : 2);
+			for (auto j = from; j != count; ++j) {
+				qualities[j - 1] = qualities[j];
+			}
+			--count;
+		} else {
+			++i;
+		}
+	}
+	if (!qualities[count - 1]->resolveVideoQuality()) {
+		--count;
+	}
+	qualities.erase(qualities.begin() + count, qualities.end());
+	data->qualities = std::move(qualities);
+}
+
+int DocumentData::resolveVideoQuality() const {
+	const auto size = isVideoFile() ? dimensions : QSize();
+	return size.isEmpty() ? 0 : std::min(size.width(), size.height());
+}
+
 void DocumentData::validateLottieSticker() {
 	if (type == FileDocument
 		&& hasMimeType(u"application/x-tgsticker"_q)) {
@@ -1384,6 +1457,16 @@ const RoundData *DocumentData::round() const {
 	return const_cast<DocumentData*>(this)->round();
 }
 
+VideoData *DocumentData::video() {
+	return isVideoFile()
+		? static_cast<VideoData*>(_additional.get())
+		: nullptr;
+}
+
+const VideoData *DocumentData::video() const {
+	return const_cast<DocumentData*>(this)->video();
+}
+
 bool DocumentData::hasRemoteLocation() const {
 	return (_dc != 0 && _access != 0);
 }
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index 47237b3c4..ceba0e875 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -92,6 +92,11 @@ struct VoiceData : public DocumentAdditionalData {
 	char wavemax = 0;
 };
 
+struct VideoData : public DocumentAdditionalData {
+	QString codec;
+	std::vector<not_null<DocumentData*>> qualities;
+};
+
 using RoundData = VoiceData;
 
 namespace Serialize {
@@ -108,8 +113,11 @@ public:
 
 	void setattributes(
 		const QVector<MTPDocumentAttribute> &attributes);
+	void setVideoQualities(const QVector<MTPDocument> &list);
 
 	void automaticLoadSettingsChanged();
+	void setVideoQualities(std::vector<not_null<DocumentData*>> qualities);
+	[[nodiscard]] int resolveVideoQuality() const;
 
 	[[nodiscard]] bool loading() const;
 	[[nodiscard]] QString loadingFilePath() const;
@@ -161,6 +169,8 @@ public:
 	[[nodiscard]] const VoiceData *voice() const;
 	[[nodiscard]] RoundData *round();
 	[[nodiscard]] const RoundData *round() const;
+	[[nodiscard]] VideoData *video();
+	[[nodiscard]] const VideoData *video() const;
 
 	void forceIsStreamedAnimation();
 	[[nodiscard]] bool isVoiceMessage() const;
diff --git a/Telegram/SourceFiles/data/data_file_origin.cpp b/Telegram/SourceFiles/data/data_file_origin.cpp
index 76838edc3..48f2be854 100644
--- a/Telegram/SourceFiles/data/data_file_origin.cpp
+++ b/Telegram/SourceFiles/data/data_file_origin.cpp
@@ -87,6 +87,7 @@ struct FileReferenceAccumulator {
 			push(data.vphoto());
 		}, [&](const MTPDmessageMediaDocument &data) {
 			push(data.vdocument());
+			push(data.valt_documents());
 		}, [&](const MTPDmessageMediaWebPage &data) {
 			push(data.vwebpage());
 		}, [&](const MTPDmessageMediaGame &data) {
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 9ce94052f..14be85c06 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -3139,17 +3139,24 @@ not_null<DocumentData*> Session::document(DocumentId id) {
 	return i->second.get();
 }
 
-not_null<DocumentData*> Session::processDocument(const MTPDocument &data) {
+not_null<DocumentData*> Session::processDocument(
+		const MTPDocument &data,
+		const MTPVector<MTPDocument> *qualities) {
 	return data.match([&](const MTPDdocument &data) {
-		return processDocument(data);
+		return processDocument(data, qualities);
 	}, [&](const MTPDdocumentEmpty &data) {
 		return document(data.vid().v);
 	});
 }
 
-not_null<DocumentData*> Session::processDocument(const MTPDdocument &data) {
+not_null<DocumentData*> Session::processDocument(
+		const MTPDdocument &data,
+		const MTPVector<MTPDocument> *qualities) {
 	const auto result = document(data.vid().v);
 	documentApplyFields(result, data);
+	if (qualities) {
+		result->setVideoQualities(qualities->v);
+	}
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index a87e7e604..654cfdba3 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -558,8 +558,12 @@ public:
 		const ImageLocation &thumbnailLocation);
 
 	[[nodiscard]] not_null<DocumentData*> document(DocumentId id);
-	not_null<DocumentData*> processDocument(const MTPDocument &data);
-	not_null<DocumentData*> processDocument(const MTPDdocument &data);
+	not_null<DocumentData*> processDocument(
+		const MTPDocument &data,
+		const MTPVector<MTPDocument> *qualities = nullptr);
+	not_null<DocumentData*> processDocument(
+		const MTPDdocument &data,
+		const MTPVector<MTPDocument> *qualities = nullptr);
 	not_null<DocumentData*> processDocument(
 		const MTPdocument &data,
 		const ImageWithLocation &thumbnail);
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 0d9671f53..bb08bca5d 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -62,7 +62,9 @@ using UpdateFlag = StoryUpdate::Flag;
 	}, [&](const MTPDmessageMediaDocument &data)
 		-> std::optional<StoryMedia> {
 		if (const auto document = data.vdocument()) {
-			const auto result = owner->processDocument(*document);
+			const auto result = owner->processDocument(
+				*document,
+				data.valt_documents());
 			if (!result->isNull()
 				&& (result->isGifv() || result->isVideoFile())) {
 				result->setStoryMedia(true);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index ddb539d82..afdeb386c 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -299,7 +299,9 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 		return document->match([&](const MTPDdocument &document) -> Result {
 			return std::make_unique<Data::MediaFile>(
 				item,
-				item->history()->owner().processDocument(document),
+				item->history()->owner().processDocument(
+					document,
+					media.valt_documents()),
 				media.is_nopremium(),
 				media.is_spoiler(),
 				media.vttl_seconds().value_or_empty());

From 3f2f3ebd51ee220762852a1e1ac110114c7114ce Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Oct 2024 14:26:41 +0400
Subject: [PATCH 103/306] Allow switching video quality.

---
 .../media/player/media_player.style           | 21 +++--
 .../media/player/media_player_dropdown.cpp    | 73 ++++++++++++++-
 .../media/player/media_player_dropdown.h      | 11 ++-
 .../media/streaming/media_streaming_common.h  |  3 +
 .../SourceFiles/media/view/media_view.style   | 22 +++--
 .../media/view/media_view_overlay_widget.cpp  | 92 +++++++++++++++++--
 .../media/view/media_view_overlay_widget.h    | 36 +++++---
 .../view/media_view_playback_controls.cpp     |  9 +-
 .../media/view/media_view_playback_controls.h |  6 ++
 9 files changed, 227 insertions(+), 46 deletions(-)

diff --git a/Telegram/SourceFiles/media/player/media_player.style b/Telegram/SourceFiles/media/player/media_player.style
index 5e5a3ec8b..b4af94564 100644
--- a/Telegram/SourceFiles/media/player/media_player.style
+++ b/Telegram/SourceFiles/media/player/media_player.style
@@ -29,6 +29,7 @@ MediaPlayerButton {
 
 MediaSpeedMenu {
 	dropdown: DropdownMenu;
+	qualityMenu: Menu;
 	activeCheck: icon;
 	activeCheckSkip: pixels;
 	sliderStyle: TextStyle;
@@ -165,16 +166,20 @@ mediaPlayerMenu: DropdownMenu(defaultDropdownMenu) {
 }
 mediaPlayerMenuCheck: icon {{ "player/player_check", mediaPlayerActiveFg }};
 
+mediaPlayerSpeedMenuInner: Menu(menuWithIcons) {
+	separator: MenuSeparator(defaultMenuSeparator) {
+		padding: margins(0px, 4px, 0px, 4px);
+		width: 6px;
+	}
+	itemPadding: margins(54px, 7px, 54px, 9px);
+	itemFgDisabled: mediaPlayerActiveFg;
+}
 mediaPlayerSpeedMenu: MediaSpeedMenu {
 	dropdown: DropdownMenu(mediaPlayerMenu) {
-		menu: Menu(menuWithIcons) {
-			separator: MenuSeparator(defaultMenuSeparator) {
-				padding: margins(0px, 4px, 0px, 4px);
-				width: 6px;
-			}
-			itemPadding: margins(54px, 7px, 54px, 9px);
-			itemFgDisabled: mediaPlayerActiveFg;
-		}
+		menu: mediaPlayerSpeedMenuInner;
+	}
+	qualityMenu: Menu(mediaPlayerSpeedMenuInner) {
+		itemPadding: margins(17px, 7px, 54px, 9px);
 	}
 	activeCheck: mediaPlayerMenuCheck;
 	activeCheckSkip: 8px;
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
index 0a8b181fe..843ce1553 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
@@ -177,7 +177,8 @@ void FillSpeedMenu(
 		not_null<Ui::Menu::Menu*> menu,
 		const style::MediaSpeedMenu &st,
 		rpl::producer<float64> value,
-		Fn<void(float64)> callback) {
+		Fn<void(float64)> callback,
+		bool onlySlider) {
 	auto slider = base::make_unique_q<SpeedSliderItem>(
 		menu,
 		st,
@@ -198,6 +199,11 @@ void FillSpeedMenu(
 	));
 
 	menu->addAction(std::move(slider));
+
+	if (onlySlider) {
+		return;
+	}
+
 	menu->addSeparator(&st.dropdown.menu.separator);
 
 	struct SpeedPoint {
@@ -693,7 +699,10 @@ SpeedController::SpeedController(
 	not_null<QWidget*> menuParent,
 	Fn<void(bool)> menuOverCallback,
 	Fn<float64(bool lastNonDefault)> value,
-	Fn<void(float64)> change)
+	Fn<void(float64)> change,
+	std::vector<int> qualities,
+	Fn<int()> quality,
+	Fn<void(int)> changeQuality)
 : WithDropdownController(
 	button,
 	menuParent,
@@ -702,7 +711,12 @@ SpeedController::SpeedController(
 	std::move(menuOverCallback))
 , _st(button->st())
 , _lookup(std::move(value))
-, _change(std::move(change)) {
+, _change(std::move(change))
+, _qualities(std::move(qualities))
+, _lookupQuality(std::move(quality))
+, _changeQuality(std::move(changeQuality)) {
+	Expects(_qualities.empty() || (_lookupQuality && _changeQuality));
+
 	button->setClickedCallback([=] {
 		toggleDefault();
 		save();
@@ -756,12 +770,63 @@ void SpeedController::save() {
 	_saved.fire({});
 }
 
+void SpeedController::setQuality(int quality) {
+	_quality = quality;
+	_changeQuality(quality);
+}
+
 void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
 	FillSpeedMenu(
 		menu->menu(),
 		_st.menu,
 		_speedChanged.events_starting_with(speed()),
-		[=](float64 speed) { setSpeed(speed); save(); });
+		[=](float64 speed) { setSpeed(speed); save(); },
+		!_qualities.empty());
+	if (_qualities.empty()) {
+		return;
+	}
+	_quality = _lookupQuality();
+	const auto raw = menu->menu();
+	const auto &st = _st.menu;
+	raw->addSeparator(&st.dropdown.menu.separator);
+
+	const auto add = [&](int quality) {
+		const auto text = quality ? u"%1p"_q.arg(quality) : u"Original"_q;
+		auto action = base::make_unique_q<Ui::Menu::Action>(
+			raw,
+			st.qualityMenu,
+			Ui::Menu::CreateAction(raw, text, [=] { _changeQuality(quality); }),
+			nullptr,
+			nullptr);
+		const auto raw = action.get();
+		const auto check = Ui::CreateChild<Ui::RpWidget>(raw);
+		check->resize(st.activeCheck.size());
+		check->paintRequest(
+		) | rpl::start_with_next([check, icon = &st.activeCheck] {
+			auto p = QPainter(check);
+			icon->paint(p, 0, 0, check->width());
+		}, check->lifetime());
+		raw->sizeValue(
+		) | rpl::start_with_next([=, skip = st.activeCheckSkip](QSize size) {
+			check->moveToRight(
+				skip,
+				(size.height() - check->height()) / 2,
+				size.width());
+		}, check->lifetime());
+		check->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_quality.value(
+		) | rpl::start_with_next([=](int now) {
+			const auto chosen = (now == quality);
+			raw->action()->setEnabled(!chosen);
+			check->setVisible(chosen);
+		}, raw->lifetime());
+		menu->addAction(std::move(action));
+	};
+
+	add(0);
+	for (const auto quality : _qualities) {
+		add(quality);
+	}
 }
 
 } // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.h b/Telegram/SourceFiles/media/player/media_player_dropdown.h
index 63197dbb8..7fcdc1f29 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.h
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.h
@@ -129,7 +129,10 @@ public:
 		not_null<QWidget*> menuParent,
 		Fn<void(bool)> menuOverCallback,
 		Fn<float64(bool lastNonDefault)> value,
-		Fn<void(float64)> change);
+		Fn<void(float64)> change,
+		std::vector<int> qualities = {},
+		Fn<int()> quality = nullptr,
+		Fn<void(int)> changeQuality = nullptr);
 
 	[[nodiscard]] rpl::producer<> saved() const;
 
@@ -141,6 +144,7 @@ private:
 	[[nodiscard]] float64 lastNonDefaultSpeed() const;
 	void toggleDefault();
 	void setSpeed(float64 newSpeed);
+	void setQuality(int quality);
 	void save();
 
 	const style::MediaSpeedButton &_st;
@@ -151,6 +155,11 @@ private:
 	rpl::event_stream<float64> _speedChanged;
 	rpl::event_stream<> _saved;
 
+	std::vector<int> _qualities;
+	Fn<int()> _lookupQuality;
+	Fn<void(int)> _changeQuality;
+	rpl::variable<int> _quality;
+
 };
 
 } // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_common.h b/Telegram/SourceFiles/media/streaming/media_streaming_common.h
index f91afead2..86f76fea1 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_common.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_common.h
@@ -17,6 +17,9 @@ inline constexpr auto kTimeUnknown = std::numeric_limits<crl::time>::min();
 inline constexpr auto kDurationMax = crl::time(std::numeric_limits<int>::max());
 inline constexpr auto kDurationUnavailable = std::numeric_limits<crl::time>::max();
 
+inline constexpr auto kOriginalQuality = 0;
+inline constexpr auto kAutoQuality = -1;
+
 namespace Audio {
 bool SupportsSpeedControl();
 } // namespace Audio
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index c235b7d59..3c3ae5fbf 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -307,17 +307,21 @@ mediaviewTitleMaximizeMacPadding: margins(0px, 4px, 8px, 4px);
 mediaviewShadowTop: icon{{ "mediaview/shadow_top", windowShadowFg }};
 mediaviewShadowBottom: icon{{ "mediaview/shadow_bottom", windowShadowFg }};
 
+mediaviewSpeedMenuInner: Menu(mediaviewMenu) {
+	separator: MenuSeparator(mediaviewMenuSeparator) {
+		fg: groupCallMenuBgOver;
+		padding: margins(0px, 4px, 0px, 4px);
+		width: 6px;
+	}
+	itemPadding: margins(54px, 7px, 54px, 9px);
+	itemFgDisabled: mediaviewTextLinkFg;
+}
 mediaviewSpeedMenu: MediaSpeedMenu(mediaPlayerSpeedMenu) {
 	dropdown: DropdownMenu(mediaviewDropdownMenu) {
-		menu: Menu(mediaviewMenu) {
-			separator: MenuSeparator(mediaviewMenuSeparator) {
-				fg: groupCallMenuBgOver;
-				padding: margins(0px, 4px, 0px, 4px);
-				width: 6px;
-			}
-			itemPadding: margins(54px, 7px, 54px, 9px);
-			itemFgDisabled: mediaviewTextLinkFg;
-		}
+		menu: mediaviewSpeedMenuInner;
+	}
+	qualityMenu: Menu(mediaviewSpeedMenuInner) {
+		itemPadding: margins(17px, 7px, 54px, 9px);
 	}
 	activeCheck: icon {{ "player/player_check", mediaviewTextLinkFg }};
 	slider: MediaSlider(defaultContinuousSlider) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 96dcdc445..580d5e120 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1112,7 +1112,10 @@ bool OverlayWidget::videoShown() const {
 QSize OverlayWidget::videoSize() const {
 	Expects(videoShown());
 
-	return flipSizeByRotation(_streamed->instance.info().video.size);
+	const auto use = (_document && _chosenQuality != _document)
+		? _document->dimensions
+		: _streamed->instance.info().video.size;
+	return flipSizeByRotation(use);
 }
 
 bool OverlayWidget::streamingRequiresControls() const {
@@ -2257,16 +2260,37 @@ OverlayWidget::~OverlayWidget() {
 	_dropdown.destroy();
 }
 
+not_null<DocumentData*> OverlayWidget::chooseQuality() const {
+	Expects(_document != nullptr);
+
+	const auto video = _document->video();
+	if (!video || video->qualities.empty() || _quality == kOriginalQuality) {
+		return _document;
+	}
+	auto closest = _document;
+	auto closestAbs = std::abs(_quality - _document->resolveVideoQuality());
+	for (const auto &quality : video->qualities) {
+		const auto abs = std::abs(_quality - quality->resolveVideoQuality());
+		if (abs < closestAbs) {
+			closestAbs = abs;
+			closest = quality;
+		}
+	}
+	return closest;
+}
+
 void OverlayWidget::assignMediaPointer(DocumentData *document) {
 	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
 	_photo = nullptr;
 	_photoMedia = nullptr;
 	if (_document != document) {
 		if ((_document = document)) {
+			_chosenQuality = chooseQuality();
 			_documentMedia = _document->createMediaView();
 			_documentMedia->goodThumbnailWanted();
 			_documentMedia->thumbnailWanted(fileOrigin());
 		} else {
+			_chosenQuality = nullptr;
 			_documentMedia = nullptr;
 		}
 		_documentLoadingTo = QString();
@@ -2275,6 +2299,7 @@ void OverlayWidget::assignMediaPointer(DocumentData *document) {
 
 void OverlayWidget::assignMediaPointer(not_null<PhotoData*> photo) {
 	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
+	_chosenQuality = nullptr;
 	_document = nullptr;
 	_documentMedia = nullptr;
 	_documentLoadingTo = QString();
@@ -3848,12 +3873,12 @@ void OverlayWidget::startStreamingPlayer(
 		return;
 	}
 
-	const auto position = _document
+	_streamedPosition = _document
 		? startStreaming.startTime
 		: _photo
 		? _photo->videoStartPosition()
 		: 0;
-	restartAtSeekPosition(position);
+	restartAtSeekPosition(_streamedPosition);
 }
 
 void OverlayWidget::initStreamingThumbnail() {
@@ -3892,9 +3917,15 @@ void OverlayWidget::initStreamingThumbnail() {
 		: good
 		? good->size()
 		: _document->dimensions;
-	if (!good && !thumbnail && !blurred) {
+	if (size.isEmpty()) {
 		return;
-	} else if (size.isEmpty()) {
+	} else if (!_streamedQualityChangeFrame.isNull()) {
+		setStaticContent(_streamedQualityChangeFrame.scaled(
+			size,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation));
+		return;
+	} else if (!good && !thumbnail && !blurred) {
 		return;
 	}
 	const auto options = VideoThumbOptions(_document);
@@ -3917,6 +3948,7 @@ void OverlayWidget::initStreamingThumbnail() {
 void OverlayWidget::streamingReady(Streaming::Information &&info) {
 	if (videoShown()) {
 		applyVideoSize();
+		_streamedQualityChangeFrame = QImage();
 	} else {
 		updateContentRect();
 	}
@@ -3938,8 +3970,9 @@ bool OverlayWidget::createStreamingObjects() {
 
 	const auto origin = fileOrigin();
 	const auto callback = [=] { waitingAnimationCallback(); };
-	if (_document) {
-		_streamed = std::make_unique<Streamed>(_document, origin, callback);
+	const auto video = _chosenQuality ? _chosenQuality : _document;
+	if (video) {
+		_streamed = std::make_unique<Streamed>(video, origin, callback);
 	} else {
 		_streamed = std::make_unique<Streamed>(_photo, origin, callback);
 	}
@@ -3950,8 +3983,8 @@ bool OverlayWidget::createStreamingObjects() {
 	++_streamedCreated;
 	_streamed->instance.setPriority(kOverlayLoaderPriority);
 	_streamed->instance.lockPlayer();
-	_streamed->withSound = _document
-		&& !_document->isSilentVideo()
+	_streamed->withSound = video
+		&& !video->isSilentVideo()
 		&& (_document->isAudioFile()
 			|| _document->isVideoFile()
 			|| _document->isVoiceMessage()
@@ -4018,6 +4051,7 @@ void OverlayWidget::handleStreamingUpdate(Streaming::Update &&update) {
 		updateContentRect();
 		Core::App().updateNonIdle();
 		updatePlaybackState();
+		_streamedPosition = update.position;
 	}, [&](const PreloadedAudio &update) {
 		updatePlaybackState();
 	}, [&](const UpdateAudio &update) {
@@ -4381,6 +4415,45 @@ float64 OverlayWidget::playbackControlsCurrentSpeed(bool lastNonDefault) {
 	return Core::App().settings().videoPlaybackSpeed(lastNonDefault);
 }
 
+std::vector<int> OverlayWidget::playbackControlsQualities() {
+	const auto video = _document ? _document->video() : nullptr;
+	if (!video || video->qualities.empty()) {
+		return {};
+	}
+	auto result = std::vector<int>();
+	result.reserve(video->qualities.size());
+	for (const auto &quality : video->qualities) {
+		result.push_back(quality->resolveVideoQuality());
+	}
+	return result;
+}
+
+int OverlayWidget::playbackControlsCurrentQuality() {
+	return _quality;
+}
+
+void OverlayWidget::playbackControlsQualityChanged(int quality) {
+	const auto now = _chosenQuality;
+	if (_quality != quality) {
+		_quality = quality;
+		if (_document) {
+			_chosenQuality = chooseQuality();
+			if (_chosenQuality != now) {
+				if (_streamed && _streamed->instance.ready()) {
+					_streamedQualityChangeFrame = currentVideoFrameImage();
+				}
+				clearStreaming();
+				_streamingStartPaused = false;
+				const auto time = _streamedPosition;
+				const auto startStreaming = StartStreaming(false, time);
+				if (!canInitStreaming() || !initStreaming(startStreaming)) {
+					redisplayContent();
+				}
+			}
+		}
+	}
+}
+
 void OverlayWidget::switchToPip() {
 	Expects(_streamed != nullptr);
 	Expects(_document != nullptr);
@@ -4628,6 +4701,7 @@ void OverlayWidget::updatePlaybackState() {
 	}
 	const auto state = _streamed->instance.player().prepareLegacyState();
 	if (state.position != kTimeUnknown && state.length != kTimeUnknown) {
+		_streamedPosition = state.position;
 		if (_streamed->controls) {
 			_streamed->controls->updatePlayback(state);
 			_touchbarTrackState.fire_copy(state);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 5114b169c..8396ddd4d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -236,6 +236,9 @@ private:
 	void playbackControlsVolumeChangeFinished() override;
 	void playbackControlsSpeedChanged(float64 speed) override;
 	float64 playbackControlsCurrentSpeed(bool lastNonDefault) override;
+	std::vector<int> playbackControlsQualities() override;
+	int playbackControlsCurrentQuality() override;
+	void playbackControlsQualityChanged(int quality) override;
 	void playbackControlsToFullScreen() override;
 	void playbackControlsFromFullScreen() override;
 	void playbackControlsToPictureInPicture() override;
@@ -315,11 +318,11 @@ private:
 	void checkForSaveLoaded();
 	void showPremiumDownloadPromo();
 
-	Entity entityForUserPhotos(int index) const;
-	Entity entityForSharedMedia(int index) const;
-	Entity entityForCollage(int index) const;
-	Entity entityByIndex(int index) const;
-	Entity entityForItemId(const FullMsgId &itemId) const;
+	[[nodiscard]] Entity entityForUserPhotos(int index) const;
+	[[nodiscard]] Entity entityForSharedMedia(int index) const;
+	[[nodiscard]] Entity entityForCollage(int index) const;
+	[[nodiscard]] Entity entityByIndex(int index) const;
+	[[nodiscard]] Entity entityForItemId(const FullMsgId &itemId) const;
 	bool moveToEntity(const Entity &entity, int preloadDelta = 0);
 
 	void setContext(std::variant<
@@ -335,23 +338,23 @@ private:
 	struct SharedMedia;
 	using SharedMediaType = SharedMediaWithLastSlice::Type;
 	using SharedMediaKey = SharedMediaWithLastSlice::Key;
-	std::optional<SharedMediaType> sharedMediaType() const;
-	std::optional<SharedMediaKey> sharedMediaKey() const;
-	std::optional<SharedMediaType> computeOverviewType() const;
+	[[nodiscard]] std::optional<SharedMediaType> sharedMediaType() const;
+	[[nodiscard]] std::optional<SharedMediaKey> sharedMediaKey() const;
+	[[nodiscard]] std::optional<SharedMediaType> computeOverviewType() const;
 	bool validSharedMedia() const;
 	void validateSharedMedia();
 	void handleSharedMediaUpdate(SharedMediaWithLastSlice &&update);
 
 	struct UserPhotos;
 	using UserPhotosKey = UserPhotosSlice::Key;
-	std::optional<UserPhotosKey> userPhotosKey() const;
+	[[nodiscard]] std::optional<UserPhotosKey> userPhotosKey() const;
 	bool validUserPhotos() const;
 	void validateUserPhotos();
 	void handleUserPhotosUpdate(UserPhotosSlice &&update);
 
 	struct Collage;
 	using CollageKey = WebPageCollage::Item;
-	std::optional<CollageKey> collageKey() const;
+	[[nodiscard]] std::optional<CollageKey> collageKey() const;
 	bool validCollage() const;
 	void validateCollage();
 
@@ -430,11 +433,11 @@ private:
 	void contentSizeChanged();
 
 	// Radial animation interface.
-	float64 radialProgress() const;
-	bool radialLoading() const;
-	QRect radialRect() const;
+	[[nodiscard]] float64 radialProgress() const;
+	[[nodiscard]] bool radialLoading() const;
+	[[nodiscard]] QRect radialRect() const;
 	void radialStart();
-	crl::time radialTimeShift() const;
+	[[nodiscard]] crl::time radialTimeShift() const;
 
 	void updateHeader();
 	void snapXY();
@@ -524,6 +527,7 @@ private:
 	void clearStreaming(bool savePosition = true);
 	[[nodiscard]] bool canInitStreaming() const;
 	[[nodiscard]] bool saveControlLocked() const;
+	[[nodiscard]] not_null<DocumentData*> chooseQuality() const;
 
 	[[nodiscard]] bool topShadowOnTheRight() const;
 	void applyHideWindowWorkaround();
@@ -551,6 +555,8 @@ private:
 	rpl::lifetime _sessionLifetime;
 	PhotoData *_photo = nullptr;
 	DocumentData *_document = nullptr;
+	DocumentData *_chosenQuality = nullptr;
+	int _quality = {};
 	QString _documentLoadingTo;
 	std::shared_ptr<Data::PhotoMedia> _photoMedia;
 	std::shared_ptr<Data::DocumentMedia> _documentMedia;
@@ -625,6 +631,8 @@ private:
 
 	std::unique_ptr<Streamed> _streamed;
 	std::unique_ptr<PipWrap> _pip;
+	QImage _streamedQualityChangeFrame;
+	crl::time _streamedPosition = 0;
 	int _streamedCreated = 0;
 	bool _showAsPip = false;
 
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index 896a66ec7..16ca4b8c4 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -47,7 +47,10 @@ PlaybackControls::PlaybackControls(
 		parent,
 		[=](bool) {},
 		[=](bool lastNonDefault) { return speedLookup(lastNonDefault); },
-		[=](float64 speed) { saveSpeed(speed); })
+		[=](float64 speed) { saveSpeed(speed); },
+		_delegate->playbackControlsQualities(),
+		[=] { return _delegate->playbackControlsCurrentQuality(); },
+		[=](int quality) { saveQuality(quality); })
 	: nullptr)
 , _fadeAnimation(std::make_unique<Ui::FadeAnimation>(this)) {
 	_fadeAnimation->show();
@@ -192,6 +195,10 @@ void PlaybackControls::saveSpeed(float64 speed) {
 	_delegate->playbackControlsSpeedChanged(speed);
 }
 
+void PlaybackControls::saveQuality(int quality) {
+	_delegate->playbackControlsQualityChanged(quality);
+}
+
 void PlaybackControls::updatePlaybackSpeed(float64 speed) {
 	DEBUG_LOG(("Media playback speed: update to %1.").arg(speed));
 	_delegate->playbackControlsSpeedChanged(speed);
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.h b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
index ac5e15baa..0970808c8 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.h
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
@@ -44,6 +44,10 @@ public:
 		virtual void playbackControlsSpeedChanged(float64 speed) = 0;
 		[[nodiscard]] virtual float64 playbackControlsCurrentSpeed(
 			bool lastNonDefault) = 0;
+		[[nodiscard]] virtual auto playbackControlsQualities()
+			-> std::vector<int> = 0;
+		[[nodiscard]] virtual int playbackControlsCurrentQuality() = 0;
+		virtual void playbackControlsQualityChanged(int quality) = 0;
 		virtual void playbackControlsToFullScreen() = 0;
 		virtual void playbackControlsFromFullScreen() = 0;
 		virtual void playbackControlsToPictureInPicture() = 0;
@@ -90,6 +94,8 @@ private:
 	[[nodiscard]] float64 speedLookup(bool lastNonDefault) const;
 	void saveSpeed(float64 speed);
 
+	void saveQuality(int quality);
+
 	const not_null<Delegate*> _delegate;
 
 	bool _inFullScreen = false;

From 37dddda1a0d3e72730162eb4a99f49115a787bec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Oct 2024 18:14:16 +0400
Subject: [PATCH 104/306] Save preferred video quality to settings.

---
 Telegram/SourceFiles/core/core_settings.cpp   | 24 +++++++++++++++++--
 Telegram/SourceFiles/core/core_settings.h     |  4 ++++
 .../streaming/media_streaming_document.cpp    |  8 +++----
 .../streaming/media_streaming_player.cpp      |  4 +++-
 .../media/view/media_view_overlay_widget.cpp  |  3 +++
 .../view/media_view_playback_controls.cpp     |  3 ++-
 6 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index d3f090230..9e1046636 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -222,7 +222,7 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_customFontFamily)
 		+ sizeof(qint32) * 3
 		+ Serialize::bytearraySize(_tonsiteStorageToken)
-		+ sizeof(qint32) * 4;
+		+ sizeof(qint32) * 5;
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -380,7 +380,8 @@ QByteArray Settings::serialize() const {
 			<< qint32(_includeMutedCounterFolders ? 1 : 0)
 			<< qint32(_ivZoom.current())
 			<< qint32(_skipToastsInFocus ? 1 : 0)
-			<< qint32(_recordVideoMessages ? 1 : 0);
+			<< qint32(_recordVideoMessages ? 1 : 0)
+			<< qint32(_videoQuality);
 	}
 
 	Ensures(result.size() == size);
@@ -507,6 +508,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 ivZoom = _ivZoom.current();
 	qint32 skipToastsInFocus = _skipToastsInFocus ? 1 : 0;
 	qint32 recordVideoMessages = _recordVideoMessages ? 1 : 0;
+	qint32 videoQuality = _videoQuality;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -825,6 +827,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> recordVideoMessages;
 	}
+	if (!stream.atEnd()) {
+		stream >> videoQuality;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -1039,6 +1044,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_ivZoom = ivZoom;
 	_skipToastsInFocus = (skipToastsInFocus == 1);
 	_recordVideoMessages = (recordVideoMessages == 1);
+	_videoQuality = (videoQuality >= 0 && videoQuality <= 4320)
+		? videoQuality
+		: 0;
 }
 
 QString Settings::getSoundPath(const QString &key) const {
@@ -1429,6 +1437,7 @@ void Settings::resetOnLastLogout() {
 	_ttlVoiceClickTooltipHidden = false;
 	_ivZoom = 100;
 	_recordVideoMessages = false;
+	_videoQuality = 0;
 
 	_recentEmojiPreload.clear();
 	_recentEmoji.clear();
@@ -1572,6 +1581,7 @@ auto Settings::skipTranslationLanguagesValue() const
 void Settings::setRememberedDeleteMessageOnlyForYou(bool value) {
 	_rememberedDeleteMessageOnlyForYou = value;
 }
+
 bool Settings::rememberedDeleteMessageOnlyForYou() const {
 	return _rememberedDeleteMessageOnlyForYou;
 }
@@ -1579,9 +1589,11 @@ bool Settings::rememberedDeleteMessageOnlyForYou() const {
 int Settings::ivZoom() const {
 	return _ivZoom.current();
 }
+
 rpl::producer<int> Settings::ivZoomValue() const {
 	return _ivZoom.value();
 }
+
 void Settings::setIvZoom(int value) {
 #ifdef Q_OS_WIN
 	constexpr auto kMin = 25;
@@ -1593,4 +1605,12 @@ void Settings::setIvZoom(int value) {
 	_ivZoom = std::clamp(value, kMin, kMax);
 }
 
+int Settings::videoQuality() const {
+	return _videoQuality;
+}
+
+void Settings::setVideoQuality(int value) {
+	_videoQuality = value;
+}
+
 } // namespace Core
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index b1fce992b..30040ee25 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -929,6 +929,9 @@ public:
 	[[nodiscard]] rpl::producer<int> ivZoomValue() const;
 	void setIvZoom(int value);
 
+	[[nodiscard]] int videoQuality() const;
+	void setVideoQuality(int quality);
+
 	[[nodiscard]] static bool ThirdColumnByDefault();
 	[[nodiscard]] static float64 DefaultDialogsWidthRatio();
 
@@ -1066,6 +1069,7 @@ private:
 	std::optional<bool> _weatherInCelsius;
 	QByteArray _tonsiteStorageToken;
 	rpl::variable<int> _ivZoom = 100;
+	int _videoQuality = 0;
 
 	bool _tabbedReplacedWithInfo = false; // per-window
 	rpl::event_stream<bool> _tabbedReplacedWithInfoValue; // per-window
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
index 27c090443..9e7a083a2 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
@@ -192,11 +192,9 @@ void Document::waitingChange(bool waiting) {
 			_radial.start(
 				st::defaultInfiniteRadialAnimation.sineDuration);
 		}
-		_fading.start(
-			[=] { waitingCallback(); },
-			_waiting ? 0. : 1.,
-			_waiting ? 1. : 0.,
-			duration);
+		_fading.start([=] {
+			waitingCallback();
+		}, _waiting ? 0. : 1., _waiting ? 1. : 0., duration);
 	};
 	if (waiting) {
 		if (_radial.animating()) {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
index 699cbdf58..b4133b0da 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
@@ -958,7 +958,9 @@ Media::Player::TrackState Player::prepareLegacyState() const {
 		if (duration > 0) {
 			result.length = duration;
 		} else {
-			result.length = std::max(crl::time(result.position), crl::time(0));
+			result.length = std::max(
+				crl::time(result.position),
+				crl::time(0));
 		}
 	}
 	return result;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 580d5e120..435e4d8d1 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -489,6 +489,7 @@ OverlayWidget::OverlayWidget()
 , _widget(_surface->rpWidget())
 , _fullscreen(Core::App().settings().mediaViewPosition().maximized == 2)
 , _windowed(Core::App().settings().mediaViewPosition().maximized == 0)
+, _quality(Core::App().settings().videoQuality())
 , _layerBg(std::make_unique<Ui::LayerManager>(_body))
 , _docDownload(_body, tr::lng_media_download(tr::now), st::mediaviewFileLink)
 , _docSaveAs(_body, tr::lng_mediaview_save_as(tr::now), st::mediaviewFileLink)
@@ -4436,6 +4437,8 @@ void OverlayWidget::playbackControlsQualityChanged(int quality) {
 	const auto now = _chosenQuality;
 	if (_quality != quality) {
 		_quality = quality;
+		Core::App().settings().setVideoQuality(quality);
+		Core::App().saveSettingsDelayed();
 		if (_document) {
 			_chosenQuality = chooseQuality();
 			if (_chosenQuality != now) {
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index 16ca4b8c4..8ec6bd86c 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -34,7 +34,8 @@ PlaybackControls::PlaybackControls(
 , _playbackProgress(std::make_unique<PlaybackProgress>())
 , _volumeToggle(this, st::mediaviewVolumeToggle)
 , _volumeController(this, st::mediaviewPlayback)
-, _speedToggle(Media::Audio::SupportsSpeedControl()
+, _speedToggle((Media::Audio::SupportsSpeedControl()
+	|| !_delegate->playbackControlsQualities().empty())
 	? object_ptr<Player::SpeedButton>(this, st::mediaviewSpeedButton)
 	: nullptr)
 , _fullScreenToggle(this, st::mediaviewFullScreenButton)

From cf52f2a743d971ab49ff60940b4b51646a7a52d9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Oct 2024 18:15:06 +0400
Subject: [PATCH 105/306] Improve multi-line menu item items.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index cdbde2988..638be741b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit cdbde2988aea6a98fb8810d8f7d15b323aa64941
+Subproject commit 638be741bcfc0866522a4680dbfffc0485bd10b8

From 0991e7d8a4a0b94a9199a93a5aea9bf8c7ed1b08 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Oct 2024 21:01:44 +0400
Subject: [PATCH 106/306] Mirror recorded round message.

---
 Telegram/Resources/art/round_placeholder.jpg  | Bin 0 -> 787 bytes
 Telegram/Resources/qrc/telegram/telegram.qrc  |   1 +
 .../ui/controls/round_video_recorder.cpp      |  46 ++++++++++--------
 3 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 Telegram/Resources/art/round_placeholder.jpg

diff --git a/Telegram/Resources/art/round_placeholder.jpg b/Telegram/Resources/art/round_placeholder.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cbdc9aee39c6eceacebf68a0459a84a54118502e
GIT binary patch
literal 787
zcmex=<NpH&0WUXCHwH#VMurL?WcYuZp@o433|N7Hot=%Hor{x$gOiJ&iyH{}#rOpH
zfJjV4LRd&xLPS|cLPADaQ%ONd(@;mp(9YT}Fff;qQUm@UVi4qDaA0s?W)x&#5@ci+
zWc+`G!H9u@i5cWlIACRCVrF4rWM>3Pz(s)!W)?;!R)+t#7<ho<OajaTK(UN$xl_}2
z&9>!sDXq~`kxb$Jo_=aZ#w-c7&0o%iZad|6AV=|`oA{w0UiRT-GhJGq-`CnCa_{2Q
zu1r0*>Hfk!mp0C<*SL^WDjB(M(Uh0R7d%N5Sr+frvuxjt4Ec<uw;gJC><v`+d3n`X
zN8r1O+1rIP8^pJD@Lkk$;j)qQzB}Q%{ds<^<#Rq?=Ww4K4fKqn0MN}0Odt=z9L~tZ
zEXbnBDx_rSC@cbWI|opT(Vn4)KSt%l+~y5Mmue?>Ea=qH-^{IVzf-!z-(5&{(bbEm
z=NaARIPdk{>%xMddE(BGiXUB0J^M0jTQK{@*z}d5nM$|*>3kBcozwB8tL~gttiZvk
zk&F8l&kgr^7CtFO&g1coNy=HaUml&^qa7_gSH9b(Jt$?(NzqTmU)E3Gztp^1CQrIe
zuziicqE5HXoPR;O+a>?a`K$f(+ir`Rx#!LUJt8B>01RU!Z!j=0G6^yZDF_RI{lLTs
z^uwQ=k}{LazS3Il?umiRW(7-sTsF(hKL7CNrpXH)6eV7HrJ=?@<44ycErXyEHP4BT
zpS63Q^w<MUmlOm>I7*y@qFPW9Y&6hPdxq!2n$wNTO`VnoJy{kwt0>IZIL2DfOLdB}
z>9cE6UOS#ke(YHkuDj!+pK(H4@2!<OKTeA6`nvwwoOt0QUUrswxAv_I*O*dxe0|*7
H{QoxrVfy*0

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/qrc/telegram/telegram.qrc b/Telegram/Resources/qrc/telegram/telegram.qrc
index 09f8b0fac..7e035ba54 100644
--- a/Telegram/Resources/qrc/telegram/telegram.qrc
+++ b/Telegram/Resources/qrc/telegram/telegram.qrc
@@ -7,6 +7,7 @@
     <file alias="art/logo_256.png">../../art/logo_256.png</file>
     <file alias="art/logo_256_no_margin.png">../../art/logo_256_no_margin.png</file>
     <file alias="art/themeimage.jpg">../../art/themeimage.jpg</file>
+    <file alias="art/round_placeholder.jpg">../../art/round_placeholder.jpg</file>
     <file alias="day-blue.tdesktop-theme">../../day-blue.tdesktop-theme</file>
     <file alias="night.tdesktop-theme">../../night.tdesktop-theme</file>
     <file alias="night-green.tdesktop-theme">../../night-green.tdesktop-theme</file>
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index 0009f6214..f01df2165 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -143,6 +143,7 @@ private:
 	void updateMaxLevel(const Media::Capture::Chunk &chunk);
 	void updateResultDuration(int64 pts, AVRational timeBase);
 
+	void mirrorYUV420P(not_null<AVFrame*> frame);
 	void cutCircleFromYUV420P(not_null<AVFrame*> frame);
 
 	[[nodiscard]] RoundVideoResult appendToPrevious(RoundVideoResult video);
@@ -752,6 +753,7 @@ void RoundVideoRecorder::Private::encodeVideoFrame(
 		_videoFrame->data,
 		_videoFrame->linesize);
 
+	mirrorYUV420P(_videoFrame.get());
 	cutCircleFromYUV420P(_videoFrame.get());
 
 	_videoFrame->pts = mcstimestamp - _videoFirstTimestamp;
@@ -836,6 +838,21 @@ void RoundVideoRecorder::Private::initMinithumbsCanvas() {
 	_minithumbs = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
 }
 
+void RoundVideoRecorder::Private::mirrorYUV420P(not_null<AVFrame*> frame) {
+	for (auto p = 0; p < 3; ++p) {
+		const auto size = p ? (kSide / 2) : kSide;
+		const auto linesize = _videoFrame->linesize[p];
+		auto data = _videoFrame->data[p];
+		for (auto y = 0; y != size; ++y) {
+			auto left = data + y * linesize;
+			auto right = left + size - 1;
+			while (left < right) {
+				std::swap(*left++, *right--);
+			}
+		}
+	}
+}
+
 void RoundVideoRecorder::Private::cutCircleFromYUV420P(
 		not_null<AVFrame*> frame) {
 	const auto width = frame->width;
@@ -1104,26 +1121,14 @@ void RoundVideoRecorder::progressTo(float64 progress) {
 void RoundVideoRecorder::preparePlaceholder(const QImage &placeholder) {
 	const auto ratio = style::DevicePixelRatio();
 	const auto full = QSize(_side, _side) * ratio;
-	if (!placeholder.isNull()) {
-		_framePlaceholder = Images::Circle(
-			placeholder.scaled(
+	_framePlaceholder = Images::Circle(
+		(placeholder.isNull()
+			? QImage(u":/gui/art/round_placeholder.jpg"_q)
+			: placeholder).scaled(
 				full,
 				Qt::KeepAspectRatio,
 				Qt::SmoothTransformation));
-		_framePlaceholder.setDevicePixelRatio(ratio);
-	} else {
-		_framePlaceholder = QImage(
-			full,
-			QImage::Format_ARGB32_Premultiplied);
-		_framePlaceholder.fill(Qt::transparent);
-		_framePlaceholder.setDevicePixelRatio(ratio);
-
-		auto p = QPainter(&_framePlaceholder);
-		auto hq = PainterHighQualityEnabler(p);
-		p.setPen(Qt::NoPen);
-		p.setBrush(Qt::black);
-		p.drawEllipse(0, 0, _side, _side);
-	}
+	_framePlaceholder.setDevicePixelRatio(ratio);
 }
 
 void RoundVideoRecorder::prepareFrame(bool blurred) {
@@ -1159,14 +1164,15 @@ void RoundVideoRecorder::prepareFrame(bool blurred) {
 				QSize(kBlurredSize, kBlurredSize),
 				Qt::KeepAspectRatio,
 				Qt::FastTransformation),
-			kRadius);
+			kRadius).mirrored(true, false);
 		preparePlaceholder(image);
 		_placeholderUpdates.fire(std::move(image));
 	} else {
-		_framePrepared = Images::Circle(copy.scaled(
+		auto scaled = copy.scaled(
 			QSize(_side, _side) * ratio,
 			Qt::KeepAspectRatio,
-			Qt::SmoothTransformation));
+			Qt::SmoothTransformation).mirrored(true, false);
+		_framePrepared = Images::Circle(std::move(scaled));
 		_framePrepared.setDevicePixelRatio(ratio);
 	}
 }

From c2afef2bde664c88768a76e97ad5a817bd608c3d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Oct 2024 21:03:03 +0400
Subject: [PATCH 107/306] Improve changing of video playback quality.

---
 .../media/view/media_view_overlay_widget.cpp    | 17 +++++++++++++++--
 .../media/view/media_view_overlay_widget.h      |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 435e4d8d1..bb16d1e3e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2285,6 +2285,8 @@ void OverlayWidget::assignMediaPointer(DocumentData *document) {
 	_photo = nullptr;
 	_photoMedia = nullptr;
 	if (_document != document) {
+		_streamedQualityChangeFrame = QImage();
+		_streamedQualityChangeFinished = false;
 		if ((_document = document)) {
 			_chosenQuality = chooseQuality();
 			_documentMedia = _document->createMediaView();
@@ -2301,6 +2303,8 @@ void OverlayWidget::assignMediaPointer(DocumentData *document) {
 void OverlayWidget::assignMediaPointer(not_null<PhotoData*> photo) {
 	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
 	_chosenQuality = nullptr;
+	_streamedQualityChangeFrame = QImage();
+	_streamedQualityChangeFinished = false;
 	_document = nullptr;
 	_documentMedia = nullptr;
 	_documentLoadingTo = QString();
@@ -4279,7 +4283,9 @@ void OverlayWidget::playbackPauseResume() {
 			redisplayContent();
 		}
 	} else if (_streamed->instance.player().finished()
-		|| !_streamed->instance.player().active()) {
+		|| !_streamed->instance.player().active()
+		|| _streamedQualityChangeFinished) {
+		_streamedQualityChangeFinished = false;
 		_streamingStartPaused = false;
 		restartAtSeekPosition(0);
 	} else if (_streamed->instance.player().paused()) {
@@ -4348,6 +4354,7 @@ void OverlayWidget::restartAtSeekPosition(crl::time position) {
 		_streamed->instance.pause();
 	} else {
 		playbackPauseMusic();
+		_streamedQualityChangeFinished = false;
 	}
 	_streamed->pausedBySeek = false;
 
@@ -4445,8 +4452,14 @@ void OverlayWidget::playbackControlsQualityChanged(int quality) {
 				if (_streamed && _streamed->instance.ready()) {
 					_streamedQualityChangeFrame = currentVideoFrameImage();
 				}
+				if (_streamed
+					&& (!_streamed->instance.player().active()
+						|| _streamed->instance.player().finished())) {
+					_streamedQualityChangeFinished = true;
+				}
+				_streamingStartPaused = _streamedQualityChangeFinished
+					|| (_streamed && _streamed->instance.player().paused());
 				clearStreaming();
-				_streamingStartPaused = false;
 				const auto time = _streamedPosition;
 				const auto startStreaming = StartStreaming(false, time);
 				if (!canInitStreaming() || !initStreaming(startStreaming)) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 8396ddd4d..c14124ffc 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -634,6 +634,7 @@ private:
 	QImage _streamedQualityChangeFrame;
 	crl::time _streamedPosition = 0;
 	int _streamedCreated = 0;
+	bool _streamedQualityChangeFinished = false;
 	bool _showAsPip = false;
 
 	std::unique_ptr<Stories::View> _stories;

From 6ed25d012fca40c50c3d16bfe5aa1bf17e928adf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 26 Oct 2024 12:03:44 +0400
Subject: [PATCH 108/306] Use new settings icon in the player.

---
 .../icons/player/player_settings.png          | Bin 0 -> 997 bytes
 .../icons/player/player_settings@2x.png       | Bin 0 -> 1658 bytes
 .../icons/player/player_settings@3x.png       | Bin 0 -> 2211 bytes
 .../media/player/media_player_button.cpp      |  84 +++++++++++++++++-
 .../media/player/media_player_button.h        |  27 +++++-
 .../media/player/media_player_dropdown.cpp    |  36 +++++---
 .../media/player/media_player_dropdown.h      |   8 +-
 .../media/player/media_player_widget.cpp      |   7 ++
 .../SourceFiles/media/view/media_view.style   |   2 +-
 .../view/media_view_playback_controls.cpp     |  10 ++-
 .../media/view/media_view_playback_controls.h |   4 +-
 11 files changed, 157 insertions(+), 21 deletions(-)
 create mode 100644 Telegram/Resources/icons/player/player_settings.png
 create mode 100644 Telegram/Resources/icons/player/player_settings@2x.png
 create mode 100644 Telegram/Resources/icons/player/player_settings@3x.png

diff --git a/Telegram/Resources/icons/player/player_settings.png b/Telegram/Resources/icons/player/player_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..65a420de07ae2242344fa7ebd2f07f08268a96dd
GIT binary patch
literal 997
zcmV<B0~-8^P)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq0004XX+uL$YePpv
zZ)|UJQ*dEpWkhLnaBN|DP%{7kD3NuLy-UMT6va=gQqVex4jmjai9^)V3U+a5D-=aA
zR0XS3ntlmwd?YDSaT8Z5_#aroS#Yq3RB&-{5JU$N-JCipxM+CZmsHv!-pA$rIGl62
zT)-Pp87uYzDCw4wOvI$M)Vkz*gNL3|s%EmNqAUvj{k!Y)(e>U>h*?d$b`aT5T$j!+
zmv){4Q-A$k)t||l8vWnYL5&#};E{=yZHo!sB_1(oDdMW&yvxUe(=MMoo|R;r_?B4G
z3TlS9Ni3&3^n3@Gie;^}gV^4m)mN9r9O_ZbVG|}8icnF31O?%L{L_v<jxBOmU{EfP
z0xZfzNf8sW#PiUhVG=TN2tn$QxO3}%53T#jZEf!rm~C**FWTBd12~<blhxbWcmx<4
z0B-6`HB?9Hq4wr-!21a>m;#3HD6?Va!XbBie+=k*;rwF^@ErnnmGiG7&g~k7pMfj=
z2Nx-7yi*22%K!iX1Y=1<Pz((K0d521?*IS*IAvH#W=%~1DgXcg2mk?xX#fNO00031
z000^Q000000-yo_1ONa40RR917@z|H1ONa40RR917ytkO0KxrNmjD0(*GWV{R5%gM
zls}IFQ53~lL`1X_+aZYmr9?rkRUi=wirsIZpwo$v_%uF+f`aHIqM;!np<ws7X6Mbb
zSu?xY&1PRS=bm%!o4I%HdnVI=TW0+avREu`w;RuTy*{7M`sTZ8KA+$1b}!ep-EIl*
zTJ?p^X47uBAFm5QsPDf~{eFMBTn>lBtyYUq2?PR)3?OVY8lg}K1GbyA4?#AYJ)KU=
z<&vDmVo@v>Wkab{TCG+{7_enB8Clh^&1Rd==iP1>Dv?Oo?RHI5k;CCgCX+<iFq5Jx
z(z9N#^FpW7DRCyR*ZXu`0GY>znG``j2o#IO#^dqfa1czbR-4Uc&({U0R;xn7HknMK
z(WqcFkWQzmd@vZeTrOCj&v!f?>5Jk35JD<pr_;eqik2@Ug#CV>%jF;`XfzthDj}r8
zFjkdHMOL-a1Zy@Mj5|&y{&Km9lpFA^()eq4OY8Uh!{Jcgn`YA&Dq;cTW@E$L>-A*+
zJO1?d)7>xrer-p2AXBN7$K%m7715eVBtoP&kjUbQ&`2hw*=$;^R&|p%bvm6I9}y)%
zIke1ip-><v7z`>rH4@U4csy==XvNDF@S|%)-b=pNxZ(6KHiOywovT*<y1&D(B+3<X
T%n`5c00000NkvXXu0mjfl3uq*

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/player/player_settings@2x.png b/Telegram/Resources/icons/player/player_settings@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..af78b2666143062feee931c1443c96f1f3e87cd3
GIT binary patch
literal 1658
zcmV-=28H>FP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ0004XX+uL$YePpv
zZ)|UJQ*dEpWkhLnaBN|DP%{7kD3NuLy-UMT6va=gQqVex4jmjai9^)V3U+a5D-=aA
zR0XS3ntlmwd?YDSaT8Z5_#aroS#Yq3RB&-{5JU$N-JCipxM+CZmsHv!-pA$rIGl62
zT)-Pp87uYzDCw4wOvI$M)Vkz*gNL3|s%EmNqAUvj{k!Y)(e>U>h*?d$b`aT5T$j!+
zmv){4Q-A$k)t||l8vWnYL5&#};E{=yZHo!sB_1(oDdMW&yvxUe(=MMoo|R;r_?B4G
z3TlS9Ni3&3^n3@Gie;^}gV^4m)mN9r9O_ZbVG|}8icnF31O?%L{L_v<jxBOmU{EfP
z0xZfzNf8sW#PiUhVG=TN2tn$QxO3}%53T#jZEf!rm~C**FWTBd12~<blhxbWcmx<4
z0B-6`HB?9Hq4wr-!21a>m;#3HD6?Va!XbBie+=k*;rwF^@ErnnmGiG7&g~k7pMfj=
z2Nx-7yi*22%K!iX1Y=1<Pz((K0d521?*IS*IAvH#W=%~1DgXcg2mk?xX#fNO00031
z000^Q000000-yo_1ONa40RR91FrWhf1ONa40RR91FaQ7m0Qmn-HUIzwY)M2xR9Fe^
zm`f;bT^Pp?4g+$JDdjS7O&<~^*HW0u$bg9=B}!uOF=SxkmboDlcQR25DffveAqvSQ
zm)y?x`#hh0_PcNIw$D-ejx~7SwVvny|F5;5wf0)i+TXr?m9Gf=&m!RQi_hcl?;jl<
z?dj=>&dbZo&d$#D_4O}mI;6+P$Is8tGl(CmLK7n{hoX*Yv9Yl?H#e%0xKwcga4hbG
zI5|1V5U#GSs;jG0Q&azXEmUY?#5FN7;Y8ON$IHu0!qe2$q*uVmfB*o~d)-?8U5xK7
zd3kxhzP_-wwzl+KF#^cR$<ce=TE1H&f`Wo-YilzyGQ7RLnWnk9xrT;@^73+FJwHF|
z>5q?(Vw|3y9vB$t?d>fnC@3l_!oIMu(B0jAadDw%*|J1NMjjs@yDZnY#_8#4Wo4y@
zhw-jaQBiSrcJ_vK`9~00Tit6wK0ZDKAF-#Wr;(A7@$qruLG%9pzN4dq$Z7DJW>{EQ
ze}6wwfdUaaB1qBP+}uQ5gLmI-Y;1%~;c*3>oSfX**%=WL;hy}4h>3~m>gs|h2Bbt2
z@i&OQ|M2ke%gam1v$M1I7<N$zB8xa(*yVuh>FI$+gcA}H-a)egO-xLbiK7b}@K*>g
z)cN^21M2JRv*vJ+wY9aauC8)^QC3z~XkxTxA&WR&(2+IrKQ9vxfnvRpup8~|?Fmx-
zixHPaPr13dg6CAWfc<oZhK35Erl#hn)wM>Ka;);p8}#>Up`sWq#)PcshlGT<s+zah
z)8O3Q-LWg`PXH!GVsm(Sn4O)imZ6CeE&%=9A%!5a0O&$ZbW>;Pot&J=b8KvEaB8Xv
z?d|Qj2!>`fg25<p0;XnB9~~VPO~mO!<8{-Fii#q$5kA|G8ojo*hJ9>oOl?%xaRC6P
zHd5c--p0PZzK*!Yr8G?s*WKOStgI|{RiK*Si`?SkqN1Xyh)dtApPwJd;o)J#H58?3
zIv_#F@u^=%c+Czn3zwW24-XGY_xg(IfMm*K*C)AAGv)cx)6>;PbzNNgFtD6~m6et0
zgQun&)RU5u)QdVTElmw_yr^epW@J&mdr^O`*WS*?n4h1o?17FqMmkal-n9PFM+Ya8
zOdK7V4npm4e7JJTe#qg<;65(>AfI`6`oVxcU4q7#3{%*lp`og(D#LwJJ?Tn4Ffg#W
zxtUEwEY4F{_-08y>yhNYu&_|+)v&_n2ht3=doV}8A<3s3{WVCYU*3_y!NK6*V8hX*
zq@*k@EeTBXdvtW<@ERmNaouTcZ6$4(nwqMwujg{Z#=pP6FWnRu7wZR<nVG4Kn|y&=
zB1GtjAm#S{q!)B=;Sps(B_$<#bZKd+c<buwEDm5jQ7op1s~G|N!NI}p?JX6<??7>J
zakv1;-eI9*=yG$nH{_6$aLMPo-qO;-4QqLMnUH`a9^{r7sRNMI#Zck*8$aC#D;|+O
z_ai>(8GpX8AJTw;0J1IRqbErjU(oE+zmQ)M_yZ#F4`g8<j>Q}R-T(jq07*qoM6N<$
Ef_^L@6aWAK

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/player/player_settings@3x.png b/Telegram/Resources/icons/player/player_settings@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..da1ec8c72c34b0a7d175967e5aab4d10dea1351b
GIT binary patch
literal 2211
zcmV;U2weAxP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<0004XX+uL$YePpv
zZ)|UJQ*dEpWkhLnaBN|DP%{7kD3NuLy-UMT6va=gQqVex4jmjai9^)V3U+a5D-=aA
zR0XS3ntlmwd?YDSaT8Z5_#aroS#Yq3RB&-{5JU$N-JCipxM+CZmsHv!-pA$rIGl62
zT)-Pp87uYzDCw4wOvI$M)Vkz*gNL3|s%EmNqAUvj{k!Y)(e>U>h*?d$b`aT5T$j!+
zmv){4Q-A$k)t||l8vWnYL5&#};E{=yZHo!sB_1(oDdMW&yvxUe(=MMoo|R;r_?B4G
z3TlS9Ni3&3^n3@Gie;^}gV^4m)mN9r9O_ZbVG|}8icnF31O?%L{L_v<jxBOmU{EfP
z0xZfzNf8sW#PiUhVG=TN2tn$QxO3}%53T#jZEf!rm~C**FWTBd12~<blhxbWcmx<4
z0B-6`HB?9Hq4wr-!21a>m;#3HD6?Va!XbBie+=k*;rwF^@ErnnmGiG7&g~k7pMfj=
z2Nx-7yi*22%K!iX1Y=1<Pz((K0d521?*IS*IAvH#W=%~1DgXcg2mk?xX#fNO00031
z000^Q000000-yo_1ONa40RR91NT34%1ONa40RR91NB{r;0JHgI)c^nnl}SWFRA>e5
zT1iNidlc_EkctY4qKP1AJ}AtfB1;e)77mLx>dH`5#7#68w6v{=ZX^dpL_u(4>Ove5
zE!1#C6Ga8ZaKs65NX_?ty#M38(>H(Dd+Xlb{Z{8Y=XZwxeE!3wOU}<(1I`+7)_}7H
zoHgLMHSmW`L-+9TxOwwtKtO<tiwikAKR@5x+?<@8JU%`qro#}Po}R_U#Rmrmf2n*B
z0RWi86bXS|zkYpoc2=cCKd=D<*fGlH?(RN5KK?`anm+(T#p-2qv%1B%Z{Oa!bxWAt
z-rg=PEyZv;J3AvsZf<TEc+Z|a^Yilq6JV&kd-sk2c1kQSFN+r1-`@`p4_Av4A^-#u
zDrzu$;rsjhQ@<-OFV_wW00Ki%8*Enk-z;oaQxSjl>Q&;;&CL<5NN@mGR0Nx4T3E1<
zkdUaTsNmpW@`sfwCnu+~vy(Vz4WbnZ4rp(0PfJVVFc^mmIO0rO(HQsH+1Y$5N3B13
z@+3Jqd31D?`jsFaKYpwoM?pb>M5U{%>%oHuFbK0Gnwgo&%F2RkZEKcGy}Y~z1_sEV
z2C=)li&F7yL(OY`e*VtRj)o}`!8HO<vtv2m)z!77rG?z65lEM6YH9)l1C4tM3JPj$
zY*aJI`3L}E7`JQ)`TF&1@_`($va%8jQGI>=w{PEw-`(AP`}S=^=47CRgoMwZKa(k#
zt*fhp3pj#1;v)>1>IE2RfxW#wVg2OfBtAZ#jA1$Y@ZkdnSW;3FF)b!Ae|-7!rMbEJ
z+O=zB1n%Hect;qfx&s+eCaSBesm_Xuij+aN<iaThfMBfS>du`z7&*f3+S;10udj9N
zny~_>a4ll^{{1^bGNY}6{rK@C)mCn9t_sTLY`CT{5R$GxosA~OG^PY$Wn^UJ-o1Nh
zJzb*`z>OO>km-umd}U>2Vq#)?dRl_f{l(&e*@fCFF)^{Hr$<*y6~NQExVSh~oRZ-3
z<;yQ$zT`_SRXLat0idL(%0mET;r;vfsyHKp{{DVp>+9FAM(~8WfB*jC;v&VNNB{sB
zsTd&;hA`FF*Qbrw$rUMk;2SD!i;!kyWc2p-hK7b}BLM&mU~L$eQWz8%mztpYL?0U)
zYeW-`z?an1)6<HIiqzE9KmYkaV9f=S+7Mua?S=qI>!Oo>baXV?+S=Meva4M-97`=N
zEs+XV+q-w~%2mLGh+t5Gq8!FKaE$;+1%Yv?C3Hte2blwbge@W>Le0>tSFZ>>H8rIX
zE<^wj7>a5(k%b@^AtVUwan!&j_}BuDjg4`;NaWtUd824zVPQca(b;HfRz!jc0QE^I
zs=-=YTe)`xW3^qWkB^TewMTL&k0UZNk|NMO7ZB=vIf1&|CO9-R!#Kh~Fp4nCnGYX6
zTwh-op<^ME8_LYgq=M;=MxhQEsX$$B6CCO<$Pg3(icFp9p6j5thK7a&$J^VRiv-P2
z3g+kM<p4Q{!?-#}k}st8oUcurC>RW3NC<O^8+FvZwli(1nmWxuSQxY|aH)xcp)1D3
z#0cfX!$WRG(5tJf#N-<)V#)~)<LVrFbaW(st-rC5Paar>xNkw*X!1bPOykg+lZWDT
zk3(sB!N9S_bdR)<3I@Vz)4hCw=KV)fJbpA{*9-J-n^M^#2}Vv#2?x5?uStSGeflK&
zH}+1FUZ?Skod{3x`3RBFfSKC1&>jzgX#}7zqJe8~8%^X{`q673umh($cC4d;|Lb86
z8q-dW-}3VEsP7m#e$(iN|BA3{`aKU!Q9eHDD;{y%`g+bLN8Biw?xh4eNn2YRJr>aK
z1}ccKu&{=PhNh+_ek*UoO9_O*b0sW3iq}Z!vAFxOto5#3xl&S6LYGoM=^6<IGkEcb
zro$tLr%#`nx}kgY=+VZ;2F(p>1X6obW>va{jE$Sp!NEaAuh^bR_`}1)I7gJ(kTP)K
zg?nd-uHvt)u4+X@*f`^!TYkBYw_dn(r>83-vggmAOUv=&e@aRUHj%s-c**nP#fzVP
zxz3}KKZk%6hZALGWfUkv<SKF+00M)kt*zzHSbpkr2zhW44!R%3iu)9aRPxJDSJTte
zCDIH2nmF??;t73;U>XO;0>d|~xSb$HJ0)nO{n|%j)_?9&RaI43ScqE3ki#9M#<M;;
zFocSowh|A^P99?NkgP`ko=;~*_5AY3&N>^-3pOH(hgY&#o%qcvQc4GYo_@g^ajH9O
lz*z&%8gSNtvjz;+z~4q->i4;Fql^Fm002ovPDHLkV1i9A15f|}

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp
index 0e9ab424a..a42929211 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_button.cpp
@@ -307,7 +307,7 @@ SpeedButton::SpeedButton(QWidget *parent, const style::MediaSpeedButton &st)
 	resize(_st.size);
 }
 
-void SpeedButton::setSpeed(float64 speed, anim::type animated) {
+void SpeedButton::setSpeed(float64 speed) {
 	_isDefault = EqualSpeeds(speed, 1.);
 	_layout.setSpeed(speed);
 	update();
@@ -337,4 +337,86 @@ QImage SpeedButton::prepareRippleMask() const {
 		_st.rippleRadius);
 }
 
+SettingsButton::SettingsButton(
+	QWidget *parent,
+	const style::MediaSpeedButton &st)
+: RippleButton(parent, st.ripple)
+, _st(st)
+, _isDefaultSpeed(true) {
+	resize(_st.size);
+}
+
+void SettingsButton::setSpeed(float64 speed) {
+	_isDefaultSpeed = EqualSpeeds(speed, 1.);
+	update();
+}
+
+void SettingsButton::setQuality(int quality) {
+	update();
+}
+
+void SettingsButton::setActive(bool active) {
+	if (_active == active) {
+		return;
+	}
+	_active = active;
+	_activeAnimation.start([=] {
+		update();
+	}, active ? 0. : 1., active ? 1. : 0., crl::time(150));
+}
+
+void SettingsButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	paintRipple(
+		p,
+		QPoint(_st.padding.left(), _st.padding.top()),
+		_isDefaultSpeed ? nullptr : &_st.rippleActiveColor->c);
+
+	//const auto active = !_isDefaultSpeed;
+	const auto inner = QRect(
+		QPoint(),
+		_st.size
+	).marginsRemoved(_st.padding);
+
+	auto hq = std::optional<PainterHighQualityEnabler>();
+	const auto active = _activeAnimation.value(_active ? 1. : 0.);
+	if (active > 0.) {
+		const auto shift = QRectF(inner).center();
+		p.save();
+		p.translate(shift);
+		p.rotate(active * 60.);
+		p.translate(-shift);
+		hq.emplace(p);
+	}
+	_st.icon.paintInCenter(p, inner);
+	if (active > 0.) {
+		p.restore();
+		hq.reset();
+	}
+
+	//p.setPen(color);
+	//p.setFont(_st.font);
+
+	//p.drawText(
+	//	QPointF(inner.topLeft()) + QPointF(
+	//		(inner.width() - _textWidth) / 2.,
+	//		(inner.height() - _adjustedHeight) / 2. + _adjustedAscent),
+	//	_text);
+}
+
+QPoint SettingsButton::prepareRippleStartPosition() const {
+	const auto inner = rect().marginsRemoved(_st.padding);
+	const auto result = mapFromGlobal(QCursor::pos()) - inner.topLeft();
+	return inner.contains(result)
+		? result
+		: DisabledRippleStartPosition();
+}
+
+QImage SettingsButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::RoundRectMask(
+		rect().marginsRemoved(_st.padding).size(),
+		_st.rippleRadius);
+}
+
 } // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/player/media_player_button.h b/Telegram/SourceFiles/media/player/media_player_button.h
index 750b533eb..8709c0cdd 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.h
+++ b/Telegram/SourceFiles/media/player/media_player_button.h
@@ -87,7 +87,7 @@ public:
 		return _st;
 	}
 
-	void setSpeed(float64 speed, anim::type animated = anim::type::normal);
+	void setSpeed(float64 speed);
 
 private:
 	void paintEvent(QPaintEvent *e) override;
@@ -101,4 +101,29 @@ private:
 
 };
 
+class SettingsButton final : public Ui::RippleButton {
+public:
+	SettingsButton(QWidget *parent, const style::MediaSpeedButton &st);
+
+	[[nodiscard]] const style::MediaSpeedButton &st() const {
+		return _st;
+	}
+
+	void setSpeed(float64 speed);
+	void setQuality(int quality);
+	void setActive(bool active);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	QPoint prepareRippleStartPosition() const override;
+	QImage prepareRippleMask() const override;
+
+	const style::MediaSpeedButton &_st;
+	Ui::Animations::Simple _activeAnimation;
+	bool _isDefaultSpeed = false;
+	bool _active = false;
+
+};
+
 } // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
index 843ce1553..45e4e2c04 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
@@ -558,6 +558,10 @@ void WithDropdownController::updateDropdownGeometry() {
 	_menu->move(position);
 }
 
+rpl::producer<bool> WithDropdownController::menuToggledValue() const {
+	return _menuToggled.value();
+}
+
 void WithDropdownController::hideTemporarily() {
 	if (_menu && !_menu->isHidden()) {
 		_temporarilyHidden = true;
@@ -590,10 +594,20 @@ void WithDropdownController::showMenu() {
 		}
 	}, _menu->lifetime());
 	_menu->setHiddenCallback([=]{
+		if (_menu.get() == raw) {
+			_menuToggled = false;
+		}
 		Ui::PostponeCall(raw, [this] {
 			_menu = nullptr;
+			_menuToggled = false;
 		});
 	});
+	_menu->setShowStartCallback([=] {
+		_menuToggled = true;
+	});
+	_menu->setHideStartCallback([=] {
+		_menuToggled = false;
+	});
 	_button->installEventFilter(raw);
 	fillMenu(raw);
 	updateDropdownGeometry();
@@ -608,6 +622,7 @@ void WithDropdownController::showMenu() {
 		Unexpected("Menu align value.");
 	}();
 	_menu->showAnimated(origin);
+	_menuToggled = true;
 }
 
 OrderController::OrderController(
@@ -695,7 +710,8 @@ void OrderController::updateIcon() {
 }
 
 SpeedController::SpeedController(
-	not_null<SpeedButton*> button,
+	not_null<Ui::AbstractButton*> button,
+	const style::MediaSpeedButton &st,
 	not_null<QWidget*> menuParent,
 	Fn<void(bool)> menuOverCallback,
 	Fn<float64(bool lastNonDefault)> value,
@@ -706,10 +722,10 @@ SpeedController::SpeedController(
 : WithDropdownController(
 	button,
 	menuParent,
-	button->st().menu.dropdown,
-	button->st().menuAlign,
+	st.menu.dropdown,
+	st.menuAlign,
 	std::move(menuOverCallback))
-, _st(button->st())
+, _st(st)
 , _lookup(std::move(value))
 , _change(std::move(change))
 , _qualities(std::move(qualities))
@@ -727,20 +743,16 @@ SpeedController::SpeedController(
 
 	setSpeed(_lookup(false));
 	_speed = _lookup(true);
-
-	button->setSpeed(_speed, anim::type::instant);
-
-	_speedChanged.events_starting_with(
-		speed()
-	) | rpl::start_with_next([=](float64 speed) {
-		button->setSpeed(speed);
-	}, button->lifetime());
 }
 
 rpl::producer<> SpeedController::saved() const {
 	return _saved.events();
 }
 
+rpl::producer<float64> SpeedController::realtimeValue() const {
+	return _speedChanged.events_starting_with(speed());
+}
+
 float64 SpeedController::speed() const {
 	return _isDefault ? 1. : _speed;
 }
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.h b/Telegram/SourceFiles/media/player/media_player_dropdown.h
index 7fcdc1f29..7975677ff 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.h
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.h
@@ -30,8 +30,6 @@ class Menu;
 
 namespace Media::Player {
 
-class SpeedButton;
-
 class Dropdown final : public Ui::RpWidget {
 public:
 	explicit Dropdown(QWidget *parent);
@@ -82,6 +80,7 @@ public:
 	Ui::DropdownMenu *menu() const;
 
 	void updateDropdownGeometry();
+	[[nodiscard]] rpl::producer<bool> menuToggledValue() const;
 
 	void hideTemporarily();
 	void showBack();
@@ -98,6 +97,7 @@ private:
 	const Qt::Alignment _menuAlign = Qt::AlignTop | Qt::AlignRight;
 	const Fn<void(bool)> _menuOverCallback;
 	base::unique_qptr<Ui::DropdownMenu> _menu;
+	rpl::variable<bool> _menuToggled;
 	bool _temporarilyHidden = false;
 	bool _overButton = false;
 
@@ -125,7 +125,8 @@ private:
 class SpeedController final : public WithDropdownController {
 public:
 	SpeedController(
-		not_null<SpeedButton*> button,
+		not_null<Ui::AbstractButton*> button,
+		const style::MediaSpeedButton &st,
 		not_null<QWidget*> menuParent,
 		Fn<void(bool)> menuOverCallback,
 		Fn<float64(bool lastNonDefault)> value,
@@ -135,6 +136,7 @@ public:
 		Fn<void(int)> changeQuality = nullptr);
 
 	[[nodiscard]] rpl::producer<> saved() const;
+	[[nodiscard]] rpl::producer<float64> realtimeValue() const;
 
 private:
 	void fillMenu(not_null<Ui::DropdownMenu*> menu) override;
diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp
index a74be5945..6425b7951 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp
@@ -73,10 +73,17 @@ Widget::Widget(
 , _speedController(
 	std::make_unique<SpeedController>(
 		_speedToggle.data(),
+		_speedToggle->st(),
 		dropdownsParent,
 		[=](bool over) { markOver(over); },
 		[=](bool lastNonDefault) { return speedLookup(lastNonDefault); },
 		[=](float64 speed) { saveSpeed(speed); })) {
+	_speedController->realtimeValue(
+	) | rpl::start_with_next([=](float64 speed) {
+		_speedToggle->setSpeed(speed);
+	}, _speedToggle->lifetime());
+	_speedToggle->finishAnimating();
+
 	setAttribute(Qt::WA_OpaquePaintEvent);
 	setMouseTracking(true);
 	resize(width(), st::mediaPlayerHeight + st::lineWidth);
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 3c3ae5fbf..55efb6fcc 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -354,7 +354,7 @@ mediaviewSpeedButton: MediaSpeedButton(mediaPlayerSpeedButton) {
 	fg: mediaviewPlaybackIconFg;
 	overFg: mediaviewPlaybackIconFgOver;
 	activeFg: mediaviewTextLinkFg;
-	icon: icon{{ "player/player_speed", mediaviewPlaybackIconFg }};
+	icon: icon{{ "player/player_settings", mediaviewPlaybackIconFg }};
 	ripple: RippleAnimation(defaultRippleAnimation) {
 		color: mediaviewPlaybackIconRipple;
 	}
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index 8ec6bd86c..ac46c78db 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -36,7 +36,7 @@ PlaybackControls::PlaybackControls(
 , _volumeController(this, st::mediaviewPlayback)
 , _speedToggle((Media::Audio::SupportsSpeedControl()
 	|| !_delegate->playbackControlsQualities().empty())
-	? object_ptr<Player::SpeedButton>(this, st::mediaviewSpeedButton)
+	? object_ptr<Player::SettingsButton>(this, st::mediaviewSpeedButton)
 	: nullptr)
 , _fullScreenToggle(this, st::mediaviewFullScreenButton)
 , _pictureInPicture(this, st::mediaviewPipButton)
@@ -45,6 +45,7 @@ PlaybackControls::PlaybackControls(
 , _speedController(_speedToggle
 	? std::make_unique<Player::SpeedController>(
 		_speedToggle.data(),
+		_speedToggle->st(),
 		parent,
 		[=](bool) {},
 		[=](bool lastNonDefault) { return speedLookup(lastNonDefault); },
@@ -62,6 +63,11 @@ PlaybackControls::PlaybackControls(
 		fadeUpdated(opacity);
 	});
 
+	_speedController->menuToggledValue(
+	) | rpl::start_with_next([=](bool toggled) {
+		_speedToggle->setActive(toggled);
+	}, _speedToggle->lifetime());
+
 	_pictureInPicture->addClickHandler([=] {
 		_delegate->playbackControlsToPictureInPicture();
 	});
@@ -193,10 +199,12 @@ float64 PlaybackControls::speedLookup(bool lastNonDefault) const {
 }
 
 void PlaybackControls::saveSpeed(float64 speed) {
+	_speedToggle->setSpeed(speed);
 	_delegate->playbackControlsSpeedChanged(speed);
 }
 
 void PlaybackControls::saveQuality(int quality) {
+	_speedToggle->setQuality(quality);
 	_delegate->playbackControlsQualityChanged(quality);
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.h b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
index 0970808c8..5357fb2fe 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.h
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
@@ -21,7 +21,7 @@ class PopupMenu;
 namespace Media {
 namespace Player {
 struct TrackState;
-class SpeedButton;
+class SettingsButton;
 class SpeedController;
 } // namespace Player
 
@@ -114,7 +114,7 @@ private:
 	std::unique_ptr<PlaybackProgress> _receivedTillProgress;
 	object_ptr<Ui::IconButton> _volumeToggle;
 	object_ptr<Ui::MediaSlider> _volumeController;
-	object_ptr<Player::SpeedButton> _speedToggle;
+	object_ptr<Player::SettingsButton> _speedToggle;
 	object_ptr<Ui::IconButton> _fullScreenToggle;
 	object_ptr<Ui::IconButton> _pictureInPicture;
 	object_ptr<Ui::LabelSimple> _playedAlready;

From 2567096de02ca9b15cc5ea8a3cdc5da69c52ef84 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Oct 2024 09:18:04 +0400
Subject: [PATCH 109/306] Send correct action on round recording.

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

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index de06fb53e..f21d35ab9 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
@@ -1885,7 +1885,10 @@ void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 	}
 	Core::App().updateNonIdle();
 	update(_durationRect);
-	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice });
+	const auto type = _recordingVideo
+		? Api::SendProgressType::RecordRound
+		: Api::SendProgressType::RecordVoice;
+	_sendActionUpdates.fire({ type });
 }
 
 void VoiceRecordBar::stop(bool send) {
@@ -1917,7 +1920,10 @@ void VoiceRecordBar::finish() {
 
 	[[maybe_unused]] const auto s = takeTTLState();
 
-	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
+	const auto type = _recordingVideo
+		? Api::SendProgressType::RecordRound
+		: Api::SendProgressType::RecordVoice;
+	_sendActionUpdates.fire({ type, -1 });
 
 	_data = {};
 }

From 93605db690dc3dc42307b569a35c083ef380e30d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Oct 2024 09:22:57 +0400
Subject: [PATCH 110/306] Use custom toast for video-not-available state.

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

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f72f4cbd3..b3b8e83a7 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3267,6 +3267,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_record_listen_cancel_sure" = "Do you want to discard your recorded voice message?";
 "lng_record_listen_cancel_sure_round" = "Do you want to discard your recorded video message?";
 "lng_record_lock_discard" = "Discard";
+"lng_record_hold_tip" = "Please hold the mouse button pressed to record a voice message.";
 "lng_record_voice_tip" = "Hold to record audio. Click to switch to video.";
 "lng_record_video_tip" = "Hold to record video. Click to switch to audio.";
 "lng_record_audio_problem" = "Could not start audio recording. Please check your microphone.";
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2a9ced8b2..440860a75 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1092,7 +1092,9 @@ void HistoryWidget::initVoiceRecordBar() {
 		updateSendButtonType();
 		switch (_send->type()) {
 		case Ui::SendButton::Type::Record:
-			controller()->showToast(tr::lng_record_voice_tip(tr::now));
+			controller()->showToast(_canRecordVideoMessage
+				? tr::lng_record_voice_tip(tr::now)
+				: tr::lng_record_hold_tip(tr::now));
 			break;
 		case Ui::SendButton::Type::Round:
 			controller()->showToast(tr::lng_record_video_tip(tr::now));
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 acef28096..6ed3a0a9c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2431,7 +2431,9 @@ void ComposeControls::initVoiceRecordBar() {
 		updateSendButtonType();
 		switch (_send->type()) {
 		case Ui::SendButton::Type::Record:
-			_show->showToast(tr::lng_record_voice_tip(tr::now));
+			_show->showToast(_canRecordVideoMessage
+				? tr::lng_record_voice_tip(tr::now)
+				: tr::lng_record_hold_tip(tr::now));
 			break;
 		case Ui::SendButton::Type::Round:
 			_show->showToast(tr::lng_record_video_tip(tr::now));

From cbd2b8f42889022ba2b3225ec9ec2a0fa98f1c6b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Oct 2024 10:09:11 +0400
Subject: [PATCH 111/306] Query recording availability in the background.

Fixes #28576.
---
 .../SourceFiles/history/history_widget.cpp    | 33 ++++++++++---------
 Telegram/SourceFiles/history/history_widget.h |  8 +++--
 .../history_view_compose_controls.cpp         | 31 ++++++++---------
 .../controls/history_view_compose_controls.h  |  9 ++---
 Telegram/lib_webrtc                           |  2 +-
 5 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 440860a75..0ce64dedf 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -559,6 +559,14 @@ HistoryWidget::HistoryWidget(
 		Window::ActivateWindow(controller);
 	});
 
+	Core::App().mediaDevices().recordAvailabilityValue(
+	) | rpl::start_with_next([=](Webrtc::RecordAvailability value) {
+		_recordAvailability = value;
+		if (_list) {
+			updateSendButtonType();
+		}
+	}, lifetime());
+
 	session().data().newItemAdded(
 	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
 		newItemAdded(item);
@@ -1091,11 +1099,12 @@ void HistoryWidget::initVoiceRecordBar() {
 			!Core::App().settings().recordVideoMessages());
 		updateSendButtonType();
 		switch (_send->type()) {
-		case Ui::SendButton::Type::Record:
-			controller()->showToast(_canRecordVideoMessage
+		case Ui::SendButton::Type::Record: {
+			const auto can = Webrtc::RecordAvailability::VideoAndAudio;
+			controller()->showToast((_recordAvailability == can)
 				? tr::lng_record_voice_tip(tr::now)
 				: tr::lng_record_hold_tip(tr::now));
-			break;
+		} break;
 		case Ui::SendButton::Type::Round:
 			controller()->showToast(tr::lng_record_video_tip(tr::now));
 			break;
@@ -2335,7 +2344,7 @@ void HistoryWidget::showHistory(
 	_contactStatus = nullptr;
 	_businessBotStatus = nullptr;
 
-	updateRecordMediaState();
+	Core::App().mediaDevices().refreshRecordAvailability();
 
 	if (peerId) {
 		using namespace HistoryView;
@@ -4305,8 +4314,9 @@ auto HistoryWidget::computeSendButtonType() const {
 	} else if (_isInlineBot) {
 		return Type::Cancel;
 	} else if (showRecordButton()) {
-		return (Core::App().settings().recordVideoMessages()
-			&& _canRecordVideoMessage)
+		const auto both = Webrtc::RecordAvailability::VideoAndAudio;
+		const auto video = Core::App().settings().recordVideoMessages();
+		return (video && _recordAvailability == both)
 			? Type::Round
 			: Type::Record;
 	}
@@ -4938,7 +4948,7 @@ bool HistoryWidget::isSearching() const {
 }
 
 bool HistoryWidget::showRecordButton() const {
-	return _canRecordAudioMessage
+	return (_recordAvailability != Webrtc::RecordAvailability::None)
 		&& !_voiceRecordBar->isListenState()
 		&& !_voiceRecordBar->isRecordingByAnotherBar()
 		&& !HasSendText(_field)
@@ -5541,15 +5551,6 @@ void HistoryWidget::inlineBotChanged() {
 	}
 }
 
-void HistoryWidget::updateRecordMediaState() {
-	Media::Capture::instance()->check();
-	_canRecordAudioMessage = Media::Capture::instance()->available();
-
-	const auto environment = &Core::App().mediaDevices();
-	const auto type = Webrtc::DeviceType::Camera;
-	_canRecordVideoMessage = !environment->devices(type).empty();
-}
-
 void HistoryWidget::fieldResized() {
 	moveFieldControls();
 	updateHistoryGeometry();
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 89e5b63c9..4b621626d 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -81,6 +81,10 @@ namespace Ui::Emoji {
 class SuggestionsController;
 } // namespace Ui::Emoji
 
+namespace Webrtc {
+enum class RecordAvailability : uchar;
+} // namespace Webrtc
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -499,7 +503,6 @@ private:
 	bool replyToPreviousMessage();
 	bool replyToNextMessage();
 	[[nodiscard]] bool showSlowmodeError();
-	void updateRecordMediaState();
 
 	void hideChildWidgets();
 	void hideSelectorControlsAnimated();
@@ -758,8 +761,7 @@ private:
 	mtpRequestId _inlineBotResolveRequestId = 0;
 	bool _isInlineBot = false;
 
-	bool _canRecordVideoMessage = false;
-	bool _canRecordAudioMessage = false;
+	Webrtc::RecordAvailability _recordAvailability = {};
 
 	std::unique_ptr<HistoryView::ContactStatus> _contactStatus;
 	std::unique_ptr<HistoryView::BusinessBotStatus> _businessBotStatus;
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 6ed3a0a9c..9eed3aeb4 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -964,7 +964,6 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	initWebpageProcess();
 	initWriteRestriction();
 	initForwardProcess();
-	updateRecordMediaState();
 	updateBotCommandShown();
 	updateLikeShown();
 	updateMessagesTTLShown();
@@ -1519,7 +1518,7 @@ void ComposeControls::orderControls() {
 }
 
 bool ComposeControls::showRecordButton() const {
-	return _canRecordAudioMessage
+	return (_recordAvailability != Webrtc::RecordAvailability::None)
 		&& !_voiceRecordBar->isListenState()
 		&& !_voiceRecordBar->isRecordingByAnotherBar()
 		&& !HasSendText(_field)
@@ -2148,12 +2147,17 @@ void ComposeControls::initSendButton() {
 		}
 	};
 
-
 	SendMenu::SetupMenuAndShortcuts(
 		_send.get(),
 		_show,
 		[=] { return sendButtonMenuDetails(); },
 		sendAction);
+
+	Core::App().mediaDevices().recordAvailabilityValue(
+	) | rpl::start_with_next([=](Webrtc::RecordAvailability value) {
+		_recordAvailability = value;
+		updateSendButtonType();
+	}, _send->lifetime());
 }
 
 void ComposeControls::initSendAsButton(not_null<PeerData*> peer) {
@@ -2430,11 +2434,12 @@ void ComposeControls::initVoiceRecordBar() {
 			!Core::App().settings().recordVideoMessages());
 		updateSendButtonType();
 		switch (_send->type()) {
-		case Ui::SendButton::Type::Record:
-			_show->showToast(_canRecordVideoMessage
+		case Ui::SendButton::Type::Record: {
+			const auto both = Webrtc::RecordAvailability::VideoAndAudio;
+			_show->showToast((_recordAvailability == both)
 				? tr::lng_record_voice_tip(tr::now)
 				: tr::lng_record_hold_tip(tr::now));
-			break;
+		} break;
 		case Ui::SendButton::Type::Round:
 			_show->showToast(tr::lng_record_video_tip(tr::now));
 			break;
@@ -2465,15 +2470,6 @@ void ComposeControls::initVoiceRecordBar() {
 	}, _wrap->lifetime());
 }
 
-void ComposeControls::updateRecordMediaState() {
-	::Media::Capture::instance()->check();
-	_canRecordAudioMessage = ::Media::Capture::instance()->available();
-
-	const auto environment = &Core::App().mediaDevices();
-	const auto type = Webrtc::DeviceType::Camera;
-	_canRecordVideoMessage = !environment->devices(type).empty();
-}
-
 void ComposeControls::updateWrappingVisibility() {
 	const auto hidden = _hidden.current();
 	const auto &restriction = _writeRestriction.current();
@@ -2509,8 +2505,9 @@ auto ComposeControls::computeSendButtonType() const {
 	} else if (_isInlineBot) {
 		return Type::Cancel;
 	} else if (showRecordButton()) {
-		return (Core::App().settings().recordVideoMessages()
-			&& _canRecordVideoMessage)
+		const auto both = Webrtc::RecordAvailability::VideoAndAudio;
+		const auto video = Core::App().settings().recordVideoMessages();
+		return (video && _recordAvailability == both)
 			? Type::Round
 			: Type::Record;
 	}
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 f1da1fa6e..6024e56de 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -76,6 +76,10 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Webrtc {
+enum class RecordAvailability : uchar;
+} // namespace Webrtc
+
 namespace Window {
 struct SectionShow;
 class SessionController;
@@ -278,7 +282,6 @@ private:
 	bool updateSendAsButton();
 	void updateAttachBotsMenu();
 	void updateHeight();
-	void updateRecordMediaState();
 	void updateWrappingVisibility();
 	void updateControlsVisibility();
 	void updateControlsGeometry(QSize size);
@@ -437,9 +440,7 @@ private:
 	bool _isInlineBot = false;
 	bool _botCommandShown = false;
 	bool _likeShown = false;
-
-	bool _canRecordVideoMessage = false;
-	bool _canRecordAudioMessage = false;
+	Webrtc::RecordAvailability _recordAvailability = {};
 
 	FullMsgId _editingId;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index fc726486e..39af56581 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit fc726486ebd261283583b5cd5f6a97a18b2ab6ca
+Subproject commit 39af565818ca2fbc4029e23f798c3b440e367423

From 4d2cda0692ecab04cb3e6dddc34fef4bed992941 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Oct 2024 10:58:30 +0400
Subject: [PATCH 112/306] Fix menu in case speed isn't controlled.

---
 .../media/player/media_player_dropdown.cpp    | 34 ++++++++++++-------
 .../view/media_view_playback_controls.cpp     | 27 ++++++++++-----
 .../media/view/media_view_playback_controls.h |  3 ++
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
index 45e4e2c04..97ec184ce 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
@@ -740,9 +740,10 @@ SpeedController::SpeedController(
 			current->otherEnter();
 		}
 	});
-
-	setSpeed(_lookup(false));
-	_speed = _lookup(true);
+	if (const auto lookup = _lookup) {
+		setSpeed(lookup(false));
+		_speed = lookup(true);
+	}
 }
 
 rpl::producer<> SpeedController::saved() const {
@@ -778,7 +779,9 @@ void SpeedController::setSpeed(float64 newSpeed) {
 }
 
 void SpeedController::save() {
-	_change(speed());
+	if (const auto change = _change) {
+		change(speed());
+	}
 	_saved.fire({});
 }
 
@@ -788,26 +791,33 @@ void SpeedController::setQuality(int quality) {
 }
 
 void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
-	FillSpeedMenu(
-		menu->menu(),
-		_st.menu,
-		_speedChanged.events_starting_with(speed()),
-		[=](float64 speed) { setSpeed(speed); save(); },
-		!_qualities.empty());
+	if (_lookup) {
+		FillSpeedMenu(
+			menu->menu(),
+			_st.menu,
+			_speedChanged.events_starting_with(speed()),
+			[=](float64 speed) { setSpeed(speed); save(); },
+			!_qualities.empty());
+	}
 	if (_qualities.empty()) {
 		return;
 	}
 	_quality = _lookupQuality();
 	const auto raw = menu->menu();
 	const auto &st = _st.menu;
-	raw->addSeparator(&st.dropdown.menu.separator);
+	if (_lookup) {
+		raw->addSeparator(&st.dropdown.menu.separator);
+	}
 
 	const auto add = [&](int quality) {
 		const auto text = quality ? u"%1p"_q.arg(quality) : u"Original"_q;
 		auto action = base::make_unique_q<Ui::Menu::Action>(
 			raw,
 			st.qualityMenu,
-			Ui::Menu::CreateAction(raw, text, [=] { _changeQuality(quality); }),
+			Ui::Menu::CreateAction(
+				raw,
+				text,
+				[=] { _changeQuality(quality); }),
 			nullptr,
 			nullptr);
 		const auto raw = action.get();
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index ac46c78db..a5aba77d1 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -29,13 +29,14 @@ PlaybackControls::PlaybackControls(
 	not_null<Delegate*> delegate)
 : RpWidget(parent)
 , _delegate(delegate)
+, _speedControllable(Media::Audio::SupportsSpeedControl())
+, _qualitiesList(_delegate->playbackControlsQualities())
 , _playPauseResume(this, st::mediaviewPlayButton)
 , _playbackSlider(this, st::mediaviewPlayback)
 , _playbackProgress(std::make_unique<PlaybackProgress>())
 , _volumeToggle(this, st::mediaviewVolumeToggle)
 , _volumeController(this, st::mediaviewPlayback)
-, _speedToggle((Media::Audio::SupportsSpeedControl()
-	|| !_delegate->playbackControlsQualities().empty())
+, _speedToggle((_speedControllable || !_qualitiesList.empty())
 	? object_ptr<Player::SettingsButton>(this, st::mediaviewSpeedButton)
 	: nullptr)
 , _fullScreenToggle(this, st::mediaviewFullScreenButton)
@@ -48,9 +49,15 @@ PlaybackControls::PlaybackControls(
 		_speedToggle->st(),
 		parent,
 		[=](bool) {},
-		[=](bool lastNonDefault) { return speedLookup(lastNonDefault); },
-		[=](float64 speed) { saveSpeed(speed); },
-		_delegate->playbackControlsQualities(),
+		(_speedControllable
+			? [=](bool lastNonDefault) {
+				return speedLookup(lastNonDefault);
+			}
+			: Fn<float64(bool)>()),
+		(_speedControllable
+			? [=](float64 speed) { saveSpeed(speed); }
+			: Fn<void(float64)>()),
+		_qualitiesList,
 		[=] { return _delegate->playbackControlsCurrentQuality(); },
 		[=](int quality) { saveQuality(quality); })
 	: nullptr)
@@ -63,10 +70,12 @@ PlaybackControls::PlaybackControls(
 		fadeUpdated(opacity);
 	});
 
-	_speedController->menuToggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
-		_speedToggle->setActive(toggled);
-	}, _speedToggle->lifetime());
+	if (const auto controller = _speedController.get()) {
+		controller->menuToggledValue(
+		) | rpl::start_with_next([=](bool toggled) {
+			_speedToggle->setActive(toggled);
+		}, _speedToggle->lifetime());
+	}
 
 	_pictureInPicture->addClickHandler([=] {
 		_delegate->playbackControlsToPictureInPicture();
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.h b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
index 5357fb2fe..0ba2cf973 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.h
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
@@ -98,6 +98,9 @@ private:
 
 	const not_null<Delegate*> _delegate;
 
+	bool _speedControllable = false;
+	std::vector<int> _qualitiesList;
+
 	bool _inFullScreen = false;
 	bool _showPause = false;
 	bool _childrenHidden = false;

From 1e02c475d62bb00879add94dd63150312b95de6d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Oct 2024 14:04:22 +0400
Subject: [PATCH 113/306] Show speed / quality badges.

---
 .../media/player/media_player_button.cpp      | 108 +++++++++++++++---
 .../media/player/media_player_button.h        |  14 +++
 .../SourceFiles/media/view/media_view.style   |   1 +
 .../view/media_view_playback_controls.cpp     |   3 +
 4 files changed, 113 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp
index a42929211..3d828b07f 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_button.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
 #include "styles/style_media_player.h"
+#include "styles/style_media_view.h"
 
 #include <QtCore/QtMath>
 
@@ -347,12 +348,18 @@ SettingsButton::SettingsButton(
 }
 
 void SettingsButton::setSpeed(float64 speed) {
-	_isDefaultSpeed = EqualSpeeds(speed, 1.);
-	update();
+	if (_speed != speed) {
+		_speed = speed;
+		_isDefaultSpeed = EqualSpeeds(speed, 1.);
+		update();
+	}
 }
 
 void SettingsButton::setQuality(int quality) {
-	update();
+	if (_quality != quality) {
+		_quality = quality;
+		update();
+	}
 }
 
 void SettingsButton::setActive(bool active) {
@@ -362,7 +369,19 @@ void SettingsButton::setActive(bool active) {
 	_active = active;
 	_activeAnimation.start([=] {
 		update();
-	}, active ? 0. : 1., active ? 1. : 0., crl::time(150));
+	}, active ? 0. : 1., active ? 1. : 0., st::mediaviewOverDuration);
+}
+
+void SettingsButton::onStateChanged(State was, StateChangeSource source) {
+	RippleButton::onStateChanged(was, source);
+
+	const auto nowOver = isOver();
+	const auto wasOver = static_cast<bool>(was & StateFlag::Over);
+	if (nowOver != wasOver) {
+		_overAnimation.start([=] {
+			update();
+		}, nowOver ? 0. : 1., nowOver ? 1. : 0., st::mediaviewOverDuration);
+	}
 }
 
 void SettingsButton::paintEvent(QPaintEvent *e) {
@@ -373,13 +392,28 @@ void SettingsButton::paintEvent(QPaintEvent *e) {
 		QPoint(_st.padding.left(), _st.padding.top()),
 		_isDefaultSpeed ? nullptr : &_st.rippleActiveColor->c);
 
-	//const auto active = !_isDefaultSpeed;
+	prepareFrame();
+	p.drawImage(0, 0, _frameCache);
+}
+
+void SettingsButton::prepareFrame() {
+	const auto ratio = style::DevicePixelRatio();
+	if (_frameCache.size() != _st.size * ratio) {
+		_frameCache = QImage(
+			_st.size * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+	}
+	_frameCache.fill(Qt::transparent);
+	auto p = QPainter(&_frameCache);
+
 	const auto inner = QRect(
 		QPoint(),
 		_st.size
 	).marginsRemoved(_st.padding);
 
 	auto hq = std::optional<PainterHighQualityEnabler>();
+	const auto over = _overAnimation.value(isOver() ? 1. : 0.);
+	const auto color = anim::color(_st.fg, _st.overFg, over);
 	const auto active = _activeAnimation.value(_active ? 1. : 0.);
 	if (active > 0.) {
 		const auto shift = QRectF(inner).center();
@@ -389,20 +423,68 @@ void SettingsButton::paintEvent(QPaintEvent *e) {
 		p.translate(-shift);
 		hq.emplace(p);
 	}
-	_st.icon.paintInCenter(p, inner);
+	_st.icon.paintInCenter(p, inner, color);
 	if (active > 0.) {
 		p.restore();
 		hq.reset();
 	}
 
-	//p.setPen(color);
-	//p.setFont(_st.font);
+	const auto rounded = int(base::SafeRound(_speed * 10));
+	if (rounded != 10) {
+		const auto text = (rounded % 10)
+			? QString::number(rounded / 10.)
+			: u"%1X"_q.arg(rounded / 10);
+		paintBadge(p, text, RectPart::TopLeft, color);
+	}
+	const auto text = (!_quality)
+		? QString()
+		: (_quality > 2000)
+		? u"4K"_q
+		: (_quality > 1000)
+		? u"FHD"_q
+		: (_quality > 700)
+		? u"HD"_q
+		: u"SD"_q;
+	if (!text.isEmpty()) {
+		paintBadge(p, text, RectPart::BottomRight, color);
+	}
+}
 
-	//p.drawText(
-	//	QPointF(inner.topLeft()) + QPointF(
-	//		(inner.width() - _textWidth) / 2.,
-	//		(inner.height() - _adjustedHeight) / 2. + _adjustedAscent),
-	//	_text);
+void SettingsButton::paintBadge(
+		QPainter &p,
+		const QString &text,
+		RectPart origin,
+		QColor color) {
+	auto hq = PainterHighQualityEnabler(p);
+	const auto xpadding = style::ConvertScale(2.);
+	const auto ypadding = 0;
+	const auto skip = style::ConvertScale(2.);
+	const auto width = _st.font->width(text);
+	const auto height = _st.font->height;
+	const auto radius = height / 3.;
+	const auto left = (origin == RectPart::TopLeft)
+		|| (origin == RectPart::BottomLeft);
+	const auto top = (origin == RectPart::TopLeft)
+		|| (origin == RectPart::TopRight);
+	const auto x = left ? 0 : (_st.size.width() - width - 2 * xpadding);
+	const auto y = top
+		? skip
+		: (_st.size.height() - height - 2 * ypadding - skip);
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	const auto stroke = style::ConvertScaleExact(1.);
+	p.setPen(QPen(Qt::transparent, stroke));
+	p.setFont(_st.font);
+	p.setBrush(color);
+	p.drawRoundedRect(
+		QRectF(
+			x - stroke / 2.,
+			y - stroke / 2.,
+			width + 2 * xpadding + stroke,
+			height + 2 * ypadding + stroke),
+		radius,
+		radius);
+	p.setPen(Qt::transparent);
+	p.drawText(x + xpadding, y + ypadding + _st.font->ascent, text);
 }
 
 QPoint SettingsButton::prepareRippleStartPosition() const {
diff --git a/Telegram/SourceFiles/media/player/media_player_button.h b/Telegram/SourceFiles/media/player/media_player_button.h
index 8709c0cdd..0c667b099 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.h
+++ b/Telegram/SourceFiles/media/player/media_player_button.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/effects/animations.h"
 #include "ui/widgets/buttons.h"
+#include "ui/rect_part.h"
 
 #include <QtGui/QFontMetrics>
 
@@ -119,8 +120,21 @@ private:
 	QPoint prepareRippleStartPosition() const override;
 	QImage prepareRippleMask() const override;
 
+	void onStateChanged(State was, StateChangeSource source) override;
+
+	void paintBadge(
+		QPainter &p,
+		const QString &text,
+		RectPart origin,
+		QColor color);
+	void prepareFrame();
+
 	const style::MediaSpeedButton &_st;
 	Ui::Animations::Simple _activeAnimation;
+	Ui::Animations::Simple _overAnimation;
+	QImage _frameCache;
+	float _speed = 1.;
+	int _quality = 0;
 	bool _isDefaultSpeed = false;
 	bool _active = false;
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 55efb6fcc..e6b41da6f 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -351,6 +351,7 @@ mediaviewSpeedMenu: MediaSpeedMenu(mediaPlayerSpeedMenu) {
 mediaviewSpeedButton: MediaSpeedButton(mediaPlayerSpeedButton) {
 	size: size(32px, 32px);
 	padding: margins(0px, 0px, 0px, 0px);
+	font: font(8px bold);
 	fg: mediaviewPlaybackIconFg;
 	overFg: mediaviewPlaybackIconFgOver;
 	activeFg: mediaviewTextLinkFg;
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index a5aba77d1..6f4bc0f13 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -70,6 +70,9 @@ PlaybackControls::PlaybackControls(
 		fadeUpdated(opacity);
 	});
 
+	_speedToggle->setSpeed(_delegate->playbackControlsCurrentSpeed(false));
+	_speedToggle->setQuality(_delegate->playbackControlsCurrentQuality());
+
 	if (const auto controller = _speedController.get()) {
 		controller->menuToggledValue(
 		) | rpl::start_with_next([=](bool toggled) {

From b9ebb02e72a5e3f4ae403ee3fe832033e1c347ce Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Oct 2024 10:22:50 +0400
Subject: [PATCH 114/306] Update API scheme on layer 192.

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

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 295b549ab..a794d7964 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -353,7 +353,7 @@ updateFolderPeers#19360dc0 folder_peers:Vector<FolderPeer> pts:int pts_count:int
 updatePeerSettings#6a7e7366 peer:Peer settings:PeerSettings = Update;
 updatePeerLocated#b4afcfb0 peers:Vector<PeerLocated> = Update;
 updateNewScheduledMessage#39a51dfb message:Message = Update;
-updateDeleteScheduledMessages#90866cee peer:Peer messages:Vector<int> = Update;
+updateDeleteScheduledMessages#f2a71983 flags:# peer:Peer messages:Vector<int> sent_messages:flags.0?Vector<int> = Update;
 updateTheme#8216fba3 theme:Theme = Update;
 updateGeoLiveViewed#871fb939 peer:Peer msg_id:int = Update;
 updateLoginToken#564fe691 = Update;

From 3137c9f3f72c1ed10b9dec02c02c6451ffde7f08 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Oct 2024 13:20:42 +0400
Subject: [PATCH 115/306] Jump-to-scheduled on video processing.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 Telegram/SourceFiles/api/api_updates.cpp      | 38 +++++++++++++++++++
 Telegram/SourceFiles/api/api_updates.h        |  1 +
 Telegram/SourceFiles/data/data_session.cpp    |  8 ++++
 Telegram/SourceFiles/data/data_session.h      |  9 +++++
 Telegram/SourceFiles/data/data_types.h        |  2 +
 Telegram/SourceFiles/history/history_item.cpp |  4 ++
 Telegram/SourceFiles/history/history_item.h   |  1 +
 .../history/history_item_helpers.cpp          |  5 ++-
 .../SourceFiles/history/history_widget.cpp    | 15 ++++++++
 .../history/view/history_view_bottom_info.cpp |  5 +++
 .../history/view/history_view_bottom_info.h   | 19 +++++-----
 .../history/view/history_view_element.cpp     |  3 ++
 .../view/history_view_scheduled_section.cpp   | 21 ++++++----
 .../view/history_view_scheduled_section.h     |  5 ++-
 15 files changed, 120 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index b3b8e83a7..c48da093a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2119,8 +2119,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_recommended_message_title" = "Recommended";
 "lng_edited" = "edited";
 "lng_commented" = "commented";
+"lng_approximate" = "appx.";
 "lng_edited_date" = "Edited: {date}";
 "lng_sent_date" = "Sent: {date}";
+"lng_approximate_about" = "Estimated date of video publishing.";
 "lng_views_tooltip#one" = "Views: {count}";
 "lng_views_tooltip#other" = "Views: {count}";
 "lng_forwards_tooltip#one" = "Shares: {count}";
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 3bbab8cf4..fc4644aae 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -316,6 +316,9 @@ void Updates::feedUpdateVector(
 	} else if (policy == SkipUpdatePolicy::SkipExceptGroupCallParticipants) {
 		return;
 	}
+	if (policy == SkipUpdatePolicy::SkipNone) {
+		applyConvertToScheduledOnSend(updates);
+	}
 	for (const auto &entry : std::as_const(list)) {
 		const auto type = entry.type();
 		if ((policy == SkipUpdatePolicy::SkipMessageIds
@@ -432,6 +435,7 @@ void Updates::feedChannelDifference(
 	session().data().processChats(data.vchats());
 
 	_handlingChannelDifference = true;
+	applyConvertToScheduledOnSend(data.vother_updates());
 	feedMessageIds(data.vother_updates());
 	session().data().processMessages(
 		data.vnew_messages(),
@@ -596,6 +600,7 @@ void Updates::feedDifference(
 	Core::App().checkAutoLock();
 	session().data().processUsers(users);
 	session().data().processChats(chats);
+	applyConvertToScheduledOnSend(other);
 	feedMessageIds(other);
 	session().data().processMessages(msgs, NewMessageType::Unread);
 	feedUpdateVector(other, SkipUpdatePolicy::SkipMessageIds);
@@ -881,6 +886,39 @@ void Updates::mtpUpdateReceived(const MTPUpdates &updates) {
 	}
 }
 
+void Updates::applyConvertToScheduledOnSend(
+		const MTPVector<MTPUpdate> &other) {
+	for (const auto &update : other.v) {
+		update.match([&](const MTPDupdateNewScheduledMessage &data) {
+			const auto id = IdFromMessage(data.vmessage());
+			const auto scheduledMessages = &_session->scheduledMessages();
+			const auto scheduledId = scheduledMessages->localMessageId(id);
+			for (const auto &updateId : other.v) {
+				updateId.match([&](const MTPDupdateMessageID &dataId) {
+					if (dataId.vid().v == id) {
+						const auto rand = dataId.vrandom_id().v;
+						auto &owner = session().data();
+						const auto localId = owner.messageIdByRandomId(rand);
+						if (const auto local = owner.message(localId)) {
+							if (!local->isScheduled()) {
+								using Flag = Data::MessageUpdate::Flag;
+								_session->data().sentToScheduled({
+									.item = local,
+									.scheduledId = scheduledId,
+								});
+
+								// We've sent a non-scheduled message,
+								// but it was converted to a scheduled.
+								local->destroy();
+							}
+						}
+					}
+				}, [](const auto &) {});
+			}
+		}, [](const auto &) {});
+	}
+}
+
 void Updates::applyGroupCallParticipantUpdates(const MTPUpdates &updates) {
 	updates.match([&](const MTPDupdates &data) {
 		session().data().processUsers(data.vusers());
diff --git a/Telegram/SourceFiles/api/api_updates.h b/Telegram/SourceFiles/api/api_updates.h
index 654e36b51..41bec419c 100644
--- a/Telegram/SourceFiles/api/api_updates.h
+++ b/Telegram/SourceFiles/api/api_updates.h
@@ -131,6 +131,7 @@ private:
 	// Doesn't call sendHistoryChangeNotifications itself.
 	void feedUpdate(const MTPUpdate &update);
 
+	void applyConvertToScheduledOnSend(const MTPVector<MTPUpdate> &other);
 	void applyGroupCallParticipantUpdates(const MTPUpdates &updates);
 
 	bool whenGetDiffChanged(
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 14be85c06..b45bb0bed 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -4813,6 +4813,14 @@ void Session::viewTagsChanged(
 	}
 }
 
+void Session::sentToScheduled(SentToScheduled value) {
+	_sentToScheduled.fire(std::move(value));
+}
+
+rpl::producer<SentToScheduled> Session::sentToScheduled() const {
+	return _sentToScheduled.events();
+}
+
 void Session::clearLocalStorage() {
 	_cache->close();
 	_cache->clear();
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 654cfdba3..b1b550d37 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -89,6 +89,11 @@ struct GiftUpdate {
 	Action action = {};
 };
 
+struct SentToScheduled {
+	not_null<HistoryItem*> item;
+	MsgId scheduledId = 0;
+};
+
 class Session final {
 public:
 	using ViewElement = HistoryView::Element;
@@ -791,6 +796,9 @@ public:
 		std::vector<ReactionId> &&was,
 		std::vector<ReactionId> &&now);
 
+	void sentToScheduled(SentToScheduled value);
+	[[nodiscard]] rpl::producer<SentToScheduled> sentToScheduled() const;
+
 	void clearLocalStorage();
 
 private:
@@ -963,6 +971,7 @@ private:
 	rpl::event_stream<ChatListEntryRefresh> _chatListEntryRefreshes;
 	rpl::event_stream<> _unreadBadgeChanges;
 	rpl::event_stream<RepliesReadTillUpdate> _repliesReadTillUpdates;
+	rpl::event_stream<SentToScheduled> _sentToScheduled;
 
 	Dialogs::MainList _chatsList;
 	Dialogs::IndexedList _contactsList;
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index fbcdf3e3f..df62562ab 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -327,6 +327,8 @@ enum class MessageFlag : uint64 {
 
 	SensitiveContent      = (1ULL << 47),
 	HasRestrictions       = (1ULL << 48),
+
+	EstimatedDate         = (1ULL << 49),
 };
 inline constexpr bool is_flag_type(MessageFlag) { return true; }
 using MessageFlags = base::flags<MessageFlag>;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index afdeb386c..8c0185f28 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -761,6 +761,10 @@ TimeId HistoryItem::date() const {
 	return _date;
 }
 
+bool HistoryItem::awaitingVideoProcessing() const {
+	return (_flags & MessageFlag::EstimatedDate);
+}
+
 HistoryServiceDependentData *HistoryItem::GetServiceDependentData() {
 	if (const auto pinned = Get<HistoryServicePinned>()) {
 		return pinned;
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 169295c92..6182fa60c 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -482,6 +482,7 @@ public:
 	[[nodiscard]] GlobalMsgId globalId() const;
 	[[nodiscard]] Data::MessagePosition position() const;
 	[[nodiscard]] TimeId date() const;
+	[[nodiscard]] bool awaitingVideoProcessing() const;
 
 	[[nodiscard]] Data::Media *media() const {
 		return _media.get();
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 751a81f39..06ca6628c 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -451,7 +451,10 @@ MessageFlags FlagsFromMTP(
 			: Flag())
 		| ((flags & MTP::f_views) ? Flag::HasViews : Flag())
 		| ((flags & MTP::f_noforwards) ? Flag::NoForwards : Flag())
-		| ((flags & MTP::f_invert_media) ? Flag::InvertMedia : Flag());
+		| ((flags & MTP::f_invert_media) ? Flag::InvertMedia : Flag())
+		| ((flags & MTP::f_video_processing_pending)
+			? Flag::EstimatedDate
+			: Flag());
 }
 
 MessageFlags FlagsFromMTP(
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 0ce64dedf..31d2a1362 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -723,6 +723,21 @@ HistoryWidget::HistoryWidget(
 		maybeMarkReactionsRead(update.item);
 	}, lifetime());
 
+	session().data().sentToScheduled(
+	) | rpl::start_with_next([=](const Data::SentToScheduled &value) {
+		if (value.item->history() == _history) {
+			const auto history = value.item->history();
+			const auto id = value.scheduledId;
+			crl::on_main(this, [=] {
+				controller->showSection(
+					std::make_shared<HistoryView::ScheduledMemento>(
+						history,
+						id));
+			});
+			return;
+		}
+	}, lifetime());
+
 	using MediaSwitch = Media::Player::Instance::Switch;
 	Media::Player::instance()->switchToNextEvents(
 	) | rpl::filter([=](const MediaSwitch &pair) {
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index 6784c7eca..361e1ee51 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -407,6 +407,8 @@ void BottomInfo::layout() {
 void BottomInfo::layoutDateText() {
 	const auto edited = (_data.flags & Data::Flag::Edited)
 		? (tr::lng_edited(tr::now) + ' ')
+		: (_data.flags & Data::Flag::EstimateDate)
+		? (tr::lng_approximate(tr::now) + ' ')
 		: QString();
 	const auto author = _data.author;
 	const auto prefix = !author.isEmpty() ? u", "_q : QString();
@@ -601,6 +603,9 @@ BottomInfo::Data BottomInfoDataFromMessage(not_null<Message*> message) {
 	if (forwarded && forwarded->imported) {
 		result.flags |= Flag::Imported;
 	}
+	if (item->awaitingVideoProcessing()) {
+		result.flags |= Flag::EstimateDate;
+	}
 	// We don't want to pass and update it in Data for now.
 	//if (item->unread()) {
 	//	result.flags |= Flag::Unread;
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.h b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
index 594a488f1..32e3e8fcd 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.h
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
@@ -32,15 +32,16 @@ struct TextState;
 class BottomInfo final : public Object {
 public:
 	struct Data {
-		enum class Flag : uchar {
-			Edited         = 0x01,
-			OutLayout      = 0x02,
-			Sending        = 0x04,
-			RepliesContext = 0x08,
-			Sponsored      = 0x10,
-			Pinned         = 0x20,
-			Imported       = 0x40,
-			Shortcut       = 0x80,
+		enum class Flag : uint16 {
+			Edited         = 0x001,
+			OutLayout      = 0x002,
+			Sending        = 0x004,
+			RepliesContext = 0x008,
+			Sponsored      = 0x010,
+			Pinned         = 0x020,
+			Imported       = 0x040,
+			Shortcut       = 0x080,
+			EstimateDate   = 0x100,
 			//Unread, // We don't want to pass and update it in Date for now.
 		};
 		friend inline constexpr bool is_flag_type(Flag) { return true; };
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 880b58f75..95d5e7a29 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -264,6 +264,9 @@ QString DateTooltipText(not_null<Element*> view) {
 	const auto format = QLocale::LongFormat;
 	const auto item = view->data();
 	auto dateText = locale.toString(view->dateTime(), format);
+	if (item->awaitingVideoProcessing()) {
+		dateText += '\n' + tr::lng_approximate_about(tr::now);
+	}
 	if (const auto editedDate = view->displayedEditDate()) {
 		dateText += '\n' + tr::lng_edited_date(
 			tr::now,
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 31b31d01d..0d56c275b 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -56,18 +56,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace HistoryView {
 
-ScheduledMemento::ScheduledMemento(not_null<History*> history)
-	: _history(history)
-	, _forumTopic(nullptr) {
+ScheduledMemento::ScheduledMemento(
+	not_null<History*> history,
+	MsgId sentToScheduledId)
+: _history(history)
+, _forumTopic(nullptr)
+, _sentToScheduledId(sentToScheduledId) {
 	const auto list = _history->session().scheduledMessages().list(_history);
-	if (!list.ids.empty()) {
-		_list.setScrollTopState({ .item = {.fullId = list.ids.front() } });
+	if (sentToScheduledId) {
+		_list.setScrollTopState({
+			.item = { .fullId = { _history->peer->id, sentToScheduledId } },
+		});
+	} else if (!list.ids.empty()) {
+		_list.setScrollTopState({ .item = { .fullId = list.ids.front() } });
 	}
 }
 
 ScheduledMemento::ScheduledMemento(not_null<Data::ForumTopic*> forumTopic)
-	: _history(forumTopic->owningHistory())
-	, _forumTopic(forumTopic) {
+: _history(forumTopic->owningHistory())
+, _forumTopic(forumTopic) {
 	const auto list = _history->session().scheduledMessages().list(
 		_forumTopic);
 	if (!list.ids.empty()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 290b11c73..b761c7a40 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -288,7 +288,9 @@ private:
 
 class ScheduledMemento final : public Window::SectionMemento {
 public:
-	ScheduledMemento(not_null<History*> history);
+	ScheduledMemento(
+		not_null<History*> history,
+		MsgId sentToScheduledId = 0);
 	ScheduledMemento(not_null<Data::ForumTopic*> forumTopic);
 
 	object_ptr<Window::SectionWidget> createWidget(
@@ -309,6 +311,7 @@ private:
 	const not_null<History*> _history;
 	const Data::ForumTopic *_forumTopic;
 	ListMemento _list;
+	MsgId _sentToScheduledId;
 
 };
 

From 66be2ac6cafd739fd30f9366784a6cbfe73fbadd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Oct 2024 22:06:24 +0400
Subject: [PATCH 116/306] Show toast/tooltip info on video processing.

---
 Telegram/Resources/langs/lang.strings         |   5 +
 Telegram/SourceFiles/api/api_updates.cpp      |  31 +-
 Telegram/SourceFiles/api/api_updates.h        |   6 +-
 Telegram/SourceFiles/apiwrap.cpp              |   4 +
 .../chat_helpers/chat_helpers.style           |  19 +
 .../data/components/scheduled_messages.cpp    |  14 +-
 Telegram/SourceFiles/data/data_session.cpp    |   8 +
 Telegram/SourceFiles/data/data_session.h      |   9 +-
 .../SourceFiles/history/history_widget.cpp    |  26 +-
 Telegram/SourceFiles/history/history_widget.h |   1 +
 .../view/history_view_scheduled_section.cpp   | 341 ++++++++++++++++--
 .../view/history_view_scheduled_section.h     |  39 +-
 .../history/view/media/history_view_gif.cpp   |   6 +-
 .../view/media/history_view_media_grouped.cpp |   6 +-
 .../info/profile/info_profile_actions.cpp     |   2 +-
 .../SourceFiles/ui/dynamic_thumbnails.cpp     |  26 +-
 Telegram/SourceFiles/ui/dynamic_thumbnails.h  |   2 +-
 17 files changed, 480 insertions(+), 65 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index c48da093a..beb351b41 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3304,6 +3304,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_scheduled_send_now" = "Send message now?";
 "lng_scheduled_send_now_many#one" = "Send {count} message now?";
 "lng_scheduled_send_now_many#other" = "Send {count} messages now?";
+"lng_scheduled_video_tip_title" = "Improving video...";
+"lng_scheduled_video_tip_text" = "The video will be published after it's optimized for the bast viewing experience.";
+"lng_scheduled_video_tip" = "Processing video may take a few minutes.";
+"lng_scheduled_video_published" = "Video Published.";
+"lng_scheduled_video_view" = "View";
 
 "lng_replies_view#one" = "View {count} Reply";
 "lng_replies_view#other" = "View {count} Replies";
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index fc4644aae..9e4250c6e 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -332,6 +332,15 @@ void Updates::feedUpdateVector(
 	session().data().sendHistoryChangeNotifications();
 }
 
+void Updates::checkForSentToScheduled(const MTPUpdates &updates) {
+	updates.match([&](const MTPDupdates &data) {
+		applyConvertToScheduledOnSend(data.vupdates(), true);
+	}, [&](const MTPDupdatesCombined &data) {
+		applyConvertToScheduledOnSend(data.vupdates(), true);
+	}, [](const auto &) {
+	});
+}
+
 void Updates::feedMessageIds(const MTPVector<MTPUpdate> &updates) {
 	for (const auto &update : updates.v) {
 		if (update.type() == mtpc_updateMessageID) {
@@ -887,23 +896,35 @@ void Updates::mtpUpdateReceived(const MTPUpdates &updates) {
 }
 
 void Updates::applyConvertToScheduledOnSend(
-		const MTPVector<MTPUpdate> &other) {
+		const MTPVector<MTPUpdate> &other,
+		bool skipScheduledCheck) {
 	for (const auto &update : other.v) {
 		update.match([&](const MTPDupdateNewScheduledMessage &data) {
-			const auto id = IdFromMessage(data.vmessage());
+			const auto &message = data.vmessage();
+			const auto id = IdFromMessage(message);
 			const auto scheduledMessages = &_session->scheduledMessages();
 			const auto scheduledId = scheduledMessages->localMessageId(id);
 			for (const auto &updateId : other.v) {
 				updateId.match([&](const MTPDupdateMessageID &dataId) {
 					if (dataId.vid().v == id) {
-						const auto rand = dataId.vrandom_id().v;
 						auto &owner = session().data();
+						if (skipScheduledCheck) {
+							const auto peerId = PeerFromMessage(message);
+							const auto history = owner.historyLoaded(peerId);
+							if (history) {
+								_session->data().sentToScheduled({
+									.history = history,
+									.scheduledId = scheduledId,
+								});
+							}
+							return;
+						}
+						const auto rand = dataId.vrandom_id().v;
 						const auto localId = owner.messageIdByRandomId(rand);
 						if (const auto local = owner.message(localId)) {
 							if (!local->isScheduled()) {
-								using Flag = Data::MessageUpdate::Flag;
 								_session->data().sentToScheduled({
-									.item = local,
+									.history = local->history(),
 									.scheduledId = scheduledId,
 								});
 
diff --git a/Telegram/SourceFiles/api/api_updates.h b/Telegram/SourceFiles/api/api_updates.h
index 41bec419c..b1ecb870f 100644
--- a/Telegram/SourceFiles/api/api_updates.h
+++ b/Telegram/SourceFiles/api/api_updates.h
@@ -40,6 +40,8 @@ public:
 	void applyUpdatesNoPtsCheck(const MTPUpdates &updates);
 	void applyUpdateNoPtsCheck(const MTPUpdate &update);
 
+	void checkForSentToScheduled(const MTPUpdates &updates);
+
 	[[nodiscard]] int32 pts() const;
 
 	void updateOnline(crl::time lastNonIdleTime = 0);
@@ -131,7 +133,9 @@ private:
 	// Doesn't call sendHistoryChangeNotifications itself.
 	void feedUpdate(const MTPUpdate &update);
 
-	void applyConvertToScheduledOnSend(const MTPVector<MTPUpdate> &other);
+	void applyConvertToScheduledOnSend(
+		const MTPVector<MTPUpdate> &other,
+		bool skipScheduledCheck = false);
 	void applyGroupCallParticipantUpdates(const MTPUpdates &updates);
 
 	bool whenGetDiffChanged(
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 4f23323ab..884ad6b6d 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3329,6 +3329,7 @@ void ApiWrap::forwardMessages(
 		}
 		const auto requestType = Data::Histories::RequestType::Send;
 		const auto idsCopy = localIds;
+		const auto scheduled = action.options.scheduled;
 		histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
 			history->sendRequestId = request(MTPmessages_ForwardMessages(
 				MTP_flags(sendFlags),
@@ -3341,6 +3342,9 @@ void ApiWrap::forwardMessages(
 				(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
 				Data::ShortcutIdToMTP(_session, action.options.shortcutId)
 			)).done([=](const MTPUpdates &result) {
+				if (!scheduled) {
+					this->updates().checkForSentToScheduled(result);
+				}
 				applyUpdates(result);
 				if (shared && !--shared->requestsLeft) {
 					shared->callback();
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index a7da478ef..cb2a2f081 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1519,3 +1519,22 @@ pickLocationChooseOnMap: RoundButton(defaultActiveButton) {
 sendGifBox: Box(defaultBox) {
 	shadowIgnoreBottomSkip: true;
 }
+
+processingVideoTipMaxWidth: 364px;
+processingVideoTipShift: 10px;
+processingVideoToast: Toast(defaultToast) {
+	minWidth: 32px;
+	maxWidth: 380px;
+	padding: margins(19px, 17px, 19px, 16px);
+}
+processingVideoPreviewSkip: 0px;
+processingVideoView: RoundButton(defaultActiveButton) {
+	width: -24px;
+	height: 68px;
+	textTop: 26px;
+	textFg: mediaviewTextLinkFg;
+	textFgOver: mediaviewTextLinkFg;
+	textBg: transparent;
+	textBgOver: transparent;
+	ripple: emptyRippleAnimation;
+}
diff --git a/Telegram/SourceFiles/data/components/scheduled_messages.cpp b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
index 9e69dd35b..460a4df58 100644
--- a/Telegram/SourceFiles/data/components/scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
@@ -343,10 +343,20 @@ void ScheduledMessages::apply(
 	if (i == end(_data)) {
 		return;
 	}
-	for (const auto &id : update.vmessages().v) {
+	const auto sent = update.vsent_messages();
+	const auto &ids = update.vmessages().v;
+	for (auto k = 0, count = int(ids.size()); k != count; ++k) {
+		const auto id = ids[k].v;
 		const auto &list = i->second;
-		const auto j = list.itemById.find(id.v);
+		const auto j = list.itemById.find(id);
 		if (j != end(list.itemById)) {
+			if (sent && k < sent->v.size()) {
+				const auto &sentId = sent->v[k];
+				_session->data().sentFromScheduled({
+					.item = j->second,
+					.sentId = sentId.v,
+				});
+			}
 			j->second->destroy();
 			i = _data.find(history);
 			if (i == end(_data)) {
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index b45bb0bed..d8782132e 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -4821,6 +4821,14 @@ rpl::producer<SentToScheduled> Session::sentToScheduled() const {
 	return _sentToScheduled.events();
 }
 
+void Session::sentFromScheduled(SentFromScheduled value) {
+	_sentFromScheduled.fire(std::move(value));
+}
+
+rpl::producer<SentFromScheduled> Session::sentFromScheduled() const {
+	return _sentFromScheduled.events();
+}
+
 void Session::clearLocalStorage() {
 	_cache->close();
 	_cache->clear();
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index b1b550d37..b9d048062 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -90,9 +90,13 @@ struct GiftUpdate {
 };
 
 struct SentToScheduled {
-	not_null<HistoryItem*> item;
+	not_null<History*> history;
 	MsgId scheduledId = 0;
 };
+struct SentFromScheduled {
+	not_null<HistoryItem*> item;
+	MsgId sentId = 0;
+};
 
 class Session final {
 public:
@@ -798,6 +802,8 @@ public:
 
 	void sentToScheduled(SentToScheduled value);
 	[[nodiscard]] rpl::producer<SentToScheduled> sentToScheduled() const;
+	void sentFromScheduled(SentFromScheduled value);
+	[[nodiscard]] rpl::producer<SentFromScheduled> sentFromScheduled() const;
 
 	void clearLocalStorage();
 
@@ -972,6 +978,7 @@ private:
 	rpl::event_stream<> _unreadBadgeChanges;
 	rpl::event_stream<RepliesReadTillUpdate> _repliesReadTillUpdates;
 	rpl::event_stream<SentToScheduled> _sentToScheduled;
+	rpl::event_stream<SentFromScheduled> _sentFromScheduled;
 
 	Dialogs::MainList _chatsList;
 	Dialogs::IndexedList _contactsList;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 31d2a1362..16b0035e5 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -725,19 +725,33 @@ HistoryWidget::HistoryWidget(
 
 	session().data().sentToScheduled(
 	) | rpl::start_with_next([=](const Data::SentToScheduled &value) {
-		if (value.item->history() == _history) {
-			const auto history = value.item->history();
+		const auto history = value.history;
+		if (history == _history) {
 			const auto id = value.scheduledId;
 			crl::on_main(this, [=] {
-				controller->showSection(
-					std::make_shared<HistoryView::ScheduledMemento>(
-						history,
-						id));
+				if (history == _history) {
+					controller->showSection(
+						std::make_shared<HistoryView::ScheduledMemento>(
+							history,
+							id));
+				}
 			});
 			return;
 		}
 	}, lifetime());
 
+	session().data().sentFromScheduled(
+	) | rpl::start_with_next([=](const Data::SentFromScheduled &value) {
+		if (value.item->awaitingVideoProcessing()
+			&& !_sentFromScheduledTip
+			&& HistoryView::ShowScheduledVideoPublished(
+				controller,
+				value,
+				crl::guard(this, [=] { _sentFromScheduledTip = false; }))) {
+			_sentFromScheduledTip = true;
+		}
+	}, lifetime());
+
 	using MediaSwitch = Media::Player::Instance::Switch;
 	Media::Player::instance()->switchToNextEvents(
 	) | rpl::filter([=](const MediaSwitch &pair) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 4b621626d..86f4c9617 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -702,6 +702,7 @@ private:
 
 	bool _preserveScrollTop = false;
 	bool _repaintFieldScheduled = false;
+	bool _sentFromScheduledTip = false;
 
 	mtpRequestId _saveEditMsgRequestId = 0;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 0d56c275b..0b20db1b7 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -16,10 +16,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_drag_area.h"
 #include "history/history_item_helpers.h" // GetErrorTextForSending.
 #include "menu/menu_send.h" // SendMenu::Type.
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/tooltip.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
 #include "ui/chat/chat_style.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
 #include "ui/ui_utility.h"
 #include "api/api_editing.h"
 #include "api/api_sending.h"
@@ -34,7 +39,10 @@ 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 "mainwindow.h"
 #include "data/components/scheduled_messages.h"
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_session.h"
@@ -55,6 +63,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QMimeData>
 
 namespace HistoryView {
+namespace {
+
+constexpr auto kVideoProcessingInfoDuration = 4 * crl::time(1000);
+
+} // namespace
 
 ScheduledMemento::ScheduledMemento(
 	not_null<History*> history,
@@ -104,33 +117,33 @@ ScheduledWidget::ScheduledWidget(
 	not_null<Window::SessionController*> controller,
 	not_null<History*> history,
 	const Data::ForumTopic *forumTopic)
-	: Window::SectionWidget(parent, controller, history->peer)
-	, WindowListDelegate(controller)
-	, _show(controller->uiShow())
-	, _history(history)
-	, _forumTopic(forumTopic)
-	, _scroll(
-		this,
-		controller->chatStyle()->value(lifetime(), st::historyScroll),
-		false)
-	, _topBar(this, controller)
-	, _topBarShadow(this)
-	, _composeControls(std::make_unique<ComposeControls>(
-		this,
-		ComposeControlsDescriptor{
-			.show = controller->uiShow(),
-			.unavailableEmojiPasted = [=](not_null<DocumentData*> emoji) {
-				listShowPremiumToast(emoji);
-			},
-			.mode = ComposeControls::Mode::Scheduled,
-			.sendMenuDetails = [] { return SendMenu::Details(); },
-			.regularWindow = controller,
-			.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
-		}))
-	, _cornerButtons(
-		_scroll.data(),
-		controller->chatStyle(),
-		static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
+: Window::SectionWidget(parent, controller, history->peer)
+, WindowListDelegate(controller)
+, _show(controller->uiShow())
+, _history(history)
+, _forumTopic(forumTopic)
+, _scroll(
+	this,
+	controller->chatStyle()->value(lifetime(), st::historyScroll),
+	false)
+, _topBar(this, controller)
+, _topBarShadow(this)
+, _composeControls(std::make_unique<ComposeControls>(
+	this,
+	ComposeControlsDescriptor{
+		.show = controller->uiShow(),
+		.unavailableEmojiPasted = [=](not_null<DocumentData*> emoji) {
+			listShowPremiumToast(emoji);
+		},
+		.mode = ComposeControls::Mode::Scheduled,
+		.sendMenuDetails = [] { return SendMenu::Details(); },
+		.regularWindow = controller,
+		.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
+	}))
+, _cornerButtons(
+	_scroll.data(),
+	controller->chatStyle(),
+	static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
 	controller->chatStyle()->paletteChanged(
 	) | rpl::start_with_next([=] {
 		_scroll->updateBars();
@@ -1070,6 +1083,24 @@ void ScheduledWidget::saveState(not_null<ScheduledMemento*> memento) {
 
 void ScheduledWidget::restoreState(not_null<ScheduledMemento*> memento) {
 	_inner->restoreState(memento->list());
+	if (const auto id = memento->sentToScheduledId()) {
+		const auto item = _history->owner().message(_history->peer, id);
+		if (item) {
+			controller()->showToast({
+				.title = tr::lng_scheduled_video_tip_title(tr::now),
+				.text = { tr::lng_scheduled_video_tip_text(tr::now) },
+				.attach = RectPart::Top,
+				.duration = kVideoProcessingInfoDuration,
+			});
+			clearProcessingVideoTracking(false);
+			_processingVideoPosition = item->position();
+			_processingVideoTipTimer.setCallback([=] {
+				_processingVideoCanShow = true;
+				updateInnerVisibleArea();
+			});
+			_processingVideoTipTimer.callOnce(kVideoProcessingInfoDuration);
+		}
+	}
 }
 
 void ScheduledWidget::resizeEvent(QResizeEvent *e) {
@@ -1141,9 +1172,153 @@ void ScheduledWidget::updateInnerVisibleArea() {
 		checkReplyReturns();
 	}
 	const auto scrollTop = _scroll->scrollTop();
-	_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
+	const auto scrollBottom = scrollTop + _scroll->height();
+	_inner->setVisibleTopBottom(scrollTop, scrollBottom);
 	_cornerButtons.updateJumpDownVisibility();
 	_cornerButtons.updateUnreadThingsVisibility();
+	if (!_processingVideoLifetime) {
+		if (const auto &position = _processingVideoPosition) {
+			if (const auto view = _inner->viewByPosition(position)) {
+				initProcessingVideoView(view);
+			}
+		}
+	}
+	checkProcessingVideoTooltip(scrollTop, scrollBottom);
+}
+
+void ScheduledWidget::initProcessingVideoView(not_null<Element*> view) {
+	_processingVideoView = view;
+
+	controller()->session().data().sentFromScheduled(
+	) | rpl::start_with_next([=](const Data::SentFromScheduled &value) {
+		if (value.item->position() == _processingVideoPosition) {
+			controller()->showPeerHistory(
+				value.item->history(),
+				Window::SectionShow::Way::Backward,
+				value.sentId);
+		}
+	}, _processingVideoLifetime);
+
+	controller()->session().data().viewRemoved(
+	) | rpl::start_with_next([=](not_null<const Element*> view) {
+		if (view == _processingVideoView.get()) {
+			const auto position = _processingVideoPosition;
+			if (const auto now = _inner->viewByPosition(position)) {
+				_processingVideoView = now;
+				updateProcessingVideoTooltipPosition();
+			} else {
+				clearProcessingVideoTracking(true);
+			}
+		}
+	}, _processingVideoLifetime);
+
+	controller()->session().data().viewResizeRequest(
+	) | rpl::start_with_next([this](not_null<const Element*> view) {
+		if (view->delegate() == _inner.data()) {
+			if (!_processingVideoUpdateScheduled) {
+				if (const auto tooltip = _processingVideoTooltip.get()) {
+					_processingVideoUpdateScheduled = true;
+					crl::on_main(tooltip, [=] {
+						_processingVideoUpdateScheduled = false;
+						updateProcessingVideoTooltipPosition();
+					});
+				}
+			}
+		}
+	}, _processingVideoLifetime);
+}
+
+void ScheduledWidget::clearProcessingVideoTracking(bool fast) {
+	if (const auto tooltip = _processingVideoTooltip.release()) {
+		tooltip->toggleAnimated(false);
+	}
+	_processingVideoPosition = {};
+	if (const auto tooltip = _processingVideoTooltip.release()) {
+		if (fast) {
+			tooltip->toggleFast(false);
+		} else {
+			tooltip->toggleAnimated(false);
+		}
+	}
+	_processingVideoTooltipShown = false;
+	_processingVideoCanShow = false;
+	_processingVideoView = nullptr;
+	_processingVideoTipTimer.cancel();
+	_processingVideoLifetime.destroy();
+}
+
+void ScheduledWidget::checkProcessingVideoTooltip(
+		int visibleTop,
+		int visibleBottom) {
+	if (_processingVideoTooltip
+		|| _processingVideoTooltipShown
+		|| !_processingVideoCanShow) {
+		return;
+	}
+	const auto view = _processingVideoView.get();
+	if (!view) {
+		_processingVideoCanShow = false;
+		return;
+	}
+	const auto rect = view->effectIconGeometry();
+	if (rect.top() > visibleTop
+		&& rect.top() + rect.height() <= visibleBottom) {
+		showProcessingVideoTooltip();
+	}
+}
+
+void ScheduledWidget::updateProcessingVideoTooltipPosition() {
+	const auto tooltip = _processingVideoTooltip.get();
+	if (!tooltip) {
+		return;
+	}
+	const auto view = _processingVideoView.get();
+	if (!view) {
+		clearProcessingVideoTracking(true);
+		return;
+	}
+	const auto shift = view->skipBlockWidth() / 2;
+	const auto rect = view->effectIconGeometry().translated(shift, 0);
+	const auto countPosition = [=](QSize size) {
+		const auto origin = rect.bottomLeft();
+		return origin - QPoint(
+			size.width() / 2,
+			size.height() + st::processingVideoTipShift);
+	};
+	tooltip->pointAt(rect, RectPart::Top, countPosition);
+}
+
+void ScheduledWidget::showProcessingVideoTooltip() {
+	_processingVideoTooltipShown = true;
+	_processingVideoTooltip = std::make_unique<Ui::ImportantTooltip>(
+		_inner.data(),
+		Ui::MakeNiceTooltipLabel(
+			_inner.data(),
+			tr::lng_scheduled_video_tip(Ui::Text::WithEntities),
+			st::processingVideoTipMaxWidth,
+			st::defaultImportantTooltipLabel),
+		st::defaultImportantTooltip);
+	const auto tooltip = _processingVideoTooltip.get();
+	const auto weak = QPointer<QWidget>(tooltip);
+	const auto destroy = [=] {
+		delete weak.data();
+	};
+	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
+	tooltip->setHiddenCallback([=] {
+		const auto tip = _processingVideoTooltip.get();
+		if (tooltip == tip) {
+			_processingVideoTooltip.release();
+		}
+		crl::on_main(tip, [=] {
+			delete tip;
+		});
+	});
+	updateProcessingVideoTooltipPosition();
+	tooltip->toggleAnimated(true);
+	_processingVideoTipTimer.setCallback(crl::guard(tooltip, [=] {
+		tooltip->toggleAnimated(false);
+	}));
+	_processingVideoTipTimer.callOnce(kVideoProcessingInfoDuration);
 }
 
 void ScheduledWidget::showAnimatedHook(
@@ -1495,4 +1670,114 @@ void ScheduledWidget::setupDragArea() {
 	areas.photo->setDroppedCallback(droppedCallback(true));
 }
 
+bool ShowScheduledVideoPublished(
+		not_null<Window::SessionController*> controller,
+		const Data::SentFromScheduled &info,
+		Fn<void()> hidden) {
+	if (!controller->widget()->isActive()) {
+		return false;
+	}
+	const auto media = info.item->media();
+	const auto document = media ? media->document() : nullptr;
+	if (!document->isVideoFile()) {
+		return false;
+	}
+	const auto history = info.item->history();
+	const auto itemId = info.sentId;
+
+	const auto text = tr::lng_scheduled_video_published(
+		tr::now,
+		Ui::Text::Bold);
+	const auto &st = st::processingVideoToast;
+	const auto skip = st::processingVideoPreviewSkip;
+	const auto size = st.style.font->height * 2;
+	const auto view = tr::lng_scheduled_video_view(tr::now);
+	const auto additional = QMargins(
+		skip + size,
+		0,
+		(st::processingVideoView.style.font->width(view)
+			- (st::processingVideoView.width / 2)),
+		0);
+
+	const auto parent = controller->uiShow()->toastParent();
+	const auto weak = Ui::Toast::Show(parent, Ui::Toast::Config{
+		.text = text,
+		.padding = rpl::single(additional),
+		.st = &st,
+		.attach = RectPart::Top,
+		.acceptinput = true,
+		.duration = kVideoProcessingInfoDuration,
+	});
+	const auto strong = weak.get();
+	if (!strong) {
+		return false;
+	}
+	const auto widget = strong->widget();
+	const auto hideToast = [weak] {
+		if (const auto strong = weak.get()) {
+			strong->hideAnimated();
+		}
+	};
+
+	const auto clickableBackground = Ui::CreateChild<Ui::AbstractButton>(
+		widget.get());
+	clickableBackground->setPointerCursor(false);
+	clickableBackground->setAcceptBoth();
+	clickableBackground->show();
+	clickableBackground->addClickHandler([=](Qt::MouseButton button) {
+		if (button == Qt::RightButton) {
+			hideToast();
+		}
+	});
+
+	const auto button = Ui::CreateChild<Ui::RoundButton>(
+		widget.get(),
+		rpl::single(view),
+		st::processingVideoView);
+	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	button->show();
+	rpl::combine(
+		widget->sizeValue(),
+		button->sizeValue()
+	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+		button->moveToRight(
+			0,
+			(outer.height() - inner.height()) / 2,
+			outer.width());
+		clickableBackground->resize(outer);
+	}, widget->lifetime());
+	const auto preview = Ui::CreateChild<Ui::RpWidget>(widget.get());
+	preview->moveToLeft(skip, skip);
+	preview->resize(size, size);
+	preview->show();
+
+	const auto thumbnail = Ui::MakeDocumentThumbnail(document, FullMsgId(
+		history->peer->id,
+		itemId));
+	thumbnail->subscribeToUpdates([=] {
+		preview->update();
+	});
+	preview->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(preview);
+		const auto image = Images::Round(
+			thumbnail->image(size),
+			ImageRoundRadius::Small);
+		p.drawImage(QRect(0, 0, size, size), image);
+	}, preview->lifetime());
+
+	button->setClickedCallback([=] {
+		controller->showPeerHistory(
+			history,
+			Window::SectionShow::Way::Forward,
+			itemId);
+		hideToast();
+	});
+
+	if (hidden) {
+		widget->lifetime().add(std::move(hidden));
+	}
+	return true;
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index b761c7a40..a2e3a5438 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -21,6 +21,10 @@ namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
 
+namespace Data {
+struct SentFromScheduled;
+} // namespace Data
+
 namespace SendMenu {
 struct Details;
 } // namespace SendMenu
@@ -37,6 +41,7 @@ class PlainShadow;
 class FlatButton;
 struct PreparedList;
 class SendFilesWay;
+class ImportantTooltip;
 } // namespace Ui
 
 namespace Profile {
@@ -51,6 +56,10 @@ namespace HistoryView::Controls {
 struct VoiceToSend;
 } // namespace HistoryView::Controls
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace HistoryView {
 
 class Element;
@@ -199,6 +208,12 @@ private:
 		Data::MessagePosition position,
 		FullMsgId originId = {});
 
+	void initProcessingVideoView(not_null<Element*> view);
+	void checkProcessingVideoTooltip(int visibleTop, int visibleBottom);
+	void showProcessingVideoTooltip();
+	void updateProcessingVideoTooltipPosition();
+	void clearProcessingVideoTracking(bool fast);
+
 	void setupComposeControls();
 
 	void setupDragArea();
@@ -277,7 +292,16 @@ private:
 	std::unique_ptr<ComposeControls> _composeControls;
 	bool _skipScrollEvent = false;
 
+	Data::MessagePosition _processingVideoPosition;
+	base::weak_ptr<Element> _processingVideoView;
+	rpl::lifetime _processingVideoLifetime;
+
 	std::unique_ptr<HistoryView::StickerToast> _stickerToast;
+	std::unique_ptr<Ui::ImportantTooltip> _processingVideoTooltip;
+	base::Timer _processingVideoTipTimer;
+	bool _processingVideoUpdateScheduled = false;
+	bool _processingVideoTooltipShown = false;
+	bool _processingVideoCanShow = false;
 
 	CornerButtons _cornerButtons;
 
@@ -299,20 +323,29 @@ public:
 		Window::Column column,
 		const QRect &geometry) override;
 
-	not_null<History*> getHistory() const {
+	[[nodiscard]] not_null<History*> getHistory() const {
 		return _history;
 	}
 
-	not_null<ListMemento*> list() {
+	[[nodiscard]] not_null<ListMemento*> list() {
 		return &_list;
 	}
 
+	[[nodiscard]] MsgId sentToScheduledId() const {
+		return _sentToScheduledId;
+	}
+
 private:
 	const not_null<History*> _history;
 	const Data::ForumTopic *_forumTopic;
 	ListMemento _list;
-	MsgId _sentToScheduledId;
+	MsgId _sentToScheduledId = 0;
 
 };
 
+bool ShowScheduledVideoPublished(
+	not_null<Window::SessionController*> controller,
+	const Data::SentFromScheduled &info,
+	Fn<void()> hidden = nullptr);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 6a3aebfcb..beb58b982 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -1982,10 +1982,12 @@ bool Gif::dataLoaded() const {
 }
 
 bool Gif::needInfoDisplay() const {
-	if (_parent->data()->isFakeAboutView()) {
+	const auto item = _parent->data();
+	if (item->isFakeAboutView()) {
 		return false;
 	}
-	return _parent->data()->isSending()
+	return item->isSending()
+		|| item->awaitingVideoProcessing()
 		|| _data->uploading()
 		|| _parent->isUnderCursor()
 		|| (_parent->delegate()->elementContext() == Context::ChatPreview)
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index 5cf80255f..2b7d2cf99 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -893,9 +893,11 @@ bool GroupedMedia::computeNeedBubble() const {
 }
 
 bool GroupedMedia::needInfoDisplay() const {
+	const auto item = _parent->data();
 	return (_mode != Mode::Column)
-		&& (_parent->data()->isSending()
-			|| _parent->data()->hasFailed()
+		&& (item->isSending()
+			|| item->awaitingVideoProcessing()
+			|| item->hasFailed()
 			|| _parent->isUnderCursor()
 			|| (_parent->delegate()->elementContext() == Context::ChatPreview)
 			|| _parent->isLastAndSelfMessage());
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index a4a84021c..40611897a 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -820,7 +820,7 @@ rpl::producer<uint64> AddCurrencyAction(
 		) | rpl::start_with_error_done([=](const QString &error) {
 			currencyLoadLifetime->destroy();
 		}, [=] {
-			if (const auto strong = weak.get()) {
+			if (const auto strong = weak.data()) {
 				state->balance = currencyLoad->data().currentBalance;
 				currencyLoadLifetime->destroy();
 			}
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
index 67cda874c..f6538867a 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
@@ -59,9 +59,9 @@ private:
 
 };
 
-class StoryThumbnail : public DynamicImage {
+class MediaThumbnail : public DynamicImage {
 public:
-	explicit StoryThumbnail(Data::FileOrigin origin, bool forceRound);
+	explicit MediaThumbnail(Data::FileOrigin origin, bool forceRound);
 
 	QImage image(int size) override;
 	void subscribeToUpdates(Fn<void()> callback) override;
@@ -89,7 +89,7 @@ private:
 
 };
 
-class PhotoThumbnail final : public StoryThumbnail {
+class PhotoThumbnail final : public MediaThumbnail {
 public:
 	PhotoThumbnail(
 		not_null<PhotoData*> photo,
@@ -108,7 +108,7 @@ private:
 
 };
 
-class VideoThumbnail final : public StoryThumbnail {
+class VideoThumbnail final : public MediaThumbnail {
 public:
 	VideoThumbnail(
 		not_null<DocumentData*> video,
@@ -304,12 +304,12 @@ void PeerUserpic::processNewPhoto() {
 	}, _subscribed->downloadLifetime);
 }
 
-StoryThumbnail::StoryThumbnail(Data::FileOrigin origin, bool forceRound)
+MediaThumbnail::MediaThumbnail(Data::FileOrigin origin, bool forceRound)
 : _origin(origin)
 , _forceRound(forceRound) {
 }
 
-QImage StoryThumbnail::image(int size) {
+QImage MediaThumbnail::image(int size) {
 	const auto ratio = style::DevicePixelRatio();
 	if (_prepared.width() != size * ratio) {
 		if (_full.isNull()) {
@@ -333,7 +333,7 @@ QImage StoryThumbnail::image(int size) {
 	return _prepared;
 }
 
-void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
+void MediaThumbnail::subscribeToUpdates(Fn<void()> callback) {
 	_subscription.destroy();
 	if (!callback) {
 		clear();
@@ -363,11 +363,11 @@ void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
 	}
 }
 
-Data::FileOrigin StoryThumbnail::origin() const {
+Data::FileOrigin MediaThumbnail::origin() const {
 	return _origin;
 }
 
-bool StoryThumbnail::forceRound() const {
+bool MediaThumbnail::forceRound() const {
 	return _forceRound;
 }
 
@@ -375,7 +375,7 @@ PhotoThumbnail::PhotoThumbnail(
 	not_null<PhotoData*> photo,
 	Data::FileOrigin origin,
 	bool forceRound)
-: StoryThumbnail(origin, forceRound)
+: MediaThumbnail(origin, forceRound)
 , _photo(photo) {
 }
 
@@ -387,7 +387,7 @@ Main::Session &PhotoThumbnail::session() {
 	return _photo->session();
 }
 
-StoryThumbnail::Thumb PhotoThumbnail::loaded(Data::FileOrigin origin) {
+MediaThumbnail::Thumb PhotoThumbnail::loaded(Data::FileOrigin origin) {
 	if (!_media) {
 		_media = _photo->createMediaView();
 		_media->wanted(Data::PhotoSize::Small, origin);
@@ -406,7 +406,7 @@ VideoThumbnail::VideoThumbnail(
 	not_null<DocumentData*> video,
 	Data::FileOrigin origin,
 	bool forceRound)
-: StoryThumbnail(origin, forceRound)
+: MediaThumbnail(origin, forceRound)
 , _video(video) {
 }
 
@@ -418,7 +418,7 @@ Main::Session &VideoThumbnail::session() {
 	return _video->session();
 }
 
-StoryThumbnail::Thumb VideoThumbnail::loaded(Data::FileOrigin origin) {
+MediaThumbnail::Thumb VideoThumbnail::loaded(Data::FileOrigin origin) {
 	if (!_media) {
 		_media = _video->createMediaView();
 		_media->thumbnailWanted(origin);
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.h b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
index 3f4bd4337..08ae74052 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.h
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
@@ -14,6 +14,7 @@ class PhotoData;
 namespace Data {
 class Story;
 class Session;
+struct FileOrigin;
 } // namespace Data
 
 namespace Ui {
@@ -33,7 +34,6 @@ class DynamicImage;
 [[nodiscard]] std::shared_ptr<DynamicImage> MakeEmojiThumbnail(
 	not_null<Data::Session*> owner,
 	const QString &data);
-
 [[nodiscard]] std::shared_ptr<DynamicImage> MakePhotoThumbnail(
 	not_null<PhotoData*> photo,
 	FullMsgId fullId);

From 2d6d89b1cfabc62bcb3ecb58864b804086cee297 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Oct 2024 10:02:09 +0400
Subject: [PATCH 117/306] Fix recording single-listen tooltip text.

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

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index beb351b41..c0d7cd9ae 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3276,6 +3276,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_record_video_problem" = "Could not start video recording. Please check your camera.";
 "lng_record_once_first_tooltip" = "Click to set this message to **Play Once**.";
 "lng_record_once_active_tooltip" = "The recipient will be able to listen only once.";
+"lng_record_once_active_video" = "The recipient will be able to watch only once.";
 "lng_will_be_notified" = "Subscribers will be notified when you post.";
 "lng_wont_be_notified" = "Subscribers will receive a silent notification.";
 "lng_willbe_history" = "Select a chat to start messaging";
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 f21d35ab9..8a8c673ca 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
@@ -364,7 +364,8 @@ class TTLButton final : public Ui::RippleButton {
 public:
 	TTLButton(
 		not_null<Ui::RpWidget*> parent,
-		const style::RecordBar &st);
+		const style::RecordBar &st,
+		bool recordingVideo);
 
 	void clearState() override;
 
@@ -383,7 +384,8 @@ private:
 
 TTLButton::TTLButton(
 	not_null<Ui::RpWidget*> parent,
-	const style::RecordBar &st)
+	const style::RecordBar &st,
+	bool recordingVideo)
 : RippleButton(parent, st.lock.ripple)
 , _st(st)
 , _rippleRect(Rect(Size(st::historyRecordLockTopShadow.width()))
@@ -410,8 +412,10 @@ TTLButton::TTLButton(
 		}
 		auto text = rpl::conditional(
 			Core::App().settings().ttlVoiceClickTooltipHiddenValue(),
-			tr::lng_record_once_active_tooltip(
-				Ui::Text::RichLangValue),
+			(recordingVideo
+				? tr::lng_record_once_active_video
+				: tr::lng_record_once_active_tooltip)(
+					Ui::Text::RichLangValue),
 			tr::lng_record_once_first_tooltip(
 				Ui::Text::RichLangValue));
 		_tooltip.reset(Ui::CreateChild<Ui::ImportantTooltip>(
@@ -1624,7 +1628,8 @@ void VoiceRecordBar::init() {
 			if (!_ttlButton) {
 				_ttlButton = std::make_unique<TTLButton>(
 					_outerContainer,
-					_st);
+					_st,
+					_recordingVideo);
 			}
 			_ttlButton->show();
 		}
@@ -1659,6 +1664,7 @@ void VoiceRecordBar::init() {
 			}
 			_recordingTipRequire = crl::now();
 			_recordingVideo = (_send->type() == Ui::SendButton::Type::Round);
+			_ttlButton = nullptr;
 			_lock->setRecordingVideo(_recordingVideo);
 			_startTimer.callOnce(st::universalDuration);
 		} else if (e->type() == QEvent::MouseButtonRelease) {

From 472a2fe802bb93dc00979bf2256a87d15794ba50 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Oct 2024 10:34:53 +0400
Subject: [PATCH 118/306] Position ttl button correctly on record finish.

---
 .../view/controls/history_view_voice_record_bar.cpp  | 12 +++++++++++-
 .../view/controls/history_view_voice_record_bar.h    |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 8a8c673ca..c6fd7bff4 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
@@ -1431,7 +1431,12 @@ void VoiceRecordBar::updateTTLGeometry(
 	const auto parent = parentWidget();
 	const auto me = Ui::MapFrom(_outerContainer, parent, geometry());
 	const auto anyTop = me.y() - st::historyRecordLockPosition.y();
-	const auto ttlFrom = anyTop - _ttlButton->height() * 2;
+	const auto lockHiddenProgress = (_lockShowing.current() || !_fullRecord)
+		? 0.
+		: (1. - _showLockAnimation.value(0.));
+	const auto ttlFrom = anyTop
+		- _ttlButton->height()
+		- (_ttlButton->height() * (1. - lockHiddenProgress));
 	if (type == TTLAnimationType::RightLeft) {
 		const auto finalRight = _outerContainer->width()
 			- rect::right(me)
@@ -1551,6 +1556,9 @@ void VoiceRecordBar::init() {
 			} else if (value == 1. && show) {
 				computeAndSetLockProgress(QCursor::pos());
 			}
+			if (_fullRecord && !show) {
+				updateTTLGeometry(TTLAnimationType::RightLeft, 1.);
+			}
 		};
 		_showLockAnimation.start(std::move(callback), from, to, duration);
 	}, lifetime());
@@ -1664,6 +1672,7 @@ void VoiceRecordBar::init() {
 			}
 			_recordingTipRequire = crl::now();
 			_recordingVideo = (_send->type() == Ui::SendButton::Type::Round);
+			_fullRecord = false;
 			_ttlButton = nullptr;
 			_lock->setRecordingVideo(_recordingVideo);
 			_startTimer.callOnce(st::universalDuration);
@@ -1828,6 +1837,7 @@ void VoiceRecordBar::startRecording() {
 			) | rpl::start_with_next_error([=](const Update &update) {
 				recordUpdated(update.level, update.samples);
 				if (update.finished) {
+					_fullRecord = true;
 					stopRecording(StopType::Listen);
 					_lockShowing = false;
 				}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 9c9d66c55..027366a59 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -208,6 +208,7 @@ private:
 	std::vector<std::unique_ptr<Ui::RoundVideoRecorder>> _videoHiding;
 	rpl::lifetime _videoCapturerLifetime;
 	bool _recordingVideo = false;
+	bool _fullRecord = false;
 
 	const style::font &_cancelFont;
 

From e38998214fc9cf012f3266cfd0218b4b2ab9d8dc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Oct 2024 11:30:19 +0400
Subject: [PATCH 119/306] Disable reschedule/edit-media for processing.

---
 Telegram/SourceFiles/chat_helpers/chat_helpers.style   | 10 +++++-----
 Telegram/SourceFiles/history/history_item.cpp          |  7 ++++++-
 Telegram/SourceFiles/history/history_item.h            |  1 +
 .../history/view/history_view_context_menu.cpp         |  4 ++--
 .../history/view/history_view_list_widget.cpp          |  2 ++
 .../history/view/history_view_list_widget.h            |  2 ++
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index cb2a2f081..4b66b507f 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1521,17 +1521,17 @@ sendGifBox: Box(defaultBox) {
 }
 
 processingVideoTipMaxWidth: 364px;
-processingVideoTipShift: 10px;
+processingVideoTipShift: 8px;
 processingVideoToast: Toast(defaultToast) {
 	minWidth: 32px;
 	maxWidth: 380px;
-	padding: margins(19px, 17px, 19px, 16px);
+	padding: margins(19px, 17px, 19px, 17px);
 }
-processingVideoPreviewSkip: 0px;
+processingVideoPreviewSkip: 8px;
 processingVideoView: RoundButton(defaultActiveButton) {
 	width: -24px;
-	height: 68px;
-	textTop: 26px;
+	height: 52px;
+	textTop: 17px;
 	textFg: mediaviewTextLinkFg;
 	textFgOver: mediaviewTextLinkFg;
 	textBg: transparent;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 8c0185f28..b588c485d 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -2212,6 +2212,10 @@ bool HistoryItem::allowsSendNow() const {
 		&& !isEditingMedia();
 }
 
+bool HistoryItem::allowsReschedule() const {
+	return allowsSendNow() && !awaitingVideoProcessing();
+}
+
 bool HistoryItem::allowsForward() const {
 	return !isService()
 		&& isRegular()
@@ -2236,7 +2240,8 @@ bool HistoryItem::allowsEdit(TimeId now) const {
 }
 
 bool HistoryItem::allowsEditMedia() const {
-	return !_media || _media->allowsEditMedia();
+	return !awaitingVideoProcessing()
+		&& (!_media || _media->allowsEditMedia());
 }
 
 bool HistoryItem::canBeEdited() const {
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 6182fa60c..9a17be15f 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -429,6 +429,7 @@ public:
 	[[nodiscard]] bool forbidsForward() const;
 	[[nodiscard]] bool forbidsSaving() const;
 	[[nodiscard]] bool allowsSendNow() const;
+	[[nodiscard]] bool allowsReschedule() const;
 	[[nodiscard]] bool allowsForward() const;
 	[[nodiscard]] bool allowsEdit(TimeId now) const;
 	[[nodiscard]] bool allowsEditMedia() const;
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index e34cab589..a9c699188 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -522,7 +522,7 @@ bool AddRescheduleAction(
 	const auto owner = &request.navigation->session().data();
 
 	const auto goodSingle = HasEditMessageAction(request, list)
-		&& request.item->isScheduled();
+		&& request.item->allowsReschedule();
 	const auto goodMany = [&] {
 		if (goodSingle) {
 			return false;
@@ -534,7 +534,7 @@ bool AddRescheduleAction(
 		if (items.size() > kRescheduleLimit) {
 			return false;
 		}
-		return ranges::all_of(items, &SelectedItem::canSendNow);
+		return ranges::all_of(items, &SelectedItem::canReschedule);
 	}();
 	if (!goodSingle && !goodMany) {
 		return false;
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 2e2c087b0..b4e6fd86e 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1183,6 +1183,7 @@ auto ListWidget::collectSelectedItems() const -> SelectedItems {
 		result.canDelete = selection.canDelete;
 		result.canForward = selection.canForward;
 		result.canSendNow = selection.canSendNow;
+		result.canReschedule = selection.canReschedule;
 		return result;
 	};
 	auto items = SelectedItems();
@@ -1317,6 +1318,7 @@ bool ListWidget::addToSelection(
 	iterator->second.canDelete = item->canDelete();
 	iterator->second.canForward = item->allowsForward();
 	iterator->second.canSendNow = item->allowsSendNow();
+	iterator->second.canReschedule = item->allowsReschedule();
 	return true;
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 02ec9a370..8fa1b1f52 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -80,6 +80,7 @@ struct SelectedItem {
 	bool canDelete = false;
 	bool canForward = false;
 	bool canSendNow = false;
+	bool canReschedule = false;
 };
 
 struct MessagesBar {
@@ -232,6 +233,7 @@ struct SelectionData {
 	bool canDelete = false;
 	bool canForward = false;
 	bool canSendNow = false;
+	bool canReschedule = false;
 };
 
 using SelectedMap = base::flat_map<

From bc8bf672b43565df6510819c2d6ebc5ba73b2996 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Oct 2024 15:52:25 +0400
Subject: [PATCH 120/306] Don't use shared video cover in viewer.

---
 .../SourceFiles/media/view/media_view_overlay_widget.cpp    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index bb16d1e3e..71fa1cc42 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -332,6 +332,7 @@ struct OverlayWidget::Streamed {
 	std::unique_ptr<PlaybackControls> controls;
 	std::unique_ptr<base::PowerSaveBlocker> powerSaveBlocker;
 
+	bool ready = false;
 	bool withSound = false;
 	bool pausedBySeek = false;
 	bool resumeOnCallEnd = false;
@@ -1107,7 +1108,9 @@ bool OverlayWidget::showCopyMediaRestriction(bool skipPRemiumCheck) {
 }
 
 bool OverlayWidget::videoShown() const {
-	return _streamed && !_streamed->instance.info().video.cover.isNull();
+	return _streamed
+		&& _streamed->ready
+		&& !_streamed->instance.info().video.cover.isNull();
 }
 
 QSize OverlayWidget::videoSize() const {
@@ -3951,6 +3954,7 @@ void OverlayWidget::initStreamingThumbnail() {
 }
 
 void OverlayWidget::streamingReady(Streaming::Information &&info) {
+	_streamed->ready = true;
 	if (videoShown()) {
 		applyVideoSize();
 		_streamedQualityChangeFrame = QImage();

From a386d70ae46b228e5512b23cd8cca8bb312777c0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Oct 2024 16:30:57 +0400
Subject: [PATCH 121/306] Track qualities availability correctly.

---
 .../SourceFiles/data/data_media_types.cpp     | 11 ++++++++
 Telegram/SourceFiles/data/data_media_types.h  |  4 +++
 Telegram/SourceFiles/history/history_item.cpp |  9 ++++---
 .../view/media/history_view_web_page.cpp      |  2 ++
 .../media/view/media_view_overlay_widget.cpp  | 27 +++++++++++++------
 .../media/view/media_view_overlay_widget.h    |  2 ++
 .../view/media_view_playback_controls.cpp     |  8 ++++--
 .../settings/settings_credits_graphics.cpp    |  1 +
 8 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 81dc056e9..bdcf6f95b 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -551,6 +551,10 @@ DocumentData *Media::document() const {
 	return nullptr;
 }
 
+bool Media::hasQualitiesList() const {
+	return false;
+}
+
 PhotoData *Media::photo() const {
 	return nullptr;
 }
@@ -964,12 +968,14 @@ MediaFile::MediaFile(
 	not_null<HistoryItem*> parent,
 	not_null<DocumentData*> document,
 	bool skipPremiumEffect,
+	bool hasQualitiesList,
 	bool spoiler,
 	crl::time ttlSeconds)
 : Media(parent)
 , _document(document)
 , _emoji(document->sticker() ? document->sticker()->alt : QString())
 , _skipPremiumEffect(skipPremiumEffect)
+, _hasQualitiesList(hasQualitiesList)
 , _spoiler(spoiler)
 , _ttlSeconds(ttlSeconds) {
 	parent->history()->owner().registerDocumentItem(_document, parent);
@@ -999,6 +1005,7 @@ std::unique_ptr<Media> MediaFile::clone(not_null<HistoryItem*> parent) {
 		parent,
 		_document,
 		!_document->session().premium(),
+		_hasQualitiesList,
 		_spoiler,
 		_ttlSeconds);
 }
@@ -1007,6 +1014,10 @@ DocumentData *MediaFile::document() const {
 	return _document;
 }
 
+bool MediaFile::hasQualitiesList() const {
+	return _hasQualitiesList;
+}
+
 bool MediaFile::uploading() const {
 	return _document->uploading();
 }
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index e1213e39a..86dd6d594 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -165,6 +165,7 @@ public:
 	virtual std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) = 0;
 
 	virtual DocumentData *document() const;
+	virtual bool hasQualitiesList() const;
 	virtual PhotoData *photo() const;
 	virtual WebPageData *webpage() const;
 	virtual MediaWebPageFlags webpageFlags() const;
@@ -287,6 +288,7 @@ public:
 		not_null<HistoryItem*> parent,
 		not_null<DocumentData*> document,
 		bool skipPremiumEffect,
+		bool hasQualitiesList,
 		bool spoiler,
 		crl::time ttlSeconds);
 	~MediaFile();
@@ -294,6 +296,7 @@ public:
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
 
 	DocumentData *document() const override;
+	bool hasQualitiesList() const override;
 
 	bool uploading() const override;
 	Storage::SharedMediaTypesMask sharedMediaTypes() const override;
@@ -324,6 +327,7 @@ private:
 	not_null<DocumentData*> _document;
 	QString _emoji;
 	bool _skipPremiumEffect = false;
+	bool _hasQualitiesList = false;
 	bool _spoiler = false;
 
 	// Video (unsupported) / Voice / Round.
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index b588c485d..9b422e1ca 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -297,12 +297,12 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 			return nullptr;
 		}
 		return document->match([&](const MTPDdocument &document) -> Result {
+			const auto list = media.valt_documents();
 			return std::make_unique<Data::MediaFile>(
 				item,
-				item->history()->owner().processDocument(
-					document,
-					media.valt_documents()),
+				item->history()->owner().processDocument(document, list),
 				media.is_nopremium(),
+				list && !list->v.isEmpty(),
 				media.is_spoiler(),
 				media.vttl_seconds().value_or_empty());
 		}, [](const MTPDdocumentEmpty &) -> Result {
@@ -628,11 +628,13 @@ HistoryItem::HistoryItem(
 	createComponentsHelper(std::move(fields));
 
 	const auto skipPremiumEffect = !history->session().premium();
+	const auto video = document->video();
 	const auto spoiler = false;
 	_media = std::make_unique<Data::MediaFile>(
 		this,
 		document,
 		skipPremiumEffect,
+		video && !video->qualities.empty(),
 		spoiler,
 		/*ttlSeconds = */0);
 	setText(caption);
@@ -1789,6 +1791,7 @@ void HistoryItem::setStoryFields(not_null<Data::Story*> story) {
 			this,
 			document,
 			/*skipPremiumEffect=*/false,
+			/*hasQualitiesList=*/false,
 			spoiler,
 			/*ttlSeconds = */0);
 	}
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 960cc51a0..46241702b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -74,11 +74,13 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 	const auto spoiler = false;
 	for (const auto &item : data.items) {
 		if (const auto document = std::get_if<DocumentData*>(&item)) {
+			const auto hasQualitiesList = false;
 			const auto skipPremiumEffect = false;
 			result.push_back(std::make_unique<Data::MediaFile>(
 				parent,
 				*document,
 				skipPremiumEffect,
+				hasQualitiesList,
 				spoiler,
 				/*ttlSeconds = */0));
 		} else if (const auto photo = std::get_if<PhotoData*>(&item)) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 71fa1cc42..ae3217b05 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2264,16 +2264,27 @@ OverlayWidget::~OverlayWidget() {
 	_dropdown.destroy();
 }
 
+auto OverlayWidget::resolveQualities() const
+-> const std::vector<not_null<DocumentData*>> & {
+	static const auto empty = std::vector<not_null<DocumentData*>>();
+	const auto video = _document ? _document->video() : nullptr;
+	const auto media = _message ? _message->media() : nullptr;
+	if (!video || !media || media->document() != _document) {
+		return empty;
+	}
+	return media->hasQualitiesList() ? video->qualities : empty;
+}
+
 not_null<DocumentData*> OverlayWidget::chooseQuality() const {
 	Expects(_document != nullptr);
 
-	const auto video = _document->video();
-	if (!video || video->qualities.empty() || _quality == kOriginalQuality) {
+	const auto &list = resolveQualities();
+	if (list.empty() || _quality == kOriginalQuality) {
 		return _document;
 	}
 	auto closest = _document;
 	auto closestAbs = std::abs(_quality - _document->resolveVideoQuality());
-	for (const auto &quality : video->qualities) {
+	for (const auto &quality : list) {
 		const auto abs = std::abs(_quality - quality->resolveVideoQuality());
 		if (abs < closestAbs) {
 			closestAbs = abs;
@@ -4428,20 +4439,20 @@ float64 OverlayWidget::playbackControlsCurrentSpeed(bool lastNonDefault) {
 }
 
 std::vector<int> OverlayWidget::playbackControlsQualities() {
-	const auto video = _document ? _document->video() : nullptr;
-	if (!video || video->qualities.empty()) {
+	const auto &list = resolveQualities();
+	if (list.empty()) {
 		return {};
 	}
 	auto result = std::vector<int>();
-	result.reserve(video->qualities.size());
-	for (const auto &quality : video->qualities) {
+	result.reserve(list.size());
+	for (const auto &quality : list) {
 		result.push_back(quality->resolveVideoQuality());
 	}
 	return result;
 }
 
 int OverlayWidget::playbackControlsCurrentQuality() {
-	return _quality;
+	return _chosenQuality ? _chosenQuality->resolveVideoQuality() : _quality;
 }
 
 void OverlayWidget::playbackControlsQualityChanged(int quality) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index c14124ffc..45dbbe794 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -528,6 +528,8 @@ private:
 	[[nodiscard]] bool canInitStreaming() const;
 	[[nodiscard]] bool saveControlLocked() const;
 	[[nodiscard]] not_null<DocumentData*> chooseQuality() const;
+	[[nodiscard]] auto resolveQualities() const
+		-> const std::vector<not_null<DocumentData*>> &;
 
 	[[nodiscard]] bool topShadowOnTheRight() const;
 	void applyHideWindowWorkaround();
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index 6f4bc0f13..132286c31 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -70,8 +70,12 @@ PlaybackControls::PlaybackControls(
 		fadeUpdated(opacity);
 	});
 
-	_speedToggle->setSpeed(_delegate->playbackControlsCurrentSpeed(false));
-	_speedToggle->setQuality(_delegate->playbackControlsCurrentQuality());
+	_speedToggle->setSpeed(_speedControllable
+		? _delegate->playbackControlsCurrentSpeed(false)
+		: 1.);
+	_speedToggle->setQuality(_qualitiesList.empty()
+		? 0
+		: _delegate->playbackControlsCurrentQuality());
 
 	if (const auto controller = _speedController.get()) {
 		controller->menuToggledValue(
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 7d106c73f..b466dab84 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -295,6 +295,7 @@ void AddViewMediaHandler(
 				state->item,
 				owner->document(item.id),
 				true, // skipPremiumEffect
+				false, // hasQualitiesList
 				false, // spoiler
 				0)); // ttlSeconds
 		}

From d6ac883efacc9d4acbfd2433b87049a39435ee68 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Oct 2024 18:03:56 +0400
Subject: [PATCH 122/306] Implement adaptive quality selection.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 .../boxes/peers/peer_short_info_box.cpp       |  15 +-
 Telegram/SourceFiles/core/core_settings.cpp   |  32 ++--
 Telegram/SourceFiles/core/core_settings.h     |   6 +-
 Telegram/SourceFiles/data/data_document.cpp   |  41 +++++
 Telegram/SourceFiles/data/data_document.h     |  13 +-
 Telegram/SourceFiles/data/data_streaming.cpp  |  79 ++++++++-
 Telegram/SourceFiles/data/data_streaming.h    |  13 +-
 .../history/view/media/history_view_gif.cpp   |  44 ++++-
 .../history/view/media/history_view_photo.cpp |  15 +-
 Telegram/SourceFiles/media/media_common.h     |  14 ++
 .../media/player/media_player_dropdown.cpp    |  19 ++-
 .../media/player/media_player_dropdown.h      |   8 +-
 .../media/player/media_player_instance.cpp    |  15 +-
 .../media/streaming/media_streaming_common.h  |   9 +-
 .../streaming/media_streaming_document.cpp    | 113 +++++++++++--
 .../streaming/media_streaming_document.h      |  32 ++--
 .../media/streaming/media_streaming_file.cpp  |   8 +
 .../media/streaming/media_streaming_file.h    |   3 +
 .../streaming/media_streaming_instance.cpp    |  19 +++
 .../streaming/media_streaming_instance.h      |   7 +
 .../media/streaming/media_streaming_loader.h  |  10 +-
 .../media_streaming_loader_local.cpp          |   4 +
 .../streaming/media_streaming_loader_local.h  |   1 +
 .../media_streaming_loader_mtproto.cpp        |  80 +++++++++-
 .../media_streaming_loader_mtproto.h          |  15 ++
 .../streaming/media_streaming_player.cpp      |   8 +
 .../media/streaming/media_streaming_player.h  |   1 +
 .../streaming/media_streaming_reader.cpp      |   4 +
 .../media/streaming/media_streaming_reader.h  |   2 +
 .../media/view/media_view_overlay_widget.cpp  | 151 ++++++++++--------
 .../media/view/media_view_overlay_widget.h    |  11 +-
 .../SourceFiles/media/view/media_view_pip.cpp |  15 +-
 .../view/media_view_playback_controls.cpp     |   5 +-
 .../media/view/media_view_playback_controls.h |   4 +-
 .../attach_item_single_media_preview.cpp      |  15 +-
 .../ui/controls/userpic_button.cpp            |  15 +-
 37 files changed, 654 insertions(+), 193 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index c0d7cd9ae..aff3af8c2 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3906,6 +3906,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mediaview_downloads" = "Downloads";
 "lng_mediaview_playback_speed" = "Playback speed: {speed}";
 "lng_mediaview_rotate_video" = "Rotate video";
+"lng_mediaview_quality_auto" = "Auto";
 
 "lng_theme_preview_title" = "Theme Preview";
 "lng_theme_preview_generating" = "Generating color theme preview...";
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index 830dc13bd..ff486ead9 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -534,15 +534,16 @@ void PeerShortInfoCover::handleStreamingUpdate(
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo update) {
 		_videoPosition = update.position;
 		_widget->update();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 9e1046636..e680527e2 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -23,6 +23,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Core {
 namespace {
 
+constexpr auto kInitialVideoQuality = 480; // Start with SD.
+
 [[nodiscard]] WindowPosition Deserialize(const QByteArray &data) {
 	QDataStream stream(data);
 	stream.setVersion(QDataStream::Qt_5_1);
@@ -88,6 +90,19 @@ void LogPosition(const WindowPosition &position, const QString &name) {
 	return RecentEmojiDocument{ id, (test == '1') };
 }
 
+[[nodiscard]] quint32 SerializeVideoQuality(Media::VideoQuality quality) {
+	static_assert(sizeof(Media::VideoQuality) == sizeof(uint32));
+	auto result = uint32();
+	memcpy(&result, &quality, sizeof(quality));
+	return result;
+}
+
+[[nodiscard]] Media::VideoQuality DeserializeVideoQuality(quint32 value) {
+	auto result = Media::VideoQuality();
+	memcpy(&result, &value, sizeof(result));
+	return (result.height <= 4320) ? result : Media::VideoQuality();
+}
+
 } // namespace
 
 [[nodiscard]] WindowPosition AdjustToScale(
@@ -124,7 +139,8 @@ Settings::Settings()
 , _floatPlayerColumn(Window::Column::Second)
 , _floatPlayerCorner(RectPart::TopRight)
 , _dialogsWithChatWidthRatio(DefaultDialogsWidthRatio())
-, _dialogsNoChatWidthRatio(DefaultDialogsWidthRatio()) {
+, _dialogsNoChatWidthRatio(DefaultDialogsWidthRatio())
+, _videoQuality({ .height = kInitialVideoQuality }) {
 }
 
 Settings::~Settings() = default;
@@ -381,7 +397,7 @@ QByteArray Settings::serialize() const {
 			<< qint32(_ivZoom.current())
 			<< qint32(_skipToastsInFocus ? 1 : 0)
 			<< qint32(_recordVideoMessages ? 1 : 0)
-			<< qint32(_videoQuality);
+			<< SerializeVideoQuality(_videoQuality);
 	}
 
 	Ensures(result.size() == size);
@@ -508,7 +524,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 ivZoom = _ivZoom.current();
 	qint32 skipToastsInFocus = _skipToastsInFocus ? 1 : 0;
 	qint32 recordVideoMessages = _recordVideoMessages ? 1 : 0;
-	qint32 videoQuality = _videoQuality;
+	quint32 videoQuality = SerializeVideoQuality(_videoQuality);
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -1044,9 +1060,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_ivZoom = ivZoom;
 	_skipToastsInFocus = (skipToastsInFocus == 1);
 	_recordVideoMessages = (recordVideoMessages == 1);
-	_videoQuality = (videoQuality >= 0 && videoQuality <= 4320)
-		? videoQuality
-		: 0;
+	_videoQuality = DeserializeVideoQuality(videoQuality);
 }
 
 QString Settings::getSoundPath(const QString &key) const {
@@ -1437,7 +1451,7 @@ void Settings::resetOnLastLogout() {
 	_ttlVoiceClickTooltipHidden = false;
 	_ivZoom = 100;
 	_recordVideoMessages = false;
-	_videoQuality = 0;
+	_videoQuality = {};
 
 	_recentEmojiPreload.clear();
 	_recentEmoji.clear();
@@ -1605,11 +1619,11 @@ void Settings::setIvZoom(int value) {
 	_ivZoom = std::clamp(value, kMin, kMax);
 }
 
-int Settings::videoQuality() const {
+Media::VideoQuality Settings::videoQuality() const {
 	return _videoQuality;
 }
 
-void Settings::setVideoQuality(int value) {
+void Settings::setVideoQuality(Media::VideoQuality value) {
 	_videoQuality = value;
 }
 
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 30040ee25..3838463f3 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -929,8 +929,8 @@ public:
 	[[nodiscard]] rpl::producer<int> ivZoomValue() const;
 	void setIvZoom(int value);
 
-	[[nodiscard]] int videoQuality() const;
-	void setVideoQuality(int quality);
+	[[nodiscard]] Media::VideoQuality videoQuality() const;
+	void setVideoQuality(Media::VideoQuality quality);
 
 	[[nodiscard]] static bool ThirdColumnByDefault();
 	[[nodiscard]] static float64 DefaultDialogsWidthRatio();
@@ -1069,7 +1069,7 @@ private:
 	std::optional<bool> _weatherInCelsius;
 	QByteArray _tonsiteStorageToken;
 	rpl::variable<int> _ivZoom = 100;
-	int _videoQuality = 0;
+	Media::VideoQuality _videoQuality;
 
 	bool _tabbedReplacedWithInfo = false; // per-window
 	rpl::event_stream<bool> _tabbedReplacedWithInfoValue; // per-window
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index d4306b2fb..af5f95077 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -576,6 +576,13 @@ void DocumentData::setVideoQualities(
 		--count;
 	}
 	qualities.erase(qualities.begin() + count, qualities.end());
+	if (!qualities.empty()) {
+		if (const auto mine = resolveVideoQuality()) {
+			if (mine > qualities.front()->resolveVideoQuality()) {
+				qualities.insert(begin(qualities), this);
+			}
+		}
+	}
 	data->qualities = std::move(qualities);
 }
 
@@ -584,6 +591,40 @@ int DocumentData::resolveVideoQuality() const {
 	return size.isEmpty() ? 0 : std::min(size.width(), size.height());
 }
 
+auto DocumentData::resolveQualities(HistoryItem *context) const
+-> const std::vector<not_null<DocumentData*>> & {
+	static const auto empty = std::vector<not_null<DocumentData*>>();
+	const auto info = video();
+	const auto media = context ? context->media() : nullptr;
+	if (!info || !media || media->document() != this) {
+		return empty;
+	}
+	return media->hasQualitiesList() ? info->qualities : empty;
+}
+
+not_null<DocumentData*> DocumentData::chooseQuality(
+		HistoryItem *context,
+		Media::VideoQuality request) {
+	const auto &list = resolveQualities(context);
+	if (list.empty() || !request.height) {
+		return this;
+	}
+	const auto height = int(request.height);
+	auto closest = this;
+	auto closestAbs = std::abs(height - resolveVideoQuality());
+	auto closestSize = size;
+	for (const auto &quality : list) {
+		const auto abs = std::abs(height - quality->resolveVideoQuality());
+		if (abs < closestAbs
+			|| (abs == closestAbs && quality->size < closestSize)) {
+			closest = quality;
+			closestAbs = abs;
+			closestSize = quality->size;
+		}
+	}
+	return closest;
+}
+
 void DocumentData::validateLottieSticker() {
 	if (type == FileDocument
 		&& hasMimeType(u"application/x-tgsticker"_q)) {
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index ceba0e875..df1f9eab3 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -31,11 +31,13 @@ struct Key;
 } // namespace Storage
 
 namespace Media {
-namespace Streaming {
-class Loader;
-} // namespace Streaming
+struct VideoQuality;
 } // namespace Media
 
+namespace Media::Streaming {
+class Loader;
+} // namespace Media::Streaming
+
 namespace Data {
 class Session;
 class DocumentMedia;
@@ -118,6 +120,11 @@ public:
 	void automaticLoadSettingsChanged();
 	void setVideoQualities(std::vector<not_null<DocumentData*>> qualities);
 	[[nodiscard]] int resolveVideoQuality() const;
+	[[nodiscard]] auto resolveQualities(HistoryItem *context) const
+		-> const std::vector<not_null<DocumentData*>> &;
+	[[nodiscard]] not_null<DocumentData*> chooseQuality(
+		HistoryItem *context,
+		Media::VideoQuality request);
 
 	[[nodiscard]] bool loading() const;
 	[[nodiscard]] QString loadingFilePath() const;
diff --git a/Telegram/SourceFiles/data/data_streaming.cpp b/Telegram/SourceFiles/data/data_streaming.cpp
index dd3b13b38..658c83807 100644
--- a/Telegram/SourceFiles/data/data_streaming.cpp
+++ b/Telegram/SourceFiles/data/data_streaming.cpp
@@ -41,6 +41,43 @@ bool PruneDestroyedAndSet(
 	return result;
 }
 
+[[nodiscard]] auto LookupOtherQualities(
+	DocumentData *original,
+	not_null<DocumentData*> quality,
+	HistoryItem *context)
+-> std::vector<Media::Streaming::QualityDescriptor> {
+	if (!original || !context) {
+		return {};
+	}
+	auto qualities = original->resolveQualities(context);
+	if (qualities.empty()) {
+		return {};
+	}
+	auto result = std::vector<Media::Streaming::QualityDescriptor>();
+	result.reserve(qualities.size());
+	for (const auto &video : qualities) {
+		if (video != quality) {
+			if (const auto height = video->resolveVideoQuality()) {
+				result.push_back({
+					.sizeInBytes = uint32(video->size),
+					.height = uint32(height),
+				});
+			}
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] auto LookupOtherQualities(
+	DocumentData *original,
+	not_null<PhotoData*> quality,
+	HistoryItem *context)
+-> std::vector<Media::Streaming::QualityDescriptor> {
+	Expects(!original);
+
+	return {};
+}
+
 } // namespace
 
 Streaming::Streaming(not_null<Session*> owner)
@@ -50,7 +87,6 @@ Streaming::Streaming(not_null<Session*> owner)
 
 Streaming::~Streaming() = default;
 
-
 template <typename Data>
 [[nodiscard]] std::shared_ptr<Streaming::Reader> Streaming::sharedReader(
 		base::flat_map<not_null<Data*>, std::weak_ptr<Reader>> &readers,
@@ -84,10 +120,16 @@ template <typename Data>
 		base::flat_map<not_null<Data*>, std::weak_ptr<Document>> &documents,
 		base::flat_map<not_null<Data*>, std::weak_ptr<Reader>> &readers,
 		not_null<Data*> data,
+		DocumentData *original,
+		HistoryItem *context,
 		FileOrigin origin) {
+	auto otherQualities = LookupOtherQualities(original, data, context);
 	const auto i = documents.find(data);
 	if (i != end(documents)) {
 		if (auto result = i->second.lock()) {
+			if (!otherQualities.empty()) {
+				result->setOtherQualities(std::move(otherQualities));
+			}
 			return result;
 		}
 	}
@@ -95,7 +137,10 @@ template <typename Data>
 	if (!reader) {
 		return nullptr;
 	}
-	auto result = std::make_shared<Document>(data, std::move(reader));
+	auto result = std::make_shared<Document>(
+		data,
+		std::move(reader),
+		std::move(otherQualities));
 	if (!PruneDestroyedAndSet(documents, data, result)) {
 		documents.emplace_or_assign(data, result);
 	}
@@ -136,7 +181,27 @@ std::shared_ptr<Streaming::Reader> Streaming::sharedReader(
 std::shared_ptr<Streaming::Document> Streaming::sharedDocument(
 		not_null<DocumentData*> document,
 		FileOrigin origin) {
-	return sharedDocument(_fileDocuments, _fileReaders, document, origin);
+	return sharedDocument(
+		_fileDocuments,
+		_fileReaders,
+		document,
+		nullptr,
+		nullptr,
+		origin);
+}
+
+std::shared_ptr<Streaming::Document> Streaming::sharedDocument(
+		not_null<DocumentData*> quality,
+		not_null<DocumentData*> original,
+		HistoryItem *context,
+		FileOrigin origin) {
+	return sharedDocument(
+		_fileDocuments,
+		_fileReaders,
+		quality,
+		original,
+		context,
+		origin);
 }
 
 std::shared_ptr<Streaming::Reader> Streaming::sharedReader(
@@ -149,7 +214,13 @@ std::shared_ptr<Streaming::Reader> Streaming::sharedReader(
 std::shared_ptr<Streaming::Document> Streaming::sharedDocument(
 		not_null<PhotoData*> photo,
 		FileOrigin origin) {
-	return sharedDocument(_photoDocuments, _photoReaders, photo, origin);
+	return sharedDocument(
+		_photoDocuments,
+		_photoReaders,
+		photo,
+		nullptr,
+		nullptr,
+		origin);
 }
 
 void Streaming::keepAlive(not_null<DocumentData*> document) {
diff --git a/Telegram/SourceFiles/data/data_streaming.h b/Telegram/SourceFiles/data/data_streaming.h
index 14e863f4a..51a6f1854 100644
--- a/Telegram/SourceFiles/data/data_streaming.h
+++ b/Telegram/SourceFiles/data/data_streaming.h
@@ -12,12 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class PhotoData;
 class DocumentData;
 
-namespace Media {
-namespace Streaming {
+namespace Media::Streaming {
 class Reader;
 class Document;
-} // namespace Streaming
-} // namespace Media
+} // namespace Media::Streaming
 
 namespace Data {
 
@@ -41,6 +39,11 @@ public:
 	[[nodiscard]] std::shared_ptr<Document> sharedDocument(
 		not_null<DocumentData*> document,
 		FileOrigin origin);
+	[[nodiscard]] std::shared_ptr<Document> sharedDocument(
+		not_null<DocumentData*> quality,
+		not_null<DocumentData*> original,
+		HistoryItem *context,
+		FileOrigin origin);
 
 	[[nodiscard]] std::shared_ptr<Reader> sharedReader(
 		not_null<PhotoData*> photo,
@@ -68,6 +71,8 @@ private:
 		base::flat_map<not_null<Data*>, std::weak_ptr<Document>> &documents,
 		base::flat_map<not_null<Data*>, std::weak_ptr<Reader>> &readers,
 		not_null<Data*> data,
+		DocumentData *original,
+		HistoryItem *context,
 		FileOrigin origin);
 
 	template <typename Data>
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index beb58b982..c406982a0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -36,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_media_spoiler.h"
 #include "window/window_session_controller.h"
 #include "core/application.h" // Application::showDocument.
+#include "core/core_settings.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/chat/chat_style.h"
 #include "ui/image/image.h"
@@ -109,8 +110,10 @@ constexpr auto kMaxInlineArea = 1920 * 1080;
 
 struct Gif::Streamed {
 	Streamed(
+		not_null<DocumentData*> chosen,
 		std::shared_ptr<::Media::Streaming::Document> shared,
 		Fn<void()> waitingCallback);
+	const not_null<DocumentData*> chosen;
 	::Media::Streaming::Instance instance;
 	::Media::Streaming::FrameRequest frozenRequest;
 	QImage frozenFrame;
@@ -118,9 +121,11 @@ struct Gif::Streamed {
 };
 
 Gif::Streamed::Streamed(
+	not_null<DocumentData*> chosen,
 	std::shared_ptr<::Media::Streaming::Document> shared,
 	Fn<void()> waitingCallback)
-: instance(std::move(shared), std::move(waitingCallback)) {
+: chosen(chosen)
+, instance(std::move(shared), std::move(waitingCallback)) {
 }
 
 [[nodiscard]] bool IsHiddenRoundMessage(not_null<Element*> parent) {
@@ -1848,13 +1853,21 @@ void Gif::playAnimation(bool autoplay) {
 }
 
 void Gif::createStreamedPlayer() {
+	const auto quality = Core::App().settings().videoQuality();
+	const auto chosen = _data->chooseQuality(_realParent, quality);
+	if (_streamed && _streamed->chosen == chosen) {
+		return;
+	}
 	auto shared = _data->owner().streaming().sharedDocument(
+		chosen,
 		_data,
+		_realParent,
 		_realParent->fullId());
 	if (!shared) {
 		return;
 	}
 	setStreamed(std::make_unique<Streamed>(
+		chosen,
 		std::move(shared),
 		[=] { repaintStreamedContent(); }));
 
@@ -1865,6 +1878,20 @@ void Gif::createStreamedPlayer() {
 		handleStreamingError(std::move(error));
 	}, _streamed->instance.lifetime());
 
+	_streamed->instance.switchQualityRequests(
+	) | rpl::start_with_next([=](int quality) {
+		auto now = Core::App().settings().videoQuality();
+		if (now.manual || now.height == quality) {
+			return;
+		}
+		Core::App().settings().setVideoQuality({
+			.manual = 0,
+			.height = uint32(quality),
+		});
+		Core::App().saveSettingsDelayed();
+		createStreamedPlayer();
+	}, _streamed->instance.lifetime());
+
 	if (_streamed->instance.ready()) {
 		streamingReady(base::duplicate(_streamed->instance.info()));
 	}
@@ -1912,14 +1939,15 @@ void Gif::handleStreamingUpdate(::Media::Streaming::Update &&update) {
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo) {
 		repaintStreamedContent();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index ff7c4872e..3e56d773f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -979,14 +979,15 @@ void Photo::handleStreamingUpdate(::Media::Streaming::Update &&update) {
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo) {
 		repaintStreamedContent();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 
diff --git a/Telegram/SourceFiles/media/media_common.h b/Telegram/SourceFiles/media/media_common.h
index c155a4084..1f757e581 100644
--- a/Telegram/SourceFiles/media/media_common.h
+++ b/Telegram/SourceFiles/media/media_common.h
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/algorithm.h"
 
+#include <compare>
+
 namespace Media {
 
 enum class RepeatMode {
@@ -23,6 +25,18 @@ enum class OrderMode {
 	Shuffle,
 };
 
+struct VideoQuality {
+	uint32 manual : 1 = 0;
+	uint32 height : 31 = 0;
+
+	friend inline constexpr auto operator<=>(
+		VideoQuality,
+		VideoQuality) = default;
+	friend inline constexpr bool operator==(
+		VideoQuality,
+		VideoQuality) = default;
+};
+
 inline constexpr auto kSpeedMin = 0.5;
 inline constexpr auto kSpeedMax = 2.5;
 inline constexpr auto kSpedUpDefault = 1.7;
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
index 97ec184ce..f6ab757b0 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
@@ -717,7 +717,7 @@ SpeedController::SpeedController(
 	Fn<float64(bool lastNonDefault)> value,
 	Fn<void(float64)> change,
 	std::vector<int> qualities,
-	Fn<int()> quality,
+	Fn<VideoQuality()> quality,
 	Fn<void(int)> changeQuality)
 : WithDropdownController(
 	button,
@@ -785,9 +785,9 @@ void SpeedController::save() {
 	_saved.fire({});
 }
 
-void SpeedController::setQuality(int quality) {
+void SpeedController::setQuality(VideoQuality quality) {
 	_quality = quality;
-	_changeQuality(quality);
+	_changeQuality(quality.manual ? quality.height : 0);
 }
 
 void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
@@ -810,7 +810,8 @@ void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
 	}
 
 	const auto add = [&](int quality) {
-		const auto text = quality ? u"%1p"_q.arg(quality) : u"Original"_q;
+		const auto automatic = tr::lng_mediaview_quality_auto(tr::now);
+		const auto text = quality ? u"%1p"_q.arg(quality) : automatic;
 		auto action = base::make_unique_q<Ui::Menu::Action>(
 			raw,
 			st.qualityMenu,
@@ -837,9 +838,15 @@ void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
 		}, check->lifetime());
 		check->setAttribute(Qt::WA_TransparentForMouseEvents);
 		_quality.value(
-		) | rpl::start_with_next([=](int now) {
-			const auto chosen = (now == quality);
+		) | rpl::start_with_next([=](VideoQuality now) {
+			const auto chosen = now.manual
+				? (now.height == quality)
+				: !quality;
 			raw->action()->setEnabled(!chosen);
+			if (!quality) {
+				raw->action()->setText(automatic
+					+ (now.manual ? QString() : u"\t%1p"_q.arg(now.height)));
+			}
 			check->setVisible(chosen);
 		}, raw->lifetime());
 		menu->addAction(std::move(action));
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.h b/Telegram/SourceFiles/media/player/media_player_dropdown.h
index 7975677ff..1a0e0bb08 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.h
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.h
@@ -132,7 +132,7 @@ public:
 		Fn<float64(bool lastNonDefault)> value,
 		Fn<void(float64)> change,
 		std::vector<int> qualities = {},
-		Fn<int()> quality = nullptr,
+		Fn<VideoQuality()> quality = nullptr,
 		Fn<void(int)> changeQuality = nullptr);
 
 	[[nodiscard]] rpl::producer<> saved() const;
@@ -146,7 +146,7 @@ private:
 	[[nodiscard]] float64 lastNonDefaultSpeed() const;
 	void toggleDefault();
 	void setSpeed(float64 newSpeed);
-	void setQuality(int quality);
+	void setQuality(VideoQuality quality);
 	void save();
 
 	const style::MediaSpeedButton &_st;
@@ -158,9 +158,9 @@ private:
 	rpl::event_stream<> _saved;
 
 	std::vector<int> _qualities;
-	Fn<int()> _lookupQuality;
+	Fn<VideoQuality()> _lookupQuality;
 	Fn<void(int)> _changeQuality;
-	rpl::variable<int> _quality;
+	rpl::variable<VideoQuality> _quality;
 
 };
 
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 127009d25..12792f370 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -1303,7 +1303,7 @@ void Instance::handleStreamingUpdate(
 		Streaming::Update &&update) {
 	using namespace Streaming;
 
-	v::match(update.data, [&](Information &update) {
+	v::match(update.data, [&](const Information &update) {
 		if (!update.video.size.isEmpty()) {
 			data->streamed->progress.setValueChangedCallback([=](
 					float64,
@@ -1315,16 +1315,17 @@ void Instance::handleStreamingUpdate(
 			requestRoundVideoResize();
 		}
 		emitUpdate(data->type);
-	}, [&](PreloadedVideo &update) {
+	}, [&](PreloadedVideo) {
 		//emitUpdate(data->type, [](AudioMsgId) { return true; });
-	}, [&](UpdateVideo &update) {
+	}, [&](UpdateVideo) {
 		emitUpdate(data->type);
-	}, [&](PreloadedAudio &update) {
+	}, [&](PreloadedAudio) {
 		//emitUpdate(data->type, [](AudioMsgId) { return true; });
-	}, [&](UpdateAudio &update) {
+	}, [&](UpdateAudio) {
 		emitUpdate(data->type);
-	}, [&](WaitingForData) {
-	}, [&](MutedByOther) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
 	}, [&](Finished) {
 		emitUpdate(data->type);
 		if (data->streamed && data->streamed->instance.player().finished()) {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_common.h b/Telegram/SourceFiles/media/streaming/media_streaming_common.h
index 86f76fea1..9f9b01c9d 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_common.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_common.h
@@ -17,9 +17,6 @@ inline constexpr auto kTimeUnknown = std::numeric_limits<crl::time>::min();
 inline constexpr auto kDurationMax = crl::time(std::numeric_limits<int>::max());
 inline constexpr auto kDurationUnavailable = std::numeric_limits<crl::time>::max();
 
-inline constexpr auto kOriginalQuality = 0;
-inline constexpr auto kAutoQuality = -1;
-
 namespace Audio {
 bool SupportsSpeedControl();
 } // namespace Audio
@@ -96,6 +93,11 @@ struct WaitingForData {
 	bool waiting = false;
 };
 
+struct SpeedEstimate {
+	int bytesPerSecond = 0;
+	bool unreliable = false;
+};
+
 struct MutedByOther {
 };
 
@@ -110,6 +112,7 @@ struct Update {
 		PreloadedAudio,
 		UpdateAudio,
 		WaitingForData,
+		SpeedEstimate,
 		MutedByOther,
 		Finished> data;
 };
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
index 9e7a083a2..5ba5ff5e9 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
@@ -29,13 +29,16 @@ constexpr auto kWaitingFastDuration = crl::time(200);
 constexpr auto kWaitingShowDuration = crl::time(500);
 constexpr auto kWaitingShowDelay = crl::time(500);
 constexpr auto kGoodThumbQuality = 87;
+constexpr auto kSwitchQualityUpPreloadedThreshold = 4 * crl::time(1000);
+constexpr auto kSwitchQualityUpSpeedMultiplier = 1.2;
 
 } // namespace
 
 Document::Document(
 	not_null<DocumentData*> document,
-	std::shared_ptr<Reader> reader)
-: Document(std::move(reader), document, nullptr) {
+	std::shared_ptr<Reader> reader,
+	std::vector<QualityDescriptor> otherQualities)
+: Document(std::move(reader), document, {}, std::move(otherQualities)) {
 	_player.fullInCache(
 	) | rpl::start_with_next([=](bool fullInCache) {
 		_document->setLoadedInMediaCache(fullInCache);
@@ -44,24 +47,27 @@ Document::Document(
 
 Document::Document(
 	not_null<PhotoData*> photo,
-	std::shared_ptr<Reader> reader)
-: Document(std::move(reader), nullptr, photo) {
+	std::shared_ptr<Reader> reader,
+	std::vector<QualityDescriptor> otherQualities)
+: Document(std::move(reader), {}, photo, {}) {
 }
 
 Document::Document(std::unique_ptr<Loader> loader)
-: Document(std::make_shared<Reader>(std::move(loader)), nullptr, nullptr) {
+: Document(std::make_shared<Reader>(std::move(loader)), {}, {}, {}) {
 }
 
 Document::Document(
 	std::shared_ptr<Reader> reader,
 	DocumentData *document,
-	PhotoData *photo)
+	PhotoData *photo,
+	std::vector<QualityDescriptor> otherQualities)
 : _document(document)
 , _photo(photo)
 , _player(std::move(reader))
 , _radial(
-		[=] { waitingCallback(); },
-		st::defaultInfiniteRadialAnimation) {
+	[=] { waitingCallback(); },
+	st::defaultInfiniteRadialAnimation)
+, _otherQualities(std::move(otherQualities)) {
 	resubscribe();
 }
 
@@ -138,20 +144,27 @@ Ui::RadialState Document::waitingState() const {
 	return _radial.computeState();
 }
 
+rpl::producer<int> Document::switchQualityRequests() const {
+	return _switchQualityRequests.events();
+}
+
 void Document::handleUpdate(Update &&update) {
 	v::match(update.data, [&](Information &update) {
 		ready(std::move(update));
-	}, [&](const PreloadedVideo &update) {
+	}, [&](PreloadedVideo update) {
 		_info.video.state.receivedTill = update.till;
-	}, [&](const UpdateVideo &update) {
+		checkSwitchToHigherQuality();
+	}, [&](UpdateVideo update) {
 		_info.video.state.position = update.position;
-	}, [&](const PreloadedAudio &update) {
+	}, [&](PreloadedAudio update) {
 		_info.audio.state.receivedTill = update.till;
-	}, [&](const UpdateAudio &update) {
+	}, [&](UpdateAudio update) {
 		_info.audio.state.position = update.position;
-	}, [&](const WaitingForData &update) {
+	}, [&](WaitingForData update) {
 		waitingChange(update.waiting);
-	}, [&](MutedByOther) {
+	}, [&](SpeedEstimate update) {
+		checkForQualitySwitch(update);
+	}, [](MutedByOther) {
 	}, [&](Finished) {
 		const auto finishTrack = [](TrackState &state) {
 			state.position = state.receivedTill = state.duration;
@@ -161,6 +174,76 @@ void Document::handleUpdate(Update &&update) {
 	});
 }
 
+void Document::setOtherQualities(std::vector<QualityDescriptor> value) {
+	_otherQualities = std::move(value);
+	checkForQualitySwitch(_lastSpeedEstimate);
+}
+
+void Document::checkForQualitySwitch(SpeedEstimate estimate) {
+	_lastSpeedEstimate = estimate;
+	if (!checkSwitchToHigherQuality()) {
+		checkSwitchToLowerQuality();
+	}
+}
+
+bool Document::checkSwitchToHigherQuality() {
+	if (_otherQualities.empty()
+		|| (_info.video.state.duration == kTimeUnknown)
+		|| (_info.video.state.duration == kDurationUnavailable)
+		|| (_info.video.state.position == kTimeUnknown)
+		|| (_info.video.state.receivedTill == kTimeUnknown)
+		|| !_lastSpeedEstimate.bytesPerSecond
+		|| _lastSpeedEstimate.unreliable
+		|| (_info.video.state.receivedTill
+			< std::min(
+				_info.video.state.duration,
+				(_info.video.state.position
+					+ kSwitchQualityUpPreloadedThreshold)))) {
+		return false;
+	}
+	const auto size = _player.fileSize();
+	Assert(size >= 0 && size <= std::numeric_limits<uint32>::max());
+	auto to = QualityDescriptor{ .sizeInBytes = uint32(size) };
+	const auto duration = _info.video.state.duration / 1000.;
+	const auto speed = _player.speed();
+	const auto multiplier = speed * kSwitchQualityUpSpeedMultiplier;
+	for (const auto &descriptor : _otherQualities) {
+		const auto perSecond = descriptor.sizeInBytes / duration;
+		if (descriptor.sizeInBytes > to.sizeInBytes
+			&& _lastSpeedEstimate.bytesPerSecond >= perSecond * multiplier) {
+			to = descriptor;
+		}
+	}
+	if (!to.height) {
+		return false;
+	}
+	_switchQualityRequests.fire_copy(to.height);
+	return true;
+}
+
+bool Document::checkSwitchToLowerQuality() {
+	if (_otherQualities.empty()
+		|| !_waiting
+		|| !_radial.animating()
+		|| !_lastSpeedEstimate.bytesPerSecond) {
+		return false;
+	}
+	const auto size = _player.fileSize();
+	Assert(size >= 0 && size <= std::numeric_limits<uint32>::max());
+	auto to = QualityDescriptor();
+	for (const auto &descriptor : _otherQualities) {
+		if (descriptor.sizeInBytes < size
+			&& descriptor.sizeInBytes > to.sizeInBytes) {
+			to = descriptor;
+		}
+	}
+	if (!to.height) {
+		return false;
+	}
+	_switchQualityRequests.fire_copy(to.height);
+	return true;
+}
+
 void Document::handleError(Error &&error) {
 	if (_document) {
 		if (error == Error::NotStreamable) {
@@ -195,6 +278,8 @@ void Document::waitingChange(bool waiting) {
 		_fading.start([=] {
 			waitingCallback();
 		}, _waiting ? 0. : 1., _waiting ? 1. : 0., duration);
+
+		checkSwitchToLowerQuality();
 	};
 	if (waiting) {
 		if (_radial.animating()) {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_document.h b/Telegram/SourceFiles/media/streaming/media_streaming_document.h
index f192aebb1..bdb579593 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_document.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_document.h
@@ -14,20 +14,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class DocumentData;
 
-namespace Media {
-namespace Streaming {
+namespace Media::Streaming {
 
 class Instance;
 class Loader;
 
+struct QualityDescriptor {
+	uint32 sizeInBytes = 0;
+	uint32 height = 0;
+};
+
 class Document {
 public:
 	Document(
 		not_null<DocumentData*> document,
-		std::shared_ptr<Reader> reader);
+		std::shared_ptr<Reader> reader,
+		std::vector<QualityDescriptor> otherQualities = {});
 	Document(
 		not_null<PhotoData*> photo,
-		std::shared_ptr<Reader> reader);
+		std::shared_ptr<Reader> reader,
+		std::vector<QualityDescriptor> otherQualities = {});
 	explicit Document(std::unique_ptr<Loader> loader);
 
 	void play(const PlaybackOptions &options);
@@ -41,11 +47,15 @@ public:
 	[[nodiscard]] float64 waitingOpacity() const;
 	[[nodiscard]] Ui::RadialState waitingState() const;
 
+	void setOtherQualities(std::vector<QualityDescriptor> value);
+	[[nodiscard]] rpl::producer<int> switchQualityRequests() const;
+
 private:
 	Document(
 		std::shared_ptr<Reader> reader,
 		DocumentData *document,
-		PhotoData *photo);
+		PhotoData *photo,
+		std::vector<QualityDescriptor> otherQualities);
 
 	friend class Instance;
 
@@ -54,6 +64,9 @@ private:
 	void refreshPlayerPriority();
 
 	void waitingCallback();
+	void checkForQualitySwitch(SpeedEstimate estimate);
+	bool checkSwitchToHigherQuality();
+	bool checkSwitchToLowerQuality();
 
 	void handleUpdate(Update &&update);
 	void handleError(Error &&error);
@@ -71,14 +84,15 @@ private:
 
 	rpl::lifetime _subscription;
 
-	bool _waiting = false;
 	mutable Ui::InfiniteRadialAnimation _radial;
 	Ui::Animations::Simple _fading;
 	base::Timer _timer;
 	base::flat_set<not_null<Instance*>> _instances;
+	std::vector<QualityDescriptor> _otherQualities;
+	rpl::event_stream<int> _switchQualityRequests;
+	SpeedEstimate _lastSpeedEstimate;
+	bool _waiting = false;
 
 };
 
-
-} // namespace Streaming
-} // namespace Media
+} // namespace Media::Streaming
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
index 22427c2ff..9e5ee8498 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
@@ -490,6 +490,14 @@ void File::setLoaderPriority(int priority) {
 	_reader->setLoaderPriority(priority);
 }
 
+int64 File::size() const {
+	return _reader->size();
+}
+
+rpl::producer<SpeedEstimate> File::speedEstimate() const {
+	return _reader->speedEstimate();
+}
+
 File::~File() {
 	stop();
 }
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.h b/Telegram/SourceFiles/media/streaming/media_streaming_file.h
index 38af45537..c17a8d195 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.h
@@ -42,6 +42,9 @@ public:
 	[[nodiscard]] bool isRemoteLoader() const;
 	void setLoaderPriority(int priority);
 
+	[[nodiscard]] int64 size() const;
+	[[nodiscard]] rpl::producer<SpeedEstimate> speedEstimate() const;
+
 	~File();
 
 private:
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp
index 898bf7678..f73efed10 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp
@@ -36,6 +36,21 @@ Instance::Instance(
 	std::move(waitingCallback)) {
 }
 
+Instance::Instance(
+	not_null<DocumentData*> quality,
+	not_null<DocumentData*> original,
+	HistoryItem *context,
+	Data::FileOrigin origin,
+	Fn<void()> waitingCallback)
+: Instance(
+	quality->owner().streaming().sharedDocument(
+		quality,
+		original,
+		context,
+		origin),
+	std::move(waitingCallback)) {
+}
+
 Instance::Instance(
 	not_null<PhotoData*> photo,
 	Data::FileOrigin origin,
@@ -72,6 +87,10 @@ const Information &Instance::info() const {
 	return _shared->info();
 }
 
+rpl::producer<int> Instance::switchQualityRequests() const {
+	return _shared->switchQualityRequests();
+}
+
 void Instance::play(const PlaybackOptions &options) {
 	Expects(_shared != nullptr);
 
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_instance.h b/Telegram/SourceFiles/media/streaming/media_streaming_instance.h
index 126cf9db0..9a7cfd9c3 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_instance.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_instance.h
@@ -34,6 +34,12 @@ public:
 		not_null<DocumentData*> document,
 		Data::FileOrigin origin,
 		Fn<void()> waitingCallback);
+	Instance(
+		not_null<DocumentData*> quality,
+		not_null<DocumentData*> original,
+		HistoryItem *context,
+		Data::FileOrigin origin,
+		Fn<void()> waitingCallback);
 	Instance(
 		not_null<PhotoData*> photo,
 		Data::FileOrigin origin,
@@ -45,6 +51,7 @@ public:
 
 	[[nodiscard]] const Player &player() const;
 	[[nodiscard]] const Information &info() const;
+	[[nodiscard]] rpl::producer<int> switchQualityRequests() const;
 
 	void play(const PlaybackOptions &options);
 	void pause();
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader.h b/Telegram/SourceFiles/media/streaming/media_streaming_loader.h
index 55845c520..f95183bab 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader.h
@@ -7,12 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "media/streaming/media_streaming_common.h"
+
 namespace Storage {
 class StreamedFileDownloader;
 } // namespace Storage
 
-namespace Media {
-namespace Streaming {
+namespace Media::Streaming {
 
 struct LoadedPart {
 	int64 offset = 0;
@@ -41,6 +42,8 @@ public:
 
 	// Parts will be sent from the main thread.
 	[[nodiscard]] virtual rpl::producer<LoadedPart> parts() const = 0;
+	[[nodiscard]] virtual auto speedEstimate() const
+		-> rpl::producer<SpeedEstimate> = 0;
 
 	virtual void attachDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader) = 0;
@@ -74,5 +77,4 @@ private:
 
 };
 
-} // namespace Streaming
-} // namespace Media
+} // namespace Media::Streaming
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp
index a85dbe775..868296d7b 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp
@@ -84,6 +84,10 @@ rpl::producer<LoadedPart> LoaderLocal::parts() const {
 	return _parts.events();
 }
 
+rpl::producer<SpeedEstimate> LoaderLocal::speedEstimate() const {
+	return rpl::never<SpeedEstimate>();
+}
+
 void LoaderLocal::attachDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader) {
 	Unexpected("Downloader attached to a local streaming loader.");
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.h b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.h
index 9531f6683..efb6d41bd 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.h
@@ -33,6 +33,7 @@ public:
 
 	// Parts will be sent from the main thread.
 	[[nodiscard]] rpl::producer<LoadedPart> parts() const override;
+	[[nodiscard]] rpl::producer<SpeedEstimate> speedEstimate() const override;
 
 	void attachDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader) override;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.cpp
index 15f881403..d6f869c58 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.cpp
@@ -14,6 +14,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Media {
 namespace Streaming {
+namespace {
+
+constexpr auto kCheckStatsInterval = crl::time(1000);
+constexpr auto kInitialStatsWait = 5 * crl::time(1000);
+
+} // namespace
 
 LoaderMtproto::LoaderMtproto(
 	not_null<Storage::DownloadManagerMtproto*> owner,
@@ -22,7 +28,8 @@ LoaderMtproto::LoaderMtproto(
 	Data::FileOrigin origin)
 : DownloadMtprotoTask(owner, location, origin)
 , _size(size)
-, _api(&api().instance()) {
+, _api(&api().instance())
+, _statsTimer([=] { checkStats(); }) {
 }
 
 Storage::Cache::Key LoaderMtproto::baseCacheKey() const {
@@ -121,12 +128,32 @@ bool LoaderMtproto::readyToRequest() const {
 
 int64 LoaderMtproto::takeNextRequestOffset() {
 	const auto offset = _requested.take();
+	Assert(offset.has_value());
+
+	const auto time = crl::now();
+	if (!_firstRequestStart) {
+		_firstRequestStart = time;
+	}
+	_stats.push_back({ .start = crl::now(), .offset = *offset });
 
 	Ensures(offset.has_value());
 	return *offset;
 }
 
 bool LoaderMtproto::feedPart(int64 offset, const QByteArray &bytes) {
+	const auto time = crl::now();
+	for (auto &entry : _stats) {
+		if (entry.offset == offset && entry.start < time) {
+			entry.end = time;
+			if (!_statsTimer.isActive()) {
+				const auto checkAt = std::max(
+					time + kCheckStatsInterval,
+					_firstRequestStart + kInitialStatsWait);
+				_statsTimer.callOnce(checkAt - time);
+			}
+			break;
+		}
+	}
 	_parts.fire({ offset, bytes });
 	return true;
 }
@@ -139,5 +166,56 @@ rpl::producer<LoadedPart> LoaderMtproto::parts() const {
 	return _parts.events();
 }
 
+rpl::producer<SpeedEstimate> LoaderMtproto::speedEstimate() const {
+	return _speedEstimate.events();
+}
+
+void LoaderMtproto::checkStats() {
+	const auto time = crl::now();
+	const auto from = time - kInitialStatsWait;
+	{ // Erase all stats entries that are too old.
+		for (auto i = begin(_stats); i != end(_stats);) {
+			if (i->start >= from) {
+				break;
+			} else if (i->end && i->end < from) {
+				i = _stats.erase(i);
+			} else {
+				++i;
+			}
+		}
+	}
+	if (_stats.empty()) {
+		return;
+	}
+	// Count duration for which at least one request was in progress.
+	// This is the time we should consider for download speed.
+	// We don't count time when no requests were in progress.
+	auto durationCountedTill = _stats.front().start;
+	auto duration = crl::time(0);
+	auto received = int64(0);
+	for (const auto &entry : _stats) {
+		if (entry.start > durationCountedTill) {
+			durationCountedTill = entry.start;
+		}
+		const auto till = entry.end ? entry.end : time;
+		if (till > durationCountedTill) {
+			duration += (till - durationCountedTill);
+			durationCountedTill = till;
+		}
+		if (entry.end) {
+			received += Storage::kDownloadPartSize;
+		}
+	}
+	if (duration) {
+		_speedEstimate.fire({
+			.bytesPerSecond = int(std::clamp(
+				int64(received * 1000 / duration),
+				int64(0),
+				int64(64 * 1024 * 1024))),
+			.unreliable = (received < 3 * Storage::kDownloadPartSize),
+		});
+	}
+}
+
 } // namespace Streaming
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h
index 93635efb1..c3a025a1e 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/timer.h"
 #include "media/streaming/media_streaming_loader.h"
 #include "mtproto/sender.h"
 #include "data/data_file_origin.h"
@@ -36,12 +37,19 @@ public:
 
 	// Parts will be sent from the main thread.
 	[[nodiscard]] rpl::producer<LoadedPart> parts() const override;
+	[[nodiscard]] rpl::producer<SpeedEstimate> speedEstimate() const override;
 
 	void attachDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader) override;
 	void clearAttachedDownloader() override;
 
 private:
+	struct StatsEntry {
+		crl::time start = 0;
+		crl::time end = 0;
+		int64 offset = 0;
+	};
+
 	bool readyToRequest() const override;
 	int64 takeNextRequestOffset() override;
 	bool feedPart(int64 offset, const QByteArray &bytes) override;
@@ -50,6 +58,8 @@ private:
 	void cancelForOffset(int64 offset);
 	void addToQueueWithPriority();
 
+	void checkStats();
+
 	const int64 _size = 0;
 	int _priority = 0;
 
@@ -57,6 +67,11 @@ private:
 
 	PriorityQueue _requested;
 	rpl::event_stream<LoadedPart> _parts;
+	rpl::event_stream<SpeedEstimate> _speedEstimate;
+
+	std::vector<StatsEntry> _stats;
+	crl::time _firstRequestStart = 0;
+	base::Timer _statsTimer;
 
 	Storage::StreamedFileDownloader *_downloader = nullptr;
 
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
index b4133b0da..0005d1754 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
@@ -715,6 +715,10 @@ void Player::start() {
 	_stage = Stage::Started;
 	const auto guard = base::make_weak(&_sessionGuard);
 
+	_file->speedEstimate() | rpl::start_with_next([=](SpeedEstimate value) {
+		_updates.fire({ value });
+	}, _sessionLifetime);
+
 	rpl::merge(
 		_audio ? _audio->waitingForData() : nullptr,
 		_video ? _video->waitingForData() : nullptr
@@ -881,6 +885,10 @@ rpl::producer<bool> Player::fullInCache() const {
 	return _fullInCache.events();
 }
 
+int64 Player::fileSize() const {
+	return _file->size();
+}
+
 QSize Player::videoSize() const {
 	return _information.video.size;
 }
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.h b/Telegram/SourceFiles/media/streaming/media_streaming_player.h
index 148dc7a11..0b8257dae 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.h
@@ -60,6 +60,7 @@ public:
 	[[nodiscard]] rpl::producer<Update, Error> updates() const;
 	[[nodiscard]] rpl::producer<bool> fullInCache() const;
 
+	[[nodiscard]] int64 fileSize() const;
 	[[nodiscard]] QSize videoSize() const;
 	[[nodiscard]] QImage frame(
 		const FrameRequest &request,
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
index 95654e590..1788f6dbb 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
@@ -1099,6 +1099,10 @@ void Reader::continueDownloaderFromMainThread() {
 	}
 }
 
+rpl::producer<SpeedEstimate> Reader::speedEstimate() const {
+	return _loader->speedEstimate();
+}
+
 void Reader::setLoaderPriority(int priority) {
 	if (_realPriority == priority) {
 		return;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_reader.h b/Telegram/SourceFiles/media/streaming/media_streaming_reader.h
index 179829846..a86a55fcd 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_reader.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_reader.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "media/streaming/media_streaming_common.h"
 #include "media/streaming/media_streaming_loader.h"
 #include "base/bytes.h"
 #include "base/weak_ptr.h"
@@ -78,6 +79,7 @@ public:
 	void cancelForDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader);
 	void continueDownloaderFromMainThread();
+	[[nodiscard]] rpl::producer<SpeedEstimate> speedEstimate() const;
 
 	~Reader();
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index ae3217b05..098eecfbd 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -51,6 +51,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/view/media_view_overlay_raster.h"
 #include "media/view/media_view_overlay_opengl.h"
 #include "media/stories/media_stories_view.h"
+#include "media/streaming/media_streaming_document.h"
 #include "media/streaming/media_streaming_player.h"
 #include "media/player/media_player_instance.h"
 #include "history/history.h"
@@ -320,7 +321,9 @@ struct OverlayWidget::Collage {
 
 struct OverlayWidget::Streamed {
 	Streamed(
-		not_null<DocumentData*> document,
+		not_null<DocumentData*> quality,
+		not_null<DocumentData*> original,
+		HistoryItem *context,
 		Data::FileOrigin origin,
 		Fn<void()> waitingCallback);
 	Streamed(
@@ -449,10 +452,12 @@ private:
 };
 
 OverlayWidget::Streamed::Streamed(
-	not_null<DocumentData*> document,
+	not_null<DocumentData*> quality,
+	not_null<DocumentData*> original,
+	HistoryItem *context,
 	Data::FileOrigin origin,
 	Fn<void()> waitingCallback)
-: instance(document, origin, std::move(waitingCallback)) {
+: instance(quality, original, context, origin, std::move(waitingCallback)) {
 }
 
 OverlayWidget::Streamed::Streamed(
@@ -2264,36 +2269,6 @@ OverlayWidget::~OverlayWidget() {
 	_dropdown.destroy();
 }
 
-auto OverlayWidget::resolveQualities() const
--> const std::vector<not_null<DocumentData*>> & {
-	static const auto empty = std::vector<not_null<DocumentData*>>();
-	const auto video = _document ? _document->video() : nullptr;
-	const auto media = _message ? _message->media() : nullptr;
-	if (!video || !media || media->document() != _document) {
-		return empty;
-	}
-	return media->hasQualitiesList() ? video->qualities : empty;
-}
-
-not_null<DocumentData*> OverlayWidget::chooseQuality() const {
-	Expects(_document != nullptr);
-
-	const auto &list = resolveQualities();
-	if (list.empty() || _quality == kOriginalQuality) {
-		return _document;
-	}
-	auto closest = _document;
-	auto closestAbs = std::abs(_quality - _document->resolveVideoQuality());
-	for (const auto &quality : list) {
-		const auto abs = std::abs(_quality - quality->resolveVideoQuality());
-		if (abs < closestAbs) {
-			closestAbs = abs;
-			closest = quality;
-		}
-	}
-	return closest;
-}
-
 void OverlayWidget::assignMediaPointer(DocumentData *document) {
 	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
 	_photo = nullptr;
@@ -2302,7 +2277,8 @@ void OverlayWidget::assignMediaPointer(DocumentData *document) {
 		_streamedQualityChangeFrame = QImage();
 		_streamedQualityChangeFinished = false;
 		if ((_document = document)) {
-			_chosenQuality = chooseQuality();
+			_quality = Core::App().settings().videoQuality();
+			_chosenQuality = _document->chooseQuality(_message, _quality);
 			_documentMedia = _document->createMediaView();
 			_documentMedia->goodThumbnailWanted();
 			_documentMedia->thumbnailWanted(fileOrigin());
@@ -3863,6 +3839,16 @@ bool OverlayWidget::initStreaming(const StartStreaming &startStreaming) {
 		handleStreamingError(std::move(error));
 	}, _streamed->instance.lifetime());
 
+	_streamed->instance.switchQualityRequests(
+	) | rpl::filter([=](int quality) {
+		return !_quality.manual && _quality.height != quality;
+	}) | rpl::start_with_next([=](int quality) {
+		applyVideoQuality({
+			.manual = 0,
+			.height = uint32(quality),
+		});
+	}, _streamed->instance.lifetime());
+
 	if (startStreaming.continueStreaming) {
 		_pip = nullptr;
 	}
@@ -3992,7 +3978,12 @@ bool OverlayWidget::createStreamingObjects() {
 	const auto callback = [=] { waitingAnimationCallback(); };
 	const auto video = _chosenQuality ? _chosenQuality : _document;
 	if (video) {
-		_streamed = std::make_unique<Streamed>(video, origin, callback);
+		_streamed = std::make_unique<Streamed>(
+			video,
+			_document,
+			_message,
+			origin,
+			callback);
 	} else {
 		_streamed = std::make_unique<Streamed>(_photo, origin, callback);
 	}
@@ -4065,19 +4056,20 @@ void OverlayWidget::handleStreamingUpdate(Streaming::Update &&update) {
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
+	}, [&](PreloadedVideo) {
 		updatePlaybackState();
-	}, [&](const UpdateVideo &update) {
+	}, [&](UpdateVideo update) {
 		updateContentRect();
 		Core::App().updateNonIdle();
 		updatePlaybackState();
 		_streamedPosition = update.position;
-	}, [&](const PreloadedAudio &update) {
+	}, [&](PreloadedAudio) {
 		updatePlaybackState();
-	}, [&](const UpdateAudio &update) {
+	}, [&](UpdateAudio) {
 		updatePlaybackState();
-	}, [&](WaitingForData) {
-	}, [&](MutedByOther) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
 	}, [&](Finished) {
 		updatePlaybackState();
 	});
@@ -4439,7 +4431,10 @@ float64 OverlayWidget::playbackControlsCurrentSpeed(bool lastNonDefault) {
 }
 
 std::vector<int> OverlayWidget::playbackControlsQualities() {
-	const auto &list = resolveQualities();
+	if (!_document) {
+		return {};
+	}
+	const auto &list = _document->resolveQualities(_message);
 	if (list.empty()) {
 		return {};
 	}
@@ -4451,37 +4446,53 @@ std::vector<int> OverlayWidget::playbackControlsQualities() {
 	return result;
 }
 
-int OverlayWidget::playbackControlsCurrentQuality() {
-	return _chosenQuality ? _chosenQuality->resolveVideoQuality() : _quality;
+VideoQuality OverlayWidget::playbackControlsCurrentQuality() {
+	return _chosenQuality
+		? VideoQuality{
+			.manual = _quality.manual,
+			.height = uint32(_chosenQuality->resolveVideoQuality()),
+		}
+		: _quality;
 }
 
 void OverlayWidget::playbackControlsQualityChanged(int quality) {
-	const auto now = _chosenQuality;
-	if (_quality != quality) {
-		_quality = quality;
-		Core::App().settings().setVideoQuality(quality);
-		Core::App().saveSettingsDelayed();
-		if (_document) {
-			_chosenQuality = chooseQuality();
-			if (_chosenQuality != now) {
-				if (_streamed && _streamed->instance.ready()) {
-					_streamedQualityChangeFrame = currentVideoFrameImage();
-				}
-				if (_streamed
-					&& (!_streamed->instance.player().active()
-						|| _streamed->instance.player().finished())) {
-					_streamedQualityChangeFinished = true;
-				}
-				_streamingStartPaused = _streamedQualityChangeFinished
-					|| (_streamed && _streamed->instance.player().paused());
-				clearStreaming();
-				const auto time = _streamedPosition;
-				const auto startStreaming = StartStreaming(false, time);
-				if (!canInitStreaming() || !initStreaming(startStreaming)) {
-					redisplayContent();
-				}
-			}
-		}
+	applyVideoQuality({
+		.manual = (quality > 0),
+		.height = quality ? uint32(quality) : _quality.height,
+	});
+}
+
+void OverlayWidget::applyVideoQuality(VideoQuality value) {
+	if (_quality == value) {
+		return;
+	}
+	_quality = value;
+	Core::App().settings().setVideoQuality(value);
+	Core::App().saveSettingsDelayed();
+
+	if (!_document) {
+		return;
+	}
+	const auto resolved = _document->chooseQuality(_message, _quality);
+	if (_chosenQuality == resolved) {
+		return;
+	}
+	_chosenQuality = resolved;
+	if (_streamed && _streamed->instance.ready()) {
+		_streamedQualityChangeFrame = currentVideoFrameImage();
+	}
+	if (_streamed
+		&& (!_streamed->instance.player().active()
+			|| _streamed->instance.player().finished())) {
+		_streamedQualityChangeFinished = true;
+	}
+	_streamingStartPaused = _streamedQualityChangeFinished
+		|| (_streamed && _streamed->instance.player().paused());
+	clearStreaming();
+	const auto time = _streamedPosition;
+	const auto startStreaming = StartStreaming(false, time);
+	if (!canInitStreaming() || !initStreaming(startStreaming)) {
+		redisplayContent();
 	}
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 45dbbe794..19f55b423 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -16,9 +16,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user_photos.h"
 #include "data/data_web_page.h"
 #include "data/data_cloud_themes.h" // Data::CloudTheme.
+#include "media/stories/media_stories_delegate.h"
 #include "media/view/media_view_playback_controls.h"
 #include "media/view/media_view_open_common.h"
-#include "media/stories/media_stories_delegate.h"
+#include "media/media_common.h"
 
 class History;
 
@@ -237,7 +238,7 @@ private:
 	void playbackControlsSpeedChanged(float64 speed) override;
 	float64 playbackControlsCurrentSpeed(bool lastNonDefault) override;
 	std::vector<int> playbackControlsQualities() override;
-	int playbackControlsCurrentQuality() override;
+	VideoQuality playbackControlsCurrentQuality() override;
 	void playbackControlsQualityChanged(int quality) override;
 	void playbackControlsToFullScreen() override;
 	void playbackControlsFromFullScreen() override;
@@ -527,9 +528,7 @@ private:
 	void clearStreaming(bool savePosition = true);
 	[[nodiscard]] bool canInitStreaming() const;
 	[[nodiscard]] bool saveControlLocked() const;
-	[[nodiscard]] not_null<DocumentData*> chooseQuality() const;
-	[[nodiscard]] auto resolveQualities() const
-		-> const std::vector<not_null<DocumentData*>> &;
+	void applyVideoQuality(VideoQuality value);
 
 	[[nodiscard]] bool topShadowOnTheRight() const;
 	void applyHideWindowWorkaround();
@@ -558,7 +557,7 @@ private:
 	PhotoData *_photo = nullptr;
 	DocumentData *_document = nullptr;
 	DocumentData *_chosenQuality = nullptr;
-	int _quality = {};
+	Media::VideoQuality _quality;
 	QString _documentLoadingTo;
 	std::shared_ptr<Data::PhotoMedia> _photoMedia;
 	std::shared_ptr<Data::DocumentMedia> _documentMedia;
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index cf9ea7079..5399ccef9 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -1532,21 +1532,22 @@ void Pip::paintVolumeControllerContent(
 void Pip::handleStreamingUpdate(Streaming::Update &&update) {
 	using namespace Streaming;
 
-	v::match(update.data, [&](Information &update) {
+	v::match(update.data, [&](const Information &update) {
 		_panel.setAspectRatio(
 			FlipSizeByRotation(update.video.size, _rotation));
-	}, [&](const PreloadedVideo &update) {
+	}, [&](PreloadedVideo) {
 		updatePlaybackState();
-	}, [&](const UpdateVideo &update) {
+	}, [&](UpdateVideo) {
 		_panel.update();
 		Core::App().updateNonIdle();
 		updatePlaybackState();
-	}, [&](const PreloadedAudio &update) {
+	}, [&](PreloadedAudio) {
 		updatePlaybackState();
-	}, [&](const UpdateAudio &update) {
+	}, [&](UpdateAudio) {
 		updatePlaybackState();
-	}, [&](WaitingForData) {
-	}, [&](MutedByOther) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
 	}, [&](Finished) {
 		updatePlaybackState();
 	});
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index 132286c31..4a396fbcf 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -73,9 +73,10 @@ PlaybackControls::PlaybackControls(
 	_speedToggle->setSpeed(_speedControllable
 		? _delegate->playbackControlsCurrentSpeed(false)
 		: 1.);
-	_speedToggle->setQuality(_qualitiesList.empty()
+	const auto quality = _delegate->playbackControlsCurrentQuality();
+	_speedToggle->setQuality((_qualitiesList.empty() || !quality.manual)
 		? 0
-		: _delegate->playbackControlsCurrentQuality());
+		: quality.height);
 
 	if (const auto controller = _speedController.get()) {
 		controller->menuToggledValue(
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.h b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
index 0ba2cf973..a67fc73ec 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.h
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/rp_widget.h"
 #include "base/object_ptr.h"
+#include "media/media_common.h"
 
 namespace Ui {
 class LabelSimple;
@@ -46,7 +47,8 @@ public:
 			bool lastNonDefault) = 0;
 		[[nodiscard]] virtual auto playbackControlsQualities()
 			-> std::vector<int> = 0;
-		[[nodiscard]] virtual int playbackControlsCurrentQuality() = 0;
+		[[nodiscard]] virtual auto playbackControlsCurrentQuality()
+			-> VideoQuality = 0;
 		virtual void playbackControlsQualityChanged(int quality) = 0;
 		virtual void playbackControlsToFullScreen() = 0;
 		virtual void playbackControlsFromFullScreen() = 0;
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 d180059dd..49eeacd46 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
@@ -150,14 +150,15 @@ void ItemSingleMediaPreview::setupStreamedPreview(
 void ItemSingleMediaPreview::handleStreamingUpdate(Update &&update) {
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo) {
 		this->update();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index ea0bfa937..947a15791 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -716,14 +716,15 @@ void UserpicButton::handleStreamingUpdate(Media::Streaming::Update &&update) {
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo) {
 		this->update();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 

From 1e2d0ced20ffbcbb85f7882ced04dc53f3dac8f1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Oct 2024 19:22:23 +0400
Subject: [PATCH 123/306] Update submodules.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 638be741b..e7b92a8e8 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 638be741bcfc0866522a4680dbfffc0485bd10b8
+Subproject commit e7b92a8e85cd84b8e2e5c912f5fad6643e207963
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index d5337d58e..6dadd92e4 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit d5337d58ebe39cffe421c7ce7725d2bfe9d03159
+Subproject commit 6dadd92e42e2626d512a35fcd09f87f6ffdad8db

From 7168a00ee47bc918841261247e71b16742ce321a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 28 Oct 2024 12:46:11 +0400
Subject: [PATCH 124/306] Update submodules

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index fe0e81036..1be687618 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -42,7 +42,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 e47e7ed0d383b8ca5622a58a5ffa0c8d5f00651f \
+	&& git fetch --depth=1 origin 643b18c2be6424fc6f35a52891ed5a6a42502ac2 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
@@ -770,7 +770,7 @@ COPY --link --from=pipewire {{ LibrariesPath }}/pipewire-cache /
 RUN git init tg_owt \
 	&& cd tg_owt \
 	&& git remote add origin {{ GIT }}/desktop-app/tg_owt.git \
-	&& git fetch --depth=1 origin 4a60ce1ab9fdb962004c6a959f682ace3db50cbd \
+	&& git fetch --depth=1 origin 8198c4d8b91e22d68eb5c7327fd408e3b6abcc79 \
 	&& git reset --hard FETCH_HEAD \
 	&& git submodule update --init --recursive --depth=1 \
 	&& rm -rf .git \
diff --git a/cmake b/cmake
index 3ca8fb8c9..5d09552ff 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 3ca8fb8c91fdf5b52565a8294f6cb33e8b6d6852
+Subproject commit 5d09552ff83312d48e8aca849d92401cf266d198
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a158f9c0f..987cf0c1a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -166,7 +166,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: e47e7ed0d383b8ca5622a58a5ffa0c8d5f00651f
+    source-commit: 643b18c2be6424fc6f35a52891ed5a6a42502ac2
     plugin: dump
     override-pull: |
       craftctl default
@@ -447,7 +447,7 @@ parts:
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
     source-depth: 1
-    source-commit: 4a60ce1ab9fdb962004c6a959f682ace3db50cbd
+    source-commit: 8198c4d8b91e22d68eb5c7327fd408e3b6abcc79
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s

From dae9f2ab2b1981170cf6774835c7faaa2422fb20 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 28 Oct 2024 11:52:39 +0400
Subject: [PATCH 125/306] Replace CMAKE_CXX_COMPILER_FRONTEND_VARIANT check
 with MSVC variable

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

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c627861b3..13af508c3 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1854,7 +1854,7 @@ endif()
 
 set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
 
-if (WIN32 AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+if (MSVC)
     target_link_libraries(Telegram
     PRIVATE
         delayimp
@@ -1951,7 +1951,7 @@ if (NOT DESKTOP_APP_DISABLE_AUTOUPDATE AND NOT build_macstore AND NOT build_wins
             base/platform/win/base_windows_safe_library.h
         )
         target_include_directories(Updater PRIVATE ${lib_base_loc})
-        if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+        if (MSVC)
             target_link_libraries(Updater
             PRIVATE
                 delayimp

From e0a0d9c03990493d7ddbd8cc5fe47e733ff8021f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 28 Oct 2024 11:57:45 +0400
Subject: [PATCH 126/306] Remove outdated ifdef

The file doesn't have __in anymore
---
 Telegram/SourceFiles/platform/win/windows_dlls.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h
index 9ebed92fc..6ed503c8d 100644
--- a/Telegram/SourceFiles/platform/win/windows_dlls.h
+++ b/Telegram/SourceFiles/platform/win/windows_dlls.h
@@ -16,10 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <RestartManager.h>
 #include <psapi.h>
 
-#ifdef __MINGW32__
-#define __in
-#endif
-
 namespace Platform {
 namespace Dlls {
 

From ebd0c3696acf7efca7b234e15197fc26930a3b88 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 31 Oct 2024 02:35:11 +0400
Subject: [PATCH 127/306] Remove #ifndef __MINGW32__ from Windows notifications

It uses C++/WinRT nowadays just like all other code so there's no point in #ifndef'ing only it
---
 .../platform/win/notifications_manager_win.cpp      | 13 -------------
 .../platform/win/notifications_manager_win.h        |  3 ---
 2 files changed, 16 deletions(-)

diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
index 618e81823..0e50281cb 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
@@ -37,7 +37,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <shellapi.h>
 #include <strsafe.h>
 
-#ifndef __MINGW32__
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Data.Xml.Dom.h>
 #include <winrt/Windows.UI.Notifications.h>
@@ -48,12 +47,9 @@ using namespace winrt::Windows::UI::Notifications;
 using namespace winrt::Windows::Data::Xml::Dom;
 using namespace winrt::Windows::Foundation;
 using winrt::com_ptr;
-#endif // !__MINGW32__
 
 namespace Platform {
 namespace Notifications {
-
-#ifndef __MINGW32__
 namespace {
 
 constexpr auto kQuerySettingsEachMs = 1000;
@@ -376,7 +372,6 @@ bool SkipFlashBounceForCustom() {
 }
 
 } // namespace
-#endif // !__MINGW32__
 
 void MaybePlaySoundForCustom(Fn<void()> playSound) {
 	if (!SkipSoundForCustom()) {
@@ -405,15 +400,11 @@ bool WaitForInputForCustom() {
 }
 
 bool Supported() {
-#ifndef __MINGW32__
 	if (!Checked) {
 		Checked = true;
 		Check();
 	}
 	return InitSucceeded;
-#endif // !__MINGW32__
-
-	return false;
 }
 
 bool Enforced() {
@@ -425,7 +416,6 @@ bool ByDefault() {
 }
 
 void Create(Window::Notifications::System *system) {
-#ifndef __MINGW32__
 	if (Core::App().settings().nativeNotifications() && Supported()) {
 		auto result = std::make_unique<Manager>(system);
 		if (result->init()) {
@@ -433,11 +423,9 @@ void Create(Window::Notifications::System *system) {
 			return;
 		}
 	}
-#endif // !__MINGW32__
 	system->setManager(nullptr);
 }
 
-#ifndef __MINGW32__
 class Manager::Private {
 public:
 	explicit Private(Manager *instance);
@@ -992,7 +980,6 @@ void Manager::doMaybeFlashBounce(Fn<void()> flashBounce) {
 		flashBounce();
 	}
 }
-#endif // !__MINGW32__
 
 } // namespace Notifications
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.h b/Telegram/SourceFiles/platform/win/notifications_manager_win.h
index eba557177..6fb62e414 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.h
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.h
@@ -14,8 +14,6 @@ struct ToastActivation;
 namespace Platform {
 namespace Notifications {
 
-#ifndef __MINGW32__
-
 class Manager : public Window::Notifications::NativeManager {
 public:
 	Manager(Window::Notifications::System *system);
@@ -54,7 +52,6 @@ private:
 	const std::unique_ptr<Private> _private;
 
 };
-#endif // !__MINGW32__
 
 } // namespace Notifications
 } // namespace Platform

From e0e4a7bec6916ea4e223707a83593fc42ad8550b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 31 Oct 2024 02:42:28 +0400
Subject: [PATCH 128/306] Always rely on __has_include(<winres.h>)

---
 Telegram/Resources/winrc/Telegram.rc | 14 ++++----------
 Telegram/Resources/winrc/Updater.rc  | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 2d9bc821e..79ceebbc5 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -6,17 +6,11 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#if defined(__MINGW64__) || defined(__MINGW32__)
-	// MinGW-w64, MinGW
-	#if defined(__has_include) && __has_include(<winres.h>)
-		#include <winres.h>
-	#else
-		#include <afxres.h>
-		#include <winresrc.h>
-	#endif
+#if defined(__has_include) && __has_include(<winres.h>)
+    #include <winres.h>
 #else
-	// MSVC, Windows SDK
-	#include <winres.h>
+    #include <afxres.h>
+    #include <winresrc.h>
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 918a473ca..088f2f856 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -6,17 +6,11 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#if defined(__MINGW64__) || defined(__MINGW32__)
-	// MinGW-w64, MinGW
-	#if defined(__has_include) && __has_include(<winres.h>)
-		#include <winres.h>
-	#else
-		#include <afxres.h>
-		#include <winresrc.h>
-	#endif
+#if defined(__has_include) && __has_include(<winres.h>)
+    #include <winres.h>
 #else
-	// MSVC, Windows SDK
-	#include <winres.h>
+    #include <afxres.h>
+    #include <winresrc.h>
 #endif
 
 /////////////////////////////////////////////////////////////////////////////

From 2365363dcc6ed2adc139c9a8ba3cd79ce3270d9b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 30 Oct 2024 11:01:04 +0400
Subject: [PATCH 129/306] webkitgtk-6.0 -> webkit2gtk-4.1 in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 987cf0c1a..42e5c541a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -70,14 +70,12 @@ 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/webkitgtk-6.0:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0
+  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1:
+    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1
 
 parts:
   telegram:
@@ -121,7 +119,7 @@ parts:
       - libprotobuf-lite32t64
       - libpulse0
       - libssl3t64
-      - libwebkitgtk-6.0-4
+      - libwebkit2gtk-4.1-0
       - libxcb1
       - libxcb-keysyms1
       - libxcb-record0

From ae7bd7112b2325ecd81d91f3aca6e2cec1a690c2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 30 Oct 2024 11:02:20 +0400
Subject: [PATCH 130/306] Stop recommending webkitgtk-6.0

---
 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 aff3af8c2..0ededbc3a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3988,7 +3988,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_payments_webview_no_use" = "Unfortunately, you can't use payments with current system configuration.";
 "lng_payments_webview_install_edge" = "Please install {link}.";
-"lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkitgtk-6.0/webkit2gtk-4.1/webkit2gtk-4.0) using your package manager.";
+"lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkit2gtk-4.1/webkit2gtk-4.0) using your package manager.";
 "lng_payments_webview_update_windows" = "Please update your system to Windows 8.1 or later.";
 "lng_payments_sure_close" = "Are you sure you want to close this payment form? The changes you made will be lost.";
 "lng_payments_receipt_label" = "Receipt";

From 20fb73b626bd7628e307969bf87b15298151c2b4 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 31 Oct 2024 03:29:11 +0400
Subject: [PATCH 131/306] Add error message for webview without OpenGL

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

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0ededbc3a..ccc634cf5 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3989,6 +3989,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_payments_webview_no_use" = "Unfortunately, you can't use payments with current system configuration.";
 "lng_payments_webview_install_edge" = "Please install {link}.";
 "lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkit2gtk-4.1/webkit2gtk-4.0) using your package manager.";
+"lng_payments_webview_enable_opengl" = "Please enable OpenGL in application settings.";
 "lng_payments_webview_update_windows" = "Please update your system to Windows 8.1 or later.";
 "lng_payments_sure_close" = "Are you sure you want to close this payment form? The changes you made will be lost.";
 "lng_payments_receipt_label" = "Receipt";
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 0081928a8..ef25c73ac 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -1603,6 +1603,8 @@ TextWithEntities ErrorText(const Webview::Available &info) {
 			Ui::Text::WithEntities);
 	case Error::NoWebKitGTK:
 		return { tr::lng_payments_webview_install_webkit(tr::now) };
+	case Error::NoOpenGL:
+		return { tr::lng_payments_webview_enable_opengl(tr::now) };
 	case Error::OldWindows:
 		return { tr::lng_payments_webview_update_windows(tr::now) };
 	default:

From b0933b96efa0ec5d346427108793edbcb93ff579 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 30 Oct 2024 11:08:39 +0400
Subject: [PATCH 132/306] Add error message for webview unsupported display
 server

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

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ccc634cf5..e8b568829 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3990,6 +3990,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_payments_webview_install_edge" = "Please install {link}.";
 "lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkit2gtk-4.1/webkit2gtk-4.0) using your package manager.";
 "lng_payments_webview_enable_opengl" = "Please enable OpenGL in application settings.";
+"lng_payments_webview_switch_x11" = "Unsupported display server. Please switch to X11.";
 "lng_payments_webview_update_windows" = "Please update your system to Windows 8.1 or later.";
 "lng_payments_sure_close" = "Are you sure you want to close this payment form? The changes you made will be lost.";
 "lng_payments_receipt_label" = "Receipt";
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index ef25c73ac..3aca29e87 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -1605,6 +1605,8 @@ TextWithEntities ErrorText(const Webview::Available &info) {
 		return { tr::lng_payments_webview_install_webkit(tr::now) };
 	case Error::NoOpenGL:
 		return { tr::lng_payments_webview_enable_opengl(tr::now) };
+	case Error::NonX11:
+		return { tr::lng_payments_webview_switch_x11(tr::now) };
 	case Error::OldWindows:
 		return { tr::lng_payments_webview_update_windows(tr::now) };
 	default:

From 2d786aa02c78923dd40eb842f6247f86714c5148 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Oct 2024 20:31:52 +0400
Subject: [PATCH 133/306] Fix a typo in phrases.

---
 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 e8b568829..d35679d98 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3306,7 +3306,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_scheduled_send_now_many#one" = "Send {count} message now?";
 "lng_scheduled_send_now_many#other" = "Send {count} messages now?";
 "lng_scheduled_video_tip_title" = "Improving video...";
-"lng_scheduled_video_tip_text" = "The video will be published after it's optimized for the bast viewing experience.";
+"lng_scheduled_video_tip_text" = "The video will be published after it's optimized for the best viewing experience.";
 "lng_scheduled_video_tip" = "Processing video may take a few minutes.";
 "lng_scheduled_video_published" = "Video Published.";
 "lng_scheduled_video_view" = "View";

From 4a5d8aa2174149bbca2eeae83cbf3623433e1fac Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Oct 2024 20:32:29 +0400
Subject: [PATCH 134/306] Fix build with MSVC.

---
 Telegram/SourceFiles/history/history_inner_widget.cpp | 2 +-
 Telegram/SourceFiles/menu/menu_sponsored.cpp          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 23495d24c..d026cf9ca 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2696,7 +2696,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		const auto sponsored = (item && item->isSponsored())
 			? item
 			: (Element::Moused() && Element::Moused()->data()->isSponsored())
-			? Element::Moused()->data()
+			? Element::Moused()->data().get()
 			: nullptr;
 		if (sponsored) {
 			Menu::FillSponsored(
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 349ab26e4..68e896c16 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -368,10 +368,10 @@ void FillSponsored(
 	const auto details = session->sponsoredMessages().lookupDetails(fullId);
 	const auto &info = details.info;
 
-	if (!mediaViewer && !details.info.empty()) {
+	if (!mediaViewer && !info.empty()) {
 		auto fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
 			const auto allText = ranges::accumulate(
-				details.info,
+				info,
 				TextWithEntities(),
 				[](TextWithEntities a, TextWithEntities b) {
 					return a.text.isEmpty() ? b : a.append('\n').append(b);
@@ -380,7 +380,7 @@ void FillSponsored(
 				TextUtilities::SetClipboardText({ allText });
 				show->showToast(tr::lng_text_copied(tr::now));
 			};
-			for (const auto &i : details.info) {
+			for (const auto &i : info) {
 				auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
 					menu,
 					st::defaultMenu,

From 0067245739c8dd795d65840e504b26a8f998e85f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Oct 2024 20:32:41 +0400
Subject: [PATCH 135/306] Send more viewport_changed, just in case.

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

diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 3aca29e87..daab6358f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -712,6 +712,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
 			crl::on_main(view, [=] {
 				sendViewport();
+				InvokeQueued(view, [=] { sendViewport(); });
 			});
 		}
 	}, _webview->lifetime);

From 7684466acf79b412dfb02307ab8b36e85e71bf5d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Oct 2024 20:32:54 +0400
Subject: [PATCH 136/306] Fix crash in quality auto-toggle.

---
 .../media/view/media_view_playback_controls.cpp      | 12 +++++++-----
 .../media/view/media_view_playback_controls.h        |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index 4a396fbcf..5ecb20da4 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -73,10 +73,7 @@ PlaybackControls::PlaybackControls(
 	_speedToggle->setSpeed(_speedControllable
 		? _delegate->playbackControlsCurrentSpeed(false)
 		: 1.);
-	const auto quality = _delegate->playbackControlsCurrentQuality();
-	_speedToggle->setQuality((_qualitiesList.empty() || !quality.manual)
-		? 0
-		: quality.height);
+	updateSpeedToggleQuality();
 
 	if (const auto controller = _speedController.get()) {
 		controller->menuToggledValue(
@@ -221,10 +218,15 @@ void PlaybackControls::saveSpeed(float64 speed) {
 }
 
 void PlaybackControls::saveQuality(int quality) {
-	_speedToggle->setQuality(quality);
+	_speedToggle->setQuality(_qualitiesList.empty() ? 0 : quality);
 	_delegate->playbackControlsQualityChanged(quality);
 }
 
+void PlaybackControls::updateSpeedToggleQuality() {
+	const auto quality = _delegate->playbackControlsCurrentQuality();
+	_speedToggle->setQuality(_qualitiesList.empty() ? 0 : quality.height);
+}
+
 void PlaybackControls::updatePlaybackSpeed(float64 speed) {
 	DEBUG_LOG(("Media playback speed: update to %1.").arg(speed));
 	_delegate->playbackControlsSpeedChanged(speed);
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.h b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
index a67fc73ec..a91b8ad2e 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.h
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
@@ -97,6 +97,7 @@ private:
 	void saveSpeed(float64 speed);
 
 	void saveQuality(int quality);
+	void updateSpeedToggleQuality();
 
 	const not_null<Delegate*> _delegate;
 

From a75d7f0381f2e358210dbf33293c7a3b2ceb2037 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Oct 2024 21:02:22 +0400
Subject: [PATCH 137/306] Version 5.7.

- Sending video messages.
- New video quality selection in channels.
- Adding media to sent text messages via Edit.
- Ads in bots with revenue sharing with bot developers.
- Chat-specific hashtags.
---
 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                                |  8 ++++++++
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 6b9a46d69..c6186e383 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.6.4.0" />
+    Version="5.7.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 79ceebbc5..2e6d03f48 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -38,8 +38,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,6,4,0
- PRODUCTVERSION 5,6,4,0
+ FILEVERSION 5,7,0,0
+ PRODUCTVERSION 5,7,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -56,10 +56,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.6.4.0"
+            VALUE "FileVersion", "5.7.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.6.4.0"
+            VALUE "ProductVersion", "5.7.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 088f2f856..6fd861b92 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,6,4,0
- PRODUCTVERSION 5,6,4,0
+ FILEVERSION 5,7,0,0
+ PRODUCTVERSION 5,7,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,10 +47,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.6.4.0"
+            VALUE "FileVersion", "5.7.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.6.4.0"
+            VALUE "ProductVersion", "5.7.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 6d97509ce..f84301932 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 = 5006004;
-constexpr auto AppVersionStr = "5.6.4";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 5007000;
+constexpr auto AppVersionStr = "5.7";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index da53e6e51..99a49a446 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5006004
-AppVersionStrMajor 5.6
-AppVersionStrSmall 5.6.4
-AppVersionStr      5.6.4
-BetaChannel        1
+AppVersion         5007000
+AppVersionStrMajor 5.7
+AppVersionStrSmall 5.7
+AppVersionStr      5.7.0
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.6.4.beta
+AppVersionOriginal 5.7
diff --git a/changelog.txt b/changelog.txt
index ceb6c9d56..859af28a7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+5.7 (31.10.24)
+
+- Sending video messages.
+- New video quality selection in channels.
+- Adding media to sent text messages via Edit.
+- Ads in bots with revenue sharing with bot developers.
+- Chat-specific hashtags.
+
 5.6.4 beta (24.10.24)
 
 - Add recording of video messages in case a camera is available.

From 8c3c8f888d3500573d4b40125c3edcc02f3be35b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Oct 2024 21:34:57 +0400
Subject: [PATCH 138/306] Version 5.7: Fix build with Xcode.

---
 Telegram/SourceFiles/core/core_settings.cpp                 | 6 ++++--
 .../info/channel_statistics/earn/info_channel_earn_list.cpp | 2 +-
 Telegram/SourceFiles/iv/iv_controller.cpp                   | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index e680527e2..0e47733b1 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -93,13 +93,15 @@ void LogPosition(const WindowPosition &position, const QString &name) {
 [[nodiscard]] quint32 SerializeVideoQuality(Media::VideoQuality quality) {
 	static_assert(sizeof(Media::VideoQuality) == sizeof(uint32));
 	auto result = uint32();
-	memcpy(&result, &quality, sizeof(quality));
+	const auto data = static_cast<const void*>(&quality);
+	memcpy(&result, data, sizeof(quality));
 	return result;
 }
 
 [[nodiscard]] Media::VideoQuality DeserializeVideoQuality(quint32 value) {
 	auto result = Media::VideoQuality();
-	memcpy(&result, &value, sizeof(result));
+	const auto data = static_cast<void*>(&result);
+	memcpy(data, &value, sizeof(result));
 	return (result.height <= 4320) ? result : Media::VideoQuality();
 }
 
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index c7b2806e4..88da162ea 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -368,7 +368,7 @@ void InnerWidget::fill() {
 	);
 
 	auto creditsStateValue = bot
-		? rpl::single(Data::CreditsEarnStatistics())
+		? rpl::single(Data::CreditsEarnStatistics()) | rpl::type_erased()
 		: rpl::single(creditsData) | rpl::then(
 			_stateUpdated.events(
 			) | rpl::map([this] { return _state.creditsEarn; })
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 8b4b0206c..7565fc90d 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -83,7 +83,7 @@ public:
 
 		AbstractButton::setDisabled(true);
 
-		const auto processTooltip = [=, this](not_null<Ui::RpWidget*> w) {
+		const auto processTooltip = [=](not_null<Ui::RpWidget*> w) {
 			w->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
 				if (e->type() == QEvent::Enter) {
 					Ui::Tooltip::Show(1000, this);
@@ -171,7 +171,7 @@ public:
 		rpl::combine(
 			sizeValue(),
 			reset->sizeValue()
-		) | rpl::start_with_next([=, this](const QSize &size, const QSize &) {
+		) | rpl::start_with_next([=](const QSize &size, const QSize &) {
 			reset->setFullWidth(0
 				+ resetLabel->width()
 				+ st::ivResetZoomInnerPadding);
@@ -658,7 +658,7 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 			_delegate->ivSetZoom(value);
 		}, lifetime());
 		_delegate->ivZoomValue(
-		) | rpl::start_with_next([=, this](int value) {
+		) | rpl::start_with_next([=](int value) {
 			webviewZoomController->setZoom(value);
 		}, lifetime());
 	}

From 1ca1f0fa7de36d62017d8d4d728a9b9f072b8918 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Oct 2024 23:19:19 +0400
Subject: [PATCH 139/306] Revert "Always rely on __has_include(<winres.h>)"

This reverts commit e0e4a7bec6916ea4e223707a83593fc42ad8550b.

Didn't work for me, gave errors when building.
---
 Telegram/Resources/winrc/Telegram.rc | 14 ++++++++++----
 Telegram/Resources/winrc/Updater.rc  | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 2e6d03f48..adfa817e1 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -6,11 +6,17 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#if defined(__has_include) && __has_include(<winres.h>)
-    #include <winres.h>
+#if defined(__MINGW64__) || defined(__MINGW32__)
+	// MinGW-w64, MinGW
+	#if defined(__has_include) && __has_include(<winres.h>)
+		#include <winres.h>
+	#else
+		#include <afxres.h>
+		#include <winresrc.h>
+	#endif
 #else
-    #include <afxres.h>
-    #include <winresrc.h>
+	// MSVC, Windows SDK
+	#include <winres.h>
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 6fd861b92..f9a116f81 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -6,11 +6,17 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#if defined(__has_include) && __has_include(<winres.h>)
-    #include <winres.h>
+#if defined(__MINGW64__) || defined(__MINGW32__)
+	// MinGW-w64, MinGW
+	#if defined(__has_include) && __has_include(<winres.h>)
+		#include <winres.h>
+	#else
+		#include <afxres.h>
+		#include <winresrc.h>
+	#endif
 #else
-    #include <afxres.h>
-    #include <winresrc.h>
+	// MSVC, Windows SDK
+	#include <winres.h>
 #endif
 
 /////////////////////////////////////////////////////////////////////////////

From d34c4cc2f2397182d84a09cac84980cefac047aa Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Fri, 1 Nov 2024 00:32:17 +0000
Subject: [PATCH 140/306] Update User-Agent for DNS to Chrome 130.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 0f20d25b3..0206faf32 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/129.0.0.0 Safari/537.36");
+		"Chrome/130.0.0.0 Safari/537.36");
 	return kResult;
 }
 

From b97ce43fca71700a0c47167fef52001f00db5607 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 1 Nov 2024 02:11:10 +0400
Subject: [PATCH 141/306] Revert "Use GSL from a desktop-app fork."

This reverts commit bbe431201724ea284106cf9a4a7827526e87dd3a.
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 91f154826..a3d8f19bf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/telegramdesktop/libtgvoip
 [submodule "Telegram/ThirdParty/GSL"]
 	path = Telegram/ThirdParty/GSL
-	url = https://github.com/desktop-app/GSL.git
+	url = https://github.com/Microsoft/GSL.git
 [submodule "Telegram/ThirdParty/xxHash"]
 	path = Telegram/ThirdParty/xxHash
 	url = https://github.com/Cyan4973/xxHash.git

From 8bd28bce69c729cbef6ed818e4109fd1e2366e0c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 1 Nov 2024 02:18:17 +0400
Subject: [PATCH 142/306] Update GSL to 4.1.0

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

diff --git a/Telegram/ThirdParty/GSL b/Telegram/ThirdParty/GSL
index 09938e870..87f9d7688 160000
--- a/Telegram/ThirdParty/GSL
+++ b/Telegram/ThirdParty/GSL
@@ -1 +1 @@
-Subproject commit 09938e870420b69a01f55c755207c871bc20b4e5
+Subproject commit 87f9d768866548b5b86e72be66c60c5abd4d9b37

From 2873e64ca23ca32cc14ac89ffd5235da08fbd612 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 09:00:59 +0400
Subject: [PATCH 143/306] Update cmake_helpers.

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

diff --git a/cmake b/cmake
index 5d09552ff..c181046ef 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 5d09552ff83312d48e8aca849d92401cf266d198
+Subproject commit c181046efdecf52c372324c74d75118a1b239e8e

From ffa8c2be7914ea8f64cec4bc0f8afa22d71e50e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 09:56:20 +0400
Subject: [PATCH 144/306] Fix some of newlines before skip blocks.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index e7b92a8e8..5062318cf 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit e7b92a8e85cd84b8e2e5c912f5fad6643e207963
+Subproject commit 5062318cf051ab9a84a5518d778fc2c7c47447f2

From 535b223333969f0ddddac5f031b3ccefeba4783b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 10:10:16 +0400
Subject: [PATCH 145/306] Fix video playback settings button dpr.

---
 Telegram/SourceFiles/media/player/media_player_button.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp
index 3d828b07f..2fc6b8877 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_button.cpp
@@ -402,6 +402,7 @@ void SettingsButton::prepareFrame() {
 		_frameCache = QImage(
 			_st.size * ratio,
 			QImage::Format_ARGB32_Premultiplied);
+		_frameCache.setDevicePixelRatio(ratio);
 	}
 	_frameCache.fill(Qt::transparent);
 	auto p = QPainter(&_frameCache);

From 07f0c182e6bcce14fe41af13db7b4f0e056e42dc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 10:15:00 +0400
Subject: [PATCH 146/306] Don't change speed on settings click.

---
 .../media/player/media_player_dropdown.cpp           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
index f6ab757b0..53208ada8 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
@@ -734,10 +734,14 @@ SpeedController::SpeedController(
 	Expects(_qualities.empty() || (_lookupQuality && _changeQuality));
 
 	button->setClickedCallback([=] {
-		toggleDefault();
-		save();
-		if (const auto current = menu()) {
-			current->otherEnter();
+		if (_lookup && _qualities.empty()) {
+			toggleDefault();
+			save();
+			if (const auto current = menu()) {
+				current->otherEnter();
+			}
+		} else {
+			showMenu();
 		}
 	});
 	if (const auto lookup = _lookup) {

From 7096a4231fa935fae52398c856562f58225eff28 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 11:26:03 +0400
Subject: [PATCH 147/306] Fix PiP -> viewer streaming jump.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 098eecfbd..27113c355 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3857,6 +3857,7 @@ bool OverlayWidget::initStreaming(const StartStreaming &startStreaming) {
 			&& !_streamed->instance.player().finished())) {
 		startStreamingPlayer(startStreaming);
 	} else {
+		_streamed->ready = _streamed->instance.player().ready();
 		updatePlaybackState();
 	}
 	return true;

From 3cfa963f69ad31803fbb782595f1c7543c1b0043 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 1 Nov 2024 11:22:13 +0300
Subject: [PATCH 148/306] Added start date to subscription entry in credits
 transactions history.

---
 .../SourceFiles/boxes/gift_premium_box.cpp    | 10 +++++++++
 .../settings/settings_credits_graphics.cpp    | 21 +++++++++++--------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index e9e126b90..d1bdd9bf1 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -1310,6 +1310,16 @@ void AddSubscriptionEntryTable(
 		controller,
 		peerId);
 	if (!s.until.isNull()) {
+		if (s.subscription.period > 0) {
+			const auto subscribed = s.until.addSecs(-s.subscription.period);
+			if (subscribed.isValid()) {
+				AddTableRow(
+					table,
+					tr::lng_group_invite_joined_row_date(),
+					rpl::single(
+						Ui::Text::WithEntities(langDateTime(subscribed))));
+			}
+		}
 		AddTableRow(
 			table,
 			s.expired
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index b466dab84..6d0677348 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1212,16 +1212,19 @@ void ReceiptCreditsBox(
 	}
 	if (s) {
 		Ui::AddSkip(content);
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
+		auto label = object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				s.cancelled
-					? tr::lng_credits_subscription_off_about()
-					: tr::lng_credits_subscription_on_about(
-						lt_date,
-						rpl::single(langDayOfMonthFull(s.until.date()))),
-				st::creditsBoxAboutDivider)));
+			s.cancelled
+				? tr::lng_credits_subscription_off_about()
+				: tr::lng_credits_subscription_on_about(
+					lt_date,
+					rpl::single(langDayOfMonthFull(s.until.date()))),
+				st::creditsBoxAboutDivider);
+		if (s.cancelled) {
+			label->setTextColorOverride(st::menuIconAttentionColor->c);
+		}
+		box->addRow(
+			object_ptr<Ui::CenterWrap<>>(box, std::move(label)));
 	}
 
 	Ui::AddSkip(content);

From 0971485367a2af33af9b8446f4d71f01abb62db7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 14:15:28 +0400
Subject: [PATCH 149/306] Support quality change in PiP.

---
 .../streaming/media_streaming_instance.cpp    |  13 ++
 .../streaming/media_streaming_instance.h      |   1 +
 .../media/view/media_view_overlay_widget.cpp  |  22 ++-
 .../SourceFiles/media/view/media_view_pip.cpp | 152 ++++++++++++++----
 .../SourceFiles/media/view/media_view_pip.h   |  36 ++++-
 5 files changed, 182 insertions(+), 42 deletions(-)

diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp
index f73efed10..4d4149ce3 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp
@@ -17,6 +17,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Media {
 namespace Streaming {
 
+Instance::Instance(const Instance &other)
+: _shared(other._shared)
+, _waitingCallback(other._waitingCallback)
+, _priority(other._priority)
+, _playerLocked(other._playerLocked) {
+	if (_shared) {
+		_shared->registerInstance(this);
+		if (_playerLocked) {
+			_shared->player().lock();
+		}
+	}
+}
+
 Instance::Instance(
 	std::shared_ptr<Document> shared,
 	Fn<void()> waitingCallback)
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_instance.h b/Telegram/SourceFiles/media/streaming/media_streaming_instance.h
index 9a7cfd9c3..314779401 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_instance.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_instance.h
@@ -27,6 +27,7 @@ class Player;
 
 class Instance {
 public:
+	Instance(const Instance &other);
 	Instance(
 		std::shared_ptr<Document> shared,
 		Fn<void()> waitingCallback);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 27113c355..d069604a6 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -345,6 +345,10 @@ struct OverlayWidget::PipWrap {
 	PipWrap(
 		QWidget *parent,
 		not_null<DocumentData*> document,
+		Data::FileOrigin origin,
+		not_null<DocumentData*> chosenQuality,
+		HistoryItem *context,
+		VideoQuality quality,
 		std::shared_ptr<Streaming::Document> shared,
 		FnMut<void()> closeAndContinue,
 		FnMut<void()> destroy);
@@ -470,6 +474,10 @@ OverlayWidget::Streamed::Streamed(
 OverlayWidget::PipWrap::PipWrap(
 	QWidget *parent,
 	not_null<DocumentData*> document,
+	Data::FileOrigin origin,
+	not_null<DocumentData*> chosenQuality,
+	HistoryItem *context,
+	VideoQuality quality,
 	std::shared_ptr<Streaming::Document> shared,
 	FnMut<void()> closeAndContinue,
 	FnMut<void()> destroy)
@@ -477,6 +485,10 @@ OverlayWidget::PipWrap::PipWrap(
 , wrapped(
 	&delegate,
 	document,
+	origin,
+	chosenQuality,
+	context,
+	quality,
 	std::move(shared),
 	std::move(closeAndContinue),
 	std::move(destroy)) {
@@ -3849,10 +3861,14 @@ bool OverlayWidget::initStreaming(const StartStreaming &startStreaming) {
 		});
 	}, _streamed->instance.lifetime());
 
+	const auto continuing = startStreaming.continueStreaming
+		&& _pip
+		&& (_pip->wrapped.shared().get()
+			== _streamed->instance.shared().get());
 	if (startStreaming.continueStreaming) {
 		_pip = nullptr;
 	}
-	if (!startStreaming.continueStreaming
+	if (!continuing
 		|| (!_streamed->instance.player().active()
 			&& !_streamed->instance.player().finished())) {
 		startStreamingPlayer(startStreaming);
@@ -4517,6 +4533,10 @@ void OverlayWidget::switchToPip() {
 	_pip = std::make_unique<PipWrap>(
 		_window,
 		document,
+		fileOrigin(),
+		_chosenQuality ? _chosenQuality : document,
+		_message,
+		_quality,
 		_streamed->instance.shared(),
 		closeAndContinue,
 		[=] { _pip = nullptr; });
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index 5399ccef9..94e44cb99 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -885,18 +885,30 @@ void PipPanel::updateDecorations() {
 Pip::Pip(
 	not_null<Delegate*> delegate,
 	not_null<DocumentData*> data,
+	Data::FileOrigin origin,
+	not_null<DocumentData*> chosenQuality,
+	HistoryItem *context,
+	VideoQuality quality,
 	std::shared_ptr<Streaming::Document> shared,
 	FnMut<void()> closeAndContinue,
 	FnMut<void()> destroy)
 : _delegate(delegate)
 , _data(data)
-, _instance(std::move(shared), [=] { waitingAnimationCallback(); })
+, _origin(origin)
+, _chosenQuality(chosenQuality)
+, _context(context)
+, _quality(quality)
+, _instance(
+	std::in_place,
+	std::move(shared),
+	[=] { waitingAnimationCallback(); })
 , _panel(
 	_delegate->pipParentWidget(),
 	[=](Ui::GL::Capabilities capabilities) {
 		return chooseRenderer(capabilities);
 	})
 , _playbackProgress(std::make_unique<PlaybackProgress>())
+, _dataMedia(_data->createMediaView())
 , _rotation(data->owner().mediaRotation().get(data))
 , _lastPositiveVolume((Core::App().settings().videoVolume() > 0.)
 	? Core::App().settings().videoVolume()
@@ -911,15 +923,28 @@ Pip::Pip(
 	) | rpl::start_with_next([=] {
 		_destroy();
 	}, _panel.rp()->lifetime());
+
+	if (_context) {
+		_data->owner().itemRemoved(
+		) | rpl::start_with_next([=](not_null<const HistoryItem*> data) {
+			if (_context != data) {
+				_context = nullptr;
+			}
+		}, _panel.rp()->lifetime());
+	}
 }
 
 Pip::~Pip() = default;
 
+std::shared_ptr<Streaming::Document> Pip::shared() const {
+	return _instance->shared();
+}
+
 void Pip::setupPanel() {
 	_panel.init();
 	const auto size = [&] {
-		if (!_instance.info().video.size.isEmpty()) {
-			return _instance.info().video.size;
+		if (!_instance->info().video.size.isEmpty()) {
+			return _instance->info().video.size;
 		}
 		const auto media = _data->activeMediaView();
 		if (media) {
@@ -1138,8 +1163,8 @@ void Pip::seekProgress(float64 value) {
 		_lastDurationMs);
 	if (_seekPositionMs != positionMs) {
 		_seekPositionMs = positionMs;
-		if (!_instance.player().paused()
-			&& !_instance.player().finished()) {
+		if (!_instance->player().paused()
+			&& !_instance->player().finished()) {
 			_pausedBySeek = true;
 			playbackPauseResume();
 		}
@@ -1157,7 +1182,7 @@ void Pip::seekFinish(float64 value) {
 		crl::time(0),
 		_lastDurationMs);
 	_seekPositionMs = -1;
-	_startPaused = !_pausedBySeek && !_instance.player().finished();
+	_startPaused = !_pausedBySeek && !_instance->player().finished();
 	restartAtSeekPosition(positionMs);
 }
 
@@ -1294,18 +1319,71 @@ void Pip::updatePlayPauseResumeState(const Player::TrackState &state) {
 }
 
 void Pip::setupStreaming() {
-	_instance.setPriority(kPipLoaderPriority);
-	_instance.lockPlayer();
+	_instance->setPriority(kPipLoaderPriority);
+	_instance->lockPlayer();
 
-	_instance.player().updates(
+	_instance->switchQualityRequests(
+	) | rpl::filter([=](int quality) {
+		return !_quality.manual && _quality.height != quality;
+	}) | rpl::start_with_next([=](int quality) {
+		applyVideoQuality({
+			.manual = 0,
+			.height = uint32(quality),
+		});
+	}, _instance->lifetime());
+
+	_instance->player().updates(
 	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Streaming::Error &&error) {
 		handleStreamingError(std::move(error));
-	}, _instance.lifetime());
+	}, _instance->lifetime());
 	updatePlaybackState();
 }
 
+void Pip::applyVideoQuality(VideoQuality value) {
+	if (_quality == value
+		|| !_dataMedia->canBePlayed(_context)) {
+		return;
+	}
+	const auto resolved = _data->chooseQuality(_context, value);
+	if (_chosenQuality == resolved) {
+		return;
+	}
+	auto instance = Streaming::Instance(
+		resolved,
+		_data,
+		_context,
+		_origin,
+		[=] { waitingAnimationCallback(); });
+	if (!instance.valid()) {
+		return;
+	}
+
+	if (_instance->ready()) {
+		_qualityChangeFrame = currentVideoFrameImage();
+	}
+	if (!_instance->player().active()
+		|| _instance->player().finished()) {
+		_qualityChangeFinished = true;
+	}
+	_startPaused = _qualityChangeFinished || _instance->player().paused();
+
+	_quality = value;
+	Core::App().settings().setVideoQuality(value);
+	Core::App().saveSettingsDelayed();
+	_chosenQuality = resolved;
+	_instance.emplace(std::move(instance));
+	setupStreaming();
+	restartAtSeekPosition(_lastUpdatePosition);
+}
+
+QImage Pip::currentVideoFrameImage() const {
+	return _instance->player().ready()
+		? _instance->player().currentFrameImage()
+		: _instance->info().video.cover;
+}
+
 Ui::GL::ChosenRenderer Pip::chooseRenderer(
 		Ui::GL::Capabilities capabilities) {
 	const auto use = Platform::IsMac()
@@ -1336,12 +1414,12 @@ void Pip::paint(not_null<Renderer*> renderer) const {
 		.fade = controlsShown,
 		.outer = _panel.widget()->size(),
 		.rotation = _rotation,
-		.videoRotation = _instance.info().video.rotation,
+		.videoRotation = _instance->info().video.rotation,
 		.useTransparency = _panel.useTransparency(),
 	};
 	if (canUseVideoFrame()) {
 		renderer->paintTransformedVideoFrame(geometry);
-		_instance.markFrameShown();
+		_instance->markFrameShown();
 	} else {
 		const auto content = staticContent();
 		if (_preparedCoverState == ThumbState::Cover) {
@@ -1349,7 +1427,7 @@ void Pip::paint(not_null<Renderer*> renderer) const {
 		}
 		renderer->paintTransformedStaticContent(content, geometry);
 	}
-	if (_instance.waitingShown()) {
+	if (_instance->waitingShown()) {
 		renderer->paintRadialLoading(countRadialRect(), controlsShown);
 	}
 	if (controlsShown > 0) {
@@ -1535,12 +1613,14 @@ void Pip::handleStreamingUpdate(Streaming::Update &&update) {
 	v::match(update.data, [&](const Information &update) {
 		_panel.setAspectRatio(
 			FlipSizeByRotation(update.video.size, _rotation));
+		_qualityChangeFrame = QImage();
 	}, [&](PreloadedVideo) {
 		updatePlaybackState();
-	}, [&](UpdateVideo) {
+	}, [&](UpdateVideo update) {
 		_panel.update();
 		Core::App().updateNonIdle();
 		updatePlaybackState();
+		_lastUpdatePosition = update.position;
 	}, [&](PreloadedAudio) {
 		updatePlaybackState();
 	}, [&](UpdateAudio) {
@@ -1554,7 +1634,7 @@ void Pip::handleStreamingUpdate(Streaming::Update &&update) {
 }
 
 void Pip::updatePlaybackState() {
-	const auto state = _instance.player().prepareLegacyState();
+	const auto state = _instance->player().prepareLegacyState();
 	updatePlayPauseResumeState(state);
 	if (state.position == kTimeUnknown
 		|| state.length == kTimeUnknown
@@ -1619,61 +1699,65 @@ void Pip::handleStreamingError(Streaming::Error &&error) {
 }
 
 void Pip::playbackPauseResume() {
-	if (_instance.player().failed()) {
+	if (_instance->player().failed()) {
 		_panel.widget()->close();
-	} else if (_instance.player().finished()
-		|| !_instance.player().active()) {
+	} else if (_instance->player().finished()
+		|| !_instance->player().active()) {
 		_startPaused = false;
 		restartAtSeekPosition(0);
-	} else if (_instance.player().paused()) {
-		_instance.resume();
+	} else if (_instance->player().paused()) {
+		_instance->resume();
 		updatePlaybackState();
 	} else {
-		_instance.pause();
+		_instance->pause();
 		updatePlaybackState();
 	}
 }
 
 void Pip::restartAtSeekPosition(crl::time position) {
-	if (!_instance.info().video.cover.isNull()) {
+	_lastUpdatePosition = position;
+
+	if (!_instance->info().video.cover.isNull()) {
 		_preparedCoverStorage = QImage();
 		_preparedCoverState = ThumbState::Empty;
-		_instance.saveFrameToCover();
+		_instance->saveFrameToCover();
 	}
 
 	auto options = Streaming::PlaybackOptions();
 	options.position = position;
 	options.hwAllowed = Core::App().settings().hardwareAcceleratedVideo();
-	options.audioId = _instance.player().prepareLegacyState().id;
+	options.audioId = _instance->player().prepareLegacyState().id;
 	options.speed = _delegate->pipPlaybackSpeed();
 
-	_instance.play(options);
+	_instance->play(options);
 	if (_startPaused) {
-		_instance.pause();
+		_instance->pause();
 	}
 	_pausedBySeek = false;
 	updatePlaybackState();
 }
 
 bool Pip::canUseVideoFrame() const {
-	return _instance.player().ready()
-		&& !_instance.info().video.cover.isNull();
+	return _instance->player().ready()
+		&& !_instance->info().video.cover.isNull();
 }
 
 QImage Pip::videoFrame(const FrameRequest &request) const {
 	Expects(canUseVideoFrame());
 
-	return _instance.frame(request);
+	return _instance->frame(request);
 }
 
 Streaming::FrameWithInfo Pip::videoFrameWithInfo() const {
 	Expects(canUseVideoFrame());
 
-	return _instance.frameWithInfo();
+	return _instance->frameWithInfo();
 }
 
 QImage Pip::staticContent() const {
-	const auto &cover = _instance.info().video.cover;
+	const auto &cover = !_qualityChangeFrame.isNull()
+		? _qualityChangeFrame
+		: _instance->info().video.cover;
 	const auto media = _data->activeMediaView();
 	const auto use = media
 		? media
@@ -1701,7 +1785,7 @@ QImage Pip::staticContent() const {
 	}
 	_preparedCoverState = state;
 	if (state == ThumbState::Cover) {
-		_preparedCoverStorage = _instance.info().video.cover;
+		_preparedCoverStorage = cover;
 	} else {
 		_preparedCoverStorage = (good
 			? good
@@ -1727,7 +1811,7 @@ void Pip::paintRadialLoadingContent(
 		st::radialLine,
 		st::radialLine,
 		st::radialLine));
-	p.setOpacity(_instance.waitingOpacity());
+	p.setOpacity(_instance->waitingOpacity());
 	p.setPen(Qt::NoPen);
 	p.setBrush(st::radialBg);
 	{
@@ -1737,7 +1821,7 @@ void Pip::paintRadialLoadingContent(
 	p.setOpacity(1.);
 	Ui::InfiniteRadialAnimation::Draw(
 		p,
-		_instance.waitingState(),
+		_instance->waitingState(),
 		arc.topLeft(),
 		arc.size(),
 		_panel.widget()->width(),
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.h b/Telegram/SourceFiles/media/view/media_view_pip.h
index d0156e1bd..503973896 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.h
+++ b/Telegram/SourceFiles/media/view/media_view_pip.h
@@ -7,13 +7,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/data_file_origin.h"
 #include "media/streaming/media_streaming_instance.h"
+#include "media/media_common.h"
 #include "ui/effects/animations.h"
 #include "ui/round_rect.h"
 #include "ui/rp_widget.h"
 
 #include <QtCore/QPointer>
 
+class HistoryItem;
+
 namespace base {
 class PowerSaveBlocker;
 } // namespace base
@@ -32,12 +36,15 @@ struct Capabilities;
 } // namespace GL
 } // namespace Ui
 
-namespace Media {
-namespace Player {
+namespace Media::Player {
 struct TrackState;
-} // namespace Player
+} // namespace Media::Player
 
-namespace View {
+namespace Media::Streaming {
+class Document;
+} // namespace Media::Streaming
+
+namespace Media::View {
 
 class PlaybackProgress;
 
@@ -134,11 +141,17 @@ public:
 	Pip(
 		not_null<Delegate*> delegate,
 		not_null<DocumentData*> data,
+		Data::FileOrigin origin,
+		not_null<DocumentData*> chosenQuality,
+		HistoryItem *context,
+		VideoQuality quality,
 		std::shared_ptr<Streaming::Document> shared,
 		FnMut<void()> closeAndContinue,
 		FnMut<void()> destroy);
 	~Pip();
 
+	[[nodiscard]] std::shared_ptr<Streaming::Document> shared() const;
+
 private:
 	enum class OverState {
 		None,
@@ -245,6 +258,8 @@ private:
 		QRect outer,
 		float64 shown) const;
 	[[nodiscard]] QRect countRadialRect() const;
+	void applyVideoQuality(VideoQuality value);
+	[[nodiscard]] QImage currentVideoFrameImage() const;
 
 	void seekUpdate(QPoint position);
 	void seekProgress(float64 value);
@@ -252,7 +267,11 @@ private:
 
 	const not_null<Delegate*> _delegate;
 	const not_null<DocumentData*> _data;
-	Streaming::Instance _instance;
+	const Data::FileOrigin _origin;
+	DocumentData *_chosenQuality = nullptr;
+	HistoryItem *_context = nullptr;
+	Media::VideoQuality _quality;
+	std::optional<Streaming::Instance> _instance;
 	bool _opengl = false;
 	PipPanel _panel;
 	QSize _size;
@@ -260,6 +279,10 @@ private:
 	std::unique_ptr<PlaybackProgress> _playbackProgress;
 	std::shared_ptr<Data::DocumentMedia> _dataMedia;
 
+	QImage _qualityChangeFrame;
+	bool _qualityChangeFinished = false;
+	crl::time _lastUpdatePosition = 0;
+
 	bool _showPause = false;
 	bool _startPaused = false;
 	bool _pausedBySeek = false;
@@ -288,5 +311,4 @@ private:
 
 };
 
-} // namespace View
-} // namespace Media
+} // namespace Media::View

From 99c5d994b54900933bad9b92ecceae657b914f25 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 14:16:43 +0400
Subject: [PATCH 150/306] Add special string for bot revenue.

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

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d35679d98..1da6e2be3 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5214,6 +5214,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sponsored_revenued_info1_description" = "Ads on Telegram do not use your personal information and are based on the channel in which you see them.";
 "lng_sponsored_revenued_info1_bot_description" = "Ads on Telegram do not use your personal information and are based on the mini app in which you see them.";
 "lng_sponsored_revenued_info2_title" = "Help the Channel Creator";
+"lng_sponsored_revenued_info2_bot_title" = "Help the Bot Developer";
 "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_info2_bot_description" = "50% of the revenue from Telegram Ads goes to the developer of the mini app where they are displayed.";
 "lng_sponsored_revenued_info3_title" = "Can Be Removed";
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 68e896c16..631f4aa8f 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -143,7 +143,9 @@ void AboutBox(
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 		addEntry(
-			tr::lng_sponsored_revenued_info2_title(),
+			(isChannel
+				? tr::lng_sponsored_revenued_info2_title
+				: tr::lng_sponsored_revenued_info2_bot_title)(),
 			(isChannel
 				? tr::lng_sponsored_revenued_info2_description
 				: tr::lng_sponsored_revenued_info2_bot_description)(

From e1b33fbc405cb6edddbe45b54cbc5bc0b9428fd5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 14:35:33 +0400
Subject: [PATCH 151/306] Remove unneeded separator from context menu.

---
 Telegram/SourceFiles/history/history_inner_widget.cpp       | 3 ---
 .../SourceFiles/history/view/history_view_context_menu.cpp  | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index d026cf9ca..238faaccb 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2902,9 +2902,6 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			HistoryView::EmojiPacksSource::Message,
 			_controller);
 		const auto added = (_menu->actions().size() > wasAmount);
-		if (!added && !_menu->empty()) {
-			_menu->addSeparator();
-		}
 		HistoryView::AddSelectRestrictionAction(
 			_menu,
 			textItem ? textItem : _dragStateItem,
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index a9c699188..180e44cc6 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1280,9 +1280,6 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 	}
 	if (item) {
 		const auto added = (result->actions().size() > wasAmount);
-		if (!added) {
-			result->addSeparator();
-		}
 		AddSelectRestrictionAction(result, item, !added);
 	}
 	if (hasWhoReactedItem) {
@@ -1885,6 +1882,9 @@ void AddSelectRestrictionAction(
 		|| item->isSponsored()) {
 		return;
 	}
+	if (addIcon && !menu->empty()) {
+		menu->addSeparator();
+	}
 	auto button = base::make_unique_q<Ui::Menu::MultilineAction>(
 		menu->menu(),
 		menu->st().menu,

From a333615e539dbbcd4417b8015217c46b7eb8f67f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 16:43:36 +0400
Subject: [PATCH 152/306] Add message link to channel star transaction info.

---
 Telegram/Resources/langs/lang.strings                        | 1 +
 Telegram/SourceFiles/api/api_credits.cpp                     | 5 ++++-
 Telegram/SourceFiles/boxes/gift_premium_box.cpp              | 4 +++-
 Telegram/SourceFiles/data/data_credits.h                     | 1 +
 .../info/statistics/info_statistics_list_controllers.cpp     | 5 ++++-
 Telegram/SourceFiles/settings/settings_credits_graphics.cpp  | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1da6e2be3..330f90d70 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2467,6 +2467,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_box_history_entry_success_date" = "Transaction date";
 "lng_credits_box_history_entry_success_url" = "Transaction link";
 "lng_credits_box_history_entry_media" = "Media";
+"lng_credits_box_history_entry_message" = "Message";
 "lng_credits_box_history_entry_about" = "You can dispute this transaction {link}.";
 "lng_credits_box_history_entry_about_link" = "here";
 "lng_credits_box_history_entry_reaction_name" = "Star Reaction";
diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 6c0a7324a..ddff600b5 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -73,7 +73,9 @@ constexpr auto kTransactionsLimit = 100;
 		return PeerId(0);
 	}).value;
 	const auto stargift = tl.data().vstargift();
+	const auto reaction = tl.data().is_reaction();
 	const auto incoming = (int64(tl.data().vstars().v) >= 0);
+	const auto saveActorId = (reaction || !extended.empty()) && incoming;
 	return Data::CreditsHistoryEntry{
 		.id = qs(tl.data().vid()),
 		.title = qs(tl.data().vtitle().value_or_empty()),
@@ -83,12 +85,13 @@ constexpr auto kTransactionsLimit = 100;
 		.extended = std::move(extended),
 		.credits = tl.data().vstars().v,
 		.bareMsgId = uint64(tl.data().vmsg_id().value_or_empty()),
-		.barePeerId = barePeerId,
+		.barePeerId = saveActorId ? peer->id.value : barePeerId,
 		.bareGiveawayMsgId = uint64(
 			tl.data().vgiveaway_post_id().value_or_empty()),
 		.bareGiftStickerId = (stargift
 			? owner->processDocument(stargift->data().vsticker())->id
 			: 0),
+		.bareActorId = saveActorId ? barePeerId : uint64(0),
 		.peerType = tl.data().vpeer().match([](const HistoryPeerTL &) {
 			return Data::CreditsHistoryEntry::PeerType::Peer;
 		}, [](const MTPDstarsTransactionPeerPlayMarket &) {
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index d1bdd9bf1..d0cc2c746 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -1168,7 +1168,9 @@ void AddCreditsHistoryEntryTable(
 			});
 			AddTableRow(
 				table,
-				tr::lng_credits_box_history_entry_media(),
+				(entry.reaction
+					? tr::lng_credits_box_history_entry_message
+					: tr::lng_credits_box_history_entry_media)(),
 				std::move(label),
 				st::giveawayGiftCodeValueMargin);
 		}
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 3b99031f8..28817376c 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -62,6 +62,7 @@ struct CreditsHistoryEntry final {
 	uint64 barePeerId = 0;
 	uint64 bareGiveawayMsgId = 0;
 	uint64 bareGiftStickerId = 0;
+	uint64 bareActorId = 0;
 	PeerType peerType;
 	QDateTime subscriptionUntil;
 	QDateTime successDate;
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 962096502..b342ad077 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -1080,7 +1080,10 @@ void CreditsController::applySlice(const Data::CreditsStatusSlice &slice) {
 				delegate()->peerListUpdateRow(row);
 			},
 		};
-		if (const auto peerId = PeerId(i.barePeerId + s.barePeerId)) {
+		if (i.bareActorId) {
+			const auto peer = session().data().peer(PeerId(i.bareActorId));
+			return std::make_unique<CreditsRow>(peer, descriptor);
+		} else if (const auto peerId = PeerId(i.barePeerId + s.barePeerId)) {
 			const auto peer = session().data().peer(peerId);
 			return std::make_unique<CreditsRow>(peer, descriptor);
 		} else {
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 6d0677348..6f50c871f 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -786,6 +786,8 @@ void ReceiptCreditsBox(
 		? session->data().peer(PeerId(s.barePeerId)).get()
 		: (e.peerType == Type::PremiumBot)
 		? nullptr
+		: e.bareActorId
+		? session->data().peer(PeerId(e.bareActorId)).get()
 		: e.barePeerId
 		? session->data().peer(PeerId(e.barePeerId)).get()
 		: nullptr;

From 939f6095baa5c4f125a79ee1a950828253512dc2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 17:18:59 +0400
Subject: [PATCH 153/306] Fix possible crash in Recent Actions.

---
 .../admin_log/history_admin_log_inner.cpp     | 19 ++++++++++++++-----
 .../admin_log/history_admin_log_inner.h       |  8 ++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index b67629f92..b37da32c1 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -273,13 +273,13 @@ InnerWidget::InnerWidget(
 	_scrollDateHideTimer.setCallback([=] { scrollDateHideByTimer(); });
 	session().data().viewRepaintRequest(
 	) | rpl::start_with_next([=](auto view) {
-		if (view->delegate() == this) {
+		if (myView(view)) {
 			repaintItem(view);
 		}
 	}, lifetime());
 	session().data().viewResizeRequest(
 	) | rpl::start_with_next([=](auto view) {
-		if (view->delegate() == this) {
+		if (myView(view)) {
 			resizeItem(view);
 		}
 	}, lifetime());
@@ -291,7 +291,7 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 	session().data().viewLayoutChanged(
 	) | rpl::start_with_next([=](auto view) {
-		if (view->delegate() == this) {
+		if (myView(view)) {
 			if (view->isUnderCursor()) {
 				updateSelected();
 			}
@@ -333,6 +333,10 @@ InnerWidget::InnerWidget(
 		[=] { requestAdmins(); }));
 }
 
+bool InnerWidget::myView(not_null<const HistoryView::Element*> view) const {
+	return !_items.empty() && (view->delegate().get() == this);
+}
+
 Main::Session &InnerWidget::session() const {
 	return _controller->session();
 }
@@ -790,11 +794,16 @@ void InnerWidget::saveState(not_null<SectionMemento*> memento) {
 }
 
 void InnerWidget::restoreState(not_null<SectionMemento*> memento) {
-	_items = memento->takeItems();
-	for (auto &item : _items) {
+	// OwnedItem::refreshView may call requestItemResize.
+	// So we postpone resizing until all views are created.
+	_items.clear();
+	auto items = memento->takeItems();
+	for (auto &item : items) {
 		item.refreshView(this);
 		_itemsByData.emplace(item->data(), item.get());
 	}
+	_items = std::move(items);
+
 	_eventIds = memento->takeEventIds();
 	_admins = memento->takeAdmins();
 	_adminsCanEdit = memento->takeAdminsCanEdit();
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
index db52cac1c..bdf9c0491 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
@@ -229,8 +229,12 @@ private:
 	void paintEmpty(Painter &p, not_null<const Ui::ChatStyle*> st);
 	void clearAfterFilterChange();
 	void clearAndRequestLog();
-	void addEvents(Direction direction, const QVector<MTPChannelAdminLogEvent> &events);
-	Element *viewForItem(const HistoryItem *item);
+	void addEvents(
+		Direction direction,
+		const QVector<MTPChannelAdminLogEvent> &events);
+	[[nodiscard]] Element *viewForItem(const HistoryItem *item);
+	[[nodiscard]] bool myView(
+		not_null<const HistoryView::Element*> view) const;
 
 	void toggleScrollDateShown();
 	void repaintScrollDateCallback();

From 267a51e800feedfcfd9842571401f8491ed23d6d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 17:27:06 +0400
Subject: [PATCH 154/306] Fix possible crash in scheduled sent toast.

---
 .../view/history_view_scheduled_section.cpp   | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 0b20db1b7..ec9843a5a 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -67,6 +67,29 @@ namespace {
 
 constexpr auto kVideoProcessingInfoDuration = 4 * crl::time(1000);
 
+[[nodiscard]] DocumentData *FindVideoFile(not_null<HistoryItem*> item) {
+	const auto fromItem = [](not_null<HistoryItem*> item) {
+		if (const auto media = item->media()) {
+			if (const auto document = media->document()) {
+				if (document->isVideoFile()) {
+					return document;
+				}
+			}
+		}
+		return (DocumentData*)nullptr;
+	};
+	if (const auto group = item->history()->owner().groups().find(item)) {
+		for (const auto &entry : group->items) {
+			if (const auto result = fromItem(entry)) {
+				return result;
+			}
+		}
+	} else if (const auto result = fromItem(item)) {
+		return result;
+	}
+	return nullptr;
+}
+
 } // namespace
 
 ScheduledMemento::ScheduledMemento(
@@ -1677,9 +1700,8 @@ bool ShowScheduledVideoPublished(
 	if (!controller->widget()->isActive()) {
 		return false;
 	}
-	const auto media = info.item->media();
-	const auto document = media ? media->document() : nullptr;
-	if (!document->isVideoFile()) {
+	const auto document = FindVideoFile(info.item);
+	if (!document) {
 		return false;
 	}
 	const auto history = info.item->history();

From f091f2b34434b4c9b3cd8969f1caf5ed49097be2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 17:52:05 +0400
Subject: [PATCH 155/306] Fix album sending with video processing.

---
 Telegram/SourceFiles/apiwrap.cpp                | 6 ++++++
 Telegram/SourceFiles/storage/localimageloader.h | 1 +
 2 files changed, 7 insertions(+)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 884ad6b6d..f69e9c18c 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4231,6 +4231,7 @@ void ApiWrap::sendMultiPaidMedia(
 	auto &histories = history->owner().histories();
 	const auto peer = history->peer;
 	const auto itemId = item->fullId();
+	album->sent = true;
 	histories.sendPreparedMessage(
 		history,
 		replyTo,
@@ -4302,6 +4303,9 @@ void ApiWrap::sendAlbumWithCancelled(
 }
 
 void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
+	if (album->sent) {
+		return;
+	}
 	const auto groupId = album->groupId;
 	if (album->items.empty()) {
 		_sendingAlbums.remove(groupId);
@@ -4326,6 +4330,7 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		return;
 	} else if (medias.size() < 2) {
 		const auto &single = medias.front().data();
+		album->sent = true;
 		sendMediaWithRandomId(
 			sample,
 			single.vmedia(),
@@ -4352,6 +4357,7 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		| (album->options.invertCaption ? Flag::f_invert_media : Flag(0));
 	auto &histories = history->owner().histories();
 	const auto peer = history->peer;
+	album->sent = true;
 	histories.sendPreparedMessage(
 		history,
 		replyTo,
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index ed0dc1c47..e0cef82c2 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -128,6 +128,7 @@ struct SendingAlbum {
 	uint64 groupId = 0;
 	std::vector<Item> items;
 	Api::SendOptions options;
+	bool sent = false;
 
 };
 

From ead5dbe368c0c8c2214253c74b099c18e978d331 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 18:22:57 +0400
Subject: [PATCH 156/306] Strict validity check for local lastseen.

---
 Telegram/SourceFiles/data/data_lastseen_status.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_lastseen_status.h b/Telegram/SourceFiles/data/data_lastseen_status.h
index a7d0171e2..f5da5fbd8 100644
--- a/Telegram/SourceFiles/data/data_lastseen_status.h
+++ b/Telegram/SourceFiles/data/data_lastseen_status.h
@@ -112,7 +112,9 @@ private:
 	static constexpr auto kValidAfter = kLifeStartDate + kSpecialValueSkip;
 
 	[[nodiscard]] bool valid() const {
-		return !_available || (_value >= kSpecialValueSkip);
+		constexpr auto kMaxSum = uint32(std::numeric_limits<TimeId>::max());
+		return (kMaxSum - _value > uint32(kLifeStartDate))
+			&& (!_available || (_value >= kSpecialValueSkip));
 	}
 
 	LastseenStatus(uint32 value, bool available, bool hiddenByMe)

From e959d1e1b09654e12c91f129d6e08c6c4bb9dce0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 18:25:40 +0400
Subject: [PATCH 157/306] Improve playback speed toggle logic.

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

diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
index 53208ada8..27a29d779 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
@@ -734,7 +734,7 @@ SpeedController::SpeedController(
 	Expects(_qualities.empty() || (_lookupQuality && _changeQuality));
 
 	button->setClickedCallback([=] {
-		if (_lookup && _qualities.empty()) {
+		if (_lookup && !_lookupQuality && !_changeQuality) {
 			toggleDefault();
 			save();
 			if (const auto current = menu()) {

From 8447b95c50228bc80c7a135958a3b22efe8b42fe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 19:59:42 +0400
Subject: [PATCH 158/306] Fix GIF playback in media viewer.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index d069604a6..1b064274b 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3886,6 +3886,7 @@ void OverlayWidget::startStreamingPlayer(
 	const auto &player = _streamed->instance.player();
 	if (player.playing()) {
 		if (!_streamed->withSound) {
+			_streamed->ready = true;
 			return;
 		}
 		_pip = nullptr;

From d568cab2fc30cb0c5d03a044bc88df421492fb08 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 22:24:16 +0400
Subject: [PATCH 159/306] Fix initial IV zoom level.

Fixes #28600.
---
 Telegram/SourceFiles/core/core_settings.cpp | 13 +++++++++----
 Telegram/SourceFiles/iv/iv_controller.cpp   |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 0e47733b1..2ef80a80d 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -240,7 +240,7 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_customFontFamily)
 		+ sizeof(qint32) * 3
 		+ Serialize::bytearraySize(_tonsiteStorageToken)
-		+ sizeof(qint32) * 5;
+		+ sizeof(qint32) * 6;
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -396,10 +396,11 @@ QByteArray Settings::serialize() const {
 			<< qint32(!_weatherInCelsius ? 0 : *_weatherInCelsius ? 1 : 2)
 			<< _tonsiteStorageToken
 			<< qint32(_includeMutedCounterFolders ? 1 : 0)
-			<< qint32(_ivZoom.current())
+			<< qint32(0) // Old IV zoom
 			<< qint32(_skipToastsInFocus ? 1 : 0)
 			<< qint32(_recordVideoMessages ? 1 : 0)
-			<< SerializeVideoQuality(_videoQuality);
+			<< SerializeVideoQuality(_videoQuality)
+			<< qint32(_ivZoom.current());
 	}
 
 	Ensures(result.size() == size);
@@ -837,7 +838,8 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		stream >> includeMutedCounterFolders;
 	}
 	if (!stream.atEnd()) {
-		stream >> ivZoom;
+		qint32 oldIvZoom = 0;
+		stream >> oldIvZoom;
 	}
 	if (!stream.atEnd()) {
 		stream >> skipToastsInFocus;
@@ -848,6 +850,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> videoQuality;
 	}
+	if (!stream.atEnd()) {
+		stream >> ivZoom;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 7565fc90d..bf699adb7 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -655,7 +655,9 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 	if (const auto webviewZoomController = raw->zoomController()) {
 		webviewZoomController->zoomValue(
 		) | rpl::start_with_next([this](int value) {
-			_delegate->ivSetZoom(value);
+			if (value > 0) {
+				_delegate->ivSetZoom(value);
+			}
 		}, lifetime());
 		_delegate->ivZoomValue(
 		) | rpl::start_with_next([=](int value) {

From 233eb6d9163b04f6fd664df8af5d92a0cb030ac2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Nov 2024 18:27:48 +0400
Subject: [PATCH 160/306] Version 5.7.1.

- Fix occasional redundant newlines before message timestamp.
- Remove playback speed change on settings button click.
- Fix video playback settings button on hidpi screens.
- Fix return from Picture-in-Picture to media viewer.
- Fix video quality auto-switching in Picture-in-Picture.
- Add message link to channel stars transaction information.
- Fix GIF playback in media viewer.
- Fix several possible 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                                | 11 +++++++++++
 6 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index c6186e383..2f0fb863c 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.7.0.0" />
+    Version="5.7.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 adfa817e1..61735bc08 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,7,0,0
- PRODUCTVERSION 5,7,0,0
+ FILEVERSION 5,7,1,0
+ PRODUCTVERSION 5,7,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.7.0.0"
+            VALUE "FileVersion", "5.7.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.0.0"
+            VALUE "ProductVersion", "5.7.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index f9a116f81..00bfc1e3d 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,7,0,0
- PRODUCTVERSION 5,7,0,0
+ FILEVERSION 5,7,1,0
+ PRODUCTVERSION 5,7,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.7.0.0"
+            VALUE "FileVersion", "5.7.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.0.0"
+            VALUE "ProductVersion", "5.7.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index f84301932..39f445219 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 = 5007000;
-constexpr auto AppVersionStr = "5.7";
+constexpr auto AppVersion = 5007001;
+constexpr auto AppVersionStr = "5.7.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 99a49a446..8a6a8bb00 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5007000
+AppVersion         5007001
 AppVersionStrMajor 5.7
-AppVersionStrSmall 5.7
-AppVersionStr      5.7.0
+AppVersionStrSmall 5.7.1
+AppVersionStr      5.7.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.7
+AppVersionOriginal 5.7.1
diff --git a/changelog.txt b/changelog.txt
index 859af28a7..3aeec6239 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,14 @@
+5.7.1 (01.11.24)
+
+- Fix occasional redundant newlines before message timestamp.
+- Remove playback speed change on settings button click.
+- Fix video playback settings button on hidpi screens.
+- Fix return from Picture-in-Picture to media viewer.
+- Fix video quality auto-switching in Picture-in-Picture.
+- Add message link to channel stars transaction information.
+- Fix GIF playback in media viewer.
+- Fix several possible crashes.
+
 5.7 (31.10.24)
 
 - Sending video messages.

From ebff6c637000e8b3a24c1ef4019bc8d032085226 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 11:20:29 +0400
Subject: [PATCH 161/306] Show exact reactions count in channels.

---
 .../history/history_inner_widget.cpp          | 12 +++++---
 .../history/view/history_view_list_widget.cpp |  6 ++--
 .../view/reactions/history_view_reactions.cpp | 28 ++++++++++++++++++-
 .../view/reactions/history_view_reactions.h   | 12 +++++++-
 Telegram/SourceFiles/lang/lang_tag.cpp        |  1 +
 Telegram/SourceFiles/lang/lang_tag.h          |  1 +
 6 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 238faaccb..73b5cbb17 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #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.h"
 #include "history/view/reactions/history_view_reactions_button.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
 #include "history/view/history_view_about_view.h"
@@ -2197,10 +2198,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	const auto leaderOrSelf = groupLeaderOrSelf(_dragStateItem);
 	const auto hasWhoReactedItem = leaderOrSelf
 		&& Api::WhoReactedExists(leaderOrSelf, Api::WhoReactedList::All);
-	const auto clickedReaction = link
-		? link->property(
-			kReactionsCountEmojiProperty).value<Data::ReactionId>()
-		: Data::ReactionId();
+	using namespace HistoryView::Reactions;
+	const auto clickedReaction = ReactionIdOfLink(link);
 	_whoReactedMenuLifetime.destroy();
 	if (!clickedReaction.empty()
 		&& leaderOrSelf
@@ -4655,6 +4654,11 @@ QString HistoryInner::tooltipText() const {
 			}
 		}
 	} else if (const auto lnk = ClickHandler::getActive()) {
+		using namespace HistoryView::Reactions;
+		const auto count = ReactionCountOfLink(_dragStateItem, lnk);
+		if (count.count && count.shortened) {
+			return Lang::FormatCountDecimal(count.count);
+		}
 		return lnk->tooltip();
 	} else if (const auto view = Element::Moused()) {
 		StateRequest request;
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index b4e6fd86e..ca1e16327 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_text.h"
 #include "history/view/media/history_view_media.h"
 #include "history/view/media/history_view_sticker.h"
+#include "history/view/reactions/history_view_reactions.h"
 #include "history/view/reactions/history_view_reactions_button.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
 #include "history/view/history_view_context_menu.h"
@@ -2788,10 +2789,7 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		: _overElement
 		? _overElement->data().get()
 		: nullptr;
-	const auto clickedReaction = link
-		? link->property(
-			kReactionsCountEmojiProperty).value<Data::ReactionId>()
-		: Data::ReactionId();
+	const auto clickedReaction = Reactions::ReactionIdOfLink(link);
 	_whoReactedMenuLifetime.destroy();
 	if (!clickedReaction.empty()
 		&& overItem
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
index c1be784a2..41390373b 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
@@ -844,4 +844,30 @@ InlineListData InlineListDataFromMessage(not_null<Message*> message) {
 	return result;
 }
 
-} // namespace HistoryView
+ReactionId ReactionIdOfLink(const ClickHandlerPtr &link) {
+	return link
+		? link->property(kReactionsCountEmojiProperty).value<ReactionId>()
+		: ReactionId();
+}
+
+ReactionCount ReactionCountOfLink(
+		HistoryItem *item,
+		const ClickHandlerPtr &link) {
+	const auto id = ReactionIdOfLink(link);
+	if (!item || !id) {
+		return {};
+	}
+	const auto groups = &item->history()->owner().groups();
+	if (const auto group = groups->find(item)) {
+		item = group->items.front();
+	}
+	const auto &list = item->reactions();
+	const auto i = ranges::find(list, id, &Data::MessageReaction::id);
+	if (i == end(list) || !i->count) {
+		return {};
+	}
+	const auto formatted = Lang::FormatCountToShort(i->count);
+	return { .count = i->count, .shortened = formatted.shortened };
+}
+
+} // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.h
index be7aa4e64..31982fd1c 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.h
@@ -149,4 +149,14 @@ private:
 [[nodiscard]] InlineListData InlineListDataFromMessage(
 	not_null<Message*> message);
 
-} // namespace HistoryView
+[[nodiscard]] ReactionId ReactionIdOfLink(const ClickHandlerPtr &link);
+
+struct ReactionCount {
+	int count = 0;
+	bool shortened = false;
+};
+[[nodiscard]] ReactionCount ReactionCountOfLink(
+	HistoryItem *item,
+	const ClickHandlerPtr &link);
+
+} // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/lang/lang_tag.cpp b/Telegram/SourceFiles/lang/lang_tag.cpp
index 7b1a10acb..2435a77eb 100644
--- a/Telegram/SourceFiles/lang/lang_tag.cpp
+++ b/Telegram/SourceFiles/lang/lang_tag.cpp
@@ -929,6 +929,7 @@ ShortenedCount FormatCountToShort(int64 number) {
 		// Update given number.
 		// E.g. 12345 will be 12000.
 		result.number = rounded * divider;
+		result.shortened = true;
 	};
 	if (abs >= 1'000'000) {
 		shorten(1'000'000, 'M');
diff --git a/Telegram/SourceFiles/lang/lang_tag.h b/Telegram/SourceFiles/lang/lang_tag.h
index 297ae1ff2..b1163b06e 100644
--- a/Telegram/SourceFiles/lang/lang_tag.h
+++ b/Telegram/SourceFiles/lang/lang_tag.h
@@ -22,6 +22,7 @@ constexpr auto kTagReplacementSize = 4;
 struct ShortenedCount {
 	int64 number = 0;
 	QString string;
+	bool shortened = false;
 };
 [[nodiscard]] ShortenedCount FormatCountToShort(int64 number);
 [[nodiscard]] QString FormatCountDecimal(int64 number);

From 07e1e2d9d61edb1c74c5ccffeb81e40a2d5f4811 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 12:03:37 +0400
Subject: [PATCH 162/306] Allow opening username in specific indexed account.

---
 .../SourceFiles/core/local_url_handlers.cpp   | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 1c4add992..a8815478f 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -175,6 +175,34 @@ auto PersonalChannelController::chosen() const
 	return _chosen.events();
 }
 
+Window::SessionController *ApplyAccountIndex(
+		not_null<Window::SessionController*> controller,
+		int accountIndex) {
+	if (accountIndex <= 0) {
+		return nullptr;
+	}
+	const auto list = Core::App().domain().orderedAccounts();
+	if (accountIndex > int(list.size())) {
+		return nullptr;
+	}
+	const auto account = list[accountIndex - 1];
+	if (account == &controller->session().account()) {
+		return controller;
+	} else if (const auto window = Core::App().windowFor({ account })) {
+		if (&window->account() != account) {
+			Core::App().domain().maybeActivate(account);
+			if (&window->account() != account) {
+				return nullptr;
+			}
+		}
+		const auto session = window->sessionController();
+		if (session) {
+			return session;
+		}
+	}
+	return nullptr;
+}
+
 void SavePersonalChannel(
 		not_null<Window::SessionController*> window,
 		ChannelData *channel) {
@@ -471,6 +499,20 @@ bool ResolveUsernameOrPhone(
 	const auto params = url_parse_params(
 		match->captured(1),
 		qthelp::UrlParamNameTransform::ToLower);
+
+	if (params.contains(u"acc"_q)) {
+		const auto switched = ApplyAccountIndex(
+			controller,
+			params.value(u"acc"_q).toInt());
+		if (switched) {
+			controller = switched;
+		} else {
+			controller->showToast(u"Could not activate account %1."_q.arg(
+				params.value(u"acc"_q)));
+			return false;
+		}
+	}
+
 	const auto domainParam = params.value(u"domain"_q);
 	const auto appnameParam = params.value(u"appname"_q);
 	const auto myContext = context.value<ClickHandlerContext>();

From 70f1675085f5813816cc68a45708353b40c1ba14 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 12:18:00 +0400
Subject: [PATCH 163/306] Improve diff/patch/git highlighting.

---
 Telegram/SourceFiles/ui/chat/chat_style.cpp | 5 +++--
 Telegram/lib_spellcheck                     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index a18889258..784d9e434 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -607,7 +607,7 @@ std::span<Text::SpecialColor> ChatStyle::highlightColors() const {
 		// constant, symbol, deleted
 		push(statisticsChartLineRed());
 
-		// selector, attr-name, string, char, builtin, inserted
+		// selector, attr-name, string, char, builtin
 		push(statisticsChartLineOrange());
 
 		// operator, entity, url
@@ -619,8 +619,9 @@ std::span<Text::SpecialColor> ChatStyle::highlightColors() const {
 		// class-name
 		push(statisticsChartLinePurple());
 
+		// inserted
+		push(statisticsChartLineGreen());
 		//push(statisticsChartLineLightgreen());
-		//push(statisticsChartLineGreen());
 		//push(statisticsChartLineGolden());
 	}
 	return _highlightColors;
diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index e76981e13..f6594068d 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit e76981e133a1d29f3ceb557f53850a8d822f439a
+Subproject commit f6594068d4282aa84c51c7242d40213f3e0bf6f6

From fabdd89c4ae386c4af633b1e65fb730bbc900bcf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 13:11:10 +0400
Subject: [PATCH 164/306] Use original duration for video qualities.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 1b064274b..157c84ba2 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4350,9 +4350,11 @@ void OverlayWidget::restartAtSeekPosition(crl::time position) {
 		_rotation = saved;
 		updateContentRect();
 	}
+	const auto overrideDuration = _stories
+		|| (_chosenQuality && _chosenQuality != _document);
 	auto options = Streaming::PlaybackOptions{
 		.position = position,
-		.durationOverride = ((_stories
+		.durationOverride = ((overrideDuration
 			&& _document
 			&& _document->hasDuration())
 			? _document->duration()

From 4001899bdf734e1fafeea1fef073b52c1f374694 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 14:00:51 +0400
Subject: [PATCH 165/306] Add personal channel to ShortInfoBox.

---
 .../SourceFiles/boxes/peers/peer_short_info_box.cpp | 11 +++++++++++
 .../SourceFiles/boxes/peers/peer_short_info_box.h   |  3 +++
 .../boxes/peers/prepare_short_info_box.cpp          | 13 +++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index ff486ead9..dc7524e76 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -775,6 +775,10 @@ void PeerShortInfoBox::prepareRows() {
 		result->setContextCopyText(contextCopyText);
 		return result;
 	};
+	addInfoOneLine(
+		tr::lng_settings_channel_label(),
+		channelValue(),
+		tr::lng_context_copy_link(tr::now));
 	addInfoOneLine(
 		tr::lng_info_link_label(),
 		linkValue(),
@@ -836,6 +840,13 @@ rpl::producer<QString> PeerShortInfoBox::nameValue() const {
 	}) | rpl::distinct_until_changed();
 }
 
+rpl::producer<TextWithEntities> PeerShortInfoBox::channelValue() const {
+	return _fields.value(
+	) | rpl::map([](const PeerShortInfoFields &fields) {
+		return Ui::Text::Link(fields.channelName, fields.channelLink);
+	}) | rpl::distinct_until_changed();
+}
+
 rpl::producer<TextWithEntities> PeerShortInfoBox::linkValue() const {
 	return _fields.value(
 	) | rpl::map([](const PeerShortInfoFields &fields) {
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
index cda68a99b..b51ac3e2d 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
@@ -37,6 +37,8 @@ enum class PeerShortInfoType {
 
 struct PeerShortInfoFields {
 	QString name;
+	QString channelName;
+	QString channelLink;
 	QString phone;
 	QString link;
 	TextWithEntities about;
@@ -169,6 +171,7 @@ private:
 	int fillRoundedTopHeight();
 
 	[[nodiscard]] rpl::producer<QString> nameValue() const;
+	[[nodiscard]] rpl::producer<TextWithEntities> channelValue() const;
 	[[nodiscard]] rpl::producer<TextWithEntities> linkValue() const;
 	[[nodiscard]] rpl::producer<QString> phoneValue() const;
 	[[nodiscard]] rpl::producer<QString> usernameValue() const;
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index 363a2e9dc..c3ff09a68 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -202,6 +202,7 @@ void ProcessFullPhoto(
 	return peer->session().changes().peerFlagsValue(
 		peer,
 		(UpdateFlag::Name
+			| UpdateFlag::PersonalChannel
 			| UpdateFlag::PhoneNumber
 			| UpdateFlag::Username
 			| UpdateFlag::About
@@ -209,8 +210,20 @@ void ProcessFullPhoto(
 	) | rpl::map([=] {
 		const auto user = peer->asUser();
 		const auto username = peer->username();
+		const auto channelId = user->personalChannelId();
+		const auto channel = channelId
+			? user->owner().channel(channelId).get()
+			: nullptr;
+		const auto channelUsername = channel
+			? channel->username()
+			: QString();
+		const auto hasChannel = !channelUsername.isEmpty();
 		return PeerShortInfoFields{
 			.name = peer->name(),
+			.channelName = hasChannel ? channel->name() : QString(),
+			.channelLink = (hasChannel
+				? channel->session().createInternalLinkFull(channelUsername)
+				: QString()),
 			.phone = user ? Ui::FormatPhone(user->phone()) : QString(),
 			.link = ((user || username.isEmpty())
 				? QString()

From 363ffc1c04c5be9e995897e80703b2823c2d24bf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 14:05:37 +0400
Subject: [PATCH 166/306] Remove unused null option in SendReport().

---
 Telegram/SourceFiles/api/api_report.cpp       | 27 +++++++------------
 Telegram/SourceFiles/api/api_report.h         |  4 +--
 .../SourceFiles/boxes/report_messages_box.cpp | 19 +++++--------
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_report.cpp b/Telegram/SourceFiles/api/api_report.cpp
index 309e2d240..f3b0658bd 100644
--- a/Telegram/SourceFiles/api/api_report.cpp
+++ b/Telegram/SourceFiles/api/api_report.cpp
@@ -40,29 +40,20 @@ MTPreportReason ReasonToTL(const Ui::ReportReason &reason) {
 
 } // namespace
 
-void SendReport(
+void SendPhotoReport(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		Ui::ReportReason reason,
 		const QString &comment,
-		std::variant<v::null_t, not_null<PhotoData*>> data) {
-	auto done = [=] {
+		not_null<PhotoData*> photo) {
+	peer->session().api().request(MTPaccount_ReportProfilePhoto(
+		peer->input,
+		photo->mtpInput(),
+		ReasonToTL(reason),
+		MTP_string(comment)
+	)).done([=] {
 		show->showToast(tr::lng_report_thanks(tr::now));
-	};
-	v::match(data, [&](v::null_t) {
-		peer->session().api().request(MTPaccount_ReportPeer(
-			peer->input,
-			ReasonToTL(reason),
-			MTP_string(comment)
-		)).done(std::move(done)).send();
-	}, [&](not_null<PhotoData*> photo) {
-		peer->session().api().request(MTPaccount_ReportProfilePhoto(
-			peer->input,
-			photo->mtpInput(),
-			ReasonToTL(reason),
-			MTP_string(comment)
-		)).done(std::move(done)).send();
-	});
+	}).send();
 }
 
 auto CreateReportMessagesOrStoriesCallback(
diff --git a/Telegram/SourceFiles/api/api_report.h b/Telegram/SourceFiles/api/api_report.h
index f0c0320f3..02d1c9bef 100644
--- a/Telegram/SourceFiles/api/api_report.h
+++ b/Telegram/SourceFiles/api/api_report.h
@@ -41,12 +41,12 @@ struct ReportResult final {
 	bool successful = false;
 };
 
-void SendReport(
+void SendPhotoReport(
 	std::shared_ptr<Ui::Show> show,
 	not_null<PeerData*> peer,
 	Ui::ReportReason reason,
 	const QString &comment,
-	std::variant<v::null_t, not_null<PhotoData*>> data);
+	not_null<PhotoData*> photo);
 
 [[nodiscard]] auto CreateReportMessagesOrStoriesCallback(
 	std::shared_ptr<Ui::Show> show,
diff --git a/Telegram/SourceFiles/boxes/report_messages_box.cpp b/Telegram/SourceFiles/boxes/report_messages_box.cpp
index bac19fbf4..e09825926 100644
--- a/Telegram/SourceFiles/boxes/report_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/report_messages_box.cpp
@@ -27,13 +27,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
-[[nodiscard]] object_ptr<Ui::BoxContent> Report(
+[[nodiscard]] object_ptr<Ui::BoxContent> ReportPhoto(
 		not_null<PeerData*> peer,
-		std::variant<v::null_t, not_null<PhotoData*>> data,
+		not_null<PhotoData*> photo,
 		const style::ReportBox *stOverride) {
-	const auto source = v::match(data, [](const MessageIdsList &ids) {
-		return Ui::ReportSource::Message;
-	}, [&](not_null<PhotoData*> photo) {
+	const auto source = [&] {
 		return peer->isUser()
 			? (photo->hasVideo()
 				? Ui::ReportSource::ProfileVideo
@@ -45,19 +43,14 @@ namespace {
 			: (photo->hasVideo()
 				? Ui::ReportSource::ChannelVideo
 				: Ui::ReportSource::ChannelPhoto);
-	}, [&](StoryId id) {
-		return Ui::ReportSource::Story;
-	}, [](v::null_t) {
-		Unexpected("Bad source report.");
-		return Ui::ReportSource::Bot;
-	});
+	}();
 	const auto st = stOverride ? stOverride : &st::defaultReportBox;
 	return Box([=](not_null<Ui::GenericBox*> box) {
 		const auto show = box->uiShow();
 		Ui::ReportReasonBox(box, *st, source, [=](Ui::ReportReason reason) {
 			show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
 				Ui::ReportDetailsBox(box, *st, [=](const QString &text) {
-					Api::SendReport(show, peer, reason, text, data);
+					Api::SendPhotoReport(show, peer, reason, text, photo);
 					show->hideLayer();
 				});
 			}));
@@ -70,7 +63,7 @@ namespace {
 object_ptr<Ui::BoxContent> ReportProfilePhotoBox(
 		not_null<PeerData*> peer,
 		not_null<PhotoData*> photo) {
-	return Report(peer, photo, nullptr);
+	return ReportPhoto(peer, photo, nullptr);
 }
 
 void ShowReportMessageBox(

From 7bf1f9bd71b18af1567a0cadf1fd552aa8386812 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 14:41:25 +0400
Subject: [PATCH 167/306] Put manage chat above stories archive.

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

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 4745fa377..9e66096fd 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1421,9 +1421,9 @@ void Filler::fillHistoryActions() {
 	addToggleMuteSubmenu(true);
 	addInfo();
 	addViewAsTopics();
+	addManageChat();
 	addStoryArchive();
 	addSupportInfo();
-	addManageChat();
 	addBoostChat();
 	addCreatePoll();
 	addThemeEdit();

From f77fdc799dbd5f9d3677277909db58ad140288e2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 14:52:42 +0400
Subject: [PATCH 168/306] Show special phone number context number.

---
 Telegram/SourceFiles/core/click_handler_types.h      |  1 +
 Telegram/SourceFiles/core/phone_click_handler.cpp    |  1 +
 .../SourceFiles/history/history_inner_widget.cpp     | 12 +++++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h
index b3aa0bae0..43295e196 100644
--- a/Telegram/SourceFiles/core/click_handler_types.h
+++ b/Telegram/SourceFiles/core/click_handler_types.h
@@ -16,6 +16,7 @@ constexpr auto kDocumentLinkMediaProperty = 0x03;
 constexpr auto kSendReactionEmojiProperty = 0x04;
 constexpr auto kReactionsCountEmojiProperty = 0x05;
 constexpr auto kDocumentFilenameTooltipProperty = 0x06;
+constexpr auto kPhoneNumberLinkProperty = 0x07;
 
 namespace Ui {
 class Show;
diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
index 28da63ffa..9723ffe34 100644
--- a/Telegram/SourceFiles/core/phone_click_handler.cpp
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -291,6 +291,7 @@ PhoneClickHandler::PhoneClickHandler(
 	QString text)
 : _session(session)
 , _text(text) {
+	setProperty(kPhoneNumberLinkProperty, _text);
 }
 
 void PhoneClickHandler::onClick(ClickContext context) const {
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 73b5cbb17..517006172 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/file_utilities.h"
 #include "core/click_handler_types.h"
+#include "core/phone_click_handler.h"
 #include "history/history_item_helpers.h"
 #include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/controls/history_view_draft_options.h"
@@ -2200,6 +2201,10 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		&& Api::WhoReactedExists(leaderOrSelf, Api::WhoReactedList::All);
 	using namespace HistoryView::Reactions;
 	const auto clickedReaction = ReactionIdOfLink(link);
+	const auto linkPhoneNumber = link
+		? link->property(kPhoneNumberLinkProperty).toString()
+		: QString();
+	const auto session = &this->session();
 	_whoReactedMenuLifetime.destroy();
 	if (!clickedReaction.empty()
 		&& leaderOrSelf
@@ -2214,9 +2219,14 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			_whoReactedMenuLifetime);
 		e->accept();
 		return;
+	} else if (!linkPhoneNumber.isEmpty()) {
+		PhoneClickHandler(session, linkPhoneNumber).onClick(
+			prepareClickContext(
+				Qt::LeftButton,
+				_dragStateItem ? _dragStateItem->fullId() : FullMsgId()));
+		return;
 	}
 	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
-	const auto session = &this->session();
 	const auto controller = _controller;
 	const auto addItemActions = [&](
 			HistoryItem *item,

From 52953626a7169642bfe7b9129e2df723b7970a5b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 15:22:13 +0400
Subject: [PATCH 169/306] Allow ctrl/cmd+click copy private post link.

---
 Telegram/Resources/langs/lang.strings         |  2 ++
 Telegram/SourceFiles/apiwrap.cpp              | 11 +++++---
 Telegram/SourceFiles/apiwrap.h                |  3 ++-
 .../view/history_view_context_menu.cpp        | 26 +++++++++++++++----
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 330f90d70..ce54557e1 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2101,6 +2101,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_channel_public_link_copied" = "Link copied to clipboard.";
 "lng_context_about_private_link" = "This link will only work for members of this chat.";
+"lng_public_post_private_hint_ctrl" = "Use Ctrl+Click to copy a non-public link.";
+"lng_public_post_private_hint_cmd" = "Use Cmd+Click to copy a non-public link.";
 
 "lng_forwarded" = "Forwarded from {user}";
 "lng_forwarded_story" = "Story from {user}";
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index f69e9c18c..b8d51732b 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -708,7 +708,8 @@ void ApiWrap::finalizeMessageDataRequest(
 
 QString ApiWrap::exportDirectMessageLink(
 		not_null<HistoryItem*> item,
-		bool inRepliesContext) {
+		bool inRepliesContext,
+		bool forceNonPublicLink) {
 	Expects(item->history()->peer->isChannel());
 
 	const auto itemId = item->fullId();
@@ -731,7 +732,7 @@ QString ApiWrap::exportDirectMessageLink(
 				const auto sender = root
 					? root->discussionPostOriginalSender()
 					: nullptr;
-				if (sender && sender->hasUsername()) {
+				if (sender && sender->hasUsername() && !forceNonPublicLink) {
 					// Comment to a public channel.
 					const auto forwarded = root->Get<HistoryMessageForwarded>();
 					linkItemId = forwarded->savedFromMsgId;
@@ -747,7 +748,7 @@ QString ApiWrap::exportDirectMessageLink(
 				}
 			}
 		}
-		const auto base = linkChannel->hasUsername()
+		const auto base = (linkChannel->hasUsername() && !forceNonPublicLink)
 			? linkChannel->username()
 			: "c/" + QString::number(peerToChannel(linkChannel->id).bare);
 		const auto post = QString::number(linkItemId.bare);
@@ -761,6 +762,7 @@ QString ApiWrap::exportDirectMessageLink(
 				? (QString::number(linkThreadId.bare) + '/' + post)
 				: post);
 		if (linkChannel->hasUsername()
+			&& !forceNonPublicLink
 			&& !linkChannel->isMegagroup()
 			&& !linkCommentId
 			&& !linkThreadId) {
@@ -774,6 +776,9 @@ QString ApiWrap::exportDirectMessageLink(
 		}
 		return session().createInternalLinkFull(query);
 	};
+	if (forceNonPublicLink) {
+		return fallback();
+	}
 	const auto i = _unlikelyMessageLinks.find(itemId);
 	const auto current = (i != end(_unlikelyMessageLinks))
 		? i->second
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 18a505de9..7cff89c71 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -164,7 +164,8 @@ public:
 	void requestMessageData(PeerData *peer, MsgId msgId, Fn<void()> done);
 	QString exportDirectMessageLink(
 		not_null<HistoryItem*> item,
-		bool inRepliesContext);
+		bool inRepliesContext,
+		bool forceNonPublicLink = false);
 	QString exportDirectStoryLink(not_null<Data::Story*> item);
 
 	void requestContacts();
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 180e44cc6..ba765b3c7 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -98,6 +98,7 @@ namespace {
 
 constexpr auto kRescheduleLimit = 20;
 constexpr auto kTagNameLimit = 12;
+constexpr auto kPublicPostLinkToastDuration = 4 * crl::time(1000);
 
 bool HasEditMessageAction(
 		const ContextMenuRequest &request,
@@ -1307,12 +1308,17 @@ void CopyPostLink(
 		return;
 	}
 	const auto inRepliesContext = (context == Context::Replies);
+	const auto forceNonPublicLink = base::IsCtrlPressed();
 	QGuiApplication::clipboard()->setText(
 		item->history()->session().api().exportDirectMessageLink(
 			item,
-			inRepliesContext));
+			inRepliesContext,
+			forceNonPublicLink));
 
 	const auto isPublicLink = [&] {
+		if (forceNonPublicLink) {
+			return false;
+		}
 		const auto channel = item->history()->peer->asChannel();
 		Assert(channel != nullptr);
 		if (const auto rootId = item->replyToTop()) {
@@ -1328,10 +1334,20 @@ void CopyPostLink(
 		}
 		return channel->hasUsername();
 	}();
-
-	show->showToast(isPublicLink
-		? tr::lng_channel_public_link_copied(tr::now)
-		: tr::lng_context_about_private_link(tr::now));
+	if (isPublicLink) {
+		show->showToast({
+			.text = tr::lng_channel_public_link_copied(
+				tr::now, Ui::Text::Bold
+			).append('\n').append(Platform::IsMac()
+				? tr::lng_public_post_private_hint_cmd(tr::now)
+				: tr::lng_public_post_private_hint_ctrl(tr::now)),
+			.duration = kPublicPostLinkToastDuration,
+		});
+	} else {
+		show->showToast(isPublicLink
+			? tr::lng_channel_public_link_copied(tr::now)
+			: tr::lng_context_about_private_link(tr::now));
+	}
 }
 
 void CopyStoryLink(

From 93c01e5f1e136a892e275c8e2b83e0ac861c719c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 16:53:37 +0400
Subject: [PATCH 170/306] Show "Hide My View" only for user stories.

---
 .../SourceFiles/media/view/media_view_overlay_widget.cpp     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 157c84ba2..183f89151 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1806,7 +1806,10 @@ void OverlayWidget::fillContextMenuActions(
 			}, &st::mediaMenuIconStats);
 		}
 	}
-	if (_stories && _stories->allowStealthMode()) {
+	if (_stories
+		&& _stories->allowStealthMode()
+		&& story
+		&& story->peer()->isUser()) {
 		const auto now = base::unixtime::now();
 		const auto stealth = _session->data().stories().stealthMode();
 		addAction(tr::lng_stealth_mode_menu_item(tr::now), [=] {

From 5f037462ed7032e5bb7f43c7278b538647af90d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Nov 2024 16:54:01 +0400
Subject: [PATCH 171/306] Implement a special context menu for sender userpic.

---
 Telegram/Resources/langs/lang.strings         |  3 ++
 .../history/history_inner_widget.cpp          | 14 ++++++
 .../history/history_inner_widget.h            |  1 +
 .../SourceFiles/history/history_widget.cpp    | 18 ++++++-
 Telegram/SourceFiles/history/history_widget.h |  9 +++-
 .../view/history_view_sublist_section.cpp     |  5 +-
 .../view/history_view_sublist_section.h       |  5 +-
 Telegram/SourceFiles/mainwidget.cpp           | 15 ++++--
 Telegram/SourceFiles/mainwidget.h             |  5 +-
 Telegram/SourceFiles/window/section_widget.h  |  5 +-
 .../SourceFiles/window/window_peer_menu.cpp   | 47 +++++++++++++++++++
 .../SourceFiles/window/window_peer_menu.h     |  8 ++++
 .../window/window_session_controller.cpp      | 11 +++--
 .../window/window_session_controller.h        |  7 ++-
 14 files changed, 137 insertions(+), 16 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ce54557e1..7b9833592 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3623,6 +3623,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_make_paid" = "Make This Content Paid";
 "lng_context_change_price" = "Change Price";
 
+"lng_context_mention" = "Mention";
+"lng_context_search_from" = "Search messages";
+
 "lng_factcheck_title" = "Fact Check";
 "lng_factcheck_placeholder" = "Add Facts or Context";
 "lng_factcheck_whats_this" = "what's this?";
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 517006172..9ccd9feb2 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2204,6 +2204,9 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	const auto linkPhoneNumber = link
 		? link->property(kPhoneNumberLinkProperty).toString()
 		: QString();
+	const auto linkUserpicPeerId = (link && _dragStateUserpic)
+		? link->property(kPeerLinkPeerIdProperty).toULongLong()
+		: 0;
 	const auto session = &this->session();
 	_whoReactedMenuLifetime.destroy();
 	if (!clickedReaction.empty()
@@ -2227,6 +2230,14 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		return;
 	}
 	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
+	if (linkUserpicPeerId) {
+		_widget->fillSenderUserpicMenu(
+			_menu.get(),
+			session->data().peer(PeerId(linkUserpicPeerId)));
+		_menu->popup(e->globalPos());
+		e->accept();
+		return;
+	}
 	const auto controller = _controller;
 	const auto addItemActions = [&](
 			HistoryItem *item,
@@ -3938,6 +3949,7 @@ void HistoryInner::mouseActionUpdate() {
 
 	TextState dragState;
 	ClickHandlerHost *lnkhost = nullptr;
+	auto dragStateUserpic = false;
 	auto selectingText = (item == _mouseActionItem)
 		&& (view == Element::Hovered())
 		&& !_selected.empty()
@@ -4033,6 +4045,7 @@ void HistoryInner::mouseActionUpdate() {
 						// stop enumeration if we've found a userpic under the cursor
 						if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
 							dragState = TextState(nullptr, view->fromPhotoLink());
+							dragStateUserpic = true;
 							_dragStateItem = nullptr;
 							lnkhost = view;
 							return false;
@@ -4044,6 +4057,7 @@ void HistoryInner::mouseActionUpdate() {
 		}
 	}
 	auto lnkChanged = ClickHandler::setActive(dragState.link, lnkhost);
+	_dragStateUserpic = dragStateUserpic;
 	if (lnkChanged || dragState.cursor != _mouseCursorState) {
 		Ui::Tooltip::Hide();
 	}
diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h
index c19c3b8b0..e3d671a97 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.h
+++ b/Telegram/SourceFiles/history/history_inner_widget.h
@@ -499,6 +499,7 @@ private:
 	HistoryItem *_dragStateItem = nullptr;
 	CursorState _mouseCursorState = CursorState();
 	uint16 _mouseTextSymbol = 0;
+	bool _dragStateUserpic = false;
 	bool _pressWasInactive = false;
 	bool _recountedAfterPendingResizedItems = false;
 	bool _useCornerReaction = false;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 16b0035e5..3d067da29 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/emoji_config.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/chat/choose_theme_controller.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/inner_dropdown.h"
 #include "ui/widgets/dropdown_menu.h"
@@ -5115,7 +5116,10 @@ bool HistoryWidget::updateCmdStartShown() {
 	return commandsChanged || buttonChanged || textChanged;
 }
 
-bool HistoryWidget::searchInChatEmbedded(Dialogs::Key chat, QString query) {
+bool HistoryWidget::searchInChatEmbedded(
+		QString query,
+		Dialogs::Key chat,
+		PeerData *searchFrom) {
 	const auto peer = chat.peer(); // windows todo
 	if (!peer || Window::SeparateId(peer) != controller()->windowId()) {
 		return false;
@@ -8071,6 +8075,18 @@ void HistoryWidget::editMessage(
 	setInnerFocus();
 }
 
+void HistoryWidget::fillSenderUserpicMenu(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<PeerData*> peer) {
+	const auto inGroup = _peer && (_peer->isChat() || _peer->isMegagroup());
+	Window::FillSenderUserpicMenu(
+		controller(),
+		peer,
+		(inGroup && _canSendTexts) ? _field.data() : nullptr,
+		inGroup ? _peer->owner().history(_peer) : Dialogs::Key(),
+		Ui::Menu::CreateAddActionCallback(menu));
+}
+
 void HistoryWidget::hidePinnedMessage() {
 	Expects(_pinnedBar != nullptr);
 
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 86f4c9617..73a8ff1c8 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -211,6 +211,10 @@ public:
 		not_null<HistoryItem*> item,
 		const TextSelection &selection);
 
+	void fillSenderUserpicMenu(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<PeerData*> peer);
+
 	[[nodiscard]] FullReplyTo replyTo() const;
 	bool lastForceReplyReplied(const FullMsgId &replyTo) const;
 	bool lastForceReplyReplied() const;
@@ -263,7 +267,10 @@ public:
 	[[nodiscard]] rpl::producer<> cancelRequests() const {
 		return _cancelRequests.events();
 	}
-	bool searchInChatEmbedded(Dialogs::Key chat, QString query);
+	bool searchInChatEmbedded(
+		QString query,
+		Dialogs::Key chat,
+		PeerData *searchFrom = nullptr);
 
 	void updateNotifyControls();
 
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
index f934a55fe..61215adcf 100644
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
@@ -329,7 +329,10 @@ void SublistWidget::setInternalState(
 	restoreState(memento);
 }
 
-bool SublistWidget::searchInChatEmbedded(Dialogs::Key chat, QString query) {
+bool SublistWidget::searchInChatEmbedded(
+		QString query,
+		Dialogs::Key chat,
+		PeerData *searchFrom) {
 	const auto sublist = chat.sublist();
 	if (!sublist || sublist != _sublist) {
 		return false;
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.h b/Telegram/SourceFiles/history/view/history_view_sublist_section.h
index 6379c9845..33b655720 100644
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_sublist_section.h
@@ -76,7 +76,10 @@ public:
 		return Window::SectionActionResult::Fallback;
 	}
 
-	bool searchInChatEmbedded(Dialogs::Key chat, QString query) override;
+	bool searchInChatEmbedded(
+		QString query,
+		Dialogs::Key chat,
+		PeerData *searchFrom = nullptr) override;
 
 	// Float player interface.
 	bool floatPlayerHandleWheelEvent(QEvent *e) override;
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index ded80eb6d..5fc463f0f 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -744,7 +744,10 @@ void MainWidget::hideSingleUseKeyboard(FullMsgId replyToId) {
 	_history->hideSingleUseKeyboard(replyToId);
 }
 
-void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
+void MainWidget::searchMessages(
+		const QString &query,
+		Dialogs::Key inChat,
+		PeerData *searchFrom) {
 	const auto complex = Data::HashtagWithUsernameFromQuery(query);
 	if (!complex.username.isEmpty()) {
 		_controller->showPeerByLink(Window::PeerByLinkInfo{
@@ -760,6 +763,7 @@ void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
 			.inChat = ((tags.empty() || inChat.sublist())
 				? inChat
 				: session().data().history(session().user())),
+			.fromPeer = inChat ? searchFrom : nullptr,
 			.tags = tags,
 			.query = tags.empty() ? query : QString(),
 		};
@@ -779,12 +783,15 @@ void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
 				controller()->session().user());
 		}
 		if ((!_mainSection
-			|| !_mainSection->searchInChatEmbedded(inChat, query))
-			&& !_history->searchInChatEmbedded(inChat, query)) {
+			|| !_mainSection->searchInChatEmbedded(query, inChat, searchFrom))
+			&& !_history->searchInChatEmbedded(query, inChat, searchFrom)) {
 			const auto account = not_null(&session().account());
 			if (const auto window = Core::App().windowFor(account)) {
 				if (const auto controller = window->sessionController()) {
-					controller->content()->searchMessages(query, inChat);
+					controller->content()->searchMessages(
+						query,
+						inChat,
+						searchFrom);
 					controller->widget()->activate();
 				}
 			}
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 4465e5685..32e5fff5d 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -163,7 +163,10 @@ public:
 	void sendBotCommand(Bot::SendCommandRequest request);
 	void hideSingleUseKeyboard(FullMsgId replyToId);
 
-	void searchMessages(const QString &query, Dialogs::Key inChat);
+	void searchMessages(
+		const QString &query,
+		Dialogs::Key inChat,
+		PeerData *searchFrom = nullptr);
 
 	void setChatBackground(
 		const Data::WallPaper &background,
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index c428c4d0f..24761f097 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -148,7 +148,10 @@ public:
 			MsgId messageId) {
 		return false;
 	}
-	virtual bool searchInChatEmbedded(Dialogs::Key chat, QString query) {
+	virtual bool searchInChatEmbedded(
+			QString query,
+			Dialogs::Key chat,
+			PeerData *searchFrom = nullptr) {
 		return false;
 	}
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 9e66096fd..a053bc87b 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2727,6 +2727,53 @@ bool FillVideoChatMenu(
 	return has || manager;
 }
 
+void FillSenderUserpicMenu(
+		not_null<SessionController*> controller,
+		not_null<PeerData*> peer,
+		Ui::InputField *fieldForMention,
+		Dialogs::Key searchInEntry,
+		const PeerMenuCallback &addAction) {
+	const auto group = (peer->isChat() || peer->isMegagroup());
+	const auto channel = peer->isChannel();
+	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);
+	addAction(viewProfileText, [=] {
+		controller->showPeerInfo(peer, Window::SectionShow::Way::Forward);
+	}, channel ? &st::menuIconInfo : &st::menuIconProfile);
+
+	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);
+	addAction(showHistoryText, [=] {
+		controller->showPeerHistory(peer, Window::SectionShow::Way::Forward);
+	}, channel ? &st::menuIconChannel : &st::menuIconChatBubble);
+
+	const auto username = peer->username();
+	const auto mention = !username.isEmpty() || peer->isUser();
+	if (const auto guard = mention ? fieldForMention : nullptr) {
+		addAction(tr::lng_context_mention(tr::now), crl::guard(guard, [=] {
+			if (!username.isEmpty()) {
+				fieldForMention->insertTag('@' + username);
+			} else {
+				fieldForMention->insertTag(
+					peer->shortName(),
+					PrepareMentionTag(peer->asUser()));
+			}
+		}), &st::menuIconUsername);
+	}
+
+	if (searchInEntry) {
+		addAction(tr::lng_context_search_from(tr::now), [=] {
+			controller->searchInChat(searchInEntry, peer);
+		}, &st::menuIconSearch);
+	}
+}
+
 bool IsUnreadThread(not_null<Data::Thread*> thread) {
 	return thread->chatListBadgesState().unread;
 }
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index 4bf6c4d13..8369e3228 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -34,6 +34,7 @@ namespace Dialogs {
 class MainList;
 struct EntryState;
 struct UnreadState;
+class Key;
 } // namespace Dialogs
 
 namespace ChatHelpers {
@@ -64,6 +65,13 @@ bool FillVideoChatMenu(
 	Dialogs::EntryState request,
 	const PeerMenuCallback &addAction);
 
+void FillSenderUserpicMenu(
+	not_null<SessionController*> controller,
+	not_null<PeerData*> peer,
+	Ui::InputField *fieldForMention,
+	Dialogs::Key searchInEntry,
+	const PeerMenuCallback &addAction);
+
 void MenuAddMarkAsReadAllChatsAction(
 	not_null<Window::SessionController*> controller,
 	const PeerMenuCallback &addAction);
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index b9d1fc876..69d58b571 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1175,14 +1175,17 @@ void SessionNavigation::showPollResults(
 	showSection(std::make_shared<Info::Memento>(poll, contextId), params);
 }
 
-void SessionNavigation::searchInChat(Dialogs::Key inChat) {
-	searchMessages(QString(), inChat);
+void SessionNavigation::searchInChat(
+		Dialogs::Key inChat,
+		PeerData *searchFrom) {
+	searchMessages(QString(), inChat, searchFrom);
 }
 
 void SessionNavigation::searchMessages(
 		const QString &query,
-		Dialogs::Key inChat) {
-	parentController()->content()->searchMessages(query, inChat);
+		Dialogs::Key inChat,
+		PeerData *searchFrom) {
+	parentController()->content()->searchMessages(query, inChat, searchFrom);
 }
 
 auto SessionNavigation::showToast(Ui::Toast::Config &&config)
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 3da9eb291..c925aacc7 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -247,8 +247,11 @@ public:
 		FullMsgId contextId,
 		const SectionShow &params = SectionShow());
 
-	void searchInChat(Dialogs::Key inChat);
-	void searchMessages(const QString &query, Dialogs::Key inChat);
+	void searchInChat(Dialogs::Key inChat, PeerData *searchFrom = nullptr);
+	void searchMessages(
+		const QString &query,
+		Dialogs::Key inChat,
+		PeerData *searchFrom = nullptr);
 
 	void resolveBoostState(not_null<ChannelData*> channel);
 

From 3fa88fad79a399d412504c2ee8df8af18b051c9b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Nov 2024 11:32:59 +0400
Subject: [PATCH 172/306] Correctly highlight label links in RTL.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 5062318cf..00b64a931 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 5062318cf051ab9a84a5518d778fc2c7c47447f2
+Subproject commit 00b64a9311b0fcc4be14dc705a69aec16f6ced5f

From 89c35e8512e0766c98de9ab2beadeed22e4c7c01 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Nov 2024 11:36:10 +0400
Subject: [PATCH 173/306] Show copy-to-clipboard button tooltip.

---
 Telegram/Resources/langs/lang.strings                    | 1 +
 Telegram/SourceFiles/history/history_item_components.cpp | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 7b9833592..5e3ee637d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5607,6 +5607,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_earn_credits_out_minimal" = "You cannot withdraw less than {link}.";
 "lng_bot_earn_credits_out_minimal_link#one" = "{count} star";
 "lng_bot_earn_credits_out_minimal_link#other" = "{count} stars";
+"lng_bot_copy_text_tooltip" = "Copy to Clipboard: {text}";
 
 "lng_contact_add" = "Add";
 "lng_contact_send_message" = "Message";
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 55e9e09a5..7ea8597bb 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -651,6 +651,14 @@ QString ReplyMarkupClickHandler::buttonText() const {
 }
 
 QString ReplyMarkupClickHandler::tooltip() const {
+	if (const auto button = getButton()) {
+		if (button->type == HistoryMessageMarkupButton::Type::CopyText) {
+			return tr::lng_bot_copy_text_tooltip(
+				tr::now,
+				lt_text,
+				st::wrap_rtl(QString::fromUtf8(button->data)));
+		}
+	}
 	const auto button = getUrlButton();
 	const auto url = button ? QString::fromUtf8(button->data) : QString();
 	const auto text = _fullDisplayed ? QString() : buttonText();

From 8e5fec2fa88bbdf8efd40101f4961b93dc89d079 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Nov 2024 11:37:00 +0400
Subject: [PATCH 174/306] Open forum from common groups.

---
 .../info_common_groups_inner_widget.cpp              | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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 37defed0d..cd5fe0b2e 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
@@ -177,9 +177,15 @@ void ListController::restoreState(
 }
 
 void ListController::rowClicked(not_null<PeerListRow*> row) {
-	_controller->parentController()->showPeerHistory(
-		row->peer(),
-		Window::SectionShow::Way::Forward);
+	const auto peer = row->peer();
+	const auto controller = _controller->parentController();
+	if (const auto forum = peer->forum()) {
+		controller->showForum(forum);
+	} else {
+		controller->showPeerHistory(
+			peer,
+			Window::SectionShow::Way::Forward);
+	}
 }
 
 } // namespace

From ecf0eba0a516c2d34cc7938c1b1061b1719033d9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Nov 2024 11:37:15 +0400
Subject: [PATCH 175/306] Open forum with topic by topic message link.

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

diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 69d58b571..06ce1e528 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -568,8 +568,16 @@ void SessionNavigation::showPeerByLinkResolved(
 
 	const auto &replies = info.repliesInfo;
 	if (const auto threadId = std::get_if<ThreadId>(&replies)) {
+		const auto history = peer->owner().history(peer);
+		const auto controller = parentController();
+		if (const auto forum = peer->forum()) {
+			if (controller->windowId().hasChatsList()
+				&& !controller->adaptive().isOneColumn()) {
+				controller->showForum(forum);
+			}
+		}
 		showRepliesForMessage(
-			session().data().history(peer),
+			history,
 			threadId->id,
 			info.messageId,
 			params);

From b2f912868d5cc234a89580404d68db9ec964f219 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Nov 2024 11:38:04 +0400
Subject: [PATCH 176/306] Fix record availability check on macOS.

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

diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index 39af56581..169ba6b1d 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit 39af565818ca2fbc4029e23f798c3b440e367423
+Subproject commit 169ba6b1d5e58e9d1cfa7b7d5c85c119e6c6e2db

From 02c01e258cf649b50e1e9eadf5f7af4024445f16 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Nov 2024 12:45:43 +0400
Subject: [PATCH 177/306] Version 5.7.2.

- Fix recompressed video playback cutoff.
- Fix video message recroding 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                                | 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 2f0fb863c..a96cc4ed2 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.7.1.0" />
+    Version="5.7.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 61735bc08..e367ff9ba 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,7,1,0
- PRODUCTVERSION 5,7,1,0
+ FILEVERSION 5,7,2,0
+ PRODUCTVERSION 5,7,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.7.1.0"
+            VALUE "FileVersion", "5.7.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.1.0"
+            VALUE "ProductVersion", "5.7.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 00bfc1e3d..9f4f4b45a 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,7,1,0
- PRODUCTVERSION 5,7,1,0
+ FILEVERSION 5,7,2,0
+ PRODUCTVERSION 5,7,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.7.1.0"
+            VALUE "FileVersion", "5.7.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.1.0"
+            VALUE "ProductVersion", "5.7.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 39f445219..5bf0f80d4 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 = 5007001;
-constexpr auto AppVersionStr = "5.7.1";
+constexpr auto AppVersion = 5007002;
+constexpr auto AppVersionStr = "5.7.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 8a6a8bb00..e586f2905 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5007001
+AppVersion         5007002
 AppVersionStrMajor 5.7
-AppVersionStrSmall 5.7.1
-AppVersionStr      5.7.1
+AppVersionStrSmall 5.7.2
+AppVersionStr      5.7.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.7.1
+AppVersionOriginal 5.7.2
diff --git a/changelog.txt b/changelog.txt
index 3aeec6239..5bc1594c2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+5.7.2 (05.11.24)
+
+- Fix recompressed video playback cutoff.
+- Fix video message recroding on macOS.
+
 5.7.1 (01.11.24)
 
 - Fix occasional redundant newlines before message timestamp.

From 1eeb46d5fcb2bb85eef51f8facb4983e3e55cbc3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Nov 2024 12:26:12 +0400
Subject: [PATCH 178/306] Fix build on VS 17.12 Preview 4 on ARM.

---
 Telegram/SourceFiles/boxes/report_messages_box.cpp             | 2 +-
 Telegram/SourceFiles/history/history_view_swipe.cpp            | 3 ++-
 .../SourceFiles/ui/controls/who_reacted_context_action.cpp     | 1 +
 Telegram/SourceFiles/ui/controls/who_reacted_context_action.h  | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/report_messages_box.cpp b/Telegram/SourceFiles/boxes/report_messages_box.cpp
index e09825926..25e548f1b 100644
--- a/Telegram/SourceFiles/boxes/report_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/report_messages_box.cpp
@@ -79,7 +79,6 @@ void ShowReportMessageBox(
 	auto performRequest = [=](
 			const auto &repeatRequest,
 			Data::ReportInput reportInput) -> void {
-		constexpr auto kToastDuration = crl::time(4000);
 		report(reportInput, [=](const Api::ReportResult &result) {
 			if (!result.error.isEmpty()) {
 				if (result.error == u"MESSAGE_ID_REQUIRED"_q) {
@@ -199,6 +198,7 @@ void ShowReportMessageBox(
 					}
 				}));
 			} else if (result.successful) {
+				constexpr auto kToastDuration = crl::time(4000);
 				show->showToast(
 					tr::lng_report_thanks(tr::now),
 					kToastDuration);
diff --git a/Telegram/SourceFiles/history/history_view_swipe.cpp b/Telegram/SourceFiles/history/history_view_swipe.cpp
index 214310fea..cbe9d65a1 100644
--- a/Telegram/SourceFiles/history/history_view_swipe.cpp
+++ b/Telegram/SourceFiles/history/history_view_swipe.cpp
@@ -198,7 +198,8 @@ void SetupSwipeHandler(
 			const auto &touches = t->touchPoints();
 			const auto released = [&](int index) {
 				return (touches.size() > index)
-					&& (touches.at(index).state() & Qt::TouchPointReleased);
+					&& (int(touches.at(index).state())
+						& int(Qt::TouchPointReleased));
 			};
 			const auto cancel = released(0)
 				|| released(1)
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
index a2f8f7229..7fde2d3fe 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/chat/group_call_userpics.h"
 #include "ui/text/text_custom_emoji.h"
+#include "ui/emoji_config.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
index f0b2545f5..60110d654 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
@@ -8,8 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/unique_qptr.h"
-#include "ui/text/text_block.h"
 #include "ui/widgets/menu/menu_item_base.h"
+#include "ui/text/text_custom_emoji.h"
 
 namespace Ui {
 

From 9c3990c0c10d3d0f0a764caa755cbfc5641d53b1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Nov 2024 16:41:56 +0400
Subject: [PATCH 179/306] Fix deploy scripts for Windows on ARM.

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

diff --git a/Telegram/build/deploy.sh b/Telegram/build/deploy.sh
index e3217ca40..90618ea55 100755
--- a/Telegram/build/deploy.sh
+++ b/Telegram/build/deploy.sh
@@ -70,9 +70,9 @@ else
   DeployMac="1"
   DeployWin="1"
   DeployWin64="1"
-  DeployWinArm="0"
+  DeployWinArm="1"
   DeployLinux="1"
-  echo "Deploying four versions of $AppVersionStrFull: for Windows 32 bit, Windows 64 bit, macOS and Linux 64 bit.."
+  echo "Deploying five versions of $AppVersionStrFull: for Windows 32 bit / 64 bit / on ARM, macOS and Linux 64 bit.."
 fi
 if [ "$BuildTarget" == "mac" ]; then
   BackupPath="$HOME/Projects/backup/tdesktop"
@@ -102,7 +102,7 @@ Win64RemoteFolder="tx64"
 WinArmDeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tarm64"
 WinArmUpdateFile="tarm64upd$AppVersion"
 WinArmSetupFile="tsetup-arm64.$AppVersionStrFull.exe"
-WinArmPortablefile="tportable-arm64.$AppVersionStrFull.zip"
+WinArmPortableFile="tportable-arm64.$AppVersionStrFull.zip"
 WinArmRemoteFolder="tarm64"
 LinuxDeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tlinux"
 LinuxUpdateFile="tlinuxupd$AppVersion"
@@ -138,7 +138,7 @@ if [ "$AlphaVersion" != "0" ]; then
   Win64UpdateFile="${Win64UpdateFile}_${AlphaSignature}"
   Win64PortableFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
   WinArmUpdateFile="${WinArmUpdateFile}_${AlphaSignature}"
-  WinArmPortablefile="talpha${AlphaVersion}_${AlphaSignature}.zip"
+  WinArmPortableFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
   LinuxUpdateFile="${LinuxUpdateFile}_${AlphaSignature}"
   LinuxSetupFile="talpha${AlphaVersion}_${AlphaSignature}.tar.xz"
 fi

From da8a4ba8ab58227177b69b7bfeec88f6476609eb Mon Sep 17 00:00:00 2001
From: xiota <github@mentalfossa.com>
Date: Mon, 4 Nov 2024 20:40:37 +0000
Subject: [PATCH 180/306] Fix some ffmpeg 7.x related errors

---
 Telegram/SourceFiles/ui/controls/round_video_recorder.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
index f01df2165..4ba0e7768 100644
--- a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -107,9 +107,15 @@ private:
 		std::array<int64, kMaxStreams> lastDts = { 0 };
 	};
 
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+	static int Write(void *opaque, const uint8_t *_buf, int buf_size) {
+		uint8_t *buf = const_cast<uint8_t *>(_buf);
+#else
 	static int Write(void *opaque, uint8_t *buf, int buf_size) {
+#endif
 		return static_cast<Private*>(opaque)->write(buf, buf_size);
 	}
+
 	static int64_t Seek(void *opaque, int64_t offset, int whence) {
 		return static_cast<Private*>(opaque)->seek(offset, whence);
 	}
@@ -388,7 +394,6 @@ bool RoundVideoRecorder::Private::initAudio() {
 	_audioCodec->sample_rate = kAudioFrequency;
 #if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	_audioCodec->ch_layout = AV_CHANNEL_LAYOUT_MONO;
-	_audioCodec->channels = _audioCodec->ch_layout.nb_channels;
 #else
 	_audioCodec->channel_layout = AV_CH_LAYOUT_MONO;
 	_audioCodec->channels = _audioChannels;

From 53abd2fe38484433f0394ea3c811457a0cb4306c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Nov 2024 17:52:54 +0400
Subject: [PATCH 181/306] Follow show-panel-on-click for attach menu.

---
 .../SourceFiles/chat_helpers/tabbed_panel.cpp    |  4 ++++
 Telegram/SourceFiles/chat_helpers/tabbed_panel.h |  1 +
 Telegram/SourceFiles/history/history_widget.cpp  | 16 +++++++++++++---
 .../inline_bots/bot_attach_web_view.cpp          | 14 +++++++++-----
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index 7d399a596..da083896f 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -33,6 +33,10 @@ base::options::toggle TabbedPanelShowOnClick({
 
 const char kOptionTabbedPanelShowOnClick[] = "tabbed-panel-show-on-click";
 
+bool ShowPanelOnClick() {
+	return TabbedPanelShowOnClick.value();
+}
+
 TabbedPanel::TabbedPanel(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
index fcedb5efc..97d66e2c7 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
@@ -25,6 +25,7 @@ namespace ChatHelpers {
 class TabbedSelector;
 
 extern const char kOptionTabbedPanelShowOnClick[];
+[[nodiscard]] bool ShowPanelOnClick();
 
 struct TabbedPanelDescriptor {
 	Window::SessionController *regularWindow = nullptr;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 3d067da29..53d3db9fd 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -421,8 +421,16 @@ HistoryWidget::HistoryWidget(
 	initTabbedSelector();
 
 	_attachToggle->setClickedCallback([=] {
+		const auto toggle = _attachBotsMenu && _attachBotsMenu->isHidden();
 		base::call_delayed(st::historyAttach.ripple.hideDuration, this, [=] {
-			chooseAttach();
+			if (_attachBotsMenu && toggle) {
+				_attachBotsMenu->showAnimated();
+			} else {
+				chooseAttach();
+				if (_attachBotsMenu) {
+					_attachBotsMenu->hideAnimated();
+				}
+			}
 		});
 	});
 
@@ -2611,7 +2619,7 @@ void HistoryWidget::setHistory(History *history) {
 	if (was && !now) {
 		_attachToggle->removeEventFilter(_attachBotsMenu.get());
 		_attachBotsMenu->hideFast();
-	} else if (now && !was) {
+	} else if (now && !was && !ChatHelpers::ShowPanelOnClick()) {
 		_attachToggle->installEventFilter(_attachBotsMenu.get());
 	}
 
@@ -2699,7 +2707,9 @@ void HistoryWidget::refreshAttachBotsMenu() {
 	}
 	_attachBotsMenu->setOrigin(
 		Ui::PanelAnimation::Origin::BottomLeft);
-	_attachToggle->installEventFilter(_attachBotsMenu.get());
+	if (!ChatHelpers::ShowPanelOnClick()) {
+		_attachToggle->installEventFilter(_attachBotsMenu.get());
+	}
 	_attachBotsMenu->heightValue(
 	) | rpl::start_with_next([=] {
 		moveFieldControls();
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index be215bc50..c3290ea24 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer_rpl.h"
 #include "boxes/peer_list_controllers.h"
 #include "boxes/share_box.h"
+#include "chat_helpers/tabbed_panel.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "core/local_url_handlers.h"
@@ -2039,9 +2040,6 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 		not_null<PeerData*> peer,
 		Fn<Api::SendAction()> actionFactory,
 		Fn<void(bool)> attach) {
-	if (!Data::CanSend(peer, ChatRestriction::SendInline)) {
-		return nullptr;
-	}
 	auto result = std::make_unique<Ui::DropdownMenu>(
 		parent,
 		st::dropdownMenuWithIcons);
@@ -2096,8 +2094,10 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 			ChooseAndSendLocation(controller, config, actionFactory());
 		}, &st::menuIconAddress);
 	}
+	const auto addBots = Data::CanSend(peer, ChatRestriction::SendInline);
 	for (const auto &bot : bots->attachBots()) {
-		if (!bot.inAttachMenu
+		if (!addBots
+			|| !bot.inAttachMenu
 			|| !PeerMatchesTypes(peer, bot.user, bot.types)) {
 			continue;
 		}
@@ -2128,7 +2128,11 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 		}, action->lifetime());
 		raw->addAction(std::move(action));
 	}
-	if (raw->actions().size() <= minimal) {
+	const auto actions = raw->actions().size();
+	const auto onclick = ChatHelpers::ShowPanelOnClick();
+	if (!actions) {
+		return nullptr;
+	} else if (actions <= minimal && !onclick) {
 		return nullptr;
 	}
 	return result;

From 8fd9ae4e591f865c02571dc3e3093e02bd96025a Mon Sep 17 00:00:00 2001
From: xmdn <72883689+xmdnx@users.noreply.github.com>
Date: Sat, 2 Nov 2024 10:55:53 +0300
Subject: [PATCH 182/306] Replace deprecated x64 architecture identifier

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

diff --git a/Telegram/build/setup.iss b/Telegram/build/setup.iss
index b0dd43f65..d2c75fa1b 100644
--- a/Telegram/build/setup.iss
+++ b/Telegram/build/setup.iss
@@ -42,8 +42,8 @@ SignTool=sha256
   #define ArchModulesFolder "arm64"
   AppVerName={#MyAppName} {#MyAppVersion} arm64
 #elif MyBuildTarget == "win64"
-  ArchitecturesAllowed="x64 arm64"
-  ArchitecturesInstallIn64BitMode="x64 arm64"
+  ArchitecturesAllowed="x64compatible"
+  ArchitecturesInstallIn64BitMode="x64compatible"
   OutputBaseFilename=tsetup-x64.{#MyAppVersionFull}
   #define ArchModulesFolder "x64"
   AppVerName={#MyAppName} {#MyAppVersion} 64bit

From 76b1288f77239551b30a06b5d20ea5b214747059 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Oct 2024 06:50:01 +0300
Subject: [PATCH 183/306] Added access to height of multi select from peer list
 box.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp | 4 ++++
 Telegram/SourceFiles/boxes/peer_list_box.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index b47d4b203..9baed5c6c 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -543,6 +543,10 @@ auto PeerListBox::collectSelectedRows()
 	return result;
 }
 
+rpl::producer<int> PeerListBox::multiSelectHeightValue() const {
+	return _select ? _select->heightValue() : rpl::single(0);
+}
+
 PeerListRow::PeerListRow(not_null<PeerData*> peer)
 : PeerListRow(peer, peer->id.value) {
 }
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index ce1cc1220..658eb4f31 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -1102,6 +1102,7 @@ public:
 
 	[[nodiscard]] std::vector<PeerListRowId> collectSelectedIds();
 	[[nodiscard]] std::vector<not_null<PeerData*>> collectSelectedRows();
+	[[nodiscard]] rpl::producer<int> multiSelectHeightValue() const;
 
 	void peerListSetTitle(rpl::producer<QString> title) override {
 		setTitle(std::move(title));

From 36994395066eba3a40a6a14ca06bb2d758f2f81e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Oct 2024 08:36:06 +0300
Subject: [PATCH 184/306] Added ability to count sections widths of slider from
 derived class.

---
 Telegram/SourceFiles/ui/widgets/discrete_sliders.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
index 0cb930bf1..7815972d1 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
@@ -127,13 +127,14 @@ protected:
 
 	void startRipple(int sectionIndex) override;
 
+	std::vector<float64> countSectionsWidths(int newWidth) const;
+
 private:
 	const style::TextStyle &getLabelStyle() const override;
 	int getAnimationDuration() const override;
 	QImage prepareRippleMask(int sectionIndex, const Section &section);
 
 	void resizeSections(int newWidth);
-	std::vector<float64> countSectionsWidths(int newWidth) const;
 
 	const style::SettingsSlider &_st;
 	std::optional<Ui::RoundRect> _bar;

From 7aa1141ba56bdb27b8d25b9138dcd0794feea43f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 1 Nov 2024 15:18:11 +0300
Subject: [PATCH 185/306] Added ability to ignore hidden rows while searching
 to PeerListContent.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp | 23 +++++++++++++++-----
 Telegram/SourceFiles/boxes/peer_list_box.h   |  5 +++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 9baed5c6c..129eda165 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -547,6 +547,10 @@ rpl::producer<int> PeerListBox::multiSelectHeightValue() const {
 	return _select ? _select->heightValue() : rpl::single(0);
 }
 
+void PeerListBox::setIgnoreHiddenRowsOnSearch(bool value) {
+	content()->setIgnoreHiddenRowsOnSearch(value);
+}
+
 PeerListRow::PeerListRow(not_null<PeerData*> peer)
 : PeerListRow(peer, peer->id.value) {
 }
@@ -1389,10 +1393,12 @@ int PeerListContent::labelHeight() const {
 
 void PeerListContent::refreshRows() {
 	if (!_hiddenRows.empty()) {
-		_filterResults.clear();
-		for (const auto &row : _rows) {
-			if (!row->hidden()) {
-				_filterResults.push_back(row.get());
+		if (!_ignoreHiddenRowsOnSearch || _normalizedSearchQuery.isEmpty()) {
+			_filterResults.clear();
+			for (const auto &row : _rows) {
+				if (!row->hidden()) {
+					_filterResults.push_back(row.get());
+				}
 			}
 		}
 	}
@@ -2057,10 +2063,13 @@ void PeerListContent::checkScrollForPreload() {
 void PeerListContent::searchQueryChanged(QString query) {
 	const auto searchWordsList = TextUtilities::PrepareSearchWords(query);
 	const auto normalizedQuery = searchWordsList.join(' ');
+	if (_ignoreHiddenRowsOnSearch && !normalizedQuery.isEmpty()) {
+		_filterResults.clear();
+	}
 	if (_normalizedSearchQuery != normalizedQuery) {
 		setSearchQuery(query, normalizedQuery);
 		if (_controller->searchInLocal() && !searchWordsList.isEmpty()) {
-			Assert(_hiddenRows.empty());
+			Assert(_hiddenRows.empty() || _ignoreHiddenRowsOnSearch);
 
 			auto minimalList = (const std::vector<not_null<PeerListRow*>>*)nullptr;
 			for (const auto &searchWord : searchWordsList) {
@@ -2196,6 +2205,10 @@ void PeerListContent::dragLeft() {
 	clearSelection();
 }
 
+void PeerListContent::setIgnoreHiddenRowsOnSearch(bool value) {
+	_ignoreHiddenRowsOnSearch = value;
+}
+
 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 658eb4f31..31b8f348a 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -658,6 +658,8 @@ public:
 	PeerListRowId updateFromParentDrag(QPoint globalPosition);
 	void dragLeft();
 
+	void setIgnoreHiddenRowsOnSearch(bool value);
+
 	// Interface for the controller.
 	void appendRow(std::unique_ptr<PeerListRow> row);
 	void appendSearchRow(std::unique_ptr<PeerListRow> row);
@@ -879,6 +881,7 @@ private:
 	int _aboveHeight = 0;
 	int _belowHeight = 0;
 	bool _hideEmpty = false;
+	bool _ignoreHiddenRowsOnSearch = false;
 	object_ptr<Ui::RpWidget> _aboveWidget = { nullptr };
 	object_ptr<Ui::RpWidget> _aboveSearchWidget = { nullptr };
 	object_ptr<Ui::RpWidget> _belowWidget = { nullptr };
@@ -1104,6 +1107,8 @@ public:
 	[[nodiscard]] std::vector<not_null<PeerData*>> collectSelectedRows();
 	[[nodiscard]] rpl::producer<int> multiSelectHeightValue() const;
 
+	void setIgnoreHiddenRowsOnSearch(bool value);
+
 	void peerListSetTitle(rpl::producer<QString> title) override {
 		setTitle(std::move(title));
 	}

From 932215c91d6917ac54b7affd5d3a0a443be04e7f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 1 Nov 2024 17:30:40 +0300
Subject: [PATCH 186/306] Added initial implementation of tabs strip for chats
 filters.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../ui/widgets/chat_filters_tabs_strip.cpp    | 195 ++++++++++++++++++
 .../ui/widgets/chat_filters_tabs_strip.h      |  27 +++
 Telegram/lib_ui                               |   2 +-
 4 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
 create mode 100644 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 13af508c3..f8344b94b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1537,6 +1537,8 @@ PRIVATE
     ui/widgets/expandable_peer_list.h
     ui/widgets/label_with_custom_emoji.cpp
     ui/widgets/label_with_custom_emoji.h
+    ui/widgets/chat_filters_tabs_strip.cpp
+    ui/widgets/chat_filters_tabs_strip.h
     ui/countryinput.cpp
     ui/countryinput.h
     ui/dynamic_thumbnails.cpp
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
new file mode 100644
index 000000000..a89e9405a
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -0,0 +1,195 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/chat_filters_tabs_strip.h"
+
+#include "data/data_chat_filters.h"
+#include "data/data_session.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/widgets/discrete_sliders.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/wrap/slide_wrap.h"
+#include "styles/style_dialogs.h" // dialogsSearchTabs
+
+#include <QScrollBar>
+
+namespace Ui {
+
+not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Main::Session*> session,
+		rpl::producer<int> multiSelectHeightValue,
+		Fn<void(int)> setAddedTopScrollSkip,
+		Fn<void(FilterId)> choose) {
+	class Slider final : public Ui::SettingsSlider {
+	public:
+		using Ui::SettingsSlider::SettingsSlider;
+
+		[[nodiscard]] int centerOfSection(int section) const {
+			const auto widths = Ui::SettingsSlider::countSectionsWidths(0);
+			auto result = 0;
+			if (section >= 0 && section < widths.size()) {
+				for (auto i = 0; i < section; i++) {
+					result += widths[i];
+				}
+				result += widths[section] / 2;
+			}
+			return result;
+		}
+
+		void fitWidthToSections() {
+			const auto widths = Ui::SettingsSlider::countSectionsWidths(0);
+			resizeToWidth(ranges::accumulate(widths, .0));
+		}
+	};
+
+	struct State final {
+		Ui::Animations::Simple animation;
+		std::optional<FilterId> lastFilterId = std::nullopt;
+	};
+
+	const auto &scrollSt = st::defaultScrollArea;
+	const auto wrap = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+		parent,
+		object_ptr<Ui::RpWidget>(parent));
+	const auto container = wrap->entity();
+	const auto scroll = Ui::CreateChild<Ui::ScrollArea>(container, scrollSt);
+	const auto sliderPadding = st::dialogsSearchTabsPadding;
+	const auto slider = scroll->setOwnedWidget(
+		object_ptr<Ui::PaddingWrap<Slider>>(
+			parent,
+			object_ptr<Slider>(parent, st::dialogsSearchTabs),
+			QMargins(sliderPadding, 0, sliderPadding, 0)))->entity();
+	const auto state = wrap->lifetime().make_state<State>();
+	wrap->toggle(false, anim::type::instant);
+	container->sizeValue() | rpl::start_with_next([=](const QSize &s) {
+		scroll->resize(s + QSize(0, scrollSt.deltax * 4));
+	}, scroll->lifetime());
+	rpl::combine(
+		parent->widthValue(),
+		slider->heightValue()
+	) | rpl::start_with_next([=](int w, int h) {
+		container->resize(w, h);
+	}, wrap->lifetime());
+	scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
+		const auto pixelDelta = e->pixelDelta();
+		const auto angleDelta = e->angleDelta();
+		if (std::abs(pixelDelta.x()) + std::abs(angleDelta.x())) {
+			return false;
+		}
+		const auto bar = scroll->horizontalScrollBar();
+		const auto y = pixelDelta.y() ? pixelDelta.y() : angleDelta.y();
+		bar->setValue(bar->value() - y);
+		return true;
+	});
+
+	const auto scrollToIndex = [=](int index, anim::type type) {
+		const auto to = index
+			? (slider->centerOfSection(index) - scroll->width() / 2)
+			: 0;
+		const auto bar = scroll->horizontalScrollBar();
+		state->animation.stop();
+		if (type == anim::type::instant) {
+			bar->setValue(to);
+		} else {
+			state->animation.start(
+				[=](float64 v) { bar->setValue(v); },
+				bar->value(),
+				std::min(to, bar->maximum()),
+				st::defaultTabsSlider.duration);
+		}
+	};
+
+	const auto applyFilter = [=](const Data::ChatFilter &filter) {
+		choose(filter.id());
+	};
+
+	const auto filterByIndex = [=](int index) -> const Data::ChatFilter& {
+		const auto &list = session->data().chatsFilters().list();
+		Assert(index >= 0 && index < list.size());
+		return list[index];
+	};
+
+	const auto rebuild = [=] {
+		const auto &list = session->data().chatsFilters().list();
+		auto sections = ranges::views::all(
+			list
+		) | ranges::views::transform([](const Data::ChatFilter &filter) {
+			return filter.title().isEmpty()
+				? tr::lng_filters_all(tr::now)
+				: filter.title();
+		}) | ranges::to_vector;
+		slider->setSections(std::move(sections));
+		slider->fitWidthToSections();
+		[&] {
+			const auto lookingId = state->lastFilterId.value_or(list[0].id());
+			for (auto i = 0; i < list.size(); i++) {
+				const auto &filter = list[i];
+				if (filter.id() == lookingId) {
+					const auto wasLast = !!state->lastFilterId;
+					state->lastFilterId = filter.id();
+					slider->setActiveSectionFast(i);
+					scrollToIndex(
+						i,
+						wasLast ? anim::type::normal : anim::type::instant);
+					applyFilter(filter);
+					return;
+				}
+			}
+			if (list.size()) {
+				const auto index = 0;
+				const auto &filter = filterByIndex(index);
+				state->lastFilterId = filter.id();
+				slider->setActiveSectionFast(index);
+				scrollToIndex(index, anim::type::instant);
+				applyFilter(filter);
+			}
+		}();
+		slider->sectionActivated() | rpl::start_with_next([=](int index) {
+			const auto &filter = filterByIndex(index);
+			state->lastFilterId = filter.id();
+			scrollToIndex(index, anim::type::normal);
+			applyFilter(filter);
+		}, wrap->lifetime());
+		wrap->toggle((list.size() > 1), anim::type::instant);
+	};
+	session->data().chatsFilters().changed(
+	) | rpl::start_with_next(rebuild, wrap->lifetime());
+	rebuild();
+
+	session->data().chatsFilters().isChatlistChanged(
+	) | rpl::start_with_next([=](FilterId id) {
+		if (!id || !state->lastFilterId || (id != state->lastFilterId)) {
+			return;
+		}
+		for (const auto &filter : session->data().chatsFilters().list()) {
+			if (filter.id() == id) {
+				applyFilter(filter);
+				return;
+			}
+		}
+	}, wrap->lifetime());
+
+	{
+		std::move(
+			multiSelectHeightValue
+		) | rpl::start_with_next([=](int height) {
+			wrap->moveToLeft(0, height);
+		}, wrap->lifetime());
+		wrap->heightValue() | rpl::start_with_next([=](int height) {
+			setAddedTopScrollSkip(height);
+		}, wrap->lifetime());
+		parent->widthValue() | rpl::start_with_next([=](int w) {
+			wrap->resizeToWidth(w);
+		}, wrap->lifetime());
+	}
+
+	return wrap;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
new file mode 100644
index 000000000..c50814830
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.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 Session;
+} // namespace Main
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Ui {
+
+not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Main::Session*> session,
+	rpl::producer<int> multiSelectHeightValue,
+	Fn<void(int)> setAddedTopScrollSkip,
+	Fn<void(FilterId)> choose);
+
+} // namespace Ui
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 00b64a931..b969b5bd3 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 00b64a9311b0fcc4be14dc705a69aec16f6ced5f
+Subproject commit b969b5bd32c339be43732d7f1d34d7fdc3454eab

From d81c7abf1aff074217daf8cc0386f2b8c1804d56 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 30 Oct 2024 13:35:02 +0300
Subject: [PATCH 187/306] Added chats filters strip to forward box.

---
 .../SourceFiles/window/window_peer_menu.cpp   | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index a053bc87b..cf2244689 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "window/window_peer_menu.h"
 
-#include "api/api_report.h"
 #include "menu/menu_check_item.h"
 #include "boxes/share_box.h"
 #include "boxes/star_gift_box.h"
@@ -38,10 +37,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/edit_contact_box.h"
 #include "calls/calls_instance.h"
 #include "inline_bots/bot_attach_web_view.h" // InlineBots::PeerType.
-#include "ui/boxes/report_box_graphics.h"
 #include "ui/toast/toast.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "ui/widgets/chat_filters_tabs_strip.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/popup_menu.h"
@@ -2053,7 +2052,39 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 	const auto state = [&] {
 		auto controller = std::make_unique<Controller>(session);
 		const auto controllerRaw = controller.get();
-		auto box = Box<ListBox>(std::move(controller), nullptr);
+		auto init = [=](not_null<PeerListBox*> box) {
+			box->setIgnoreHiddenRowsOnSearch(true);
+			auto applyFilter = [=](FilterId id) {
+				box->scrollToY(0);
+				const auto &list = session->data().chatsFilters().list();
+				const auto filter = ranges::find(
+					list,
+					id,
+					&Data::ChatFilter::id);
+				if (filter == list.end()) {
+					return;
+				}
+				box->peerListPartitionRows([&](const PeerListRow &row) {
+					const auto rowPtr = const_cast<PeerListRow*>(&row);
+					if (!filter->id()) {
+						box->peerListSetRowHidden(rowPtr, false);
+					} else {
+						const auto result = filter->contains(
+							session->data().history(row.peer()));
+						box->peerListSetRowHidden(rowPtr, !result);
+					}
+					return false;
+				});
+				box->peerListRefreshRows();
+			};
+			Ui::AddChatFiltersTabsStrip(
+				box,
+				session,
+				box->multiSelectHeightValue(),
+				[=](int height) { box->setAddedTopScrollSkip(height); },
+				std::move(applyFilter));
+		};
+		auto box = Box<ListBox>(std::move(controller), std::move(init));
 		const auto boxRaw = box.data();
 		boxRaw->setForwardOptions({
 			.sendersCount = sendersCount,

From 1fa5e424e9e6231d45b705b8d95428e5453cb3a8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 1 Nov 2024 17:31:14 +0300
Subject: [PATCH 188/306] Added chats filters tabs strip to share box.

---
 Telegram/SourceFiles/boxes/share_box.cpp | 59 +++++++++++++++++++++---
 Telegram/SourceFiles/boxes/share_box.h   |  2 +
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index bd154f8c4..6550b3e10 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_account.h"
 #include "ui/boxes/confirm_box.h"
 #include "apiwrap.h"
+#include "ui/widgets/chat_filters_tabs_strip.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/multi_select.h"
 #include "ui/widgets/scroll_area.h"
@@ -39,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/share_message_phrase_factory.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/data_channel.h"
+#include "data/data_chat_filters.h"
 #include "data/data_game.h"
 #include "data/data_histories.h"
 #include "data/data_user.h"
@@ -86,6 +88,8 @@ public:
 	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
 	rpl::producer<> searchRequests() const;
 
+	void applyChatFilter(FilterId id);
+
 protected:
 	void visibleTopBottomUpdated(
 		int visibleTop,
@@ -166,7 +170,9 @@ private:
 	int _upon = -1;
 	int _visibleTop = 0;
 
-	std::unique_ptr<Dialogs::IndexedList> _chatsIndexed;
+	std::unique_ptr<Dialogs::IndexedList> _defaultChatsIndexed;
+	std::unique_ptr<Dialogs::IndexedList> _customChatsIndexed;
+	not_null<Dialogs::IndexedList*> _chatsIndexed;
 	QString _filter;
 	std::vector<not_null<Dialogs::Row*>> _filtered;
 
@@ -337,10 +343,25 @@ void ShareBox::prepare() {
 		{ .suggestCustomEmoji = true });
 
 	_select->raise();
+
+	AddChatFiltersTabsStrip(
+		this,
+		_descriptor.session,
+		_select->heightValue(),
+		[this](int height) {
+			_additionalTopScrollSkip = height;
+			updateScrollSkips();
+			scrollToY(0);
+		},
+		[this](FilterId id) {
+			_inner->applyChatFilter(id);
+			scrollToY(0);
+		});
 }
 
 int ShareBox::getTopScrollSkip() const {
-	return _select->isHidden() ? 0 : _select->height();
+	return (_select->isHidden() ? 0 : _select->height())
+		+ _additionalTopScrollSkip;
 }
 
 int ShareBox::getBottomScrollSkip() const {
@@ -671,9 +692,10 @@ ShareBox::Inner::Inner(
 , _descriptor(descriptor)
 , _show(std::move(show))
 , _st(_descriptor.st ? *_descriptor.st : st::shareBoxList)
-, _chatsIndexed(
+, _defaultChatsIndexed(
 	std::make_unique<Dialogs::IndexedList>(
-		Dialogs::SortMode::Add)) {
+		Dialogs::SortMode::Add))
+, _chatsIndexed(_defaultChatsIndexed.get()) {
 	_rowsTop = st::shareRowsTop;
 	_rowHeight = st::shareRowHeight;
 	setAttribute(Qt::WA_OpaquePaintEvent);
@@ -691,7 +713,7 @@ ShareBox::Inner::Inner(
 	const auto self = _descriptor.session->user();
 	const auto selfHistory = self->owner().history(self);
 	if (_descriptor.filterCallback(selfHistory)) {
-		_chatsIndexed->addToEnd(selfHistory);
+		_defaultChatsIndexed->addToEnd(selfHistory);
 	}
 	const auto addList = [&](not_null<Dialogs::IndexedList*> list) {
 		for (const auto &row : list->all()) {
@@ -699,7 +721,7 @@ ShareBox::Inner::Inner(
 				if (!history->peer->isSelf()
 					&& (history->asForum()
 						|| _descriptor.filterCallback(history))) {
-					_chatsIndexed->addToEnd(history);
+					_defaultChatsIndexed->addToEnd(history);
 				}
 			}
 		}
@@ -722,7 +744,7 @@ ShareBox::Inner::Inner(
 
 	_descriptor.session->changes().realtimeNameUpdates(
 	) | rpl::start_with_next([=](const Data::NameUpdate &update) {
-		_chatsIndexed->peerNameChanged(
+		_defaultChatsIndexed->peerNameChanged(
 			update.peer,
 			update.oldFirstLetters);
 	}, lifetime());
@@ -1339,6 +1361,29 @@ rpl::producer<> ShareBox::Inner::searchRequests() const {
 	return _searchRequests.events();
 }
 
+void ShareBox::Inner::applyChatFilter(FilterId id) {
+	if (!id) {
+		_chatsIndexed = _defaultChatsIndexed.get();
+	} else {
+		_customChatsIndexed = std::make_unique<Dialogs::IndexedList>(
+			Dialogs::SortMode::Add);
+		_chatsIndexed = _customChatsIndexed.get();
+
+		const auto addList = [&](not_null<Dialogs::IndexedList*> list) {
+			for (const auto &row : list->all()) {
+				if (const auto history = row->history()) {
+					if (_descriptor.filterCallback(history)) {
+						_customChatsIndexed->addToEnd(history);
+					}
+				}
+			}
+		};
+		const auto &data = _descriptor.session->data();
+		addList(data.chatsFilters().chatsList(id)->indexed());
+	}
+	update();
+}
+
 void ShareBox::Inner::peopleReceived(
 		const QString &query,
 		const QVector<MTPPeer> &my,
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index d0bf28ce9..05847f500 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -174,6 +174,8 @@ private:
 	bool _peopleFull = false;
 	mtpRequestId _peopleRequest = 0;
 
+	int _additionalTopScrollSkip = 0;
+
 	using PeopleCache = QMap<QString, MTPcontacts_Found>;
 	PeopleCache _peopleCache;
 

From b06dbd1c00113f93e8fa2ffa4926f277209012d9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 1 Nov 2024 17:56:06 +0300
Subject: [PATCH 189/306] Added support of pinned chats from filters to forward
 box.

---
 .../SourceFiles/window/window_peer_menu.cpp   | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index cf2244689..c93c9fecc 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2056,7 +2056,40 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			box->setIgnoreHiddenRowsOnSearch(true);
 			auto applyFilter = [=](FilterId id) {
 				box->scrollToY(0);
-				const auto &list = session->data().chatsFilters().list();
+				auto &filters = session->data().chatsFilters();
+				const auto &list = filters.list();
+				if (list.size() <= 1) {
+					return;
+				}
+				const auto pinned = filters.chatsList(id)->pinned()->order();
+				box->peerListSortRows([&](
+						const PeerListRow &r1,
+						const PeerListRow &r2) {
+					const auto it1 = ranges::find_if(pinned, [&](
+							const Dialogs::Key &k) {
+						return k.peer() == r1.peer();
+					});
+					const auto it2 = ranges::find_if(pinned, [&](
+							const Dialogs::Key &k) {
+						return k.peer() == r2.peer();
+					});
+					if (it1 == pinned.end() && it2 != pinned.end()) {
+						return false;
+					} else if (it2 == pinned.end() && it1 != pinned.end()) {
+						return true;
+					} else if (it1 != pinned.end() && it2 != pinned.end()) {
+						return it1 < it2;
+					}
+					const auto history1 = session->data().history(r1.peer());
+					const auto history2 = session->data().history(r2.peer());
+					const auto date1 = history1->lastMessage()
+						? history1->lastMessage()->date()
+						: TimeId(0);
+					const auto date2 = history2->lastMessage()
+						? history2->lastMessage()->date()
+						: TimeId(0);
+					return date1 > date2;
+				});
 				const auto filter = ranges::find(
 					list,
 					id,

From de3d7a777462addf9fd5090e0a04ff056b8c6937 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 13:10:09 +0300
Subject: [PATCH 190/306] Removed redundant templates from DiscreteSlider.

---
 .../ui/widgets/discrete_sliders.cpp           | 110 +++++++++++-------
 .../SourceFiles/ui/widgets/discrete_sliders.h |  21 ++--
 2 files changed, 80 insertions(+), 51 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index 53dc4e3dd..56c239a99 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/discrete_sliders.h"
 
 #include "ui/effects/ripple_animation.h"
-#include "ui/painter.h"
+#include "styles/style_widgets.h"
 
 namespace Ui {
 
@@ -125,8 +125,7 @@ DiscreteSlider::Range DiscreteSlider::getCurrentActiveRange() const {
 	};
 }
 
-template <typename Lambda>
-void DiscreteSlider::enumerateSections(Lambda callback) {
+void DiscreteSlider::enumerateSections(Fn<bool(Section&)> callback) {
 	for (auto &section : _sections) {
 		if (!callback(section)) {
 			return;
@@ -134,9 +133,9 @@ void DiscreteSlider::enumerateSections(Lambda callback) {
 	}
 }
 
-template <typename Lambda>
-void DiscreteSlider::enumerateSections(Lambda callback) const {
-	for (auto &section : _sections) {
+void DiscreteSlider::enumerateSections(
+		Fn<bool(const Section&)> callback) const {
+	for (const auto &section : _sections) {
 		if (!callback(section)) {
 			return;
 		}
@@ -144,7 +143,7 @@ void DiscreteSlider::enumerateSections(Lambda callback) const {
 }
 
 void DiscreteSlider::mousePressEvent(QMouseEvent *e) {
-	auto index = getIndexFromPosition(e->pos());
+	const auto index = getIndexFromPosition(e->pos());
 	if (_selectOnPress) {
 		setSelectedSection(index);
 	}
@@ -153,17 +152,21 @@ void DiscreteSlider::mousePressEvent(QMouseEvent *e) {
 }
 
 void DiscreteSlider::mouseMoveEvent(QMouseEvent *e) {
-	if (_pressed < 0) return;
+	if (_pressed < 0) {
+		return;
+	}
 	if (_selectOnPress) {
 		setSelectedSection(getIndexFromPosition(e->pos()));
 	}
 }
 
 void DiscreteSlider::mouseReleaseEvent(QMouseEvent *e) {
-	auto pressed = std::exchange(_pressed, -1);
-	if (pressed < 0) return;
+	const auto pressed = std::exchange(_pressed, -1);
+	if (pressed < 0) {
+		return;
+	}
 
-	auto index = getIndexFromPosition(e->pos());
+	const auto index = getIndexFromPosition(e->pos());
 	if (pressed < _sections.size()) {
 		if (_sections[pressed].ripple) {
 			_sections[pressed].ripple->lastStop();
@@ -175,14 +178,16 @@ void DiscreteSlider::mouseReleaseEvent(QMouseEvent *e) {
 }
 
 void DiscreteSlider::setSelectedSection(int index) {
-	if (index < 0 || index >= _sections.size()) return;
+	if (index < 0 || index >= _sections.size()) {
+		return;
+	}
 
 	if (_selected != index) {
 		const auto from = getFinalActiveRange();
 		_selected = index;
 		const auto to = getFinalActiveRange();
 		const auto duration = getAnimationDuration();
-		const auto updater = [=] { update(); };
+		const auto updater = [this] { update(); };
 		_a_left.start(updater, from.left, to.left, duration);
 		_a_width.start(updater, from.width, to.width, duration);
 		_callbackAfterMs = crl::now() + duration;
@@ -190,8 +195,8 @@ void DiscreteSlider::setSelectedSection(int index) {
 }
 
 int DiscreteSlider::getIndexFromPosition(QPoint pos) {
-	int count = _sections.size();
-	for (int i = 0; i != count; ++i) {
+	const auto count = _sections.size();
+	for (auto i = 0; i != count; ++i) {
 		if (_sections[i].left + _sections[i].width > pos.x()) {
 			return i;
 		}
@@ -237,10 +242,12 @@ int SettingsSlider::getAnimationDuration() const {
 }
 
 void SettingsSlider::resizeSections(int newWidth) {
-	auto count = getSectionsCount();
-	if (!count) return;
+	const auto count = getSectionsCount();
+	if (!count) {
+		return;
+	}
 
-	auto sectionWidths = countSectionsWidths(newWidth);
+	const auto sectionWidths = countSectionsWidths(newWidth);
 
 	auto skip = 0;
 	auto x = 0.;
@@ -258,11 +265,10 @@ void SettingsSlider::resizeSections(int newWidth) {
 	stopAnimation();
 }
 
-std::vector<float64> SettingsSlider::countSectionsWidths(
-		int newWidth) const {
-	auto count = getSectionsCount();
-	auto sectionsWidth = newWidth - (count - 1) * _st.barSkip;
-	auto sectionWidth = sectionsWidth / float64(count);
+std::vector<float64> SettingsSlider::countSectionsWidths(int newWidth) const {
+	const auto count = getSectionsCount();
+	const auto sectionsWidth = newWidth - (count - 1) * _st.barSkip;
+	const auto sectionWidth = sectionsWidth / float64(count);
 
 	auto result = std::vector<float64>(count, sectionWidth);
 	auto labelsWidth = 0;
@@ -297,7 +303,9 @@ int SettingsSlider::resizeGetHeight(int newWidth) {
 }
 
 void SettingsSlider::startRipple(int sectionIndex) {
-	if (!_st.ripple.showDuration) return;
+	if (!_st.ripple.showDuration) {
+		return;
+	}
 	auto index = 0;
 	enumerateSections([this, &index, sectionIndex](Section &section) {
 		if (index++ == sectionIndex) {
@@ -319,13 +327,13 @@ void SettingsSlider::startRipple(int sectionIndex) {
 QImage SettingsSlider::prepareRippleMask(
 		int sectionIndex,
 		const Section &section) {
-	auto size = QSize(section.width, height() - _st.rippleBottomSkip);
+	const auto size = QSize(section.width, height() - _st.rippleBottomSkip);
 	if (!_rippleTopRoundRadius
 		|| (sectionIndex > 0 && sectionIndex + 1 < getSectionsCount())) {
 		return RippleAnimation::RectMask(size);
 	}
 	return RippleAnimation::MaskByDrawer(size, false, [&](QPainter &p) {
-		auto plusRadius = _rippleTopRoundRadius + 1;
+		const auto plusRadius = _rippleTopRoundRadius + 1;
 		p.drawRoundedRect(
 			0,
 			0,
@@ -347,10 +355,10 @@ QImage SettingsSlider::prepareRippleMask(
 }
 
 void SettingsSlider::paintEvent(QPaintEvent *e) {
-	Painter p(this);
+	auto p = QPainter(this);
 
-	auto clip = e->rect();
-	auto range = getCurrentActiveRange();
+	const auto clip = e->rect();
+	const auto range = DiscreteSlider::getCurrentActiveRange();
 
 	const auto drawRect = [&](QRect rect, bool active = false) {
 		const auto &bar = active ? _barActive : _bar;
@@ -366,28 +374,35 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 			: section.width;
 		const auto activeLeft = section.left
 			+ (section.width - activeWidth) / 2;
-		auto active = 1.
+		const auto active = 1.
 			- std::clamp(
-				qAbs(range.left - activeLeft) / float64(range.width),
+				std::abs(range.left - activeLeft) / float64(range.width),
 				0.,
 				1.);
 		if (section.ripple) {
-			auto color = anim::color(_st.rippleBg, _st.rippleBgActive, active);
+			const auto color = anim::color(
+				_st.rippleBg,
+				_st.rippleBgActive,
+				active);
 			section.ripple->paint(p, section.left, 0, width(), &color);
 			if (section.ripple->empty()) {
 				section.ripple.reset();
 			}
 		}
 		if (!_st.barSnapToLabel) {
-			auto from = activeLeft, tofill = activeWidth;
+			auto from = activeLeft;
+			auto tofill = activeWidth;
 			if (range.left > from) {
-				auto fill = qMin(tofill, range.left - from);
+				const auto fill = std::min(tofill, range.left - from);
 				drawRect(myrtlrect(from, _st.barTop, fill, _st.barStroke));
 				from += fill;
 				tofill -= fill;
 			}
 			if (range.left + activeWidth > from) {
-				if (auto fill = qMin(tofill, range.left + activeWidth - from)) {
+				const auto fill = std::min(
+					tofill,
+					range.left + activeWidth - from);
+				if (fill) {
 					drawRect(
 						myrtlrect(from, _st.barTop, fill, _st.barStroke),
 						true);
@@ -399,15 +414,20 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 				drawRect(myrtlrect(from, _st.barTop, tofill, _st.barStroke));
 			}
 		}
-		const auto labelLeft = section.left + (section.width - section.label.maxWidth()) / 2;
-		if (myrtlrect(labelLeft, _st.labelTop, section.label.maxWidth(), _st.labelStyle.font->height).intersects(clip)) {
+		const auto labelLeft = section.left
+			+ (section.width - section.label.maxWidth()) / 2;
+		const auto rect = myrtlrect(
+			labelLeft,
+			_st.labelTop,
+			section.label.maxWidth(),
+			_st.labelStyle.font->height);
+		if (rect.intersects(clip)) {
 			p.setPen(anim::pen(_st.labelFg, _st.labelFgActive, active));
-			section.label.drawLeft(
-				p,
-				labelLeft,
-				_st.labelTop,
-				section.label.maxWidth(),
-				width());
+			section.label.draw(p, {
+				.position = QPoint(labelLeft, _st.labelTop),
+				.outerWidth = width(),
+				.availableWidth = section.label.maxWidth(),
+			});
 		}
 		return true;
 	});
@@ -416,7 +436,9 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 		const auto from = std::max(range.left - add, 0);
 		const auto till = std::min(range.left + range.width + add, width());
 		if (from < till) {
-			drawRect(myrtlrect(from, _st.barTop, till - from, _st.barStroke), true);
+			drawRect(
+				myrtlrect(from, _st.barTop, till - from, _st.barStroke),
+				true);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
index 7815972d1..952123eb4 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
@@ -10,7 +10,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rp_widget.h"
 #include "ui/round_rect.h"
 #include "ui/effects/animations.h"
-#include "styles/style_widgets.h"
+
+namespace style {
+struct TextStyle;
+struct SettingsSlider;
+} // namespace style
+
+namespace st {
+extern const style::SettingsSlider &defaultSettingsSlider;
+} // namespace st
 
 namespace Ui {
 
@@ -72,11 +80,8 @@ protected:
 		return _sections.size();
 	}
 
-	template <typename Lambda>
-	void enumerateSections(Lambda callback);
-
-	template <typename Lambda>
-	void enumerateSections(Lambda callback) const;
+	void enumerateSections(Fn<bool(Section&)> callback);
+	void enumerateSections(Fn<bool(const Section&)> callback) const;
 
 	virtual void startRipple(int sectionIndex) {
 	}
@@ -116,7 +121,9 @@ private:
 
 class SettingsSlider : public DiscreteSlider {
 public:
-	SettingsSlider(QWidget *parent, const style::SettingsSlider &st = st::defaultSettingsSlider);
+	SettingsSlider(
+		QWidget *parent,
+		const style::SettingsSlider &st = st::defaultSettingsSlider);
 
 	void setRippleTopRoundRadius(int radius);
 

From 5a4449f1a2468cb549306e09219eaed97b109ca6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 14:44:29 +0300
Subject: [PATCH 191/306] Added ability to set custom width of section to
 DiscreteSlider.

---
 .../ui/widgets/discrete_sliders.cpp           | 25 +++++++++++++------
 .../SourceFiles/ui/widgets/discrete_sliders.h |  7 ++++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index 56c239a99..9ceaa818b 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -57,6 +57,13 @@ void DiscreteSlider::finishAnimating() {
 	}
 }
 
+void DiscreteSlider::setAdditionalContentWidthToSection(int index, int w) {
+	if (index >= 0 && index < _sections.size()) {
+		auto &section = _sections[index];
+		section.contentWidth = section.label.maxWidth() + w;
+	}
+}
+
 void DiscreteSlider::setSelectOnPress(bool selectOnPress) {
 	_selectOnPress = selectOnPress;
 }
@@ -112,7 +119,7 @@ DiscreteSlider::Range DiscreteSlider::getFinalActiveRange() const {
 		return { 0, 0 };
 	}
 	const auto width = _snapToLabel
-		? std::min(raw->width, raw->label.maxWidth())
+		? std::min(raw->width, raw->contentWidth)
 		: raw->width;
 	return { raw->left + ((raw->width - width) / 2), width };
 }
@@ -207,7 +214,8 @@ int DiscreteSlider::getIndexFromPosition(QPoint pos) {
 DiscreteSlider::Section::Section(
 	const QString &label,
 	const style::TextStyle &st)
-: label(st, label) {
+: label(st, label)
+, contentWidth(Section::label.maxWidth()) {
 }
 
 DiscreteSlider::Section::Section(
@@ -215,6 +223,7 @@ DiscreteSlider::Section::Section(
 		const style::TextStyle &st,
 		const std::any &context) {
 	this->label.setMarkedText(st, label, kMarkupTextOptions, context);
+	contentWidth = Section::label.maxWidth();
 }
 
 SettingsSlider::SettingsSlider(
@@ -274,8 +283,8 @@ std::vector<float64> SettingsSlider::countSectionsWidths(int newWidth) const {
 	auto labelsWidth = 0;
 	auto commonWidth = true;
 	enumerateSections([&](const Section &section) {
-		labelsWidth += section.label.maxWidth();
-		if (section.label.maxWidth() >= sectionWidth) {
+		labelsWidth += section.contentWidth;
+		if (section.contentWidth >= sectionWidth) {
 			commonWidth = false;
 		}
 		return true;
@@ -289,7 +298,7 @@ std::vector<float64> SettingsSlider::countSectionsWidths(int newWidth) const {
 		enumerateSections([&](const Section &section) {
 			Expects(currentWidth != result.end());
 
-			*currentWidth = padding + section.label.maxWidth() + padding;
+			*currentWidth = padding + section.contentWidth + padding;
 			++currentWidth;
 			return true;
 		});
@@ -370,7 +379,7 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 	};
 	enumerateSections([&](Section &section) {
 		const auto activeWidth = _st.barSnapToLabel
-			? section.label.maxWidth()
+			? section.contentWidth
 			: section.width;
 		const auto activeLeft = section.left
 			+ (section.width - activeWidth) / 2;
@@ -415,11 +424,11 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 			}
 		}
 		const auto labelLeft = section.left
-			+ (section.width - section.label.maxWidth()) / 2;
+			+ (section.width - section.contentWidth) / 2;
 		const auto rect = myrtlrect(
 			labelLeft,
 			_st.labelTop,
-			section.label.maxWidth(),
+			section.contentWidth,
 			_st.labelStyle.font->height);
 		if (rect.intersects(clip)) {
 			p.setPen(anim::pen(_st.labelFg, _st.labelFgActive, active));
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
index 952123eb4..2ac574b7c 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
@@ -44,6 +44,8 @@ public:
 	void setActiveSectionFast(int index);
 	void finishAnimating();
 
+	void setAdditionalContentWidthToSection(int index, int width);
+
 	[[nodiscard]] rpl::producer<int> sectionActivated() const {
 		return _sectionActivated.events();
 	}
@@ -63,10 +65,11 @@ protected:
 			const style::TextStyle &st,
 			const std::any &context);
 
-		int left = 0;
-		int width = 0;
 		Ui::Text::String label;
 		std::unique_ptr<RippleAnimation> ripple;
+		int left = 0;
+		int width = 0;
+		int contentWidth = 0;
 	};
 	struct Range {
 		int left = 0;

From f0a2c47613335567a42f5f5055dc46eb72a5ef3e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 16:48:00 +0300
Subject: [PATCH 192/306] Added initial implementation of chats filters tabs
 slider to td_ui.

---
 .../ui/widgets/chat_filters_tabs_slider.cpp   | 188 ++++++++++++++++++
 .../ui/widgets/chat_filters_tabs_slider.h     |  55 +++++
 Telegram/cmake/td_ui.cmake                    |   2 +
 3 files changed, 245 insertions(+)
 create mode 100644 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
 create mode 100644 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
new file mode 100644
index 000000000..ca53058c5
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -0,0 +1,188 @@
+/*
+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/chat_filters_tabs_slider.h"
+
+#include "ui/effects/ripple_animation.h"
+#include "styles/style_widgets.h"
+
+#include <QScrollBar>
+
+namespace Ui {
+
+ChatsFiltersTabs::ChatsFiltersTabs(
+	not_null<Ui::RpWidget*> parent,
+	const style::SettingsSlider &st)
+: Ui::SettingsSlider(parent, st)
+, _st(st)
+, _unreadSt([&] {
+	auto st = Ui::UnreadBadgeStyle();
+	st.align = style::al_left;
+	return st;
+}())
+, _unreadMaxString(u"99+"_q)
+, _unreadSkip(st::lineWidth * 5) {
+	Expects(_st.barSnapToLabel && _st.strictSkip);
+	if (_st.barRadius > 0) {
+		_bar.emplace(_st.barRadius, _st.barFg);
+		_barActive.emplace(_st.barRadius, _st.barFgActive);
+	}
+	{
+		const auto one = Ui::CountUnreadBadgeSize(u"9"_q, _unreadSt, 1);
+		_cachedBadgeWidths = {
+			one.width(),
+			Ui::CountUnreadBadgeSize(u"99"_q, _unreadSt, 2).width(),
+			Ui::CountUnreadBadgeSize(u"999"_q, _unreadSt, 2).width(),
+		};
+		_cachedBadgeHeight = one.height();
+	}
+}
+
+int ChatsFiltersTabs::centerOfSection(int section) const {
+	const auto widths = countSectionsWidths(0);
+	auto result = 0;
+	if (section >= 0 && section < widths.size()) {
+		for (auto i = 0; i < section; i++) {
+			result += widths[i];
+		}
+		result += widths[section] / 2;
+	}
+	return result;
+}
+
+void ChatsFiltersTabs::fitWidthToSections() {
+	const auto widths = countSectionsWidths(0);
+	resizeToWidth(ranges::accumulate(widths, .0));
+}
+
+void ChatsFiltersTabs::setUnreadCount(int index, int unreadCount) {
+	const auto it = _unreadCounts.find(index);
+	if (it == _unreadCounts.end()) {
+		if (unreadCount) {
+			_unreadCounts.emplace(index, Unread{
+				.cache = cacheUnreadCount(unreadCount),
+				.count = unreadCount,
+			});
+		}
+	} else {
+		if (unreadCount) {
+			it->second.count = unreadCount;
+			it->second.cache = cacheUnreadCount(unreadCount);
+		} else {
+			_unreadCounts.erase(it);
+		}
+	}
+	if (unreadCount) {
+		const auto widthIndex = (unreadCount < 10)
+			? 0
+			: (unreadCount < 100)
+			? 1
+			: 2;
+		setAdditionalContentWidthToSection(
+			index,
+			_cachedBadgeWidths[widthIndex] + _unreadSkip);
+	} else {
+		setAdditionalContentWidthToSection(index, 0);
+	}
+}
+
+QImage ChatsFiltersTabs::cacheUnreadCount(int count) const {
+	const auto widthIndex = (count < 10) ? 0 : (count < 100) ? 1 : 2;
+	auto image = QImage(
+		QSize(_cachedBadgeWidths[widthIndex], _cachedBadgeHeight)
+			* style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	const auto string = (count > 99)
+		? _unreadMaxString
+		: QString::number(count);
+	{
+		auto p = QPainter(&image);
+		Ui::PaintUnreadBadge(p, string, 0, 0, _unreadSt, 0);
+	}
+	return image;
+}
+
+void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	const auto clip = e->rect();
+	const auto range = getCurrentActiveRange();
+
+	auto index = 0;
+	enumerateSections([&](Section &section) {
+		const auto activeWidth = _st.barSnapToLabel
+			? section.contentWidth
+			: section.width;
+		const auto activeLeft = section.left
+			+ (section.width - activeWidth) / 2;
+		const auto active = 1.
+			- std::clamp(
+				std::abs(range.left - activeLeft) / float64(range.width),
+				0.,
+				1.);
+		if (section.ripple) {
+			const auto color = anim::color(
+				_st.rippleBg,
+				_st.rippleBgActive,
+				active);
+			section.ripple->paint(p, section.left, 0, width(), &color);
+			if (section.ripple->empty()) {
+				section.ripple.reset();
+			}
+		}
+		const auto labelLeft = section.left
+			+ (section.width - section.contentWidth) / 2;
+		const auto rect = myrtlrect(
+			labelLeft,
+			_st.labelTop,
+			section.contentWidth,
+			_st.labelStyle.font->height);
+		if (rect.intersects(clip)) {
+			p.setPen(anim::pen(_st.labelFg, _st.labelFgActive, active));
+			section.label.draw(p, {
+				.position = QPoint(labelLeft, _st.labelTop),
+				.outerWidth = width(),
+				.availableWidth = section.label.maxWidth(),
+			});
+			{
+				const auto it = _unreadCounts.find(index);
+				if (it != _unreadCounts.end()) {
+					p.drawImage(
+						labelLeft
+							+ _unreadSkip
+							+ section.label.maxWidth(),
+						_st.labelTop,
+						it->second.cache);
+				}
+			}
+		}
+		index++;
+		return true;
+	});
+	if (_st.barSnapToLabel) {
+		const auto drawRect = [&](QRect rect, bool active) {
+			const auto &bar = active ? _barActive : _bar;
+			if (bar) {
+				bar->paint(p, rect);
+			} else {
+				p.fillRect(rect, active ? _st.barFgActive : _st.barFg);
+			}
+		};
+		const auto add = _st.barStroke / 2;
+		const auto from = std::max(range.left - add, 0);
+		const auto till = std::min(range.left + range.width + add, width());
+		if (from < till) {
+			drawRect(
+				myrtlrect(from, _st.barTop, till - from, _st.barStroke),
+				true);
+		}
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
new file mode 100644
index 000000000..a4d0e3191
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
@@ -0,0 +1,55 @@
+/*
+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/unread_badge_paint.h"
+#include "ui/widgets/discrete_sliders.h"
+
+namespace style {
+struct SettingsSlider;
+} // namespace style
+
+namespace Ui {
+
+class RpWidget;
+class SettingsSlider;
+
+class ChatsFiltersTabs final : public Ui::SettingsSlider {
+public:
+	ChatsFiltersTabs(
+		not_null<Ui::RpWidget*> parent,
+		const style::SettingsSlider &st);
+
+	[[nodiscard]] int centerOfSection(int section) const;
+	void fitWidthToSections();
+	void setUnreadCount(int index, int unreadCount);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	[[nodiscard]] QImage cacheUnreadCount(int count) const;
+
+	using Index = int;
+	struct Unread final {
+		QImage cache;
+		int count = 0;
+	};
+	base::flat_map<Index, Unread> _unreadCounts;
+	const style::SettingsSlider &_st;
+	const UnreadBadgeStyle _unreadSt;
+	const QString _unreadMaxString;
+	const int _unreadSkip;
+	std::vector<int> _cachedBadgeWidths;
+	int _cachedBadgeHeight = 0;
+	std::optional<Ui::RoundRect> _bar;
+	std::optional<Ui::RoundRect> _barActive;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 3da81f9d2..f45d83aff 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -421,6 +421,8 @@ PRIVATE
     ui/widgets/fields/time_part_input_with_placeholder.cpp
     ui/widgets/fields/time_part_input_with_placeholder.h
 
+    ui/widgets/chat_filters_tabs_slider.cpp
+    ui/widgets/chat_filters_tabs_slider.h
     ui/widgets/color_editor.cpp
     ui/widgets/color_editor.h
     ui/widgets/continuous_sliders.cpp

From 36924da59afd2f3aa83d32b3de197ce6b5dd6a7b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 16:49:52 +0300
Subject: [PATCH 193/306] Replaced inner slider in chats filters strip.

---
 .../ui/widgets/chat_filters_tabs_strip.cpp    | 28 ++-----------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index a89e9405a..ec3ca0bf7 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "ui/widgets/discrete_sliders.h"
+#include "ui/widgets/chat_filters_tabs_slider.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_dialogs.h" // dialogsSearchTabs
@@ -26,28 +26,6 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		rpl::producer<int> multiSelectHeightValue,
 		Fn<void(int)> setAddedTopScrollSkip,
 		Fn<void(FilterId)> choose) {
-	class Slider final : public Ui::SettingsSlider {
-	public:
-		using Ui::SettingsSlider::SettingsSlider;
-
-		[[nodiscard]] int centerOfSection(int section) const {
-			const auto widths = Ui::SettingsSlider::countSectionsWidths(0);
-			auto result = 0;
-			if (section >= 0 && section < widths.size()) {
-				for (auto i = 0; i < section; i++) {
-					result += widths[i];
-				}
-				result += widths[section] / 2;
-			}
-			return result;
-		}
-
-		void fitWidthToSections() {
-			const auto widths = Ui::SettingsSlider::countSectionsWidths(0);
-			resizeToWidth(ranges::accumulate(widths, .0));
-		}
-	};
-
 	struct State final {
 		Ui::Animations::Simple animation;
 		std::optional<FilterId> lastFilterId = std::nullopt;
@@ -61,9 +39,9 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	const auto scroll = Ui::CreateChild<Ui::ScrollArea>(container, scrollSt);
 	const auto sliderPadding = st::dialogsSearchTabsPadding;
 	const auto slider = scroll->setOwnedWidget(
-		object_ptr<Ui::PaddingWrap<Slider>>(
+		object_ptr<Ui::PaddingWrap<Ui::ChatsFiltersTabs>>(
 			parent,
-			object_ptr<Slider>(parent, st::dialogsSearchTabs),
+			object_ptr<Ui::ChatsFiltersTabs>(parent, st::dialogsSearchTabs),
 			QMargins(sliderPadding, 0, sliderPadding, 0)))->entity();
 	const auto state = wrap->lifetime().make_state<State>();
 	wrap->toggle(false, anim::type::instant);

From b11b5caeb3d9227286b5bab085783f615fe26438 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 17:00:18 +0300
Subject: [PATCH 194/306] Moved out unread state values of main list to
 separated file.

---
 Telegram/CMakeLists.txt                       |  2 +
 .../SourceFiles/data/data_unread_value.cpp    | 53 +++++++++++++++++++
 Telegram/SourceFiles/data/data_unread_value.h | 28 ++++++++++
 .../window/window_filters_menu.cpp            | 41 ++------------
 4 files changed, 86 insertions(+), 38 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_unread_value.cpp
 create mode 100644 Telegram/SourceFiles/data/data_unread_value.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index f8344b94b..a86a14484 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -636,6 +636,8 @@ PRIVATE
     data/data_thread.h
     data/data_types.cpp
     data/data_types.h
+    data/data_unread_value.cpp
+    data/data_unread_value.h
     data/data_user.cpp
     data/data_user.h
     data/data_user_photos.cpp
diff --git a/Telegram/SourceFiles/data/data_unread_value.cpp b/Telegram/SourceFiles/data/data_unread_value.cpp
new file mode 100644
index 000000000..665502979
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_unread_value.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_unread_value.h"
+
+#include "data/data_chat_filters.h"
+#include "data/data_folder.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+
+namespace Data {
+namespace {
+
+rpl::producer<Dialogs::UnreadState> MainListUnreadState(
+		not_null<Dialogs::MainList*> list) {
+	return rpl::single(rpl::empty) | rpl::then(
+		list->unreadStateChanges() | rpl::to_empty
+	) | rpl::map([=] {
+		return list->unreadState();
+	});
+}
+
+} // namespace
+
+[[nodiscard]] Dialogs::UnreadState MainListMapUnreadState(
+		not_null<Main::Session*> session,
+		const Dialogs::UnreadState &state) {
+	const auto folderId = Data::Folder::kId;
+	if (const auto folder = session->data().folderLoaded(folderId)) {
+		return state - folder->chatsList()->unreadState();
+	}
+	return state;
+}
+
+rpl::producer<Dialogs::UnreadState> UnreadStateValue(
+		not_null<Main::Session*> session,
+		FilterId filterId) {
+	if (filterId > 0) {
+		const auto filters = &session->data().chatsFilters();
+		return MainListUnreadState(filters->chatsList(filterId));
+	}
+	return MainListUnreadState(
+		session->data().chatsList()
+	) | rpl::map([=](const Dialogs::UnreadState &state) {
+		return MainListMapUnreadState(session, state);
+	});
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_unread_value.h b/Telegram/SourceFiles/data/data_unread_value.h
new file mode 100644
index 000000000..0c60f32ab
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_unread_value.h
@@ -0,0 +1,28 @@
+/*
+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 Dialogs {
+struct UnreadState;
+} // namespace Dialogs
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+[[nodiscard]] Dialogs::UnreadState MainListMapUnreadState(
+	not_null<Main::Session*> session,
+	const Dialogs::UnreadState &state);
+
+[[nodiscard]] rpl::producer<Dialogs::UnreadState> UnreadStateValue(
+	not_null<Main::Session*> session,
+	FilterId filterId);
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index daf217800..5076c2ab6 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
+#include "data/data_unread_value.h"
 #include "lang/lang_keys.h"
 #include "ui/filter_icons.h"
 #include "ui/wrap/vertical_layout.h"
@@ -41,42 +42,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_menu_icons.h"
 
 namespace Window {
-namespace {
-
-[[nodiscard]] Dialogs::UnreadState MainListMapUnreadState(
-		not_null<Main::Session*> session,
-		const Dialogs::UnreadState &state) {
-	const auto folderId = Data::Folder::kId;
-	if (const auto folder = session->data().folderLoaded(folderId)) {
-		return state - folder->chatsList()->unreadState();
-	}
-	return state;
-}
-
-[[nodiscard]] rpl::producer<Dialogs::UnreadState> MainListUnreadState(
-		not_null<Dialogs::MainList*> list) {
-	return rpl::single(rpl::empty) | rpl::then(
-		list->unreadStateChanges() | rpl::to_empty
-	) | rpl::map([=] {
-		return list->unreadState();
-	});
-}
-
-[[nodiscard]] rpl::producer<Dialogs::UnreadState> UnreadStateValue(
-		not_null<Main::Session*> session,
-		FilterId filterId) {
-	if (filterId > 0) {
-		const auto filters = &session->data().chatsFilters();
-		return MainListUnreadState(filters->chatsList(filterId));
-	}
-	return MainListUnreadState(
-		session->data().chatsList()
-	) | rpl::map([=](const Dialogs::UnreadState &state) {
-		return MainListMapUnreadState(session, state);
-	});
-}
-
-} // namespace
 
 FiltersMenu::FiltersMenu(
 	not_null<Ui::RpWidget*> parent,
@@ -310,7 +275,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 	raw->setIconOverride(icons.normal, icons.active);
 	if (id >= 0) {
 		rpl::combine(
-			UnreadStateValue(&_session->session(), id),
+			Data::UnreadStateValue(&_session->session(), id),
 			_includeMuted.value()
 		) | rpl::start_with_next([=](
 				const Dialogs::UnreadState &state,
@@ -431,7 +396,7 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 	} else {
 		auto customUnreadState = [=] {
 			const auto session = &_session->session();
-			return MainListMapUnreadState(
+			return Data::MainListMapUnreadState(
 				session,
 				session->data().chatsList()->unreadState());
 		};

From b83d943841692fd2098ee274710111c41591122d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 17:13:55 +0300
Subject: [PATCH 195/306] Moved out value notification settings for filters to
 separated file.

---
 Telegram/SourceFiles/data/data_unread_value.cpp   | 15 +++++++++++++++
 Telegram/SourceFiles/data/data_unread_value.h     |  2 ++
 .../SourceFiles/window/window_filters_menu.cpp    | 15 ++-------------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_unread_value.cpp b/Telegram/SourceFiles/data/data_unread_value.cpp
index 665502979..c374dc0f6 100644
--- a/Telegram/SourceFiles/data/data_unread_value.cpp
+++ b/Telegram/SourceFiles/data/data_unread_value.cpp
@@ -7,10 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_unread_value.h"
 
+#include "core/application.h"
+#include "core/core_settings.h"
 #include "data/data_chat_filters.h"
 #include "data/data_folder.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
+#include "window/notifications_manager.h"
 
 namespace Data {
 namespace {
@@ -50,4 +53,16 @@ rpl::producer<Dialogs::UnreadState> UnreadStateValue(
 	});
 }
 
+rpl::producer<bool> IncludeMutedCounterFoldersValue() {
+	using namespace Window::Notifications;
+	return rpl::single(rpl::empty_value()) | rpl::then(
+		Core::App().notifications().settingsChanged(
+		) | rpl::filter(
+			rpl::mappers::_1 == ChangeType::IncludeMuted
+		) | rpl::to_empty
+	) | rpl::map([] {
+		return Core::App().settings().includeMutedCounterFolders();
+	});
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_unread_value.h b/Telegram/SourceFiles/data/data_unread_value.h
index 0c60f32ab..1acdbcc98 100644
--- a/Telegram/SourceFiles/data/data_unread_value.h
+++ b/Telegram/SourceFiles/data/data_unread_value.h
@@ -25,4 +25,6 @@ namespace Data {
 	not_null<Main::Session*> session,
 	FilterId filterId);
 
+[[nodiscard]] rpl::producer<bool> IncludeMutedCounterFoldersValue();
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 5076c2ab6..8577ebf0b 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -13,12 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_main_menu.h"
 #include "window/window_peer_menu.h"
 #include "main/main_session.h"
-#include "core/application.h"
-#include "core/core_settings.h"
-#include "window/notifications_manager.h"
 #include "data/data_session.h"
 #include "data/data_chat_filters.h"
-#include "data/data_folder.h"
 #include "data/data_user.h"
 #include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
@@ -53,14 +49,7 @@ FiltersMenu::FiltersMenu(
 , _scroll(&_outer)
 , _container(
 	_scroll.setOwnedWidget(
-		object_ptr<Ui::VerticalLayout>(&_scroll)))
-, _includeMuted(Core::App().settings().includeMutedCounterFolders()) {
-	Core::App().notifications().settingsChanged(
-	) | rpl::filter(
-		rpl::mappers::_1 == Window::Notifications::ChangeType::IncludeMuted
-	) | rpl::start_with_next([=] {
-		_includeMuted = Core::App().settings().includeMutedCounterFolders();
-	}, _outer.lifetime());
+		object_ptr<Ui::VerticalLayout>(&_scroll))) {
 
 	_drag.timer.setCallback([=] {
 		if (_drag.filterId >= 0) {
@@ -276,7 +265,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 	if (id >= 0) {
 		rpl::combine(
 			Data::UnreadStateValue(&_session->session(), id),
-			_includeMuted.value()
+			Data::IncludeMutedCounterFoldersValue()
 		) | rpl::start_with_next([=](
 				const Dialogs::UnreadState &state,
 				bool includeMuted) {

From 8c35de48f3843a307ea3b2a8594a69389534d600 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 17:33:16 +0300
Subject: [PATCH 196/306] Added process of unread states to chats filters
 strip.

---
 .../ui/widgets/chat_filters_tabs_strip.cpp    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index ec3ca0bf7..6f9fba69c 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/data_chat_filters.h"
 #include "data/data_session.h"
+#include "data/data_unread_value.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/widgets/chat_filters_tabs_slider.h"
@@ -29,6 +30,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	struct State final {
 		Ui::Animations::Simple animation;
 		std::optional<FilterId> lastFilterId = std::nullopt;
+		rpl::lifetime unreadLifetime;
 	};
 
 	const auto &scrollSt = st::defaultScrollArea;
@@ -104,6 +106,24 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		}) | ranges::to_vector;
 		slider->setSections(std::move(sections));
 		slider->fitWidthToSections();
+		{
+			auto includeMuted = Data::IncludeMutedCounterFoldersValue();
+			state->unreadLifetime.destroy();
+			for (auto i = 0; i < list.size(); i++) {
+				rpl::combine(
+					Data::UnreadStateValue(session, list[i].id()),
+					rpl::duplicate(includeMuted)
+				) | rpl::start_with_next([=](
+						const Dialogs::UnreadState &state,
+						bool includeMuted) {
+					const auto muted = (state.chatsMuted + state.marksMuted);
+					const auto count = (state.chats + state.marks)
+						- (includeMuted ? 0 : muted);
+					slider->setUnreadCount(i, count);
+					slider->fitWidthToSections();
+				}, state->unreadLifetime);
+			}
+		}
 		[&] {
 			const auto lookingId = state->lastFilterId.value_or(list[0].id());
 			for (auto i = 0; i < list.size(); i++) {

From 6f09e1699fa6580c2e3210d959a436357bd2f442 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 18:20:54 +0300
Subject: [PATCH 197/306] Moved out display of remove filter box from chats
 filters menu.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../api/api_chat_filters_remove_manager.cpp   | 128 ++++++++++++++++++
 .../api/api_chat_filters_remove_manager.h     |  35 +++++
 .../window/window_filters_menu.cpp            | 103 +-------------
 .../SourceFiles/window/window_filters_menu.h  |   6 +-
 5 files changed, 170 insertions(+), 104 deletions(-)
 create mode 100644 Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp
 create mode 100644 Telegram/SourceFiles/api/api_chat_filters_remove_manager.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index a86a14484..aa61a3336 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -112,6 +112,8 @@ PRIVATE
     api/api_bot.h
     api/api_chat_filters.cpp
     api/api_chat_filters.h
+    api/api_chat_filters_remove_manager.cpp
+    api/api_chat_filters_remove_manager.h
     api/api_chat_invite.cpp
     api/api_chat_invite.h
     api/api_chat_links.cpp
diff --git a/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp
new file mode 100644
index 000000000..fe96accd6
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp
@@ -0,0 +1,128 @@
+/*
+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_filters_remove_manager.h"
+
+#include "api/api_chat_filters.h"
+#include "apiwrap.h"
+#include "data/data_chat_filters.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/ui_utility.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+
+namespace Api {
+namespace {
+
+void RemoveChatFilter(
+		not_null<Main::Session*> session,
+		FilterId filterId,
+		std::vector<not_null<PeerData*>> leave) {
+	const auto api = &session->api();
+	session->data().chatsFilters().apply(MTP_updateDialogFilter(
+		MTP_flags(MTPDupdateDialogFilter::Flag(0)),
+		MTP_int(filterId),
+		MTPDialogFilter()));
+	if (leave.empty()) {
+		api->request(MTPmessages_UpdateDialogFilter(
+			MTP_flags(MTPmessages_UpdateDialogFilter::Flag(0)),
+			MTP_int(filterId),
+			MTPDialogFilter()
+		)).send();
+	} else {
+		api->request(MTPchatlists_LeaveChatlist(
+			MTP_inputChatlistDialogFilter(MTP_int(filterId)),
+			MTP_vector<MTPInputPeer>(ranges::views::all(
+				leave
+			) | ranges::views::transform([](not_null<PeerData*> peer) {
+				return MTPInputPeer(peer->input);
+			}) | ranges::to<QVector<MTPInputPeer>>())
+		)).done([=](const MTPUpdates &result) {
+			api->applyUpdates(result);
+		}).send();
+	}
+}
+
+} // namespace
+
+RemoveComplexChatFilter::RemoveComplexChatFilter() = default;
+
+void RemoveComplexChatFilter::request(
+		QPointer<Ui::RpWidget> widget,
+		base::weak_ptr<Window::SessionController> weak,
+		FilterId id) {
+	const auto session = &weak->session();
+	const auto &list = session->data().chatsFilters().list();
+	const auto i = ranges::find(list, id, &Data::ChatFilter::id);
+	const auto filter = (i != end(list)) ? *i : Data::ChatFilter();
+	const auto has = filter.hasMyLinks();
+	const auto confirm = [=](Fn<void()> action, bool onlyWhenHas = false) {
+		if (!has && onlyWhenHas) {
+			action();
+			return;
+		}
+		weak->window().show(Ui::MakeConfirmBox({
+			.text = (has
+				? tr::lng_filters_delete_sure()
+				: tr::lng_filters_remove_sure()),
+			.confirmed = [=](Fn<void()> &&close) { close(); action(); },
+			.confirmText = (has
+				? tr::lng_box_delete()
+				: tr::lng_filters_remove_yes()),
+			.confirmStyle = &st::attentionBoxButton,
+		}));
+	};
+	const auto simple = [=] {
+		confirm([=] { RemoveChatFilter(session, id, {}); });
+	};
+	const auto suggestRemoving = Api::ExtractSuggestRemoving(filter);
+	if (suggestRemoving.empty()) {
+		simple();
+		return;
+	} else if (_removingRequestId) {
+		if (_removingId == id) {
+			return;
+		}
+		session->api().request(_removingRequestId).cancel();
+	}
+	_removingId = id;
+	_removingRequestId = session->api().request(
+		MTPchatlists_GetLeaveChatlistSuggestions(
+			MTP_inputChatlistDialogFilter(
+				MTP_int(id)))
+	).done(crl::guard(widget, [=, this](const MTPVector<MTPPeer> &result) {
+		_removingRequestId = 0;
+		const auto suggestRemovePeers = ranges::views::all(
+			result.v
+		) | ranges::views::transform([=](const MTPPeer &peer) {
+			return session->data().peer(peerFromMTP(peer));
+		}) | ranges::to_vector;
+		const auto chosen = crl::guard(widget, [=](
+				std::vector<not_null<PeerData*>> peers) {
+			RemoveChatFilter(session, id, std::move(peers));
+		});
+		confirm(crl::guard(widget, [=] {
+			Api::ProcessFilterRemove(
+				weak,
+				filter.title(),
+				filter.iconEmoji(),
+				suggestRemoving,
+				suggestRemovePeers,
+				chosen);
+		}), true);
+	})).fail(crl::guard(widget, [=, this] {
+		_removingRequestId = 0;
+		simple();
+	})).send();
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_chat_filters_remove_manager.h b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.h
new file mode 100644
index 000000000..ce92b2df3
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.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
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Api {
+
+class RemoveComplexChatFilter final {
+public:
+	RemoveComplexChatFilter();
+
+	void request(
+		QPointer<Ui::RpWidget> widget,
+		base::weak_ptr<Window::SessionController> weak,
+		FilterId id);
+
+private:
+	FilterId _removingId = 0;
+	mtpRequestId _removingRequestId = 0;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 8577ebf0b..db6e05c4a 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -367,7 +367,7 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 	if (id) {
 		addAction(
 			tr::lng_filters_context_edit(tr::now),
-			[=] { showEditBox(id); },
+			[=] { EditExistingFilter(_session, id); },
 			&st::menuIconEdit);
 
 		auto filteredChats = [=] {
@@ -380,7 +380,7 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 
 		addAction(
 			tr::lng_filters_context_remove(tr::now),
-			[=] { showRemoveBox(id); },
+			[=] { _removeApi.request(Ui::MakeWeak(&_outer), _session, id); },
 			&st::menuIconDelete);
 	} else {
 		auto customUnreadState = [=] {
@@ -407,105 +407,6 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 	_popupMenu->popup(position);
 }
 
-void FiltersMenu::showEditBox(FilterId id) {
-	EditExistingFilter(_session, id);
-}
-
-void FiltersMenu::showRemoveBox(FilterId id) {
-	const auto session = &_session->session();
-	const auto &list = session->data().chatsFilters().list();
-	const auto i = ranges::find(list, id, &Data::ChatFilter::id);
-	const auto filter = (i != end(list)) ? *i : Data::ChatFilter();
-	const auto has = filter.hasMyLinks();
-	const auto confirm = [=](Fn<void()> action, bool onlyWhenHas = false) {
-		if (!has && onlyWhenHas) {
-			action();
-			return;
-		}
-		_session->window().show(Ui::MakeConfirmBox({
-			.text = (has
-				? tr::lng_filters_delete_sure()
-				: tr::lng_filters_remove_sure()),
-			.confirmed = [=](Fn<void()> &&close) { close(); action(); },
-			.confirmText = (has
-				? tr::lng_box_delete()
-				: tr::lng_filters_remove_yes()),
-			.confirmStyle = &st::attentionBoxButton,
-		}));
-	};
-	const auto simple = [=] {
-		confirm([=] { remove(id); });
-	};
-	const auto suggestRemoving = Api::ExtractSuggestRemoving(filter);
-	if (suggestRemoving.empty()) {
-		simple();
-		return;
-	} else if (_removingRequestId) {
-		if (_removingId == id) {
-			return;
-		}
-		session->api().request(_removingRequestId).cancel();
-	}
-	_removingId = id;
-	_removingRequestId = session->api().request(
-		MTPchatlists_GetLeaveChatlistSuggestions(
-			MTP_inputChatlistDialogFilter(
-				MTP_int(id)))
-	).done(crl::guard(&_outer, [=](const MTPVector<MTPPeer> &result) {
-		_removingRequestId = 0;
-		const auto suggestRemovePeers = ranges::views::all(
-			result.v
-		) | ranges::views::transform([=](const MTPPeer &peer) {
-			return session->data().peer(peerFromMTP(peer));
-		}) | ranges::to_vector;
-		const auto chosen = crl::guard(&_outer, [=](
-				std::vector<not_null<PeerData*>> peers) {
-			remove(id, std::move(peers));
-		});
-		confirm(crl::guard(&_outer, [=] {
-			Api::ProcessFilterRemove(
-				_session,
-				filter.title(),
-				filter.iconEmoji(),
-				suggestRemoving,
-				suggestRemovePeers,
-				chosen);
-		}), true);
-	})).fail(crl::guard(&_outer, [=] {
-		_removingRequestId = 0;
-		simple();
-	})).send();
-}
-
-void FiltersMenu::remove(
-		FilterId id,
-		std::vector<not_null<PeerData*>> leave) {
-	const auto session = &_session->session();
-	const auto api = &session->api();
-	session->data().chatsFilters().apply(MTP_updateDialogFilter(
-		MTP_flags(MTPDupdateDialogFilter::Flag(0)),
-		MTP_int(id),
-		MTPDialogFilter()));
-	if (leave.empty()) {
-		api->request(MTPmessages_UpdateDialogFilter(
-			MTP_flags(MTPmessages_UpdateDialogFilter::Flag(0)),
-			MTP_int(id),
-			MTPDialogFilter()
-		)).send();
-	} else {
-		api->request(MTPchatlists_LeaveChatlist(
-			MTP_inputChatlistDialogFilter(MTP_int(id)),
-			MTP_vector<MTPInputPeer>(ranges::views::all(
-				leave
-			) | ranges::views::transform([](not_null<PeerData*> peer) {
-				return MTPInputPeer(peer->input);
-			}) | ranges::to<QVector<MTPInputPeer>>())
-		)).done([=](const MTPUpdates &result) {
-			api->applyUpdates(result);
-		}).send();
-	}
-}
-
 void FiltersMenu::applyReorder(
 		not_null<Ui::RpWidget*> widget,
 		int oldPosition,
diff --git a/Telegram/SourceFiles/window/window_filters_menu.h b/Telegram/SourceFiles/window/window_filters_menu.h
index 54e3189c1..805ae18c5 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.h
+++ b/Telegram/SourceFiles/window/window_filters_menu.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "api/api_chat_filters_remove_manager.h"
 #include "base/timer.h"
 #include "ui/effects/animations.h"
 #include "ui/widgets/side_bar_button.h"
@@ -48,9 +49,6 @@ private:
 		bool toBeginning = false);
 	void setupMainMenuIcon();
 	void showMenu(QPoint position, FilterId id);
-	void showEditBox(FilterId id);
-	void showRemoveBox(FilterId id);
-	void remove(FilterId id, std::vector<not_null<PeerData*>> leave = {});
 	void scrollToButton(not_null<Ui::RpWidget*> widget);
 	void openFiltersSettings();
 
@@ -70,6 +68,8 @@ private:
 	bool _ignoreRefresh = false;
 	bool _waitingSuggested = false;
 
+	Api::RemoveComplexChatFilter _removeApi;
+
 	FilterId _removingId = 0;
 	mtpRequestId _removingRequestId = 0;
 

From 607c7e7777bc5ce387671439f40cdd460cfca8c3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 20:03:54 +0300
Subject: [PATCH 198/306] Added context menu process to chats filters tabs
 slider.

---
 .../ui/widgets/chat_filters_tabs_slider.cpp   | 29 +++++++++++++++++++
 .../ui/widgets/chat_filters_tabs_slider.h     |  6 ++++
 2 files changed, 35 insertions(+)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
index ca53058c5..9e109e3e9 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -185,4 +185,33 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
 	}
 }
 
+void ChatsFiltersTabs::mousePressEvent(QMouseEvent *e) {
+	const auto mouseButton = e->button();
+	if (mouseButton == Qt::MouseButton::LeftButton) {
+		Ui::SettingsSlider::mousePressEvent(e);
+	} else {
+		Ui::RpWidget::mousePressEvent(e);
+	}
+}
+
+void ChatsFiltersTabs::contextMenuEvent(QContextMenuEvent *e) {
+	const auto pos = e->pos();
+	auto left = 0;
+	auto index = 0;
+	enumerateSections([&](const Section &section) {
+		const auto currentRight = section.left + section.width;
+		if (pos.x() > left && pos.x() < currentRight) {
+			return false;
+		}
+		left = currentRight;
+		index++;
+		return true;
+	});
+	_contextMenuRequested.fire_copy(index);
+}
+
+rpl::producer<int> ChatsFiltersTabs::contextMenuRequested() const {
+	return _contextMenuRequested.events();
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
index a4d0e3191..786368581 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
@@ -29,8 +29,12 @@ public:
 	void fitWidthToSections();
 	void setUnreadCount(int index, int unreadCount);
 
+	[[nodiscard]] rpl::producer<int> contextMenuRequested() const;
+
 protected:
 	void paintEvent(QPaintEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
 
 private:
 	[[nodiscard]] QImage cacheUnreadCount(int count) const;
@@ -50,6 +54,8 @@ private:
 	std::optional<Ui::RoundRect> _bar;
 	std::optional<Ui::RoundRect> _barActive;
 
+	rpl::event_stream<int> _contextMenuRequested;
+
 };
 
 } // namespace Ui

From 53dffc5e8875ed7bfe37ddc412dfc5c0590b90ae Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 20:28:18 +0300
Subject: [PATCH 199/306] Added context menu to chats filters strip.

---
 .../ui/widgets/chat_filters_tabs_strip.cpp    | 112 +++++++++++++++++-
 1 file changed, 107 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 6f9fba69c..026bc325e 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -7,19 +7,118 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/widgets/chat_filters_tabs_strip.h"
 
+#include "api/api_chat_filters_remove_manager.h"
+#include "boxes/filters/edit_filter_box.h"
+#include "core/application.h"
 #include "data/data_chat_filters.h"
 #include "data/data_session.h"
 #include "data/data_unread_value.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "settings/settings_folders.h"
 #include "ui/widgets/chat_filters_tabs_slider.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/wrap/slide_wrap.h"
+#include "window/window_controller.h"
+#include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
 #include "styles/style_dialogs.h" // dialogsSearchTabs
+#include "styles/style_menu_icons.h"
 
 #include <QScrollBar>
 
 namespace Ui {
+namespace {
+
+struct State final {
+	Ui::Animations::Simple animation;
+	std::optional<FilterId> lastFilterId = std::nullopt;
+	rpl::lifetime unreadLifetime;
+	base::unique_qptr<Ui::PopupMenu> menu;
+
+	Api::RemoveComplexChatFilter removeApi;
+	bool waitingSuggested = false;
+};
+
+void ShowMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		not_null<State*> state,
+		int index) {
+	const auto session = &controller->session();
+
+	auto id = FilterId(0);
+	{
+		const auto &list = session->data().chatsFilters().list();
+		if (index < 0 || index >= list.size()) {
+			return;
+		}
+		id = list[index].id();
+	}
+	state->menu = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	const auto addAction = Ui::Menu::CreateAddActionCallback(
+		state->menu.get());
+
+	if (id) {
+		addAction(
+			tr::lng_filters_context_edit(tr::now),
+			[=] { EditExistingFilter(controller, id); },
+			&st::menuIconEdit);
+
+		Window::MenuAddMarkAsReadChatListAction(
+			controller,
+			[=] { return session->data().chatsFilters().chatsList(id); },
+			addAction);
+
+		auto showRemoveBox = [=] {
+			state->removeApi.request(Ui::MakeWeak(parent), controller, id);
+		};
+		addAction(
+			tr::lng_filters_context_remove(tr::now),
+			std::move(showRemoveBox),
+			&st::menuIconDelete);
+	} else {
+		auto customUnreadState = [=] {
+			return Data::MainListMapUnreadState(
+				session,
+				session->data().chatsList()->unreadState());
+		};
+		Window::MenuAddMarkAsReadChatListAction(
+			controller,
+			[=] { return session->data().chatsList(); },
+			addAction,
+			std::move(customUnreadState));
+
+		auto openFiltersSettings = [=] {
+			const auto filters = &session->data().chatsFilters();
+			if (filters->suggestedLoaded()) {
+				controller->showSettings(Settings::Folders::Id());
+			} else if (!state->waitingSuggested) {
+				state->waitingSuggested = true;
+				filters->requestSuggested();
+				filters->suggestedUpdated(
+				) | rpl::take(1) | rpl::start_with_next([=] {
+					controller->showSettings(Settings::Folders::Id());
+				}, parent->lifetime());
+			}
+		};
+		addAction(
+			tr::lng_filters_setup_menu(tr::now),
+			std::move(openFiltersSettings),
+			&st::menuIconEdit);
+	}
+	if (state->menu->empty()) {
+		state->menu = nullptr;
+		return;
+	}
+	state->menu->popup(QCursor::pos());
+}
+
+} // namespace
 
 not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		not_null<Ui::RpWidget*> parent,
@@ -27,16 +126,16 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		rpl::producer<int> multiSelectHeightValue,
 		Fn<void(int)> setAddedTopScrollSkip,
 		Fn<void(FilterId)> choose) {
-	struct State final {
-		Ui::Animations::Simple animation;
-		std::optional<FilterId> lastFilterId = std::nullopt;
-		rpl::lifetime unreadLifetime;
-	};
+	const auto window = Core::App().findWindow(parent);
+	const auto controller = window ? window->sessionController() : nullptr;
 
 	const auto &scrollSt = st::defaultScrollArea;
 	const auto wrap = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
 		parent,
 		object_ptr<Ui::RpWidget>(parent));
+	if (!controller) {
+		return wrap;
+	}
 	const auto container = wrap->entity();
 	const auto scroll = Ui::CreateChild<Ui::ScrollArea>(container, scrollSt);
 	const auto sliderPadding = st::dialogsSearchTabsPadding;
@@ -154,6 +253,9 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			scrollToIndex(index, anim::type::normal);
 			applyFilter(filter);
 		}, wrap->lifetime());
+		slider->contextMenuRequested() | rpl::start_with_next([=](int index) {
+			ShowMenu(wrap, controller, state, index);
+		}, slider->lifetime());
 		wrap->toggle((list.size() > 1), anim::type::instant);
 	};
 	session->data().chatsFilters().changed(

From 36741ab780cbc6a3c259a57746904d25af101070 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 22:19:54 +0300
Subject: [PATCH 200/306] Reused setting for legacy iv zoom for chat filters
 view type.

---
 Telegram/SourceFiles/core/core_settings.cpp | 20 +++++++++++++++++---
 Telegram/SourceFiles/core/core_settings.h   |  5 +++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 2ef80a80d..5a22f6d00 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -396,7 +396,7 @@ QByteArray Settings::serialize() const {
 			<< qint32(!_weatherInCelsius ? 0 : *_weatherInCelsius ? 1 : 2)
 			<< _tonsiteStorageToken
 			<< qint32(_includeMutedCounterFolders ? 1 : 0)
-			<< qint32(0) // Old IV zoom
+			<< qint32(_chatFiltersHorizontal.current() ? 1 : 0)
 			<< qint32(_skipToastsInFocus ? 1 : 0)
 			<< qint32(_recordVideoMessages ? 1 : 0)
 			<< SerializeVideoQuality(_videoQuality)
@@ -528,6 +528,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 skipToastsInFocus = _skipToastsInFocus ? 1 : 0;
 	qint32 recordVideoMessages = _recordVideoMessages ? 1 : 0;
 	quint32 videoQuality = SerializeVideoQuality(_videoQuality);
+	quint32 chatFiltersHorizontal = _chatFiltersHorizontal.current() ? 1 : 0;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -838,8 +839,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		stream >> includeMutedCounterFolders;
 	}
 	if (!stream.atEnd()) {
-		qint32 oldIvZoom = 0;
-		stream >> oldIvZoom;
+		stream >> chatFiltersHorizontal;
 	}
 	if (!stream.atEnd()) {
 		stream >> skipToastsInFocus;
@@ -1068,6 +1068,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_skipToastsInFocus = (skipToastsInFocus == 1);
 	_recordVideoMessages = (recordVideoMessages == 1);
 	_videoQuality = DeserializeVideoQuality(videoQuality);
+	_chatFiltersHorizontal = (chatFiltersHorizontal == 1);
 }
 
 QString Settings::getSoundPath(const QString &key) const {
@@ -1459,6 +1460,7 @@ void Settings::resetOnLastLogout() {
 	_ivZoom = 100;
 	_recordVideoMessages = false;
 	_videoQuality = {};
+	_chatFiltersHorizontal = false;
 
 	_recentEmojiPreload.clear();
 	_recentEmoji.clear();
@@ -1634,4 +1636,16 @@ void Settings::setVideoQuality(Media::VideoQuality value) {
 	_videoQuality = value;
 }
 
+bool Settings::chatFiltersHorizontal() const {
+	return _chatFiltersHorizontal.current();
+}
+
+rpl::producer<bool> Settings::chatFiltersHorizontalValue() const {
+	return _chatFiltersHorizontal.value();
+}
+
+void Settings::setChatFiltersHorizontal(bool value) {
+	_chatFiltersHorizontal = value;
+}
+
 } // namespace Core
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 3838463f3..d7933efaf 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -929,6 +929,10 @@ public:
 	[[nodiscard]] rpl::producer<int> ivZoomValue() const;
 	void setIvZoom(int value);
 
+	[[nodiscard]] bool chatFiltersHorizontal() const;
+	[[nodiscard]] rpl::producer<bool> chatFiltersHorizontalValue() const;
+	void setChatFiltersHorizontal(bool value);
+
 	[[nodiscard]] Media::VideoQuality videoQuality() const;
 	void setVideoQuality(Media::VideoQuality quality);
 
@@ -1070,6 +1074,7 @@ private:
 	QByteArray _tonsiteStorageToken;
 	rpl::variable<int> _ivZoom = 100;
 	Media::VideoQuality _videoQuality;
+	rpl::variable<bool> _chatFiltersHorizontal = false;
 
 	bool _tabbedReplacedWithInfo = false; // per-window
 	rpl::event_stream<bool> _tabbedReplacedWithInfoValue; // per-window

From dc49c788a8dad80dfba4e235d49dc697647846b5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 2 Nov 2024 22:23:32 +0300
Subject: [PATCH 201/306] Added setting for chat filters view type to filters
 settings.

---
 Telegram/Resources/langs/lang.strings         |  3 ++
 .../SourceFiles/settings/settings_folders.cpp | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 5e3ee637d..05c538b15 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5099,6 +5099,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_toast_add" = "{chat} added to {folder} folder";
 "lng_filters_toast_remove" = "{chat} removed from {folder} folder";
 "lng_filters_shareable_status" = "shareable folder";
+"lng_filters_view_subtitle" = "Tabs view";
+"lng_filters_vertical" = "Tabs on the left";
+"lng_filters_horizontal" = "Tabs at the top";
 
 "lng_filters_delete_sure" = "Are you sure you want to delete this folder? This will also deactivate all the invite links created to share this folder.";
 "lng_filters_link" = "Share Folder";
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 7d9c3707a..f2ba21dd2 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/box_content_divider.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/wrap/slide_wrap.h"
@@ -843,6 +844,34 @@ void SetupTopContent(
 
 }
 
+void SetupView(not_null<Ui::VerticalLayout*> content) {
+	Ui::AddDivider(content);
+	Ui::AddSkip(content);
+	Ui::AddSubsectionTitle(content, tr::lng_filters_view_subtitle());
+
+	const auto group = std::make_shared<Ui::RadioenumGroup<bool>>(
+		Core::App().settings().chatFiltersHorizontal());
+	const auto addSend = [&](bool value, const QString &text) {
+		content->add(
+			object_ptr<Ui::Radioenum<bool>>(
+				content,
+				group,
+				value,
+				text,
+				st::settingsSendType),
+			st::settingsSendTypePadding);
+	};
+	addSend(false, tr::lng_filters_vertical(tr::now));
+	addSend(true, tr::lng_filters_horizontal(tr::now));
+
+	group->setChangedCallback([=](bool value) {
+		Core::App().settings().setChatFiltersHorizontal(value);
+		Core::App().saveSettingsDelayed();
+	});
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+}
+
 } // namespace
 
 Folders::Folders(
@@ -871,6 +900,8 @@ void Folders::setupContent(not_null<Window::SessionController*> controller) {
 
 	_save = SetupFoldersContent(controller, content);
 
+	SetupView(content);
+
 	Ui::ResizeFitChild(this, content);
 }
 

From 4d9112283d7705c69faaee9a614b2dca8c7a2c91 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 3 Nov 2024 12:50:21 +0300
Subject: [PATCH 202/306] Added support of locked sections to chats filters
 tabs slider.

---
 .../ui/widgets/chat_filters_tabs_slider.cpp   | 78 ++++++++++++++++++-
 .../ui/widgets/chat_filters_tabs_slider.h     | 10 +++
 .../ui/widgets/chat_filters_tabs_strip.cpp    | 15 ++++
 3 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
index 9e109e3e9..ab5a2089e 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/chat_filters_tabs_slider.h"
 
 #include "ui/effects/ripple_animation.h"
+#include "ui/widgets/side_bar_button.h"
 #include "styles/style_widgets.h"
 
 #include <QScrollBar>
@@ -57,6 +58,7 @@ int ChatsFiltersTabs::centerOfSection(int section) const {
 void ChatsFiltersTabs::fitWidthToSections() {
 	const auto widths = countSectionsWidths(0);
 	resizeToWidth(ranges::accumulate(widths, .0));
+	_lockedFromX = calculateLockedFromX();
 }
 
 void ChatsFiltersTabs::setUnreadCount(int index, int unreadCount) {
@@ -90,6 +92,37 @@ void ChatsFiltersTabs::setUnreadCount(int index, int unreadCount) {
 	}
 }
 
+int ChatsFiltersTabs::calculateLockedFromX() const {
+	if (!_lockedFrom) {
+		return std::numeric_limits<int>::max();
+	}
+	auto left = 0;
+	auto index = 0;
+	enumerateSections([&](const Section &section) {
+		const auto currentRight = section.left + section.width;
+		if (index == _lockedFrom) {
+			return false;
+		}
+		left = currentRight;
+		index++;
+		return true;
+	});
+	return left ? left : std::numeric_limits<int>::max();
+}
+
+void ChatsFiltersTabs::setLockedFrom(int index) {
+	_lockedFrom = index;
+	_lockedFromX = calculateLockedFromX();
+	if (!index) {
+		_paletteLifetime.destroy();
+		return;
+	}
+	_paletteLifetime = style::PaletteChanged(
+	) | rpl::start_with_next([this] {
+		_lockCache.emplace(Ui::SideBarLockIcon(_st.labelFg));
+	});
+}
+
 QImage ChatsFiltersTabs::cacheUnreadCount(int count) const {
 	const auto widthIndex = (count < 10) ? 0 : (count < 100) ? 1 : 2;
 	auto image = QImage(
@@ -144,6 +177,11 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
 			section.contentWidth,
 			_st.labelStyle.font->height);
 		if (rect.intersects(clip)) {
+			const auto locked = (_lockedFrom && (index >= _lockedFrom));
+			if (locked) {
+				constexpr auto kPremiumLockedOpacity = 0.6;
+				p.setOpacity(kPremiumLockedOpacity);
+			}
 			p.setPen(anim::pen(_st.labelFg, _st.labelFgActive, active));
 			section.label.draw(p, {
 				.position = QPoint(labelLeft, _st.labelTop),
@@ -161,6 +199,18 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
 						it->second.cache);
 				}
 			}
+			if (locked) {
+				if (!_lockCache) {
+					_lockCache.emplace(Ui::SideBarLockIcon(_st.labelFg));
+				}
+				const auto size = _lockCache->size()
+					/ style::DevicePixelRatio();
+				p.drawImage(
+					labelLeft + (section.label.maxWidth() - size.width()) / 2,
+					height() - size.height() - st::lineWidth,
+					*_lockCache);
+				p.setOpacity(1.0);
+			}
 		}
 		index++;
 		return true;
@@ -188,14 +238,36 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
 void ChatsFiltersTabs::mousePressEvent(QMouseEvent *e) {
 	const auto mouseButton = e->button();
 	if (mouseButton == Qt::MouseButton::LeftButton) {
-		Ui::SettingsSlider::mousePressEvent(e);
+		_lockedPressed = (e->pos().x() >= _lockedFromX);
+		if (_lockedPressed) {
+			Ui::RpWidget::mousePressEvent(e);
+		} else {
+			Ui::SettingsSlider::mousePressEvent(e);
+		}
 	} else {
 		Ui::RpWidget::mousePressEvent(e);
 	}
 }
 
+void ChatsFiltersTabs::mouseReleaseEvent(QMouseEvent *e) {
+	const auto mouseButton = e->button();
+	if (mouseButton == Qt::MouseButton::LeftButton) {
+		if (base::take(_lockedPressed)) {
+			_lockedPressed = false;
+			_lockedClicked.fire({});
+		} else {
+			Ui::SettingsSlider::mouseReleaseEvent(e);
+		}
+	} else {
+		Ui::RpWidget::mouseReleaseEvent(e);
+	}
+}
+
 void ChatsFiltersTabs::contextMenuEvent(QContextMenuEvent *e) {
 	const auto pos = e->pos();
+	if (pos.x() >= _lockedFromX) {
+		return;
+	}
 	auto left = 0;
 	auto index = 0;
 	enumerateSections([&](const Section &section) {
@@ -214,4 +286,8 @@ rpl::producer<int> ChatsFiltersTabs::contextMenuRequested() const {
 	return _contextMenuRequested.events();
 }
 
+rpl::producer<> ChatsFiltersTabs::lockedClicked() const {
+	return _lockedClicked.events();
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
index 786368581..ca311c7fe 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
@@ -28,16 +28,20 @@ public:
 	[[nodiscard]] int centerOfSection(int section) const;
 	void fitWidthToSections();
 	void setUnreadCount(int index, int unreadCount);
+	void setLockedFrom(int index);
 
 	[[nodiscard]] rpl::producer<int> contextMenuRequested() const;
+	[[nodiscard]] rpl::producer<> lockedClicked() const;
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
 	void contextMenuEvent(QContextMenuEvent *e) override;
 
 private:
 	[[nodiscard]] QImage cacheUnreadCount(int count) const;
+	[[nodiscard]] int calculateLockedFromX() const;
 
 	using Index = int;
 	struct Unread final {
@@ -51,10 +55,16 @@ private:
 	const int _unreadSkip;
 	std::vector<int> _cachedBadgeWidths;
 	int _cachedBadgeHeight = 0;
+	int _lockedFrom = 0;
+	int _lockedFromX = 0;
+	bool _lockedPressed = false;
 	std::optional<Ui::RoundRect> _bar;
 	std::optional<Ui::RoundRect> _barActive;
+	std::optional<QImage> _lockCache;
 
+	rpl::lifetime _paletteLifetime;
 	rpl::event_stream<int> _contextMenuRequested;
+	rpl::event_stream<> _lockedClicked;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 026bc325e..cd8fdf147 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -9,10 +9,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_chat_filters_remove_manager.h"
 #include "boxes/filters/edit_filter_box.h"
+#include "boxes/premium_limits_box.h"
 #include "core/application.h"
 #include "data/data_chat_filters.h"
+#include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/data_unread_value.h"
+#include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_folders.h"
@@ -205,6 +208,18 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		}) | ranges::to_vector;
 		slider->setSections(std::move(sections));
 		slider->fitWidthToSections();
+		{
+			const auto reorderAll = session->user()->isPremium();
+			const auto maxLimit = (reorderAll ? 1 : 0)
+				+ Data::PremiumLimits(session).dialogFiltersCurrent();
+			const auto premiumFrom = (reorderAll ? 0 : 1) + maxLimit;
+			slider->setLockedFrom((premiumFrom >= list.size())
+				? 0
+				: premiumFrom);
+			slider->lockedClicked() | rpl::start_with_next([=] {
+				controller->show(Box(FiltersLimitBox, session, std::nullopt));
+			}, slider->lifetime());
+		}
 		{
 			auto includeMuted = Data::IncludeMutedCounterFoldersValue();
 			state->unreadLifetime.destroy();

From 1d7622e0b5fb35cac1d3dc507b77965de270274a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 3 Nov 2024 18:19:05 +0300
Subject: [PATCH 203/306] Added condition to hide chats filters strip.

---
 .../SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp | 10 ++++++++--
 .../SourceFiles/ui/widgets/chat_filters_tabs_strip.h   |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index cd8fdf147..66affaf5c 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -40,6 +40,7 @@ struct State final {
 	std::optional<FilterId> lastFilterId = std::nullopt;
 	rpl::lifetime unreadLifetime;
 	base::unique_qptr<Ui::PopupMenu> menu;
+	rpl::variable<bool> additionalToggleOn;
 
 	Api::RemoveComplexChatFilter removeApi;
 	bool waitingSuggested = false;
@@ -128,7 +129,8 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		not_null<Main::Session*> session,
 		rpl::producer<int> multiSelectHeightValue,
 		Fn<void(int)> setAddedTopScrollSkip,
-		Fn<void(FilterId)> choose) {
+		Fn<void(FilterId)> choose,
+		rpl::producer<bool> additionalToggleOn) {
 	const auto window = Core::App().findWindow(parent);
 	const auto controller = window ? window->sessionController() : nullptr;
 
@@ -148,6 +150,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			object_ptr<Ui::ChatsFiltersTabs>(parent, st::dialogsSearchTabs),
 			QMargins(sliderPadding, 0, sliderPadding, 0)))->entity();
 	const auto state = wrap->lifetime().make_state<State>();
+	state->additionalToggleOn = std::move(additionalToggleOn);
 	wrap->toggle(false, anim::type::instant);
 	container->sizeValue() | rpl::start_with_next([=](const QSize &s) {
 		scroll->resize(s + QSize(0, scrollSt.deltax * 4));
@@ -271,7 +274,10 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		slider->contextMenuRequested() | rpl::start_with_next([=](int index) {
 			ShowMenu(wrap, controller, state, index);
 		}, slider->lifetime());
-		wrap->toggle((list.size() > 1), anim::type::instant);
+		state->additionalToggleOn.value(
+		) | rpl::start_with_next([=](bool enabled) {
+			wrap->toggle(enabled && (list.size() > 1), anim::type::instant);
+		}, wrap->lifetime());
 	};
 	session->data().chatsFilters().changed(
 	) | rpl::start_with_next(rebuild, wrap->lifetime());
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
index c50814830..3a5c1ed59 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
@@ -22,6 +22,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	not_null<Main::Session*> session,
 	rpl::producer<int> multiSelectHeightValue,
 	Fn<void(int)> setAddedTopScrollSkip,
-	Fn<void(FilterId)> choose);
+	Fn<void(FilterId)> choose,
+	rpl::producer<bool> additionalToggleOn = rpl::single(true));
 
 } // namespace Ui

From f205952ff2838ccc8f82be15e88439ce8dedbfe6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 3 Nov 2024 10:37:15 +0300
Subject: [PATCH 204/306] Added chats filters strip to dialogs widget.

---
 .../dialogs/dialogs_inner_widget.cpp          |  4 --
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 71 +++++++++++++++++--
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 +
 3 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 7d63bb597..f587dab2b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -11,13 +11,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/chat_search_empty.h"
 #include "dialogs/ui/chat_search_in.h"
 #include "dialogs/ui/dialogs_layout.h"
-#include "dialogs/ui/dialogs_stories_content.h"
 #include "dialogs/ui/dialogs_video_userpic.h"
 #include "dialogs/dialogs_indexed_list.h"
 #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"
@@ -44,7 +42,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer_values.h"
 #include "data/data_histories.h"
 #include "data/data_chat_filters.h"
-#include "data/data_cloud_file.h"
 #include "data/data_changes.h"
 #include "data/data_message_reactions.h"
 #include "data/data_saved_messages.h"
@@ -68,7 +65,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/loading_element.h"
 #include "ui/widgets/multi_select.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
-#include "ui/empty_userpic.h"
 #include "ui/unread_badge.h"
 #include "boxes/filters/edit_filter_box.h"
 #include "boxes/peers/edit_forum_topic_box.h"
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 73f8f598e..6f6b57298 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -16,7 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/dialogs_inner_widget.h"
 #include "dialogs/dialogs_search_from_controllers.h"
 #include "dialogs/dialogs_key.h"
-#include "dialogs/dialogs_entry.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/history_view_top_bar_widget.h"
@@ -26,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/edit_peer_requests_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/chat_filters_tabs_strip.h"
 #include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/wrap/fade_wrap.h"
@@ -46,14 +46,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session_settings.h"
 #include "api/api_chat_filters.h"
 #include "apiwrap.h"
-#include "base/event_filter.h"
 #include "core/application.h"
 #include "core/ui_integration.h"
 #include "core/update_checker.h"
 #include "core/shortcuts.h"
-#include "boxes/peer_list_box.h"
-#include "boxes/peers/edit_participants_box.h"
-#include "window/window_adaptive.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "window/window_slide_animation.h"
@@ -655,6 +651,41 @@ Widget::Widget(
 		setupMoreChatsBar();
 		setupDownloadBar();
 	}
+
+	session().data().chatsFilters().changed(
+	) | rpl::start_with_next([=] {
+		if (!session().data().chatsFilters().loaded()) {
+			return;
+		}
+		if (session().data().chatsFilters().has()) {
+			if (_chatFilters) {
+				return;
+			}
+			_chatFilters = Ui::AddChatFiltersTabsStrip(
+				this,
+				&session(),
+				rpl::single(0),
+				[=](int h) { updateControlsGeometry(); },
+				[=](FilterId id) { controller->setActiveChatsFilter(id); },
+				Core::App().settings().chatFiltersHorizontalValue());
+			_chatFilters->stackUnder(_scroll);
+			_chatFilters->resizeToWidth(width());
+			updateControlsGeometry();
+			const auto shadow = Ui::CreateChild<Ui::PlainShadow>(
+				_chatFilters);
+			shadow->show();
+			_chatFilters->sizeValue(
+			) | rpl::start_with_next([=](const QSize &size) {
+				shadow->setGeometry(
+					0,
+					size.height() - shadow->height(),
+					size.width(),
+					shadow->height());
+			}, lifetime());
+		} else {
+			_chatFilters = nullptr;
+		}
+	}, lifetime());
 }
 
 void Widget::chosenRow(const ChosenRow &row) {
@@ -1227,6 +1258,9 @@ void Widget::updateControlsVisibility(bool fast) {
 	if (_moreChatsBar) {
 		_moreChatsBar->show();
 	}
+	if (_chatFilters) {
+		_chatFilters->show();
+	}
 	if (_openedFolder || _openedForum) {
 		_subsectionTopBar->show();
 		if (_forumTopShadow) {
@@ -1845,6 +1879,12 @@ void Widget::scrollToDefault(bool verytop) {
 			this,
 			QPoint(),
 			QRect(0, top, wideGeometry.width(), skip));
+		if (_chatFilters) {
+			Ui::RenderWidget(
+				p,
+				_chatFilters,
+				QPoint(0, skip - _chatFilters->height()));
+		}
 		Ui::RenderWidget(p, _scroll, QPoint(0, skip));
 	}
 	if (scrollGeometry != wideGeometry) {
@@ -1860,6 +1900,9 @@ void Widget::startWidthAnimation() {
 	}
 	_widthAnimationCache = grabNonNarrowScrollFrame();
 	_scroll->hide();
+	if (_chatFilters) {
+		_chatFilters->hide();
+	}
 	updateStoriesVisibility();
 }
 
@@ -1867,6 +1910,9 @@ void Widget::stopWidthAnimation() {
 	_widthAnimationCache = QPixmap();
 	if (!_showAnimation) {
 		_scroll->setVisible(!_suggestions);
+		if (_chatFilters) {
+			_chatFilters->setVisible(!_suggestions);
+		}
 	}
 	updateStoriesVisibility();
 	update();
@@ -1961,6 +2007,9 @@ void Widget::startSlideAnimation(
 	if (_moreChatsBar) {
 		_moreChatsBar->hide();
 	}
+	if (_chatFilters) {
+		_chatFilters->hide();
+	}
 	if (_forumTopShadow) {
 		_forumTopShadow->hide();
 	}
@@ -3507,6 +3556,9 @@ void Widget::updateControlsGeometry() {
 	if (_forumRequestsBar) {
 		_forumRequestsBar->resizeToWidth(barw);
 	}
+	if (_chatFilters) {
+		_chatFilters->resizeToWidth(barw);
+	}
 	_updateScrollGeometryCached = [=] {
 		const auto moreChatsBarTop = expandedStoriesTop
 			+ ((!_stories || _stories->isHidden()) ? 0 : _aboveScrollAdded);
@@ -3528,8 +3580,15 @@ void Widget::updateControlsGeometry() {
 		if (_forumReportBar) {
 			_forumReportBar->bar().move(0, forumReportTop);
 		}
-		const auto scrollTop = forumReportTop
+		const auto chatFiltersTop = forumReportTop
 			+ (_forumReportBar ? _forumReportBar->bar().height() : 0);
+		if (_chatFilters) {
+			_chatFilters->move(0, chatFiltersTop);
+		}
+		const auto scrollTop = chatFiltersTop
+			+ (_chatFilters
+				? (_chatFilters->height() * (1. - narrowRatio))
+				: 0);
 		const auto scrollHeight = height() - scrollTop - bottomSkip;
 		const auto wasScrollHeight = _scroll->height();
 		_scroll->setGeometry(0, scrollTop, scrollWidth, scrollHeight);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index ff751c714..83756e01c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -390,6 +390,8 @@ private:
 
 	QPixmap _widthAnimationCache;
 
+	Ui::RpWidget *_chatFilters = nullptr;
+
 	int _topDelta = 0;
 
 	std::unique_ptr<Widget> _childList;

From bcd84518d1c0a8179f8e3c9c36c24e50aad954f8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 3 Nov 2024 18:16:40 +0300
Subject: [PATCH 205/306] Added tracking of active chats filter to chats
 filters strip.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  3 ++-
 .../ui/widgets/chat_filters_tabs_strip.cpp    | 19 +++++++++++++++++--
 .../ui/widgets/chat_filters_tabs_strip.h      |  3 ++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6f6b57298..056f2a159 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -667,7 +667,8 @@ Widget::Widget(
 				rpl::single(0),
 				[=](int h) { updateControlsGeometry(); },
 				[=](FilterId id) { controller->setActiveChatsFilter(id); },
-				Core::App().settings().chatFiltersHorizontalValue());
+				Core::App().settings().chatFiltersHorizontalValue(),
+				true);
 			_chatFilters->stackUnder(_scroll);
 			_chatFilters->resizeToWidth(width());
 			updateControlsGeometry();
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 66affaf5c..e29f90e89 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -130,7 +130,8 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		rpl::producer<int> multiSelectHeightValue,
 		Fn<void(int)> setAddedTopScrollSkip,
 		Fn<void(FilterId)> choose,
-		rpl::producer<bool> additionalToggleOn) {
+		rpl::producer<bool> additionalToggleOn,
+		bool trackActiveChatsFilter) {
 	const auto window = Core::App().findWindow(parent);
 	const auto controller = window ? window->sessionController() : nullptr;
 
@@ -265,7 +266,21 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 				applyFilter(filter);
 			}
 		}();
-		slider->sectionActivated() | rpl::start_with_next([=](int index) {
+		if (trackActiveChatsFilter) {
+			controller->activeChatsFilter(
+			) | rpl::start_with_next([=](FilterId id) {
+				const auto &list = session->data().chatsFilters().list();
+				for (auto i = 0; i < list.size(); ++i) {
+					if (list[i].id() == id) {
+						slider->setActiveSection(i);
+						scrollToIndex(i, anim::type::normal);
+						break;
+					}
+				}
+			}, slider->lifetime());
+		}
+		slider->sectionActivated() | rpl::distinct_until_changed(
+		) | rpl::start_with_next([=](int index) {
 			const auto &filter = filterByIndex(index);
 			state->lastFilterId = filter.id();
 			scrollToIndex(index, anim::type::normal);
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
index 3a5c1ed59..806a2ee14 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
@@ -23,6 +23,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	rpl::producer<int> multiSelectHeightValue,
 	Fn<void(int)> setAddedTopScrollSkip,
 	Fn<void(FilterId)> choose,
-	rpl::producer<bool> additionalToggleOn = rpl::single(true));
+	rpl::producer<bool> additionalToggleOn = rpl::single(true),
+	bool trackActiveChatsFilter = false);
 
 } // namespace Ui

From 81aef519d4b76bb96b0fbfa183f9b2b224d9a524 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 3 Nov 2024 18:20:06 +0300
Subject: [PATCH 206/306] Added support of setting for chats filters view type
 to filters menu.

---
 Telegram/SourceFiles/window/window_controller.cpp    |  3 ++-
 .../SourceFiles/window/window_session_controller.cpp | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index ec9fa548e..da6efc8d1 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -229,7 +229,8 @@ void Controller::setupSideBar() {
 		sideBarChanged();
 	}, _sessionController->lifetime());
 
-	if (_sessionController->session().settings().dialogsFiltersEnabled()) {
+	if (_sessionController->session().settings().dialogsFiltersEnabled()
+		&& !Core::App().settings().chatFiltersHorizontal()) {
 		_sessionController->toggleFiltersMenu(true);
 	} else {
 		sideBarChanged();
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 06ce1e528..8a05d59e5 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1314,7 +1314,14 @@ SessionController::SessionController(
 		closeFolder();
 	}, lifetime());
 
-	session->data().chatsFilters().changed(
+	rpl::merge(
+		session->data().chatsFilters().changed() | rpl::filter([=] {
+			return session->data().chatsFilters().loaded();
+		}) | rpl::map([] {
+			return Core::App().settings().chatFiltersHorizontalValue(
+			) | rpl::to_empty;
+		}) | rpl::flatten_latest(),
+		session->data().chatsFilters().changed()
 	) | rpl::start_with_next([=] {
 		checkOpenedFilter();
 		crl::on_main(this, [=] {
@@ -1550,7 +1557,8 @@ void SessionController::toggleFiltersMenu(bool enabled) {
 }
 
 void SessionController::refreshFiltersMenu() {
-	toggleFiltersMenu(session().data().chatsFilters().has());
+	toggleFiltersMenu(session().data().chatsFilters().has()
+		&& !Core::App().settings().chatFiltersHorizontal());
 }
 
 rpl::producer<> SessionController::filtersMenuChanged() const {

From ba0da9f59ee34eeecf0594e542f4f312f27c1c9f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 4 Nov 2024 16:28:06 +0300
Subject: [PATCH 207/306] Slightly improved process of switching between chats
 filters view types.

---
 Telegram/SourceFiles/core/core_settings.cpp   |  4 +-
 Telegram/SourceFiles/core/core_settings.h     |  2 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 75 ++++++++++---------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  5 +-
 Telegram/SourceFiles/mainwidget.cpp           |  6 ++
 Telegram/SourceFiles/mainwidget.h             |  1 +
 .../ui/widgets/chat_filters_tabs_strip.cpp    |  8 +-
 .../ui/widgets/chat_filters_tabs_strip.h      |  1 -
 .../window/window_session_controller.cpp      | 24 +++---
 .../window/window_session_controller.h        |  1 -
 10 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 5a22f6d00..756d42138 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -1640,8 +1640,8 @@ bool Settings::chatFiltersHorizontal() const {
 	return _chatFiltersHorizontal.current();
 }
 
-rpl::producer<bool> Settings::chatFiltersHorizontalValue() const {
-	return _chatFiltersHorizontal.value();
+rpl::producer<bool> Settings::chatFiltersHorizontalChanges() const {
+	return _chatFiltersHorizontal.changes();
 }
 
 void Settings::setChatFiltersHorizontal(bool value) {
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index d7933efaf..b03f4ed5f 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -930,7 +930,7 @@ public:
 	void setIvZoom(int value);
 
 	[[nodiscard]] bool chatFiltersHorizontal() const;
-	[[nodiscard]] rpl::producer<bool> chatFiltersHorizontalValue() const;
+	[[nodiscard]] rpl::producer<bool> chatFiltersHorizontalChanges() const;
 	void setChatFiltersHorizontal(bool value);
 
 	[[nodiscard]] Media::VideoQuality videoQuality() const;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 056f2a159..df00ed494 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -652,41 +652,10 @@ Widget::Widget(
 		setupDownloadBar();
 	}
 
-	session().data().chatsFilters().changed(
-	) | rpl::start_with_next([=] {
-		if (!session().data().chatsFilters().loaded()) {
-			return;
-		}
-		if (session().data().chatsFilters().has()) {
-			if (_chatFilters) {
-				return;
-			}
-			_chatFilters = Ui::AddChatFiltersTabsStrip(
-				this,
-				&session(),
-				rpl::single(0),
-				[=](int h) { updateControlsGeometry(); },
-				[=](FilterId id) { controller->setActiveChatsFilter(id); },
-				Core::App().settings().chatFiltersHorizontalValue(),
-				true);
-			_chatFilters->stackUnder(_scroll);
-			_chatFilters->resizeToWidth(width());
-			updateControlsGeometry();
-			const auto shadow = Ui::CreateChild<Ui::PlainShadow>(
-				_chatFilters);
-			shadow->show();
-			_chatFilters->sizeValue(
-			) | rpl::start_with_next([=](const QSize &size) {
-				shadow->setGeometry(
-					0,
-					size.height() - shadow->height(),
-					size.width(),
-					shadow->height());
-			}, lifetime());
-		} else {
-			_chatFilters = nullptr;
-		}
-	}, lifetime());
+	if (session().settings().dialogsFiltersEnabled()
+		&& Core::App().settings().chatFiltersHorizontal()) {
+		toggleFiltersMenu(true);
+	}
 }
 
 void Widget::chosenRow(const ChosenRow &row) {
@@ -1331,6 +1300,42 @@ void Widget::updateHasFocus(not_null<QWidget*> focused) {
 	}
 }
 
+void Widget::toggleFiltersMenu(bool enabled) {
+	if (!enabled == !_chatFilters) {
+		return;
+	} else if (enabled) {
+		_chatFilters = base::make_unique_q<Ui::RpWidget>(this);
+		const auto raw = _chatFilters.get();
+		const auto inner = Ui::AddChatFiltersTabsStrip(
+			_chatFilters.get(),
+			&session(),
+			rpl::single(0),
+			[this](int h) { updateControlsGeometry(); },
+			[this](FilterId id) {
+				if (controller()->activeChatsFilterCurrent() != id) {
+					controller()->setActiveChatsFilter(id);
+				}
+			},
+			true);
+		raw->show();
+		raw->stackUnder(_scroll);
+		raw->resizeToWidth(width());
+		const auto shadow = Ui::CreateChild<Ui::PlainShadow>(raw);
+		shadow->show();
+		inner->sizeValue() | rpl::start_with_next([=](const QSize &s) {
+			raw->resize(s);
+			shadow->setGeometry(
+				0,
+				s.height() - shadow->height(),
+				s.width(),
+				shadow->height());
+		}, _chatFilters->lifetime());
+		updateControlsGeometry();
+	} else {
+		_chatFilters = nullptr;
+	}
+}
+
 bool Widget::cancelSearchByMouseBack() {
 	return _searchHasFocus
 		&& !_searchSuggestionsLocked
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 83756e01c..b163cef85 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -129,6 +129,7 @@ public:
 	[[nodiscard]] RowDescriptor resolveChatNext(RowDescriptor from = {}) const;
 	[[nodiscard]] RowDescriptor resolveChatPrevious(RowDescriptor from = {}) const;
 	void updateHasFocus(not_null<QWidget*> focused);
+	void toggleFiltersMenu(bool value);
 
 	// Float player interface.
 	bool floatPlayerHandleWheelEvent(QEvent *e) override;
@@ -317,6 +318,8 @@ private:
 	std::unique_ptr<Ui::RequestsBar> _forumRequestsBar;
 	std::unique_ptr<HistoryView::ContactStatus> _forumReportBar;
 
+	base::unique_qptr<Ui::RpWidget> _chatFilters;
+
 	object_ptr<Ui::ElasticScroll> _scroll;
 	QPointer<InnerWidget> _inner;
 	std::unique_ptr<Suggestions> _suggestions;
@@ -390,8 +393,6 @@ private:
 
 	QPixmap _widthAnimationCache;
 
-	Ui::RpWidget *_chatFilters = nullptr;
-
 	int _topDelta = 0;
 
 	std::unique_ptr<Widget> _childList;
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 5fc463f0f..5cd766f03 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1098,6 +1098,12 @@ void MainWidget::dialogsCancelled() {
 	_history->activate();
 }
 
+void MainWidget::toggleFiltersMenu(bool value) const {
+	if (_dialogs) {
+		_dialogs->toggleFiltersMenu(value);
+	}
+}
+
 void MainWidget::setChatBackground(
 		const Data::WallPaper &background,
 		QImage &&image) {
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 32e5fff5d..5d6379896 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -213,6 +213,7 @@ public:
 	void showNonPremiumLimitToast(bool download);
 
 	void dialogsCancelled();
+	void toggleFiltersMenu(bool value) const;
 
 private:
 	void paintEvent(QPaintEvent *e) override;
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index e29f90e89..f44cc38b8 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -40,7 +40,6 @@ struct State final {
 	std::optional<FilterId> lastFilterId = std::nullopt;
 	rpl::lifetime unreadLifetime;
 	base::unique_qptr<Ui::PopupMenu> menu;
-	rpl::variable<bool> additionalToggleOn;
 
 	Api::RemoveComplexChatFilter removeApi;
 	bool waitingSuggested = false;
@@ -130,7 +129,6 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		rpl::producer<int> multiSelectHeightValue,
 		Fn<void(int)> setAddedTopScrollSkip,
 		Fn<void(FilterId)> choose,
-		rpl::producer<bool> additionalToggleOn,
 		bool trackActiveChatsFilter) {
 	const auto window = Core::App().findWindow(parent);
 	const auto controller = window ? window->sessionController() : nullptr;
@@ -151,7 +149,6 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			object_ptr<Ui::ChatsFiltersTabs>(parent, st::dialogsSearchTabs),
 			QMargins(sliderPadding, 0, sliderPadding, 0)))->entity();
 	const auto state = wrap->lifetime().make_state<State>();
-	state->additionalToggleOn = std::move(additionalToggleOn);
 	wrap->toggle(false, anim::type::instant);
 	container->sizeValue() | rpl::start_with_next([=](const QSize &s) {
 		scroll->resize(s + QSize(0, scrollSt.deltax * 4));
@@ -289,10 +286,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		slider->contextMenuRequested() | rpl::start_with_next([=](int index) {
 			ShowMenu(wrap, controller, state, index);
 		}, slider->lifetime());
-		state->additionalToggleOn.value(
-		) | rpl::start_with_next([=](bool enabled) {
-			wrap->toggle(enabled && (list.size() > 1), anim::type::instant);
-		}, wrap->lifetime());
+		wrap->toggle((list.size() > 1), anim::type::instant);
 	};
 	session->data().chatsFilters().changed(
 	) | rpl::start_with_next(rebuild, wrap->lifetime());
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
index 806a2ee14..d57cfdda3 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
@@ -23,7 +23,6 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	rpl::producer<int> multiSelectHeightValue,
 	Fn<void(int)> setAddedTopScrollSkip,
 	Fn<void(FilterId)> choose,
-	rpl::producer<bool> additionalToggleOn = rpl::single(true),
 	bool trackActiveChatsFilter = false);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 8a05d59e5..5c54a79d2 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1315,17 +1315,20 @@ SessionController::SessionController(
 	}, lifetime());
 
 	rpl::merge(
-		session->data().chatsFilters().changed() | rpl::filter([=] {
-			return session->data().chatsFilters().loaded();
-		}) | rpl::map([] {
-			return Core::App().settings().chatFiltersHorizontalValue(
-			) | rpl::to_empty;
-		}) | rpl::flatten_latest(),
+		Core::App().settings().chatFiltersHorizontalChanges() | rpl::to_empty,
 		session->data().chatsFilters().changed()
 	) | rpl::start_with_next([=] {
 		checkOpenedFilter();
-		crl::on_main(this, [=] {
-			refreshFiltersMenu();
+		crl::on_main(this, [this] {
+			if (SessionNavigation::session().data().chatsFilters().has()) {
+				const auto isHorizontal
+					= Core::App().settings().chatFiltersHorizontal();
+				content()->toggleFiltersMenu(isHorizontal);
+				toggleFiltersMenu(!isHorizontal);
+			} else {
+				content()->toggleFiltersMenu(false);
+				toggleFiltersMenu(false);
+			}
 		});
 	}, lifetime());
 
@@ -1556,11 +1559,6 @@ void SessionController::toggleFiltersMenu(bool enabled) {
 	_filtersMenuChanged.fire({});
 }
 
-void SessionController::refreshFiltersMenu() {
-	toggleFiltersMenu(session().data().chatsFilters().has()
-		&& !Core::App().settings().chatFiltersHorizontal());
-}
-
 rpl::producer<> SessionController::filtersMenuChanged() const {
 	return _filtersMenuChanged.events();
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index c925aacc7..8cb9a590f 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -630,7 +630,6 @@ private:
 
 	void init();
 	void setupShortcuts();
-	void refreshFiltersMenu();
 	void checkOpenedFilter();
 	void suggestArchiveAndMute();
 	void activateFirstChatsFilter();

From 146409844da18e9535bb8d84173a5b67e11c13be Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 4 Nov 2024 16:41:16 +0300
Subject: [PATCH 208/306] Simplified geometry management of chats filters
 strip.

---
 Telegram/SourceFiles/boxes/share_box.cpp      | 26 ++++++++-------
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  5 ++-
 .../ui/widgets/chat_filters_tabs_strip.cpp    | 32 +++++--------------
 .../ui/widgets/chat_filters_tabs_strip.h      |  2 --
 .../SourceFiles/window/window_peer_menu.cpp   | 10 ++++--
 5 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 6550b3e10..8551a4f7e 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -344,19 +344,23 @@ void ShareBox::prepare() {
 
 	_select->raise();
 
-	AddChatFiltersTabsStrip(
-		this,
-		_descriptor.session,
-		_select->heightValue(),
-		[this](int height) {
-			_additionalTopScrollSkip = height;
+	{
+		const auto chatsFilters = AddChatFiltersTabsStrip(
+			this,
+			_descriptor.session,
+			[this](FilterId id) {
+				_inner->applyChatFilter(id);
+				scrollToY(0);
+			});
+		chatsFilters->heightValue() | rpl::start_with_next([this](int h) {
+			_additionalTopScrollSkip = h;
 			updateScrollSkips();
 			scrollToY(0);
-		},
-		[this](FilterId id) {
-			_inner->applyChatFilter(id);
-			scrollToY(0);
-		});
+		}, lifetime());
+		_select->heightValue() | rpl::start_with_next([=](int h) {
+			chatsFilters->moveToLeft(0, h);
+		}, chatsFilters->lifetime());
+	}
 }
 
 int ShareBox::getTopScrollSkip() const {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index df00ed494..4746532e1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1309,8 +1309,6 @@ void Widget::toggleFiltersMenu(bool enabled) {
 		const auto inner = Ui::AddChatFiltersTabsStrip(
 			_chatFilters.get(),
 			&session(),
-			rpl::single(0),
-			[this](int h) { updateControlsGeometry(); },
 			[this](FilterId id) {
 				if (controller()->activeChatsFilterCurrent() != id) {
 					controller()->setActiveChatsFilter(id);
@@ -1322,13 +1320,14 @@ void Widget::toggleFiltersMenu(bool enabled) {
 		raw->resizeToWidth(width());
 		const auto shadow = Ui::CreateChild<Ui::PlainShadow>(raw);
 		shadow->show();
-		inner->sizeValue() | rpl::start_with_next([=](const QSize &s) {
+		inner->sizeValue() | rpl::start_with_next([=, this](const QSize &s) {
 			raw->resize(s);
 			shadow->setGeometry(
 				0,
 				s.height() - shadow->height(),
 				s.width(),
 				shadow->height());
+			updateControlsGeometry();
 		}, _chatFilters->lifetime());
 		updateControlsGeometry();
 	} else {
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index f44cc38b8..95e224eb1 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -126,8 +126,6 @@ void ShowMenu(
 not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Main::Session*> session,
-		rpl::producer<int> multiSelectHeightValue,
-		Fn<void(int)> setAddedTopScrollSkip,
 		Fn<void(FilterId)> choose,
 		bool trackActiveChatsFilter) {
 	const auto window = Core::App().findWindow(parent);
@@ -150,15 +148,6 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			QMargins(sliderPadding, 0, sliderPadding, 0)))->entity();
 	const auto state = wrap->lifetime().make_state<State>();
 	wrap->toggle(false, anim::type::instant);
-	container->sizeValue() | rpl::start_with_next([=](const QSize &s) {
-		scroll->resize(s + QSize(0, scrollSt.deltax * 4));
-	}, scroll->lifetime());
-	rpl::combine(
-		parent->widthValue(),
-		slider->heightValue()
-	) | rpl::start_with_next([=](int w, int h) {
-		container->resize(w, h);
-	}, wrap->lifetime());
 	scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
 		const auto pixelDelta = e->pixelDelta();
 		const auto angleDelta = e->angleDelta();
@@ -305,19 +294,14 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		}
 	}, wrap->lifetime());
 
-	{
-		std::move(
-			multiSelectHeightValue
-		) | rpl::start_with_next([=](int height) {
-			wrap->moveToLeft(0, height);
-		}, wrap->lifetime());
-		wrap->heightValue() | rpl::start_with_next([=](int height) {
-			setAddedTopScrollSkip(height);
-		}, wrap->lifetime());
-		parent->widthValue() | rpl::start_with_next([=](int w) {
-			wrap->resizeToWidth(w);
-		}, wrap->lifetime());
-	}
+	rpl::combine(
+		parent->widthValue() | rpl::filter(rpl::mappers::_1 > 0),
+		slider->heightValue() | rpl::filter(rpl::mappers::_1 > 0)
+	) | rpl::start_with_next([=](int w, int h) {
+		scroll->resize(w, h + scrollSt.deltax * 4);
+		container->resize(w, h);
+		wrap->resize(w, h);
+	}, wrap->lifetime());
 
 	return wrap;
 }
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
index d57cfdda3..229471b8e 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
@@ -20,8 +20,6 @@ namespace Ui {
 not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Main::Session*> session,
-	rpl::producer<int> multiSelectHeightValue,
-	Fn<void(int)> setAddedTopScrollSkip,
 	Fn<void(FilterId)> choose,
 	bool trackActiveChatsFilter = false);
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index c93c9fecc..78b3e2a2c 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2110,12 +2110,16 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 				});
 				box->peerListRefreshRows();
 			};
-			Ui::AddChatFiltersTabsStrip(
+			const auto chatsFilters = Ui::AddChatFiltersTabsStrip(
 				box,
 				session,
-				box->multiSelectHeightValue(),
-				[=](int height) { box->setAddedTopScrollSkip(height); },
 				std::move(applyFilter));
+			chatsFilters->heightValue() | rpl::start_with_next([box](int h) {
+				box->setAddedTopScrollSkip(h);
+			}, box->lifetime());
+			box->multiSelectHeightValue() | rpl::start_with_next([=](int h) {
+				chatsFilters->moveToLeft(0, h);
+			}, chatsFilters->lifetime());
 		};
 		auto box = Box<ListBox>(std::move(controller), std::move(init));
 		const auto boxRaw = box.data();

From 63a8fe7ee8a1d67eb0f134f4abb3a2c4d76b5687 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 5 Nov 2024 06:56:20 +0300
Subject: [PATCH 209/306] Added direct access to sections of discrete slider to
 derived classes.

---
 Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp | 4 ++++
 Telegram/SourceFiles/ui/widgets/discrete_sliders.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index 9ceaa818b..f686cefd0 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -68,6 +68,10 @@ void DiscreteSlider::setSelectOnPress(bool selectOnPress) {
 	_selectOnPress = selectOnPress;
 }
 
+std::vector<DiscreteSlider::Section> &DiscreteSlider::sectionsRef() {
+	return _sections;
+}
+
 void DiscreteSlider::addSection(const QString &label) {
 	_sections.push_back(Section(label, getLabelStyle()));
 	resizeToWidth(width());
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
index 2ac574b7c..c89b6cfef 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
@@ -97,6 +97,8 @@ protected:
 
 	void setSelectOnPress(bool selectOnPress);
 
+	std::vector<Section> &sectionsRef();
+
 private:
 	void activateCallback();
 	virtual const style::TextStyle &getLabelStyle() const = 0;

From 3e413a036fd33e59609e0c8c949301e4ca5f4e93 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 4 Nov 2024 20:32:24 +0300
Subject: [PATCH 210/306] Added initial implementation of class for reorder of
 tabs slider.

---
 .../chat_filters_tabs_slider_reorder.cpp      | 373 ++++++++++++++++++
 .../chat_filters_tabs_slider_reorder.h        |  98 +++++
 Telegram/cmake/td_ui.cmake                    |   2 +
 Telegram/lib_base                             |   2 +-
 4 files changed, 474 insertions(+), 1 deletion(-)
 create mode 100644 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
 create mode 100644 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.h

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
new file mode 100644
index 000000000..8695aac32
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
@@ -0,0 +1,373 @@
+/*
+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/chat_filters_tabs_slider_reorder.h"
+
+#include "ui/widgets/scroll_area.h"
+#include "styles/style_basic.h"
+
+#include <QScrollBar>
+#include <QtGui/QtEvents>
+#include <QtWidgets/QApplication>
+
+namespace Ui {
+namespace {
+
+constexpr auto kScrollFactor = 0.05;
+
+} // namespace
+
+ChatsFiltersTabsReorder::ChatsFiltersTabsReorder(
+	not_null<ChatsFiltersTabs*> layout,
+	not_null<ScrollArea*> scroll)
+: _layout(layout)
+, _scroll(scroll)
+, _scrollAnimation([this] { updateScrollCallback(); }) {
+}
+
+ChatsFiltersTabsReorder::ChatsFiltersTabsReorder(
+	not_null<ChatsFiltersTabs*> layout)
+: _layout(layout) {
+}
+
+void ChatsFiltersTabsReorder::cancel() {
+	if (_currentWidget) {
+		cancelCurrent(indexOf(_currentWidget));
+	}
+	_lifetime.destroy();
+	for (auto i = 0, count = _layout->count(); i != count; ++i) {
+		_layout->setHorizontalShift(i, 0);
+	}
+	_entries.clear();
+}
+
+void ChatsFiltersTabsReorder::start() {
+	const auto count = _layout->count();
+	if (count < 2) {
+		return;
+	}
+	_layout->events()
+	| rpl::start_with_next_done([this](not_null<QEvent*> e) {
+		switch (e->type()) {
+		case QEvent::MouseMove:
+			mouseMove(static_cast<QMouseEvent*>(e.get())->globalPos());
+			break;
+		case QEvent::MouseButtonPress: {
+			const auto m = static_cast<QMouseEvent*>(e.get());
+			mousePress(m->button(), m->pos(), m->globalPos());
+			break;
+		}
+		case QEvent::MouseButtonRelease:
+			mouseRelease(static_cast<QMouseEvent*>(e.get())->button());
+			break;
+		}
+	}, [this] {
+		cancel();
+	}, _lifetime);
+
+	for (auto i = 0; i != count; ++i) {
+		const auto widget = _layout->widgetAt(i);
+		_entries.push_back({ widget });
+	}
+}
+
+void ChatsFiltersTabsReorder::addPinnedInterval(int from, int length) {
+	_pinnedIntervals.push_back({ from, length });
+}
+
+void ChatsFiltersTabsReorder::clearPinnedIntervals() {
+	_pinnedIntervals.clear();
+}
+
+bool ChatsFiltersTabsReorder::Interval::isIn(int index) const {
+	return (index >= from) && (index < (from + length));
+}
+
+bool ChatsFiltersTabsReorder::isIndexPinned(int index) const {
+	return ranges::any_of(_pinnedIntervals, [&](const Interval &i) {
+		return i.isIn(index);
+	});
+}
+
+void ChatsFiltersTabsReorder::checkForStart(QPoint position) {
+	const auto shift = position.x() - _currentStart;
+	const auto delta = QApplication::startDragDistance();
+	if (std::abs(shift) <= delta) {
+		return;
+	}
+	_currentState = State::Started;
+	_currentStart += (shift > 0) ? delta : -delta;
+
+	const auto index = indexOf(_currentWidget);
+	_layout->setRaised(index);
+	_currentDesiredIndex = index;
+	_updates.fire({ _currentWidget, index, index, _currentState });
+
+	updateOrder(index, position);
+}
+
+void ChatsFiltersTabsReorder::updateOrder(int index, QPoint position) {
+	if (isIndexPinned(index)) {
+		return;
+	}
+	const auto shift = position.x() - _currentStart;
+	auto &current = _entries[index];
+	current.shiftAnimation.stop();
+	current.shift = current.finalShift = shift;
+	_layout->setHorizontalShift(index, shift);
+
+	checkForScrollAnimation();
+
+	const auto count = _entries.size();
+	const auto currentWidth = current.widget->width;
+	const auto currentMiddle = current.widget->left
+		+ shift
+		+ currentWidth / 2;
+	_currentDesiredIndex = index;
+	if (shift > 0) {
+		for (auto next = index + 1; next != count; ++next) {
+			if (isIndexPinned(next)) {
+				return;
+			}
+			const auto &e = _entries[next];
+			if (currentMiddle < e.widget->left + e.widget->width / 2) {
+				moveToShift(next, 0);
+			} else {
+				_currentDesiredIndex = next;
+				moveToShift(next, -currentWidth);
+			}
+		}
+		for (auto prev = index - 1; prev >= 0; --prev) {
+			moveToShift(prev, 0);
+		}
+	} else {
+		for (auto next = index + 1; next != count; ++next) {
+			moveToShift(next, 0);
+		}
+		for (auto prev = index - 1; prev >= 0; --prev) {
+			if (isIndexPinned(prev)) {
+				return;
+			}
+			const auto &e = _entries[prev];
+			if (currentMiddle >= e.widget->left + e.widget->width / 2) {
+				moveToShift(prev, 0);
+			} else {
+				_currentDesiredIndex = prev;
+				moveToShift(prev, currentWidth);
+			}
+		}
+	}
+}
+
+void ChatsFiltersTabsReorder::mousePress(
+		Qt::MouseButton button,
+		QPoint position,
+		QPoint globalPosition) {
+	if (button != Qt::LeftButton) {
+		return;
+	}
+	auto widget = (ChatsFiltersTabs::ShiftedSection*)(nullptr);
+	for (auto i = 0; i != _layout->_sections.size(); ++i) {
+		auto &section = _layout->_sections[i];
+		if ((position.x() >= section.section->left)
+			&& (position.x() < (section.section->left + section.section->width))) {
+			widget = &section;
+			break;
+		}
+	}
+	cancelCurrent();
+	_currentWidget = widget->section;
+	_currentShiftedWidget = widget;
+	_currentStart = globalPosition.x();
+}
+
+void ChatsFiltersTabsReorder::mouseMove(QPoint position) {
+	if (!_currentWidget) {
+	// if (_currentWidget != widget) {
+		return;
+	} else if (_currentState != State::Started) {
+		checkForStart(position);
+	} else {
+		updateOrder(indexOf(_currentWidget), position);
+	}
+}
+
+void ChatsFiltersTabsReorder::mouseRelease(Qt::MouseButton button) {
+	if (button != Qt::LeftButton) {
+		return;
+	}
+	finishReordering();
+}
+
+void ChatsFiltersTabsReorder::cancelCurrent() {
+	if (_currentWidget) {
+		cancelCurrent(indexOf(_currentWidget));
+	}
+}
+
+void ChatsFiltersTabsReorder::cancelCurrent(int index) {
+	Expects(_currentWidget != nullptr);
+
+	if (_currentState == State::Started) {
+		_currentState = State::Cancelled;
+		_updates.fire({ _currentWidget, index, index, _currentState });
+	}
+	_currentWidget = nullptr;
+	_currentShiftedWidget = nullptr;
+	for (auto i = 0, count = int(_entries.size()); i != count; ++i) {
+		moveToShift(i, 0);
+	}
+}
+
+void ChatsFiltersTabsReorder::finishReordering() {
+	if (_scroll) {
+		_scrollAnimation.stop();
+	}
+	finishCurrent();
+}
+
+void ChatsFiltersTabsReorder::finishCurrent() {
+	if (!_currentWidget) {
+		return;
+	}
+	const auto index = indexOf(_currentWidget);
+	if (_currentDesiredIndex == index || _currentState != State::Started) {
+		cancelCurrent(index);
+		return;
+	}
+	const auto result = _currentDesiredIndex;
+	const auto widget = _currentWidget;
+	_currentState = State::Cancelled;
+	_currentWidget = nullptr;
+	_currentShiftedWidget = nullptr;
+
+	auto &current = _entries[index];
+	const auto width = current.widget->width;
+	if (index < result) {
+		auto sum = 0;
+		for (auto i = index; i != result; ++i) {
+			auto &entry = _entries[i + 1];
+			const auto widget = entry.widget;
+			entry.deltaShift += width;
+			updateShift(widget, i + 1);
+			sum += widget->width;
+		}
+		current.finalShift -= sum;
+	} else if (index > result) {
+		auto sum = 0;
+		for (auto i = result; i != index; ++i) {
+			auto &entry = _entries[i];
+			const auto widget = entry.widget;
+			entry.deltaShift -= width;
+			updateShift(widget, i);
+			sum += widget->width;
+		}
+		current.finalShift += sum;
+	}
+	if (!(current.finalShift + current.deltaShift)) {
+		current.shift = 0;
+		_layout->setHorizontalShift(index, 0);
+	}
+	base::reorder(_entries, index, result);
+	_layout->reorderSections(index, _currentDesiredIndex);
+	for (auto i = 0; i != _layout->sectionsRef().size(); ++i) {
+		_entries[i].widget = &_layout->sectionsRef()[i];
+		moveToShift(i, 0);
+	}
+
+	_updates.fire({ widget, index, result, State::Applied });
+}
+
+void ChatsFiltersTabsReorder::moveToShift(int index, int shift) {
+	auto &entry = _entries[index];
+	if (entry.finalShift + entry.deltaShift == shift) {
+		return;
+	}
+	const auto widget = entry.widget;
+	entry.shiftAnimation.start(
+		[=, this] { updateShift(widget, index); },
+		entry.finalShift,
+		shift - entry.deltaShift,
+		st::slideWrapDuration);
+	entry.finalShift = shift - entry.deltaShift;
+}
+
+void ChatsFiltersTabsReorder::updateShift(
+		not_null<Section*> widget,
+		int indexHint) {
+	Expects(indexHint >= 0 && indexHint < _entries.size());
+
+	const auto index = (_entries[indexHint].widget == widget)
+		? indexHint
+		: indexOf(widget);
+	auto &entry = _entries[index];
+	entry.shift = base::SafeRound(
+		entry.shiftAnimation.value(entry.finalShift)
+	) + entry.deltaShift;
+	if (entry.deltaShift && !entry.shiftAnimation.animating()) {
+		entry.finalShift += entry.deltaShift;
+		entry.deltaShift = 0;
+	}
+	_layout->setHorizontalShift(index, entry.shift);
+}
+
+int ChatsFiltersTabsReorder::indexOf(not_null<Section*> widget) const {
+	const auto i = ranges::find(_entries, widget, &Entry::widget);
+	Assert(i != end(_entries));
+	return i - begin(_entries);
+}
+
+auto ChatsFiltersTabsReorder::updates() const -> rpl::producer<Single> {
+	return _updates.events();
+}
+
+void ChatsFiltersTabsReorder::updateScrollCallback() {
+	if (!_scroll) {
+		return;
+	}
+	const auto delta = deltaFromEdge();
+	const auto oldLeft = _scroll->scrollLeft();
+	_scroll->horizontalScrollBar()->setValue(oldLeft + delta);
+	const auto newLeft = _scroll->scrollLeft();
+
+	_currentStart += oldLeft - newLeft;
+	if (newLeft == 0 || newLeft == _scroll->scrollLeftMax()) {
+		_scrollAnimation.stop();
+	}
+}
+
+void ChatsFiltersTabsReorder::checkForScrollAnimation() {
+	if (!_scroll || !deltaFromEdge() || _scrollAnimation.animating()) {
+		return;
+	}
+	_scrollAnimation.start();
+}
+
+int ChatsFiltersTabsReorder::deltaFromEdge() {
+	Expects(_currentWidget != nullptr);
+	Expects(_currentShiftedWidget != nullptr);
+	Expects(_scroll);
+
+	const auto globalPosition = _layout->mapToGlobal(
+		QPoint(
+			_currentWidget->left + _currentShiftedWidget->horizontalShift,
+			0));
+	const auto localLeft = _scroll->mapFromGlobal(globalPosition).x();
+	const auto localRight = localLeft
+		+ _currentWidget->width
+		- _scroll->width();
+
+	const auto isLeftEdge = (localLeft < 0);
+	const auto isRightEdge = (localRight > 0);
+	if (!isLeftEdge && !isRightEdge) {
+		_scrollAnimation.stop();
+		return 0;
+	}
+	return int((isRightEdge ? localRight : localLeft) * kScrollFactor);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.h
new file mode 100644
index 000000000..4a167d366
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.h
@@ -0,0 +1,98 @@
+/*
+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/effects/animations.h"
+#include "ui/widgets/chat_filters_tabs_slider.h"
+
+namespace Ui {
+
+class ScrollArea;
+
+class ChatsFiltersTabsReorder final {
+public:
+	using Section = ChatsFiltersTabs::Section;
+	enum class State : uchar {
+		Started,
+		Applied,
+		Cancelled,
+	};
+
+	struct Single {
+		not_null<Section*> widget;
+		int oldPosition = 0;
+		int newPosition = 0;
+		State state = State::Started;
+	};
+
+	ChatsFiltersTabsReorder(
+		not_null<ChatsFiltersTabs*> layout,
+		not_null<ScrollArea*> scroll);
+	ChatsFiltersTabsReorder(not_null<ChatsFiltersTabs*> layout);
+
+	void start();
+	void cancel();
+	void finishReordering();
+	void addPinnedInterval(int from, int length);
+	void clearPinnedIntervals();
+	[[nodiscard]] rpl::producer<Single> updates() const;
+
+private:
+	struct Entry {
+		not_null<Section*> widget;
+		Ui::Animations::Simple shiftAnimation;
+		int shift = 0;
+		int finalShift = 0;
+		int deltaShift = 0;
+	};
+	struct Interval {
+		[[nodiscard]] bool isIn(int index) const;
+
+		int from = 0;
+		int length = 0;
+	};
+
+	void mousePress(Qt::MouseButton button, QPoint position, QPoint global);
+	void mouseMove(QPoint position);
+	void mouseRelease(Qt::MouseButton button);
+
+	void checkForStart(QPoint position);
+	void updateOrder(int index, QPoint position);
+	void cancelCurrent();
+	void finishCurrent();
+	void cancelCurrent(int index);
+
+	[[nodiscard]] int indexOf(not_null<Section*> widget) const;
+	void moveToShift(int index, int shift);
+	void updateShift(not_null<Section*> widget, int indexHint);
+
+	void updateScrollCallback();
+	void checkForScrollAnimation();
+	[[nodiscard]] int deltaFromEdge();
+
+	[[nodiscard]] bool isIndexPinned(int index) const;
+
+	const not_null<ChatsFiltersTabs*> _layout;
+	Ui::ScrollArea *_scroll = nullptr;
+
+	Ui::Animations::Basic _scrollAnimation;
+
+	std::vector<Interval> _pinnedIntervals;
+
+	Section *_currentWidget = nullptr;
+	ChatsFiltersTabs::ShiftedSection *_currentShiftedWidget = nullptr;
+	int _currentStart = 0;
+	int _currentDesiredIndex = 0;
+	State _currentState = State::Cancelled;
+	std::vector<Entry> _entries;
+	rpl::event_stream<Single> _updates;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index f45d83aff..c7af0a748 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -423,6 +423,8 @@ PRIVATE
 
     ui/widgets/chat_filters_tabs_slider.cpp
     ui/widgets/chat_filters_tabs_slider.h
+    ui/widgets/chat_filters_tabs_slider_reorder.cpp
+    ui/widgets/chat_filters_tabs_slider_reorder.h
     ui/widgets/color_editor.cpp
     ui/widgets/color_editor.h
     ui/widgets/continuous_sliders.cpp
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 21d1ac8bf..2b622fd0b 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 21d1ac8bfcca03f67d7f6df75e265cd5597dc101
+Subproject commit 2b622fd0b223ed6266a32dc07382975769cc031c

From 7cc81393d6e43a4c71c84e632597beca2e63e250 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 5 Nov 2024 12:16:11 +0300
Subject: [PATCH 211/306] Adapted chats filters tabs slider for reorder
 feature.

---
 .../ui/widgets/chat_filters_tabs_slider.cpp   | 153 ++++++++++++++++--
 .../ui/widgets/chat_filters_tabs_slider.h     |  22 +++
 .../window/window_filters_menu.cpp            |   2 +-
 3 files changed, 160 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
index ab5a2089e..c93b61453 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -41,6 +41,7 @@ ChatsFiltersTabs::ChatsFiltersTabs(
 		};
 		_cachedBadgeHeight = one.height();
 	}
+	Ui::DiscreteSlider::setSelectOnPress(false);
 }
 
 int ChatsFiltersTabs::centerOfSection(int section) const {
@@ -59,6 +60,14 @@ void ChatsFiltersTabs::fitWidthToSections() {
 	const auto widths = countSectionsWidths(0);
 	resizeToWidth(ranges::accumulate(widths, .0));
 	_lockedFromX = calculateLockedFromX();
+
+	{
+		_sections.clear();
+		enumerateSections([&](Section &section) {
+			_sections.emplace_back(not_null{ &section }, 0, false);
+			return true;
+		});
+	}
 }
 
 void ChatsFiltersTabs::setUnreadCount(int index, int unreadCount) {
@@ -146,30 +155,44 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
 
 	const auto clip = e->rect();
 	const auto range = getCurrentActiveRange();
+	const auto activeIndex = activeSection();
 
 	auto index = 0;
-	enumerateSections([&](Section &section) {
-		const auto activeWidth = _st.barSnapToLabel
-			? section.contentWidth
-			: section.width;
-		const auto activeLeft = section.left
-			+ (section.width - activeWidth) / 2;
-		const auto active = 1.
-			- std::clamp(
-				std::abs(range.left - activeLeft) / float64(range.width),
-				0.,
-				1.);
+	auto raisedIndex = -1;
+	auto activeHorizontalShift = 0;
+	const auto drawSection = [&](Section &section) {
+		// const auto activeWidth = _st.barSnapToLabel
+		// 	? section.contentWidth
+		// 	: section.width;
+
+		const auto horizontalShift = _sections[index].horizontalShift;
+		const auto shiftedLeft = section.left + horizontalShift;
+		if (_sections[index].raise) {
+			raisedIndex = index;
+		}
+		if (index == activeIndex) {
+			activeHorizontalShift = horizontalShift;
+		}
+
+		// const auto activeLeft = shiftedLeft
+		// 	+ (section.width - activeWidth) / 2;
+		// const auto active = 1.
+		// 	- std::clamp(
+		// 		std::abs(range.left - activeLeft) / float64(range.width),
+		// 		0.,
+		// 		1.);
+		const auto active = (index == activeIndex) ? 1. : 0.;
 		if (section.ripple) {
 			const auto color = anim::color(
 				_st.rippleBg,
 				_st.rippleBgActive,
 				active);
-			section.ripple->paint(p, section.left, 0, width(), &color);
+			section.ripple->paint(p, shiftedLeft, 0, width(), &color);
 			if (section.ripple->empty()) {
 				section.ripple.reset();
 			}
 		}
-		const auto labelLeft = section.left
+		const auto labelLeft = shiftedLeft
 			+ (section.width - section.contentWidth) / 2;
 		const auto rect = myrtlrect(
 			labelLeft,
@@ -214,7 +237,12 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
 		}
 		index++;
 		return true;
-	});
+	};
+	enumerateSections(drawSection);
+	if (raisedIndex >= 0) {
+		index = raisedIndex;
+		drawSection(*_sections[raisedIndex].section);
+	}
 	if (_st.barSnapToLabel) {
 		const auto drawRect = [&](QRect rect, bool active) {
 			const auto &bar = active ? _barActive : _bar;
@@ -229,7 +257,11 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
 		const auto till = std::min(range.left + range.width + add, width());
 		if (from < till) {
 			drawRect(
-				myrtlrect(from, _st.barTop, till - from, _st.barStroke),
+				myrtlrect(
+					from,
+					_st.barTop,
+					till - from,
+					_st.barStroke).translated(activeHorizontalShift, 0),
 				true);
 		}
 	}
@@ -249,6 +281,14 @@ void ChatsFiltersTabs::mousePressEvent(QMouseEvent *e) {
 	}
 }
 
+void ChatsFiltersTabs::mouseMoveEvent(QMouseEvent *e) {
+	if (_reordering) {
+		Ui::RpWidget::mouseMoveEvent(e);
+	} else {
+		Ui::SettingsSlider::mouseMoveEvent(e);
+	}
+}
+
 void ChatsFiltersTabs::mouseReleaseEvent(QMouseEvent *e) {
 	const auto mouseButton = e->button();
 	if (mouseButton == Qt::MouseButton::LeftButton) {
@@ -256,7 +296,15 @@ void ChatsFiltersTabs::mouseReleaseEvent(QMouseEvent *e) {
 			_lockedPressed = false;
 			_lockedClicked.fire({});
 		} else {
-			Ui::SettingsSlider::mouseReleaseEvent(e);
+			if (_reordering) {
+				for (const auto &section : _sections) {
+					if (section.section->ripple) {
+						section.section->ripple->lastStop();
+					}
+				}
+			} else {
+				Ui::SettingsSlider::mouseReleaseEvent(e);
+			}
 		}
 	} else {
 		Ui::RpWidget::mouseReleaseEvent(e);
@@ -290,4 +338,77 @@ rpl::producer<> ChatsFiltersTabs::lockedClicked() const {
 	return _lockedClicked.events();
 }
 
+int ChatsFiltersTabs::count() const {
+	return _sections.size();
+}
+
+void ChatsFiltersTabs::setHorizontalShift(int index, int shift) {
+	Expects(index >= 0 && index < _sections.size());
+
+	auto &section = _sections[index];
+	if (const auto delta = shift - section.horizontalShift) {
+		section.horizontalShift = shift;
+		update();
+	}
+}
+
+void ChatsFiltersTabs::setRaised(int index) {
+	_sections[index].raise = true;
+	update();
+}
+
+void ChatsFiltersTabs::reorderSections(int oldIndex, int newIndex) {
+	Expects(oldIndex >= 0 && oldIndex < _sections.size());
+	Expects(newIndex >= 0 && newIndex < _sections.size());
+	// Expects(!_inResize);
+	auto lefts = std::vector<int>();
+	enumerateSections([&](Section &section) {
+		lefts.emplace_back(section.left);
+		return true;
+	});
+	const auto wasActive = activeSection();
+
+	{
+		auto unreadCounts = base::flat_map<Index, Unread>();
+		for (auto &[index, unread] : _unreadCounts) {
+			unreadCounts.emplace(
+				base::reorder_index(index, oldIndex, newIndex),
+				std::move(unread));
+		}
+		_unreadCounts = std::move(unreadCounts);
+	}
+
+	base::reorder(sectionsRef(), oldIndex, newIndex);
+	Ui::DiscreteSlider::setActiveSectionFast(
+		base::reorder_index(wasActive, oldIndex, newIndex));
+	Ui::DiscreteSlider::stopAnimation();
+
+	{
+		_sections.clear();
+		auto left = 0;
+		enumerateSections([&](Section &section) {
+			_sections.emplace_back(not_null{ &section }, 0, false);
+			section.left = left;
+			left += section.width;
+			return true;
+		});
+	}
+	update();
+}
+
+not_null<Ui::DiscreteSlider::Section*> ChatsFiltersTabs::widgetAt(
+		int index) const {
+	Expects(index >= 0 && index < count());
+
+	return _sections[index].section;
+}
+
+void ChatsFiltersTabs::setReordering(int value) {
+	_reordering = value;
+}
+
+int ChatsFiltersTabs::reordering() const {
+	return _reordering;
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
index ca311c7fe..3a027d278 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
@@ -19,6 +19,8 @@ namespace Ui {
 class RpWidget;
 class SettingsSlider;
 
+class ChatsFiltersTabsReorder;
+
 class ChatsFiltersTabs final : public Ui::SettingsSlider {
 public:
 	ChatsFiltersTabs(
@@ -33,12 +35,30 @@ public:
 	[[nodiscard]] rpl::producer<int> contextMenuRequested() const;
 	[[nodiscard]] rpl::producer<> lockedClicked() const;
 
+	void setHorizontalShift(int index, int shift);
+	void setRaised(int index);
+	[[nodiscard]] int count() const;
+	void reorderSections(int oldIndex, int newIndex);
+	[[nodiscard]] not_null<DiscreteSlider::Section*> widgetAt(int i) const;
+	void setReordering(int value);
+	[[nodiscard]] int reordering() const;
+
 protected:
+	struct ShiftedSection {
+		not_null<Ui::DiscreteSlider::Section*> section;
+		int horizontalShift = 0;
+		bool raise = false;
+	};
+	friend class ChatsFiltersTabsReorder;
+
 	void paintEvent(QPaintEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
 	void contextMenuEvent(QContextMenuEvent *e) override;
 
+	std::vector<ShiftedSection> _sections;
+
 private:
 	[[nodiscard]] QImage cacheUnreadCount(int count) const;
 	[[nodiscard]] int calculateLockedFromX() const;
@@ -62,6 +82,8 @@ private:
 	std::optional<Ui::RoundRect> _barActive;
 	std::optional<QImage> _lockCache;
 
+	int _reordering = 0;
+
 	rpl::lifetime _paletteLifetime;
 	rpl::event_stream<int> _contextMenuRequested;
 	rpl::event_stream<> _lockedClicked;
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index db6e05c4a..1502db36b 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -220,7 +220,7 @@ void FiltersMenu::setupList() {
 	_reorder = std::make_unique<Ui::VerticalLayoutReorder>(_list, &_scroll);
 
 	_reorder->updates(
-		) | rpl::start_with_next([=](Ui::VerticalLayoutReorder::Single data) {
+	) | rpl::start_with_next([=](Ui::VerticalLayoutReorder::Single data) {
 		using State = Ui::VerticalLayoutReorder::State;
 		if (data.state == State::Started) {
 			++_reordering;

From 6716973ce0514c1c68f8f2ce8e4086d284d5ca2d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 5 Nov 2024 12:21:46 +0300
Subject: [PATCH 212/306] Added ability to reorder tabs of chats filters strip.

---
 .../ui/widgets/chat_filters_tabs_strip.cpp    | 81 ++++++++++++++++++-
 .../ui/widgets/chat_filters_tabs_strip.h      |  2 +-
 2 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 95e224eb1..07e6ea40d 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -19,7 +19,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_folders.h"
-#include "ui/widgets/chat_filters_tabs_slider.h"
+#include "ui/ui_utility.h"
+#include "ui/widgets/chat_filters_tabs_slider_reorder.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
@@ -43,6 +44,9 @@ struct State final {
 
 	Api::RemoveComplexChatFilter removeApi;
 	bool waitingSuggested = false;
+
+	std::unique_ptr<Ui::ChatsFiltersTabsReorder> reorder;
+	bool ignoreRefresh = false;
 };
 
 void ShowMenu(
@@ -127,7 +131,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Main::Session*> session,
 		Fn<void(FilterId)> choose,
-		bool trackActiveChatsFilter) {
+		bool trackActiveFilterAndUnreadAndReorder) {
 	const auto window = Core::App().findWindow(parent);
 	const auto controller = window ? window->sessionController() : nullptr;
 
@@ -147,6 +151,52 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			object_ptr<Ui::ChatsFiltersTabs>(parent, st::dialogsSearchTabs),
 			QMargins(sliderPadding, 0, sliderPadding, 0)))->entity();
 	const auto state = wrap->lifetime().make_state<State>();
+	if (trackActiveFilterAndUnreadAndReorder) {
+		using Reorder = Ui::ChatsFiltersTabsReorder;
+		state->reorder = std::make_unique<Reorder>(slider, scroll);
+		const auto applyReorder = [=](
+				int oldPosition,
+				int newPosition) {
+			if (newPosition == oldPosition) {
+				return;
+			}
+
+			const auto filters = &session->data().chatsFilters();
+			const auto &list = filters->list();
+			if (!session->user()->isPremium()) {
+				if (list[0].id() != FilterId()) {
+					filters->moveAllToFront();
+				}
+			}
+			Assert(oldPosition >= 0 && oldPosition < list.size());
+			Assert(newPosition >= 0 && newPosition < list.size());
+
+			auto order = ranges::views::all(
+				list
+			) | ranges::views::transform(
+				&Data::ChatFilter::id
+			) | ranges::to_vector;
+			base::reorder(order, oldPosition, newPosition);
+
+			state->ignoreRefresh = true;
+			filters->saveOrder(order);
+			state->ignoreRefresh = false;
+		};
+
+		state->reorder->updates(
+		) | rpl::start_with_next([=](const Reorder::Single &data) {
+			if (data.state == Reorder::State::Started) {
+				slider->setReordering(slider->reordering() + 1);
+			} else {
+				Ui::PostponeCall(slider, [=] {
+					slider->setReordering(slider->reordering() - 1);
+				});
+				if (data.state == Reorder::State::Applied) {
+					applyReorder(data.oldPosition, data.newPosition);
+				}
+			}
+		}, slider->lifetime());
+	}
 	wrap->toggle(false, anim::type::instant);
 	scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
 		const auto pixelDelta = e->pixelDelta();
@@ -178,6 +228,9 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	};
 
 	const auto applyFilter = [=](const Data::ChatFilter &filter) {
+		if (slider->reordering()) {
+			return;
+		}
 		choose(filter.id());
 	};
 
@@ -189,6 +242,9 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 
 	const auto rebuild = [=] {
 		const auto &list = session->data().chatsFilters().list();
+		if ((list.size() <= 1) || state->ignoreRefresh) {
+			return;
+		}
 		auto sections = ranges::views::all(
 			list
 		) | ranges::views::transform([](const Data::ChatFilter &filter) {
@@ -209,8 +265,17 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			slider->lockedClicked() | rpl::start_with_next([=] {
 				controller->show(Box(FiltersLimitBox, session, std::nullopt));
 			}, slider->lifetime());
+			if (state->reorder) {
+				state->reorder->cancel();
+				if (!reorderAll) {
+					state->reorder->addPinnedInterval(0, 1);
+				}
+				state->reorder->addPinnedInterval(
+					premiumFrom,
+					std::max(1, int(list.size()) - maxLimit));
+			}
 		}
-		{
+		if (trackActiveFilterAndUnreadAndReorder) {
 			auto includeMuted = Data::IncludeMutedCounterFoldersValue();
 			state->unreadLifetime.destroy();
 			for (auto i = 0; i < list.size(); i++) {
@@ -252,7 +317,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 				applyFilter(filter);
 			}
 		}();
-		if (trackActiveChatsFilter) {
+		if (trackActiveFilterAndUnreadAndReorder) {
 			controller->activeChatsFilter(
 			) | rpl::start_with_next([=](FilterId id) {
 				const auto &list = session->data().chatsFilters().list();
@@ -263,10 +328,14 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 						break;
 					}
 				}
+				state->reorder->finishReordering();
 			}, slider->lifetime());
 		}
 		slider->sectionActivated() | rpl::distinct_until_changed(
 		) | rpl::start_with_next([=](int index) {
+			if (slider->reordering()) {
+				return;
+			}
 			const auto &filter = filterByIndex(index);
 			state->lastFilterId = filter.id();
 			scrollToIndex(index, anim::type::normal);
@@ -276,6 +345,10 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			ShowMenu(wrap, controller, state, index);
 		}, slider->lifetime());
 		wrap->toggle((list.size() > 1), anim::type::instant);
+
+		if (state->reorder) {
+			state->reorder->start();
+		}
 	};
 	session->data().chatsFilters().changed(
 	) | rpl::start_with_next(rebuild, wrap->lifetime());
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
index 229471b8e..641065ff8 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
@@ -21,6 +21,6 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Main::Session*> session,
 	Fn<void(FilterId)> choose,
-	bool trackActiveChatsFilter = false);
+	bool trackActiveFilterAndUnreadAndReorder = false);
 
 } // namespace Ui

From a41e9bf67e3a234716cc1fc820363fe80f160cc3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 5 Nov 2024 14:10:43 +0300
Subject: [PATCH 213/306] Added preview of chats filters strip to filter link
 box.

---
 Telegram/SourceFiles/api/api_chat_filters.cpp |  2 +
 .../ui/controls/filter_link_header.cpp        | 91 ++++++++++++++++---
 .../ui/controls/filter_link_header.h          |  1 +
 .../ui/widgets/chat_filters_tabs_slider.cpp   |  4 +
 .../ui/widgets/chat_filters_tabs_slider.h     |  2 +
 5 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index ee6b97b58..2c8410b80 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/premium_limits_box.h"
 #include "boxes/filters/edit_filter_links.h" // FilterChatStatusText
 #include "core/application.h"
+#include "core/core_settings.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_chat_filters.h"
@@ -152,6 +153,7 @@ void InitFilterLinkHeader(
 		.badge = (type == Ui::FilterLinkHeaderType::AddingChats
 			? std::move(count)
 			: rpl::single(0)),
+		.horizontalFilters = Core::App().settings().chatFiltersHorizontal(),
 	});
 	const auto widget = header.widget;
 	widget->resizeToWidth(st::boxWideWidth);
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
index 0d69c0efd..8228d3332 100644
--- a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
@@ -8,11 +8,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/filter_link_header.h"
 
 #include "lang/lang_keys.h"
+#include "ui/image/image_prepare.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
-#include "ui/image/image_prepare.h"
+#include "ui/ui_utility.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/chat_filters_tabs_slider.h"
 #include "ui/widgets/labels.h"
+#include "styles/style_chat_helpers.h" // defaultEmojiSuggestions
+#include "styles/style_dialogs.h" // dialogsSearchTabs
 #include "styles/style_filter_icons.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
@@ -68,6 +72,7 @@ private:
 
 	QString _folderTitle;
 	not_null<const style::icon*> _folderIcon;
+	bool _horizontalFilters = false;
 
 	int _maxHeight = 0;
 
@@ -75,6 +80,46 @@ private:
 
 };
 
+[[nodiscard]] QImage GeneratePreview(
+		not_null<Ui::RpWidget*> parent,
+		const QString &title,
+		int badge) {
+	using Tabs = Ui::ChatsFiltersTabs;
+	auto owned = parent->lifetime().make_state<base::unique_qptr<Tabs>>(
+		base::make_unique_q<Tabs>(parent, st::dialogsSearchTabs));
+	const auto raw = owned->get();
+	raw->setSections({
+		tr::lng_filters_name_people(tr::now),
+		title,
+		tr::lng_filters_name_unread(tr::now),
+	});
+	raw->fitWidthToSections();
+	raw->setActiveSectionFast(1);
+	raw->stopAnimation();
+
+	auto result = QImage(
+		raw->size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(style::DevicePixelRatio());
+	result.fill(st::windowBg->c);
+	{
+		auto p = QPainter(&result);
+		Ui::RenderWidget(p, raw, QPoint(), raw->rect());
+
+		const auto &r = st::defaultEmojiSuggestions.fadeRight;
+		const auto &l = st::defaultEmojiSuggestions.fadeLeft;
+		const auto padding = st::filterLinkSubsectionTitlePadding.top();
+		const auto w = raw->width();
+		const auto h = raw->height();
+		r.fill(p, QRect(w - r.width() - padding, 0, r.width(), h));
+		l.fill(p, QRect(padding, 0, l.width(), h));
+		p.fillRect(0, 0, padding, h, st::windowBg);
+		p.fillRect(w - padding, 0, padding, raw->height(), st::windowBg);
+	}
+	owned->reset();
+	return result;
+}
+
 [[nodiscard]] QImage GeneratePreview(
 		const QString &title,
 		not_null<const style::icon*> icon,
@@ -199,17 +244,18 @@ Widget::Widget(
 , _titleFont(st::boxTitle.style.font)
 , _titlePadding(st::filterLinkTitlePadding)
 , _folderTitle(descriptor.folderTitle)
-, _folderIcon(descriptor.folderIcon) {
+, _folderIcon(descriptor.folderIcon)
+, _horizontalFilters(descriptor.horizontalFilters) {
 	setMinimumHeight(st::boxTitleHeight);
 	refreshTitleText();
 	setTitlePosition(st::boxTitlePosition.x(), st::boxTitlePosition.y());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::start_with_next([this] {
 		_preview = QImage();
 	}, lifetime());
 
-	_badge.changes() | rpl::start_with_next([=] {
+	_badge.changes() | rpl::start_with_next([this] {
 		_preview = QImage();
 		update();
 	}, lifetime());
@@ -242,7 +288,9 @@ void Widget::resizeEvent(QResizeEvent *e) {
 	_about->resizeToWidth(availableWidth);
 
 	const auto minHeight = minimumHeight();
-	const auto maxHeight = st::filterLinkAboutTop
+	const auto maxHeight = (_horizontalFilters
+			? (st::filterLinkAboutTop * 0.8)
+			: st::filterLinkAboutTop)
 		+ _about->height()
 		+ st::filterLinkAboutBottom;
 	if (maxHeight <= minHeight) {
@@ -283,12 +331,22 @@ void Widget::resizeEvent(QResizeEvent *e) {
 QRectF Widget::previewRect(
 		float64 topProgress,
 		float64 sizeProgress) const {
-	const auto size = st::filterLinkPreview * sizeProgress;
-	return QRectF(
-		(width() - size) / 2.,
-		st::filterLinkPreviewTop * topProgress,
-		size,
-		size);
+	if (_horizontalFilters) {
+		const auto size = (_preview.size() / style::DevicePixelRatio())
+			* sizeProgress;
+		return QRectF(
+			(width() - size.width()) / 2.,
+			st::filterLinkPreviewTop * 1.5 * topProgress,
+			size.width(),
+			size.height());
+	} else {
+		const auto size = st::filterLinkPreview * sizeProgress;
+		return QRectF(
+			(width() - size) / 2.,
+			st::filterLinkPreviewTop * topProgress,
+			size,
+			size);
+	}
 };
 
 void Widget::paintEvent(QPaintEvent *e) {
@@ -298,10 +356,13 @@ void Widget::paintEvent(QPaintEvent *e) {
 	if (_progress.top) {
 		auto hq = PainterHighQualityEnabler(p);
 		if (_preview.isNull()) {
-			_preview = GeneratePreview(
-				_folderTitle,
-				_folderIcon,
-				_badge.current());
+			const auto badge = _badge.current();
+			if (_horizontalFilters) {
+				_preview = GeneratePreview(this, _folderTitle, badge);
+				Widget::resizeEvent(nullptr);
+			} else {
+				_preview = GeneratePreview(_folderTitle, _folderIcon, badge);
+			}
 		}
 		p.drawImage(_previewRect, _preview);
 	}
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.h b/Telegram/SourceFiles/ui/controls/filter_link_header.h
index 8769bf069..c55e20846 100644
--- a/Telegram/SourceFiles/ui/controls/filter_link_header.h
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.h
@@ -29,6 +29,7 @@ struct FilterLinkHeaderDescriptor {
 	base::required<QString> folderTitle;
 	not_null<const style::icon*> folderIcon;
 	rpl::producer<int> badge;
+	bool horizontalFilters = false;
 };
 
 struct FilterLinkHeader {
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
index c93b61453..2e43aa53d 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -411,4 +411,8 @@ int ChatsFiltersTabs::reordering() const {
 	return _reordering;
 }
 
+void ChatsFiltersTabs::stopAnimation() {
+	Ui::DiscreteSlider::stopAnimation();
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
index 3a027d278..652ee2759 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
@@ -43,6 +43,8 @@ public:
 	void setReordering(int value);
 	[[nodiscard]] int reordering() const;
 
+	void stopAnimation();
+
 protected:
 	struct ShiftedSection {
 		not_null<Ui::DiscreteSlider::Section*> section;

From 4a327ba584817bb65c56f19a7c26fda00b7f7d2f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Nov 2024 10:24:43 +0300
Subject: [PATCH 214/306] Fixed display of chats filters strip from forward box
 in search mode.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  | 25 ++++++++++++++++---
 Telegram/SourceFiles/boxes/peer_list_box.h    | 12 +++++++--
 .../SourceFiles/window/window_peer_menu.cpp   |  3 ++-
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 129eda165..a94b34cc0 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -206,7 +206,9 @@ void PeerListBox::keyPressEvent(QKeyEvent *e) {
 		content()->selectSkipPage(height(), 1);
 	} else if (e->key() == Qt::Key_PageUp) {
 		content()->selectSkipPage(height(), -1);
-	} else if (e->key() == Qt::Key_Escape && _select && !_select->entity()->getQuery().isEmpty()) {
+	} else if (e->key() == Qt::Key_Escape
+			&& _select
+			&& !_select->entity()->getQuery().isEmpty()) {
 		_select->entity()->clearQuery();
 	} else {
 		BoxContent::keyPressEvent(e);
@@ -215,7 +217,16 @@ void PeerListBox::keyPressEvent(QKeyEvent *e) {
 
 void PeerListBox::searchQueryChanged(const QString &query) {
 	scrollToY(0);
-	content()->searchQueryChanged(query);
+	const auto isEmpty = content()->searchQueryChanged(query);
+	if (_specialTabsMode.enabled) {
+		_specialTabsMode.searchIsActive = !isEmpty;
+		if (_specialTabsMode.searchIsActive) {
+			_specialTabsMode.topSkip = _addedTopScrollSkip;
+			setAddedTopScrollSkip(0);
+		} else {
+			setAddedTopScrollSkip(_specialTabsMode.topSkip);
+		}
+	}
 }
 
 void PeerListBox::resizeEvent(QResizeEvent *e) {
@@ -547,8 +558,13 @@ rpl::producer<int> PeerListBox::multiSelectHeightValue() const {
 	return _select ? _select->heightValue() : rpl::single(0);
 }
 
-void PeerListBox::setIgnoreHiddenRowsOnSearch(bool value) {
+void PeerListBox::setSpecialTabMode(bool value) {
 	content()->setIgnoreHiddenRowsOnSearch(value);
+	if (value) {
+		_specialTabsMode.enabled = true;
+	} else {
+		_specialTabsMode = {};
+	}
 }
 
 PeerListRow::PeerListRow(not_null<PeerData*> peer)
@@ -2060,7 +2076,7 @@ void PeerListContent::checkScrollForPreload() {
 	}
 }
 
-void PeerListContent::searchQueryChanged(QString query) {
+PeerListContent::IsEmpty PeerListContent::searchQueryChanged(QString query) {
 	const auto searchWordsList = TextUtilities::PrepareSearchWords(query);
 	const auto normalizedQuery = searchWordsList.join(' ');
 	if (_ignoreHiddenRowsOnSearch && !normalizedQuery.isEmpty()) {
@@ -2117,6 +2133,7 @@ void PeerListContent::searchQueryChanged(QString query) {
 		}
 		refreshRows();
 	}
+	return _normalizedSearchQuery.isEmpty();
 }
 
 std::unique_ptr<PeerListState> PeerListContent::saveState() const {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 31b8f348a..bd71470a7 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -652,7 +652,8 @@ public:
 	[[nodiscard]] bool hasPressed() const;
 	void clearSelection();
 
-	void searchQueryChanged(QString query);
+	using IsEmpty = bool;
+	IsEmpty searchQueryChanged(QString query);
 	bool submitted();
 
 	PeerListRowId updateFromParentDrag(QPoint globalPosition);
@@ -1107,7 +1108,7 @@ public:
 	[[nodiscard]] std::vector<not_null<PeerData*>> collectSelectedRows();
 	[[nodiscard]] rpl::producer<int> multiSelectHeightValue() const;
 
-	void setIgnoreHiddenRowsOnSearch(bool value);
+	void setSpecialTabMode(bool value);
 
 	void peerListSetTitle(rpl::producer<QString> title) override {
 		setTitle(std::move(title));
@@ -1174,4 +1175,11 @@ private:
 	bool _scrollBottomFixed = false;
 	int _addedTopScrollSkip = 0;
 
+	struct SpecialTabsMode final {
+		bool enabled = false;
+		bool searchIsActive = false;
+		int topSkip = 0;
+	};
+	SpecialTabsMode _specialTabsMode;
+
 };
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 78b3e2a2c..068708c4e 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2053,7 +2053,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		auto controller = std::make_unique<Controller>(session);
 		const auto controllerRaw = controller.get();
 		auto init = [=](not_null<PeerListBox*> box) {
-			box->setIgnoreHiddenRowsOnSearch(true);
+			box->setSpecialTabMode(true);
 			auto applyFilter = [=](FilterId id) {
 				box->scrollToY(0);
 				auto &filters = session->data().chatsFilters();
@@ -2114,6 +2114,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 				box,
 				session,
 				std::move(applyFilter));
+			chatsFilters->lower();
 			chatsFilters->heightValue() | rpl::start_with_next([box](int h) {
 				box->setAddedTopScrollSkip(h);
 			}, box->lifetime());

From a77777f50917aca5e4f1ab8fd6e969a06f350ddd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Nov 2024 10:50:12 +0300
Subject: [PATCH 215/306] Fixed display of chats filters strip from share box
 in search mode.

---
 Telegram/SourceFiles/boxes/share_box.cpp | 16 ++++++++++++++--
 Telegram/SourceFiles/boxes/share_box.h   |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 8551a4f7e..a2c1db10a 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -83,6 +83,7 @@ public:
 	void activateSkipColumn(int direction);
 	void activateSkipPage(int pageHeight, int direction);
 	void updateFilter(QString filter = QString());
+	[[nodiscard]] bool isFilterEmpty() const;
 	void selectActive();
 
 	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
@@ -288,6 +289,10 @@ void ShareBox::prepare() {
 
 	_select->setQueryChangedCallback([=](const QString &query) {
 		applyFilterUpdate(query);
+		if (_chatsFilters) {
+			updateScrollSkips();
+			scrollToY(0);
+		}
 	});
 	_select->setItemRemovedCallback([=](uint64 itemId) {
 		if (const auto peer = _descriptor.session->data().peerLoaded(PeerId(itemId))) {
@@ -352,20 +357,23 @@ void ShareBox::prepare() {
 				_inner->applyChatFilter(id);
 				scrollToY(0);
 			});
+		chatsFilters->lower();
 		chatsFilters->heightValue() | rpl::start_with_next([this](int h) {
-			_additionalTopScrollSkip = h;
 			updateScrollSkips();
 			scrollToY(0);
 		}, lifetime());
 		_select->heightValue() | rpl::start_with_next([=](int h) {
 			chatsFilters->moveToLeft(0, h);
 		}, chatsFilters->lifetime());
+		_chatsFilters = chatsFilters;
 	}
 }
 
 int ShareBox::getTopScrollSkip() const {
 	return (_select->isHidden() ? 0 : _select->height())
-		+ _additionalTopScrollSkip;
+		+ ((_chatsFilters && _inner && _inner->isFilterEmpty())
+			? _chatsFilters->height()
+			: 0);
 }
 
 int ShareBox::getBottomScrollSkip() const {
@@ -1357,6 +1365,10 @@ void ShareBox::Inner::updateFilter(QString filter) {
 	}
 }
 
+bool ShareBox::Inner::isFilterEmpty() const {
+	return _filter.isEmpty();
+}
+
 rpl::producer<Ui::ScrollToRequest> ShareBox::Inner::scrollToRequests() const {
 	return _scrollToRequests.events();
 }
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index 05847f500..ef6960af0 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -174,7 +174,7 @@ private:
 	bool _peopleFull = false;
 	mtpRequestId _peopleRequest = 0;
 
-	int _additionalTopScrollSkip = 0;
+	RpWidget *_chatsFilters = nullptr;
 
 	using PeopleCache = QMap<QString, MTPcontacts_Found>;
 	PeopleCache _peopleCache;

From f89167ef94262bf1e92b4a44bab56cc7ada466b7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Nov 2024 12:17:35 +0300
Subject: [PATCH 216/306] Fixed display of chats filters strip from dialogs
 widget in search mode.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 4746532e1..d6707dbe9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3139,6 +3139,9 @@ bool Widget::applySearchState(SearchState state) {
 	const auto tagsChanged = (_searchState.tags != state.tags);
 	const auto queryChanged = (_searchState.query != state.query);
 	const auto tabChanged = (_searchState.tab != state.tab);
+	const auto queryEmptyChanged = queryChanged
+		? (_searchState.query.isEmpty() != state.query.isEmpty())
+		: false;
 
 	if (forum) {
 		if (_openedForum == forum) {
@@ -3174,6 +3177,10 @@ bool Widget::applySearchState(SearchState state) {
 		? peer->owner().history(migrateFrom).get()
 		: nullptr;
 	_searchState = state;
+	if (_chatFilters && queryEmptyChanged) {
+		_chatFilters->setVisible(_searchState.query.isEmpty());
+		updateControlsGeometry();
+	}
 	_searchWithPostsPreview = computeSearchWithPostsPreview();
 	if (queryChanged) {
 		updateLockUnlockVisibility(anim::type::normal);
@@ -3591,7 +3598,7 @@ void Widget::updateControlsGeometry() {
 			_chatFilters->move(0, chatFiltersTop);
 		}
 		const auto scrollTop = chatFiltersTop
-			+ (_chatFilters
+			+ ((_chatFilters && _searchState.query.isEmpty())
 				? (_chatFilters->height() * (1. - narrowRatio))
 				: 0);
 		const auto scrollHeight = height() - scrollTop - bottomSkip;

From 7a535a4554b2d597b8db07dc9638c88e1d7e4801 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 9 Nov 2024 14:56:34 +0300
Subject: [PATCH 217/306] Fixed display of sponsored messages with long
 descriptions and media.

---
 .../history/view/media/history_view_web_page.cpp       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 46241702b..432b4bfab 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -663,8 +663,8 @@ QSize WebPage::countCurrentSize(int newWidth) {
 	const auto stickerSet = stickerSetData();
 	const auto factcheck = factcheckData();
 	const auto sponsored = sponsoredData();
-	const auto specialRightPix = ((sponsored && !sponsored->hasMedia)
-		|| stickerSet);
+	const auto specialRightPix = (stickerSet
+		|| (sponsored && !sponsored->hasMedia && _data->photo));
 	const auto lineHeight = UnitedLineHeight();
 	const auto factcheckMetrics = factcheck
 		? computeFactcheckMetrics(_description.countHeight(innerWidth))
@@ -678,7 +678,7 @@ QSize WebPage::countCurrentSize(int newWidth) {
 	}
 	const auto linesMax = factcheck
 		? (factcheckMetrics.lines + 1)
-		: (specialRightPix || isLogEntryOriginal())
+		: (sponsored || isLogEntryOriginal())
 		? kMaxOriginalEntryLines
 		: 5;
 	const auto siteNameHeight = _siteNameLines ? lineHeight : 0;
@@ -711,7 +711,9 @@ QSize WebPage::countCurrentSize(int newWidth) {
 				newHeight += _titleLines * lineHeight;
 			}
 
-			const auto descriptionHeight = _description.countHeight(wleft);
+			const auto descriptionHeight = _description.countHeight(sponsored
+				? innerWidth
+				: wleft);
 			const auto restLines = (linesMax - _siteNameLines - _titleLines);
 			if (descriptionHeight < restLines * descriptionLineHeight) {
 				// We have height for all the lines.

From 059a4cf0d8e06d846cc3f87ceffa36c261e64b86 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 9 Nov 2024 15:04:36 +0300
Subject: [PATCH 218/306] Fixed ripple animation for sponsored messages.

Regression was introduced in 3f6d184435.
---
 .../SourceFiles/history/view/media/history_view_web_page.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 432b4bfab..4f54fc7d3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -1512,7 +1512,7 @@ void WebPage::clickHandlerPressedChanged(
 		}
 		return;
 	}
-	if (p == _openl) {
+	if ((p == _openl) || (sponsoredData() && sponsoredData()->link == p)) {
 		if (pressed) {
 			if (!_ripple) {
 				const auto full = Rect(currentSize());

From ccb41f778e04fe148e3868a014949e8e1d901f7f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 9 Nov 2024 15:18:29 +0300
Subject: [PATCH 219/306] Removed selection marks from unselectable messages.

---
 .../history/admin_log/history_admin_log_inner.cpp           | 3 ++-
 .../SourceFiles/history/admin_log/history_admin_log_inner.h | 3 ++-
 Telegram/SourceFiles/history/history_inner_widget.cpp       | 6 +++++-
 Telegram/SourceFiles/history/view/history_view_element.cpp  | 3 ++-
 Telegram/SourceFiles/history/view/history_view_element.h    | 5 +++--
 .../SourceFiles/history/view/history_view_list_widget.cpp   | 6 +++++-
 .../SourceFiles/history/view/history_view_list_widget.h     | 2 +-
 Telegram/SourceFiles/history/view/history_view_message.cpp  | 6 +++---
 .../history/view/history_view_replies_section.cpp           | 2 +-
 9 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index b37da32c1..a7ea96d4c 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -666,7 +666,8 @@ bool InnerWidget::elementUnderCursor(
 	return (Element::Hovered() == view);
 }
 
-HistoryView::SelectionModeResult InnerWidget::elementInSelectionMode() {
+HistoryView::SelectionModeResult InnerWidget::elementInSelectionMode(
+		const HistoryView::Element *) {
 	return {};
 }
 
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
index bdf9c0491..209cc0384 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
@@ -94,7 +94,8 @@ public:
 	HistoryView::Context elementContext() override;
 	bool elementUnderCursor(
 		not_null<const HistoryView::Element*> view) override;
-	HistoryView::SelectionModeResult elementInSelectionMode() override;
+	HistoryView::SelectionModeResult elementInSelectionMode(
+		const HistoryView::Element *view) override;
 	bool elementIntersectsRange(
 		not_null<const HistoryView::Element*> view,
 		int from,
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 9ccd9feb2..41e33a6b0 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -155,7 +155,11 @@ public:
 			not_null<const Element*> view) override {
 		return (Element::Moused() == view);
 	}
-	HistoryView::SelectionModeResult elementInSelectionMode() override {
+	HistoryView::SelectionModeResult elementInSelectionMode(
+			const Element *view) override {
+		if (view && view->data()->isSponsored()) {
+			return HistoryView::SelectionModeResult();
+		}
 		return _widget
 			? _widget->inSelectionMode()
 			: HistoryView::SelectionModeResult();
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 95d5e7a29..3b6dde0c8 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -111,7 +111,8 @@ bool DefaultElementDelegate::elementUnderCursor(
 	return false;
 }
 
-SelectionModeResult DefaultElementDelegate::elementInSelectionMode() {
+SelectionModeResult DefaultElementDelegate::elementInSelectionMode(
+		const Element *view) {
 	return {};
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index be41e07dc..e8a5a1c53 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -80,7 +80,8 @@ class ElementDelegate {
 public:
 	virtual Context elementContext() = 0;
 	virtual bool elementUnderCursor(not_null<const Element*> view) = 0;
-	virtual SelectionModeResult elementInSelectionMode() = 0;
+	virtual SelectionModeResult elementInSelectionMode(
+		const Element *view) = 0;
 	virtual bool elementIntersectsRange(
 		not_null<const Element*> view,
 		int from,
@@ -136,7 +137,7 @@ public:
 class DefaultElementDelegate : public ElementDelegate {
 public:
 	bool elementUnderCursor(not_null<const Element*> view) override;
-	SelectionModeResult elementInSelectionMode() override;
+	SelectionModeResult elementInSelectionMode(const Element *view) override;
 	bool elementIntersectsRange(
 		not_null<const Element*> view,
 		int from,
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index ca1e16327..68a28f1f8 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1782,7 +1782,11 @@ bool ListWidget::elementUnderCursor(
 	return (_overElement == view);
 }
 
-SelectionModeResult ListWidget::elementInSelectionMode() {
+SelectionModeResult ListWidget::elementInSelectionMode(
+		const HistoryView::Element *view) {
+	if (view && !_delegate->listIsItemGoodForSelection(view->data())) {
+		return {};
+	}
 	return inSelectionMode();
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 8fa1b1f52..056d6ce95 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -391,7 +391,7 @@ public:
 	// ElementDelegate interface.
 	Context elementContext() override;
 	bool elementUnderCursor(not_null<const Element*> view) override;
-	SelectionModeResult elementInSelectionMode() override;
+	SelectionModeResult elementInSelectionMode(const Element *view) override;
 	bool elementIntersectsRange(
 		not_null<const Element*> view,
 		int from,
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 3a84ee927..0dae7fbf0 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1100,7 +1100,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 	if (hasGesture) {
 		p.translate(context.gestureHorizontal.translation, 0);
 	}
-	const auto selectionModeResult = delegate()->elementInSelectionMode();
+	const auto selectionModeResult = delegate()->elementInSelectionMode(this);
 	const auto selectionTranslation = (selectionModeResult.progress > 0)
 		? (selectionModeResult.progress
 			* AdditionalSpaceForSelectionCheckbox(this, g))
@@ -3868,7 +3868,7 @@ bool Message::displayFastReply() const {
 	return hasFastReply()
 		&& data()->isRegular()
 		&& canSendAnything()
-		&& !delegate()->elementInSelectionMode().inSelectionMode;
+		&& !delegate()->elementInSelectionMode(this).inSelectionMode;
 }
 
 bool Message::displayRightActionComments() const {
@@ -4032,7 +4032,7 @@ void Message::drawRightAction(
 
 ClickHandlerPtr Message::rightActionLink(
 		std::optional<QPoint> pressPoint) const {
-	if (delegate()->elementInSelectionMode().progress > 0) {
+	if (delegate()->elementInSelectionMode(this).progress > 0) {
 		return nullptr;
 	}
 	ensureRightAction();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 107e4bf7f..081d01f44 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -898,7 +898,7 @@ void RepliesWidget::setupSwipeReply() {
 		}
 	}, [=, show = controller()->uiShow()](int cursorTop) {
 		auto result = HistoryView::SwipeHandlerFinishData();
-		if (_inner->elementInSelectionMode().inSelectionMode) {
+		if (_inner->elementInSelectionMode(nullptr).inSelectionMode) {
 			return result;
 		}
 		const auto view = _inner->lookupItemByY(cursorTop);

From 5abecec478452169778bc5737ca3d7f5ddea5588 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 10 Nov 2024 23:49:26 +0300
Subject: [PATCH 220/306] Fixed display of sponsored messages at bottom for
 bots.

---
 Telegram/SourceFiles/data/components/sponsored_messages.cpp | 3 +++
 Telegram/SourceFiles/history/history_widget.cpp             | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index d2746ad9a..61e36d1c5 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -74,6 +74,9 @@ void SponsoredMessages::clearOldRequests() {
 
 SponsoredMessages::AppendResult SponsoredMessages::append(
 		not_null<History*> history) {
+	if (isTopBarFor(history)) {
+		return SponsoredMessages::AppendResult::None;
+	}
 	const auto it = _data.find(history);
 	if (it == end(_data)) {
 		return SponsoredMessages::AppendResult::None;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 53d3db9fd..01b2c9189 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2582,6 +2582,8 @@ void HistoryWidget::showHistory(
 					}
 				}));
 			checkState();
+		} else {
+			requestSponsoredMessageBar();
 		}
 	} else {
 		_chooseForReport = nullptr;
@@ -4531,7 +4533,6 @@ void HistoryWidget::showFinished() {
 	_showAnimation = nullptr;
 	doneShow();
 	synteticScrollToY(_scroll->scrollTop());
-	requestSponsoredMessageBar();
 }
 
 void HistoryWidget::doneShow() {

From e56bbf557d407a4d4643d53f8b3b4689a5eecfe2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 11 Nov 2024 10:06:34 +0300
Subject: [PATCH 221/306] Added ability to open filters list in context menu
 from share boxes.

---
 .../ui/widgets/chat_filters_tabs_strip.cpp    | 53 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 07e6ea40d..56be5ee5d 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "styles/style_dialogs.h" // dialogsSearchTabs
+#include "styles/style_media_player.h" // mediaPlayerMenuCheck
 #include "styles/style_menu_icons.h"
 
 #include <QScrollBar>
@@ -125,6 +126,47 @@ void ShowMenu(
 	state->menu->popup(QCursor::pos());
 }
 
+void ShowFiltersListMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Main::Session*> session,
+		not_null<State*> state,
+		int active,
+		Fn<void(int)> changeActive) {
+	const auto &list = session->data().chatsFilters().list();
+
+	state->menu = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+
+	const auto reorderAll = session->user()->isPremium();
+	const auto maxLimit = (reorderAll ? 1 : 0)
+		+ Data::PremiumLimits(session).dialogFiltersCurrent();
+	const auto premiumFrom = (reorderAll ? 0 : 1) + maxLimit;
+
+	for (auto i = 0; i < list.size(); ++i) {
+		const auto &filter = list[i];
+		auto text = filter.title().isEmpty()
+			? tr::lng_filters_all(tr::now)
+			: filter.title();
+
+		const auto action = state->menu->addAction(std::move(text), [=] {
+			if (i != active) {
+				changeActive(i);
+			}
+		}, (i == active) ? &st::mediaPlayerMenuCheck : nullptr);
+		action->setEnabled(i < premiumFrom);
+	}
+	session->data().chatsFilters().changed() | rpl::start_with_next([=] {
+		state->menu->hideMenu();
+	}, state->menu->lifetime());
+
+	if (state->menu->empty()) {
+		state->menu = nullptr;
+		return;
+	}
+	state->menu->popup(QCursor::pos());
+}
+
 } // namespace
 
 not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
@@ -342,7 +384,16 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			applyFilter(filter);
 		}, wrap->lifetime());
 		slider->contextMenuRequested() | rpl::start_with_next([=](int index) {
-			ShowMenu(wrap, controller, state, index);
+			if (trackActiveFilterAndUnreadAndReorder) {
+				ShowMenu(wrap, controller, state, index);
+			} else {
+				ShowFiltersListMenu(
+					wrap,
+					session,
+					state,
+					slider->activeSection(),
+					[=](int i) { slider->setActiveSection(i); });
+			}
 		}, slider->lifetime());
 		wrap->toggle((list.size() > 1), anim::type::instant);
 

From d37c040b36a81003f7da98470f2ba94a28d05046 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 11 Nov 2024 19:32:21 +0300
Subject: [PATCH 222/306] Improved style of button for earn out when it is
 disabled.

---
 .../settings/settings_credits_graphics.cpp    | 85 +++++++++++--------
 1 file changed, 48 insertions(+), 37 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 6f50c871f..849a08120 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1855,44 +1855,48 @@ void AddWithdrawalWidget(
 	}, label->lifetime());
 
 	const auto lockedColor = anim::with_alpha(stButton.textFg->c, .5);
-	const auto lockedLabelTop = Ui::CreateChild<Ui::FlatLabel>(
-		button,
-		tr::lng_bot_earn_balance_button_locked(),
-		st::botEarnLockedButtonLabel);
-	lockedLabelTop->setTextColorOverride(lockedColor);
-	lockedLabelTop->setAttribute(Qt::WA_TransparentForMouseEvents);
-	const auto lockedLabelBottom = Ui::CreateChild<Ui::FlatLabel>(
-		button,
-		QString(),
-		st::botEarnLockedButtonLabel);
-	lockedLabelBottom->setTextColorOverride(lockedColor);
-	lockedLabelBottom->setAttribute(Qt::WA_TransparentForMouseEvents);
+	const auto lockedLabel = Ui::CreateChild<Ui::RpWidget>(button);
+	lockedLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+	struct LockedState final {
+		Ui::Text::String text;
+		bool locked = false;
+		bool dateIsNull = false;
+		rpl::lifetime dateUpdateLifetime;
+	};
+	const auto state = lockedLabel->lifetime().make_state<LockedState>();
 	rpl::combine(
 		rpl::duplicate(lockedValue),
-		button->sizeValue(),
-		lockedLabelTop->sizeValue(),
-		lockedLabelBottom->sizeValue()
-	) | rpl::start_with_next([=](
-			bool locked,
-			const QSize &b,
-			const QSize &top,
-			const QSize &bottom) {
-		const auto factor = locked ? 1 : -10;
-		const auto sumHeight = top.height() + bottom.height();
-		lockedLabelTop->moveToLeft(
-			(b.width() - top.width()) / 2,
-			factor * (b.height() - sumHeight) / 2);
-		lockedLabelBottom->moveToLeft(
-			(b.width() - bottom.width()) / 2,
-			factor * ((b.height() - sumHeight) / 2 + top.height()));
-	}, lockedLabelTop->lifetime());
+		button->sizeValue()
+	) | rpl::start_with_next([=](bool locked, const QSize &s) {
+		state->locked = locked;
+		lockedLabel->resize(s);
+	}, lockedLabel->lifetime());
+	lockedLabel->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(lockedLabel);
+		p.setPen(state->locked ? QPen(lockedColor) : stButton.textFg->p);
+		if (state->dateIsNull) {
+			p.setFont(st::channelEarnSemiboldLabel.style.font);
+			p.drawText(
+				lockedLabel->rect(),
+				style::al_center,
+				tr::lng_bot_earn_balance_button_locked(tr::now));
+			return;
+		}
+		state->text.draw(p, {
+			.position = QPoint(
+				0,
+				(lockedLabel->height() - state->text.minHeight()) / 2),
+			.outerWidth = lockedLabel->width(),
+			.availableWidth = lockedLabel->width(),
+			.align = style::al_center,
+		});
+	}, lockedLabel->lifetime());
 
-	const auto dateUpdateLifetime
-		= lockedLabelBottom->lifetime().make_state<rpl::lifetime>();
 	std::move(
 		dateValue
 	) | rpl::start_with_next([=](const QDateTime &dt) {
-		dateUpdateLifetime->destroy();
+		state->dateUpdateLifetime.destroy();
+		state->dateIsNull = dt.isNull();
 		if (dt.isNull()) {
 			return;
 		}
@@ -1901,7 +1905,7 @@ void AddWithdrawalWidget(
 
 		const auto context = Core::MarkedTextContext{
 			.session = session,
-			.customEmojiRepaint = [=] { lockedLabelBottom->update(); },
+			.customEmojiRepaint = [=] { lockedLabel->update(); },
 		};
 		const auto emoji = Ui::Text::SingleCustomEmoji(
 			session->data().customEmojiManager().registerInternalEmoji(
@@ -1929,11 +1933,18 @@ void AddWithdrawalWidget(
 				: (u"%1:%2"_q)
 					.arg(minutes, 2, 10, kZero)
 					.arg(seconds, 2, 10, kZero);
-			lockedLabelBottom->setMarkedText(
-				base::duplicate(emoji).append(formatted),
+			state->text.setMarkedText(
+				st::botEarnLockedButtonLabel.style,
+				TextWithEntities()
+					.append(tr::lng_bot_earn_balance_button_locked(tr::now))
+					.append('\n')
+					.append(emoji)
+					.append(formatted),
+				kMarkupTextOptions,
 				context);
-		}, *dateUpdateLifetime);
-	}, lockedLabelBottom->lifetime());
+			lockedLabel->update();
+		}, state->dateUpdateLifetime);
+	}, lockedLabel->lifetime());
 
 	Api::HandleWithdrawalButton(
 		Api::RewardReceiver{

From 78a0fa55b56233ca7bd70140d3aec583b66f890c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Nov 2024 22:56:40 +0400
Subject: [PATCH 223/306] Send correct round video upload actions.

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

diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index eef376b74..765bcb72e 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -229,6 +229,8 @@ void Uploader::processDocumentProgress(FullMsgId itemId) {
 		const auto document = media ? media->document() : nullptr;
 		const auto sendAction = (document && document->isVoiceMessage())
 			? Api::SendProgressType::UploadVoice
+			: (document && document->isVideoMessage())
+			? Api::SendProgressType::UploadRound
 			: Api::SendProgressType::UploadFile;
 		const auto progress = (document && document->uploading())
 			? ((document->uploadingData->offset * 100)
@@ -250,6 +252,8 @@ void Uploader::processDocumentFailed(FullMsgId itemId) {
 		const auto document = media ? media->document() : nullptr;
 		const auto sendAction = (document && document->isVoiceMessage())
 			? Api::SendProgressType::UploadVoice
+			: (document && document->isVideoMessage())
+			? Api::SendProgressType::UploadRound
 			: Api::SendProgressType::UploadFile;
 		sendProgressUpdate(item, sendAction, -1);
 	}

From 1ed34c6fa02fe8016bffe8e5bb80b19e487a3b88 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 13 Nov 2024 00:19:58 +0400
Subject: [PATCH 224/306] Beta version 5.7.3.

- Option to show folders above the chats list.
- Folders on top of recipients list box.
---
 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 a96cc4ed2..f93f27343 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.7.2.0" />
+    Version="5.7.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 e367ff9ba..98d4c6c31 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,7,2,0
- PRODUCTVERSION 5,7,2,0
+ FILEVERSION 5,7,3,0
+ PRODUCTVERSION 5,7,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.7.2.0"
+            VALUE "FileVersion", "5.7.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.2.0"
+            VALUE "ProductVersion", "5.7.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 9f4f4b45a..c7e32043a 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,7,2,0
- PRODUCTVERSION 5,7,2,0
+ FILEVERSION 5,7,3,0
+ PRODUCTVERSION 5,7,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.7.2.0"
+            VALUE "FileVersion", "5.7.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.2.0"
+            VALUE "ProductVersion", "5.7.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 5bf0f80d4..e6e74c46b 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 = 5007002;
-constexpr auto AppVersionStr = "5.7.2";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 5007003;
+constexpr auto AppVersionStr = "5.7.3";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index e586f2905..d480f65bc 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5007002
+AppVersion         5007003
 AppVersionStrMajor 5.7
-AppVersionStrSmall 5.7.2
-AppVersionStr      5.7.2
-BetaChannel        0
+AppVersionStrSmall 5.7.3
+AppVersionStr      5.7.3
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 5.7.2
+AppVersionOriginal 5.7.3.beta
diff --git a/changelog.txt b/changelog.txt
index 5bc1594c2..b6c45eb56 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+5.7.3 beta (13.11.24)
+
+- Option to show folders above the chats list.
+- Folders on top of recipients list box.
+
 5.7.2 (05.11.24)
 
 - Fix recompressed video playback cutoff.

From 7e2e510d8a8ecda34d2a5717467bdc7ac04acdb4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 13 Nov 2024 00:51:35 +0400
Subject: [PATCH 225/306] Beta version 5.7.3: Fix build with Xcode.

---
 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
index 2e43aa53d..0bf4704b3 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -64,7 +64,7 @@ void ChatsFiltersTabs::fitWidthToSections() {
 	{
 		_sections.clear();
 		enumerateSections([&](Section &section) {
-			_sections.emplace_back(not_null{ &section }, 0, false);
+			_sections.push_back({ not_null{ &section }, 0, false });
 			return true;
 		});
 	}
@@ -387,7 +387,7 @@ void ChatsFiltersTabs::reorderSections(int oldIndex, int newIndex) {
 		_sections.clear();
 		auto left = 0;
 		enumerateSections([&](Section &section) {
-			_sections.emplace_back(not_null{ &section }, 0, false);
+			_sections.push_back({ not_null{ &section }, 0, false });
 			section.left = left;
 			left += section.width;
 			return true;

From 074bb1e66eba275fdf497fd9b72c769d052ac18b Mon Sep 17 00:00:00 2001
From: ziplantil <86836197+ziplantil@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:35:57 +0200
Subject: [PATCH 226/306] Fix bug in ChatBotCommands::update when commands
 empty (#28631)

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

diff --git a/Telegram/SourceFiles/data/data_peer_bot_commands.cpp b/Telegram/SourceFiles/data/data_peer_bot_commands.cpp
index 8adc31a9e..2487dc768 100644
--- a/Telegram/SourceFiles/data/data_peer_bot_commands.cpp
+++ b/Telegram/SourceFiles/data/data_peer_bot_commands.cpp
@@ -17,11 +17,16 @@ ChatBotCommands::Changed ChatBotCommands::update(
 		clear();
 	} else {
 		for (const auto &commands : list) {
-			auto &value = operator[](commands.userId);
-			changed |= commands.commands.empty()
-				? remove(commands.userId)
-				: !ranges::equal(value, commands.commands);
-			value = commands.commands;
+			if (commands.commands.empty()) {
+				changed |= remove(commands.userId);
+			} else {
+				auto &value = operator[](commands.userId);
+				const auto isEqual = ranges::equal(value, commands.commands);
+				changed |= !isEqual;
+				if (!isEqual) {
+					value = commands.commands;
+				}
+			}
 		}
 	}
 	return changed;

From 49223a46881a9579c8f1741868933db861ac9db1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 13 Nov 2024 10:34:31 +0300
Subject: [PATCH 227/306] Fixed possible crash for bot owners in earn section
 for bots.

---
 .../channel_statistics/earn/info_channel_earn_list.cpp    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 88da162ea..c2a059c90 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -833,7 +833,7 @@ void InnerWidget::fill() {
 		Ui::AddSkip(container);
 	}
 #ifndef _DEBUG
-	if (!channel->amCreator()) {
+	if (channel && !channel->amCreator()) {
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 		return;
@@ -1346,8 +1346,8 @@ void InnerWidget::fill() {
 			handleSlice(firstSlice);
 			if (!firstSlice.allLoaded) {
 				struct ShowMoreState final {
-					ShowMoreState(not_null<ChannelData*> channel)
-					: api(channel) {
+					ShowMoreState(not_null<PeerData*> peer)
+					: api(peer) {
 					}
 					Api::EarnStatistics api;
 					bool loading = false;
@@ -1355,7 +1355,7 @@ void InnerWidget::fill() {
 					rpl::variable<int> showed = 0;
 				};
 				const auto state
-					= lifetime().make_state<ShowMoreState>(channel);
+					= lifetime().make_state<ShowMoreState>(_peer);
 				state->token = firstSlice.token;
 				state->showed = firstSlice.list.size();
 				const auto max = firstSlice.total;

From cf270bd9ce1767ac0a77074055f335ea500b2198 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 13 Nov 2024 10:54:12 +0300
Subject: [PATCH 228/306] Removed chats filters strip from forum layout.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index d6707dbe9..72a00a410 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1301,6 +1301,9 @@ void Widget::updateHasFocus(not_null<QWidget*> focused) {
 }
 
 void Widget::toggleFiltersMenu(bool enabled) {
+	if (_layout == Layout::Child) {
+		enabled = false;
+	}
 	if (!enabled == !_chatFilters) {
 		return;
 	} else if (enabled) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index b163cef85..6f2bab88e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -296,7 +296,7 @@ private:
 	bool _dragForward = false;
 	base::Timer _chooseByDragTimer;
 
-	Layout _layout = Layout::Main;
+	const Layout _layout = Layout::Main;
 	int _narrowWidth = 0;
 	object_ptr<Ui::RpWidget> _searchControls;
 	object_ptr<HistoryView::TopBarWidget> _subsectionTopBar = { nullptr };

From f0f2a71a87aab9f36e13ae7a548a60f906b056ca Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 13 Nov 2024 11:03:10 +0300
Subject: [PATCH 229/306] Fixed disappearing of chats filters strip in forward
 box after search.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index a94b34cc0..5a440ced5 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -219,12 +219,15 @@ void PeerListBox::searchQueryChanged(const QString &query) {
 	scrollToY(0);
 	const auto isEmpty = content()->searchQueryChanged(query);
 	if (_specialTabsMode.enabled) {
+		const auto was = _specialTabsMode.searchIsActive;
 		_specialTabsMode.searchIsActive = !isEmpty;
-		if (_specialTabsMode.searchIsActive) {
-			_specialTabsMode.topSkip = _addedTopScrollSkip;
-			setAddedTopScrollSkip(0);
-		} else {
-			setAddedTopScrollSkip(_specialTabsMode.topSkip);
+		if (was != _specialTabsMode.searchIsActive) {
+			if (_specialTabsMode.searchIsActive) {
+				_specialTabsMode.topSkip = _addedTopScrollSkip;
+				setAddedTopScrollSkip(0);
+			} else {
+				setAddedTopScrollSkip(_specialTabsMode.topSkip);
+			}
 		}
 	}
 }

From edf6c42e9dcb5f58d434a1c6952c19b6af705ac9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 13 Nov 2024 18:49:04 +0300
Subject: [PATCH 230/306] Added short variant of unfiltered chats list to chats
 filters strip.

---
 Telegram/Resources/langs/lang.strings                       | 1 +
 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 05c538b15..6b143da2c 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5045,6 +5045,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_outdated_now" = "So Telegram Desktop can update to newer versions.";
 
 "lng_filters_all" = "All chats";
+"lng_filters_all_short" = "All";
 "lng_filters_setup" = "Edit";
 "lng_filters_title" = "Folders";
 "lng_filters_subtitle" = "My folders";
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 56be5ee5d..b3a65f915 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -146,7 +146,7 @@ void ShowFiltersListMenu(
 	for (auto i = 0; i < list.size(); ++i) {
 		const auto &filter = list[i];
 		auto text = filter.title().isEmpty()
-			? tr::lng_filters_all(tr::now)
+			? tr::lng_filters_all_short(tr::now)
 			: filter.title();
 
 		const auto action = state->menu->addAction(std::move(text), [=] {
@@ -291,7 +291,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			list
 		) | ranges::views::transform([](const Data::ChatFilter &filter) {
 			return filter.title().isEmpty()
-				? tr::lng_filters_all(tr::now)
+				? tr::lng_filters_all_short(tr::now)
 				: filter.title();
 		}) | ranges::to_vector;
 		slider->setSections(std::move(sections));

From 9c1701c62a972d66814cbf8a48a05b4031f72b81 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 13 Nov 2024 18:58:04 +0300
Subject: [PATCH 231/306] Added support of muted chats filters to chats filters
 strip.

---
 .../ui/widgets/chat_filters_tabs_slider.cpp      | 16 +++++++++++-----
 .../ui/widgets/chat_filters_tabs_slider.h        |  4 ++--
 .../ui/widgets/chat_filters_tabs_strip.cpp       |  3 ++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
index 0bf4704b3..2e51210ee 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -70,19 +70,19 @@ void ChatsFiltersTabs::fitWidthToSections() {
 	}
 }
 
-void ChatsFiltersTabs::setUnreadCount(int index, int unreadCount) {
+void ChatsFiltersTabs::setUnreadCount(int index, int unreadCount, bool mute) {
 	const auto it = _unreadCounts.find(index);
 	if (it == _unreadCounts.end()) {
 		if (unreadCount) {
 			_unreadCounts.emplace(index, Unread{
-				.cache = cacheUnreadCount(unreadCount),
+				.cache = cacheUnreadCount(unreadCount, mute),
 				.count = unreadCount,
 			});
 		}
 	} else {
 		if (unreadCount) {
 			it->second.count = unreadCount;
-			it->second.cache = cacheUnreadCount(unreadCount);
+			it->second.cache = cacheUnreadCount(unreadCount, mute);
 		} else {
 			_unreadCounts.erase(it);
 		}
@@ -132,7 +132,7 @@ void ChatsFiltersTabs::setLockedFrom(int index) {
 	});
 }
 
-QImage ChatsFiltersTabs::cacheUnreadCount(int count) const {
+QImage ChatsFiltersTabs::cacheUnreadCount(int count, bool muted) const {
 	const auto widthIndex = (count < 10) ? 0 : (count < 100) ? 1 : 2;
 	auto image = QImage(
 		QSize(_cachedBadgeWidths[widthIndex], _cachedBadgeHeight)
@@ -145,7 +145,13 @@ QImage ChatsFiltersTabs::cacheUnreadCount(int count) const {
 		: QString::number(count);
 	{
 		auto p = QPainter(&image);
-		Ui::PaintUnreadBadge(p, string, 0, 0, _unreadSt, 0);
+		if (muted) {
+			auto copy = _unreadSt;
+			copy.muted = muted;
+			Ui::PaintUnreadBadge(p, string, 0, 0, copy, 0);
+		} else {
+			Ui::PaintUnreadBadge(p, string, 0, 0, _unreadSt, 0);
+		}
 	}
 	return image;
 }
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
index 652ee2759..c66818fbd 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
@@ -29,7 +29,7 @@ public:
 
 	[[nodiscard]] int centerOfSection(int section) const;
 	void fitWidthToSections();
-	void setUnreadCount(int index, int unreadCount);
+	void setUnreadCount(int index, int unreadCount, bool muted);
 	void setLockedFrom(int index);
 
 	[[nodiscard]] rpl::producer<int> contextMenuRequested() const;
@@ -62,7 +62,7 @@ protected:
 	std::vector<ShiftedSection> _sections;
 
 private:
-	[[nodiscard]] QImage cacheUnreadCount(int count) const;
+	[[nodiscard]] QImage cacheUnreadCount(int count, bool muted) const;
 	[[nodiscard]] int calculateLockedFromX() const;
 
 	using Index = int;
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index b3a65f915..5c80f72ca 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -330,7 +330,8 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 					const auto muted = (state.chatsMuted + state.marksMuted);
 					const auto count = (state.chats + state.marks)
 						- (includeMuted ? 0 : muted);
-					slider->setUnreadCount(i, count);
+					const auto isMuted = includeMuted && (count == muted);
+					slider->setUnreadCount(i, count, isMuted);
 					slider->fitWidthToSections();
 				}, state->unreadLifetime);
 			}

From ad9ebdf8e6e4e8a3e711bc590a1b9949b91291bb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 13 Nov 2024 19:29:32 +0300
Subject: [PATCH 232/306] Fixed propagation scroll from chats filters strip to
 chats list.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 72a00a410..ab1f88108 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1307,7 +1307,21 @@ void Widget::toggleFiltersMenu(bool enabled) {
 	if (!enabled == !_chatFilters) {
 		return;
 	} else if (enabled) {
-		_chatFilters = base::make_unique_q<Ui::RpWidget>(this);
+		class NoScrollPropagationWidget final : public Ui::RpWidget {
+		public:
+			using Ui::RpWidget::RpWidget;
+
+		protected:
+			void touchEvent(QTouchEvent *e) {
+				e->accept();
+			}
+			void wheelEvent(QWheelEvent *e) override final {
+				e->accept();
+			}
+
+		};
+
+		_chatFilters = base::make_unique_q<NoScrollPropagationWidget>(this);
 		const auto raw = _chatFilters.get();
 		const auto inner = Ui::AddChatFiltersTabsStrip(
 			_chatFilters.get(),

From c03c19d26fba21c4b57bec1eb150b4447224006b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 13 Nov 2024 21:30:46 +0300
Subject: [PATCH 233/306] Slightly improved style of chats lists strip in
 boxes.

---
 Telegram/SourceFiles/dialogs/dialogs.style                  | 4 ++++
 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 8dea08276..8eb562d52 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -692,6 +692,10 @@ dialogsSearchTabs: SettingsSlider(defaultSettingsSlider) {
 }
 dialogsSearchTabsPadding: 8px;
 
+chatsFiltersTabs: SettingsSlider(dialogsSearchTabs) {
+	rippleBottomSkip: 0px;
+}
+
 dialogsStoriesList: DialogsStoriesList {
 	small: dialogsStories;
 	full: dialogsStoriesFull;
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 5c80f72ca..aecd13dbc 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -190,7 +190,11 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	const auto slider = scroll->setOwnedWidget(
 		object_ptr<Ui::PaddingWrap<Ui::ChatsFiltersTabs>>(
 			parent,
-			object_ptr<Ui::ChatsFiltersTabs>(parent, st::dialogsSearchTabs),
+			object_ptr<Ui::ChatsFiltersTabs>(
+				parent,
+				trackActiveFilterAndUnreadAndReorder
+					? st::dialogsSearchTabs
+					: st::chatsFiltersTabs),
 			QMargins(sliderPadding, 0, sliderPadding, 0)))->entity();
 	const auto state = wrap->lifetime().make_state<State>();
 	if (trackActiveFilterAndUnreadAndReorder) {

From 9e83562bf47207d2cd6f80f6d56dec781d335324 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 13 Nov 2024 21:59:49 +0300
Subject: [PATCH 234/306] Fixed display of pinned chats from main list in
 forward box.

---
 .../SourceFiles/window/window_peer_menu.cpp   | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 068708c4e..b610c07a6 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2061,18 +2061,32 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 				if (list.size() <= 1) {
 					return;
 				}
-				const auto pinned = filters.chatsList(id)->pinned()->order();
+				const auto pinned = [&] {
+					const auto &list = id
+						? filters.chatsList(id)
+						: session->data().chatsList(nullptr);
+					const auto pinned = list->pinned()->order();
+					auto peers = std::vector<not_null<PeerData*>>();
+					peers.reserve(pinned.size());
+					auto foundSelf = !!id;
+					for (const auto &pin : pinned) {
+						if (!foundSelf && pin.peer()->isSelf()) {
+							peers.insert(peers.begin(), pin.peer());
+							foundSelf = true;
+						} else {
+							peers.push_back(pin.peer());
+						}
+					}
+					if (!foundSelf) {
+						peers.insert(peers.begin(), session->user());
+					}
+					return peers;
+				}();
 				box->peerListSortRows([&](
 						const PeerListRow &r1,
 						const PeerListRow &r2) {
-					const auto it1 = ranges::find_if(pinned, [&](
-							const Dialogs::Key &k) {
-						return k.peer() == r1.peer();
-					});
-					const auto it2 = ranges::find_if(pinned, [&](
-							const Dialogs::Key &k) {
-						return k.peer() == r2.peer();
-					});
+					const auto it1 = ranges::find(pinned, r1.peer());
+					const auto it2 = ranges::find(pinned, r2.peer());
 					if (it1 == pinned.end() && it2 != pinned.end()) {
 						return false;
 					} else if (it2 == pinned.end() && it1 != pinned.end()) {

From 1a759cc4e7892454b8cdacbc64952d42c024dbec Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Nov 2024 03:55:32 +0300
Subject: [PATCH 235/306] Fixed crash from short info box for non-users.

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

diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index c3ff09a68..72482cffd 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -210,7 +210,7 @@ void ProcessFullPhoto(
 	) | rpl::map([=] {
 		const auto user = peer->asUser();
 		const auto username = peer->username();
-		const auto channelId = user->personalChannelId();
+		const auto channelId = user ? user->personalChannelId() : 0;
 		const auto channel = channelId
 			? user->owner().channel(channelId).get()
 			: nullptr;

From 2b5f68003d70ef47e1d5d4dbddbca8d02d0eec1a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Nov 2024 07:22:14 +0300
Subject: [PATCH 236/306] Fixed pagination of subscriptions in list.

---
 Telegram/SourceFiles/api/api_credits.cpp                       | 3 ++-
 .../info/statistics/info_statistics_list_controllers.cpp       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index ddff600b5..133a9326b 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -174,7 +174,8 @@ constexpr auto kTransactionsLimit = 100;
 		.balance = status.data().vbalance().v,
 		.subscriptionsMissingBalance
 			= status.data().vsubscriptions_missing_balance().value_or_empty(),
-		.allLoaded = !status.data().vnext_offset().has_value(),
+		.allLoaded = !status.data().vnext_offset().has_value()
+			&& !status.data().vsubscriptions_next_offset().has_value(),
 		.token = qs(status.data().vnext_offset().value_or_empty()),
 		.tokenSubscriptions = qs(
 			status.data().vsubscriptions_next_offset().value_or_empty()),
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index b342ad077..25c1d4f7d 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -1050,7 +1050,7 @@ void CreditsController::requestNext() {
 		_requesting = false;
 		applySlice(s);
 	};
-	if (!_firstSlice.subscriptions.empty()) {
+	if (_subscription) {
 		return _api.requestSubscriptions(_apiToken, done);
 	}
 	_api.request(_apiToken, done);

From ddaf11ed6a18a79bd2739a965639d4202adaafe5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Nov 2024 20:27:15 +0300
Subject: [PATCH 237/306] Improved style of sponsored messages with media with
 max width.

---
 .../history/view/media/history_view_web_page.cpp       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 4f54fc7d3..ff0c83af4 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -560,7 +560,9 @@ QSize WebPage::countOptimalSize() {
 	}
 
 	// init dimensions
-	const auto skipBlockWidth = _parent->skipBlockWidth();
+	const auto skipBlockWidth = (sponsored && sponsored->hasMedia)
+		? 0
+		: _parent->skipBlockWidth();
 	auto maxWidth = skipBlockWidth;
 	auto minHeight = 0;
 
@@ -628,8 +630,10 @@ QSize WebPage::countOptimalSize() {
 		_durationWidth = st::msgDateFont->width(_duration);
 	}
 	if (!_openButton.isEmpty()) {
-		maxWidth += rect::m::sum::h(st::historyPageButtonPadding)
-			+ _openButton.maxWidth();
+		accumulate_max(
+			maxWidth,
+			rect::m::sum::h(st::historyPageButtonPadding)
+				+ _openButton.maxWidth());
 	}
 	maxWidth += rect::m::sum::h(padding);
 	minHeight += rect::m::sum::v(padding);

From d2109dd2cb9d24859c776fe2d131b3910551cb79 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Nov 2024 22:40:02 +0300
Subject: [PATCH 238/306] Replaced outer padding for chats filters strip with
 inner padding.

---
 .../ui/widgets/chat_filters_tabs_slider.cpp          |  6 +++++-
 .../ui/widgets/chat_filters_tabs_strip.cpp           | 12 ++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
index 2e51210ee..def399081 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/effects/ripple_animation.h"
 #include "ui/widgets/side_bar_button.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_widgets.h"
 
 #include <QScrollBar>
@@ -58,7 +59,8 @@ int ChatsFiltersTabs::centerOfSection(int section) const {
 
 void ChatsFiltersTabs::fitWidthToSections() {
 	const auto widths = countSectionsWidths(0);
-	resizeToWidth(ranges::accumulate(widths, .0));
+	const auto sliderPadding = st::dialogsSearchTabsPadding;
+	resizeToWidth(ranges::accumulate(widths, .0) + sliderPadding * 2);
 	_lockedFromX = calculateLockedFromX();
 
 	{
@@ -163,6 +165,8 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
 	const auto range = getCurrentActiveRange();
 	const auto activeIndex = activeSection();
 
+	p.translate(st::dialogsSearchTabsPadding, 0);
+
 	auto index = 0;
 	auto raisedIndex = -1;
 	auto activeHorizontalShift = 0;
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index aecd13dbc..bd39d4ba6 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -186,16 +186,12 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	}
 	const auto container = wrap->entity();
 	const auto scroll = Ui::CreateChild<Ui::ScrollArea>(container, scrollSt);
-	const auto sliderPadding = st::dialogsSearchTabsPadding;
 	const auto slider = scroll->setOwnedWidget(
-		object_ptr<Ui::PaddingWrap<Ui::ChatsFiltersTabs>>(
+		object_ptr<Ui::ChatsFiltersTabs>(
 			parent,
-			object_ptr<Ui::ChatsFiltersTabs>(
-				parent,
-				trackActiveFilterAndUnreadAndReorder
-					? st::dialogsSearchTabs
-					: st::chatsFiltersTabs),
-			QMargins(sliderPadding, 0, sliderPadding, 0)))->entity();
+			trackActiveFilterAndUnreadAndReorder
+				? st::dialogsSearchTabs
+				: st::chatsFiltersTabs));
 	const auto state = wrap->lifetime().make_state<State>();
 	if (trackActiveFilterAndUnreadAndReorder) {
 		using Reorder = Ui::ChatsFiltersTabsReorder;

From 715874a98f06c76a57e73abd9077d1ee0740eef0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Nov 2024 22:49:04 +0300
Subject: [PATCH 239/306] Slightly improved phrase for no results in forward
 box.

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

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index b610c07a6..9d01be276 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1999,6 +1999,10 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		}) {
 		}
 
+		void setSearchNoResultsText(const QString &text) {
+			PeerListController::setSearchNoResultsText(text);
+		}
+
 		void rowClicked(not_null<PeerListRow*> row) override final {
 			const auto count = delegate()->peerListSelectedRowsCount();
 			if (showLockedError(row) || (count && row->peer()->isForum())) {
@@ -2053,6 +2057,8 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		auto controller = std::make_unique<Controller>(session);
 		const auto controllerRaw = controller.get();
 		auto init = [=](not_null<PeerListBox*> box) {
+			controllerRaw->setSearchNoResultsText(
+				tr::lng_bot_chats_not_found(tr::now));
 			box->setSpecialTabMode(true);
 			auto applyFilter = [=](FilterId id) {
 				box->scrollToY(0);

From 9d3b3476c2187b7845bab052f3a06e031182ec96 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 15 Nov 2024 10:51:20 +0300
Subject: [PATCH 240/306] Fixed display of chats filters strip in new windows.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp          | 1 +
 .../SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp   | 9 ++++++---
 .../SourceFiles/ui/widgets/chat_filters_tabs_strip.h     | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index ab1f88108..f2e809107 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1331,6 +1331,7 @@ void Widget::toggleFiltersMenu(bool enabled) {
 					controller()->setActiveChatsFilter(id);
 				}
 			},
+			controller(),
 			true);
 		raw->show();
 		raw->stackUnder(_scroll);
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index bd39d4ba6..8c1549481 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -173,16 +173,19 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Main::Session*> session,
 		Fn<void(FilterId)> choose,
+		Window::SessionController *controller,
 		bool trackActiveFilterAndUnreadAndReorder) {
-	const auto window = Core::App().findWindow(parent);
-	const auto controller = window ? window->sessionController() : nullptr;
 
 	const auto &scrollSt = st::defaultScrollArea;
 	const auto wrap = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
 		parent,
 		object_ptr<Ui::RpWidget>(parent));
 	if (!controller) {
-		return wrap;
+		const auto window = Core::App().findWindow(parent);
+		controller = window ? window->sessionController() : nullptr;
+		if (!controller) {
+			return wrap;
+		}
 	}
 	const auto container = wrap->entity();
 	const auto scroll = Ui::CreateChild<Ui::ScrollArea>(container, scrollSt);
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
index 641065ff8..7b42651ed 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
@@ -15,12 +15,17 @@ namespace Ui {
 class RpWidget;
 } // namespace Ui
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Ui {
 
 not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Main::Session*> session,
 	Fn<void(FilterId)> choose,
+	Window::SessionController *controller = nullptr,
 	bool trackActiveFilterAndUnreadAndReorder = false);
 
 } // namespace Ui

From 013b58f6f6f7d0886fdedc79dd9c18c9d85d1b94 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 15 Nov 2024 20:04:33 +0300
Subject: [PATCH 241/306] Fixed display of forums in share box with applied
 chats filter.

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

diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index a2c1db10a..eed3a2e04 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -1388,7 +1388,8 @@ void ShareBox::Inner::applyChatFilter(FilterId id) {
 		const auto addList = [&](not_null<Dialogs::IndexedList*> list) {
 			for (const auto &row : list->all()) {
 				if (const auto history = row->history()) {
-					if (_descriptor.filterCallback(history)) {
+					if (history->asForum()
+							|| _descriptor.filterCallback(history)) {
 						_customChatsIndexed->addToEnd(history);
 					}
 				}

From 8f1d215851dfde55fe3be061ea3beef3f6a6479b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 15 Nov 2024 22:36:23 +0300
Subject: [PATCH 242/306] Fixed rebuild of chats filters in strip when premium
 status is changed.

---
 Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 8c1549481..6c9cdd578 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/premium_limits_box.h"
 #include "core/application.h"
 #include "data/data_chat_filters.h"
+#include "data/data_peer_values.h" // Data::AmPremiumValue.
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/data_unread_value.h"
@@ -312,6 +313,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			}, slider->lifetime());
 			if (state->reorder) {
 				state->reorder->cancel();
+				state->reorder->clearPinnedIntervals();
 				if (!reorderAll) {
 					state->reorder->addPinnedInterval(0, 1);
 				}
@@ -405,7 +407,9 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 			state->reorder->start();
 		}
 	};
-	session->data().chatsFilters().changed(
+	rpl::combine(
+		session->data().chatsFilters().changed(),
+		Data::AmPremiumValue(session) | rpl::to_empty
 	) | rpl::start_with_next(rebuild, wrap->lifetime());
 	rebuild();
 

From 7f2c98f17a7f5aa2ee330d5965d6df8095cf6a3e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 15 Nov 2024 22:46:07 +0300
Subject: [PATCH 243/306] Fixed mouse events in chats filters strip with inner
 padding.

---
 .../ui/widgets/chat_filters_tabs_slider.cpp   | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
index def399081..ac6f6dcbd 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -15,6 +15,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QScrollBar>
 
 namespace Ui {
+namespace {
+
+[[nodiscard]] QMouseEvent TranslatedMouseEvent(QMouseEvent *e) {
+	return QMouseEvent(
+		e->type(),
+		e->pos() + QPoint(-st::dialogsSearchTabsPadding, 0),
+		e->button(),
+		e->buttons(),
+		e->modifiers());
+}
+
+} // namespace
 
 ChatsFiltersTabs::ChatsFiltersTabs(
 	not_null<Ui::RpWidget*> parent,
@@ -278,29 +290,32 @@ void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
 }
 
 void ChatsFiltersTabs::mousePressEvent(QMouseEvent *e) {
-	const auto mouseButton = e->button();
+	auto m = TranslatedMouseEvent(e);
+	const auto mouseButton = m.button();
 	if (mouseButton == Qt::MouseButton::LeftButton) {
-		_lockedPressed = (e->pos().x() >= _lockedFromX);
+		_lockedPressed = (m.pos().x() >= _lockedFromX);
 		if (_lockedPressed) {
-			Ui::RpWidget::mousePressEvent(e);
+			Ui::RpWidget::mousePressEvent(&m);
 		} else {
-			Ui::SettingsSlider::mousePressEvent(e);
+			Ui::SettingsSlider::mousePressEvent(&m);
 		}
 	} else {
-		Ui::RpWidget::mousePressEvent(e);
+		Ui::RpWidget::mousePressEvent(&m);
 	}
 }
 
 void ChatsFiltersTabs::mouseMoveEvent(QMouseEvent *e) {
+	auto m = TranslatedMouseEvent(e);
 	if (_reordering) {
-		Ui::RpWidget::mouseMoveEvent(e);
+		Ui::RpWidget::mouseMoveEvent(&m);
 	} else {
-		Ui::SettingsSlider::mouseMoveEvent(e);
+		Ui::SettingsSlider::mouseMoveEvent(&m);
 	}
 }
 
 void ChatsFiltersTabs::mouseReleaseEvent(QMouseEvent *e) {
-	const auto mouseButton = e->button();
+	auto m = TranslatedMouseEvent(e);
+	const auto mouseButton = m.button();
 	if (mouseButton == Qt::MouseButton::LeftButton) {
 		if (base::take(_lockedPressed)) {
 			_lockedPressed = false;
@@ -313,16 +328,16 @@ void ChatsFiltersTabs::mouseReleaseEvent(QMouseEvent *e) {
 					}
 				}
 			} else {
-				Ui::SettingsSlider::mouseReleaseEvent(e);
+				Ui::SettingsSlider::mouseReleaseEvent(&m);
 			}
 		}
 	} else {
-		Ui::RpWidget::mouseReleaseEvent(e);
+		Ui::RpWidget::mouseReleaseEvent(&m);
 	}
 }
 
 void ChatsFiltersTabs::contextMenuEvent(QContextMenuEvent *e) {
-	const auto pos = e->pos();
+	const auto pos = e->pos() + QPoint(-st::dialogsSearchTabsPadding, 0);
 	if (pos.x() >= _lockedFromX) {
 		return;
 	}

From efe99b3f62ead19c2ace65bccbcf13847509052e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 13 Nov 2024 13:36:53 +0400
Subject: [PATCH 244/306] Fix special userpic menu in topics.

---
 .../history_view_compose_controls.cpp         |  4 ++
 .../controls/history_view_compose_controls.h  |  2 +
 .../view/history_view_chat_preview.cpp        |  7 ++++
 .../history/view/history_view_list_widget.cpp | 39 ++++++++++++++++++-
 .../history/view/history_view_list_widget.h   |  8 ++++
 .../view/history_view_replies_section.cpp     | 18 +++++++++
 .../view/history_view_replies_section.h       |  2 +
 7 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 9eed3aeb4..2fdbc1d15 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -3383,6 +3383,10 @@ Fn<void()> ComposeControls::restoreTextCallback(
 	});
 }
 
+Ui::InputField *ComposeControls::fieldForMention() const {
+	return _writeRestriction.current() ? nullptr : _field.get();
+}
+
 TextWithEntities ComposeControls::prepareTextForEditMsg() const {
 	if (!_history) {
 		return {};
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 6024e56de..2b97c4f98 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -249,6 +249,8 @@ public:
 
 	Fn<void()> restoreTextCallback(const QString &insertTextOnCancel) const;
 
+	[[nodiscard]] Ui::InputField *fieldForMention() const;
+
 private:
 	enum class TextUpdateEvent {
 		SaveDraft = (1 << 0),
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 4747ce609..da6b492d3 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -161,6 +161,8 @@ private:
 	bool listShowReactPremiumError(
 		not_null<HistoryItem*> item,
 		const Data::ReactionId &id) override;
+	base::unique_qptr<Ui::PopupMenu> listFillSenderUserpicMenu(
+		PeerId userpicPeerId) override;
 	void listWindowSetInnerFocus() override;
 	bool listAllowsDragForward() override;
 	void listLaunchDrag(
@@ -828,6 +830,11 @@ bool Item::listShowReactPremiumError(
 	return false;
 }
 
+base::unique_qptr<Ui::PopupMenu> Item::listFillSenderUserpicMenu(
+		PeerId userpicPeerId) {
+	return nullptr;
+}
+
 void Item::listWindowSetInnerFocus() {
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 68a28f1f8..1a67af4ec 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -30,9 +30,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/message_field.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
-#include "core/click_handler_types.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/core_settings.h"
+#include "core/phone_click_handler.h"
 #include "apiwrap.h"
 #include "api/api_who_reacted.h"
 #include "api/api_views.h"
@@ -171,6 +172,11 @@ bool WindowListDelegate::listShowReactPremiumError(
 	return Window::ShowReactPremiumError(_window, item, id);
 }
 
+auto WindowListDelegate::listFillSenderUserpicMenu(PeerId userpicPeerId)
+-> base::unique_qptr<Ui::PopupMenu> {
+	return nullptr;
+}
+
 void WindowListDelegate::listWindowSetInnerFocus() {
 	_window->widget()->setInnerFocus();
 }
@@ -2794,6 +2800,12 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		? _overElement->data().get()
 		: nullptr;
 	const auto clickedReaction = Reactions::ReactionIdOfLink(link);
+	const auto linkPhoneNumber = link
+		? link->property(kPhoneNumberLinkProperty).toString()
+		: QString();
+	const auto linkUserpicPeerId = (link && _overSenderUserpic)
+		? PeerId(link->property(kPeerLinkPeerIdProperty).toULongLong())
+		: PeerId();
 	_whoReactedMenuLifetime.destroy();
 	if (!clickedReaction.empty()
 		&& overItem
@@ -2808,6 +2820,19 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			_whoReactedMenuLifetime);
 		e->accept();
 		return;
+	} else if (!linkPhoneNumber.isEmpty()) {
+		PhoneClickHandler(&session(), linkPhoneNumber).onClick(
+			prepareClickContext(
+				Qt::LeftButton,
+				_overItemExact ? _overItemExact->fullId() : FullMsgId()));
+		return;
+	} else if (linkUserpicPeerId) {
+		_menu = _delegate->listFillSenderUserpicMenu(linkUserpicPeerId);
+		if (_menu) {
+			_menu->popup(e->globalPos());
+			e->accept();
+			return;
+		}
 	}
 
 	auto request = ContextMenuRequest(controller());
@@ -3568,6 +3593,15 @@ ClickHandlerContext ListWidget::prepareClickHandlerContext(FullMsgId id) {
 	};
 }
 
+ClickContext ListWidget::prepareClickContext(
+		Qt::MouseButton button,
+		FullMsgId itemId) {
+	return {
+		button,
+		QVariant::fromValue(prepareClickHandlerContext(itemId)),
+	};
+}
+
 int ListWidget::SelectionViewOffset(
 		not_null<const ListWidget*> inner,
 		not_null<const Element*> view) {
@@ -3629,6 +3663,7 @@ void ListWidget::mouseActionUpdate() {
 	auto inTextSelection = (_overState.pointState != PointState::Outside)
 		&& (_overState.itemId == _pressState.itemId)
 		&& hasSelectedText();
+	auto dragStateUserpic = false;
 	const auto overReaction = reactionView && reactionState.link;
 	if (overReaction) {
 		dragState = reactionState;
@@ -3727,6 +3762,7 @@ void ListWidget::mouseActionUpdate() {
 						// stop enumeration if we've found a userpic under the cursor
 						if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
 							dragState = TextState(nullptr, view->fromPhotoLink());
+							dragStateUserpic = true;
 							_overItemExact = nullptr;
 							lnkhost = view;
 							return false;
@@ -3738,6 +3774,7 @@ void ListWidget::mouseActionUpdate() {
 		}
 	}
 	const auto lnkChanged = ClickHandler::setActive(dragState.link, lnkhost);
+	_overSenderUserpic = dragStateUserpic;
 	if (lnkChanged || dragState.cursor != _mouseCursorState) {
 		Ui::Tooltip::Hide();
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 056d6ce95..a21cea06e 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -185,6 +185,8 @@ public:
 	virtual bool listShowReactPremiumError(
 		not_null<HistoryItem*> item,
 		const Data::ReactionId &id) = 0;
+	virtual base::unique_qptr<Ui::PopupMenu> listFillSenderUserpicMenu(
+		PeerId userpicPeerId) = 0;
 	virtual void listWindowSetInnerFocus() = 0;
 	virtual bool listAllowsDragForward() = 0;
 	virtual void listLaunchDrag(
@@ -218,6 +220,8 @@ public:
 	bool listShowReactPremiumError(
 		not_null<HistoryItem*> item,
 		const Data::ReactionId &id) override;
+	base::unique_qptr<Ui::PopupMenu> listFillSenderUserpicMenu(
+		PeerId userpicPeerId) override;
 	void listWindowSetInnerFocus() override;
 	bool listAllowsDragForward() override;
 	void listLaunchDrag(
@@ -356,6 +360,9 @@ public:
 		int top) const;
 	[[nodiscard]] ClickHandlerContext prepareClickHandlerContext(
 		FullMsgId id);
+	[[nodiscard]] ClickContext prepareClickContext(
+		Qt::MouseButton button,
+		FullMsgId itemId);
 
 	// AbstractTooltipShower interface
 	QString tooltipText() const override;
@@ -808,6 +815,7 @@ private:
 	CursorState _mouseCursorState = CursorState();
 	uint16 _mouseTextSymbol = 0;
 	bool _pressWasInactive = false;
+	bool _overSenderUserpic = false;
 
 	bool _selectEnabled = false;
 	HistoryItem *_selectedTextItem = nullptr;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 081d01f44..5531cae2e 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_view_swipe.h"
 #include "ui/chat/pinned_bar.h"
 #include "ui/chat/chat_style.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/popup_menu.h"
@@ -2705,6 +2706,23 @@ Ui::ChatPaintContext RepliesWidget::listPreparePaintContext(
 	return context;
 }
 
+base::unique_qptr<Ui::PopupMenu> RepliesWidget::listFillSenderUserpicMenu(
+		PeerId userpicPeerId) {
+	const auto searchInEntry = _topic
+		? Dialogs::Key(_topic)
+		: Dialogs::Key(_history);
+	auto menu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::popupMenuWithIcons);
+	Window::FillSenderUserpicMenu(
+		controller(),
+		_history->owner().peer(userpicPeerId),
+		_composeControls->fieldForMention(),
+		searchInEntry,
+		Ui::Menu::CreateAddActionCallback(menu.get()));
+	return menu->empty() ? nullptr : std::move(menu);
+}
+
 void RepliesWidget::setupEmptyPainter() {
 	Expects(_topic != nullptr);
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 71321f14c..1312eabd7 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -183,6 +183,8 @@ public:
 		not_null<TranslateTracker*> tracker) override;
 	Ui::ChatPaintContext listPreparePaintContext(
 		Ui::ChatPaintContextArgs &&args) override;
+	base::unique_qptr<Ui::PopupMenu> listFillSenderUserpicMenu(
+		PeerId userpicPeerId) override;
 
 	// CornerButtonsDelegate delegate.
 	void cornerButtonsShowAtPosition(

From 0445f7d6e8a5d366b7c37c5e48f43ef36a029c75 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 15:43:12 +0400
Subject: [PATCH 245/306] Enable auto-night-mode by default.

---
 Telegram/SourceFiles/core/core_settings.cpp | 14 +++++++++-----
 Telegram/SourceFiles/core/core_settings.h   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 756d42138..5170b16fc 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -240,7 +240,7 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_customFontFamily)
 		+ sizeof(qint32) * 3
 		+ Serialize::bytearraySize(_tonsiteStorageToken)
-		+ sizeof(qint32) * 6;
+		+ sizeof(qint32) * 7;
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -309,7 +309,7 @@ QByteArray Settings::serialize() const {
 			<< qint32(_thirdSectionExtendedBy)
 			<< qint32(_notifyFromAll ? 1 : 0)
 			<< qint32(_nativeWindowFrame.current() ? 1 : 0)
-			<< qint32(_systemDarkModeEnabled.current() ? 1 : 0)
+			<< qint32(0) // Legacy system dark mode
 			<< _cameraDeviceId.current()
 			<< qint32(_ipRevealWarning ? 1 : 0)
 			<< qint32(_groupCallPushToTalk ? 1 : 0)
@@ -400,7 +400,8 @@ QByteArray Settings::serialize() const {
 			<< qint32(_skipToastsInFocus ? 1 : 0)
 			<< qint32(_recordVideoMessages ? 1 : 0)
 			<< SerializeVideoQuality(_videoQuality)
-			<< qint32(_ivZoom.current());
+			<< qint32(_ivZoom.current())
+			<< qint32(_systemDarkModeEnabled.current() ? 1 : 0);
 	}
 
 	Ensures(result.size() == size);
@@ -477,6 +478,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 notifyFromAll = _notifyFromAll ? 1 : 0;
 	qint32 nativeWindowFrame = _nativeWindowFrame.current() ? 1 : 0;
 	qint32 systemDarkModeEnabled = _systemDarkModeEnabled.current() ? 1 : 0;
+	qint32 legacySystemDarkModeEnabled = 0;
 	qint32 ipRevealWarning = _ipRevealWarning ? 1 : 0;
 	qint32 groupCallPushToTalk = _groupCallPushToTalk ? 1 : 0;
 	QByteArray groupCallPushToTalkShortcut = _groupCallPushToTalkShortcut;
@@ -610,7 +612,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		stream >> nativeWindowFrame;
 	}
 	if (!stream.atEnd()) {
-		stream >> systemDarkModeEnabled;
+		stream >> legacySystemDarkModeEnabled;
 	}
 	if (!stream.atEnd()) {
 		stream >> cameraDeviceId;
@@ -853,6 +855,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> ivZoom;
 	}
+	if (!stream.atEnd()) {
+		stream >> systemDarkModeEnabled;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -1453,7 +1458,6 @@ void Settings::resetOnLastLogout() {
 	_thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
 	_notifyFromAll = true;
 	_tabbedReplacedWithInfo = false; // per-window
-	_systemDarkModeEnabled = false;
 	_hiddenGroupCallTooltips = 0;
 	_storiesClickTooltipHidden = false;
 	_ttlVoiceClickTooltipHidden = false;
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index b03f4ed5f..87fb383f4 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -1036,7 +1036,7 @@ private:
 	bool _notifyFromAll = true;
 	rpl::variable<bool> _nativeWindowFrame = false;
 	rpl::variable<std::optional<bool>> _systemDarkMode = std::nullopt;
-	rpl::variable<bool> _systemDarkModeEnabled = false;
+	rpl::variable<bool> _systemDarkModeEnabled = true;
 	rpl::variable<WindowTitleContent> _windowTitleContent;
 	WindowPosition _windowPosition; // per-window
 	bool _disableOpenGL = false;

From a4212cc865189bc71d2716cb512b997c30c2d96c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 18:28:35 +0400
Subject: [PATCH 246/306] Fix point state detection on media messages.

---
 .../history/view/history_view_message.cpp      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 0dae7fbf0..d67787ae6 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -2120,6 +2120,7 @@ PointState Message::pointState(QPoint point) const {
 
 			// Entry page is always a bubble bottom.
 			auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
+			auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 
 			if (item->repliesAreComments() || item->externalReply()) {
 				g.setHeight(g.height() - st::historyCommentsButtonHeight);
@@ -2160,11 +2161,18 @@ PointState Message::pointState(QPoint point) const {
 				trect.setHeight(trect.height() - entryHeight);
 			}
 
-			auto mediaHeight = media->height();
-			auto mediaLeft = trect.x() - st::msgPadding.left();
-			auto mediaTop = (trect.y() + trect.height() - mediaHeight);
-
-			if (point.y() >= mediaTop && point.y() < mediaTop + mediaHeight) {
+			const auto mediaHeight = mediaDisplayed ? media->height() : 0;
+			const auto mediaLeft = trect.x() - st::msgPadding.left();
+			const auto mediaTop = (!mediaDisplayed || _invertMedia)
+				? (trect.y() + (mediaOnTop ? 0 : st::mediaInBubbleSkip))
+				: (trect.y() + trect.height() - mediaHeight);
+			if (mediaDisplayed && _invertMedia) {
+				trect.setY(mediaTop
+					+ mediaHeight
+					+ (mediaOnBottom ? 0 : st::mediaInBubbleSkip));
+			}
+			if (point.y() >= mediaTop
+				&& point.y() < mediaTop + mediaHeight) {
 				return media->pointState(point - QPoint(mediaLeft, mediaTop));
 			}
 		}

From 7cb26ba1040425134fd74b1a933171d538d0ba3b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 23:38:46 +0400
Subject: [PATCH 247/306] Fix crash in possible ads teardown.

---
 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 01b2c9189..7caf21053 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -7701,12 +7701,12 @@ void HistoryWidget::createSponsoredMessageBar() {
 	session().sponsoredMessages().itemRemoved(
 		maybeFullId
 	) | rpl::start_with_next([this] {
+		_sponsoredMessageBar->toggle(false, anim::type::normal);
 		_sponsoredMessageBar->shownValue() | rpl::filter(
 			!rpl::mappers::_1
 		) | rpl::start_with_next([this] {
 			_sponsoredMessageBar = nullptr;
 		}, _sponsoredMessageBar->lifetime());
-		_sponsoredMessageBar->toggle(false, anim::type::normal);
 	}, _sponsoredMessageBar->lifetime());
 
 	if (maybeFullId) {

From 067fd25a347873aef41f2ef3d0b18101812ea5dc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 23:59:52 +0400
Subject: [PATCH 248/306] Beta version 5.7.4.

- Enable auto night mode by default.
- Use muted chats folder badge in horizontal strip.
- Fix custom userpic context menu in comments and topics.
- Fix scrolling of chats folders together with the list.
- Fix chats folders list disappearing in some cases.
- Fix topic groups in share box with chats folders.
- Fix bot commands list in some groups.
- Fix crash in channel short info box display.
- Fix crash in bot monetization section opening.
- Fix crash in bot sponsored messages destruction.
---
 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_rpl                             |  2 +-
 Telegram/lib_ui                              |  2 +-
 Telegram/lib_webview                         |  2 +-
 changelog.txt                                | 13 +++++++++++++
 9 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index f93f27343..4683ca419 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.7.3.0" />
+    Version="5.7.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 98d4c6c31..65d5d0ed8 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,7,3,0
- PRODUCTVERSION 5,7,3,0
+ FILEVERSION 5,7,4,0
+ PRODUCTVERSION 5,7,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.7.3.0"
+            VALUE "FileVersion", "5.7.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.3.0"
+            VALUE "ProductVersion", "5.7.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index c7e32043a..9e2d62198 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,7,3,0
- PRODUCTVERSION 5,7,3,0
+ FILEVERSION 5,7,4,0
+ PRODUCTVERSION 5,7,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.7.3.0"
+            VALUE "FileVersion", "5.7.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.3.0"
+            VALUE "ProductVersion", "5.7.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index e6e74c46b..e7b5a1873 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 = 5007003;
-constexpr auto AppVersionStr = "5.7.3";
+constexpr auto AppVersion = 5007004;
+constexpr auto AppVersionStr = "5.7.4";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index d480f65bc..9776d9e67 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5007003
+AppVersion         5007004
 AppVersionStrMajor 5.7
-AppVersionStrSmall 5.7.3
-AppVersionStr      5.7.3
+AppVersionStrSmall 5.7.4
+AppVersionStr      5.7.4
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 5.7.3.beta
+AppVersionOriginal 5.7.4.beta
diff --git a/Telegram/lib_rpl b/Telegram/lib_rpl
index 8b1015d1b..9a3ce435f 160000
--- a/Telegram/lib_rpl
+++ b/Telegram/lib_rpl
@@ -1 +1 @@
-Subproject commit 8b1015d1bd57ef03fcd07a3eeddd3f5a9b688ade
+Subproject commit 9a3ce435f4054e6cbd45e1c6e3e27cfff515c829
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b969b5bd3..46c18e2c7 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b969b5bd32c339be43732d7f1d34d7fdc3454eab
+Subproject commit 46c18e2c7e730c6304e8d813be4d5abc6fb364ad
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 6dadd92e4..095babf23 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 6dadd92e42e2626d512a35fcd09f87f6ffdad8db
+Subproject commit 095babf234736e053bdbbc3dc15bc042a40c45b4
diff --git a/changelog.txt b/changelog.txt
index b6c45eb56..eb4229eca 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,16 @@
+5.7.4 beta (15.11.24)
+
+- Enable auto night mode by default.
+- Use muted chats folder badge in horizontal strip.
+- Fix custom userpic context menu in comments and topics.
+- Fix scrolling of chats folders together with the list.
+- Fix chats folders list disappearing in some cases.
+- Fix topic groups in share box with chats folders.
+- Fix bot commands list in some groups.
+- Fix crash in channel short info box display.
+- Fix crash in bot monetization section opening.
+- Fix crash in bot sponsored messages destruction.
+
 5.7.3 beta (13.11.24)
 
 - Option to show folders above the chats list.

From 7dd1e9bfbef377c7ce50e06fdf0056603ba2f751 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 16 Nov 2024 00:04:20 +0400
Subject: [PATCH 249/306] Beta version 5.7.4: Revert accident submodules.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 46c18e2c7..b969b5bd3 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 46c18e2c7e730c6304e8d813be4d5abc6fb364ad
+Subproject commit b969b5bd32c339be43732d7f1d34d7fdc3454eab
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 095babf23..efc48237b 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 095babf234736e053bdbbc3dc15bc042a40c45b4
+Subproject commit efc48237bcaf269b57c8a37539e11e1887e1f3cf

From 5eb59a1a43099d4a4aa4a103800aca07adf2238e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 16 Nov 2024 06:27:07 +0300
Subject: [PATCH 250/306] Improved style of tabs for boost gifts in boosts
 section.

---
 .../boosts/info_boosts_inner_widget.cpp         | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
index 09ca04209..e2436585c 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
@@ -35,9 +35,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
 #include "ui/widgets/slider_natural_width.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/ui_utility.h"
+#include "styles/style_dialogs.h" // dialogsSearchTabs
 #include "styles/style_giveaway.h"
 #include "styles/style_info.h"
 #include "styles/style_premium.h"
@@ -430,7 +432,7 @@ void InnerWidget::fill() {
 #else
 		const auto hasOneTab = (hasBoosts != hasGifts);
 #endif
-		const auto boostsTabText = tr::lng_boosts_list_title(
+		const auto boostsTabText = tr::lng_giveaway_quantity(
 			tr::now,
 			lt_count,
 			status.firstSliceBoosts.multipliedTotal);
@@ -454,8 +456,19 @@ void InnerWidget::fill() {
 				inner,
 				object_ptr<Ui::CustomWidthSlider>(
 					inner,
-					st::defaultTabsSlider)),
+					st::dialogsSearchTabs)),
 			st::boxRowPadding);
+		if (const auto shadow = Ui::CreateChild<Ui::PlainShadow>(inner)) {
+			shadow->show();
+			slider->geometryValue(
+			) | rpl::start_with_next([=](const QRect &r) {
+				shadow->setGeometry(
+					inner->x(),
+					rect::bottom(r) - shadow->height(),
+					inner->width(),
+					shadow->height());
+			}, shadow->lifetime());
+		}
 		slider->toggle(!hasOneTab, anim::type::instant);
 
 		slider->entity()->addSection(boostsTabText);

From f7ca8212aa5a81ccf6eb7f54c1d2ce3629bf0f33 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 16 Nov 2024 07:28:54 +0300
Subject: [PATCH 251/306] Moved out down arrow icon of "Show More" button to
 single place.

---
 .../earn/info_channel_earn_list.cpp           | 23 +---------------
 .../info_statistics_list_controllers.cpp      | 23 +---------------
 .../SourceFiles/ui/effects/toggle_arrow.cpp   | 26 +++++++++++++++++++
 .../SourceFiles/ui/effects/toggle_arrow.h     |  4 +++
 4 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index c2a059c90..3f98b5f23 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -119,27 +119,6 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
 	});
 }
 
-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) {
@@ -1372,7 +1351,7 @@ void InnerWidget::fill() {
 								) | tr::to_count()),
 							st::statisticsShowMoreButton)));
 				const auto button = wrap->entity();
-				AddArrow(button);
+				Ui::AddToggleUpDownArrowToMoreButton(button);
 
 				wrap->toggle(true, anim::type::instant);
 				const auto handleReceived = [=](
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 25c1d4f7d..a14d9141d 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -60,27 +60,6 @@ constexpr auto kColorIndexPending = int(4);
 		+ (entry.in ? '1' : '0'));
 }
 
-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 AddSubtitle(
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<QString> title) {
@@ -1308,7 +1287,7 @@ not_null<Ui::SlideWrap<Ui::SettingsButton>*> AddShowMoreButton(
 				std::move(title),
 				st::statisticsShowMoreButton)),
 		{ 0, -st::settingsButton.padding.top(), 0, 0 });
-	AddArrow(wrap->entity());
+	Ui::AddToggleUpDownArrowToMoreButton(wrap->entity());
 	return wrap;
 }
 
diff --git a/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp b/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
index 57e152ff1..1c8779a93 100644
--- a/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
+++ b/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
@@ -7,6 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/effects/toggle_arrow.h"
 
+#include "ui/rp_widget.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "styles/style_statistics.h"
+#include "styles/style_window.h"
+
 #include <QtCore/QtMath>
 
 namespace Ui {
@@ -50,4 +56,24 @@ namespace Ui {
 	return path;
 }
 
+void AddToggleUpDownArrowToMoreButton(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 = 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();
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/toggle_arrow.h b/Telegram/SourceFiles/ui/effects/toggle_arrow.h
index 3a12c7e4d..51cb1e089 100644
--- a/Telegram/SourceFiles/ui/effects/toggle_arrow.h
+++ b/Telegram/SourceFiles/ui/effects/toggle_arrow.h
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
+class RpWidget;
+
 [[nodiscard]] QPainterPath ToggleUpDownArrowPath(
 	float64 x,
 	float64 y,
@@ -16,4 +18,6 @@ namespace Ui {
 	float64 fourStrokes,
 	float64 progress);
 
+void AddToggleUpDownArrowToMoreButton(not_null<Ui::RpWidget*> parent);
+
 } // namespace Ui

From 0248be5543a3598b2d37d7d7ac44c7a829eedeaf Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 16 Nov 2024 07:33:44 +0300
Subject: [PATCH 252/306] Removed from display extended credits topup options
 by default.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../settings/settings_credits_graphics.cpp    | 40 +++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6b143da2c..82e45d90f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2413,6 +2413,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_summary_history_tab_out" = "Outgoing";
 "lng_credits_summary_history_entry_inner_in" = "In-App Purchase";
 "lng_credits_summary_balance" = "Balance";
+"lng_credits_more_options" = "More Options";
 "lng_credits_gift_button" = "Gift Stars to Friends";
 "lng_credits_box_out_title" = "Confirm Your Purchase";
 "lng_credits_box_out_sure#one" = "Do you want to buy **\"{text}\"** in **{bot}** for **{count} Star**?";
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 849a08120..ba0f18b92 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -58,6 +58,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
 #include "ui/effects/premium_top_bar.h"
+#include "ui/effects/toggle_arrow.h"
 #include "ui/image/image_prepare.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
@@ -417,6 +418,23 @@ void FillCreditOptions(
 		Ui::AddSubsectionTitle(
 			content,
 			tr::lng_credits_summary_options_subtitle());
+
+		const auto buttons = content->add(
+			object_ptr<Ui::VerticalLayout>(content));
+
+		const auto showMoreWrap = content->add(
+			object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+				content,
+				object_ptr<Ui::SettingsButton>(
+					content,
+					tr::lng_credits_more_options(),
+					st::statisticsShowMoreButton)));
+		const auto showMore = showMoreWrap->entity();
+		showMore->setClickedCallback([=] {
+			showMoreWrap->toggle(false, anim::type::instant);
+		});
+		Ui::AddToggleUpDownArrowToMoreButton(showMore);
+
 		const auto &st = st::creditsTopupButton;
 		const auto diffBetweenTextAndStar = st.padding.left()
 			- st.iconLeft
@@ -431,10 +449,24 @@ void FillCreditOptions(
 			if (option.credits < minCredits) {
 				continue;
 			}
-			const auto button = content->add(object_ptr<Ui::SettingsButton>(
-				content,
-				rpl::never<QString>(),
-				st));
+			const auto button = [&] {
+				auto owned = object_ptr<Ui::SettingsButton>(
+					buttons,
+					rpl::never<QString>(),
+					st);
+				if (!option.extended) {
+					return buttons->add(std::move(owned));
+				}
+				const auto wrap = buttons->add(
+					object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+						buttons,
+						std::move(owned)));
+				wrap->toggle(false, anim::type::instant);
+				showMore->clicks() | rpl::start_with_next([=] {
+					wrap->toggle(true, anim::type::normal);
+				}, wrap->lifetime());
+				return wrap->entity();
+			}();
 			const auto text = button->lifetime().make_state<Ui::Text::String>(
 				st.style,
 				tr::lng_credits_summary_options_credits(

From 33aa904cb739c28ef1fcef0b409da94bc096b6eb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 16 Nov 2024 08:26:20 +0300
Subject: [PATCH 253/306] Added shortcuts to flip photos in media viewer.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 183f89151..f2314a616 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1200,6 +1200,9 @@ void OverlayWidget::setStaticContent(QImage image) {
 		image = std::move(image).convertToFormat(kGood);
 	}
 	image.setDevicePixelRatio(style::DevicePixelRatio());
+	if (_flip) {
+		image = image.mirrored(_flip & Qt::Horizontal, _flip & Qt::Vertical);
+	}
 	_staticContent = std::move(image);
 	_staticContentTransparent = IsSemitransparent(_staticContent);
 }
@@ -2286,6 +2289,7 @@ OverlayWidget::~OverlayWidget() {
 
 void OverlayWidget::assignMediaPointer(DocumentData *document) {
 	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
+	_flip = {};
 	_photo = nullptr;
 	_photoMedia = nullptr;
 	if (_document != document) {
@@ -2314,6 +2318,7 @@ void OverlayWidget::assignMediaPointer(not_null<PhotoData*> photo) {
 	_documentMedia = nullptr;
 	_documentLoadingTo = QString();
 	if (_photo != photo) {
+		_flip = {};
 		_photo = photo;
 		_photoMedia = _photo->createMediaView();
 		_photoMedia->wanted(Data::PhotoSize::Small, fileOrigin());
@@ -5461,6 +5466,26 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 			activateControls();
 		}
 		moveToNext(-1);
+	} else if (key == Qt::Key_H) {
+		if (_flip & Qt::Horizontal) {
+			_flip &= ~Qt::Horizontal;
+		} else {
+			_flip |= Qt::Horizontal;
+		}
+		if (_photo) {
+			validatePhotoCurrentImage();
+			redisplayContent();
+		}
+	} else if (key == Qt::Key_V) {
+		if (_flip & Qt::Vertical) {
+			_flip &= ~Qt::Vertical;
+		} else {
+			_flip |= Qt::Vertical;
+		}
+		if (_photo) {
+			validatePhotoCurrentImage();
+			redisplayContent();
+		}
 	} else if (key == Qt::Key_Right) {
 		if (_controlsHideTimer.isActive()) {
 			activateControls();
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 19f55b423..1a5064cfe 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -638,6 +638,8 @@ private:
 	bool _streamedQualityChangeFinished = false;
 	bool _showAsPip = false;
 
+	Qt::Orientations _flip;
+
 	std::unique_ptr<Stories::View> _stories;
 	std::shared_ptr<Show> _cachedShow;
 	rpl::event_stream<> _storiesChanged;

From e3f4f60e2d5e8e88aee2aa1ff4d1eb8a9626e793 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 16 Nov 2024 11:05:00 +0300
Subject: [PATCH 254/306] Replaced list of credits topup options with big label
 in settings.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 .../SourceFiles/boxes/gift_credits_box.cpp    |  3 +-
 .../payments/ui/payments_reaction_box.cpp     |  3 +-
 .../SourceFiles/settings/settings_credits.cpp | 99 ++++++++++++++++---
 .../settings/settings_credits_graphics.cpp    | 65 +++++++-----
 .../settings/settings_credits_graphics.h      |  6 +-
 Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp |  2 +-
 Telegram/SourceFiles/ui/effects/credits.style | 17 ++++
 8 files changed, 154 insertions(+), 43 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 82e45d90f..64c038f05 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2414,6 +2414,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_summary_history_entry_inner_in" = "In-App Purchase";
 "lng_credits_summary_balance" = "Balance";
 "lng_credits_more_options" = "More Options";
+"lng_credits_balance_me" = "your balance";
+"lng_credits_buy_button" = "Buy More Stars";
 "lng_credits_gift_button" = "Gift Stars to Friends";
 "lng_credits_box_out_title" = "Confirm Your Purchase";
 "lng_credits_box_out_sure#one" = "Do you want to buy **\"{text}\"** in **{bot}** for **{count} Star**?";
diff --git a/Telegram/SourceFiles/boxes/gift_credits_box.cpp b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
index f0ecd05f6..a9712f704 100644
--- a/Telegram/SourceFiles/boxes/gift_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
@@ -123,7 +123,8 @@ void GiftCreditsBox(
 		box->verticalLayout(),
 		peer,
 		0,
-		[=] { gifted(); box->uiShow()->hideLayer(); });
+		[=] { gifted(); box->uiShow()->hideLayer(); },
+		tr::lng_credits_summary_options_subtitle());
 
 	box->setPinnedToBottomContent(
 		object_ptr<Ui::VerticalLayout>(box));
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
index c874eb3a9..77342222e 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
@@ -30,7 +30,8 @@ namespace Settings {
 [[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
 	not_null<Ui::RpWidget*> parent,
 	rpl::producer<uint64> balanceValue,
-	bool rightAlign);
+	bool rightAlign,
+	rpl::producer<float64> opacityValue = nullptr);
 } // namespace Settings
 
 namespace Ui {
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index b36f1df0f..5685922ac 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/vertical_layout.h"
 #include "window/window_session_controller.h"
 #include "styles/style_credits.h"
+#include "styles/style_giveaway.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_premium.h"
@@ -350,20 +351,87 @@ void Credits::setupContent() {
 			Ui::StartFireworks(_parent);
 		}
 	};
-	const auto self = _controller->session().user();
-	FillCreditOptions(_controller->uiShow(), content, self, 0, paid);
-	{
-		Ui::AddSkip(content);
-		const auto giftButton = AddButtonWithIcon(
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	const auto balanceLine = content->add(
+		object_ptr<Ui::CenterWrap<>>(
+			content,
+			object_ptr<Ui::RpWidget>(content)))->entity();
+	const auto balanceIcon = CreateSingleStarWidget(
+		balanceLine,
+		st::creditsSettingsBigBalance.style.font->height);
+	const auto balanceAmount = Ui::CreateChild<Ui::FlatLabel>(
+		balanceLine,
+		_controller->session().credits().balanceValue(
+		) | rpl::map(Lang::FormatCountDecimal),
+		st::creditsSettingsBigBalance);
+	balanceAmount->sizeValue() | rpl::start_with_next([=] {
+		balanceLine->resize(
+			balanceIcon->width()
+				+ st::creditsSettingsBigBalanceSkip
+				+ balanceAmount->textMaxWidth(),
+			balanceIcon->height());
+	}, balanceLine->lifetime());
+	balanceLine->widthValue() | rpl::start_with_next([=] {
+		balanceAmount->moveToRight(0, 0);
+	}, balanceLine->lifetime());
+	Ui::AddSkip(content);
+	content->add(
+		object_ptr<Ui::CenterWrap<>>(
+			content,
+			object_ptr<Ui::FlatLabel>(
+				content,
+				tr::lng_credits_balance_me(),
+				st::infoTopBar.subtitle)));
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	const auto button = content->add(
+		object_ptr<Ui::RoundButton>(
+			content,
+			tr::lng_credits_buy_button(),
+			st::creditsSettingsBigBalanceButton),
+		st::boxRowPadding);
+	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	button->setClickedCallback([=, show = _controller->uiShow()] {
+		show->show(Box([=](not_null<Ui::GenericBox*> box) {
+			box->setStyle(st::giveawayGiftCodeBox);
+			box->setWidth(st::boxWideWidth);
+			box->setTitle(tr::lng_credits_summary_options_subtitle());
+			const auto inner = box->verticalLayout();
+			const auto self = show->session().user();
+			FillCreditOptions(show, inner, self, 0, paid, nullptr);
+
+			const auto button = box->addButton(tr::lng_close(), [=] {
+				box->closeBox();
+			});
+			const auto buttonWidth = st::boxWideWidth
+				- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
+			button->widthValue() | rpl::filter([=] {
+				return (button->widthNoMargins() != buttonWidth);
+			}) | rpl::start_with_next([=] {
+				button->resizeToWidth(buttonWidth);
+			}, button->lifetime());
+		}));
+	});
+
+	Ui::AddSkip(content);
+
+	const auto gift = content->add(
+		object_ptr<Ui::RoundButton>(
 			content,
 			tr::lng_credits_gift_button(),
-			st::settingsButtonLightNoIcon);
-		Ui::AddSkip(content);
-		Ui::AddDivider(content);
-		giftButton->setClickedCallback([=] {
-			Ui::ShowGiftCreditsBox(_controller, paid);
-		});
-	}
+			st::creditsSettingsBigBalanceButtonGift),
+		st::boxRowPadding);
+	gift->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	gift->setClickedCallback([=, controller = _controller] {
+		Ui::ShowGiftCreditsBox(controller, paid);
+	});
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddDivider(content);
 
 	setupSubscriptions(content);
 	setupHistory(content);
@@ -422,7 +490,12 @@ QPointer<Ui::RpWidget> Credits::createPinnedToTop(
 		const auto balance = AddBalanceWidget(
 			content,
 			_controller->session().credits().balanceValue(),
-			true);
+			true,
+			content->heightValue() | rpl::map([=](int height) {
+				const auto ratio = float64(height - content->minimumHeight())
+					/ (content->maximumHeight() - content->minimumHeight());
+				return (1. - ratio / 0.35);
+			}));
 		_controller->session().credits().load(true);
 		rpl::combine(
 			balance->sizeValue(),
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index ba0f18b92..bba86892f 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -398,7 +398,8 @@ void FillCreditOptions(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<PeerData*> peer,
 		int minimumCredits,
-		Fn<void()> paid) {
+		Fn<void()> paid,
+		rpl::producer<QString> subtitle) {
 	const auto options = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
@@ -415,9 +416,9 @@ void FillCreditOptions(
 		while (content->count()) {
 			delete content->widgetAt(0);
 		}
-		Ui::AddSubsectionTitle(
-			content,
-			tr::lng_credits_summary_options_subtitle());
+		if (subtitle) {
+			Ui::AddSubsectionTitle(content, std::move(subtitle));
+		}
 
 		const auto buttons = content->add(
 			object_ptr<Ui::VerticalLayout>(content));
@@ -570,29 +571,41 @@ void FillCreditOptions(
 not_null<Ui::RpWidget*> AddBalanceWidget(
 		not_null<Ui::RpWidget*> parent,
 		rpl::producer<uint64> balanceValue,
-		bool rightAlign) {
+		bool rightAlign,
+		rpl::producer<float64> opacityValue) {
+	struct State final {
+		QImage star;
+		float64 opacity = 1.0;
+		Ui::Text::String label;
+		Ui::Text::String count;
+	};
 	const auto balance = Ui::CreateChild<Balance>(parent);
-	const auto balanceStar = balance->lifetime().make_state<QImage>(
-		Ui::GenerateStars(st::creditsBalanceStarHeight, 1));
-	const auto starSize = balanceStar->size() / style::DevicePixelRatio();
-	const auto label = balance->lifetime().make_state<Ui::Text::String>(
+	const auto state = balance->lifetime().make_state<State>();
+	state->star = QImage(Ui::GenerateStars(st::creditsBalanceStarHeight, 1));
+	const auto starSize = state->star.size() / style::DevicePixelRatio();
+	state->label = Ui::Text::String(
 		st::defaultTextStyle,
 		tr::lng_credits_summary_balance(tr::now));
-	const auto count = balance->lifetime().make_state<Ui::Text::String>(
+	state->count = Ui::Text::String(
 		st::semiboldTextStyle,
 		tr::lng_contacts_loading(tr::now));
-	const auto diffBetweenStarAndCount = count->style()->font->spacew;
+	if (opacityValue) {
+		std::move(opacityValue) | rpl::start_with_next([=](float64 value) {
+			state->opacity = value;
+		}, balance->lifetime());
+	}
+	const auto diffBetweenStarAndCount = state->count.style()->font->spacew;
 	const auto resize = [=] {
 		balance->resize(
 			std::max(
-				label->maxWidth(),
-				count->maxWidth()
+				state->label.maxWidth(),
+				state->count.maxWidth()
 					+ starSize.width()
 					+ diffBetweenStarAndCount),
-			label->style()->font->height + starSize.height());
+			state->label.style()->font->height + starSize.height());
 	};
 	std::move(balanceValue) | rpl::start_with_next([=](uint64 value) {
-		count->setText(
+		state->count.setText(
 			st::semiboldTextStyle,
 			Lang::FormatCountToShort(value).string);
 		balance->setBalance(value);
@@ -602,32 +615,33 @@ not_null<Ui::RpWidget*> AddBalanceWidget(
 	) | rpl::start_with_next([=] {
 		auto p = QPainter(balance);
 
+		p.setOpacity(state->opacity);
 		p.setPen(st::boxTextFg);
 
-		label->draw(p, {
+		state->label.draw(p, {
 			.position = QPoint(
-				rightAlign ? (balance->width() - label->maxWidth()) : 0,
+				rightAlign ? (balance->width() - state->label.maxWidth()) : 0,
 				0),
 			.availableWidth = balance->width(),
 		});
-		count->draw(p, {
+		state->count.draw(p, {
 			.position = QPoint(
 				(rightAlign
-					? (balance->width() - count->maxWidth())
+					? (balance->width() - state->count.maxWidth())
 					: (starSize.width() + diffBetweenStarAndCount)),
-				label->minHeight()
-					+ (starSize.height() - count->minHeight()) / 2),
+				state->label.minHeight()
+					+ (starSize.height() - state->count.minHeight()) / 2),
 			.availableWidth = balance->width(),
 		});
 		p.drawImage(
 			(rightAlign
 				? (balance->width()
-					- count->maxWidth()
+					- state->count.maxWidth()
 					- starSize.width()
 					- diffBetweenStarAndCount)
 				: 0),
-			label->minHeight(),
-			*balanceStar);
+			state->label.minHeight(),
+			state->star);
 	}, balance->lifetime());
 	return balance;
 }
@@ -1696,7 +1710,8 @@ void SmallBalanceBox(
 		box->verticalLayout(),
 		show->session().user(),
 		credits - show->session().credits().balance(),
-		[=] { show->session().credits().load(true); });
+		[=] { show->session().credits().load(true); },
+		tr::lng_credits_summary_options_subtitle());
 
 	content->setMaximumHeight(st::creditsLowBalancePremiumCoverHeight);
 	content->setMinimumHeight(st::infoLayerTopBarHeight);
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index fb19e2bff..59913b304 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -58,12 +58,14 @@ void FillCreditOptions(
 	not_null<Ui::VerticalLayout*> container,
 	not_null<PeerData*> peer,
 	int minCredits,
-	Fn<void()> paid);
+	Fn<void()> paid,
+	rpl::producer<QString> subtitle);
 
 [[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
 	not_null<Ui::RpWidget*> parent,
 	rpl::producer<uint64> balanceValue,
-	bool rightAlign);
+	bool rightAlign,
+	rpl::producer<float64> opacityValue = nullptr);
 
 void AddWithdrawalWidget(
 	not_null<Ui::VerticalLayout*> container,
diff --git a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
index 426f9705f..33e7096d0 100644
--- a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
@@ -302,7 +302,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 		divider->resize(container->width(), result->height());
 		result->moveToLeft((container->width() - result->width()) / 2, 0);
 		topWidget->setVisible(userpicToggled);
-		topWidget->moveToLeft(0, -std::numeric_limits<int>::min());
+		topWidget->moveToLeft(0, std::numeric_limits<int>::min());
 		topWidget->raise();
 
 		aboutLabel->raise();
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index b0861a8dc..734b2a2f0 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -11,6 +11,23 @@ using "ui/widgets/widgets.style";
 using "ui/effects/premium.style";
 using "settings/settings.style";
 
+creditsSettingsBigBalance: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(24px semibold);
+	}
+}
+creditsSettingsBigBalanceSkip: 4px;
+creditsSettingsBigBalanceButton: RoundButton(defaultActiveButton) {
+	height: 42px;
+	textTop: 12px;
+	style: semiboldTextStyle;
+}
+creditsSettingsBigBalanceButtonGift: RoundButton(defaultLightButton) {
+	height: 42px;
+	textTop: 12px;
+	style: defaultTextStyle;
+}
+
 creditsPremiumCover: PremiumCover(defaultPremiumCover) {
 	about: FlatLabel(userPremiumCoverAbout) {
 		textFg: boxTitleFg;

From 983c949e8c8411fd8e9719c11adbd1465ead9c74 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 16 Nov 2024 11:38:26 +0300
Subject: [PATCH 255/306] Added ability to provide preloaded credits topup
 options to list.

---
 .../SourceFiles/boxes/gift_credits_box.cpp    |  3 +-
 .../SourceFiles/settings/settings_credits.cpp | 90 ++++++++++++++-----
 .../settings/settings_credits_graphics.cpp    | 22 +++--
 .../settings/settings_credits_graphics.h      |  4 +-
 4 files changed, 89 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/gift_credits_box.cpp b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
index a9712f704..896ecea51 100644
--- a/Telegram/SourceFiles/boxes/gift_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
@@ -124,7 +124,8 @@ void GiftCreditsBox(
 		peer,
 		0,
 		[=] { gifted(); box->uiShow()->hideLayer(); },
-		tr::lng_credits_summary_options_subtitle());
+		tr::lng_credits_summary_options_subtitle(),
+		{});
 
 	box->setPinnedToBottomContent(
 		object_ptr<Ui::VerticalLayout>(box));
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 5685922ac..b4cd7396d 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo_media.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
 #include "info/statistics/info_statistics_list_controllers.h"
 #include "lang/lang_keys.h"
@@ -101,6 +102,13 @@ Credits::Credits(
 , _star(Ui::GenerateStars(st::creditsTopupButton.height, 1))
 , _balanceStar(Ui::GenerateStars(st::creditsBalanceStarHeight, 1)) {
 	setupContent();
+
+	_controller->session().premiumPossibleValue(
+	) | rpl::start_with_next([=](bool premiumPossible) {
+		if (!premiumPossible) {
+			_showBack.fire({});
+		}
+	}, lifetime());
 }
 
 rpl::producer<QString> Credits::title() {
@@ -387,34 +395,76 @@ void Credits::setupContent() {
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 
+	struct State final {
+		rpl::variable<bool> confirmButtonBusy = false;
+		std::optional<Api::CreditsTopupOptions> api;
+	};
+	const auto state = content->lifetime().make_state<State>();
+
 	const auto button = content->add(
 		object_ptr<Ui::RoundButton>(
 			content,
-			tr::lng_credits_buy_button(),
+			rpl::conditional(
+				state->confirmButtonBusy.value(),
+				rpl::single(QString()),
+				tr::lng_credits_buy_button()),
 			st::creditsSettingsBigBalanceButton),
 		st::boxRowPadding);
 	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	button->setClickedCallback([=, show = _controller->uiShow()] {
-		show->show(Box([=](not_null<Ui::GenericBox*> box) {
-			box->setStyle(st::giveawayGiftCodeBox);
-			box->setWidth(st::boxWideWidth);
-			box->setTitle(tr::lng_credits_summary_options_subtitle());
-			const auto inner = box->verticalLayout();
-			const auto self = show->session().user();
-			FillCreditOptions(show, inner, self, 0, paid, nullptr);
+	const auto show = _controller->uiShow();
+	const auto optionsBox = [=](not_null<Ui::GenericBox*> box) {
+		box->setStyle(st::giveawayGiftCodeBox);
+		box->setWidth(st::boxWideWidth);
+		box->setTitle(tr::lng_credits_summary_options_subtitle());
+		const auto inner = box->verticalLayout();
+		const auto self = show->session().user();
+		const auto options = state->api
+			? state->api->options()
+			: Data::CreditTopupOptions();
+		FillCreditOptions(show, inner, self, 0, paid, nullptr, options);
 
-			const auto button = box->addButton(tr::lng_close(), [=] {
-				box->closeBox();
-			});
-			const auto buttonWidth = st::boxWideWidth
-				- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-			button->widthValue() | rpl::filter([=] {
-				return (button->widthNoMargins() != buttonWidth);
-			}) | rpl::start_with_next([=] {
-				button->resizeToWidth(buttonWidth);
-			}, button->lifetime());
-		}));
+		const auto button = box->addButton(tr::lng_close(), [=] {
+			box->closeBox();
+		});
+		const auto buttonWidth = st::boxWideWidth
+			- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
+		button->widthValue() | rpl::filter([=] {
+			return (button->widthNoMargins() != buttonWidth);
+		}) | rpl::start_with_next([=] {
+			button->resizeToWidth(buttonWidth);
+		}, button->lifetime());
+	};
+	button->setClickedCallback([=] {
+		if (state->api && !state->api->options().empty()) {
+			state->confirmButtonBusy = false;
+			show->show(Box(optionsBox));
+		} else {
+			state->confirmButtonBusy = true;
+			state->api.emplace(show->session().user());
+			state->api->request(
+			) | rpl::start_with_error_done([=](const QString &error) {
+				state->confirmButtonBusy = false;
+				show->showToast(error);
+			}, [=] {
+				state->confirmButtonBusy = false;
+				show->show(Box(optionsBox));
+			}, content->lifetime());
+		}
 	});
+	{
+		using namespace Info::Statistics;
+		const auto loadingAnimation = InfiniteRadialAnimationWidget(
+			button,
+			button->height() / 2);
+		AddChildToWidgetCenter(button, loadingAnimation);
+		loadingAnimation->showOn(state->confirmButtonBusy.value());
+	}
+	const auto paddings = rect::m::sum::h(st::boxRowPadding);
+	button->widthValue() | rpl::filter([=] {
+		return (button->widthNoMargins() != (content->width() - paddings));
+	}) | rpl::start_with_next([=] {
+		button->resizeToWidth(content->width() - paddings);
+	}, button->lifetime());
 
 	Ui::AddSkip(content);
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index bba86892f..32804af35 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -399,7 +399,8 @@ void FillCreditOptions(
 		not_null<PeerData*> peer,
 		int minimumCredits,
 		Fn<void()> paid,
-		rpl::producer<QString> subtitle) {
+		rpl::producer<QString> subtitle,
+		std::vector<Data::CreditTopupOption> preloadedTopupOptions) {
 	const auto options = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
@@ -552,12 +553,16 @@ void FillCreditOptions(
 	const auto apiCredits = content->lifetime().make_state<ApiOptions>(peer);
 
 	if (show->session().premiumPossible()) {
-		apiCredits->request(
-		) | rpl::start_with_error_done([=](const QString &error) {
-			show->showToast(error);
-		}, [=] {
-			fill(apiCredits->options());
-		}, content->lifetime());
+		if (preloadedTopupOptions.empty()) {
+			apiCredits->request(
+			) | rpl::start_with_error_done([=](const QString &error) {
+				show->showToast(error);
+			}, [=] {
+				fill(apiCredits->options());
+			}, content->lifetime());
+		} else {
+			fill(std::move(preloadedTopupOptions));
+		}
 	}
 
 	show->session().premiumPossibleValue(
@@ -1711,7 +1716,8 @@ void SmallBalanceBox(
 		show->session().user(),
 		credits - show->session().credits().balance(),
 		[=] { show->session().credits().load(true); },
-		tr::lng_credits_summary_options_subtitle());
+		tr::lng_credits_summary_options_subtitle(),
+		{});
 
 	content->setMaximumHeight(st::creditsLowBalancePremiumCoverHeight);
 	content->setMinimumHeight(st::infoLayerTopBarHeight);
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index 59913b304..608f22cf0 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -21,6 +21,7 @@ struct Boost;
 struct CreditsHistoryEntry;
 struct SubscriptionEntry;
 struct GiftCode;
+struct CreditTopupOption;
 } // namespace Data
 
 namespace Main {
@@ -59,7 +60,8 @@ void FillCreditOptions(
 	not_null<PeerData*> peer,
 	int minCredits,
 	Fn<void()> paid,
-	rpl::producer<QString> subtitle);
+	rpl::producer<QString> subtitle,
+	std::vector<Data::CreditTopupOption> preloadedTopupOptions);
 
 [[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
 	not_null<Ui::RpWidget*> parent,

From 77e7796b3fe18f61965c534489bbba2b196935b9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 16 Nov 2024 14:43:34 +0300
Subject: [PATCH 256/306] Fit transactions id from credits history entries to
 table cell.

---
 .../SourceFiles/boxes/gift_premium_box.cpp     | 18 +++++++++++++++---
 .../boosts/giveaway/giveaway.style             |  4 ++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index d0cc2c746..915e2c48b 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -1242,12 +1242,24 @@ void AddCreditsHistoryEntryTable(
 		}
 	}
 	if (!entry.id.isEmpty()) {
-		constexpr auto kOneLineCount = 18;
-		const auto oneLine = entry.id.length() <= kOneLineCount;
+		constexpr auto kOneLineCount = 22;
+		const auto oneLine = entry.id.size() <= kOneLineCount;
+		auto multiLine = QString();
+		if (!oneLine) {
+			for (auto i = 0; i < entry.id.size(); ++i) {
+				multiLine.append(entry.id[i]);
+				if ((i + 1) % kOneLineCount == 0) {
+					multiLine.append('\n');
+				}
+			}
+		}
 		auto label = object_ptr<Ui::FlatLabel>(
 			table,
 			rpl::single(
-				Ui::Text::Wrapped({ entry.id }, EntityType::Code, {})),
+				Ui::Text::Wrapped(
+					{ oneLine ? entry.id : std::move(multiLine) },
+					EntityType::Code,
+					{})),
 			oneLine
 				? st::giveawayGiftCodeValue
 				: st::giveawayGiftCodeValueMultiline);
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
index 226da96f7..ca7d302e6 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
@@ -96,6 +96,10 @@ giveawayGiftCodeValue: FlatLabel(defaultFlatLabel) {
 giveawayGiftCodeValueMultiline: FlatLabel(giveawayGiftCodeValue) {
 	minWidth: 128px;
 	maxHeight: 100px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(10px);
+		linkUnderline: kLinkUnderlineNever;
+	}
 }
 giveawayGiftMessage: FlatLabel(giveawayGiftCodeValue) {
 	minWidth: 128px;

From d16ccc9dc515ce3b33960beb08a8635b3f205557 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Nov 2024 01:52:12 +0300
Subject: [PATCH 257/306] Fixed display of chats filters strip on removing last
 chats filter.

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

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 6c9cdd578..78320fb41 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -288,7 +288,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 
 	const auto rebuild = [=] {
 		const auto &list = session->data().chatsFilters().list();
-		if ((list.size() <= 1) || state->ignoreRefresh) {
+		if ((list.size() <= 1 && !slider->width()) || state->ignoreRefresh) {
 			return;
 		}
 		auto sections = ranges::views::all(

From 721a642a2fe2ab2c57eb220d616653585f268d6a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Nov 2024 10:37:40 +0300
Subject: [PATCH 258/306] Added date to info who promoted or restricted
 participants in menu.

---
 Telegram/Resources/langs/lang.strings         |  6 +-
 .../boxes/peers/edit_participants_box.cpp     | 75 ++++++++++++-------
 2 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 64c038f05..9a36efb1d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4359,7 +4359,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_edit_admin_rank_about" = "A title that members will see instead of '{title}'.";
 "lng_rights_about_add_admins_yes" = "This admin will be able to add new admins with equal or fewer rights.";
 "lng_rights_about_add_admins_no" = "This admin will not be able to add new admins.";
-"lng_rights_about_by" = "This admin promoted by {user} at {date}.";
+"lng_rights_about_by" = "This admin promoted by {user} on {date}.";
 
 "lng_rights_about_admin_cant_edit" = "You can't edit the rights of this admin.";
 "lng_rights_about_restriction_cant_edit" = "You cannot change the restrictions for this user.";
@@ -4438,8 +4438,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_chat_files" = "Files";
 "lng_rights_chat_voice_messages" = "Voice messages";
 "lng_rights_chat_video_messages" = "Video messages";
-"lng_rights_chat_restricted_by" = "Restricted by {user} at {date}.";
-"lng_rights_chat_banned_by" = "Banned by {user} at {date}.";
+"lng_rights_chat_restricted_by" = "Restricted by {user} on {date}.";
+"lng_rights_chat_banned_by" = "Banned by {user} on {date}.";
 "lng_rights_chat_banned_until_header" = "Restricted until";
 "lng_rights_chat_banned_forever" = "Forever";
 "lng_rights_chat_banned_day#one" = "For {count} day";
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 345d9880e..d1b6d7a2d 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -30,10 +30,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "base/unixtime.h"
 #include "ui/effects/outline_segments.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/text/text_utilities.h"
 #include "info/profile/info_profile_values.h"
 #include "window/window_session_controller.h"
 #include "history/history.h"
+#include "styles/style_chat.h"
 #include "styles/style_menu_icons.h"
 
 namespace {
@@ -1645,6 +1648,51 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 	auto result = base::make_unique_q<Ui::PopupMenu>(
 		parent,
 		st::popupMenuWithIcons);
+	const auto addToEnd = gsl::finally([&] {
+		const auto addInfoAction = [&](
+				not_null<PeerData*> by,
+				tr::phrase<lngtag_user, lngtag_date> phrase,
+				TimeId since) {
+			auto text = phrase(
+				tr::now,
+				lt_user,
+				Ui::Text::Bold(by->name()),
+				lt_date,
+				Ui::Text::Bold(
+					langDateTimeFull(base::unixtime::parse(since))),
+				Ui::Text::WithEntities);
+			auto button = base::make_unique_q<Ui::Menu::MultilineAction>(
+				result->menu(),
+				result->st().menu,
+				st::historyHasCustomEmoji,
+				st::historyHasCustomEmojiPosition,
+				std::move(text));
+			if (const auto n = _navigation) {
+				button->setClickedCallback([=] {
+					n->parentController()->show(PrepareShortInfoBox(by, n));
+				});
+			}
+			result->addSeparator();
+			result->addAction(std::move(button));
+		};
+
+		if (const auto by = _additional.restrictedBy(participant)) {
+			if (const auto since = _additional.restrictedSince(participant)) {
+				addInfoAction(
+					by,
+					_additional.isKicked(participant)
+						? tr::lng_rights_chat_banned_by
+						: tr::lng_rights_chat_restricted_by,
+					since);
+			}
+		} else if (user) {
+			if (const auto by = _additional.adminPromotedBy(user)) {
+				if (const auto since = _additional.adminPromotedSince(user)) {
+					addInfoAction(by, tr::lng_rights_about_by, since);
+				}
+			}
+		}
+	});
 	if (_navigation) {
 		result->addAction(
 			(participant->isUser()
@@ -1658,33 +1706,6 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 				? &st::menuIconProfile
 				: &st::menuIconInfo));
 	}
-	if (const auto by = _additional.restrictedBy(participant)) {
-		result->addAction(
-			(_role == Role::Kicked
-				? tr::lng_channel_banned_status_removed_by
-				: tr::lng_channel_banned_status_restricted_by)(
-					tr::now,
-					lt_user,
-					by->name()),
-			crl::guard(this, [=] {
-				_navigation->parentController()->show(
-					PrepareShortInfoBox(by, _navigation));
-			}),
-			&st::menuIconAdmin);
-	} else if (user) {
-		if (const auto by = _additional.adminPromotedBy(user)) {
-			result->addAction(
-				tr::lng_channel_admin_status_promoted_by(
-					tr::now,
-					lt_user,
-					by->name()),
-				crl::guard(this, [=] {
-					_navigation->parentController()->show(
-						PrepareShortInfoBox(by, _navigation));
-				}),
-				&st::menuIconAdmin);
-		}
-	}
 	if (_role == Role::Kicked) {
 		if (_peer->isMegagroup()
 			&& _additional.canRestrictParticipant(participant)) {

From 3e899107499efdffca869abaf0612b24460485f5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Nov 2024 10:46:12 +0300
Subject: [PATCH 259/306] Replaced user info with short box for admins in
 section of kicked users.

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

diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index d1b6d7a2d..bdd3bdc24 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -1700,8 +1700,10 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 				: participant->isBroadcast()
 				? tr::lng_context_view_channel
 				: tr::lng_context_view_group)(tr::now),
-			crl::guard(this, [=] {
-				_navigation->showPeerInfo(participant); }),
+			crl::guard(this, [=, this] {
+				_navigation->parentController()->show(
+					PrepareShortInfoBox(participant, _navigation));
+			}),
 			(participant->isUser()
 				? &st::menuIconProfile
 				: &st::menuIconInfo));

From 3f3143514e3aad8042bf78222a735a68ccfd6a28 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Nov 2024 11:20:02 +0300
Subject: [PATCH 260/306] Added attention style to menu item to delete chats
 filter.

---
 .../ui/widgets/chat_filters_tabs_strip.cpp           | 10 ++++++----
 Telegram/SourceFiles/window/window_filters_menu.cpp  | 12 ++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 78320fb41..6a9f07457 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -86,10 +86,12 @@ void ShowMenu(
 		auto showRemoveBox = [=] {
 			state->removeApi.request(Ui::MakeWeak(parent), controller, id);
 		};
-		addAction(
-			tr::lng_filters_context_remove(tr::now),
-			std::move(showRemoveBox),
-			&st::menuIconDelete);
+		addAction({
+			.text = tr::lng_filters_context_remove(tr::now),
+			.handler = std::move(showRemoveBox),
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
 	} else {
 		auto customUnreadState = [=] {
 			return Data::MainListMapUnreadState(
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 1502db36b..f32608d1c 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -378,10 +378,14 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 			std::move(filteredChats),
 			addAction);
 
-		addAction(
-			tr::lng_filters_context_remove(tr::now),
-			[=] { _removeApi.request(Ui::MakeWeak(&_outer), _session, id); },
-			&st::menuIconDelete);
+		addAction({
+			.text = tr::lng_filters_context_remove(tr::now),
+			.handler = [=, this] {
+				_removeApi.request(Ui::MakeWeak(&_outer), _session, id);
+			},
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
 	} else {
 		auto customUnreadState = [=] {
 			const auto session = &_session->session();

From df45edd816d29877838f08a9e139892ba57e104e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 16 Nov 2024 20:46:30 +0400
Subject: [PATCH 261/306] Move channel requests to a layer.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../boxes/peers/edit_peer_requests_box.cpp    | 125 ++++++--
 .../boxes/peers/edit_peer_requests_box.h      |  33 +-
 Telegram/SourceFiles/info/info_controller.cpp |   2 +
 Telegram/SourceFiles/info/info_controller.h   |   1 +
 Telegram/SourceFiles/info/info_memento.cpp    |   3 +
 .../info_requests_list_widget.cpp             | 287 ++++++++++++++++++
 .../requests_list/info_requests_list_widget.h |  68 +++++
 8 files changed, 498 insertions(+), 23 deletions(-)
 create mode 100644 Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
 create mode 100644 Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index aa61a3336..d5d3b2cac 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -986,6 +986,8 @@ PRIVATE
     info/profile/info_profile_values.h
     info/profile/info_profile_widget.cpp
     info/profile/info_profile_widget.h
+    info/requests_list/info_requests_list_widget.cpp
+    info/requests_list/info_requests_list_widget.h
     info/saved/info_saved_sublists_widget.cpp
     info/saved/info_saved_sublists_widget.h
     info/settings/info_settings_widget.cpp
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
index c28847bcc..26310db43 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
@@ -7,27 +7,30 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/peers/edit_peer_requests_box.h"
 
-#include "ui/effects/ripple_animation.h"
+#include "api/api_invite_links.h"
+#include "apiwrap.h"
+#include "base/unixtime.h"
 #include "boxes/peer_list_controllers.h"
 #include "boxes/peers/edit_participants_box.h" // SubscribeToMigration
 #include "boxes/peers/edit_peer_invite_link.h" // PrepareRequestedRowStatus
-#include "boxes/peers/prepare_short_info_box.h" // PrepareShortInfoBox
-#include "history/view/history_view_requests_bar.h" // kRecentRequestsLimit
-#include "data/data_peer.h"
-#include "data/data_user.h"
-#include "data/data_chat.h"
+#include "boxes/peers/edit_peer_requests_box.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_peer.h"
 #include "data/data_session.h"
-#include "base/unixtime.h"
+#include "data/data_user.h"
+#include "history/view/history_view_requests_bar.h" // kRecentRequestsLimit
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "info/requests_list/info_requests_list_widget.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "mtproto/sender.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
 #include "ui/round_rect.h"
 #include "ui/text/text_utilities.h"
-#include "ui/painter.h"
-#include "lang/lang_keys.h"
 #include "window/window_session_controller.h"
-#include "apiwrap.h"
-#include "api/api_invite_links.h"
 #include "styles/style_boxes.h"
 
 namespace {
@@ -262,14 +265,10 @@ RequestsBoxController::~RequestsBoxController() = default;
 void RequestsBoxController::Start(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer) {
-	auto controller = std::make_unique<RequestsBoxController>(
-		navigation,
-		peer->migrateToOrMe());
-	const auto initBox = [=](not_null<PeerListBox*> box) {
-		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
-	};
-	navigation->parentController()->show(
-		Box<PeerListBox>(std::move(controller), initBox));
+	navigation->showSection(
+		std::make_shared<Info::Memento>(
+			peer->migrateToOrMe(),
+			Info::Section::Type::RequestsList));
 }
 
 Main::Session &RequestsBoxController::session() const {
@@ -289,6 +288,58 @@ std::unique_ptr<PeerListRow> RequestsBoxController::createSearchRow(
 	return nullptr;
 }
 
+std::unique_ptr<PeerListRow> RequestsBoxController::createRestoredRow(
+		not_null<PeerData*> peer) {
+	if (const auto user = peer->asUser()) {
+		return createRow(user, _dates[user]);
+	}
+	return nullptr;
+}
+
+auto RequestsBoxController::saveState() const
+-> std::unique_ptr<PeerListState> {
+	auto result = PeerListController::saveState();
+
+	auto my = std::make_unique<SavedState>();
+	my->dates = _dates;
+	my->offsetDate = _offsetDate;
+	my->offsetUser = _offsetUser;
+	my->allLoaded = _allLoaded;
+	my->wasLoading = (_loadRequestId != 0);
+	if (const auto search = searchController()) {
+		my->searchState = search->saveState();
+	}
+	result->controllerState = std::move(my);
+	return result;
+}
+
+void RequestsBoxController::restoreState(
+		std::unique_ptr<PeerListState> state) {
+	auto typeErasedState = state
+		? state->controllerState.get()
+		: nullptr;
+	if (const auto my = dynamic_cast<SavedState*>(typeErasedState)) {
+		if (const auto requestId = base::take(_loadRequestId)) {
+			_api.request(requestId).cancel();
+		}
+		_dates = std::move(my->dates);
+		_offsetDate = my->offsetDate;
+		_offsetUser = my->offsetUser;
+		_allLoaded = my->allLoaded;
+		if (const auto search = searchController()) {
+			search->restoreState(std::move(my->searchState));
+		}
+		if (my->wasLoading) {
+			loadMoreRows();
+		}
+		PeerListController::restoreState(std::move(state));
+		if (delegate()->peerListFullRowsCount() || _allLoaded) {
+			refreshDescription();
+			delegate()->peerListRefreshRows();
+		}
+	}
+}
+
 void RequestsBoxController::prepare() {
 	delegate()->peerListSetSearchMode(PeerListSearchMode::Enabled);
 	delegate()->peerListSetTitle(_peer->isBroadcast()
@@ -356,9 +407,7 @@ void RequestsBoxController::refreshDescription() {
 }
 
 void RequestsBoxController::rowClicked(not_null<PeerListRow*> row) {
-	_navigation->parentController()->show(PrepareShortInfoBox(
-		row->peer(),
-		_navigation));
+	_navigation->showPeerInfo(row->peer());
 }
 
 void RequestsBoxController::rowElementClicked(
@@ -405,6 +454,7 @@ void RequestsBoxController::appendRow(
 		not_null<UserData*> user,
 		TimeId date) {
 	if (!delegate()->peerListFindRow(user->id.value)) {
+		_dates.emplace(user, date);
 		if (auto row = createRow(user, date)) {
 			delegate()->peerListAppendRow(std::move(row));
 			setDescriptionText(QString());
@@ -503,6 +553,7 @@ std::unique_ptr<PeerListRow> RequestsBoxController::createRow(
 		const auto search = static_cast<RequestsBoxSearchController*>(
 			searchController());
 		date = search->dateForUser(user);
+		_dates.emplace(user, date);
 	}
 	return std::make_unique<Row>(_helper.get(), user, date);
 }
@@ -574,6 +625,36 @@ TimeId RequestsBoxSearchController::dateForUser(not_null<UserData*> user) {
 	return {};
 }
 
+auto RequestsBoxSearchController::saveState() const
+-> std::unique_ptr<SavedStateBase> {
+	auto result = std::make_unique<SavedState>();
+	result->query = _query;
+	result->offsetDate = _offsetDate;
+	result->offsetUser = _offsetUser;
+	result->allLoaded = _allLoaded;
+	result->wasLoading = (_requestId != 0);
+	return result;
+}
+
+void RequestsBoxSearchController::restoreState(
+		std::unique_ptr<SavedStateBase> state) {
+	if (auto my = dynamic_cast<SavedState*>(state.get())) {
+		if (auto requestId = base::take(_requestId)) {
+			_api.request(requestId).cancel();
+		}
+		_cache.clear();
+		_queries.clear();
+
+		_allLoaded = my->allLoaded;
+		_offsetDate = my->offsetDate;
+		_offsetUser = my->offsetUser;
+		_query = my->query;
+		if (my->wasLoading) {
+			searchOnServer();
+		}
+	}
+}
+
 bool RequestsBoxSearchController::searchInCache() {
 	const auto i = _cache.find(_query);
 	if (i != _cache.cend()) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h
index 005b83c84..834ec5431 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h
@@ -35,15 +35,34 @@ public:
 	Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
-	void rowElementClicked(not_null<PeerListRow*> row, int element) override;
+	void rowElementClicked(
+		not_null<PeerListRow*> row,
+		int element) override;
 	void loadMoreRows() override;
 
 	std::unique_ptr<PeerListRow> createSearchRow(
 		not_null<PeerData*> peer) override;
+	std::unique_ptr<PeerListRow> createRestoredRow(
+		not_null<PeerData*> peer) override;
+
+	std::unique_ptr<PeerListState> saveState() const override;
+	void restoreState(std::unique_ptr<PeerListState> state) override;
 
 private:
 	class RowHelper;
 
+	struct SavedState : SavedStateBase {
+		using SearchStateBase = PeerListSearchController::SavedStateBase;
+		std::unique_ptr<SearchStateBase> searchState;
+		base::flat_map<not_null<UserData*>, TimeId> dates;
+		TimeId offsetDate = 0;
+		UserData *offsetUser = nullptr;
+		bool allLoaded = false;
+		bool wasLoading = false;
+		rpl::lifetime lifetime;
+
+	};
+
 	static std::unique_ptr<PeerListSearchController> CreateSearchController(
 		not_null<PeerData*> peer);
 
@@ -63,6 +82,8 @@ private:
 	not_null<PeerData*> _peer;
 	MTP::Sender _api;
 
+	base::flat_map<not_null<UserData*>, TimeId> _dates;
+
 	TimeId _offsetDate = 0;
 	UserData *_offsetUser = nullptr;
 	mtpRequestId _loadRequestId = 0;
@@ -82,7 +103,17 @@ public:
 	void removeFromCache(not_null<UserData*> user);
 	[[nodiscard]] TimeId dateForUser(not_null<UserData*> user);
 
+	std::unique_ptr<SavedStateBase> saveState() const override;
+	void restoreState(std::unique_ptr<SavedStateBase> state) override;
+
 private:
+	struct SavedState : SavedStateBase {
+		QString query;
+		TimeId offsetDate = 0;
+		UserData *offsetUser = nullptr;
+		bool allLoaded = false;
+		bool wasLoading = false;
+	};
 	struct Item {
 		not_null<UserData*> user;
 		TimeId date = 0;
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 7470b1d09..25ad70b2a 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -296,6 +296,7 @@ void Controller::updateSearchControllers(
 		: Section::MediaType::kCount;
 	const auto hasMediaSearch = isMedia
 		&& SharedMediaAllowSearch(mediaType);
+	const auto hasRequestsListSearch = (type == Type::RequestsList);
 	const auto hasCommonGroupsSearch = (type == Type::CommonGroups);
 	const auto hasDownloadsSearch = (type == Type::Downloads);
 	const auto hasMembersSearch = (type == Type::Members)
@@ -312,6 +313,7 @@ void Controller::updateSearchControllers(
 		_searchController = nullptr;
 	}
 	if (hasMediaSearch
+		|| hasRequestsListSearch
 		|| hasCommonGroupsSearch
 		|| hasDownloadsSearch
 		|| hasMembersSearch) {
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index f321e6956..6d7d2e92b 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -106,6 +106,7 @@ public:
 		Media,
 		CommonGroups,
 		SimilarChannels,
+		RequestsList,
 		SavedSublists,
 		PeerGifts,
 		Members,
diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp
index a8018f21c..e26bab419 100644
--- a/Telegram/SourceFiles/info/info_memento.cpp
+++ b/Telegram/SourceFiles/info/info_memento.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/saved/info_saved_sublists_widget.h"
 #include "info/settings/info_settings_widget.h"
 #include "info/similar_channels/info_similar_channels_widget.h"
+#include "info/requests_list/info_requests_list_widget.h"
 #include "info/peer_gifts/info_peer_gifts_widget.h"
 #include "info/polls/info_polls_results_widget.h"
 #include "info/info_section_widget.h"
@@ -149,6 +150,8 @@ std::shared_ptr<ContentMemento> Memento::DefaultContent(
 	case Section::Type::SimilarChannels:
 		return std::make_shared<SimilarChannels::Memento>(
 			peer->asChannel());
+	case Section::Type::RequestsList:
+		return std::make_shared<RequestsList::Memento>(peer->asChannel());
 	case Section::Type::PeerGifts:
 		return std::make_shared<PeerGifts::Memento>(peer->asUser());
 	case Section::Type::SavedSublists:
diff --git a/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
new file mode 100644
index 000000000..ba68ea345
--- /dev/null
+++ b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
@@ -0,0 +1,287 @@
+/*
+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/requests_list/info_requests_list_widget.h"
+
+#include "api/api_chat_participants.h"
+#include "apiwrap.h"
+#include "boxes/peers/edit_peer_requests_box.h"
+#include "boxes/peer_list_box.h"
+#include "data/data_channel.h"
+#include "data/data_peer_values.h"
+#include "data/data_session.h"
+#include "info/info_controller.h"
+#include "main/main_session.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/search_field_controller.h"
+#include "ui/ui_utility.h"
+#include "lang/lang_keys.h"
+#include "styles/style_info.h"
+#include "styles/style_widgets.h"
+#include "boxes/peers/edit_peer_requests_box.h"
+
+namespace Info::RequestsList {
+namespace {
+
+} // namespace
+
+class InnerWidget final
+	: public Ui::RpWidget
+	, private PeerListContentDelegate {
+public:
+	InnerWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		not_null<ChannelData*> channel);
+
+	[[nodiscard]] not_null<ChannelData*> channel() const {
+		return _channel;
+	}
+
+	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
+
+	int desiredHeight() const;
+
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+protected:
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+private:
+	using ListWidget = PeerListContent;
+
+	// PeerListContentDelegate interface
+	void peerListSetTitle(rpl::producer<QString> title) override;
+	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+	int peerListSelectedRowsCount() override;
+	void peerListScrollToTop() override;
+	void peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) override;
+	void peerListFinishSelectedRowsBunch() override;
+	void peerListSetDescription(object_ptr<Ui::FlatLabel> description) override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
+
+	object_ptr<ListWidget> setupList(
+		RpWidget *parent,
+		not_null<RequestsBoxController*> controller);
+
+	const std::shared_ptr<Main::SessionShow> _show;
+	not_null<Controller*> _controller;
+	const not_null<ChannelData*> _channel;
+	std::unique_ptr<RequestsBoxController> _listController;
+	object_ptr<ListWidget> _list;
+
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+};
+
+InnerWidget::InnerWidget(
+	QWidget *parent,
+	not_null<Controller*> controller,
+	not_null<ChannelData*> channel)
+: RpWidget(parent)
+, _show(controller->uiShow())
+, _controller(controller)
+, _channel(channel)
+, _listController(std::make_unique<RequestsBoxController>(
+	controller,
+	_channel))
+, _list(setupList(this, _listController.get())) {
+	setContent(_list.data());
+	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
+
+	controller->searchFieldController()->queryValue(
+	) | rpl::start_with_next([this](QString &&query) {
+		peerListScrollToTop();
+		content()->searchQueryChanged(std::move(query));
+	}, lifetime());
+}
+
+void InnerWidget::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+	memento->setListState(_listController->saveState());
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+	_listController->restoreState(memento->listState());
+}
+
+rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
+	return _scrollToRequests.events();
+}
+
+int InnerWidget::desiredHeight() const {
+	auto desired = 0;
+	desired += _list->fullRowsCount() * st::infoMembersList.item.height;
+	return qMax(height(), desired);
+}
+
+object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
+		RpWidget *parent,
+		not_null<RequestsBoxController*> controller) {
+	auto result = object_ptr<ListWidget>(parent, controller);
+	result->scrollToRequests(
+	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+		auto addmin = (request.ymin < 0) ? 0 : st::infoCommonGroupsMargin.top();
+		auto addmax = (request.ymax < 0) ? 0 : st::infoCommonGroupsMargin.top();
+		_scrollToRequests.fire({
+			request.ymin + addmin,
+			request.ymax + addmax });
+	}, result->lifetime());
+	result->moveToLeft(0, st::infoCommonGroupsMargin.top());
+
+	parent->widthValue(
+	) | rpl::start_with_next([list = result.data()](int newWidth) {
+		list->resizeToWidth(newWidth);
+	}, result->lifetime());
+
+	result->heightValue(
+	) | rpl::start_with_next([parent](int listHeight) {
+		auto newHeight = st::infoCommonGroupsMargin.top()
+			+ listHeight
+			+ st::infoCommonGroupsMargin.bottom();
+		parent->resize(parent->width(), newHeight);
+	}, result->lifetime());
+
+	return result;
+}
+
+void InnerWidget::peerListSetTitle(rpl::producer<QString> title) {
+}
+
+void InnerWidget::peerListSetAdditionalTitle(rpl::producer<QString> title) {
+}
+
+bool InnerWidget::peerListIsRowChecked(not_null<PeerListRow*> row) {
+	return false;
+}
+
+int InnerWidget::peerListSelectedRowsCount() {
+	return 0;
+}
+
+void InnerWidget::peerListScrollToTop() {
+	_scrollToRequests.fire({ -1, -1 });
+}
+
+void InnerWidget::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void InnerWidget::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void InnerWidget::peerListFinishSelectedRowsBunch() {
+}
+
+void InnerWidget::peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) {
+	description.destroy();
+}
+
+std::shared_ptr<Main::SessionShow> InnerWidget::peerListUiShow() {
+	return _show;
+}
+
+Memento::Memento(not_null<ChannelData*> channel)
+: ContentMemento(channel, nullptr, PeerId()) {
+}
+
+Section Memento::section() const {
+	return Section(Section::Type::RequestsList);
+}
+
+not_null<ChannelData*> Memento::channel() const {
+	return peer()->asChannel();
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(parent, controller, channel());
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+void Memento::setListState(std::unique_ptr<PeerListState> state) {
+	_listState = std::move(state);
+}
+
+std::unique_ptr<PeerListState> Memento::listState() {
+	return std::move(_listState);
+}
+
+Memento::~Memento() = default;
+
+Widget::Widget(
+	QWidget *parent,
+	not_null<Controller*> controller,
+	not_null<ChannelData*> channel)
+: ContentWidget(parent, controller) {
+	controller->setSearchEnabledByContent(true);
+	_inner = setInnerWidget(object_ptr<InnerWidget>(
+		this,
+		controller,
+		channel));
+}
+
+rpl::producer<QString> Widget::title() {
+	return tr::lng_manage_peer_requests();
+}
+
+not_null<ChannelData*> Widget::channel() const {
+	return _inner->channel();
+}
+
+bool Widget::showInternal(not_null<ContentMemento*> memento) {
+	if (!controller()->validateMementoPeer(memento)) {
+		return false;
+	}
+	if (auto requestsMemento = dynamic_cast<Memento*>(memento.get())) {
+		if (requestsMemento->channel() == channel()) {
+			restoreState(requestsMemento);
+			return true;
+		}
+	}
+	return false;
+}
+
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(channel());
+	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());
+}
+
+} // namespace Info::RequestsList
diff --git a/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h
new file mode 100644
index 000000000..d61fc938e
--- /dev/null
+++ b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h
@@ -0,0 +1,68 @@
+/*
+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"
+
+class ChannelData;
+struct PeerListState;
+
+namespace Info::RequestsList {
+
+class InnerWidget;
+
+class Memento final : public ContentMemento {
+public:
+	explicit Memento(not_null<ChannelData*> channel);
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+	[[nodiscard]] not_null<ChannelData*> channel() const;
+
+	void setListState(std::unique_ptr<PeerListState> state);
+	std::unique_ptr<PeerListState> listState();
+
+	~Memento();
+
+private:
+	std::unique_ptr<PeerListState> _listState;
+};
+
+class Widget final : public ContentWidget {
+public:
+	Widget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		not_null<ChannelData*> channel);
+
+	[[nodiscard]] not_null<ChannelData*> channel() const;
+
+	bool showInternal(
+		not_null<ContentMemento*> memento) override;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento);
+
+	rpl::producer<QString> title() override;
+
+private:
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	InnerWidget *_inner = nullptr;
+};
+
+} // namespace Info::RequestsList

From 702aa944dd7d6b5c7a3d03112d9e6d9e06351f9a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 12:22:12 +0400
Subject: [PATCH 262/306] Move read/reacted list to a layer.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../boxes/peers/edit_peer_requests_box.h      |   2 -
 .../view/history_view_context_menu.cpp        |  20 +-
 .../reactions/history_view_reactions_list.cpp | 231 ++++++++----
 .../reactions/history_view_reactions_list.h   |  27 +-
 .../reactions/history_view_reactions_tabs.h   |   2 +-
 .../SourceFiles/info/info_content_widget.cpp  |  40 +-
 .../SourceFiles/info/info_content_widget.h    |  25 +-
 Telegram/SourceFiles/info/info_controller.cpp |  41 ++
 Telegram/SourceFiles/info/info_controller.h   |  25 +-
 Telegram/SourceFiles/info/info_memento.cpp    |  20 +
 Telegram/SourceFiles/info/info_memento.h      |  13 +
 .../polls/info_polls_results_inner_widget.cpp |   7 +-
 .../polls/info_polls_results_inner_widget.h   |   7 +-
 .../info/polls/info_polls_results_widget.cpp  |   6 +-
 .../info/polls/info_polls_results_widget.h    |   6 +-
 .../info_reactions_list_widget.cpp            | 352 ++++++++++++++++++
 .../info_reactions_list_widget.h              |  82 ++++
 .../info_requests_list_widget.cpp             |   8 -
 .../requests_list/info_requests_list_widget.h |   1 +
 20 files changed, 788 insertions(+), 129 deletions(-)
 create mode 100644 Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
 create mode 100644 Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index d5d3b2cac..8ea6aa9ae 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -986,6 +986,8 @@ PRIVATE
     info/profile/info_profile_values.h
     info/profile/info_profile_widget.cpp
     info/profile/info_profile_widget.h
+    info/reactions_list/info_reactions_list_widget.cpp
+    info/reactions_list/info_reactions_list_widget.h
     info/requests_list/info_requests_list_widget.cpp
     info/requests_list/info_requests_list_widget.h
     info/saved/info_saved_sublists_widget.cpp
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h
index 834ec5431..4db714bc3 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h
@@ -59,8 +59,6 @@ private:
 		UserData *offsetUser = nullptr;
 		bool allLoaded = false;
 		bool wasLoading = false;
-		rpl::lifetime lifetime;
-
 	};
 
 	static std::unique_ptr<PeerListSearchController> CreateSearchController(
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index ba765b3c7..0fb338a88 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1510,11 +1510,13 @@ void AddWhoReactedAction(
 			strong->hideMenu();
 		}
 		if (const auto item = controller->session().data().message(itemId)) {
-			controller->window().show(Reactions::FullListBox(
-				controller,
-				item,
-				{},
-				whoReadIds));
+			controller->showSection(
+				std::make_shared<Info::Memento>(
+					whoReadIds,
+					itemId,
+					HistoryView::Reactions::DefaultSelectedTab(
+						item,
+						whoReadIds)));
 		}
 	};
 	if (!menu->empty()) {
@@ -1685,10 +1687,10 @@ void ShowWhoReactedMenu(
 	};
 	const auto showAllChosen = [=, itemId = item->fullId()]{
 		if (const auto item = controller->session().data().message(itemId)) {
-			controller->window().show(Reactions::FullListBox(
-				controller,
-				item,
-				id));
+			controller->showSection(std::make_shared<Info::Memento>(
+				nullptr,
+				itemId,
+				HistoryView::Reactions::DefaultSelectedTab(item, id)));
 		}
 	};
 	const auto owner = &controller->session().data();
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp
index f925dcb90..209e73e3c 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp
@@ -62,8 +62,8 @@ private:
 class Controller final : public PeerListController {
 public:
 	Controller(
-		not_null<Window::SessionController*> window,
-		not_null<HistoryItem*> item,
+		not_null<Window::SessionNavigation*> window,
+		FullMsgId itemId,
 		const ReactionId &selected,
 		rpl::producer<ReactionId> switches,
 		std::shared_ptr<Api::WhoReadList> whoReadIds);
@@ -73,9 +73,26 @@ public:
 	void rowClicked(not_null<PeerListRow*> row) override;
 	void loadMoreRows() override;
 
+	std::unique_ptr<PeerListRow> createRestoredRow(
+		not_null<PeerData*> peer) override;
+
+	std::unique_ptr<PeerListState> saveState() const override;
+	void restoreState(std::unique_ptr<PeerListState> state) override;
+
 private:
 	using AllEntry = std::pair<not_null<PeerData*>, Data::ReactionId>;
 
+	struct SavedState : SavedStateBase {
+		ReactionId shownReaction;
+		base::flat_map<std::pair<PeerId, ReactionId>, uint64> idsMap;
+		uint64 idsCounter = 0;
+		std::vector<AllEntry> all;
+		QString allOffset;
+		std::vector<not_null<PeerData*>> filtered;
+		QString filteredOffset;
+		bool wasLoading = false;
+	};
+
 	void fillWhoRead();
 	void loadMore(const ReactionId &reaction);
 	bool appendRow(not_null<PeerData*> peer, ReactionId reaction);
@@ -88,14 +105,15 @@ private:
 		not_null<PeerData*> peer,
 		const ReactionId &reaction) const;
 
-	const not_null<Window::SessionController*> _window;
-	const not_null<HistoryItem*> _item;
+	const not_null<Window::SessionNavigation*> _window;
+	const not_null<PeerData*> _peer;
+	const FullMsgId _itemId;
 	const Ui::Text::CustomEmojiFactory _factory;
+	const std::shared_ptr<Api::WhoReadList> _whoReadIds;
+	const std::vector<not_null<PeerData*>> _whoRead;
 	MTP::Sender _api;
 
 	ReactionId _shownReaction;
-	std::shared_ptr<Api::WhoReadList> _whoReadIds;
-	std::vector<not_null<PeerData*>> _whoRead;
 
 	mutable base::flat_map<std::pair<PeerId, ReactionId>, uint64> _idsMap;
 	mutable uint64 _idsCounter = 0;
@@ -110,6 +128,22 @@ private:
 
 };
 
+[[nodiscard]] std::vector<not_null<PeerData*>> ResolveWhoRead(
+		not_null<Window::SessionNavigation*> window,
+		const std::shared_ptr<Api::WhoReadList> &whoReadIds) {
+	if (!whoReadIds || whoReadIds->list.empty()) {
+		return {};
+	}
+	auto result = std::vector<not_null<PeerData*>>();
+	auto &owner = window->session().data();
+	for (const auto &peerWithDate : whoReadIds->list) {
+		if (const auto peer = owner.peerLoaded(peerWithDate.peer)) {
+			result.push_back(peer);
+		}
+	}
+	return result;
+}
+
 Row::Row(
 	uint64 id,
 	not_null<PeerData*> peer,
@@ -166,17 +200,19 @@ void Row::rightActionPaint(
 }
 
 Controller::Controller(
-	not_null<Window::SessionController*> window,
-	not_null<HistoryItem*> item,
+	not_null<Window::SessionNavigation*> window,
+	FullMsgId itemId,
 	const ReactionId &selected,
 	rpl::producer<ReactionId> switches,
 	std::shared_ptr<Api::WhoReadList> whoReadIds)
 : _window(window)
-, _item(item)
+, _peer(window->session().data().peer(itemId.peer))
+, _itemId(itemId)
 , _factory(Data::ReactedMenuFactory(&window->session()))
+, _whoReadIds(whoReadIds)
+, _whoRead(ResolveWhoRead(window, _whoReadIds))
 , _api(&window->session().mtp())
-, _shownReaction(selected)
-, _whoReadIds(whoReadIds) {
+, _shownReaction(selected) {
 	std::move(
 		switches
 	) | rpl::filter([=](const ReactionId &reaction) {
@@ -248,14 +284,6 @@ uint64 Controller::id(
 }
 
 void Controller::fillWhoRead() {
-	if (_whoReadIds && !_whoReadIds->list.empty() && _whoRead.empty()) {
-		auto &owner = _window->session().data();
-		for (const auto &peerWithDate : _whoReadIds->list) {
-			if (const auto peer = owner.peerLoaded(peerWithDate.peer)) {
-				_whoRead.push_back(peer);
-			}
-		}
-	}
 	for (const auto &peer : _whoRead) {
 		appendRow(peer, ReactionId());
 	}
@@ -271,6 +299,60 @@ void Controller::loadMoreRows() {
 	loadMore(_shownReaction);
 }
 
+std::unique_ptr<PeerListRow> Controller::createRestoredRow(
+		not_null<PeerData*> peer) {
+	if (_shownReaction.emoji() == u"read"_q) {
+		return createRow(peer, Data::ReactionId());
+	} else if (_shownReaction.empty()) {
+		const auto i = ranges::find(_all, peer, &AllEntry::first);
+		const auto reaction = (i != end(_all)) ? i->second : _shownReaction;
+		return createRow(peer, reaction);
+	}
+	return createRow(peer, _shownReaction);
+}
+
+std::unique_ptr<PeerListState> Controller::saveState() const {
+	auto result = PeerListController::saveState();
+
+	auto my = std::make_unique<SavedState>();
+	my->shownReaction = _shownReaction;
+	my->idsMap = _idsMap;
+	my->idsCounter = _idsCounter;
+	my->all = _all;
+	my->allOffset = _allOffset;
+	my->filtered = _filtered;
+	my->filteredOffset = _filteredOffset;
+	my->wasLoading = (_loadRequestId != 0);
+	result->controllerState = std::move(my);
+	return result;
+}
+
+void Controller::restoreState(std::unique_ptr<PeerListState> state) {
+	auto typeErasedState = state
+		? state->controllerState.get()
+		: nullptr;
+	if (const auto my = dynamic_cast<SavedState*>(typeErasedState)) {
+		if (const auto requestId = base::take(_loadRequestId)) {
+			_api.request(requestId).cancel();
+		}
+		_shownReaction = my->shownReaction;
+		_idsMap = std::move(my->idsMap);
+		_idsCounter = my->idsCounter;
+		_all = std::move(my->all);
+		_allOffset = std::move(my->allOffset);
+		_filtered = std::move(my->filtered);
+		_filteredOffset = std::move(my->filteredOffset);
+		if (my->wasLoading) {
+			loadMoreRows();
+		}
+		PeerListController::restoreState(std::move(state));
+		if (delegate()->peerListFullRowsCount()) {
+			setDescriptionText(QString());
+			delegate()->peerListRefreshRows();
+		}
+	}
+}
+
 void Controller::loadMore(const ReactionId &reaction) {
 	if (reaction.emoji() == u"read"_q) {
 		loadMore(ReactionId());
@@ -290,8 +372,8 @@ void Controller::loadMore(const ReactionId &reaction) {
 		| (reaction.empty() ? Flag(0) : Flag::f_reaction);
 	_loadRequestId = _api.request(MTPmessages_GetMessageReactionsList(
 		MTP_flags(flags),
-		_item->history()->peer->input,
-		MTP_int(_item->id),
+		_peer->input,
+		MTP_int(_itemId.msg),
 		Data::ReactionToMTP(reaction),
 		MTP_string(offset),
 		MTP_int(offset.isEmpty() ? kPerPageFirst : kPerPage)
@@ -332,7 +414,7 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 	const auto window = _window;
 	const auto peer = row->peer();
 	crl::on_main(window, [=] {
-		window->show(PrepareShortInfoBox(peer, window));
+		window->showPeerInfo(peer);
 	});
 }
 
@@ -353,72 +435,75 @@ std::unique_ptr<PeerListRow> Controller::createRow(
 		_factory,
 		Data::ReactionEntityData(reaction),
 		[=](Row *row) { delegate()->peerListUpdateRow(row); },
-		[=] { return _window->isGifPausedAtLeastFor(
+		[=] { return _window->parentController()->isGifPausedAtLeastFor(
 			Window::GifPauseReason::Layer); });
 }
 
 } // namespace
 
-object_ptr<Ui::BoxContent> FullListBox(
-		not_null<Window::SessionController*> window,
+Data::ReactionId DefaultSelectedTab(
+		not_null<HistoryItem*> item,
+		std::shared_ptr<Api::WhoReadList> whoReadIds) {
+	return DefaultSelectedTab(item, {}, std::move(whoReadIds));
+}
+
+Data::ReactionId DefaultSelectedTab(
 		not_null<HistoryItem*> item,
 		Data::ReactionId selected,
 		std::shared_ptr<Api::WhoReadList> whoReadIds) {
-	Expects(IsServerMsgId(item->id));
-
-	if (!ranges::contains(
-			item->reactions(),
-			selected,
-			&Data::MessageReaction::id)) {
+	const auto proj = &Data::MessageReaction::id;
+	if (!ranges::contains(item->reactions(), selected, proj)) {
 		selected = {};
 	}
-	if (selected.empty() && whoReadIds && !whoReadIds->list.empty()) {
-		selected = Data::ReactionId{ u"read"_q };
-	}
-	const auto tabRequests = std::make_shared<
-		rpl::event_stream<Data::ReactionId>>();
-	const auto initBox = [=](not_null<PeerListBox*> box) {
-		box->setNoContentMargin(true);
+	return (selected.empty() && whoReadIds && !whoReadIds->list.empty())
+		? Data::ReactionId{ u"read"_q }
+		: selected;
+}
 
-		auto map = item->reactions();
-		if (whoReadIds && !whoReadIds->list.empty()) {
-			map.push_back({
-				.id = Data::ReactionId{ u"read"_q },
-				.count = int(whoReadIds->list.size()),
-			});
-		}
-		const auto tabs = CreateTabs(
-			box,
-			Data::ReactedMenuFactory(&item->history()->session()),
-			[=] { return window->isGifPausedAtLeastFor(
-				Window::GifPauseReason::Layer); },
-			map,
-			selected,
-			whoReadIds ? whoReadIds->type : Ui::WhoReadType::Reacted);
-		tabs->changes(
-		) | rpl::start_to_stream(*tabRequests, box->lifetime());
-
-		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
-			tabs->resizeToWidth(width);
-			tabs->move(0, 0);
-		}, box->lifetime());
-		tabs->heightValue(
-		) | rpl::start_with_next([=](int height) {
-			box->setAddedTopScrollSkip(height);
-		}, box->lifetime());
-		box->addButton(tr::lng_close(), [=] {
-			box->closeBox();
+not_null<Tabs*> CreateReactionsTabs(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionNavigation*> window,
+		FullMsgId itemId,
+		Data::ReactionId selected,
+		std::shared_ptr<Api::WhoReadList> whoReadIds) {
+	const auto item = window->session().data().message(itemId);
+	auto map = item
+		? item->reactions()
+		: std::vector<Data::MessageReaction>();
+	if (whoReadIds && !whoReadIds->list.empty()) {
+		map.push_back({
+			.id = Data::ReactionId{ u"read"_q },
+			.count = int(whoReadIds->list.size()),
 		});
-	};
-	return Box<PeerListBox>(
-		std::make_unique<Controller>(
+	}
+	return CreateTabs(
+		parent,
+		Data::ReactedMenuFactory(&window->session()),
+		[=] { return window->parentController()->isGifPausedAtLeastFor(
+			Window::GifPauseReason::Layer); },
+		map,
+		selected,
+		whoReadIds ? whoReadIds->type : Ui::WhoReadType::Reacted);
+}
+
+PreparedFullList FullListController(
+		not_null<Window::SessionNavigation*> window,
+		FullMsgId itemId,
+		Data::ReactionId selected,
+		std::shared_ptr<Api::WhoReadList> whoReadIds) {
+	Expects(IsServerMsgId(itemId.msg));
+
+	const auto tab = std::make_shared<
+		rpl::event_stream<Data::ReactionId>>();
+	return {
+		.controller = std::make_unique<Controller>(
 			window,
-			item,
+			itemId,
 			selected,
-			tabRequests->events(),
+			tab->events(),
 			whoReadIds),
-		initBox);
+		.switchTab = [=](Data::ReactionId id) { tab->fire_copy(id); },
+	};
 }
 
 } // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.h
index b65c21065..be6dc59fe 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/object_ptr.h"
 
 class HistoryItem;
+class PeerListController;
 
 namespace Data {
 struct ReactionId;
@@ -21,6 +22,7 @@ struct WhoReadList;
 
 namespace Window {
 class SessionController;
+class SessionNavigation;
 } // namespace Window
 
 namespace Ui {
@@ -29,10 +31,31 @@ class BoxContent;
 
 namespace HistoryView::Reactions {
 
-object_ptr<Ui::BoxContent> FullListBox(
-	not_null<Window::SessionController*> window,
+[[nodiscard]] Data::ReactionId DefaultSelectedTab(
+	not_null<HistoryItem*> item,
+	std::shared_ptr<Api::WhoReadList> whoReadIds);
+
+[[nodiscard]] Data::ReactionId DefaultSelectedTab(
 	not_null<HistoryItem*> item,
 	Data::ReactionId selected,
 	std::shared_ptr<Api::WhoReadList> whoReadIds = nullptr);
 
+struct Tabs;
+[[nodiscard]] not_null<Tabs*> CreateReactionsTabs(
+	not_null<QWidget*> parent,
+	not_null<Window::SessionNavigation*> window,
+	FullMsgId itemId,
+	Data::ReactionId selected,
+	std::shared_ptr<Api::WhoReadList> whoReadIds);
+
+struct PreparedFullList {
+	std::unique_ptr<PeerListController> controller;
+	Fn<void(Data::ReactionId)> switchTab;
+};
+[[nodiscard]] PreparedFullList FullListController(
+	not_null<Window::SessionNavigation*> window,
+	FullMsgId itemId,
+	Data::ReactionId selected,
+	std::shared_ptr<Api::WhoReadList> whoReadIds = nullptr);
+
 } // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.h
index 51d776004..8e3566552 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.h
@@ -27,7 +27,7 @@ struct Tabs {
 	Fn<rpl::producer<int>()> heightValue;
 };
 
-not_null<Tabs*> CreateTabs(
+[[nodiscard]] not_null<Tabs*> CreateTabs(
 	not_null<QWidget*> parent,
 	Ui::Text::CustomEmojiFactory factory,
 	Fn<bool()> paused,
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index 942864710..15583240a 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -7,27 +7,28 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/info_content_widget.h"
 
-#include "window/window_session_controller.h"
-#include "ui/widgets/scroll_area.h"
-#include "ui/widgets/fields/input_field.h"
-#include "ui/wrap/padding_wrap.h"
-#include "ui/search_field_controller.h"
-#include "ui/ui_utility.h"
-#include "lang/lang_keys.h"
-#include "info/profile/info_profile_widget.h"
-#include "info/media/info_media_widget.h"
-#include "info/common_groups/info_common_groups_widget.h"
-#include "info/info_layer_widget.h"
-#include "info/info_section_widget.h"
-#include "info/info_controller.h"
+#include "api/api_who_reacted.h"
 #include "boxes/peer_list_box.h"
 #include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_session.h"
 #include "data/data_forum_topic.h"
 #include "data/data_forum.h"
+#include "info/profile/info_profile_widget.h"
+#include "info/media/info_media_widget.h"
+#include "info/common_groups/info_common_groups_widget.h"
+#include "info/info_layer_widget.h"
+#include "info/info_section_widget.h"
+#include "info/info_controller.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/search_field_controller.h"
+#include "ui/ui_utility.h"
 #include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
 #include "styles/style_info.h"
 #include "styles/style_profile.h"
 #include "styles/style_layers.h"
@@ -377,6 +378,8 @@ Key ContentMemento::key() const {
 		return Stories::Tag{ peer, storiesTab() };
 	} else if (const auto peer = statisticsTag().peer) {
 		return statisticsTag();
+	} else if (const auto who = reactionsWhoReadIds()) {
+		return Key(who, _reactionsSelected, _pollReactionsContextId);
 	} else {
 		return Downloads::Tag();
 	}
@@ -417,4 +420,15 @@ ContentMemento::ContentMemento(Statistics::Tag statistics)
 : _statisticsTag(statistics) {
 }
 
+ContentMemento::ContentMemento(
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: _reactionsWhoReadIds(whoReadIds
+	? whoReadIds
+	: std::make_shared<Api::WhoReadList>())
+, _reactionsSelected(selected)
+, _pollReactionsContextId(contextId) {
+}
+
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index fd39d7384..f0c46da5a 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -10,6 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_wrap_widget.h"
 #include "info/statistics/info_statistics_tag.h"
 
+namespace Api {
+struct WhoReadList;
+} // namespace Api
+
 namespace Dialogs::Stories {
 struct Content;
 } // namespace Dialogs::Stories
@@ -189,8 +193,12 @@ public:
 	explicit ContentMemento(Statistics::Tag statistics);
 	ContentMemento(not_null<PollData*> poll, FullMsgId contextId)
 	: _poll(poll)
-	, _pollContextId(contextId) {
+	, _pollReactionsContextId(contextId) {
 	}
+	ContentMemento(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
 
 	virtual object_ptr<ContentWidget> createWidget(
 		QWidget *parent,
@@ -222,7 +230,16 @@ public:
 		return _poll;
 	}
 	FullMsgId pollContextId() const {
-		return _pollContextId;
+		return _poll ? _pollReactionsContextId : FullMsgId();
+	}
+	std::shared_ptr<Api::WhoReadList> reactionsWhoReadIds() const {
+		return _reactionsWhoReadIds;
+	}
+	Data::ReactionId reactionsSelected() const {
+		return _reactionsSelected;
+	}
+	FullMsgId reactionsContextId() const {
+		return _reactionsWhoReadIds ? _pollReactionsContextId : FullMsgId();
 	}
 	Key key() const;
 
@@ -264,7 +281,9 @@ private:
 	Stories::Tab _storiesTab = {};
 	Statistics::Tag _statisticsTag;
 	PollData * const _poll = nullptr;
-	const FullMsgId _pollContextId;
+	std::shared_ptr<Api::WhoReadList> _reactionsWhoReadIds;
+	Data::ReactionId _reactionsSelected;
+	const FullMsgId _pollReactionsContextId;
 
 	int _scrollTop = 0;
 	QString _searchFieldQuery;
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 25ad70b2a..388f870fe 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -50,6 +50,13 @@ Key::Key(not_null<PollData*> poll, FullMsgId contextId)
 : _value(PollKey{ poll, contextId }) {
 }
 
+Key::Key(
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	Data::ReactionId selected,
+	FullMsgId contextId)
+: _value(ReactionsKey{ whoReadIds, selected, contextId }) {
+}
+
 PeerData *Key::peer() const {
 	if (const auto peer = std::get_if<not_null<PeerData*>>(&_value)) {
 		return *peer;
@@ -113,6 +120,27 @@ FullMsgId Key::pollContextId() const {
 	return FullMsgId();
 }
 
+std::shared_ptr<Api::WhoReadList> Key::reactionsWhoReadIds() const {
+	if (const auto data = std::get_if<ReactionsKey>(&_value)) {
+		return data->whoReadIds;
+	}
+	return nullptr;
+}
+
+Data::ReactionId Key::reactionsSelected() const {
+	if (const auto data = std::get_if<ReactionsKey>(&_value)) {
+		return data->selected;
+	}
+	return Data::ReactionId();
+}
+
+FullMsgId Key::reactionsContextId() const {
+	if (const auto data = std::get_if<ReactionsKey>(&_value)) {
+		return data->contextId;
+	}
+	return FullMsgId();
+}
+
 rpl::producer<SparseIdsMergedSlice> AbstractController::mediaSource(
 		SparseIdsMergedSlice::UniversalMsgId aroundId,
 		int limitBefore,
@@ -183,6 +211,19 @@ PollData *AbstractController::poll() const {
 	return nullptr;
 }
 
+auto AbstractController::reactionsWhoReadIds() const
+-> std::shared_ptr<Api::WhoReadList> {
+	return key().reactionsWhoReadIds();
+}
+
+Data::ReactionId AbstractController::reactionsSelected() const {
+	return key().reactionsSelected();
+}
+
+FullMsgId AbstractController::reactionsContextId() const {
+	return key().reactionsContextId();
+}
+
 void AbstractController::showSection(
 		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params) {
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index 6d7d2e92b..4fad8ca05 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -7,10 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/data_message_reaction_id.h"
 #include "data/data_search_controller.h"
 #include "info/statistics/info_statistics_tag.h"
 #include "window/window_session_controller.h"
 
+namespace Api {
+struct WhoReadList;
+} // namespace Api
+
 namespace Data {
 class ForumTopic;
 } // namespace Data
@@ -67,6 +72,10 @@ public:
 	Key(Stories::Tag stories);
 	Key(Statistics::Tag statistics);
 	Key(not_null<PollData*> poll, FullMsgId contextId);
+	Key(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		Data::ReactionId selected,
+		FullMsgId contextId);
 
 	PeerData *peer() const;
 	Data::ForumTopic *topic() const;
@@ -77,12 +86,20 @@ public:
 	Statistics::Tag statisticsTag() const;
 	PollData *poll() const;
 	FullMsgId pollContextId() const;
+	std::shared_ptr<Api::WhoReadList> reactionsWhoReadIds() const;
+	Data::ReactionId reactionsSelected() const;
+	FullMsgId reactionsContextId() const;
 
 private:
 	struct PollKey {
 		not_null<PollData*> poll;
 		FullMsgId contextId;
 	};
+	struct ReactionsKey {
+		std::shared_ptr<Api::WhoReadList> whoReadIds;
+		Data::ReactionId selected;
+		FullMsgId contextId;
+	};
 	std::variant<
 		not_null<PeerData*>,
 		not_null<Data::ForumTopic*>,
@@ -90,7 +107,8 @@ private:
 		Downloads::Tag,
 		Stories::Tag,
 		Statistics::Tag,
-		PollKey> _value;
+		PollKey,
+		ReactionsKey> _value;
 
 };
 
@@ -107,6 +125,7 @@ public:
 		CommonGroups,
 		SimilarChannels,
 		RequestsList,
+		ReactionsList,
 		SavedSublists,
 		PeerGifts,
 		Members,
@@ -187,6 +206,10 @@ public:
 	[[nodiscard]] FullMsgId pollContextId() const {
 		return key().pollContextId();
 	}
+	[[nodiscard]] auto reactionsWhoReadIds() const
+		-> std::shared_ptr<Api::WhoReadList>;
+	[[nodiscard]] Data::ReactionId reactionsSelected() const;
+	[[nodiscard]] FullMsgId reactionsContextId() const;
 
 	virtual void setSearchEnabledByContent(bool enabled) {
 	}
diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp
index e26bab419..7e38fb5d1 100644
--- a/Telegram/SourceFiles/info/info_memento.cpp
+++ b/Telegram/SourceFiles/info/info_memento.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/saved/info_saved_sublists_widget.h"
 #include "info/settings/info_settings_widget.h"
 #include "info/similar_channels/info_similar_channels_widget.h"
+#include "info/reactions_list/info_reactions_list_widget.h"
 #include "info/requests_list/info_requests_list_widget.h"
 #include "info/peer_gifts/info_peer_gifts_widget.h"
 #include "info/polls/info_polls_results_widget.h"
@@ -54,6 +55,13 @@ Memento::Memento(not_null<PollData*> poll, FullMsgId contextId)
 : Memento(DefaultStack(poll, contextId)) {
 }
 
+Memento::Memento(
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: Memento(DefaultStack(std::move(whoReadIds), contextId, selected)) {
+}
+
 Memento::Memento(std::vector<std::shared_ptr<ContentMemento>> stack)
 : _stack(std::move(stack)) {
 	auto topics = base::flat_set<not_null<Data::ForumTopic*>>();
@@ -113,6 +121,18 @@ std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 	return result;
 }
 
+std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected) {
+	auto result = std::vector<std::shared_ptr<ContentMemento>>();
+	result.push_back(std::make_shared<ReactionsList::Memento>(
+		std::move(whoReadIds),
+		contextId,
+		selected));
+	return result;
+}
+
 Section Memento::DefaultSection(not_null<PeerData*> peer) {
 	if (peer->savedSublistsInfo()) {
 		return Section(Section::Type::SavedSublists);
diff --git a/Telegram/SourceFiles/info/info_memento.h b/Telegram/SourceFiles/info/info_memento.h
index 3d18296cb..dc50f2f89 100644
--- a/Telegram/SourceFiles/info/info_memento.h
+++ b/Telegram/SourceFiles/info/info_memento.h
@@ -13,12 +13,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/section_memento.h"
 #include "base/object_ptr.h"
 
+namespace Api {
+struct WhoReadList;
+} // namespace Api
+
 namespace Storage {
 enum class SharedMediaType : signed char;
 } // namespace Storage
 
 namespace Data {
 class ForumTopic;
+struct ReactionId;
 } // namespace Data
 
 namespace Ui {
@@ -46,6 +51,10 @@ public:
 	Memento(not_null<Data::ForumTopic*> topic, Section section);
 	Memento(Settings::Tag settings, Section section);
 	Memento(not_null<PollData*> poll, FullMsgId contextId);
+	Memento(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
 	explicit Memento(std::vector<std::shared_ptr<ContentMemento>> stack);
 
 	object_ptr<Window::SectionWidget> createWidget(
@@ -91,6 +100,10 @@ private:
 	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		not_null<PollData*> poll,
 		FullMsgId contextId);
+	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
 
 	static std::shared_ptr<ContentMemento> DefaultContent(
 		not_null<PeerData*> peer,
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 f54e09ea5..d2b8b31b9 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
@@ -24,8 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_info.h"
 
-namespace Info {
-namespace Polls {
+namespace Info::Polls {
 namespace {
 
 constexpr auto kFirstPage = 15;
@@ -659,6 +658,4 @@ auto InnerWidget::showPeerInfoRequests() const
 	return _showPeerInfoRequests.events();
 }
 
-} // namespace Polls
-} // namespace Info
-
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.h b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.h
index f2fbf05af..c84e10ef9 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.h
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.h
@@ -16,10 +16,10 @@ class VerticalLayout;
 } // namespace Ui
 
 namespace Info {
-
 class Controller;
+} // namespace Info
 
-namespace Polls {
+namespace Info::Polls {
 
 class Memento;
 class ListController;
@@ -70,5 +70,4 @@ private:
 
 };
 
-} // namespace Polls
-} // namespace Info
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
index 02d3fe0a2..056eb35cf 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
@@ -13,8 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_poll.h"
 #include "ui/ui_utility.h"
 
-namespace Info {
-namespace Polls {
+namespace Info::Polls {
 
 Memento::Memento(not_null<PollData*> poll, FullMsgId contextId)
 : ContentMemento(poll, contextId) {
@@ -113,5 +112,4 @@ void Widget::restoreState(not_null<Memento*> memento) {
 	scrollTopRestore(memento->scrollTop());
 }
 
-} // namespace Polls
-} // namespace Info
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_widget.h b/Telegram/SourceFiles/info/polls/info_polls_results_widget.h
index 6766da4f5..a3c4ac752 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_widget.h
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_widget.h
@@ -12,8 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 struct PeerListState;
 
-namespace Info {
-namespace Polls {
+namespace Info::Polls {
 
 class InnerWidget;
 
@@ -68,5 +67,4 @@ private:
 
 };
 
-} // namespace Polls
-} // namespace Info
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
new file mode 100644
index 000000000..a94f2f2a7
--- /dev/null
+++ b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
@@ -0,0 +1,352 @@
+/*
+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/reactions_list/info_reactions_list_widget.h"
+
+#include "api/api_who_reacted.h"
+#include "boxes/peer_list_box.h"
+#include "data/data_channel.h"
+#include "history/view/reactions/history_view_reactions_list.h"
+#include "history/view/reactions/history_view_reactions_tabs.h"
+#include "info/info_controller.h"
+#include "ui/controls/who_reacted_context_action.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/search_field_controller.h"
+#include "ui/ui_utility.h"
+#include "lang/lang_keys.h"
+#include "styles/style_info.h"
+
+namespace Info::ReactionsList {
+namespace {
+
+} // namespace
+
+class InnerWidget final
+	: public Ui::RpWidget
+	, private PeerListContentDelegate {
+public:
+	InnerWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
+
+	[[nodiscard]] std::shared_ptr<Api::WhoReadList> whoReadIds() const;
+	[[nodiscard]] FullMsgId contextId() const;
+	[[nodiscard]] Data::ReactionId selected() const;
+
+	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
+
+	int desiredHeight() const;
+
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+protected:
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+private:
+	using ListWidget = PeerListContent;
+
+	// PeerListContentDelegate interface
+	void peerListSetTitle(rpl::producer<QString> title) override;
+	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+	int peerListSelectedRowsCount() override;
+	void peerListScrollToTop() override;
+	void peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) override;
+	void peerListFinishSelectedRowsBunch() override;
+	void peerListSetDescription(object_ptr<Ui::FlatLabel> description) override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
+
+	object_ptr<ListWidget> setupList(
+		RpWidget *parent,
+		not_null<PeerListController*> controller);
+
+	const std::shared_ptr<Main::SessionShow> _show;
+	not_null<Controller*> _controller;
+	Data::ReactionId _selected;
+	not_null<HistoryView::Reactions::Tabs*> _tabs;
+	rpl::variable<int> _tabsHeight;
+	HistoryView::Reactions::PreparedFullList _full;
+	object_ptr<ListWidget> _list;
+
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+};
+
+InnerWidget::InnerWidget(
+	QWidget *parent,
+	not_null<Controller*> controller,
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: RpWidget(parent)
+, _show(controller->uiShow())
+, _controller(controller)
+, _selected(selected)
+, _tabs(HistoryView::Reactions::CreateReactionsTabs(
+	this,
+	controller,
+	controller->reactionsContextId(),
+	_selected,
+	controller->reactionsWhoReadIds()))
+, _tabsHeight(_tabs->heightValue())
+, _full(HistoryView::Reactions::FullListController(
+	controller,
+	controller->reactionsContextId(),
+	_selected,
+	controller->reactionsWhoReadIds()))
+, _list(setupList(this, _full.controller.get())) {
+	setContent(_list.data());
+	_full.controller->setDelegate(static_cast<PeerListDelegate*>(this));
+	_tabs->changes(
+	) | rpl::start_with_next([=](Data::ReactionId reaction) {
+		_selected = reaction;
+		_full.switchTab(reaction);
+	}, _list->lifetime());
+}
+
+std::shared_ptr<Api::WhoReadList> InnerWidget::whoReadIds() const {
+	return _controller->reactionsWhoReadIds();
+}
+
+FullMsgId InnerWidget::contextId() const {
+	return _controller->reactionsContextId();
+}
+
+Data::ReactionId InnerWidget::selected() const {
+	return _selected;
+}
+
+void InnerWidget::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+	memento->setListState(_full.controller->saveState());
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+	_full.controller->restoreState(memento->listState());
+}
+
+rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
+	return _scrollToRequests.events();
+}
+
+int InnerWidget::desiredHeight() const {
+	auto desired = 0;
+	desired += _list->fullRowsCount() * st::infoMembersList.item.height;
+	return qMax(height(), desired);
+}
+
+object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
+		RpWidget *parent,
+		not_null<PeerListController*> controller) {
+	auto result = object_ptr<ListWidget>(parent, controller);
+	const auto raw = result.data();
+
+	raw->scrollToRequests(
+	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+		const auto skip = _tabsHeight.current()
+			+ st::infoCommonGroupsMargin.top();
+		auto addmin = (request.ymin < 0) ? 0 : skip;
+		auto addmax = (request.ymax < 0) ? 0 : skip;
+		_scrollToRequests.fire({
+			request.ymin + addmin,
+			request.ymax + addmax });
+	}, raw->lifetime());
+
+	_tabs->move(0, 0);
+	_tabsHeight.value() | rpl::start_with_next([=](int tabs) {
+		raw->moveToLeft(0, tabs + st::infoCommonGroupsMargin.top());
+	}, raw->lifetime());
+
+	parent->widthValue(
+	) | rpl::start_with_next([=](int newWidth) {
+		_tabs->resizeToWidth(newWidth);
+		raw->resizeToWidth(newWidth);
+	}, raw->lifetime());
+
+	rpl::combine(
+		_tabsHeight.value(),
+		raw->heightValue()
+	) | rpl::start_with_next([parent](int tabsHeight, int listHeight) {
+		const auto newHeight = tabsHeight
+			+ st::infoCommonGroupsMargin.top()
+			+ listHeight
+			+ st::infoCommonGroupsMargin.bottom();
+		parent->resize(parent->width(), newHeight);
+	}, result->lifetime());
+
+	return result;
+}
+
+void InnerWidget::peerListSetTitle(rpl::producer<QString> title) {
+}
+
+void InnerWidget::peerListSetAdditionalTitle(rpl::producer<QString> title) {
+}
+
+bool InnerWidget::peerListIsRowChecked(not_null<PeerListRow*> row) {
+	return false;
+}
+
+int InnerWidget::peerListSelectedRowsCount() {
+	return 0;
+}
+
+void InnerWidget::peerListScrollToTop() {
+	_scrollToRequests.fire({ -1, -1 });
+}
+
+void InnerWidget::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void InnerWidget::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void InnerWidget::peerListFinishSelectedRowsBunch() {
+}
+
+void InnerWidget::peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) {
+	description.destroy();
+}
+
+std::shared_ptr<Main::SessionShow> InnerWidget::peerListUiShow() {
+	return _show;
+}
+
+Memento::Memento(
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: ContentMemento(std::move(whoReadIds), contextId, selected) {
+}
+
+Section Memento::section() const {
+	return Section(Section::Type::ReactionsList);
+}
+
+std::shared_ptr<Api::WhoReadList> Memento::whoReadIds() const {
+	return reactionsWhoReadIds();
+}
+
+FullMsgId Memento::contextId() const {
+	return reactionsContextId();
+}
+
+Data::ReactionId Memento::selected() const {
+	return reactionsSelected();
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(
+		parent,
+		controller,
+		whoReadIds(),
+		contextId(),
+		selected());
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+void Memento::setListState(std::unique_ptr<PeerListState> state) {
+	_listState = std::move(state);
+}
+
+std::unique_ptr<PeerListState> Memento::listState() {
+	return std::move(_listState);
+}
+
+Memento::~Memento() = default;
+
+Widget::Widget(
+	QWidget *parent,
+	not_null<Controller*> controller,
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: ContentWidget(parent, controller) {
+	_inner = setInnerWidget(object_ptr<InnerWidget>(
+		this,
+		controller,
+		std::move(whoReadIds),
+		contextId,
+		selected));
+}
+
+rpl::producer<QString> Widget::title() {
+	const auto ids = whoReadIds();
+	const auto count = ids ? int(ids->list.size()) : 0;
+	return !count
+		? tr::lng_manage_peer_reactions()
+		: (ids->type == Ui::WhoReadType::Seen)
+		? tr::lng_context_seen_text(lt_count, rpl::single(1. * count))
+		: (ids->type == Ui::WhoReadType::Listened)
+		? tr::lng_context_seen_listened(lt_count, rpl::single(1. * count))
+		: (ids->type == Ui::WhoReadType::Watched)
+		? tr::lng_context_seen_watched(lt_count, rpl::single(1. * count))
+		: tr::lng_manage_peer_reactions();
+}
+
+std::shared_ptr<Api::WhoReadList> Widget::whoReadIds() const {
+	return _inner->whoReadIds();
+}
+
+FullMsgId Widget::contextId() const {
+	return _inner->contextId();
+}
+
+Data::ReactionId Widget::selected() const {
+	return _inner->selected();
+}
+
+bool Widget::showInternal(not_null<ContentMemento*> memento) {
+	return false;
+}
+
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(
+		whoReadIds(),
+		contextId(),
+		selected());
+	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());
+}
+
+} // namespace Info::ReactionsList
diff --git a/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.h b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.h
new file mode 100644
index 000000000..a713c6e2b
--- /dev/null
+++ b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.h
@@ -0,0 +1,82 @@
+/*
+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"
+
+class ChannelData;
+struct PeerListState;
+
+namespace Api {
+struct WhoReadList;
+} // namespace Api
+
+namespace Info::ReactionsList {
+
+class InnerWidget;
+
+class Memento final : public ContentMemento {
+public:
+	Memento(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+	[[nodiscard]] std::shared_ptr<Api::WhoReadList> whoReadIds() const;
+	[[nodiscard]] FullMsgId contextId() const;
+	[[nodiscard]] Data::ReactionId selected() const;
+
+	void setListState(std::unique_ptr<PeerListState> state);
+	std::unique_ptr<PeerListState> listState();
+
+	~Memento();
+
+private:
+	std::unique_ptr<PeerListState> _listState;
+
+};
+
+class Widget final : public ContentWidget {
+public:
+	Widget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
+
+	[[nodiscard]] std::shared_ptr<Api::WhoReadList> whoReadIds() const;
+	[[nodiscard]] FullMsgId contextId() const;
+	[[nodiscard]] Data::ReactionId selected() const;
+
+	bool showInternal(
+		not_null<ContentMemento*> memento) override;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento);
+
+	rpl::producer<QString> title() override;
+
+private:
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	InnerWidget *_inner = nullptr;
+};
+
+} // namespace Info::ReactionsList
diff --git a/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
index ba68ea345..70f638e1c 100644
--- a/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
+++ b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
@@ -7,22 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/requests_list/info_requests_list_widget.h"
 
-#include "api/api_chat_participants.h"
-#include "apiwrap.h"
 #include "boxes/peers/edit_peer_requests_box.h"
-#include "boxes/peer_list_box.h"
 #include "data/data_channel.h"
-#include "data/data_peer_values.h"
-#include "data/data_session.h"
 #include "info/info_controller.h"
-#include "main/main_session.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/search_field_controller.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
 #include "styles/style_info.h"
-#include "styles/style_widgets.h"
-#include "boxes/peers/edit_peer_requests_box.h"
 
 namespace Info::RequestsList {
 namespace {
diff --git a/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h
index d61fc938e..32e04ac5d 100644
--- a/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h
+++ b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h
@@ -36,6 +36,7 @@ public:
 
 private:
 	std::unique_ptr<PeerListState> _listState;
+
 };
 
 class Widget final : public ContentWidget {

From 6c64c22f835fab9d808c6584a6386b9383b3086c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 17 Nov 2024 07:38:48 +0400
Subject: [PATCH 263/306] Don't expand minimum window size for folders

Turn them into horizontal automatically instead
---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp    |  3 ++-
 Telegram/SourceFiles/settings/settings_folders.cpp | 13 +++++++++++--
 Telegram/SourceFiles/window/main_window.cpp        |  5 -----
 Telegram/SourceFiles/window/window_controller.cpp  |  1 +
 .../window/window_session_controller.cpp           | 14 +++++++++++++-
 .../SourceFiles/window/window_session_controller.h |  2 ++
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index f2e809107..0cb207bc1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -653,7 +653,8 @@ Widget::Widget(
 	}
 
 	if (session().settings().dialogsFiltersEnabled()
-		&& Core::App().settings().chatFiltersHorizontal()) {
+		&& (Core::App().settings().chatFiltersHorizontal()
+			|| !controller->enoughSpaceForFilters())) {
 		toggleFiltersMenu(true);
 	}
 }
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index f2ba21dd2..552215041 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -844,7 +844,16 @@ void SetupTopContent(
 
 }
 
-void SetupView(not_null<Ui::VerticalLayout*> content) {
+void SetupView(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> content) {
+	const auto wrap = content->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			content,
+			object_ptr<Ui::VerticalLayout>(content)));
+	wrap->toggleOn(controller->enoughSpaceForFiltersValue());
+	content = wrap->entity();
+
 	Ui::AddDivider(content);
 	Ui::AddSkip(content);
 	Ui::AddSubsectionTitle(content, tr::lng_filters_view_subtitle());
@@ -900,7 +909,7 @@ void Folders::setupContent(not_null<Window::SessionController*> controller) {
 
 	_save = SetupFoldersContent(controller, content);
 
-	SetupView(content);
+	SetupView(controller, content);
 
 	Ui::ResizeFitChild(this, content);
 }
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 208ed561c..334af505e 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -566,11 +566,6 @@ void MainWindow::updatePalette() {
 
 int MainWindow::computeMinWidth() const {
 	auto result = st::windowMinWidth;
-	if (const auto session = _controller->sessionController()) {
-		if (const auto add = session->filtersWidth()) {
-			result += add;
-		}
-	}
 	if (_rightColumn) {
 		result += _rightColumn->width();
 	}
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index da6efc8d1..fb47a4050 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -230,6 +230,7 @@ void Controller::setupSideBar() {
 	}, _sessionController->lifetime());
 
 	if (_sessionController->session().settings().dialogsFiltersEnabled()
+		&& _sessionController->enoughSpaceForFilters()
 		&& !Core::App().settings().chatFiltersHorizontal()) {
 		_sessionController->toggleFiltersMenu(true);
 	} else {
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 5c54a79d2..0ec6d195b 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1315,6 +1315,7 @@ SessionController::SessionController(
 	}, lifetime());
 
 	rpl::merge(
+		enoughSpaceForFiltersValue() | rpl::skip(1) | rpl::to_empty,
 		Core::App().settings().chatFiltersHorizontalChanges() | rpl::to_empty,
 		session->data().chatsFilters().changed()
 	) | rpl::start_with_next([=] {
@@ -1322,7 +1323,8 @@ SessionController::SessionController(
 		crl::on_main(this, [this] {
 			if (SessionNavigation::session().data().chatsFilters().has()) {
 				const auto isHorizontal
-					= Core::App().settings().chatFiltersHorizontal();
+					= Core::App().settings().chatFiltersHorizontal()
+						|| !enoughSpaceForFilters();
 				content()->toggleFiltersMenu(isHorizontal);
 				toggleFiltersMenu(!isHorizontal);
 			} else {
@@ -2588,6 +2590,16 @@ int SessionController::filtersWidth() const {
 	return _filters ? st::windowFiltersWidth : 0;
 }
 
+bool SessionController::enoughSpaceForFilters() const {
+	return widget()->width() >= widget()->minimumWidth() + st::windowFiltersWidth;
+}
+
+rpl::producer<bool> SessionController::enoughSpaceForFiltersValue() const {
+	return widget()->widthValue() | rpl::map([=] {
+		return enoughSpaceForFilters();
+	}) | rpl::distinct_until_changed();
+}
+
 rpl::producer<FilterId> SessionController::activeChatsFilter() const {
 	return _activeChatsFilter.value();
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 8cb9a590f..f6880bdbe 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -546,6 +546,8 @@ public:
 	}
 
 	[[nodiscard]] int filtersWidth() const;
+	[[nodiscard]] bool enoughSpaceForFilters() const;
+	[[nodiscard]] rpl::producer<bool> enoughSpaceForFiltersValue() const;
 	[[nodiscard]] rpl::producer<FilterId> activeChatsFilter() const;
 	[[nodiscard]] FilterId activeChatsFilterCurrent() const;
 	void setActiveChatsFilter(

From f4e2b4bcbd83fbbf226a8239af9edeeb089bf029 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 14:07:07 +0400
Subject: [PATCH 264/306] Don't drop the old state of "systemDarkModeEnabled".

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

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 5170b16fc..3090ec1a0 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -478,7 +478,6 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 notifyFromAll = _notifyFromAll ? 1 : 0;
 	qint32 nativeWindowFrame = _nativeWindowFrame.current() ? 1 : 0;
 	qint32 systemDarkModeEnabled = _systemDarkModeEnabled.current() ? 1 : 0;
-	qint32 legacySystemDarkModeEnabled = 0;
 	qint32 ipRevealWarning = _ipRevealWarning ? 1 : 0;
 	qint32 groupCallPushToTalk = _groupCallPushToTalk ? 1 : 0;
 	QByteArray groupCallPushToTalkShortcut = _groupCallPushToTalkShortcut;
@@ -612,7 +611,8 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		stream >> nativeWindowFrame;
 	}
 	if (!stream.atEnd()) {
-		stream >> legacySystemDarkModeEnabled;
+		// Read over this one below, if was in the file.
+		stream >> systemDarkModeEnabled;
 	}
 	if (!stream.atEnd()) {
 		stream >> cameraDeviceId;

From 83df3cba66f32921c82a33bb77ddab1401d76810 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Nov 2024 12:23:32 +0300
Subject: [PATCH 265/306] Added debug logs for changing chats filters from
 context menu.

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

diff --git a/Telegram/SourceFiles/boxes/choose_filter_box.cpp b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
index 4e99a01ba..252403af8 100644
--- a/Telegram/SourceFiles/boxes/choose_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
@@ -96,6 +96,9 @@ void ChangeFilterById(
 						Ui::Text::WithEntities));
 			}
 		}).fail([=](const MTP::Error &error) {
+			LOG(("API Error: failed to %1 a dialog to a folder. %2")
+				.arg(add ? u"add"_q : u"remove"_q)
+				.arg(error.type()));
 			// Revert filter on fail.
 			history->owner().chatsFilters().set(was);
 		}).send();

From 67bbdbfc70289442c0b6d03b876045fc7b8c6f2f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Nov 2024 13:27:36 +0300
Subject: [PATCH 266/306] Added ability to change userpic with image from
 clipboard.

---
 Telegram/Resources/langs/lang.strings         |   3 +
 .../ui/controls/userpic_button.cpp            | 100 ++++++++++++------
 2 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9a36efb1d..f24c6003c 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1464,8 +1464,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_info_add_as_contact" = "Add to contacts";
 "lng_profile_shared_media" = "Shared media";
 "lng_profile_suggest_photo" = "Suggest Profile Photo";
+"lng_profile_suggest_photo_from_clipboard" = "Suggest From Clipboard";
 "lng_profile_set_photo_for" = "Set Profile Photo";
+"lng_profile_set_photo_for_from_clipboard" = "Set From Clipboard";
 "lng_profile_photo_reset" = "Reset to Original";
+"lng_profile_photo_from_clipboard" = "From clipboard";
 "lng_profile_suggest_sure" = "You can suggest {user} to set this photo for their Telegram profile.";
 "lng_profile_suggest_button" = "Suggest";
 "lng_profile_set_personal_sure" = "Only you will see this photo and it will replace any photo {user} sets for themselves.";
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index 947a15791..472f8e165 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -50,6 +50,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_menu_icons.h"
 #include "styles/style_premium.h"
 
+#include <QtGui/QClipboard>
+#include <QtGui/QGuiApplication>
+
 namespace Ui {
 namespace {
 
@@ -274,43 +277,45 @@ void UserpicButton::choosePhotoLocally() {
 			_chosenImages.fire({ std::move(image), type });
 		};
 	};
-	const auto chooseFile = [=](ChosenType type = ChosenType::Set) {
+	const auto editorData = [=](ChosenType type) {
+		const auto user = _peer ? _peer->asUser() : nullptr;
+		const auto name = (user && !user->firstName.isEmpty())
+			? user->firstName
+			: _peer
+			? _peer->name()
+			: QString();
+		const auto phrase = (type == ChosenType::Suggest)
+			? &tr::lng_profile_suggest_sure
+			: (user && EditPeerInfoBox::Available(user))
+			? nullptr
+			: (user && !user->isSelf())
+			? &tr::lng_profile_set_personal_sure
+			: nullptr;
+		return Editor::EditorData{
+			.about = (phrase
+				? (*phrase)(
+					tr::now,
+					lt_user,
+					Ui::Text::Bold(name),
+					Ui::Text::WithEntities)
+				: TextWithEntities()),
+			.confirm = ((type == ChosenType::Suggest)
+				? tr::lng_profile_suggest_button(tr::now)
+				: tr::lng_profile_set_photo_button(tr::now)),
+			.cropType = (useForumShape()
+				? Editor::EditorData::CropType::RoundedRect
+				: Editor::EditorData::CropType::Ellipse),
+			.keepAspectRatio = true,
+		};
+	};
+	const auto chooseFile = [=](ChosenType type) {
 		base::call_delayed(
 			_st.changeButton.ripple.hideDuration,
 			crl::guard(this, [=] {
-				using namespace Editor;
-				const auto user = _peer ? _peer->asUser() : nullptr;
-				const auto name = (user && !user->firstName.isEmpty())
-					? user->firstName
-					: _peer
-					? _peer->name()
-					: QString();
-				const auto phrase = (type == ChosenType::Suggest)
-					? &tr::lng_profile_suggest_sure
-					: (user && EditPeerInfoBox::Available(user))
-					? nullptr
-					: (user && !user->isSelf())
-					? &tr::lng_profile_set_personal_sure
-					: nullptr;
 				PrepareProfilePhotoFromFile(
 					this,
 					_window,
-					{
-						.about = (phrase
-							? (*phrase)(
-								tr::now,
-								lt_user,
-								Ui::Text::Bold(name),
-								Ui::Text::WithEntities)
-							: TextWithEntities()),
-						.confirm = ((type == ChosenType::Suggest)
-							? tr::lng_profile_suggest_button(tr::now)
-							: tr::lng_profile_set_photo_button(tr::now)),
-						.cropType = (useForumShape()
-							? EditorData::CropType::RoundedRect
-							: EditorData::CropType::Ellipse),
-						.keepAspectRatio = true,
-					},
+					editorData(type),
 					callback(type));
 			}));
 	};
@@ -334,19 +339,43 @@ void UserpicButton::choosePhotoLocally() {
 			done,
 			_peer ? _peer->isForum() : false);
 	};
+	const auto addFromClipboard = [=](ChosenType type, tr::phrase<> text) {
+		if (const auto data = QGuiApplication::clipboard()->mimeData()) {
+			if (data->hasImage()) {
+				auto openEditor = crl::guard(this, [=, this] {
+					Editor::PrepareProfilePhoto(
+						this,
+						_window,
+						editorData(ChosenType::Set),
+						callback(ChosenType::Set),
+						qvariant_cast<QImage>(data->imageData()));
+				});
+				_menu->addAction(
+					std::move(text)(tr::now),
+					std::move(openEditor),
+					&st::menuIconPhoto);
+			}
+		}
+	};
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
 		st::popupMenuWithIcons);
 	if (user && !user->isSelf()) {
 		_menu->addAction(
 			tr::lng_profile_set_photo_for(tr::now),
-			[=] { chooseFile(); },
+			[=] { chooseFile(ChosenType::Set); },
 			&st::menuIconPhotoSet);
+		addFromClipboard(
+			ChosenType::Set,
+			tr::lng_profile_set_photo_for_from_clipboard);
 		if (canSuggestPhoto(user)) {
 			_menu->addAction(
 				tr::lng_profile_suggest_photo(tr::now),
 				[=] { chooseFile(ChosenType::Suggest); },
 				&st::menuIconPhotoSuggest);
+			addFromClipboard(
+				ChosenType::Suggest,
+				tr::lng_profile_suggest_photo_from_clipboard);
 		}
 		addUserpicBuilder(ChosenType::Set);
 		if (hasPersonalPhotoLocally()) {
@@ -357,7 +386,7 @@ void UserpicButton::choosePhotoLocally() {
 		const auto hasCamera = IsCameraAvailable();
 		if (hasCamera || _controller) {
 			_menu->addAction(tr::lng_attach_file(tr::now), [=] {
-				chooseFile();
+				chooseFile(ChosenType::Set);
 			}, &st::menuIconPhoto);
 			if (hasCamera) {
 				_menu->addAction(tr::lng_attach_camera(tr::now), [=] {
@@ -369,9 +398,12 @@ void UserpicButton::choosePhotoLocally() {
 						callback(ChosenType::Set)));
 				}, &st::menuIconPhotoSet);
 			}
+			addFromClipboard(
+				ChosenType::Set,
+				tr::lng_profile_photo_from_clipboard);
 			addUserpicBuilder(ChosenType::Set);
 		} else {
-			chooseFile();
+			chooseFile(ChosenType::Set);
 		}
 	}
 	_menu->popup(QCursor::pos());

From db2e45c56ebf02fd277d8ac9553f474ec1e89d9d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Nov 2024 13:43:19 +0300
Subject: [PATCH 267/306] Added ability to go to top of chats list by clicking
 on selected filter.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp      |  1 +
 .../ui/widgets/chat_filters_tabs_strip.cpp           | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 0cb207bc1..7c737d4b5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1328,6 +1328,7 @@ void Widget::toggleFiltersMenu(bool enabled) {
 			_chatFilters.get(),
 			&session(),
 			[this](FilterId id) {
+				_scroll->scrollToY(0);
 				if (controller()->activeChatsFilterCurrent() != id) {
 					controller()->setActiveChatsFilter(id);
 				}
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 6a9f07457..569f139f4 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -381,14 +381,18 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 				state->reorder->finishReordering();
 			}, slider->lifetime());
 		}
-		slider->sectionActivated() | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](int index) {
+		rpl::single(-1) | rpl::then(
+			slider->sectionActivated()
+		) | rpl::combine_previous(
+		) | rpl::start_with_next([=](int was, int index) {
 			if (slider->reordering()) {
 				return;
 			}
 			const auto &filter = filterByIndex(index);
-			state->lastFilterId = filter.id();
-			scrollToIndex(index, anim::type::normal);
+			if (was != index) {
+				state->lastFilterId = filter.id();
+				scrollToIndex(index, anim::type::normal);
+			}
 			applyFilter(filter);
 		}, wrap->lifetime());
 		slider->contextMenuRequested() | rpl::start_with_next([=](int index) {

From 07e367e1a0c36f3588565a67400aa0c83c05761a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Nov 2024 12:44:48 +0400
Subject: [PATCH 268/306] Update API scheme to layer 193.

---
 Telegram/SourceFiles/history/history_item.cpp |  2 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 37 +++++++++++++------
 .../controls/who_reacted_context_action.cpp   |  2 +
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 9b422e1ca..08b3187dc 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -5530,7 +5530,7 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 						data.vmessage()->data().ventities().v),
 				}
 				: TextWithEntities()),
-			.convertStars = int(data.vconvert_stars().v),
+			.convertStars = int(data.vconvert_stars().value_or_empty()),
 			.limitedCount = gift.vavailability_total().value_or_empty(),
 			.limitedLeft = gift.vavailability_remains().value_or_empty(),
 			.count = int(gift.vstars().v),
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index a794d7964..6b2a753ce 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -183,7 +183,7 @@ messageActionRequestedPeerSentMe#93b31848 button_id:int peers:Vector<RequestedPe
 messageActionPaymentRefunded#41b3e202 flags:# peer:Peer currency:string total_amount:long payload:flags.0?bytes charge:PaymentCharge = MessageAction;
 messageActionGiftStars#45d5b021 flags:# currency:string amount:long stars:long crypto_currency:flags.0?string crypto_amount:flags.0?long transaction_id:flags.1?string = MessageAction;
 messageActionPrizeStars#b00c47a2 flags:# unclaimed:flags.0?true stars:long transaction_id:string boost_peer:Peer giveaway_msg_id:int = MessageAction;
-messageActionStarGift#9bb3ef44 flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true gift:StarGift message:flags.1?TextWithEntities convert_stars:long = MessageAction;
+messageActionStarGift#8557637 flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true gift:StarGift message:flags.1?TextWithEntities convert_stars:flags.4?long = 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;
@@ -235,7 +235,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#1f58e369 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 can_view_revenue:flags2.9?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 stargifts_count:flags2.8?int = UserFull;
+userFull#1f58e369 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 can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?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 stargifts_count:flags2.8?int = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -426,6 +426,7 @@ updateBusinessBotCallbackQuery#1ea2fda7 flags:# query_id:long user_id:long conne
 updateStarsRevenueStatus#a584b019 peer:Peer status:StarsRevenueStatus = Update;
 updateBotPurchasedPaidMedia#283bd312 user_id:long payload:string qts:int = Update;
 updatePaidReactionPrivacy#51ca7aec private:Bool = Update;
+updateBotSubscriptionExpire#2d13c6ee user_id:long payload:string invoice_slug:string until_date:int qts:int = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -635,7 +636,7 @@ messages.stickerSetNotModified#d3f924eb = messages.StickerSet;
 
 botCommand#c27ac8c7 command:string description:string = BotCommand;
 
-botInfo#82437e74 flags:# has_preview_medias:flags.6?true user_id:flags.0?long description:flags.1?string description_photo:flags.4?Photo description_document:flags.5?Document commands:flags.2?Vector<BotCommand> menu_button:flags.3?BotMenuButton privacy_policy_url:flags.7?string = BotInfo;
+botInfo#36607333 flags:# has_preview_medias:flags.6?true user_id:flags.0?long description:flags.1?string description_photo:flags.4?Photo description_document:flags.5?Document commands:flags.2?Vector<BotCommand> menu_button:flags.3?BotMenuButton privacy_policy_url:flags.7?string app_settings:flags.8?BotAppSettings = BotInfo;
 
 keyboardButton#a2fa4880 text:string = KeyboardButton;
 keyboardButtonUrl#258aff05 text:string url:string = KeyboardButton;
@@ -893,7 +894,7 @@ dataJSON#7d748d04 data:string = DataJSON;
 
 labeledPrice#cb296bf8 label:string amount:long = LabeledPrice;
 
-invoice#5db95a15 flags:# test:flags.0?true name_requested:flags.1?true phone_requested:flags.2?true email_requested:flags.3?true shipping_address_requested:flags.4?true flexible:flags.5?true phone_to_provider:flags.6?true email_to_provider:flags.7?true recurring:flags.9?true currency:string prices:Vector<LabeledPrice> max_tip_amount:flags.8?long suggested_tip_amounts:flags.8?Vector<long> terms_url:flags.10?string = Invoice;
+invoice#49ee584 flags:# test:flags.0?true name_requested:flags.1?true phone_requested:flags.2?true email_requested:flags.3?true shipping_address_requested:flags.4?true flexible:flags.5?true phone_to_provider:flags.6?true email_to_provider:flags.7?true recurring:flags.9?true currency:string prices:Vector<LabeledPrice> max_tip_amount:flags.8?long suggested_tip_amounts:flags.8?Vector<long> terms_url:flags.10?string subscription_period:flags.11?int = Invoice;
 
 paymentCharge#ea02c27e id:string provider_charge_id:string = PaymentCharge;
 
@@ -1436,7 +1437,7 @@ attachMenuBots#3c4301c0 hash:long bots:Vector<AttachMenuBot> users:Vector<User>
 
 attachMenuBotsBot#93bf667f bot:AttachMenuBot users:Vector<User> = AttachMenuBotsBot;
 
-webViewResultUrl#4d22ff98 flags:# fullsize:flags.1?true query_id:flags.0?long url:string = WebViewResult;
+webViewResultUrl#4d22ff98 flags:# fullsize:flags.1?true fullscreen:flags.2?true query_id:flags.0?long url:string = WebViewResult;
 
 webViewMessageSent#c94511c flags:# msg_id:flags.0?InputBotInlineMessageID = WebViewMessageSent;
 
@@ -1855,7 +1856,7 @@ bots.previewInfo#ca71d64 media:Vector<BotPreviewMedia> lang_codes:Vector<string>
 
 starsSubscriptionPricing#5416d58 period:int amount:long = StarsSubscriptionPricing;
 
-starsSubscription#538ecf18 flags:# canceled:flags.0?true can_refulfill:flags.1?true missing_balance:flags.2?true id:string peer:Peer until_date:int pricing:StarsSubscriptionPricing chat_invite_hash:flags.3?string = StarsSubscription;
+starsSubscription#2e6eab1a flags:# canceled:flags.0?true can_refulfill:flags.1?true missing_balance:flags.2?true bot_canceled:flags.7?true id:string peer:Peer until_date:int pricing:StarsSubscriptionPricing chat_invite_hash:flags.3?string title:flags.4?string photo:flags.5?WebDocument invoice_slug:flags.6?string = StarsSubscription;
 
 messageReactor#4ba3a95a flags:# top:flags.0?true my:flags.1?true anonymous:flags.2?true peer_id:flags.3?Peer count:int = MessageReactor;
 
@@ -1863,7 +1864,7 @@ starsGiveawayOption#94ce852a flags:# extended:flags.0?true default:flags.1?true
 
 starsGiveawayWinnersOption#54236209 flags:# default:flags.0?true users:int per_user_stars:long = StarsGiveawayWinnersOption;
 
-starGift#49c577cd flags:# limited:flags.0?true sold_out:flags.1?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int = StarGift;
+starGift#49c577cd flags:# limited:flags.0?true sold_out:flags.1?true birthday:flags.2?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int = StarGift;
 
 payments.starGiftsNotModified#a388a368 = payments.StarGifts;
 payments.starGifts#901689ea hash:int gifts:Vector<StarGift> = payments.StarGifts;
@@ -1878,6 +1879,12 @@ reportResultChooseOption#f0e4e0b6 title:string options:Vector<MessageReportOptio
 reportResultAddComment#6f09ac31 flags:# optional:flags.0?true option:bytes = ReportResult;
 reportResultReported#8db33c4b = ReportResult;
 
+messages.botPreparedInlineMessage#8ecf0511 id:string expire_date:int = messages.BotPreparedInlineMessage;
+
+messages.preparedInlineMessage#ff57708d query_id:long result:BotInlineResult peer_types:Vector<InlineQueryPeerType> cache_time:int users:Vector<User> = messages.PreparedInlineMessage;
+
+botAppSettings#c99b1950 flags:# placeholder_path:flags.0?bytes background_color:flags.1?int background_dark_color:flags.2?int header_color:flags.3?int header_dark_color:flags.4?int = BotAppSettings;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2221,9 +2228,9 @@ messages.searchSentMedia#107e31a0 q:string filter:MessagesFilter limit:int = mes
 messages.getAttachMenuBots#16fcc2cb hash:long = AttachMenuBots;
 messages.getAttachMenuBot#77216192 bot:InputUser = AttachMenuBotsBot;
 messages.toggleBotInAttachMenu#69f59d69 flags:# write_allowed:flags.0?true bot:InputUser enabled:Bool = Bool;
-messages.requestWebView#269dc2c1 flags:# from_bot_menu:flags.4?true silent:flags.5?true compact:flags.7?true peer:InputPeer bot:InputUser url:flags.1?string start_param:flags.3?string theme_params:flags.2?DataJSON platform:string reply_to:flags.0?InputReplyTo send_as:flags.13?InputPeer = WebViewResult;
+messages.requestWebView#269dc2c1 flags:# from_bot_menu:flags.4?true silent:flags.5?true compact:flags.7?true fullscreen:flags.8?true peer:InputPeer bot:InputUser url:flags.1?string start_param:flags.3?string theme_params:flags.2?DataJSON platform:string reply_to:flags.0?InputReplyTo send_as:flags.13?InputPeer = WebViewResult;
 messages.prolongWebView#b0d81a83 flags:# silent:flags.5?true peer:InputPeer bot:InputUser query_id:long reply_to:flags.0?InputReplyTo send_as:flags.13?InputPeer = Bool;
-messages.requestSimpleWebView#413a3e73 flags:# from_switch_webview:flags.1?true from_side_menu:flags.2?true compact:flags.7?true bot:InputUser url:flags.3?string start_param:flags.4?string theme_params:flags.0?DataJSON platform:string = WebViewResult;
+messages.requestSimpleWebView#413a3e73 flags:# from_switch_webview:flags.1?true from_side_menu:flags.2?true compact:flags.7?true fullscreen:flags.8?true bot:InputUser url:flags.3?string start_param:flags.4?string theme_params:flags.0?DataJSON platform:string = WebViewResult;
 messages.sendWebViewResultMessage#a4314f5 bot_query_id:string result:InputBotInlineResult = WebViewMessageSent;
 messages.sendWebViewData#dc0242c8 bot:InputUser random_id:long button_text:string data:string = Updates;
 messages.transcribeAudio#269e9a49 peer:InputPeer msg_id:int = messages.TranscribedAudio;
@@ -2245,7 +2252,7 @@ messages.getEmojiProfilePhotoGroups#21a548f3 hash:int = messages.EmojiGroups;
 messages.searchCustomEmoji#2c11c0d7 emoticon:string hash:long = EmojiList;
 messages.togglePeerTranslations#e47cb579 flags:# disabled:flags.0?true peer:InputPeer = Bool;
 messages.getBotApp#34fdc5c3 app:InputBotApp hash:long = messages.BotApp;
-messages.requestAppWebView#53618bce flags:# write_allowed:flags.0?true compact:flags.7?true peer:InputPeer app:InputBotApp start_param:flags.1?string theme_params:flags.2?DataJSON platform:string = WebViewResult;
+messages.requestAppWebView#53618bce flags:# write_allowed:flags.0?true compact:flags.7?true fullscreen:flags.8?true peer:InputPeer app:InputBotApp start_param:flags.1?string theme_params:flags.2?DataJSON platform:string = WebViewResult;
 messages.setChatWallPaper#8ffacae1 flags:# for_both:flags.3?true revert:flags.4?true peer:InputPeer wallpaper:flags.0?InputWallPaper settings:flags.2?WallPaperSettings id:flags.1?int = Updates;
 messages.searchEmojiStickerSets#92b4494c flags:# exclude_featured:flags.0?true q:string hash:long = messages.FoundStickerSets;
 messages.getSavedDialogs#5381d21a flags:# exclude_pinned:flags.0?true offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:long = messages.SavedDialogs;
@@ -2273,7 +2280,7 @@ messages.getAvailableEffects#dea20a39 hash:int = messages.AvailableEffects;
 messages.editFactCheck#589ee75 peer:InputPeer msg_id:int text:TextWithEntities = Updates;
 messages.deleteFactCheck#d1da940c peer:InputPeer msg_id:int = Updates;
 messages.getFactCheck#b9cdc5ee peer:InputPeer msg_id:Vector<int> = Vector<FactCheck>;
-messages.requestMainWebView#c9e01e7b flags:# compact:flags.7?true peer:InputPeer bot:InputUser start_param:flags.1?string theme_params:flags.0?DataJSON platform:string = WebViewResult;
+messages.requestMainWebView#c9e01e7b flags:# compact:flags.7?true fullscreen:flags.8?true peer:InputPeer bot:InputUser start_param:flags.1?string theme_params:flags.0?DataJSON platform:string = WebViewResult;
 messages.sendPaidReaction#9dd6a67b flags:# peer:InputPeer msg_id:int count:int random_id:long private:flags.0?Bool = Updates;
 messages.togglePaidReactionPrivacy#849ad397 peer:InputPeer msg_id:int private:Bool = Bool;
 messages.getPaidReactionPrivacy#472455aa = Updates;
@@ -2281,6 +2288,8 @@ messages.viewSponsoredMessage#673ad8f1 peer:InputPeer random_id:bytes = Bool;
 messages.clickSponsoredMessage#f093465 flags:# media:flags.0?true fullscreen:flags.1?true peer:InputPeer random_id:bytes = Bool;
 messages.reportSponsoredMessage#1af3dbb8 peer:InputPeer random_id:bytes option:bytes = channels.SponsoredMessageReportResult;
 messages.getSponsoredMessages#9bd2f439 peer:InputPeer = messages.SponsoredMessages;
+messages.savePreparedInlineMessage#f21f7f2f flags:# result:InputBotInlineResult user_id:InputUser peer_types:flags.0?Vector<InlineQueryPeerType> = messages.BotPreparedInlineMessage;
+messages.getPreparedInlineMessage#857ebdb8 bot:InputUser id:string = messages.PreparedInlineMessage;
 
 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;
@@ -2412,6 +2421,9 @@ bots.deletePreviewMedia#2d0135b3 bot:InputUser lang_code:string media:Vector<Inp
 bots.reorderPreviewMedias#b627f3aa bot:InputUser lang_code:string order:Vector<InputMedia> = Bool;
 bots.getPreviewInfo#423ab3ad bot:InputUser lang_code:string = bots.PreviewInfo;
 bots.getPreviewMedias#a2a5594d bot:InputUser = Vector<BotPreviewMedia>;
+bots.updateUserEmojiStatus#ed9f30c5 user_id:InputUser emoji_status:EmojiStatus = Bool;
+bots.toggleUserEmojiStatusPermission#6de6392 bot:InputUser enabled:Bool = Bool;
+bots.checkDownloadFileParams#50077589 bot:InputUser file_name:string url:string = Bool;
 
 payments.getPaymentForm#37148dbb flags:# invoice:InputInvoice theme_params:flags.0?DataJSON = payments.PaymentForm;
 payments.getPaymentReceipt#2478d1cc peer:InputPeer msg_id:int = payments.PaymentReceipt;
@@ -2447,6 +2459,7 @@ payments.getStarGifts#c4563590 hash:int = payments.StarGifts;
 payments.getUserStarGifts#5e72c7e1 user_id:InputUser offset:string limit:int = payments.UserStarGifts;
 payments.saveStarGift#87acf08e flags:# unsave:flags.0?true user_id:InputUser msg_id:int = Bool;
 payments.convertStarGift#421e027 user_id:InputUser msg_id:int = Bool;
+payments.botCancelStarsSubscription#57f9ece6 flags:# restore:flags.0?true user_id:InputUser invoice_slug:flags.1?string charge_id:flags.2?string = Bool;
 
 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;
@@ -2566,4 +2579,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 192
+// LAYER 193
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
index 7fde2d3fe..b45dd4251 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
@@ -21,6 +21,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
+#include <QtCore/QLocale>
+
 namespace Lang {
 namespace {
 

From c987872be8473eb5377fa01b9282db54fcfe29d6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Nov 2024 18:33:07 +0400
Subject: [PATCH 269/306] Start fullscreen support in SeparatePanel.

---
 .../ui/chat/attach/attach_bot_webview.cpp     | 34 +++++++++++++++++--
 .../ui/chat/attach/attach_bot_webview.h       |  2 ++
 Telegram/SourceFiles/ui/menu_icons.style      |  2 ++
 Telegram/lib_ui                               |  2 +-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index daab6358f..41fd093d0 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -378,6 +378,13 @@ Panel::Panel(
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
 	_widget->setInnerSize(st::botWebViewPanelSize, true);
 
+	_fullscreen.value(
+	) | rpl::start_with_next([=](bool fullscreen) {
+		_widget->toggleFullScreen(fullscreen);
+		layoutButtons();
+		sendSafeArea();
+	}, _widget->lifetime());
+
 	_widget->closeRequests(
 	) | rpl::start_with_next([=] {
 		if (_closeNeedConfirmation) {
@@ -612,6 +619,15 @@ bool Panel::showWebview(
 				.isAttention = true,
 			});
 		}
+		if (_widget->isFullScreen()) {
+			callback(u"Close Full Screen"_q, [=] {
+				_fullscreen = false;
+			}, &st::menuIconPlayerWindowed);
+		} else {
+			callback(u"Show Full Screen"_q, [=] {
+				_fullscreen = true;
+			}, &st::menuIconPlayerFullScreen);
+		}
 	});
 	return true;
 }
@@ -619,7 +635,7 @@ bool Panel::showWebview(
 void Panel::createWebviewBottom() {
 	_webviewBottom = std::make_unique<RpWidget>(_widget.get());
 	const auto bottom = _webviewBottom.get();
-	bottom->show();
+	bottom->setVisible(!_fullscreen.current());
 
 	const auto &padding = st::paymentsPanelPadding;
 	const auto label = CreateChild<FlatLabel>(
@@ -744,6 +760,8 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			_themeUpdateForced.fire({});
 		} else if (command == "web_app_request_viewport") {
 			sendViewport();
+		} else if (command == "web_app_request_safe_area") {
+			sendSafeArea();
 		} else if (command == "web_app_open_tg_link") {
 			openTgLink(arguments);
 		} else if (command == "web_app_open_link") {
@@ -828,6 +846,11 @@ void Panel::sendViewport() {
 		"is_expanded: true }");
 }
 
+void Panel::sendSafeArea() {
+	postEvent("safe_area_changed",
+		"{ top: 0, right: 0, bottom: 0, left: 0 }");
+}
+
 void Panel::setTitle(rpl::producer<QString> title) {
 	_widget->setTitle(std::move(title));
 }
@@ -1362,12 +1385,15 @@ void Panel::createButton(std::unique_ptr<Button> &button) {
 }
 
 void Panel::layoutButtons() {
+	if (!_webviewBottom) {
+		return;
+	}
 	const auto inner = _widget->innerGeometry();
 	const auto shown = [](std::unique_ptr<Button> &button) {
 		return button && !button->isHidden();
 	};
 	const auto any = shown(_mainButton) || shown(_secondaryButton);
-	_webviewBottom->setVisible(!any);
+	_webviewBottom->setVisible(!any && !_fullscreen.current());
 	if (any) {
 		_bottomButtonsBg->show();
 
@@ -1437,6 +1463,8 @@ void Panel::layoutButtons() {
 	}
 	_footerHeight = any
 		? _bottomButtonsBg->height()
+		: _fullscreen.current()
+		? 0
 		: _webviewBottom->height();
 }
 
@@ -1461,7 +1489,7 @@ void Panel::showBox(
 					&& widget->isHidden()
 					&& _webview->lastHidingBox == raw) {
 					widget->show();
-					_webviewBottom->show();
+					_webviewBottom->setVisible(!_fullscreen.current());
 				}
 			}, _webview->lifetime);
 			if (hideNow) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index f03dcdc34..05a64c3c6 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -147,6 +147,7 @@ private:
 	void scheduleCloseWithConfirmation();
 	void closeWithConfirmation();
 	void sendViewport();
+	void sendSafeArea();
 
 	using EventData = std::variant<QString, QJsonObject>;
 	void postEvent(const QString &event);
@@ -179,6 +180,7 @@ private:
 	std::optional<QColor> _bottomBarColor;
 	rpl::lifetime _headerColorLifetime;
 	rpl::lifetime _bottomBarColorLifetime;
+	rpl::variable<bool> _fullscreen = false;
 	bool _webviewProgress = false;
 	bool _themeUpdateScheduled = false;
 	bool _hiddenForPayment = false;
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 80a9ed4ad..c81bedebb 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -159,6 +159,8 @@ menuIconWinHello: icon {{ "menu/passcode_winhello", menuIconColor }};
 menuIconTouchID: icon {{ "menu/passcode_finger", menuIconColor }};
 menuIconAppleWatch: icon {{ "menu/passcode_watch", menuIconColor }};
 menuIconSystemPwd: menuIconPermissions;
+menuIconPlayerFullScreen: icon {{ "player/player_fullscreen", menuIconColor }};
+menuIconPlayerWindowed: icon {{ "player/player_minimize", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b969b5bd3..967ae393e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b969b5bd32c339be43732d7f1d34d7fdc3454eab
+Subproject commit 967ae393e82eb52174fd25e3a5a15b8029e21938

From 21487641c1b5eeb4d5abb5f03a1b8d4d767ef567 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Nov 2024 12:02:59 +0400
Subject: [PATCH 270/306] Support miniapp fullscreen API.

---
 .../SourceFiles/core/local_url_handlers.cpp   |  1 +
 .../inline_bots/bot_attach_web_view.cpp       | 47 +++++++++++---
 .../inline_bots/bot_attach_web_view.h         | 12 +++-
 .../ui/chat/attach/attach_bot_webview.cpp     | 62 +++++++++++++++++++
 .../ui/chat/attach/attach_bot_webview.h       |  4 ++
 .../window/window_session_controller.cpp      | 10 ++-
 .../window_session_controller_link_info.h     |  1 +
 7 files changed, 123 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index a8815478f..adcc40385 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -618,6 +618,7 @@ bool ResolveUsernameOrPhone(
 		.startAutoSubmit = myContext.botStartAutoSubmit,
 		.botAppName = (appname.isEmpty() ? postParam : appname),
 		.botAppForceConfirmation = myContext.mayShowConfirmation,
+		.botAppFullScreen = (params.value(u"mode"_q) == u"fullscreen"_q),
 		.attachBotUsername = params.value(u"attach"_q),
 		.attachBotToggleCommand = (params.contains(u"startattach"_q)
 			? params.value(u"startattach"_q)
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index c3290ea24..674170696 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -914,6 +914,7 @@ void WebViewInstance::requestButton() {
 	using Flag = MTPmessages_RequestWebView::Flag;
 	_requestId = _session->api().request(MTPmessages_RequestWebView(
 		MTP_flags(Flag::f_theme_params
+			| (_context.fullscreen ? Flag::f_fullscreen : Flag(0))
 			| (_button.url.isEmpty() ? Flag(0) : Flag::f_url)
 			| (_button.startCommand.isEmpty()
 				? Flag(0)
@@ -936,7 +937,11 @@ void WebViewInstance::requestButton() {
 			: MTP_inputPeerEmpty())
 	)).done([=](const MTPWebViewResult &result) {
 		const auto &data = result.data();
-		show(qs(data.vurl()), data.vquery_id().value_or_empty());
+		show({
+			.url = qs(data.vurl()),
+			.queryId = data.vquery_id().value_or_empty(),
+			.fullscreen = data.is_fullscreen(),
+		});
 	}).fail([=](const MTP::Error &error) {
 		_parentShow->showToast(error.type());
 		if (error.type() == u"BOT_INVALID"_q) {
@@ -950,6 +955,7 @@ void WebViewInstance::requestSimple() {
 	using Flag = MTPmessages_RequestSimpleWebView::Flag;
 	_requestId = _session->api().request(MTPmessages_RequestSimpleWebView(
 		MTP_flags(Flag::f_theme_params
+			| (_context.fullscreen ? Flag::f_fullscreen : Flag(0))
 			| (v::is<WebViewSourceSwitch>(_source)
 				? (Flag::f_url | Flag::f_from_switch_webview)
 				: v::is<WebViewSourceMainMenu>(_source)
@@ -964,7 +970,11 @@ void WebViewInstance::requestSimple() {
 		MTP_dataJSON(MTP_bytes(botThemeParams().json)),
 		MTP_string("tdesktop")
 	)).done([=](const MTPWebViewResult &result) {
-		show(qs(result.data().vurl()));
+		const auto &data = result.data();
+		show({
+			.url = qs(data.vurl()),
+			.fullscreen = data.is_fullscreen(),
+		});
 	}).fail([=](const MTP::Error &error) {
 		_parentShow->showToast(error.type());
 		close();
@@ -975,6 +985,7 @@ void WebViewInstance::requestMain() {
 	using Flag = MTPmessages_RequestMainWebView::Flag;
 	_requestId = _session->api().request(MTPmessages_RequestMainWebView(
 		MTP_flags(Flag::f_theme_params
+			| (_context.fullscreen ? Flag::f_fullscreen : Flag(0))
 			| (_button.startCommand.isEmpty()
 						? Flag()
 						: Flag::f_start_param)
@@ -989,7 +1000,11 @@ void WebViewInstance::requestMain() {
 		MTP_dataJSON(MTP_bytes(botThemeParams().json)),
 		MTP_string("tdesktop")
 	)).done([=](const MTPWebViewResult &result) {
-		show(qs(result.data().vurl()));
+		const auto &data = result.data();
+		show({
+			.url = qs(data.vurl()),
+			.fullscreen = data.is_fullscreen(),
+		});
 	}).fail([=](const MTP::Error &error) {
 		_parentShow->showToast(error.type());
 		close();
@@ -1003,6 +1018,7 @@ void WebViewInstance::requestApp(bool allowWrite) {
 	using Flag = MTPmessages_RequestAppWebView::Flag;
 	const auto app = _app;
 	const auto flags = Flag::f_theme_params
+		| (_context.fullscreen ? Flag::f_fullscreen : Flag(0))
 		| (_appStartParam.isEmpty() ? Flag(0) : Flag::f_start_param)
 		| (allowWrite ? Flag::f_write_allowed : Flag(0));
 	_requestId = _session->api().request(MTPmessages_RequestAppWebView(
@@ -1014,7 +1030,11 @@ void WebViewInstance::requestApp(bool allowWrite) {
 		MTP_string("tdesktop")
 	)).done([=](const MTPWebViewResult &result) {
 		_requestId = 0;
-		show(qs(result.data().vurl()));
+		const auto &data = result.data();
+		show({
+			.url = qs(data.vurl()),
+			.fullscreen = data.is_fullscreen(),
+		});
 	}).fail([=](const MTP::Error &error) {
 		_requestId = 0;
 		if (error.type() == u"BOT_INVALID"_q) {
@@ -1093,7 +1113,7 @@ void WebViewInstance::maybeChooseAndRequestButton(PeerTypes supported) {
 	close();
 }
 
-void WebViewInstance::show(const QString &url, uint64 queryId) {
+void WebViewInstance::show(ShowArgs &&args) {
 	auto title = Info::Profile::NameValue(_bot);
 	auto titleBadge = _bot->isVerified()
 		? object_ptr<Ui::RpWidget>(_parentShow->toastParent())
@@ -1131,18 +1151,19 @@ void WebViewInstance::show(const QString &url, uint64 queryId) {
 		|| v::is<WebViewSourceAttachMenu>(_source)
 		|| (attached != end(bots)
 			&& (attached->inAttachMenu || attached->inMainMenu));
-	_panelUrl = url;
+	_panelUrl = args.url;
 	_panel = Ui::BotWebView::Show({
-		.url = url,
+		.url = args.url,
 		.storageId = _session->local().resolveStorageIdBots(),
 		.title = std::move(title),
 		.titleBadge = std::move(titleBadge),
 		.bottom = rpl::single('@' + _bot->username()),
 		.delegate = static_cast<Ui::BotWebView::Delegate*>(this),
 		.menuButtons = buttons,
+		.fullscreen = args.fullscreen,
 		.allowClipboardRead = allowClipboardRead,
 	});
-	started(queryId);
+	started(args.queryId);
 
 	if (const auto strong = PendingActivation.get()) {
 		if (strong == this) {
@@ -1618,20 +1639,25 @@ void AttachWebView::openByUsername(
 		not_null<Window::SessionController*> controller,
 		const Api::SendAction &action,
 		const QString &botUsername,
-		const QString &startCommand) {
+		const QString &startCommand,
+		bool fullscreen) {
 	if (botUsername.isEmpty()
-		|| (_botUsername == botUsername && _startCommand == startCommand)) {
+		|| (_botUsername == botUsername
+			&& _startCommand == startCommand
+			&& _fullScreenRequested == fullscreen)) {
 		return;
 	}
 	cancel();
 
 	_botUsername = botUsername;
 	_startCommand = startCommand;
+	_fullScreenRequested = fullscreen;
 	const auto weak = base::make_weak(controller);
 	const auto show = controller->uiShow();
 	resolveUsername(show, crl::guard(weak, [=](not_null<PeerData*> peer) {
 		_botUsername = QString();
 		const auto token = base::take(_startCommand);
+		const auto fullscreen = base::take(_fullScreenRequested);
 
 		const auto bot = peer->asUser();
 		if (!bot || !bot->isBot()) {
@@ -1646,6 +1672,7 @@ void AttachWebView::openByUsername(
 			.context = {
 				.controller = controller,
 				.action = action,
+				.fullscreen = fullscreen,
 			},
 			.button = { .startCommand = token },
 			.source = InlineBots::WebViewSourceLinkAttachMenu{},
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index 4958ba19d..a879cdd2c 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -187,6 +187,7 @@ struct WebViewContext {
 	base::weak_ptr<Window::SessionController> controller;
 	Dialogs::EntryState dialogsEntryState;
 	std::optional<Api::SendAction> action;
+	bool fullscreen = false;
 	bool maySkipConfirmation = false;
 };
 
@@ -234,7 +235,12 @@ private:
 	void confirmOpen(Fn<void()> done);
 	void confirmAppOpen(bool writeAccess, Fn<void(bool allowWrite)> done);
 
-	void show(const QString &url, uint64 queryId = 0);
+	struct ShowArgs {
+		QString url;
+		uint64 queryId = 0;
+		bool fullscreen = false;
+	};
+	void show(ShowArgs &&args);
 	void showGame();
 	void started(uint64 queryId);
 
@@ -291,7 +297,8 @@ public:
 		not_null<Window::SessionController*> controller,
 		const Api::SendAction &action,
 		const QString &botUsername,
-		const QString &startCommand);
+		const QString &startCommand,
+		bool fullscreen);
 
 	void cancel();
 
@@ -360,6 +367,7 @@ private:
 
 	QString _botUsername;
 	QString _startCommand;
+	bool _fullScreenRequested = false;
 
 	mtpRequestId _requestId = 0;
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 41fd093d0..36de9475d 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -38,6 +38,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
 #include <QtGui/QWindow>
+#include <QtGui/QScreen>
+#include <QtGui/qpa/qplatformscreen.h>
 
 namespace Ui::BotWebView {
 namespace {
@@ -369,11 +371,13 @@ Panel::Panel(
 	object_ptr<Ui::RpWidget> titleBadge,
 	not_null<Delegate*> delegate,
 	MenuButtons menuButtons,
+	bool fullscreen,
 	bool allowClipboardRead)
 : _storageId(storageId)
 , _delegate(delegate)
 , _menuButtons(menuButtons)
 , _widget(std::make_unique<SeparatePanel>())
+, _fullscreen(fullscreen)
 , _allowClipboardRead(allowClipboardRead) {
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
 	_widget->setInnerSize(st::botWebViewPanelSize, true);
@@ -382,7 +386,9 @@ Panel::Panel(
 	) | rpl::start_with_next([=](bool fullscreen) {
 		_widget->toggleFullScreen(fullscreen);
 		layoutButtons();
+		sendFullScreen();
 		sendSafeArea();
+		sendContentSafeArea();
 	}, _widget->lifetime());
 
 	_widget->closeRequests(
@@ -762,6 +768,36 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			sendViewport();
 		} else if (command == "web_app_request_safe_area") {
 			sendSafeArea();
+		} else if (command == "web_app_request_content_safe_area") {
+			sendContentSafeArea();
+		} else if (command == "web_app_request_fullscreen") {
+			if (!_fullscreen.current()) {
+				_fullscreen = true;
+			} else {
+				sendFullScreen();
+			}
+		} else if (command == "web_app_exit_fullscreen") {
+			if (_fullscreen.current()) {
+				_fullscreen = false;
+			} else {
+				sendFullScreen();
+			}
+		} else if (command == "web_app_check_home_screen") {
+			postEvent("home_screen_checked", "{ status: \"unsupported\" }");
+		} else if (command == "web_app_start_accelerometer") {
+			postEvent("accelerometer_failed", "{ error: \"UNSUPPORTED\" }");
+		} else if (command == "web_app_start_device_orientation") {
+			postEvent(
+				"device_orientation_failed",
+				"{ error: \"UNSUPPORTED\" }");
+		} else if (command == "web_app_start_gyroscope") {
+			postEvent("gyroscope_failed", "{ error: \"UNSUPPORTED\" }");
+		} else if (command == "web_app_check_location") {
+			postEvent("location_checked", "{ available: false }");
+		} else if (command == "web_app_request_location") {
+			postEvent("location_requested", "{ available: false }");
+		} else if (command == "web_app_biometry_get_info") {
+			postEvent("biometry_info_received", "{ available: false }");
 		} else if (command == "web_app_open_tg_link") {
 			openTgLink(arguments);
 		} else if (command == "web_app_open_link") {
@@ -846,11 +882,36 @@ void Panel::sendViewport() {
 		"is_expanded: true }");
 }
 
+void Panel::sendFullScreen() {
+	postEvent("fullscreen_changed", _fullscreen.current()
+		? "{ is_fullscreen: true }"
+		: "{ is_fullscreen: false }");
+}
+
 void Panel::sendSafeArea() {
 	postEvent("safe_area_changed",
 		"{ top: 0, right: 0, bottom: 0, left: 0 }");
 }
 
+void Panel::sendContentSafeArea() {
+	const auto shift = st::separatePanelClose.rippleAreaPosition.y();
+	const auto top = _fullscreen.current()
+		? (shift + st::fullScreenPanelClose.height + (shift / 2))
+		: 0;
+	const auto scaled = top * style::DevicePixelRatio();
+	auto report = 0;
+	if (const auto screen = QGuiApplication::primaryScreen()) {
+		const auto dpi = screen->logicalDotsPerInch();
+		const auto ratio = screen->devicePixelRatio();
+		const auto basePair = screen->handle()->logicalBaseDpi();
+		const auto base = (basePair.first + basePair.second) * 0.5;
+		const auto systemScreenScale = dpi * ratio / base;
+		report = int(base::SafeRound(scaled / systemScreenScale));
+	}
+	postEvent("content_safe_area_changed",
+		u"{ top: %1, right: 0, bottom: 0, left: 0 }"_q.arg(report));
+}
+
 void Panel::setTitle(rpl::producer<QString> title) {
 	_widget->setTitle(std::move(title));
 }
@@ -1662,6 +1723,7 @@ std::unique_ptr<Panel> Show(Args &&args) {
 		std::move(args.titleBadge),
 		args.delegate,
 		args.menuButtons,
+		args.fullscreen,
 		args.allowClipboardRead);
 	const auto params = args.delegate->botThemeParams();
 	if (!result->showWebview(args.url, params, std::move(args.bottom))) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index 05a64c3c6..a42bf6634 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -79,6 +79,7 @@ public:
 		object_ptr<Ui::RpWidget> titleBadge,
 		not_null<Delegate*> delegate,
 		MenuButtons menuButtons,
+		bool fullscreen,
 		bool allowClipboardRead);
 	~Panel();
 
@@ -148,6 +149,8 @@ private:
 	void closeWithConfirmation();
 	void sendViewport();
 	void sendSafeArea();
+	void sendContentSafeArea();
+	void sendFullScreen();
 
 	using EventData = std::variant<QString, QJsonObject>;
 	void postEvent(const QString &event);
@@ -198,6 +201,7 @@ struct Args {
 	rpl::producer<QString> bottom;
 	not_null<Delegate*> delegate;
 	MenuButtons menuButtons;
+	bool fullscreen = false;
 	bool allowClipboardRead = false;
 };
 [[nodiscard]] std::unique_ptr<Panel> Show(Args &&args);
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 0ec6d195b..bb9bddf9e 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -637,6 +637,7 @@ void SessionNavigation::showPeerByLinkResolved(
 				.context = {
 					.controller = parentController(),
 					.action = action,
+					.fullscreen = info.botAppFullScreen,
 					.maySkipConfirmation = !info.botAppForceConfirmation,
 				},
 				.button = { .startCommand = info.startToken },
@@ -697,14 +698,18 @@ void SessionNavigation::showPeerByLinkResolved(
 					parentController(),
 					Api::SendAction(history),
 					attachBotUsername,
-					info.attachBotToggleCommand.value_or(QString()));
+					info.attachBotToggleCommand.value_or(QString()),
+					info.botAppFullScreen);
 			});
 		} else if (bot && info.attachBotMainOpen) {
 			const auto startCommand = info.attachBotToggleCommand.value_or(
 				QString());
 			bot->session().attachWebView().open({
 				.bot = bot,
-				.context = { .controller = parentController() },
+				.context = {
+					.controller = parentController(),
+					.fullscreen = info.botAppFullScreen,
+				},
 				.button = { .startCommand = startCommand },
 				.source = InlineBots::WebViewSourceLinkBotProfile{
 					.token = startCommand,
@@ -728,6 +733,7 @@ void SessionNavigation::showPeerByLinkResolved(
 						? Api::SendAction(
 							contextUser->owner().history(contextUser))
 						: std::optional<Api::SendAction>()),
+					.fullscreen = info.botAppFullScreen,
 				},
 				.button = { .startCommand = *info.attachBotToggleCommand },
 				.source = InlineBots::WebViewSourceLinkAttachMenu{
diff --git a/Telegram/SourceFiles/window/window_session_controller_link_info.h b/Telegram/SourceFiles/window/window_session_controller_link_info.h
index 329dc4d65..145da2d41 100644
--- a/Telegram/SourceFiles/window/window_session_controller_link_info.h
+++ b/Telegram/SourceFiles/window/window_session_controller_link_info.h
@@ -49,6 +49,7 @@ struct PeerByLinkInfo {
 	bool joinChannel = false;
 	QString botAppName;
 	bool botAppForceConfirmation = false;
+	bool botAppFullScreen = false;
 	QString attachBotUsername;
 	std::optional<QString> attachBotToggleCommand;
 	bool attachBotMainOpen = false;

From 4198203a7f68570e374c24446c7bb02b768070cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Nov 2024 16:05:39 +0400
Subject: [PATCH 271/306] Implement emoji status set from miniapps.

---
 Telegram/Resources/langs/lang.strings         |   3 +
 .../data/data_message_reactions.cpp           |   3 +
 Telegram/SourceFiles/data/data_user.h         |   1 +
 .../data/stickers/data_custom_emoji.cpp       |  23 ++-
 .../data/stickers/data_custom_emoji.h         |   4 +-
 .../view/history_view_contact_status.cpp      |   2 +-
 .../view/media/history_view_custom_emoji.cpp  |   3 +
 .../info/profile/info_profile_cover.cpp       |   2 +-
 .../inline_bots/bot_attach_web_view.cpp       | 147 ++++++++++++++++++
 .../inline_bots/bot_attach_web_view.h         |   4 +
 .../SourceFiles/settings/settings_premium.cpp |  22 +++
 .../SourceFiles/settings/settings_premium.h   |   9 ++
 .../ui/chat/attach/attach_bot_webview.cpp     |  37 +++++
 .../ui/chat/attach/attach_bot_webview.h       |   9 ++
 Telegram/SourceFiles/ui/chat/chat.style       |  23 +++
 15 files changed, 281 insertions(+), 11 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f24c6003c..23b7ae0c9 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3418,6 +3418,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_add_to_side_menu_done" = "Bot added to the main menu.";
 "lng_bot_no_scan_qr" = "QR Codes for bots are not supported on Desktop. Please use one of Telegram's mobile apps.";
 "lng_bot_no_share_story" = "Sharing to Stories is not supported on Desktop. Please use one of Telegram's mobile apps.";
+"lng_bot_emoji_status_confirm" = "Confirm";
+"lng_bot_emoji_status_title" = "Set Emoji Status";
+"lng_bot_emoji_status_text" = "Do you want to set this emoji status suggested by {bot}?";
 
 "lng_bot_status_users#one" = "{count} monthly user";
 "lng_bot_status_users#other" = "{count} monthly users";
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index d360ccf65..57bb4cbf2 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -1225,6 +1225,9 @@ not_null<CustomEmojiManager::Listener*> Reactions::resolveListener() {
 }
 
 void Reactions::customEmojiResolveDone(not_null<DocumentData*> document) {
+	if (!document->sticker()) {
+		return;
+	}
 	const auto id = ReactionId{ { document->id } };
 	const auto favorite = (_unresolvedFavoriteId == id);
 	const auto i = _unresolvedTop.find(id);
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index f016a9d4d..8dfc2b4f7 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -47,6 +47,7 @@ struct BotInfo {
 	bool cantJoinGroups : 1 = false;
 	bool supportsAttachMenu : 1 = false;
 	bool canEditInformation : 1 = false;
+	bool canManageEmojiStatus : 1 = false;
 	bool supportsBusiness : 1 = false;
 	bool hasMainApp : 1 = false;
 };
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index bb90a581d..2ed3baef8 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -652,22 +652,27 @@ void CustomEmojiManager::unregisterListener(not_null<Listener*> listener) {
 	}
 }
 
-rpl::producer<not_null<DocumentData*>> CustomEmojiManager::resolve(
-		DocumentId documentId) {
+auto CustomEmojiManager::resolve(DocumentId documentId)
+-> rpl::producer<not_null<DocumentData*>, rpl::empty_error> {
 	return [=](auto consumer) {
 		auto result = rpl::lifetime();
-		const auto put = [=](not_null<DocumentData*> document) {
+		const auto put = [=](
+				not_null<DocumentData*> document,
+				bool resolved = true) {
 			if (!document->sticker()) {
+				if (resolved) {
+					consumer.put_error({});
+				}
 				return false;
 			}
 			consumer.put_next_copy(document);
 			return true;
 		};
-		if (!put(owner().document(documentId))) {
-			const auto listener = new CallbackListener(put);
+		if (!put(owner().document(documentId), false)) {
+			const auto listener = result.make_state<CallbackListener>(put);
+			resolve(documentId, listener);
 			result.add([=] {
 				unregisterListener(listener);
-				delete listener;
 			});
 		}
 		return result;
@@ -763,6 +768,9 @@ void CustomEmojiManager::request() {
 		requestFinished();
 	}).fail([=] {
 		LOG(("API Error: Failed to get documents for emoji."));
+		for (const auto &id : ids) {
+			processListeners(_owner->document(id.v));
+		}
 		requestFinished();
 	}).send();
 }
@@ -792,7 +800,8 @@ void CustomEmojiManager::processLoaders(not_null<DocumentData*> document) {
 	}
 }
 
-void CustomEmojiManager::processListeners(not_null<DocumentData*> document) {
+void CustomEmojiManager::processListeners(
+		not_null<DocumentData*> document) {
 	const auto id = document->id;
 	if (const auto listeners = _resolvers.take(id)) {
 		for (const auto &listener : *listeners) {
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
index d51a52190..1d2f7940b 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
@@ -66,8 +66,8 @@ public:
 	void resolve(DocumentId documentId, not_null<Listener*> listener);
 	void unregisterListener(not_null<Listener*> listener);
 
-	[[nodiscard]] rpl::producer<not_null<DocumentData*>> resolve(
-		DocumentId documentId);
+	[[nodiscard]] auto resolve(DocumentId documentId)
+		-> rpl::producer<not_null<DocumentData*>, rpl::empty_error>;
 
 	[[nodiscard]] std::unique_ptr<Ui::CustomEmoji::Loader> createLoader(
 		not_null<DocumentData*> document,
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index a764199da..5d3025d45 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -98,7 +98,7 @@ namespace {
 				text.size(),
 				Data::SerializeCustomEmojiId(document)) },
 		};
-	});
+	}) | rpl::map_error_to_done();
 }
 
 [[nodiscard]] rpl::producer<TextWithEntities> PeerCustomStatus(
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 51c69c89b..94de0a30c 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp
@@ -108,6 +108,9 @@ CustomEmoji::CustomEmoji(
 }
 
 void CustomEmoji::customEmojiResolveDone(not_null<DocumentData*> document) {
+	if (!document->sticker()) {
+		return;
+	}
 	_resolving = false;
 	const auto id = document->id;
 	for (auto &line : _lines) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index a35609c38..c91b146a5 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -162,7 +162,7 @@ void TopicIconView::setupPlayer(not_null<Data::ForumTopic*> topic) {
 			id
 		) | rpl::map([=](not_null<DocumentData*> document) {
 			return document.get();
-		});
+		}) | rpl::map_error_to_done();
 	}) | rpl::flatten_latest(
 	) | rpl::map([=](DocumentData *document)
 	-> rpl::producer<std::shared_ptr<StickerPlayer>> {
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 674170696..f7ff549c2 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -26,12 +26,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_file_origin.h"
 #include "data/data_peer_bot_command.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_web_page.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "data/stickers/data_stickers.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "info/profile/info_profile_values.h"
@@ -43,6 +45,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwidget.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_non_panel_process.h"
+#include "settings/settings_premium.h"
 #include "storage/storage_account.h"
 #include "storage/storage_domain.h"
 #include "ui/basic_click_handlers.h"
@@ -428,6 +431,124 @@ void FillBotUsepic(
 	Ui::IconWithTitle(box->verticalLayout(), userpic, title, aboutLabel);
 }
 
+std::unique_ptr<Ui::RpWidget> MakeEmojiSetStatusPreview(
+		not_null<QWidget*> parent,
+		not_null<PeerData*> peer,
+		not_null<DocumentData*> document) {
+	auto result = std::make_unique<Ui::RpWidget>(parent);
+
+	const auto size = st::chatGiveawayPeerSize;
+	const auto padding = st::chatGiveawayPeerPadding;
+
+	const auto raw = result.get();
+
+	const auto width = raw->lifetime().make_state<int>();
+	const auto name = raw->lifetime().make_state<Ui::FlatLabel>(
+		raw,
+		rpl::single(peer->name()),
+		st::botEmojiStatusName);
+	auto emojiText = TextWithEntities();
+	const auto emoji = raw->lifetime().make_state<Ui::FlatLabel>(
+		raw,
+		rpl::single(emojiText),
+		st::botEmojiStatusName);
+	const auto userpic = raw->lifetime().make_state<Ui::UserpicButton>(
+		raw,
+		peer,
+		st::botEmojiStatusUserpic);
+
+	raw->resize(size, size);
+	raw->sizeValue() | rpl::start_with_next([=](QSize outer) {
+		const auto full = outer.width();
+		const auto decorations = size
+			+ padding.left()
+			+ padding.right()
+			+ emoji->width()
+			+ st::normalFont->spacew;
+		const auto inner = full - decorations;
+		const auto use = std::min(inner, name->textMaxWidth());
+		*width = use + decorations;
+		const auto left = (full - *width) / 2;
+		if (inner > 0) {
+			userpic->moveToLeft(left, 0, outer.width());
+			emoji->moveToLeft(
+				left + *width - padding.right() - emoji->width(),
+				padding.top(),
+				outer.width());
+			name->resizeToWidth(use);
+			name->moveToLeft(
+				left + size + padding.left(),
+				padding.top(),
+				outer.width());
+		}
+	}, raw->lifetime());
+	raw->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(raw);
+		const auto left = (raw->width() - *width) / 2;
+		const auto skip = size / 2;
+		p.setClipRect(left + skip, 0, *width - skip, size);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowBgOver);
+		p.drawRoundedRect(left, 0, *width, size, skip, skip);
+	}, raw->lifetime());
+
+	return result;
+}
+
+void ConfirmEmojiStatusBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<UserData*> bot,
+		not_null<DocumentData*> document,
+		TimeId until,
+		Fn<void(bool)> done) {
+	box->setNoContentMargin(true);
+
+	auto owned = Settings::MakeEmojiStatusPreview(box, document);
+	const auto preview = box->addRow(
+		object_ptr<Ui::RpWidget>::fromRaw(owned.release()));
+	preview->resize(preview->width(), st::botEmojiStatusPreviewHeight);
+
+	const auto set = box->lifetime().make_state<bool>();
+
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		tr::lng_bot_emoji_status_title(),
+		st::botEmojiStatusTitle));
+	AddSkip(box->verticalLayout());
+
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		tr::lng_bot_emoji_status_text(
+			lt_bot,
+			rpl::single(Ui::Text::Bold(bot->name())),
+			Ui::Text::RichLangValue),
+		st::botEmojiStatusText));
+
+	AddSkip(box->verticalLayout());
+
+	auto ownedSet = MakeEmojiSetStatusPreview(
+		box,
+		document->session().user(),
+		document);
+	box->addRow(
+		object_ptr<Ui::RpWidget>::fromRaw(ownedSet.release()));
+
+	box->addButton(tr::lng_bot_emoji_status_confirm(), [=] {
+		document->owner().emojiStatuses().set(document->id, until);
+		*set = true;
+		box->closeBox();
+		done(true);
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		const auto was = *set;
+		box->closeBox();
+		if (!was) {
+			done(false);
+		}
+	});
+}
+
 class BotAction final : public Ui::Menu::ItemBase {
 public:
 	BotAction(
@@ -1514,6 +1635,32 @@ void WebViewInstance::botInvokeCustomMethod(
 	}).send();
 }
 
+void WebViewInstance::botSetEmojiStatus(
+		Ui::BotWebView::SetEmojiStatusRequest request) {
+	const auto bot = _bot;
+	const auto panel = _panel.get();
+	const auto callback = request.callback;
+	const auto until = request.expirationDate;
+	if (!panel) {
+		callback(u"UNKNOWN_ERROR"_q);
+		return;
+	}
+	_session->data().customEmojiManager().resolve(
+		request.customEmojiId
+	) | rpl::start_with_next_error([=](not_null<DocumentData*> document) {
+		const auto sticker = document->sticker();
+		if (!sticker || sticker->setType != Data::StickersType::Emoji) {
+			callback(u"SUGGESTED_EMOJI_INVALID"_q);
+			return;
+		}
+		const auto done = [=](bool success) {
+			callback(success ? QString() : u"USER_DECLINED"_q);
+		};
+		panel->showBox(
+			Box(ConfirmEmojiStatusBox, bot, document, until, done));
+	}, [=] { callback(u"SUGGESTED_EMOJI_INVALID"_q); }, panel->lifetime());
+}
+
 void WebViewInstance::botOpenPrivacyPolicy() {
 	const auto bot = _bot;
 	const auto weak = _context.controller;
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index a879cdd2c..b3ce5cbf5 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -263,6 +263,8 @@ private:
 	void botSharePhone(Fn<void(bool shared)> callback) override;
 	void botInvokeCustomMethod(
 		Ui::BotWebView::CustomMethodRequest request) override;
+	void botSetEmojiStatus(
+		Ui::BotWebView::SetEmojiStatusRequest request) override;
 	void botOpenPrivacyPolicy() override;
 	void botClose() override;
 
@@ -283,6 +285,8 @@ private:
 	QString _panelUrl;
 	std::unique_ptr<Ui::BotWebView::Panel> _panel;
 
+	rpl::lifetime _lifetime;
+
 	static base::weak_ptr<WebViewInstance> PendingActivation;
 
 };
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 6c239c49e..172420fd8 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -1773,7 +1773,29 @@ void AddSummaryPremium(
 	}
 
 	Ui::AddSkip(content, descriptionPadding.bottom());
+}
 
+std::unique_ptr<Ui::RpWidget> MakeEmojiStatusPreview(
+		not_null<QWidget*> parent,
+		not_null<DocumentData*> document) {
+	auto result = std::make_unique<Ui::RpWidget>(parent);
+
+	const auto raw = result.get();
+	const auto size = HistoryView::Sticker::EmojiSize();
+	const auto emoji = raw->lifetime().make_state<EmojiStatusTopBar>(
+		document,
+		[=](QRect r) { raw->update(std::move(r)); },
+		size);
+	raw->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(raw);
+		emoji->paint(p);
+	}, raw->lifetime());
+
+	raw->sizeValue() | rpl::start_with_next([=](QSize size) {
+		emoji->setCenter(QPointF(size.width() / 2., size.height() / 2.));
+	}, raw->lifetime());
+
+	return result;
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_premium.h b/Telegram/SourceFiles/settings/settings_premium.h
index 65d7d18da..3a6ef6896 100644
--- a/Telegram/SourceFiles/settings/settings_premium.h
+++ b/Telegram/SourceFiles/settings/settings_premium.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "settings/settings_type.h"
 
+class DocumentData;
 enum class PremiumFeature;
 
 namespace style {
@@ -108,5 +109,13 @@ void AddSummaryPremium(
 	const QString &ref,
 	Fn<void(PremiumFeature)> buttonCallback);
 
+[[nodiscard]] std::unique_ptr<Ui::RpWidget> MakeEmojiStatusPreview(
+	not_null<QWidget*> parent,
+	not_null<DocumentData*> document);
+[[nodiscard]] std::unique_ptr<Ui::RpWidget> MakeEmojiSetStatusPreview(
+	not_null<QWidget*> parent,
+	not_null<PeerData*> peer,
+	not_null<DocumentData*> document);
+
 } // namespace Settings
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 36de9475d..62e9191e1 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -824,6 +824,8 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			processHeaderColor(arguments);
 		} else if (command == "web_app_set_bottom_bar_color") {
 			processBottomBarColor(arguments);
+		} else if (command == "web_app_set_emoji_status") {
+			processEmojiStatusRequest(arguments);
 		} else if (command == "share_score") {
 			_delegate->botHandleMenuButton(MenuButton::ShareGame);
 		}
@@ -963,6 +965,41 @@ void Panel::switchInlineQueryMessage(const QJsonObject &args) {
 	_delegate->botSwitchInlineQuery(types, query);
 }
 
+void Panel::processEmojiStatusRequest(const QJsonObject &args) {
+	if (args.isEmpty()) {
+		_delegate->botClose();
+		return;
+	}
+	const auto emojiId = args["custom_emoji_id"].toString().toULongLong();
+	const auto expirationDate = TimeId(base::SafeRound(
+		args["expiration_date"].toDouble()));
+	if (!emojiId) {
+		postEvent(
+			"emoji_status_failed",
+			"{ error: \"SUGGESTED_EMOJI_INVALID\" }");
+		return;
+	} else if (expirationDate < 0) {
+		postEvent(
+			"emoji_status_failed",
+			"{ error: \"EXPIRATION_DATE_INVALID\" }");
+		return;
+	}
+	auto callback = crl::guard(this, [=](QString error) {
+		if (error.isEmpty()) {
+			postEvent("emoji_status_set");
+		} else {
+			postEvent(
+				"emoji_status_failed",
+				u"{ error: \"%1\" }"_q.arg(error));
+		}
+	});
+	_delegate->botSetEmojiStatus({
+		.customEmojiId = emojiId,
+		.expirationDate = expirationDate,
+		.callback = std::move(callback),
+	});
+}
+
 void Panel::openTgLink(const QJsonObject &args) {
 	if (args.isEmpty()) {
 		LOG(("BotWebView Error: Bad arguments in 'web_app_open_tg_link'."));
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index a42bf6634..7ea2be451 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -51,6 +51,12 @@ struct CustomMethodRequest {
 	Fn<void(CustomMethodResult)> callback;
 };
 
+struct SetEmojiStatusRequest {
+	uint64 customEmojiId = 0;
+	TimeId expirationDate = 0;
+	Fn<void(QString)> callback;
+};
+
 class Delegate {
 public:
 	virtual Webview::ThemeParams botThemeParams() = 0;
@@ -67,6 +73,7 @@ public:
 	virtual void botAllowWriteAccess(Fn<void(bool allowed)> callback) = 0;
 	virtual void botSharePhone(Fn<void(bool shared)> callback) = 0;
 	virtual void botInvokeCustomMethod(CustomMethodRequest request) = 0;
+	virtual void botSetEmojiStatus(SetEmojiStatusRequest request) = 0;
 	virtual void botOpenPrivacyPolicy() = 0;
 	virtual void botClose() = 0;
 };
@@ -123,6 +130,8 @@ private:
 	void setTitle(rpl::producer<QString> title);
 	void sendDataMessage(const QJsonObject &args);
 	void switchInlineQueryMessage(const QJsonObject &args);
+	void processEmojiStatusRequest(const QJsonObject &args);
+	void processEmojiStatusAccessRequest();
 	void processButtonMessage(
 		std::unique_ptr<Button> &button,
 		const QJsonObject &args);
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index ec1f9c2f6..eb47373c5 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1155,3 +1155,26 @@ msgSelectionCheck: RoundCheckbox(defaultPeerListCheck) {
 }
 
 sponsoredMessageBarMaxHeight: 156px;
+
+botEmojiStatusPreviewHeight: 148px;
+botEmojiStatusTitle: FlatLabel(boxTitle) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(16px semibold);
+		lineHeight: 20px;
+	}
+	minWidth: 256px;
+	maxHeight: 0px;
+	align: align(top);
+}
+botEmojiStatusText: FlatLabel(defaultFlatLabel) {
+	style: boxTextStyle;
+	minWidth: 256px;
+	maxHeight: 0px;
+	align: align(top);
+}
+botEmojiStatusUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(chatGiveawayPeerSize, chatGiveawayPeerSize);
+	photoSize: chatGiveawayPeerSize;
+}
+botEmojiStatusName: FlatLabel(defaultFlatLabel) {
+}

From 3d77bff0c909a35cadae88f0924131a4ddf5cd3e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Nov 2024 21:56:54 +0400
Subject: [PATCH 272/306] Support bot emoji status access.

---
 .../Resources/animations/hello_status.tgs     | Bin 0 -> 2322 bytes
 Telegram/Resources/langs/lang.strings         |   4 +
 .../Resources/qrc/telegram/animations.qrc     |   1 +
 Telegram/SourceFiles/data/data_document.cpp   |   8 ++
 Telegram/SourceFiles/data/data_document.h     |   1 +
 Telegram/SourceFiles/data/data_user.cpp       |   3 +
 .../history/history_inner_widget.cpp          |   8 ++
 Telegram/SourceFiles/info/info.style          |   1 +
 .../info/profile/info_profile_actions.cpp     |  35 ++++++
 .../inline_bots/bot_attach_web_view.cpp       | 103 +++++++++++++++++-
 .../inline_bots/bot_attach_web_view.h         |   2 +
 .../SourceFiles/settings/settings_premium.cpp |   2 +-
 .../ui/chat/attach/attach_bot_webview.cpp     |  11 ++
 .../ui/chat/attach/attach_bot_webview.h       |   2 +
 Telegram/SourceFiles/ui/chat/chat.style       |   3 +
 15 files changed, 179 insertions(+), 5 deletions(-)
 create mode 100644 Telegram/Resources/animations/hello_status.tgs

diff --git a/Telegram/Resources/animations/hello_status.tgs b/Telegram/Resources/animations/hello_status.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..b48182c2c11a4c2000380d762dc0a1b7312f76ae
GIT binary patch
literal 2322
zcmY+;c{~%09|!Q6sma}pNip}CEfZULHVfr8DM?f4G0L?TGNCye6WI{I<cJ=*k34wX
zGUX~)X~<j=QRGPGdVW{WtG<7HU$6Hc-_Q3W&j17dGeG{&&X#_%2I9L~t(g}<cl~(W
zmj&v5mk+do-#8|WeHSn{KLp!d+9A~j{%&q_p}Kewo^a~{k%?+c_aik&Qr{iL>C`EG
zsz;33Nn7icF4RAx-b(f!cYa^JAX2I`G3#|pvU7cGlib+!Tz!GN#~Zw|)SP)m+XEI7
z96WMla%|r1*d@0w)2ycYjIf8VHg~^NY)$db4LOG`By1xG{jv~<aS2yuJMje0wa58Z
zTk{{fpCDo58)KhYsaK`#d-pyI@}z9HEatu%ONGv5aI4z=W}XLA84ugfX6`jH=if#7
zTX!JARBR(QwAnDrxuUXWaC0$OqY^7Y#e(tH^!hImvb*gi$2Hv3Kqxs#_wCij{MsC2
z$&32ah?tK_H-nbmsTQ;;L*mNPV-}IUTKPG@#ZG@yN*HIMU2#+F-(p$clx(;xv^#EU
zu`^|CwbaUeTYDk1;V^+h=dhsJBQ1Oqj<dNb0We@*Kla|<eQWsXitFB*Etoa#vSy=?
zm~^685znv&?0?bu$v}CWPf_ifRMGt-sj+sc1-sS`Ic@6GqL1To@w$`nE_RzbOZ2f7
zHePoI-gS5%;Jp_gt&47Y8Mar%X$-Fh&J5-UxKn<6pljRJ)xNnFIMhWfh1DnCOr}eB
z@7sP?l9!y&PTe4AG+{9vwbRp4cA;d|bLW!0r<tMhC7saN1rBxk?B@cQCA1f!M<DM+
zRpRI4rH*wk*QZ^#6kFd3?u{zcNb{U3t{5s=Cuv(CGXyW~Q)MZ>z}PPad*~`W&wL$p
zMt0heqy>W=<C-&2op^s~t17&c<54}A%&wcZ#Wxb7iwRe%QUnSW)KEcwl-Jwu>vD4r
zOiy4;sYjT3Z*1cfvWA2E7+DSetgp+J<_W5!6pG?W{}4mLAkn_QlUJWv@sFN1!}q_j
zi0pq<;^yD%YM6GE_ogkT->)KA2MH_<Xfxrc^&cIOdbmFoz+)5i^=0ZoYB68J82zCu
zZfj<bQ6x&m-AQpfZwcY<Ct|e(l!l>*4I`za+X4xUdJa#zA3}2nDhIr><w%F<SKnW3
z_R5ra1}0g4epJxP=yz<6D?`Ij4DyQ&fy<MIvU?1eypNQ^C6u4{AiQ#61LN{}#5>K(
zge%o6|82jjn!Xkue!a;w<`^4qf@n%{Rf`Lyynv=-1RxfR{87HZgViWZ=01hAQ9YTJ
z^G|!UI75;ygFO%ZFj$kkE{CX3eD-yUq#nXUwB*?vky=i2?vutVr)@apnTYDm6INbC
zl7S`JOy=CAD(4bgApH$d%(DD^#R=cv+q9}V=JAqh;&$;J5dw@k=yxAaoE1Q@Hp_*_
zi84(_MxhyGiv}c@Z;p;H^j7&6xr*KLk?aOM&}BN!?zqk0V0q1>wq!RTf%!&P7R|_p
z{6+`#BXojTKBtenMZypH3$u+6>sioA+yc!YquA-pR(Ui*#RTVnrhD__@Q#y(hS+fA
zQkbLCmYR#~qfT-hINc!v+D-MA6F*+lXq<LN3hMdcg|T)Utll1a%0;iGZuS9LFR#Q|
zeCS4@a`+l-doZxqHO|pySD-vjTqk_GgpF>wLYjzqON7SLkLi|5wI+Lz|7@|tm<f^b
z#3{UC-nAum-NDyaD<o%q+9)!KdC1ad-o)OmYJO&%P<4n5h=BI`>Hxqtl~u}y*l@}o
zFGjLzTs?ce;JT(6bTClrc#9F&<aIdId6b>Bd~u?kW~(38T?aN~oL7_vhy>AejQDjl
z6;om|=~ow#xg45<Qs1Cb#Yee<3aZG;0UDFNWO0p?o_+BiFuy>bE>s>4$qh0P#VGi8
zmR}WCHMpAx?ho}$%eb3&FScPq!`H27Kdm@*(9e~4^J+PZqs14EyzLD%E>a}WdD&Dh
zD4L`asOgZX3^G*v6qDUDv;$X<q3GCV+;P(R_(AzE09RX-t?#j+Qy`(?CGK<wkTYs|
z{*cp*FRib5y>O_=sqA`V;rb`bg||soMSFY$iXg-1a#PWgPF?0vYeEkwuOR#xMPTC0
z#4RHyWk`Yl#Npv3S{2a^4Ew_|5a5KC9F_5%D4=2of~AC)BXdzbP5V5O*b+=(MviEE
zM!+H|fiL{twSykihCcl}dIP~`sUYK1LJ-GBrt|`IMDTi}30!PVmUKt%dd|NB+zvIX
zJi;bcl?RLGvP=k55l=VLp0w&LK!=B?7VM;e@Jf|{nk9j}FgC(l?oz|*RE`Jj+Ngo3
zCtu2OyF|r~l+=5W6ByT((_+yIAThp7U{ui4IqhUOKO;vvDgp0w5-r?A+?O}AQW@nC
z;%+NeX1c4YzzvlVG?_r0iRnOAHnbaDOX=0fK|Gmo@0sCMl4Vp8t<a+41YWvlOIVPW
zL6W2w{{T-OepKJ45U4!-oi?v7KLcS3p;N^ol}07k`R`;PlXa&$kl)HG<*VAkr*Wcx
zX^PI%?XjtoL>02o&Vl`AQ!dLV-&W_&^M$b0aoO9n75*+Ub=>l)Fu(~7d^RZjAjm>o
z9lu-+3b&6i5(KJ%li`Gj2?8km!cT1fmG=ZA{<+KswdQ~$p8g2>HyMJzP!<9*|B-7X
z7-1{{y7&{NA-~W-6&&}!M*n?qR}sACC#m_PXF~?O4|n#TU&}8*;e$WhBEsc;1-eT_
z-5~otjl$n0;+?VaWSqw<Df|D*ZCc+%nqUOCHs)8hk7NynhK(F~WQ~wU;T<p&<l)Zy
zZy}HhjqRnc#Icuhiys>^jy4TA^iekPqT@~5XLKm&jq(-w?#);E!ziyT=PwO`C+ltp
zL}wwstFM%-A~w&x{1ehKdW^Z?VKP#p#$3gZP~@n4K~~>4Sg&f#Yra=~9dWDcS9aUO
sWL-wQ_MN>jw$s_S*1bKuTJltPZo@g3wTBVh`LK(_g@?Mp!vKK40hiB2ZU6uP

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 23b7ae0c9..9c0aa15d6 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1461,6 +1461,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_open_app" = "Open App";
 "lng_profile_open_app_about" = "By launching this mini app, you agree to the {terms}.";
 "lng_profile_open_app_terms" = "Terms of Service for Mini Apps";
+"lng_profile_bot_permissions_title" = "Allow access to";
+"lng_profile_bot_emoji_status_access" = "Emoji Status";
 "lng_info_add_as_contact" = "Add to contacts";
 "lng_profile_shared_media" = "Shared media";
 "lng_profile_suggest_photo" = "Suggest Profile Photo";
@@ -3421,6 +3423,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_emoji_status_confirm" = "Confirm";
 "lng_bot_emoji_status_title" = "Set Emoji Status";
 "lng_bot_emoji_status_text" = "Do you want to set this emoji status suggested by {bot}?";
+"lng_bot_emoji_status_access_text" = "{bot} requests access to set your **emoji status**. You will be able to revoke this access in the profile page of {name}.";
+"lng_bot_emoji_status_access_allow" = "Allow";
 
 "lng_bot_status_users#one" = "{count} monthly user";
 "lng_bot_status_users#other" = "{count} monthly users";
diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc
index ac6ff1dbf..f60061f99 100644
--- a/Telegram/Resources/qrc/telegram/animations.qrc
+++ b/Telegram/Resources/qrc/telegram/animations.qrc
@@ -28,6 +28,7 @@
     <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>
+    <file alias="hello_status.tgs">../../animations/hello_status.tgs</file>
 
     <file alias="dice_idle.tgs">../../animations/dice/dice_idle.tgs</file>
     <file alias="dart_idle.tgs">../../animations/dice/dart_idle.tgs</file>
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index af5f95077..c14d29bfc 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -745,6 +745,14 @@ bool DocumentData::emojiUsesTextColor() const {
 	return (_flags & Flag::UseTextColor);
 }
 
+void DocumentData::overrideEmojiUsesTextColor(bool value) {
+	if (value) {
+		_flags |= Flag::UseTextColor;
+	} else {
+		_flags &= ~Flag::UseTextColor;
+	}
+}
+
 bool DocumentData::hasThumbnail() const {
 	return _thumbnail.location.valid()
 		&& !thumbnailFailed()
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index df1f9eab3..6aa21caa9 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -206,6 +206,7 @@ public:
 	[[nodiscard]] bool isPremiumSticker() const;
 	[[nodiscard]] bool isPremiumEmoji() const;
 	[[nodiscard]] bool emojiUsesTextColor() const;
+	void overrideEmojiUsesTextColor(bool value);
 
 	[[nodiscard]] bool hasThumbnail() const;
 	[[nodiscard]] bool thumbnailLoading() const;
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 2456567d3..7433dbd9a 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -580,6 +580,9 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	} else {
 		user->setBotInfoVersion(-1);
 	}
+	if (const auto info = user->botInfo.get()) {
+		info->canManageEmojiStatus = update.is_bot_can_manage_emoji_status();
+	}
 	if (const auto pinned = update.vpinned_msg_id()) {
 		SetTopPinnedMessageId(user, pinned->v);
 	}
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 41e33a6b0..2753b0dc0 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2435,6 +2435,14 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				if (const auto sticker = emojiStickers->stickerForEmoji(
 						isolated)) {
 					addDocumentActions(sticker.document, item);
+				} else if (v::is<QString>(isolated.items.front())
+					&& v::is_null(isolated.items[1])) {
+					const auto id = v::get<QString>(isolated.items.front());
+					const auto docId = id.toULongLong();
+					const auto document = session->data().document(docId);
+					if (document->sticker()) {
+						addDocumentActions(document, item);
+					}
 				}
 			}
 		}
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index ae7037a2c..05796c024 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -470,6 +470,7 @@ infoIconMediaSaved: icon {{ "info/info_media_saved", infoIconFg }};
 infoIconMediaStoriesArchive: icon {{ "info/info_stories_archive", infoIconFg }};
 infoIconMediaStoriesRecent: icon {{ "info/info_stories_recent", infoIconFg }};
 infoIconMediaGifts: icon {{ "menu/gift_premium", infoIconFg, point(4px, 4px) }};
+infoIconEmojiStatusAccess: icon {{ "menu/read_reactions", infoIconFg, point(4px, 4px) }};
 
 infoIconShare: icon {{ "info/info_share", infoIconFg }};
 infoIconEdit: icon {{ "info/info_edit", infoIconFg }};
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 40611897a..7ade4a32e 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -958,6 +958,7 @@ private:
 	object_ptr<Ui::RpWidget> setupInfo();
 	object_ptr<Ui::RpWidget> setupMuteToggle();
 	void setupMainApp();
+	void setupBotPermissions();
 	void setupMainButtons();
 	Ui::MultiSlideTracker fillTopicButtons();
 	Ui::MultiSlideTracker fillUserButtons(
@@ -1865,6 +1866,37 @@ void DetailsFiller::setupMainApp() {
 	Ui::AddSkip(_wrap);
 }
 
+void DetailsFiller::setupBotPermissions() {
+	AddSkip(_wrap);
+	AddSubsectionTitle(_wrap, tr::lng_profile_bot_permissions_title());
+	const auto emoji = _wrap->add(
+		object_ptr<Ui::SettingsButton>(
+			_wrap,
+			tr::lng_profile_bot_emoji_status_access(),
+			st::infoSharedMediaButton));
+	object_ptr<Profile::FloatingIcon>(
+		emoji,
+		st::infoIconEmojiStatusAccess,
+		st::infoSharedMediaButtonIconPosition);
+
+	const auto user = _peer->asUser();
+	emoji->toggleOn(
+		rpl::single(bool(user->botInfo->canManageEmojiStatus))
+	)->toggledValue() | rpl::filter([=](bool allowed) {
+		return allowed != user->botInfo->canManageEmojiStatus;
+	}) | rpl::start_with_next([=](bool allowed) {
+		user->botInfo->canManageEmojiStatus = allowed;
+		const auto session = &user->session();
+		session->api().request(MTPbots_ToggleUserEmojiStatusPermission(
+			user->inputUser,
+			MTP_bool(allowed)
+		)).send();
+	}, emoji->lifetime());
+	AddSkip(_wrap);
+	AddDivider(_wrap);
+	AddSkip(_wrap);
+}
+
 void DetailsFiller::setupMainButtons() {
 	auto wrapButtons = [=](auto &&callback) {
 		auto topSkip = _wrap->add(CreateSlideSkipWidget(_wrap));
@@ -2059,6 +2091,9 @@ object_ptr<Ui::RpWidget> DetailsFiller::fill() {
 			if (info->hasMainApp) {
 				setupMainApp();
 			}
+			if (info->canManageEmojiStatus) {
+				setupBotPermissions();
+			}
 		}
 	}
 	if (!_peer->isSelf()) {
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index f7ff549c2..e1858aa95 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer_rpl.h"
 #include "boxes/peer_list_controllers.h"
 #include "boxes/share_box.h"
+#include "chat_helpers/stickers_lottie.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
@@ -447,11 +448,21 @@ std::unique_ptr<Ui::RpWidget> MakeEmojiSetStatusPreview(
 		raw,
 		rpl::single(peer->name()),
 		st::botEmojiStatusName);
-	auto emojiText = TextWithEntities();
+	const auto makeContext = [=](Fn<void()> update) {
+		return Core::MarkedTextContext{
+			.session = &peer->session(),
+			.customEmojiRepaint = update,
+		};
+	};
 	const auto emoji = raw->lifetime().make_state<Ui::FlatLabel>(
 		raw,
-		rpl::single(emojiText),
-		st::botEmojiStatusName);
+		rpl::single(
+			Ui::Text::SingleCustomEmoji(
+				Data::SerializeCustomEmojiId(document->id),
+				document->sticker() ? document->sticker()->alt : QString())),
+		st::botEmojiStatusEmoji,
+		st::defaultPopupMenu,
+		makeContext);
 	const auto userpic = raw->lifetime().make_state<Ui::UserpicButton>(
 		raw,
 		peer,
@@ -496,6 +507,59 @@ std::unique_ptr<Ui::RpWidget> MakeEmojiSetStatusPreview(
 	return result;
 }
 
+void ConfirmEmojiStatusAccessBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<UserData*> bot,
+		Fn<void(bool)> done) {
+	box->setNoContentMargin(true);
+
+	const auto set = box->lifetime().make_state<bool>();
+
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	AddSkip(box->verticalLayout(), 4 * st::defaultVerticalListSkip);
+
+	const auto statusIcon = ChatHelpers::GenerateLocalTgsSticker(
+		&bot->session(),
+		u"hello_status"_q);
+	statusIcon->overrideEmojiUsesTextColor(true);
+
+	auto ownedSet = MakeEmojiSetStatusPreview(
+		box,
+		bot->session().user(),
+		statusIcon);
+	box->addRow(
+		object_ptr<Ui::RpWidget>::fromRaw(ownedSet.release()));
+
+	AddSkip(box->verticalLayout(), 2 * st::defaultVerticalListSkip);
+
+	auto name = Ui::Text::Bold(bot->name());
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		tr::lng_bot_emoji_status_access_text(
+			lt_bot,
+			rpl::single(name),
+			lt_name,
+			rpl::single(name),
+			Ui::Text::RichLangValue),
+		st::botEmojiStatusText));
+
+	box->addButton(tr::lng_bot_emoji_status_access_allow(), [=] {
+		*set = true;
+		box->closeBox();
+		done(true);
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		const auto was = *set;
+		box->closeBox();
+		if (!was) {
+			done(false);
+		}
+	});
+}
+
 void ConfirmEmojiStatusBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<UserData*> bot,
@@ -511,6 +575,10 @@ void ConfirmEmojiStatusBox(
 
 	const auto set = box->lifetime().make_state<bool>();
 
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
 	box->addRow(object_ptr<Ui::FlatLabel>(
 		box,
 		tr::lng_bot_emoji_status_title(),
@@ -525,7 +593,7 @@ void ConfirmEmojiStatusBox(
 			Ui::Text::RichLangValue),
 		st::botEmojiStatusText));
 
-	AddSkip(box->verticalLayout());
+	AddSkip(box->verticalLayout(), 2 * st::defaultVerticalListSkip);
 
 	auto ownedSet = MakeEmojiSetStatusPreview(
 		box,
@@ -1600,6 +1668,33 @@ void WebViewInstance::botAllowWriteAccess(Fn<void(bool allowed)> callback) {
 	}).send();
 }
 
+void WebViewInstance::botRequestEmojiStatusAccess(
+		Fn<void(bool allowed)> callback) {
+	if (_bot->botInfo->canManageEmojiStatus) {
+		callback(true);
+	} else if (const auto panel = _panel.get()) {
+		const auto bot = _bot;
+		panel->showBox(Box(ConfirmEmojiStatusAccessBox, bot, [=](bool ok) {
+			if (!ok) {
+				callback(false);
+				return;
+			}
+			const auto session = &bot->session();
+			bot->botInfo->canManageEmojiStatus = true;
+			session->api().request(MTPbots_ToggleUserEmojiStatusPermission(
+				bot->inputUser,
+				MTP_bool(true)
+			)).done([=] {
+				callback(true);
+			}).fail([=] {
+				callback(false);
+			}).send();
+		}));
+	} else {
+		callback(false);
+	}
+}
+
 void WebViewInstance::botSharePhone(Fn<void(bool shared)> callback) {
 	const auto history = _bot->owner().history(_bot);
 	if (_bot->isBlocked()) {
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index b3ce5cbf5..0d7ae73d4 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -260,6 +260,8 @@ private:
 		QString query) override;
 	void botCheckWriteAccess(Fn<void(bool allowed)> callback) override;
 	void botAllowWriteAccess(Fn<void(bool allowed)> callback) override;
+	void botRequestEmojiStatusAccess(
+		Fn<void(bool allowed)> callback) override;
 	void botSharePhone(Fn<void(bool shared)> callback) override;
 	void botInvokeCustomMethod(
 		Ui::BotWebView::CustomMethodRequest request) override;
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 172420fd8..b14e9aee1 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -774,7 +774,7 @@ void TopBarUser::updateTitle(
 		{ EntityType::CustomEmoji, 0, 1, entityEmojiData },
 		Ui::Text::Link(text, linkIndex).entities.front(),
 	};
-	auto title = (setId == coloredId)
+	auto title = (setId != coloredId)
 		? tr::lng_premium_emoji_status_title_colored(
 			tr::now,
 			lt_user,
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 62e9191e1..da2a8a5b8 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -826,6 +826,8 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			processBottomBarColor(arguments);
 		} else if (command == "web_app_set_emoji_status") {
 			processEmojiStatusRequest(arguments);
+		} else if (command == "web_app_request_emoji_status_access") {
+			processEmojiStatusAccessRequest();
 		} else if (command == "share_score") {
 			_delegate->botHandleMenuButton(MenuButton::ShareGame);
 		}
@@ -1000,6 +1002,15 @@ void Panel::processEmojiStatusRequest(const QJsonObject &args) {
 	});
 }
 
+void Panel::processEmojiStatusAccessRequest() {
+	auto callback = crl::guard(this, [=](bool allowed) {
+		postEvent("emoji_status_access_requested", allowed
+			? "{ status: \"allowed\" }"
+			: "{ status: \"cancelled\" }");
+	});
+	_delegate->botRequestEmojiStatusAccess(std::move(callback));
+}
+
 void Panel::openTgLink(const QJsonObject &args) {
 	if (args.isEmpty()) {
 		LOG(("BotWebView Error: Bad arguments in 'web_app_open_tg_link'."));
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index 7ea2be451..97da49a60 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -71,6 +71,8 @@ public:
 		QString query) = 0;
 	virtual void botCheckWriteAccess(Fn<void(bool allowed)> callback) = 0;
 	virtual void botAllowWriteAccess(Fn<void(bool allowed)> callback) = 0;
+	virtual void botRequestEmojiStatusAccess(
+		Fn<void(bool allowed)> callback) = 0;
 	virtual void botSharePhone(Fn<void(bool shared)> callback) = 0;
 	virtual void botInvokeCustomMethod(CustomMethodRequest request) = 0;
 	virtual void botSetEmojiStatus(SetEmojiStatusRequest request) = 0;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index eb47373c5..d68c1c933 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1178,3 +1178,6 @@ botEmojiStatusUserpic: UserpicButton(defaultUserpicButton) {
 }
 botEmojiStatusName: FlatLabel(defaultFlatLabel) {
 }
+botEmojiStatusEmoji: FlatLabel(botEmojiStatusName) {
+	textFg: profileVerifiedCheckBg;
+}

From 2d1fb0562db32b64e762407b2ea801ce025c711f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Nov 2024 23:19:29 +0400
Subject: [PATCH 273/306] Prepared messages sharing from miniapp.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   3 +
 Telegram/SourceFiles/apiwrap.cpp              |   5 +-
 Telegram/SourceFiles/apiwrap.h                |   3 +-
 Telegram/SourceFiles/history/history.cpp      |   8 +
 Telegram/SourceFiles/history/history.h        |   1 +
 .../history/history_item_reply_markup.cpp     |  44 ++--
 .../history/history_item_reply_markup.h       |   3 +
 .../inline_bots/bot_attach_web_view.cpp       |  85 ++++++++
 .../inline_bots/bot_attach_web_view.h         |   2 +
 .../inline_bot_confirm_prepared.cpp           | 196 ++++++++++++++++++
 .../inline_bots/inline_bot_confirm_prepared.h |  21 ++
 .../inline_bots/inline_bot_result.cpp         |  10 +-
 .../inline_bots/inline_bot_result.h           |   3 +
 .../inline_bots/inline_bot_send_data.cpp      |  20 +-
 .../inline_bots/inline_bot_send_data.h        |  10 +-
 .../ui/chat/attach/attach_bot_webview.cpp     |  69 ++++--
 .../ui/chat/attach/attach_bot_webview.h       |   9 +
 .../SourceFiles/window/window_peer_menu.cpp   |  27 ++-
 .../SourceFiles/window/window_peer_menu.h     |   7 +
 20 files changed, 465 insertions(+), 63 deletions(-)
 create mode 100644 Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
 create mode 100644 Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 8ea6aa9ae..956115e4b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1040,6 +1040,8 @@ PRIVATE
     info/info_wrap_widget.h
     inline_bots/bot_attach_web_view.cpp
     inline_bots/bot_attach_web_view.h
+    inline_bots/inline_bot_confirm_prepared.cpp
+    inline_bots/inline_bot_confirm_prepared.h
     inline_bots/inline_bot_layout_internal.cpp
     inline_bots/inline_bot_layout_internal.h
     inline_bots/inline_bot_layout_item.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9c0aa15d6..1525b0fed 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3425,6 +3425,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_emoji_status_text" = "Do you want to set this emoji status suggested by {bot}?";
 "lng_bot_emoji_status_access_text" = "{bot} requests access to set your **emoji status**. You will be able to revoke this access in the profile page of {name}.";
 "lng_bot_emoji_status_access_allow" = "Allow";
+"lng_bot_share_prepared_title" = "Share Message";
+"lng_bot_share_prepared_about" = "{bot} mini app suggests you to send this message to a chat you select.";
+"lng_bot_share_prepared_button" = "Share With...";
 
 "lng_bot_status_users#one" = "{count} monthly user";
 "lng_bot_status_users#other" = "{count} monthly users";
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index b8d51732b..f4779b1f7 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3947,7 +3947,8 @@ void ApiWrap::sendInlineResult(
 		not_null<UserData*> bot,
 		not_null<InlineBots::Result*> data,
 		const SendAction &action,
-		std::optional<MsgId> localMessageId) {
+		std::optional<MsgId> localMessageId,
+		Fn<void(bool)> done) {
 	sendAction(action);
 
 	const auto history = action.history;
@@ -4027,11 +4028,13 @@ void ApiWrap::sendInlineResult(
 		history->finishSavingCloudDraft(
 			topicRootId,
 			UnixtimeFromMsgId(response.outerMsgId));
+		done(true);
 	}, [=](const MTP::Error &error, const MTP::Response &response) {
 		sendMessageFail(error, peer, randomId, newId);
 		history->finishSavingCloudDraft(
 			topicRootId,
 			UnixtimeFromMsgId(response.outerMsgId));
+		done(false);
 	});
 	finishForwarding(action);
 }
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 7cff89c71..f25368293 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -361,7 +361,8 @@ public:
 		not_null<UserData*> bot,
 		not_null<InlineBots::Result*> data,
 		const SendAction &action,
-		std::optional<MsgId> localMessageId);
+		std::optional<MsgId> localMessageId,
+		Fn<void(bool)> done = nullptr);
 	void sendMessageFail(
 		const MTP::Error &error,
 		not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index f78b3f906..250fcb831 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -712,6 +712,14 @@ not_null<HistoryItem*> History::addNewLocalMessage(
 		true);
 }
 
+not_null<HistoryItem*> History::addNewLocalMessage(
+		not_null<HistoryItem*> item) {
+	Expects(item->history() == this);
+	Expects(item->isLocal());
+
+	return addNewItem(item, true);
+}
+
 not_null<HistoryItem*> History::addSponsoredMessage(
 		MsgId id,
 		Data::SponsoredFrom from,
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 73695785f..7685e0ba4 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -180,6 +180,7 @@ public:
 	not_null<HistoryItem*> addNewLocalMessage(
 		HistoryItemCommonFields &&fields,
 		not_null<GameData*> game);
+	not_null<HistoryItem*> addNewLocalMessage(not_null<HistoryItem*> item);
 
 	not_null<HistoryItem*> addSponsoredMessage(
 		MsgId id,
diff --git a/Telegram/SourceFiles/history/history_item_reply_markup.cpp b/Telegram/SourceFiles/history/history_item_reply_markup.cpp
index 5cd532ad5..319a77238 100644
--- a/Telegram/SourceFiles/history/history_item_reply_markup.cpp
+++ b/Telegram/SourceFiles/history/history_item_reply_markup.cpp
@@ -14,28 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
-[[nodiscard]] InlineBots::PeerTypes PeerTypesFromMTP(
-		const MTPvector<MTPInlineQueryPeerType> &types) {
-	using namespace InlineBots;
-	auto result = PeerTypes(0);
-	for (const auto &type : types.v) {
-		result |= type.match([&](const MTPDinlineQueryPeerTypePM &data) {
-			return PeerType::User;
-		}, [&](const MTPDinlineQueryPeerTypeChat &data) {
-			return PeerType::Group;
-		}, [&](const MTPDinlineQueryPeerTypeMegagroup &data) {
-			return PeerType::Group;
-		}, [&](const MTPDinlineQueryPeerTypeBroadcast &data) {
-			return PeerType::Broadcast;
-		}, [&](const MTPDinlineQueryPeerTypeBotPM &data) {
-			return PeerType::Bot;
-		}, [&](const MTPDinlineQueryPeerTypeSameBotPM &data) {
-			return PeerType();
-		});
-	}
-	return result;
-}
-
 [[nodiscard]] RequestPeerQuery RequestPeerQueryFromTL(
 		const MTPDkeyboardButtonRequestPeer &query) {
 	using Type = RequestPeerQuery::Type;
@@ -76,6 +54,28 @@ namespace {
 
 } // namespace
 
+InlineBots::PeerTypes PeerTypesFromMTP(
+		const MTPvector<MTPInlineQueryPeerType> &types) {
+	using namespace InlineBots;
+	auto result = PeerTypes(0);
+	for (const auto &type : types.v) {
+		result |= type.match([&](const MTPDinlineQueryPeerTypePM &data) {
+			return PeerType::User;
+		}, [&](const MTPDinlineQueryPeerTypeChat &data) {
+			return PeerType::Group;
+		}, [&](const MTPDinlineQueryPeerTypeMegagroup &data) {
+			return PeerType::Group;
+		}, [&](const MTPDinlineQueryPeerTypeBroadcast &data) {
+			return PeerType::Broadcast;
+		}, [&](const MTPDinlineQueryPeerTypeBotPM &data) {
+			return PeerType::Bot;
+		}, [&](const MTPDinlineQueryPeerTypeSameBotPM &data) {
+			return PeerType();
+		});
+	}
+	return result;
+}
+
 HistoryMessageMarkupButton::HistoryMessageMarkupButton(
 	Type type,
 	const QString &text,
diff --git a/Telegram/SourceFiles/history/history_item_reply_markup.h b/Telegram/SourceFiles/history/history_item_reply_markup.h
index 8d1d4e937..77895c3aa 100644
--- a/Telegram/SourceFiles/history/history_item_reply_markup.h
+++ b/Telegram/SourceFiles/history/history_item_reply_markup.h
@@ -19,6 +19,9 @@ enum class PeerType : uint8;
 using PeerTypes = base::flags<PeerType>;
 } // namespace InlineBots
 
+[[nodiscard]] InlineBots::PeerTypes PeerTypesFromMTP(
+	const MTPvector<MTPInlineQueryPeerType> &types);
+
 enum class ReplyMarkupFlag : uint32 {
 	None                  = (1U << 0),
 	ForceReply            = (1U << 1),
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index e1858aa95..17983983f 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/qthelp_url.h"
 #include "base/random.h"
 #include "base/timer_rpl.h"
+#include "base/unixtime.h"
 #include "boxes/peer_list_controllers.h"
 #include "boxes/share_box.h"
 #include "chat_helpers/stickers_lottie.h"
@@ -38,6 +39,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "info/profile/info_profile_values.h"
+#include "inline_bots/inline_bot_result.h"
+#include "inline_bots/inline_bot_confirm_prepared.h"
 #include "iv/iv_instance.h"
 #include "lang/lang_keys.h"
 #include "main/main_app_config.h"
@@ -1730,6 +1733,88 @@ void WebViewInstance::botInvokeCustomMethod(
 	}).send();
 }
 
+void WebViewInstance::botSendPreparedMessage(
+		Ui::BotWebView::SendPreparedMessageRequest request) {
+	const auto bot = _bot;
+	const auto id = request.id;
+	const auto panel = _panel.get();
+	const auto weak = base::make_weak(panel);
+	const auto callback = request.callback;
+	if (!panel) {
+		callback(u"UNKNOWN_ERROR"_q);
+		return;
+	}
+	_session->api().request(MTPmessages_GetPreparedInlineMessage(
+		bot->inputUser,
+		MTP_string(request.id)
+	)).done([=](const MTPmessages_PreparedInlineMessage &result) {
+		const auto panel = weak.get();
+		const auto &data = result.data();
+		bot->owner().processUsers(data.vusers());
+		const auto parsed = std::shared_ptr<Result>(Result::Create(
+			&bot->session(),
+			data.vquery_id().v,
+			data.vresult()));
+		if (!parsed || !panel) {
+			callback(u"UNKNOWN_ERROR"_q);
+			return;
+		}
+		const auto types = PeerTypesFromMTP(data.vpeer_types());
+		const auto history = bot->owner().history(bot->session().user());
+		const auto item = parsed->makeMessage(history, {
+			.id = bot->owner().nextNonHistoryEntryId(),
+			.flags = MessageFlag::FakeHistoryItem,
+			.from = bot->session().userPeerId(),
+			.date = base::unixtime::now(),
+			.viaBotId = peerToUser(bot->id),
+		});
+		struct State {
+			QPointer<Ui::BoxContent> preview;
+			bool sent = false;
+		};
+		const auto state = std::make_shared<State>();
+		auto box = Box(PreparedPreviewBox, item, [=] {
+			const auto chosen = [=](not_null<Data::Thread*> thread) {
+				auto action = Api::SendAction(thread);
+				const auto done = [=](bool success) {
+					if (success) {
+						callback(QString());
+					} else {
+						callback(u"MESSAGE_SEND_FAILED"_q);
+					}
+				};
+				bot->session().api().sendInlineResult(
+					bot,
+					parsed.get(),
+					action,
+					std::nullopt,
+					done);
+				state->sent = true;
+				if (const auto strong = state->preview.data()) {
+					strong->closeBox();
+				}
+				return true;
+			};
+			auto box = Window::PrepareChooseRecipientBox(
+				&bot->session(),
+				chosen,
+				tr::lng_inline_switch_choose(),
+				nullptr,
+				types);
+			panel->showBox(std::move(box));
+		});
+		box->boxClosing() | rpl::start_with_next([=] {
+			if (!state->sent) {
+				callback("USER_DECLINED");
+			}
+		}, box->lifetime());
+		state->preview = box.data();
+		panel->showBox(std::move(box));
+	}).fail([=] {
+		callback(u"MESSAGE_EXPIRED"_q);
+	}).send();
+}
+
 void WebViewInstance::botSetEmojiStatus(
 		Ui::BotWebView::SetEmojiStatusRequest request) {
 	const auto bot = _bot;
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index 0d7ae73d4..46e1487c4 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -265,6 +265,8 @@ private:
 	void botSharePhone(Fn<void(bool shared)> callback) override;
 	void botInvokeCustomMethod(
 		Ui::BotWebView::CustomMethodRequest request) override;
+	void botSendPreparedMessage(
+		Ui::BotWebView::SendPreparedMessageRequest request) override;
 	void botSetEmojiStatus(
 		Ui::BotWebView::SetEmojiStatusRequest request) override;
 	void botOpenPrivacyPolicy() override;
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
new file mode 100644
index 000000000..07aae0515
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
@@ -0,0 +1,196 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "inline_bots/inline_bot_confirm_prepared.h"
+
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/admin_log/history_admin_log_item.h"
+#include "history/view/history_view_element.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"
+#include "ui/effects/path_shift_gradient.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
+#include "window/themes/window_theme.h"
+#include "window/section_widget.h"
+#include "styles/style_chat.h"
+
+namespace InlineBots {
+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<HistoryItem*> item);
+	~PreviewWrap();
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	void resizeTo(int width);
+	void prepare(not_null<HistoryItem*> item);
+
+	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;
+	AdminLog::OwnedItem _item;
+	QPoint _position;
+
+};
+
+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<HistoryItem*> item)
+: RpWidget(parent)
+, _history(item->history())
+, _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());
+
+	using namespace HistoryView;
+	_history->owner().viewRepaintRequest(
+	) | rpl::start_with_next([=](not_null<const Element*> view) {
+		if (view == _item.get()) {
+			update();
+		}
+	}, lifetime());
+
+	_history->session().downloaderTaskFinished() | rpl::start_with_next([=] {
+		update();
+	}, lifetime());
+
+	prepare(item);
+}
+
+PreviewWrap::~PreviewWrap() {
+	_item = {};
+}
+
+void PreviewWrap::prepare(not_null<HistoryItem*> item) {
+	_item = AdminLog::OwnedItem(_delegate.get(), item);
+	if (width() >= st::msgMinWidth) {
+		resizeTo(width());
+	}
+
+	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()
+		+ _item->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);
+	_item->draw(p, context);
+}
+
+} // namesace
+
+void PreparedPreviewBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<HistoryItem*> item,
+		Fn<void()> share) {
+	box->setTitle(tr::lng_bot_share_prepared_title());
+	const auto container = box->verticalLayout();
+	container->add(object_ptr<PreviewWrap>(container, item));
+	const auto bot = item->viaBot();
+	const auto name = bot ? bot->name() : u"Bot"_q;
+	Ui::AddDividerText(
+		container,
+		tr::lng_bot_share_prepared_about(lt_bot, rpl::single(name))),
+	box->addButton(tr::lng_bot_share_prepared_button(), share);
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+	item->history()->owner().itemRemoved(
+	) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
+		if (removed == item) {
+			box->closeBox();
+		}
+	}, box->lifetime());
+}
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
new file mode 100644
index 000000000..606bc31c2
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
@@ -0,0 +1,21 @@
+/*
+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
+
+namespace InlineBots {
+
+void PreparedPreviewBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<HistoryItem*> item,
+	Fn<void()> share);
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
index 612d35769..7c487f843 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
@@ -378,14 +378,20 @@ bool Result::hasThumbDisplay() const {
 void Result::addToHistory(
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
-	fields.flags |= MessageFlag::FromInlineBot;
+	history->addNewLocalMessage(makeMessage(history, std::move(fields)));
+}
+
+not_null<HistoryItem*> Result::makeMessage(
+		not_null<History*> history,
+		HistoryItemCommonFields &&fields) const {
+	fields.flags |= MessageFlag::FromInlineBot | MessageFlag::Local;
 	if (_replyMarkup) {
 		fields.markup = *_replyMarkup;
 		if (!fields.markup.isNull()) {
 			fields.flags |= MessageFlag::HasReplyMarkup;
 		}
 	}
-	sendData->addToHistory(this, history, std::move(fields));
+	return sendData->makeMessage(this, history, std::move(fields));
 }
 
 QString Result::getErrorOnSend(not_null<History*> history) const {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.h b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
index cc7e090ee..e0b89e3d9 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
@@ -66,6 +66,9 @@ public:
 	void addToHistory(
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const;
+	[[nodiscard]] not_null<HistoryItem*> makeMessage(
+		not_null<History*> history,
+		HistoryItemCommonFields &&fields) const;
 	QString getErrorOnSend(not_null<History*> history) const;
 
 	// interface for Layout:: usage
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
index 0b8e9d8b7..714516b39 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
@@ -28,7 +28,7 @@ QString SendData::getLayoutDescription(const Result *owner) const {
 	return owner->_description;
 }
 
-void SendDataCommon::addToHistory(
+not_null<HistoryItem*> SendDataCommon::makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
@@ -36,7 +36,7 @@ void SendDataCommon::addToHistory(
 	if (fields.replyTo) {
 		fields.flags |= MessageFlag::HasReplyInfo;
 	}
-	history->addNewLocalMessage(
+	return history->makeMessage(
 		std::move(fields),
 		std::move(distinct.text),
 		std::move(distinct.media));
@@ -96,14 +96,14 @@ QString SendContact::getLayoutDescription(const Result *owner) const {
 	return result;
 }
 
-void SendPhoto::addToHistory(
+not_null<HistoryItem*> SendPhoto::makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
-	history->addNewLocalMessage(
+	return history->makeMessage(
 		std::move(fields),
 		_photo,
-		{ _message, _entities });
+		TextWithEntities{ _message, _entities });
 }
 
 QString SendPhoto::getErrorOnSend(
@@ -113,14 +113,14 @@ QString SendPhoto::getErrorOnSend(
 	return Data::RestrictionError(history->peer, type).value_or(QString());
 }
 
-void SendFile::addToHistory(
+not_null<HistoryItem*> SendFile::makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
-	history->addNewLocalMessage(
+	return history->makeMessage(
 		std::move(fields),
 		_document,
-		{ _message, _entities });
+		TextWithEntities{ _message, _entities });
 }
 
 QString SendFile::getErrorOnSend(
@@ -130,11 +130,11 @@ QString SendFile::getErrorOnSend(
 	return Data::RestrictionError(history->peer, type).value_or(QString());
 }
 
-void SendGame::addToHistory(
+not_null<HistoryItem*> SendGame::makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
-	history->addNewLocalMessage(std::move(fields), _game);
+	return history->addNewLocalMessage(std::move(fields), _game);
 }
 
 QString SendGame::getErrorOnSend(
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
index 502cc006e..9c53b6207 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
@@ -40,7 +40,7 @@ public:
 
 	virtual bool isValid() const = 0;
 
-	virtual void addToHistory(
+	virtual not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const = 0;
@@ -75,7 +75,7 @@ public:
 	};
 	virtual SentMessageFields getSentMessageFields() const = 0;
 
-	void addToHistory(
+	not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const override;
@@ -236,7 +236,7 @@ public:
 		return _photo != nullptr;
 	}
 
-	void addToHistory(
+	not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const override;
@@ -270,7 +270,7 @@ public:
 		return _document != nullptr;
 	}
 
-	void addToHistory(
+	not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const override;
@@ -298,7 +298,7 @@ public:
 		return _game != nullptr;
 	}
 
-	void addToHistory(
+	not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const override;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index da2a8a5b8..9da6c01eb 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -183,7 +183,8 @@ struct Panel::WebviewWithLifetime {
 		Webview::WindowConfig config = Webview::WindowConfig());
 
 	Webview::Window window;
-	QPointer<RpWidget> lastHidingBox;
+	std::vector<QPointer<RpWidget>> boxes;
+	rpl::lifetime boxesLifetime;
 	rpl::lifetime lifetime;
 };
 
@@ -824,6 +825,8 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			processHeaderColor(arguments);
 		} else if (command == "web_app_set_bottom_bar_color") {
 			processBottomBarColor(arguments);
+		} else if (command == "web_app_send_prepared_message") {
+			processSendMessageRequest(arguments);
 		} else if (command == "web_app_set_emoji_status") {
 			processEmojiStatusRequest(arguments);
 		} else if (command == "web_app_request_emoji_status_access") {
@@ -967,6 +970,27 @@ void Panel::switchInlineQueryMessage(const QJsonObject &args) {
 	_delegate->botSwitchInlineQuery(types, query);
 }
 
+void Panel::processSendMessageRequest(const QJsonObject &args) {
+	if (args.isEmpty()) {
+		_delegate->botClose();
+		return;
+	}
+	const auto id = args["id"].toString();
+	auto callback = crl::guard(this, [=](QString error) {
+		if (error.isEmpty()) {
+			postEvent("prepared_message_sent");
+		} else {
+			postEvent(
+				"prepared_message_failed",
+				u"{ error: \"%1\" }"_q.arg(error));
+		}
+	});
+	_delegate->botSendPreparedMessage({
+		.id = id,
+		.callback = std::move(callback),
+	});
+}
+
 void Panel::processEmojiStatusRequest(const QJsonObject &args) {
 	if (args.isEmpty()) {
 		_delegate->botClose();
@@ -1502,9 +1526,11 @@ void Panel::layoutButtons() {
 		return button && !button->isHidden();
 	};
 	const auto any = shown(_mainButton) || shown(_secondaryButton);
-	_webviewBottom->setVisible(!any && !_fullscreen.current());
+	_webviewBottom->setVisible(!any
+		&& !_fullscreen.current()
+		&& !_layerShown);
 	if (any) {
-		_bottomButtonsBg->show();
+		_bottomButtonsBg->setVisible(!_layerShown);
 
 		const auto one = shown(_mainButton)
 			? _mainButton.get()
@@ -1570,7 +1596,9 @@ void Panel::layoutButtons() {
 	} else if (_bottomButtonsBg) {
 		_bottomButtonsBg->hide();
 	}
-	_footerHeight = any
+	_footerHeight = _layerShown
+		? 0
+		: any
 		? _bottomButtonsBg->height()
 		: _fullscreen.current()
 		? 0
@@ -1586,25 +1614,34 @@ void Panel::showBox(
 		LayerOptions options,
 		anim::type animated) {
 	if (const auto widget = _webview ? _webview->window.widget() : nullptr) {
+		_layerShown = true;
 		const auto hideNow = !widget->isHidden();
-		if (hideNow || _webview->lastHidingBox) {
-			const auto raw = _webview->lastHidingBox = box.data();
-			box->boxClosing(
-			) | rpl::start_with_next([=] {
+		const auto raw = box.data();
+		_webview->boxes.push_back(raw);
+		raw->boxClosing(
+		) | rpl::filter([=] {
+			return _webview != nullptr;
+		}) | rpl::start_with_next([=] {
+			auto &list = _webview->boxes;
+			list.erase(ranges::remove_if(list, [&](QPointer<RpWidget> b) {
+				return !b || (b == raw);
+			}), end(list));
+			if (list.empty()) {
+				_webview->boxesLifetime.destroy();
+				_layerShown = false;
 				const auto widget = _webview
 					? _webview->window.widget()
 					: nullptr;
-				if (widget
-					&& widget->isHidden()
-					&& _webview->lastHidingBox == raw) {
+				if (widget && widget->isHidden()) {
 					widget->show();
-					_webviewBottom->setVisible(!_fullscreen.current());
+					layoutButtons();
 				}
-			}, _webview->lifetime);
-			if (hideNow) {
-				widget->hide();
-				_webviewBottom->hide();
 			}
+		}, _webview->boxesLifetime);
+
+		if (hideNow) {
+			widget->hide();
+			layoutButtons();
 		}
 	}
 	const auto raw = box.data();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index 97da49a60..1f15dac3c 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -57,6 +57,11 @@ struct SetEmojiStatusRequest {
 	Fn<void(QString)> callback;
 };
 
+struct SendPreparedMessageRequest {
+	QString id = 0;
+	Fn<void(QString)> callback;
+};
+
 class Delegate {
 public:
 	virtual Webview::ThemeParams botThemeParams() = 0;
@@ -76,6 +81,8 @@ public:
 	virtual void botSharePhone(Fn<void(bool shared)> callback) = 0;
 	virtual void botInvokeCustomMethod(CustomMethodRequest request) = 0;
 	virtual void botSetEmojiStatus(SetEmojiStatusRequest request) = 0;
+	virtual void botSendPreparedMessage(
+		SendPreparedMessageRequest request) = 0;
 	virtual void botOpenPrivacyPolicy() = 0;
 	virtual void botClose() = 0;
 };
@@ -132,6 +139,7 @@ private:
 	void setTitle(rpl::producer<QString> title);
 	void sendDataMessage(const QJsonObject &args);
 	void switchInlineQueryMessage(const QJsonObject &args);
+	void processSendMessageRequest(const QJsonObject &args);
 	void processEmojiStatusRequest(const QJsonObject &args);
 	void processEmojiStatusAccessRequest();
 	void processButtonMessage(
@@ -195,6 +203,7 @@ private:
 	rpl::lifetime _headerColorLifetime;
 	rpl::lifetime _bottomBarColorLifetime;
 	rpl::variable<bool> _fullscreen = false;
+	bool _layerShown = false;
 	bool _webviewProgress = false;
 	bool _themeUpdateScheduled = false;
 	bool _hiddenForPayment = false;
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 9d01be276..764ebba2e 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1881,8 +1881,8 @@ void BlockSenderFromRepliesBox(
 		Window::ClearReply{ id });
 }
 
-QPointer<Ui::BoxContent> ShowChooseRecipientBox(
-		not_null<Window::SessionNavigation*> navigation,
+object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
+		not_null<Main::Session*> session,
 		FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 		rpl::producer<QString> titleOverride,
 		FnMut<void()> &&successCallback,
@@ -1927,15 +1927,30 @@ QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 			box->setTitle(std::move(titleOverride));
 		}
 	};
-	*weak = navigation->parentController()->show(Box<PeerListBox>(
+	auto result = Box<PeerListBox>(
 		std::make_unique<ChooseRecipientBoxController>(ChooseRecipientArgs{
-			.session = &navigation->session(),
+			.session = session,
 			.callback = std::move(callback),
 			.filter = std::move(filter),
 			.premiumRequiredError = WritePremiumRequiredError,
 		}),
-		std::move(initBox)));
-	return weak->data();
+		std::move(initBox));
+	*weak = result.data();
+	return result;
+}
+
+QPointer<Ui::BoxContent> ShowChooseRecipientBox(
+		not_null<Window::SessionNavigation*> navigation,
+		FnMut<bool(not_null<Data::Thread*>)> &&chosen,
+		rpl::producer<QString> titleOverride,
+		FnMut<void()> &&successCallback,
+		InlineBots::PeerTypes typesRestriction) {
+	return navigation->parentController()->show(PrepareChooseRecipientBox(
+		&navigation->session(),
+		std::move(chosen),
+		std::move(titleOverride),
+		std::move(successCallback),
+		typesRestriction));
 }
 
 QPointer<Ui::BoxContent> ShowForwardMessagesBox(
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index 8369e3228..e1714257b 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "api/api_common.h"
+#include "base/object_ptr.h"
 #include "menu/menu_send.h"
 #include "data/data_poll.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
@@ -138,6 +139,12 @@ Fn<void()> DeleteAndLeaveHandler(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer);
 
+object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
+	not_null<Main::Session*> session,
+	FnMut<bool(not_null<Data::Thread*>)> &&chosen,
+	rpl::producer<QString> titleOverride = nullptr,
+	FnMut<void()> &&successCallback = nullptr,
+	InlineBots::PeerTypes typesRestriction = 0);
 QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 	not_null<Window::SessionNavigation*> navigation,
 	FnMut<bool(not_null<Data::Thread*>)> &&chosen,

From 7bf78b3317f919a7540a199526c9f9d5f67d96a9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 11 Nov 2024 19:08:06 +0400
Subject: [PATCH 274/306] Use initial bot web app header/body colors.

---
 Telegram/SourceFiles/data/data_user.cpp       |  18 +++
 Telegram/SourceFiles/data/data_user.h         |   5 +
 .../inline_bots/bot_attach_web_view.cpp       |  18 ++-
 .../payments/ui/payments_panel.cpp            |   4 +-
 .../ui/chat/attach/attach_bot_webview.cpp     | 111 +++++++++++-------
 .../ui/chat/attach/attach_bot_webview.h       |  53 +++++----
 .../window/themes/window_theme.cpp            |   3 +-
 Telegram/lib_webview                          |   2 +-
 8 files changed, 142 insertions(+), 72 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 7433dbd9a..c8e5466b9 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -345,6 +345,24 @@ void UserData::setBotInfo(const MTPBotInfo &info) {
 		const auto privacyChanged = (botInfo->privacyPolicyUrl != privacy);
 		botInfo->privacyPolicyUrl = privacy;
 
+		if (const auto settings = d.vapp_settings()) {
+			const auto &data = settings->data();
+			botInfo->botAppColorTitleDay = Ui::MaybeColorFromSerialized(
+				data.vheader_color()).value_or(QColor(0, 0, 0, 0));
+			botInfo->botAppColorTitleNight = Ui::MaybeColorFromSerialized(
+				data.vheader_dark_color()).value_or(QColor(0, 0, 0, 0));
+			botInfo->botAppColorBodyDay = Ui::MaybeColorFromSerialized(
+				data.vbackground_color()).value_or(QColor(0, 0, 0, 0));
+			botInfo->botAppColorBodyNight = Ui::MaybeColorFromSerialized(
+				data.vbackground_dark_color()).value_or(QColor(0, 0, 0, 0));
+		} else {
+			botInfo->botAppColorTitleDay
+				= botInfo->botAppColorTitleNight
+				= botInfo->botAppColorBodyDay
+				= botInfo->botAppColorBodyNight
+				= QColor(0, 0, 0, 0);
+		}
+
 		if (changedCommands || changedButton || privacyChanged) {
 			owner().botCommandsChanged(this);
 		}
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index 8dfc2b4f7..63f03549a 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -33,6 +33,11 @@ struct BotInfo {
 	QString botMenuButtonUrl;
 	QString privacyPolicyUrl;
 
+	QColor botAppColorTitleDay = QColor(0, 0, 0, 0);
+	QColor botAppColorTitleNight = QColor(0, 0, 0, 0);
+	QColor botAppColorBodyDay = QColor(0, 0, 0, 0);
+	QColor botAppColorBodyNight = QColor(0, 0, 0, 0);
+
 	QString startToken;
 	Dialogs::EntryState inlineReturnTo;
 
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 17983983f..93fa4d389 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -1423,7 +1423,23 @@ void WebViewInstance::started(uint64 queryId) {
 }
 
 Webview::ThemeParams WebViewInstance::botThemeParams() {
-	return Window::Theme::WebViewParams();
+	auto result = Window::Theme::WebViewParams();
+	if (const auto info = _bot->botInfo.get()) {
+		const auto night = Window::Theme::IsNightMode();
+		const auto &title = night
+			? info->botAppColorTitleNight
+			: info->botAppColorTitleDay;
+		const auto &body = night
+			? info->botAppColorBodyNight
+			: info->botAppColorBodyDay;
+		if (title.alpha() == 255) {
+			result.titleBg = title;
+		}
+		if (body.alpha() == 255) {
+			result.bodyBg = body;
+		}
+	}
+	return result;
 }
 
 bool WebViewInstance::botHandleLocalUri(QString uri, bool keepOpen) {
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index 2bc023e8c..b0e1bcc0c 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -550,7 +550,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	_webview = std::make_unique<WebviewWithLifetime>(
 		container,
 		Webview::WindowConfig{
-			.opaqueBg = params.opaqueBg,
+			.opaqueBg = params.bodyBg,
 			.storageId = _delegate->panelWebviewStorageId(),
 		});
 
@@ -919,7 +919,7 @@ void Panel::updateThemeParams(const Webview::ThemeParams &params) {
 		return;
 	}
 	_webview->window.updateTheme(
-		params.opaqueBg,
+		params.bodyBg,
 		params.scrollBg,
 		params.scrollBgOver,
 		params.scrollBarBg,
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 9da6c01eb..7158f1e9f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -366,23 +366,19 @@ Panel::Progress::Progress(QWidget *parent, Fn<QRect()> rect)
 	st::paymentsLoading) {
 }
 
-Panel::Panel(
-	const Webview::StorageId &storageId,
-	rpl::producer<QString> title,
-	object_ptr<Ui::RpWidget> titleBadge,
-	not_null<Delegate*> delegate,
-	MenuButtons menuButtons,
-	bool fullscreen,
-	bool allowClipboardRead)
-: _storageId(storageId)
-, _delegate(delegate)
-, _menuButtons(menuButtons)
+Panel::Panel(Args &&args)
+: _storageId(args.storageId)
+, _delegate(args.delegate)
+, _menuButtons(args.menuButtons)
 , _widget(std::make_unique<SeparatePanel>())
-, _fullscreen(fullscreen)
-, _allowClipboardRead(allowClipboardRead) {
+, _fullscreen(args.fullscreen)
+, _allowClipboardRead(args.allowClipboardRead) {
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
 	_widget->setInnerSize(st::botWebViewPanelSize, true);
 
+	const auto params = _delegate->botThemeParams();
+	updateColorOverrides(params);
+
 	_fullscreen.value(
 	) | rpl::start_with_next([=](bool fullscreen) {
 		_widget->toggleFullScreen(fullscreen);
@@ -426,8 +422,17 @@ Panel::Panel(
 		});
 	}, _widget->lifetime());
 
-	setTitle(std::move(title));
-	_widget->setTitleBadge(std::move(titleBadge));
+	setTitle(std::move(args.title));
+	_widget->setTitleBadge(std::move(args.titleBadge));
+
+	if (!showWebview(args.url, params, std::move(args.bottom))) {
+		const auto available = Webview::Availability();
+		if (available.error != Webview::Available::Error::None) {
+			showWebviewError(tr::lng_bot_no_webview(tr::now), available);
+		} else {
+			showCriticalError({ "Error: Could not initialize WebView." });
+		}
+	}
 }
 
 Panel::~Panel() {
@@ -679,13 +684,17 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	_widget->showInner(std::move(outer));
 	_webviewParent = container;
 
+	_headerColorReceived = false;
+	_bodyColorReceived = false;
+	_bottomColorReceived = false;
+	updateColorOverrides(params);
 	createWebviewBottom();
 
 	container->show();
 	_webview = std::make_unique<WebviewWithLifetime>(
 		container,
 		Webview::WindowConfig{
-			.opaqueBg = params.opaqueBg,
+			.opaqueBg = params.bodyBg,
 			.storageId = _storageId,
 		});
 	const auto raw = &_webview->window;
@@ -823,6 +832,8 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			requestClipboardText(arguments);
 		} else if (command == "web_app_set_header_color") {
 			processHeaderColor(arguments);
+		} else if (command == "web_app_set_background_color") {
+			processBackgroundColor(arguments);
 		} else if (command == "web_app_set_bottom_bar_color") {
 			processBottomBarColor(arguments);
 		} else if (command == "web_app_send_prepared_message") {
@@ -1437,6 +1448,7 @@ void Panel::processSettingsButtonMessage(const QJsonObject &args) {
 }
 
 void Panel::processHeaderColor(const QJsonObject &args) {
+	_headerColorReceived = true;
 	if (const auto color = ParseColor(args["color"].toString())) {
 		_widget->overrideTitleColor(color);
 		_headerColorLifetime.destroy();
@@ -1453,7 +1465,32 @@ void Panel::processHeaderColor(const QJsonObject &args) {
 	}
 }
 
+void Panel::processBackgroundColor(const QJsonObject &args) {
+	_bodyColorReceived = true;
+	if (const auto color = ParseColor(args["color"].toString())) {
+		_widget->overrideBodyColor(color);
+		_bodyColorLifetime.destroy();
+	} else if (const auto color = LookupNamedColor(
+			args["color_key"].toString())) {
+		_widget->overrideBodyColor((*color)->c);
+		_bodyColorLifetime = style::PaletteChanged(
+		) | rpl::start_with_next([=] {
+			_widget->overrideBodyColor((*color)->c);
+		});
+	} else {
+		_widget->overrideBodyColor(std::nullopt);
+		_bodyColorLifetime.destroy();
+	}
+	if (const auto raw = _bottomButtonsBg.get()) {
+		raw->update();
+	}
+	if (const auto raw = _webviewBottom.get()) {
+		raw->update();
+	}
+}
+
 void Panel::processBottomBarColor(const QJsonObject &args) {
+	_bottomColorReceived = true;
 	if (const auto color = ParseColor(args["color"].toString())) {
 		_widget->overrideBottomBarColor(color);
 		_bottomBarColor = color;
@@ -1462,7 +1499,7 @@ void Panel::processBottomBarColor(const QJsonObject &args) {
 			args["color_key"].toString())) {
 		_widget->overrideBottomBarColor((*color)->c);
 		_bottomBarColor = (*color)->c;
-		_headerColorLifetime = style::PaletteChanged(
+		_bottomBarColorLifetime = style::PaletteChanged(
 		) | rpl::start_with_next([=] {
 			_widget->overrideBottomBarColor((*color)->c);
 			_bottomBarColor = (*color)->c;
@@ -1470,7 +1507,7 @@ void Panel::processBottomBarColor(const QJsonObject &args) {
 	} else {
 		_widget->overrideBottomBarColor(std::nullopt);
 		_bottomBarColor = std::nullopt;
-		_headerColorLifetime.destroy();
+		_bottomBarColorLifetime.destroy();
 	}
 	if (const auto raw = _bottomButtonsBg.get()) {
 		raw->update();
@@ -1596,13 +1633,15 @@ void Panel::layoutButtons() {
 	} else if (_bottomButtonsBg) {
 		_bottomButtonsBg->hide();
 	}
-	_footerHeight = _layerShown
+	const auto footer = _layerShown
 		? 0
 		: any
 		? _bottomButtonsBg->height()
 		: _fullscreen.current()
 		? 0
 		: _webviewBottom->height();
+	_widget->setBottomBarHeight((!_layerShown && any) ? footer : 0);
+	_footerHeight = footer;
 }
 
 void Panel::showBox(object_ptr<BoxContent> box) {
@@ -1707,11 +1746,12 @@ void Panel::showCriticalError(const TextWithEntities &text) {
 }
 
 void Panel::updateThemeParams(const Webview::ThemeParams &params) {
+	updateColorOverrides(params);
 	if (!_webview || !_webview->window.widget()) {
 		return;
 	}
 	_webview->window.updateTheme(
-		params.opaqueBg,
+		params.bodyBg,
 		params.scrollBg,
 		params.scrollBgOver,
 		params.scrollBarBg,
@@ -1719,6 +1759,15 @@ void Panel::updateThemeParams(const Webview::ThemeParams &params) {
 	postEvent("theme_changed", "{\"theme_params\": " + params.json + "}");
 }
 
+void Panel::updateColorOverrides(const Webview::ThemeParams &params) {
+	if (!_headerColorReceived && params.titleBg.alpha() == 255) {
+		_widget->overrideTitleColor(params.titleBg);
+	}
+	if (!_bodyColorReceived && params.bodyBg.alpha() == 255) {
+		_widget->overrideBodyColor(params.bodyBg);
+	}
+}
+
 void Panel::invoiceClosed(const QString &slug, const QString &status) {
 	if (!_webview || !_webview->window.widget()) {
 		return;
@@ -1802,27 +1851,7 @@ rpl::lifetime &Panel::lifetime() {
 }
 
 std::unique_ptr<Panel> Show(Args &&args) {
-	auto result = std::make_unique<Panel>(
-		args.storageId,
-		std::move(args.title),
-		std::move(args.titleBadge),
-		args.delegate,
-		args.menuButtons,
-		args.fullscreen,
-		args.allowClipboardRead);
-	const auto params = args.delegate->botThemeParams();
-	if (!result->showWebview(args.url, params, std::move(args.bottom))) {
-		const auto available = Webview::Availability();
-		if (available.error != Webview::Available::Error::None) {
-			result->showWebviewError(
-				tr::lng_bot_no_webview(tr::now),
-				available);
-		} else {
-			result->showCriticalError({
-				"Error: Could not initialize WebView." });
-		}
-	}
-	return result;
+	return std::make_unique<Panel>(std::move(args));
 }
 
 } // namespace Ui::BotWebView
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index 1f15dac3c..bff1175ce 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -87,16 +87,21 @@ public:
 	virtual void botClose() = 0;
 };
 
+struct Args {
+	QString url;
+	Webview::StorageId storageId;
+	rpl::producer<QString> title;
+	object_ptr<Ui::RpWidget> titleBadge = { nullptr };
+	rpl::producer<QString> bottom;
+	not_null<Delegate*> delegate;
+	MenuButtons menuButtons;
+	bool fullscreen = false;
+	bool allowClipboardRead = false;
+};
+
 class Panel final : public base::has_weak_ptr {
 public:
-	Panel(
-		const Webview::StorageId &storageId,
-		rpl::producer<QString> title,
-		object_ptr<Ui::RpWidget> titleBadge,
-		not_null<Delegate*> delegate,
-		MenuButtons menuButtons,
-		bool fullscreen,
-		bool allowClipboardRead);
+	explicit Panel(Args &&args);
 	~Panel();
 
 	void requestActivate();
@@ -148,6 +153,7 @@ private:
 	void processBackButtonMessage(const QJsonObject &args);
 	void processSettingsButtonMessage(const QJsonObject &args);
 	void processHeaderColor(const QJsonObject &args);
+	void processBackgroundColor(const QJsonObject &args);
 	void processBottomBarColor(const QJsonObject &args);
 	void openTgLink(const QJsonObject &args);
 	void openExternalLink(const QJsonObject &args);
@@ -171,6 +177,8 @@ private:
 	void sendContentSafeArea();
 	void sendFullScreen();
 
+	void updateColorOverrides(const Webview::ThemeParams &params);
+
 	using EventData = std::variant<QString, QJsonObject>;
 	void postEvent(const QString &event);
 	void postEvent(const QString &event, EventData data);
@@ -201,29 +209,22 @@ private:
 	rpl::event_stream<> _themeUpdateForced;
 	std::optional<QColor> _bottomBarColor;
 	rpl::lifetime _headerColorLifetime;
+	rpl::lifetime _bodyColorLifetime;
 	rpl::lifetime _bottomBarColorLifetime;
 	rpl::variable<bool> _fullscreen = false;
-	bool _layerShown = false;
-	bool _webviewProgress = false;
-	bool _themeUpdateScheduled = false;
-	bool _hiddenForPayment = false;
-	bool _closeWithConfirmationScheduled = false;
-	bool _allowClipboardRead = false;
-	bool _inBlockingRequest = false;
+	bool _layerShown : 1 = false;
+	bool _webviewProgress : 1 = false;
+	bool _themeUpdateScheduled : 1 = false;
+	bool _hiddenForPayment : 1 = false;
+	bool _closeWithConfirmationScheduled : 1 = false;
+	bool _allowClipboardRead : 1 = false;
+	bool _inBlockingRequest : 1 = false;
+	bool _headerColorReceived : 1 = false;
+	bool _bodyColorReceived : 1 = false;
+	bool _bottomColorReceived : 1 = false;
 
 };
 
-struct Args {
-	QString url;
-	Webview::StorageId storageId;
-	rpl::producer<QString> title;
-	object_ptr<Ui::RpWidget> titleBadge = { nullptr };
-	rpl::producer<QString> bottom;
-	not_null<Delegate*> delegate;
-	MenuButtons menuButtons;
-	bool fullscreen = false;
-	bool allowClipboardRead = false;
-};
 [[nodiscard]] std::unique_ptr<Panel> Show(Args &&args);
 
 } // namespace Ui::BotWebView
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 899534d9e..dcdbfcccd 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -1539,7 +1539,8 @@ bool ReadPaletteValues(const QByteArray &content, Fn<bool(QLatin1String name, QL
 			mix(bg.blue(), shadow.blue()))));
 	}
 	return {
-		.opaqueBg = st::windowBg->c,
+		.bodyBg = st::windowBg->c,
+		.titleBg = QColor(0, 0, 0, 0),
 		.scrollBg = st::scrollBg->c,
 		.scrollBgOver = st::scrollBgOver->c,
 		.scrollBarBg = st::scrollBarBg->c,
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index efc48237b..095babf23 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit efc48237bcaf269b57c8a37539e11e1887e1f3cf
+Subproject commit 095babf234736e053bdbbc3dc15bc042a40c45b4

From 2fed657940f0f226aceee6b498d6a2db12fcd190 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Nov 2024 22:26:41 +0400
Subject: [PATCH 275/306] Make nice share message from miniapp.

---
 .../boxes/peer_list_controllers.cpp           |  5 ++
 .../SourceFiles/boxes/peer_list_controllers.h |  3 +
 .../boxes/peers/edit_peer_invite_link.cpp     | 86 ++++++++++++++-----
 .../boxes/peers/edit_peer_invite_link.h       | 13 ++-
 .../inline_bots/bot_attach_web_view.cpp       | 62 +++++++++----
 .../inline_bot_confirm_prepared.cpp           | 59 +++++++++++--
 .../inline_bots/inline_bot_confirm_prepared.h |  8 +-
 7 files changed, 188 insertions(+), 48 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 53d56080a..05b8d6d20 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -1065,6 +1065,11 @@ std::unique_ptr<PeerListRow> ChooseTopicBoxController::createSearchRow(
 	return nullptr;
 }
 
+std::unique_ptr<PeerListRow> ChooseTopicBoxController::MakeRow(
+		not_null<Data::ForumTopic*> topic) {
+	return std::make_unique<Row>(topic);
+}
+
 auto ChooseTopicBoxController::createRow(not_null<Data::ForumTopic*> topic)
 -> std::unique_ptr<Row> {
 	const auto skip = _filter && !_filter(topic);
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.h b/Telegram/SourceFiles/boxes/peer_list_controllers.h
index 20479c2b4..07f71534a 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.h
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.h
@@ -335,6 +335,9 @@ public:
 	void loadMoreRows() override;
 	std::unique_ptr<PeerListRow> createSearchRow(PeerListRowId id) override;
 
+	[[nodiscard]] static std::unique_ptr<PeerListRow> MakeRow(
+		not_null<Data::ForumTopic*> topic);
+
 private:
 	class Row final : public PeerListRow {
 	public:
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 4dc7f897b..c8b4f2d48 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -12,12 +12,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "boxes/gift_premium_box.h"
 #include "boxes/peer_list_box.h"
+#include "boxes/peer_list_controllers.h"
 #include "boxes/share_box.h"
 #include "core/application.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/components/credits.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
+#include "data/data_forum_topic.h"
 #include "data/data_histories.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
@@ -51,6 +53,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_credits.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_giveaway.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h" // st::boxDividerLabel.
@@ -264,8 +267,9 @@ private:
 class SingleRowController final : public PeerListController {
 public:
 	SingleRowController(
-		not_null<PeerData*> peer,
-		rpl::producer<QString> status);
+		not_null<Data::Thread*> thread,
+		rpl::producer<QString> status,
+		Fn<void()> clicked);
 
 	void prepare() override;
 	void loadMoreRows() override;
@@ -273,8 +277,10 @@ public:
 	Main::Session &session() const override;
 
 private:
-	const not_null<PeerData*> _peer;
+	const not_null<Main::Session*> _session;
+	const base::weak_ptr<Data::Thread> _thread;
 	rpl::producer<QString> _status;
+	Fn<void()> _clicked;
 	rpl::lifetime _lifetime;
 
 };
@@ -1144,36 +1150,59 @@ int Controller::descriptionTopSkipMin() const {
 }
 
 SingleRowController::SingleRowController(
-	not_null<PeerData*> peer,
-	rpl::producer<QString> status)
-: _peer(peer)
-, _status(std::move(status)) {
+	not_null<Data::Thread*> thread,
+	rpl::producer<QString> status,
+	Fn<void()> clicked)
+: _session(&thread->session())
+, _thread(thread)
+, _status(std::move(status))
+, _clicked(std::move(clicked)) {
 }
 
 void SingleRowController::prepare() {
-	auto row = std::make_unique<PeerListRow>(_peer);
-
+	const auto strong = _thread.get();
+	if (!strong) {
+		return;
+	}
+	const auto topic = strong->asTopic();
+	auto row = topic
+		? ChooseTopicBoxController::MakeRow(topic)
+		: std::make_unique<PeerListRow>(strong->peer());
 	const auto raw = row.get();
-	std::move(
-		_status
-	) | rpl::start_with_next([=](const QString &status) {
-		raw->setCustomStatus(status);
-		delegate()->peerListUpdateRow(raw);
-	}, _lifetime);
-
+	if (_status) {
+		std::move(
+			_status
+		) | rpl::start_with_next([=](const QString &status) {
+			raw->setCustomStatus(status);
+			delegate()->peerListUpdateRow(raw);
+		}, _lifetime);
+	}
 	delegate()->peerListAppendRow(std::move(row));
 	delegate()->peerListRefreshRows();
+
+	if (topic) {
+		topic->destroyed() | rpl::start_with_next([=] {
+			while (delegate()->peerListFullRowsCount()) {
+				delegate()->peerListRemoveRow(delegate()->peerListRowAt(0));
+			}
+			delegate()->peerListRefreshRows();
+		}, _lifetime);
+	}
 }
 
 void SingleRowController::loadMoreRows() {
 }
 
 void SingleRowController::rowClicked(not_null<PeerListRow*> row) {
-	ShowPeerInfoSync(row->peer());
+	if (const auto onstack = _clicked) {
+		onstack();
+	} else {
+		ShowPeerInfoSync(row->peer());
+	}
 }
 
 Main::Session &SingleRowController::session() const {
-	return _peer->session();
+	return *_session;
 }
 
 } // namespace
@@ -1186,14 +1215,29 @@ bool IsExpiredLink(const Api::InviteLink &data, TimeId now) {
 void AddSinglePeerRow(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<PeerData*> peer,
-		rpl::producer<QString> status) {
+		rpl::producer<QString> status,
+		Fn<void()> clicked) {
+	AddSinglePeerRow(
+		container,
+		peer->owner().history(peer),
+		std::move(status),
+		std::move(clicked));
+}
+
+void AddSinglePeerRow(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Data::Thread*> thread,
+		rpl::producer<QString> status,
+		Fn<void()> clicked) {
 	const auto delegate = container->lifetime().make_state<
 		PeerListContentDelegateSimple
 	>();
 	const auto controller = container->lifetime().make_state<
 		SingleRowController
-	>(peer, std::move(status));
-	controller->setStyleOverrides(&st::peerListSingleRow);
+	>(thread, std::move(status), std::move(clicked));
+	controller->setStyleOverrides(thread->asTopic()
+		? &st::chooseTopicList
+		: &st::peerListSingleRow);
 	const auto content = container->add(object_ptr<PeerListContent>(
 		container,
 		controller));
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
index e59ffdd5e..45abe3a46 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
@@ -16,6 +16,10 @@ namespace Api {
 struct InviteLink;
 } // namespace Api
 
+namespace Data {
+class Thread;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -31,7 +35,14 @@ class BoxContent;
 void AddSinglePeerRow(
 	not_null<Ui::VerticalLayout*> container,
 	not_null<PeerData*> peer,
-	rpl::producer<QString> status);
+	rpl::producer<QString> status,
+	Fn<void()> clicked = nullptr);
+
+void AddSinglePeerRow(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Data::Thread*> thread,
+	rpl::producer<QString> status,
+	Fn<void()> clicked = nullptr);
 
 void AddPermanentLinkBlock(
 	std::shared_ptr<Ui::Show> show,
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 93fa4d389..b2609d3ea 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_common.h"
 #include "api/api_sending.h"
 #include "apiwrap.h"
+#include "base/call_delayed.h"
 #include "base/qthelp_url.h"
 #include "base/random.h"
 #include "base/timer_rpl.h"
@@ -60,6 +61,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/dropdown_menu.h"
@@ -1786,29 +1788,23 @@ void WebViewInstance::botSendPreparedMessage(
 		});
 		struct State {
 			QPointer<Ui::BoxContent> preview;
+			rpl::event_stream<not_null<Data::Thread*>> recipient;
 			bool sent = false;
 		};
 		const auto state = std::make_shared<State>();
-		auto box = Box(PreparedPreviewBox, item, [=] {
+		auto recipient = state->recipient.events();
+		auto box = Box(PreparedPreviewBox, item, std::move(recipient), [=] {
+			if (state->sent) {
+				return;
+			}
 			const auto chosen = [=](not_null<Data::Thread*> thread) {
-				auto action = Api::SendAction(thread);
-				const auto done = [=](bool success) {
-					if (success) {
-						callback(QString());
-					} else {
-						callback(u"MESSAGE_SEND_FAILED"_q);
-					}
-				};
-				bot->session().api().sendInlineResult(
-					bot,
-					parsed.get(),
-					action,
-					std::nullopt,
-					done);
-				state->sent = true;
-				if (const auto strong = state->preview.data()) {
-					strong->closeBox();
+				if (!Data::CanSend(thread, ChatRestriction::SendInline)) {
+					panel->showToast({
+						tr::lng_restricted_send_inline_all(tr::now),
+					});
+					return false;
 				}
+				state->recipient.fire_copy(thread);
 				return true;
 			};
 			auto box = Window::PrepareChooseRecipientBox(
@@ -1818,6 +1814,36 @@ void WebViewInstance::botSendPreparedMessage(
 				nullptr,
 				types);
 			panel->showBox(std::move(box));
+		}, [=](not_null<Data::Thread*> thread) {
+			if (state->sent) {
+				return;
+			}
+			state->sent = true;
+			const auto weak = state->preview;
+			const auto done = [=](bool success) {
+				if (success) {
+					if (const auto strong = weak.data()) {
+						strong->showToast({ tr::lng_share_done(tr::now) });
+					}
+					base::call_delayed(Ui::Toast::kDefaultDuration, [weak] {
+						if (const auto strong = weak.data()) {
+							strong->closeBox();
+						}
+					});
+					callback(QString());
+				} else {
+					if (const auto strong = weak.data()) {
+						strong->closeBox();
+					}
+					callback(u"MESSAGE_SEND_FAILED"_q);
+				}
+			};
+			bot->session().api().sendInlineResult(
+				bot,
+				parsed.get(),
+				Api::SendAction(thread),
+				std::nullopt,
+				done);
 		});
 		box->boxClosing() | rpl::start_with_next([=] {
 			if (!state->sent) {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
index 07aae0515..4b4b434ae 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "inline_bots/inline_bot_confirm_prepared.h"
 
+#include "boxes/peers/edit_peer_invite_link.h"
+#include "data/data_forum_topic.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "history/admin_log/history_admin_log_item.h"
@@ -19,11 +21,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/chat_theme.h"
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/layers/generic_box.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 "styles/style_chat.h"
+#include "styles/style_layers.h"
 
 namespace InlineBots {
 namespace {
@@ -168,22 +172,63 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 	_item->draw(p, context);
 }
 
-} // namesace
+} // namespace
 
 void PreparedPreviewBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<HistoryItem*> item,
-		Fn<void()> share) {
+		rpl::producer<not_null<Data::Thread*>> recipient,
+		Fn<void()> choose,
+		Fn<void(not_null<Data::Thread*>)> send) {
 	box->setTitle(tr::lng_bot_share_prepared_title());
 	const auto container = box->verticalLayout();
 	container->add(object_ptr<PreviewWrap>(container, item));
 	const auto bot = item->viaBot();
 	const auto name = bot ? bot->name() : u"Bot"_q;
-	Ui::AddDividerText(
-		container,
-		tr::lng_bot_share_prepared_about(lt_bot, rpl::single(name))),
-	box->addButton(tr::lng_bot_share_prepared_button(), share);
-	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	const auto info = container->add(
+		object_ptr<Ui::SlideWrap<Ui::DividerLabel>>(
+			container,
+			object_ptr<Ui::DividerLabel>(
+				container,
+				object_ptr<Ui::FlatLabel>(
+					container,
+					tr::lng_bot_share_prepared_about(lt_bot, rpl::single(name)),
+					st::boxDividerLabel),
+				st::defaultBoxDividerLabelPadding,
+				RectPart::Top | RectPart::Bottom)));
+	const auto row = container->add(object_ptr<Ui::VerticalLayout>(
+		container));
+
+	const auto reset = [=] {
+		info->show(anim::type::instant);
+		while (row->count()) {
+			delete row->widgetAt(0);
+		}
+		box->addButton(tr::lng_bot_share_prepared_button(), choose);
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	};
+	reset();
+
+	const auto lifetime = box->lifetime().make_state<rpl::lifetime>();
+	std::move(
+		recipient
+	) | rpl::start_with_next([=](not_null<Data::Thread*> thread) {
+		info->hide(anim::type::instant);
+		while (row->count()) {
+			delete row->widgetAt(0);
+		}
+		AddSkip(row);
+		AddSinglePeerRow(row, thread, nullptr, choose);
+		if (const auto topic = thread->asTopic()) {
+			*lifetime = topic->destroyed() | rpl::start_with_next(reset);
+		} else {
+			*lifetime = rpl::lifetime();
+		}
+		row->resizeToWidth(container->width());
+		box->clearButtons();
+		box->addButton(tr::lng_send_button(), [=] { send(thread); });
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	}, info->lifetime());
 
 	item->history()->owner().itemRemoved(
 	) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
index 606bc31c2..69af5d11a 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
@@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+namespace Data {
+class Thread;
+} // namespace Data
+
 namespace Ui {
 class GenericBox;
 } // namespace Ui
@@ -16,6 +20,8 @@ namespace InlineBots {
 void PreparedPreviewBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<HistoryItem*> item,
-	Fn<void()> share);
+	rpl::producer<not_null<Data::Thread*>> recipient,
+	Fn<void()> choose,
+	Fn<void(not_null<Data::Thread*>)> sent);
 
 } // namespace InlineBots

From 341ab781b2ea8533da124507eec8479e869ca225 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Nov 2024 21:32:21 +0400
Subject: [PATCH 276/306] Implement download of files in miniapps.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   3 +
 .../inline_bots/bot_attach_web_view.cpp       |  45 ++-
 .../inline_bots/bot_attach_web_view.h         |  11 +-
 .../inline_bots/inline_bot_confirm_prepared.h |   4 +
 .../inline_bots/inline_bot_downloads.cpp      | 324 ++++++++++++++++++
 .../inline_bots/inline_bot_downloads.h        |  99 ++++++
 .../SourceFiles/storage/file_download_web.cpp | 127 ++++++-
 .../SourceFiles/storage/file_download_web.h   |  19 +-
 .../SourceFiles/storage/storage_account.cpp   |  51 +++
 .../SourceFiles/storage/storage_account.h     |   5 +
 .../ui/chat/attach/attach_bot_webview.cpp     |  40 ++-
 .../ui/chat/attach/attach_bot_webview.h       |  20 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   2 +
 14 files changed, 721 insertions(+), 31 deletions(-)
 create mode 100644 Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
 create mode 100644 Telegram/SourceFiles/inline_bots/inline_bot_downloads.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 956115e4b..f05dcb98e 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1042,6 +1042,8 @@ PRIVATE
     inline_bots/bot_attach_web_view.h
     inline_bots/inline_bot_confirm_prepared.cpp
     inline_bots/inline_bot_confirm_prepared.h
+    inline_bots/inline_bot_downloads.cpp
+    inline_bots/inline_bot_downloads.h
     inline_bots/inline_bot_layout_internal.cpp
     inline_bots/inline_bot_layout_internal.h
     inline_bots/inline_bot_layout_item.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1525b0fed..e925aeaa6 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3428,6 +3428,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_share_prepared_title" = "Share Message";
 "lng_bot_share_prepared_about" = "{bot} mini app suggests you to send this message to a chat you select.";
 "lng_bot_share_prepared_button" = "Share With...";
+"lng_bot_download_file" = "Download File";
+"lng_bot_download_file_sure" = "{bot} suggests you download the following file:";
+"lng_bot_download_file_button" = "Download";
 
 "lng_bot_status_users#one" = "{count} monthly user";
 "lng_bot_status_users#other" = "{count} monthly users";
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index b2609d3ea..637ec996b 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_sending.h"
 #include "apiwrap.h"
 #include "base/call_delayed.h"
+#include "base/base_file_utilities.h"
 #include "base/qthelp_url.h"
 #include "base/random.h"
 #include "base/timer_rpl.h"
@@ -42,6 +43,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h"
 #include "inline_bots/inline_bot_result.h"
 #include "inline_bots/inline_bot_confirm_prepared.h"
+#include "inline_bots/inline_bot_downloads.h"
 #include "iv/iv_instance.h"
 #include "lang/lang_keys.h"
 #include "main/main_app_config.h"
@@ -569,7 +571,7 @@ void ConfirmEmojiStatusBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<UserData*> bot,
 		not_null<DocumentData*> document,
-		TimeId until,
+		TimeId duration,
 		Fn<void(bool)> done) {
 	box->setNoContentMargin(true);
 
@@ -608,7 +610,9 @@ void ConfirmEmojiStatusBox(
 		object_ptr<Ui::RpWidget>::fromRaw(ownedSet.release()));
 
 	box->addButton(tr::lng_bot_emoji_status_confirm(), [=] {
-		document->owner().emojiStatuses().set(document->id, until);
+		document->owner().emojiStatuses().set(
+			document->id,
+			duration ? (base::unixtime::now() + duration) : 0);
 		*set = true;
 		box->closeBox();
 		done(true);
@@ -1345,6 +1349,7 @@ void WebViewInstance::show(ShowArgs &&args) {
 		|| v::is<WebViewSourceAttachMenu>(_source)
 		|| (attached != end(bots)
 			&& (attached->inAttachMenu || attached->inMainMenu));
+	const auto downloads = &_session->attachWebView().downloads();
 	_panelUrl = args.url;
 	_panel = Ui::BotWebView::Show({
 		.url = args.url,
@@ -1356,6 +1361,7 @@ void WebViewInstance::show(ShowArgs &&args) {
 		.menuButtons = buttons,
 		.fullscreen = args.fullscreen,
 		.allowClipboardRead = allowClipboardRead,
+		.downloadsProgress = downloads->downloadsProgress(_bot),
 	});
 	started(args.queryId);
 
@@ -1862,7 +1868,7 @@ void WebViewInstance::botSetEmojiStatus(
 	const auto bot = _bot;
 	const auto panel = _panel.get();
 	const auto callback = request.callback;
-	const auto until = request.expirationDate;
+	const auto duration = request.duration;
 	if (!panel) {
 		callback(u"UNKNOWN_ERROR"_q);
 		return;
@@ -1879,10 +1885,40 @@ void WebViewInstance::botSetEmojiStatus(
 			callback(success ? QString() : u"USER_DECLINED"_q);
 		};
 		panel->showBox(
-			Box(ConfirmEmojiStatusBox, bot, document, until, done));
+			Box(ConfirmEmojiStatusBox, bot, document, duration, done));
 	}, [=] { callback(u"SUGGESTED_EMOJI_INVALID"_q); }, panel->lifetime());
 }
 
+void WebViewInstance::botDownloadFile(
+		Ui::BotWebView::DownloadFileRequest request) {
+	const auto callback = request.callback;
+	if (_confirmingDownload || !_panel) {
+		callback(false);
+		return;
+	}
+	_confirmingDownload = true;
+	const auto done = [=](QString path) {
+		_confirmingDownload = false;
+		if (path.isEmpty()) {
+			callback(false);
+			return;
+		}
+		_bot->session().attachWebView().downloads().start({
+			.bot = _bot,
+			.url = request.url,
+			.path = path,
+		});
+		callback(true);
+	};
+	_panel->showBox(Box(DownloadFileBox, DownloadBoxArgs{
+		.session = &_bot->session(),
+		.bot = _bot->name(),
+		.name = base::FileNameFromUserString(request.name),
+		.url = request.url,
+		.done = done,
+	}));
+}
+
 void WebViewInstance::botOpenPrivacyPolicy() {
 	const auto bot = _bot;
 	const auto weak = _context.controller;
@@ -1995,6 +2031,7 @@ std::shared_ptr<Main::SessionShow> WebViewInstance::uiShow() {
 
 AttachWebView::AttachWebView(not_null<Main::Session*> session)
 : _session(session)
+, _downloads(std::make_unique<Downloads>(session))
 , _refreshTimer([=] { requestBots(); }) {
 	_refreshTimer.callEach(kRefreshBotsTimeout);
 }
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index 46e1487c4..9b3e7b500 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -7,11 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "api/api_common.h"
 #include "base/flags.h"
 #include "base/timer.h"
 #include "base/weak_ptr.h"
 #include "dialogs/dialogs_key.h"
-#include "api/api_common.h"
 #include "mtproto/sender.h"
 #include "ui/chat/attach/attach_bot_webview.h"
 #include "ui/rp_widget.h"
@@ -51,6 +51,7 @@ enum class CheckoutResult;
 namespace InlineBots {
 
 class WebViewInstance;
+class Downloads;
 
 enum class PeerType : uint8 {
 	SameBot   = 0x01,
@@ -269,6 +270,8 @@ private:
 		Ui::BotWebView::SendPreparedMessageRequest request) override;
 	void botSetEmojiStatus(
 		Ui::BotWebView::SetEmojiStatusRequest request) override;
+	void botDownloadFile(
+		Ui::BotWebView::DownloadFileRequest request) override;
 	void botOpenPrivacyPolicy() override;
 	void botClose() override;
 
@@ -282,6 +285,7 @@ private:
 	BotAppData *_app = nullptr;
 	QString _appStartParam;
 	bool _dataSent = false;
+	bool _confirmingDownload = false;
 
 	mtpRequestId _requestId = 0;
 	mtpRequestId _prolongId = 0;
@@ -300,6 +304,10 @@ public:
 	explicit AttachWebView(not_null<Main::Session*> session);
 	~AttachWebView();
 
+	[[nodiscard]] Downloads &downloads() const {
+		return *_downloads;
+	}
+
 	void open(WebViewDescriptor &&descriptor);
 	void openByUsername(
 		not_null<Window::SessionController*> controller,
@@ -370,6 +378,7 @@ private:
 		Fn<void(bool added)> callback = nullptr);
 
 	const not_null<Main::Session*> _session;
+	const std::unique_ptr<Downloads> _downloads;
 
 	base::Timer _refreshTimer;
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
index 69af5d11a..c2169a7cc 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
@@ -11,6 +11,10 @@ namespace Data {
 class Thread;
 } // namespace Data
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Ui {
 class GenericBox;
 } // namespace Ui
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
new file mode 100644
index 000000000..40644f6e5
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
@@ -0,0 +1,324 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "inline_bots/inline_bot_downloads.h"
+
+#include "data/data_document.h"
+#include "data/data_peer_id.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "storage/file_download_web.h"
+#include "storage/serialize_common.h"
+#include "storage/storage_account.h"
+#include "ui/chat/attach/attach_bot_webview.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_chat.h"
+
+#include <QtCore/QBuffer>
+#include <QtCore/QDataStream>
+
+namespace InlineBots {
+namespace {
+
+constexpr auto kDownloadsVersion = 1;
+constexpr auto kMaxDownloadsBots = 4096;
+constexpr auto kMaxDownloadsPerBot = 16384;
+
+} // namespace
+
+Downloads::Downloads(not_null<Main::Session*> session)
+: _session(session) {
+}
+
+Downloads::~Downloads() = default;
+
+DownloadId Downloads::start(StartArgs &&args) {
+	read();
+
+	const auto botId = args.bot->id;
+	const auto id = ++_autoIncrementId;
+	auto &list = _lists[botId].list;
+	list.push_back({
+		.id = id,
+		.url = std::move(args.url),
+		.path = std::move(args.path),
+	});
+	auto &entry = list.back();
+	auto &loader = _loaders[id];
+	loader.botId = botId;
+	loader.loader = std::make_unique<webFileLoader>(
+		_session,
+		entry.url,
+		entry.path,
+		WebRequestType::FullLoad);
+	loader.loader->updates(
+	) | rpl::start_with_next_error_done([=] {
+		progress(botId, id);
+	}, [=](FileLoader::Error) {
+		fail(botId, id);
+	}, [=] {
+		done(botId, id);
+	}, loader.loader->lifetime());
+	loader.loader->start();
+
+	return id;
+}
+
+void Downloads::progress(PeerId botId, DownloadId id) {
+	const auto i = _loaders.find(id);
+	if (i == end(_loaders)) {
+		return;
+	}
+	const auto &loader = i->second.loader;
+	const auto total = loader->fullSize();
+	const auto ready = loader->currentOffset();
+
+	auto &list = _lists[botId].list;
+	const auto j = ranges::find(
+		list,
+		id,
+		&DownloadsEntry::id);
+	Assert(j != end(list));
+
+	if (total < 0
+		|| ready > total
+		|| (j->total && j->total != total)) {
+		fail(botId, id);
+		return;
+	} else if (ready > total) {
+		fail(botId, id);
+		return;
+	} else if (ready == total) {
+		// Wait for 'done' signal.
+		return;
+	}
+	applyProgress(botId, id, total, ready);
+}
+
+void Downloads::fail(PeerId botId, DownloadId id) {
+	const auto i = _loaders.find(id);
+	if (i == end(_loaders)) {
+		return;
+	}
+	auto loader = std::move(i->second.loader);
+	_loaders.erase(i);
+	loader = nullptr;
+
+	auto &list = _lists[botId].list;
+	const auto k = ranges::find(
+		list,
+		id,
+		&DownloadsEntry::id);
+	Assert(k != end(list));
+	k->ready = -1;
+}
+
+void Downloads::done(PeerId botId, DownloadId id) {
+	const auto i = _loaders.find(id);
+	if (i == end(_loaders)) {
+		return;
+	}
+	auto &list = _lists[botId].list;
+	const auto j = ranges::find(
+		list,
+		id,
+		&DownloadsEntry::id);
+	Assert(j != end(list));
+
+	const auto total = i->second.loader->fullSize();
+	if (total <= 0 || (j->total && j->total != total)) {
+		fail(botId, id);
+		return;
+	}
+	_loaders.erase(i);
+
+	applyProgress(botId, id, total, total);
+}
+
+void Downloads::applyProgress(
+		PeerId botId,
+		DownloadId id,
+		int64 total,
+		int64 ready) {
+	Expects(total > 0);
+	Expects(ready >= 0 && ready <= total);
+
+	auto &list = _lists[botId].list;
+	const auto j = ranges::find(
+		list,
+		id,
+		&DownloadsEntry::id);
+	Assert(j != end(list));
+
+	auto &progress = _progressView[botId];
+	auto current = progress.current();
+	if (!j->total) {
+		j->total = total;
+		current.total += total;
+	}
+	if (j->ready != ready) {
+		const auto delta = ready - j->ready;
+		j->ready = ready;
+		current.ready += delta;
+	}
+
+	if (total == ready) {
+		write();
+	}
+
+	progress = current;
+	if (current.ready == current.total) {
+		progress = DownloadsProgress();
+	}
+}
+
+void Downloads::cancel(DownloadId id) {
+	const auto i = _loaders.find(id);
+	if (i == end(_loaders)) {
+		return;
+	}
+	const auto botId = i->second.botId;
+	fail(botId, id);
+
+	auto &list = _lists[botId].list;
+	list.erase(
+		ranges::remove(list, id, &DownloadsEntry::id),
+		end(list));
+
+	auto &progress = _progressView[botId];
+	progress.force_assign(progress.current());
+}
+
+[[nodiscard]] auto Downloads::downloadsProgress(not_null<UserData*> bot)
+->rpl::producer<DownloadsProgress> {
+	read();
+
+	return _progressView[bot->id].value();
+}
+
+void Downloads::read() {
+	auto bytes = _session->local().readInlineBotsDownloads();
+	if (bytes.isEmpty()) {
+		return;
+	}
+
+	Assert(_lists.empty());
+
+	auto stream = QDataStream(&bytes, QIODevice::ReadOnly);
+	stream.setVersion(QDataStream::Qt_5_1);
+
+	quint32 version = 0, count = 0;
+	stream >> version;
+	if (version != kDownloadsVersion) {
+		return;
+	}
+	stream >> count;
+	if (!count || count > kMaxDownloadsBots) {
+		return;
+	}
+	auto lists = base::flat_map<PeerId, List>();
+	for (auto i = 0; i != count; ++i) {
+		quint64 rawBotId = 0;
+		quint32 count = 0;
+		stream >> rawBotId >> count;
+		const auto botId = DeserializePeerId(rawBotId);
+		if (!botId
+			|| !peerIsUser(botId)
+			|| count > kMaxDownloadsPerBot
+			|| lists.contains(botId)) {
+			return;
+		}
+		auto &list = lists[botId];
+		list.list.reserve(count);
+		for (auto j = 0; j != count; ++j) {
+			auto entry = DownloadsEntry();
+			stream >> entry.url >> entry.path >> entry.total;
+			entry.ready = entry.total;
+			entry.id = ++_autoIncrementId;
+			list.list.push_back(std::move(entry));
+		}
+	}
+	_lists = std::move(lists);
+}
+
+void Downloads::write() {
+	auto size = sizeof(quint32) // version
+		+ sizeof(quint32); // lists count
+
+	for (const auto &[botId, list] : _lists) {
+		size += sizeof(quint64) // botId
+			+ sizeof(quint32); // list count
+		for (const auto &entry : list.list) {
+			if (entry.total > 0 && entry.ready == entry.total) {
+				size += Serialize::stringSize(entry.url)
+					+ Serialize::stringSize(entry.path)
+					+ sizeof(quint64); // total
+			}
+		}
+	}
+
+	auto bytes = QByteArray();
+	bytes.reserve(size);
+	auto buffer = QBuffer(&bytes);
+	buffer.open(QIODevice::WriteOnly);
+	auto stream = QDataStream(&buffer);
+	stream.setVersion(QDataStream::Qt_5_1);
+
+	stream << quint32(kDownloadsVersion) << quint32(_lists.size());
+
+	for (const auto &[botId, list] : _lists) {
+		stream << SerializePeerId(botId) << quint32(list.list.size());
+		for (const auto &entry : list.list) {
+			if (entry.total > 0 && entry.ready == entry.total) {
+				stream << entry.url << entry.path << entry.total;
+			}
+		}
+	}
+	buffer.close();
+
+	_session->local().writeInlineBotsDownloads(bytes);
+}
+
+void DownloadFileBox(not_null<Ui::GenericBox*> box, DownloadBoxArgs args) {
+	Expects(!args.name.isEmpty());
+
+	box->setTitle(tr::lng_bot_download_file());
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		tr::lng_bot_download_file_sure(
+			lt_bot,
+			rpl::single(Ui::Text::Bold(args.bot)),
+			Ui::Text::RichLangValue),
+		st::botDownloadLabel));
+	//box->addRow(MakeFilePreview(box, args));
+	const auto done = std::move(args.done);
+	const auto name = args.name;
+	const auto session = args.session;
+	box->addButton(tr::lng_bot_download_file_button(), [=] {
+		const auto path = FileNameForSave(
+			session,
+			tr::lng_save_file(tr::now),
+			QString(),
+			u"file"_q,
+			name,
+			false,
+			QDir());
+		if (!path.isEmpty()) {
+			box->closeBox();
+			done(path);
+		}
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+		done(QString());
+	});
+}
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h
new file mode 100644
index 000000000..33383cd7f
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h
@@ -0,0 +1,99 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class webFileLoader;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace Ui::BotWebView {
+struct DownloadsProgress;
+} // namespace Ui::BotWebView
+
+namespace InlineBots {
+
+using DownloadId = uint32;
+
+using ::Ui::BotWebView::DownloadsProgress;
+
+struct DownloadsEntry {
+	DownloadId id = 0;
+	QString url;
+	QString path;
+	uint64 ready = 0;
+	uint64 total = 0;
+};
+
+class Downloads final {
+public:
+	explicit Downloads(not_null<Main::Session*> session);
+	~Downloads();
+
+	struct StartArgs {
+		not_null<UserData*> bot;
+		QString url;
+		QString path;
+	};
+	uint32 start(StartArgs &&args); // Returns download id.
+
+	void cancel(DownloadId id);
+
+	[[nodiscard]] auto downloadsProgress(not_null<UserData*> bot)
+		-> rpl::producer<DownloadsProgress>;
+
+private:
+	struct List {
+		std::vector<DownloadsEntry> list;
+		bool checked = false;
+	};
+	struct Loader {
+		std::unique_ptr<webFileLoader> loader;
+		PeerId botId = 0;
+	};
+
+	void read();
+	void write();
+
+	void progress(PeerId botId, DownloadId id);
+	void fail(PeerId botId, DownloadId id);
+	void done(PeerId botId, DownloadId id);
+	void applyProgress(
+		PeerId botId,
+		DownloadId id,
+		int64 total,
+		int64 ready);
+
+	const not_null<Main::Session*> _session;
+
+	base::flat_map<PeerId, List> _lists;
+	base::flat_map<DownloadId, Loader> _loaders;
+
+	base::flat_map<
+		PeerId,
+		rpl::variable<DownloadsProgress>> _progressView;
+
+	DownloadId _autoIncrementId = 0;
+
+};
+
+struct DownloadBoxArgs {
+	not_null<Main::Session*> session;
+	QString bot;
+	QString name;
+	QString url;
+	Fn<void(QString)> done;
+};
+void DownloadFileBox(not_null<Ui::GenericBox*> box, DownloadBoxArgs args);
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/storage/file_download_web.cpp b/Telegram/SourceFiles/storage/file_download_web.cpp
index 33dda245f..bda894d4c 100644
--- a/Telegram/SourceFiles/storage/file_download_web.cpp
+++ b/Telegram/SourceFiles/storage/file_download_web.cpp
@@ -18,6 +18,7 @@ namespace {
 constexpr auto kMaxWebFileQueries = 8;
 constexpr auto kMaxHttpRedirects = 5;
 constexpr auto kResetDownloadPrioritiesTimeout = crl::time(200);
+constexpr auto kMaxWebFile = 4000 * int64(1024 * 1024);
 
 std::weak_ptr<WebLoadManager> GlobalLoadManager;
 
@@ -41,6 +42,7 @@ enum class Error {
 struct Progress {
 	qint64 ready = 0;
 	qint64 total = 0;
+	QByteArray streamed;
 };
 
 using Update = std::variant<Progress, QByteArray, Error>;
@@ -67,10 +69,12 @@ private:
 	struct Enqueued {
 		int id = 0;
 		QString url;
+		bool stream = false;
 	};
 	struct Sent {
 		QString url;
 		not_null<QNetworkReply*> reply;
+		bool stream = false;
 		QByteArray data;
 		int64 ready = 0;
 		int64 total = 0;
@@ -81,7 +85,7 @@ private:
 	void handleNetworkErrors();
 
 	// Worker thread.
-	void enqueue(int id, const QString &url);
+	void enqueue(int id, const QString &url, bool stream);
 	void remove(int id);
 	void resetGeneration();
 	void checkSendNext();
@@ -107,7 +111,11 @@ private:
 	void failed(int id, not_null<QNetworkReply*> reply);
 	void finished(int id, not_null<QNetworkReply*> reply);
 	void deleteDeferred(not_null<QNetworkReply*> reply);
-	void queueProgressUpdate(int id, int64 ready, int64 total);
+	void queueProgressUpdate(
+		int id,
+		int64 ready,
+		int64 total,
+		QByteArray streamed);
 	void queueFailedUpdate(int id);
 	void queueFinishedUpdate(int id, const QByteArray &data);
 	void clear();
@@ -187,8 +195,9 @@ void WebLoadManager::enqueue(not_null<webFileLoader*> loader) {
 			: _ids.emplace(loader, ++_autoincrement).first->second;
 	}();
 	const auto url = loader->url();
+	const auto stream = loader->streamLoading();
 	InvokeQueued(_network.get(), [=] {
-		enqueue(id, url);
+		enqueue(id, url, stream);
 	});
 }
 
@@ -204,7 +213,7 @@ void WebLoadManager::remove(not_null<webFileLoader*> loader) {
 	});
 }
 
-void WebLoadManager::enqueue(int id, const QString &url) {
+void WebLoadManager::enqueue(int id, const QString &url, bool stream) {
 	const auto i = ranges::find(_queue, id, &Enqueued::id);
 	if (i != end(_queue)) {
 		return;
@@ -212,7 +221,7 @@ void WebLoadManager::enqueue(int id, const QString &url) {
 	_previousGeneration.erase(
 		ranges::remove(_previousGeneration, id, &Enqueued::id),
 		end(_previousGeneration));
-	_queue.push_back(Enqueued{ id, url });
+	_queue.push_back(Enqueued{ id, url, stream });
 	if (!_resetGenerationTimer.isActive()) {
 		_resetGenerationTimer.callOnce(kResetDownloadPrioritiesTimeout);
 	}
@@ -253,7 +262,7 @@ void WebLoadManager::checkSendNext() {
 void WebLoadManager::send(const Enqueued &entry) {
 	const auto id = entry.id;
 	const auto url = entry.url;
-	_sent.emplace(id, Sent{ url, send(id, url) });
+	_sent.emplace(id, Sent{ url, send(id, url), entry.stream });
 }
 
 void WebLoadManager::removeSent(int id) {
@@ -294,6 +303,13 @@ void WebLoadManager::progress(
 		not_null<QNetworkReply*> reply,
 		int64 ready,
 		int64 total) {
+	if (total <= 0) {
+		const auto originalContentLength = reply->attribute(
+			QNetworkRequest::OriginalContentLengthAttribute);
+		if (originalContentLength.isValid()) {
+			total = originalContentLength.toLongLong();
+		}
+	}
 	const auto statusCode = reply->attribute(
 		QNetworkRequest::HttpStatusCodeAttribute);
 	const auto status = statusCode.isValid() ? statusCode.toInt() : 200;
@@ -338,10 +354,7 @@ void WebLoadManager::notify(
 	if (const auto sent = findSent(id, reply)) {
 		sent->ready = ready;
 		sent->total = std::max(total, int64(0));
-		sent->data.append(reply->readAll());
-		if (total == 0
-			|| total > Storage::kMaxFileInMemory
-			|| sent->data.size() > Storage::kMaxFileInMemory) {
+		if (total <= 0) {
 			LOG(("Network Error: "
 				"Bad size received for HTTP download progress "
 				"in WebLoadManager::onProgress(): %1 / %2 (bytes %3)"
@@ -349,10 +362,43 @@ void WebLoadManager::notify(
 				).arg(total
 				).arg(sent->data.size()));
 			failed(id, reply);
-		} else if (total > 0 && ready >= total) {
-			finished(id, reply);
+			return;
+		}
+		auto bytes = reply->readAll();
+		if (sent->stream) {
+			if (total > kMaxWebFile) {
+				LOG(("Network Error: "
+					"Bad size received for HTTP download progress "
+					"in WebLoadManager::onProgress(): %1 / %2"
+					).arg(ready
+					).arg(total));
+				failed(id, reply);
+			} else {
+				queueProgressUpdate(
+					id,
+					sent->ready,
+					sent->total,
+					std::move(bytes));
+				if (ready >= total) {
+					finished(id, reply);
+				}
+			}
 		} else {
-			queueProgressUpdate(id, sent->ready, sent->total);
+			sent->data.append(std::move(bytes));
+			if (total > Storage::kMaxFileInMemory
+				|| sent->data.size() > Storage::kMaxFileInMemory) {
+				LOG(("Network Error: "
+					"Bad size received for HTTP download progress "
+					"in WebLoadManager::onProgress(): %1 / %2 (bytes %3)"
+					).arg(ready
+					).arg(total
+					).arg(sent->data.size()));
+				failed(id, reply);
+			} else if (ready >= total) {
+				finished(id, reply);
+			} else {
+				queueProgressUpdate(id, sent->ready, sent->total, {});
+			}
 		}
 	}
 }
@@ -406,9 +452,13 @@ void WebLoadManager::clear() {
 	}
 }
 
-void WebLoadManager::queueProgressUpdate(int id, int64 ready, int64 total) {
-	crl::on_main(this, [=] {
-		sendUpdate(id, Progress{ ready, total });
+void WebLoadManager::queueProgressUpdate(
+		int id,
+		int64 ready,
+		int64 total,
+		QByteArray streamed) {
+	crl::on_main(this, [=, bytes = std::move(streamed)]() mutable {
+		sendUpdate(id, Progress{ ready, total, std::move(bytes) });
 	});
 }
 
@@ -458,6 +508,25 @@ webFileLoader::webFileLoader(
 , _url(url) {
 }
 
+webFileLoader::webFileLoader(
+	not_null<Main::Session*> session,
+	const QString &url,
+	const QString &path,
+	WebRequestType type)
+: FileLoader(
+	session,
+	path,
+	0,
+	0,
+	UnknownFileLocation,
+	LoadToFileOnly,
+	LoadFromCloudOrLocal,
+	false,
+	0)
+, _url(url)
+, _requestType(type) {
+}
+
 webFileLoader::~webFileLoader() {
 	if (!_finished) {
 		cancel();
@@ -468,6 +537,14 @@ QString webFileLoader::url() const {
 	return _url;
 }
 
+WebRequestType webFileLoader::requestType() const {
+	return _requestType;
+}
+
+bool webFileLoader::streamLoading() const {
+	return (_toCache == LoadToFileOnly);
+}
+
 void webFileLoader::startLoading() {
 	if (_finished) {
 		return;
@@ -477,7 +554,10 @@ void webFileLoader::startLoading() {
 			this
 		) | rpl::start_with_next([=](const Update &data) {
 			if (const auto progress = std::get_if<Progress>(&data)) {
-				loadProgress(progress->ready, progress->total);
+				loadProgress(
+					progress->ready,
+					progress->total,
+					progress->streamed);
 			} else if (const auto bytes = std::get_if<QByteArray>(&data)) {
 				loadFinished(*bytes);
 			} else {
@@ -492,10 +572,19 @@ int64 webFileLoader::currentOffset() const {
 	return _ready;
 }
 
-void webFileLoader::loadProgress(qint64 ready, qint64 total) {
+void webFileLoader::loadProgress(
+		qint64 ready,
+		qint64 total,
+		const QByteArray &streamed) {
 	_fullSize = _loadSize = total;
 	_ready = ready;
-	notifyAboutProgress();
+	if (!streamed.isEmpty()
+		&& !writeResultPart(_streamedOffset, bytes::make_span(streamed))) {
+		loadFailed();
+	} else {
+		_streamedOffset += streamed.size();
+		notifyAboutProgress();
+	}
 }
 
 void webFileLoader::loadFinished(const QByteArray &data) {
diff --git a/Telegram/SourceFiles/storage/file_download_web.h b/Telegram/SourceFiles/storage/file_download_web.h
index efa6f6b83..bc5367ca1 100644
--- a/Telegram/SourceFiles/storage/file_download_web.h
+++ b/Telegram/SourceFiles/storage/file_download_web.h
@@ -11,6 +11,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class WebLoadManager;
 
+enum class WebRequestType {
+	FullLoad,
+	OnlySize,
+};
+
 class webFileLoader final : public FileLoader {
 public:
 	webFileLoader(
@@ -20,9 +25,16 @@ public:
 		LoadFromCloudSetting fromCloud,
 		bool autoLoading,
 		uint8 cacheTag);
+	webFileLoader(
+		not_null<Main::Session*> session,
+		const QString &url,
+		const QString &path,
+		WebRequestType type);
 	~webFileLoader();
 
 	[[nodiscard]] QString url() const;
+	[[nodiscard]] WebRequestType requestType() const;
+	[[nodiscard]] bool streamLoading() const;
 
 	int64 currentOffset() const override;
 
@@ -33,12 +45,17 @@ private:
 	Storage::Cache::Key cacheKey() const override;
 	std::optional<MediaKey> fileLocationKey() const override;
 
-	void loadProgress(qint64 ready, qint64 size);
+	void loadProgress(
+		qint64 ready,
+		qint64 size,
+		const QByteArray &streamed);
 	void loadFinished(const QByteArray &data);
 	void loadFailed();
 
 	const QString _url;
 	int64 _ready = 0;
+	int64 _streamedOffset = 0;
+	WebRequestType _requestType = {};
 
 	std::shared_ptr<WebLoadManager> _manager;
 	rpl::lifetime _managerLifetime;
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index 031e61e53..3c8d81403 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -95,6 +95,7 @@ enum { // Local Storage Keys
 	lskSearchSuggestions = 0x18, // no data
 	lskWebviewTokens = 0x19, // data: QByteArray bots, QByteArray other
 	lskRoundPlaceholder = 0x1a, // no data
+	lskInlineBotsDownloads = 0x1b, // no data
 };
 
 auto EmptyMessageDraftSources()
@@ -222,6 +223,7 @@ base::flat_set<QString> Account::collectGoodNames() const {
 		_archivedCustomEmojiKey,
 		_searchSuggestionsKey,
 		_roundPlaceholderKey,
+		_inlineBotsDownloadsKey,
 	};
 	auto result = base::flat_set<QString>{
 		"map0",
@@ -309,6 +311,7 @@ Account::ReadMapResult Account::readMapWith(
 	quint64 userSettingsKey = 0, recentHashtagsAndBotsKey = 0, exportSettingsKey = 0;
 	quint64 searchSuggestionsKey = 0;
 	quint64 roundPlaceholderKey = 0;
+	quint64 inlineBotsDownloadsKey = 0;
 	QByteArray webviewStorageTokenBots, webviewStorageTokenOther;
 	while (!map.stream.atEnd()) {
 		quint32 keyType;
@@ -421,6 +424,9 @@ Account::ReadMapResult Account::readMapWith(
 		case lskRoundPlaceholder: {
 			map.stream >> roundPlaceholderKey;
 		} break;
+		case lskInlineBotsDownloads: {
+			map.stream >> inlineBotsDownloadsKey;
+		} break;
 		case lskWebviewTokens: {
 			map.stream
 				>> webviewStorageTokenBots
@@ -463,6 +469,7 @@ Account::ReadMapResult Account::readMapWith(
 	_exportSettingsKey = exportSettingsKey;
 	_searchSuggestionsKey = searchSuggestionsKey;
 	_roundPlaceholderKey = roundPlaceholderKey;
+	_inlineBotsDownloadsKey = inlineBotsDownloadsKey;
 	_oldMapVersion = mapData.version;
 	_webviewStorageIdBots.token = webviewStorageTokenBots;
 	_webviewStorageIdOther.token = webviewStorageTokenOther;
@@ -578,6 +585,7 @@ void Account::writeMap() {
 			+ Serialize::bytearraySize(_webviewStorageIdOther.token);
 	}
 	if (_roundPlaceholderKey) mapSize += sizeof(quint32) + sizeof(quint64);
+	if (_inlineBotsDownloadsKey) mapSize += sizeof(quint32) + sizeof(quint64);
 
 	EncryptedDescriptor mapData(mapSize);
 	if (!self.isEmpty()) {
@@ -652,6 +660,10 @@ void Account::writeMap() {
 		mapData.stream << quint32(lskRoundPlaceholder);
 		mapData.stream << quint64(_roundPlaceholderKey);
 	}
+	if (_inlineBotsDownloadsKey) {
+		mapData.stream << quint32(lskInlineBotsDownloads);
+		mapData.stream << quint64(_inlineBotsDownloadsKey);
+	}
 	map.writeEncrypted(mapData, _localKey);
 
 	_mapChanged = false;
@@ -682,6 +694,7 @@ void Account::reset() {
 	_settingsKey = _recentHashtagsAndBotsKey = _exportSettingsKey = 0;
 	_searchSuggestionsKey = 0;
 	_roundPlaceholderKey = 0;
+	_inlineBotsDownloadsKey = 0;
 	_oldMapVersion = 0;
 	_fileLocations.clear();
 	_fileLocationPairs.clear();
@@ -3239,6 +3252,44 @@ void Account::writeRoundPlaceholder(const QImage &placeholder) {
 	file.writeEncrypted(data, _localKey);
 }
 
+QByteArray Account::readInlineBotsDownloads() {
+	if (_inlineBotsDownloadsRead) {
+		return QByteArray();
+	}
+	_inlineBotsDownloadsRead = true;
+	if (!_inlineBotsDownloadsKey) {
+		return QByteArray();
+	}
+
+	FileReadDescriptor inlineBotsDownloads;
+	if (!ReadEncryptedFile(
+			inlineBotsDownloads,
+			_inlineBotsDownloadsKey,
+			_basePath,
+			_localKey)) {
+		ClearKey(_inlineBotsDownloadsKey, _basePath);
+		_inlineBotsDownloadsKey = 0;
+		writeMapDelayed();
+		return QByteArray();
+	}
+
+	auto bytes = QByteArray();
+	inlineBotsDownloads.stream >> bytes;
+	return bytes;
+}
+
+void Account::writeInlineBotsDownloads(const QByteArray &bytes) {
+	if (!_inlineBotsDownloadsKey) {
+		_inlineBotsDownloadsKey = GenerateKey(_basePath);
+		writeMapQueued();
+	}
+	quint32 size = Serialize::bytearraySize(bytes);
+	EncryptedDescriptor data(size);
+	data.stream << bytes;
+	FileWriteDescriptor file(_inlineBotsDownloadsKey, _basePath);
+	file.writeEncrypted(data, _localKey);
+}
+
 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 c0efdefdc..a044b0a74 100644
--- a/Telegram/SourceFiles/storage/storage_account.h
+++ b/Telegram/SourceFiles/storage/storage_account.h
@@ -177,6 +177,9 @@ public:
 	[[nodiscard]] QImage readRoundPlaceholder();
 	void writeRoundPlaceholder(const QImage &placeholder);
 
+	[[nodiscard]] QByteArray readInlineBotsDownloads();
+	void writeInlineBotsDownloads(const QByteArray &bytes);
+
 	[[nodiscard]] bool encrypt(
 		const void *src,
 		void *dst,
@@ -306,6 +309,7 @@ private:
 	FileKey _archivedCustomEmojiKey = 0;
 	FileKey _searchSuggestionsKey = 0;
 	FileKey _roundPlaceholderKey = 0;
+	FileKey _inlineBotsDownloadsKey = 0;
 
 	qint64 _cacheTotalSizeLimit = 0;
 	qint64 _cacheBigFileTotalSizeLimit = 0;
@@ -317,6 +321,7 @@ private:
 	bool _readingUserSettings = false;
 	bool _recentHashtagsAndBotsWereRead = false;
 	bool _searchSuggestionsRead = false;
+	bool _inlineBotsDownloadsRead = false;
 
 	Webview::StorageId _webviewStorageIdBots;
 	Webview::StorageId _webviewStorageIdOther;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 7158f1e9f..98e965a86 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -786,6 +786,8 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			} else {
 				sendFullScreen();
 			}
+		} else if (command == "web_app_request_file_download") {
+			processDownloadRequest(arguments);
 		} else if (command == "web_app_exit_fullscreen") {
 			if (_fullscreen.current()) {
 				_fullscreen = false;
@@ -1008,17 +1010,17 @@ void Panel::processEmojiStatusRequest(const QJsonObject &args) {
 		return;
 	}
 	const auto emojiId = args["custom_emoji_id"].toString().toULongLong();
-	const auto expirationDate = TimeId(base::SafeRound(
-		args["expiration_date"].toDouble()));
+	const auto duration = TimeId(base::SafeRound(
+		args["duration"].toDouble()));
 	if (!emojiId) {
 		postEvent(
 			"emoji_status_failed",
 			"{ error: \"SUGGESTED_EMOJI_INVALID\" }");
 		return;
-	} else if (expirationDate < 0) {
+	} else if (duration < 0) {
 		postEvent(
 			"emoji_status_failed",
-			"{ error: \"EXPIRATION_DATE_INVALID\" }");
+			"{ error: \"DURATION_INVALID\" }");
 		return;
 	}
 	auto callback = crl::guard(this, [=](QString error) {
@@ -1032,7 +1034,7 @@ void Panel::processEmojiStatusRequest(const QJsonObject &args) {
 	});
 	_delegate->botSetEmojiStatus({
 		.customEmojiId = emojiId,
-		.expirationDate = expirationDate,
+		.duration = duration,
 		.callback = std::move(callback),
 	});
 }
@@ -1514,6 +1516,34 @@ void Panel::processBottomBarColor(const QJsonObject &args) {
 	}
 }
 
+void Panel::processDownloadRequest(const QJsonObject &args) {
+	if (args.isEmpty()) {
+		_delegate->botClose();
+		return;
+	}
+	const auto url = args["url"].toString();
+	const auto name = args["file_name"].toString();
+	if (url.isEmpty()) {
+		LOG(("BotWebView Error: Bad 'url' in download request."));
+		_delegate->botClose();
+		return;
+	} else if (name.isEmpty()) {
+		LOG(("BotWebView Error: Bad 'file_name' in download request."));
+		_delegate->botClose();
+		return;
+	}
+	const auto done = crl::guard(this, [=](bool started) {
+		postEvent("file_download_requested", started
+			? "{ status: \"downloading\" }"
+			: "{ status: \"cancelled\" }");
+	});
+	_delegate->botDownloadFile({
+		.url = url,
+		.name = name,
+		.callback = done,
+	});
+}
+
 void Panel::createButton(std::unique_ptr<Button> &button) {
 	if (!_bottomButtonsBg) {
 		_bottomButtonsBg = std::make_unique<RpWidget>(_widget.get());
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index bff1175ce..5b4fa16cb 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -53,10 +53,25 @@ struct CustomMethodRequest {
 
 struct SetEmojiStatusRequest {
 	uint64 customEmojiId = 0;
-	TimeId expirationDate = 0;
+	TimeId duration = 0;
 	Fn<void(QString)> callback;
 };
 
+struct DownloadFileRequest {
+	QString url;
+	QString name;
+	Fn<void(bool)> callback;
+};
+
+struct DownloadsProgress {
+	uint64 ready = 0;
+	uint64 total = 0;
+
+	friend inline bool operator==(
+		const DownloadsProgress &a,
+		const DownloadsProgress &b) = default;
+};
+
 struct SendPreparedMessageRequest {
 	QString id = 0;
 	Fn<void(QString)> callback;
@@ -81,6 +96,7 @@ public:
 	virtual void botSharePhone(Fn<void(bool shared)> callback) = 0;
 	virtual void botInvokeCustomMethod(CustomMethodRequest request) = 0;
 	virtual void botSetEmojiStatus(SetEmojiStatusRequest request) = 0;
+	virtual void botDownloadFile(DownloadFileRequest request) = 0;
 	virtual void botSendPreparedMessage(
 		SendPreparedMessageRequest request) = 0;
 	virtual void botOpenPrivacyPolicy() = 0;
@@ -97,6 +113,7 @@ struct Args {
 	MenuButtons menuButtons;
 	bool fullscreen = false;
 	bool allowClipboardRead = false;
+	rpl::producer<DownloadsProgress> downloadsProgress;
 };
 
 class Panel final : public base::has_weak_ptr {
@@ -155,6 +172,7 @@ private:
 	void processHeaderColor(const QJsonObject &args);
 	void processBackgroundColor(const QJsonObject &args);
 	void processBottomBarColor(const QJsonObject &args);
+	void processDownloadRequest(const QJsonObject &args);
 	void openTgLink(const QJsonObject &args);
 	void openExternalLink(const QJsonObject &args);
 	void openInvoice(const QJsonObject &args);
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index d68c1c933..b7bb520bc 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1181,3 +1181,5 @@ botEmojiStatusName: FlatLabel(defaultFlatLabel) {
 botEmojiStatusEmoji: FlatLabel(botEmojiStatusName) {
 	textFg: profileVerifiedCheckBg;
 }
+
+botDownloadLabel: boxLabel;

From ef521624a0326ef8f2e1953a6c4db2db5f538607 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 13 Nov 2024 11:11:25 +0400
Subject: [PATCH 277/306] Check file by server before downloading.

---
 .../inline_bots/bot_attach_web_view.cpp       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 637ec996b..19d811922 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -1910,13 +1910,21 @@ void WebViewInstance::botDownloadFile(
 		});
 		callback(true);
 	};
-	_panel->showBox(Box(DownloadFileBox, DownloadBoxArgs{
-		.session = &_bot->session(),
-		.bot = _bot->name(),
-		.name = base::FileNameFromUserString(request.name),
-		.url = request.url,
-		.done = done,
-	}));
+	_bot->session().api().request(MTPbots_CheckDownloadFileParams(
+		_bot->inputUser,
+		MTP_string(request.name),
+		MTP_string(request.url)
+	)).done([=] {
+		_panel->showBox(Box(DownloadFileBox, DownloadBoxArgs{
+			.session = &_bot->session(),
+			.bot = _bot->name(),
+			.name = base::FileNameFromUserString(request.name),
+			.url = request.url,
+			.done = done,
+		}));
+	}).fail([=] {
+		done(QString());
+	}).send();
 }
 
 void WebViewInstance::botOpenPrivacyPolicy() {

From 338122793ce3c4f7257a059fbd27b03f5f4d274a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Nov 2024 00:02:02 +0400
Subject: [PATCH 278/306] Implement bot downloads list UI.

---
 Telegram/Resources/langs/lang.strings         |   3 +
 .../inline_bots/bot_attach_web_view.cpp       |  13 +-
 .../inline_bots/bot_attach_web_view.h         |   6 +
 .../inline_bots/inline_bot_downloads.cpp      | 193 +++++++++----
 .../inline_bots/inline_bot_downloads.h        |  40 +--
 .../SourceFiles/payments/ui/payments.style    |   4 +
 .../SourceFiles/storage/file_download_web.cpp |   2 +-
 .../ui/chat/attach/attach_bot_downloads.cpp   | 268 ++++++++++++++++++
 .../ui/chat/attach/attach_bot_downloads.h     |  47 +++
 .../ui/chat/attach/attach_bot_webview.cpp     | 129 ++++++++-
 .../ui/chat/attach/attach_bot_webview.h       |  22 +-
 Telegram/SourceFiles/ui/chat/chat.style       |  18 ++
 Telegram/cmake/td_ui.cmake                    |   2 +
 Telegram/lib_ui                               |   2 +-
 14 files changed, 665 insertions(+), 84 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.h

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e925aeaa6..905db2f92 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3431,6 +3431,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_download_file" = "Download File";
 "lng_bot_download_file_sure" = "{bot} suggests you download the following file:";
 "lng_bot_download_file_button" = "Download";
+"lng_bot_download_starting" = "Starting...";
+"lng_bot_download_failed" = "Failed. {retry}";
+"lng_bot_download_retry" = "Retry";
 
 "lng_bot_status_users#one" = "{count} monthly user";
 "lng_bot_status_users#other" = "{count} monthly users";
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 19d811922..90a40dbff 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -1361,7 +1361,7 @@ void WebViewInstance::show(ShowArgs &&args) {
 		.menuButtons = buttons,
 		.fullscreen = args.fullscreen,
 		.allowClipboardRead = allowClipboardRead,
-		.downloadsProgress = downloads->downloadsProgress(_bot),
+		.downloadsProgress = downloads->progress(_bot),
 	});
 	started(args.queryId);
 
@@ -1450,6 +1450,17 @@ Webview::ThemeParams WebViewInstance::botThemeParams() {
 	return result;
 }
 
+auto WebViewInstance::botDownloads(bool forceCheck)
+-> const std::vector<Ui::BotWebView::DownloadsEntry> & {
+	return _session->attachWebView().downloads().list(_bot, forceCheck);
+}
+
+void WebViewInstance::botDownloadsAction(
+		uint32 id,
+		Ui::BotWebView::DownloadsAction type) {
+	_session->attachWebView().downloads().action(_bot, id, type);
+}
+
 bool WebViewInstance::botHandleLocalUri(QString uri, bool keepOpen) {
 	const auto local = Core::TryConvertUrlToLocal(uri);
 	if (Core::InternalPassportLink(local)) {
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index 9b3e7b500..febf74dfa 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -28,6 +28,7 @@ class DropdownMenu;
 
 namespace Ui::BotWebView {
 class Panel;
+struct DownloadsEntry;
 } // namespace Ui::BotWebView
 
 namespace Main {
@@ -250,6 +251,11 @@ private:
 	-> Fn<void(Payments::NonPanelPaymentForm)>;
 
 	Webview::ThemeParams botThemeParams() override;
+	auto botDownloads(bool forceCheck = false)
+		-> const std::vector<Ui::BotWebView::DownloadsEntry> & override;
+	void botDownloadsAction(
+		uint32 id,
+		Ui::BotWebView::DownloadsAction type) override;
 	bool botHandleLocalUri(QString uri, bool keepOpen) override;
 	void botHandleInvoice(QString slug) override;
 	void botHandleMenuButton(Ui::BotWebView::MenuButton button) override;
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
index 40644f6e5..cbb4ede82 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "inline_bots/inline_bot_downloads.h"
 
+#include "core/file_utilities.h"
 #include "data/data_document.h"
 #include "data/data_peer_id.h"
 #include "data/data_user.h"
@@ -15,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/file_download_web.h"
 #include "storage/serialize_common.h"
 #include "storage/storage_account.h"
-#include "ui/chat/attach/attach_bot_webview.h"
+#include "ui/chat/attach/attach_bot_downloads.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/labels.h"
@@ -24,6 +25,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QBuffer>
 #include <QtCore/QDataStream>
 
+#include "base/call_delayed.h"
+
 namespace InlineBots {
 namespace {
 
@@ -37,7 +40,10 @@ Downloads::Downloads(not_null<Main::Session*> session)
 : _session(session) {
 }
 
-Downloads::~Downloads() = default;
+Downloads::~Downloads() {
+	base::take(_loaders);
+	base::take(_lists);
+}
 
 DownloadId Downloads::start(StartArgs &&args) {
 	read();
@@ -50,14 +56,28 @@ DownloadId Downloads::start(StartArgs &&args) {
 		.url = std::move(args.url),
 		.path = std::move(args.path),
 	});
-	auto &entry = list.back();
+	load(botId, id, list.back());
+	return id;
+}
+
+void Downloads::load(
+		PeerId botId,
+		DownloadId id,
+		DownloadsEntry &entry) {
+	entry.loading = 1;
+	entry.failed = 0;
+
 	auto &loader = _loaders[id];
+	Assert(!loader.loader);
 	loader.botId = botId;
 	loader.loader = std::make_unique<webFileLoader>(
 		_session,
 		entry.url,
 		entry.path,
 		WebRequestType::FullLoad);
+
+	applyProgress(botId, id, 0, 0);
+
 	loader.loader->updates(
 	) | rpl::start_with_next_error_done([=] {
 		progress(botId, id);
@@ -66,9 +86,8 @@ DownloadId Downloads::start(StartArgs &&args) {
 	}, [=] {
 		done(botId, id);
 	}, loader.loader->lifetime());
-	loader.loader->start();
 
-	return id;
+	loader.loader->start();
 }
 
 void Downloads::progress(PeerId botId, DownloadId id) {
@@ -87,22 +106,18 @@ void Downloads::progress(PeerId botId, DownloadId id) {
 		&DownloadsEntry::id);
 	Assert(j != end(list));
 
-	if (total < 0
-		|| ready > total
-		|| (j->total && j->total != total)) {
-		fail(botId, id);
-		return;
-	} else if (ready > total) {
+	if (total < 0 || ready > total) {
 		fail(botId, id);
 		return;
 	} else if (ready == total) {
 		// Wait for 'done' signal.
 		return;
 	}
+
 	applyProgress(botId, id, total, ready);
 }
 
-void Downloads::fail(PeerId botId, DownloadId id) {
+void Downloads::fail(PeerId botId, DownloadId id, bool cancel) {
 	const auto i = _loaders.find(id);
 	if (i == end(_loaders)) {
 		return;
@@ -117,7 +132,16 @@ void Downloads::fail(PeerId botId, DownloadId id) {
 		id,
 		&DownloadsEntry::id);
 	Assert(k != end(list));
-	k->ready = -1;
+	k->loading = 0;
+	k->failed = 1;
+
+	if (cancel) {
+		auto copy = *k;
+		list.erase(k);
+		applyProgress(botId, copy, 0, 0);
+	} else {
+		applyProgress(botId, *k, 0, 0);
+	}
 }
 
 void Downloads::done(PeerId botId, DownloadId id) {
@@ -125,19 +149,20 @@ void Downloads::done(PeerId botId, DownloadId id) {
 	if (i == end(_loaders)) {
 		return;
 	}
+	const auto total = i->second.loader->fullSize();
+	if (total <= 0) {
+		fail(botId, id);
+		return;
+	}
+	_loaders.erase(i);
+
 	auto &list = _lists[botId].list;
 	const auto j = ranges::find(
 		list,
 		id,
 		&DownloadsEntry::id);
 	Assert(j != end(list));
-
-	const auto total = i->second.loader->fullSize();
-	if (total <= 0 || (j->total && j->total != total)) {
-		fail(botId, id);
-		return;
-	}
-	_loaders.erase(i);
+	j->loading = 0;
 
 	applyProgress(botId, id, total, total);
 }
@@ -147,7 +172,7 @@ void Downloads::applyProgress(
 		DownloadId id,
 		int64 total,
 		int64 ready) {
-	Expects(total > 0);
+	Expects(total >= 0);
 	Expects(ready >= 0 && ready <= total);
 
 	auto &list = _lists[botId].list;
@@ -157,52 +182,117 @@ void Downloads::applyProgress(
 		&DownloadsEntry::id);
 	Assert(j != end(list));
 
+	applyProgress(botId, *j, total, ready);
+}
+
+void Downloads::applyProgress(
+		PeerId botId,
+		DownloadsEntry &entry,
+		int64 total,
+		int64 ready) {
 	auto &progress = _progressView[botId];
 	auto current = progress.current();
-	if (!j->total) {
-		j->total = total;
-		current.total += total;
+	auto subtract = int64(0);
+	if (current.ready == current.total) {
+		subtract = current.ready;
 	}
-	if (j->ready != ready) {
-		const auto delta = ready - j->ready;
-		j->ready = ready;
+	if (entry.total != total) {
+		const auto delta = total - entry.total;
+		entry.total = total;
+		current.total += delta;
+	}
+	if (entry.ready != ready) {
+		const auto delta = ready - entry.ready;
+		entry.ready = ready;
 		current.ready += delta;
 	}
+	if (subtract > 0
+		&& current.ready >= subtract
+		&& current.total >= subtract) {
+		current.ready -= subtract;
+		current.total -= subtract;
+	}
+	if (entry.loading || current.ready < current.total) {
+		current.loading = 1;
+	} else {
+		current.loading = 0;
+	}
 
-	if (total == ready) {
+	if (total > 0 && total == ready) {
 		write();
 	}
 
 	progress = current;
-	if (current.ready == current.total) {
-		progress = DownloadsProgress();
+}
+
+void Downloads::action(
+		not_null<UserData*> bot,
+		DownloadId id,
+		DownloadsAction type) {
+	switch (type) {
+	case DownloadsAction::Open: {
+		const auto i = ranges::find(
+			_lists[bot->id].list,
+			id,
+			&DownloadsEntry::id);
+		if (i == end(_lists[bot->id].list)) {
+			return;
+		}
+		File::ShowInFolder(i->path);
+	} break;
+	case DownloadsAction::Cancel: {
+		const auto i = _loaders.find(id);
+		if (i == end(_loaders)) {
+			return;
+		}
+		const auto botId = i->second.botId;
+		fail(botId, id, true);
+	} break;
+	case DownloadsAction::Retry: {
+		const auto i = ranges::find(
+			_lists[bot->id].list,
+			id,
+			&DownloadsEntry::id);
+		if (i == end(_lists[bot->id].list)) {
+			return;
+		}
+		load(bot->id, id, *i);
+	} break;
 	}
 }
 
-void Downloads::cancel(DownloadId id) {
-	const auto i = _loaders.find(id);
-	if (i == end(_loaders)) {
-		return;
-	}
-	const auto botId = i->second.botId;
-	fail(botId, id);
-
-	auto &list = _lists[botId].list;
-	list.erase(
-		ranges::remove(list, id, &DownloadsEntry::id),
-		end(list));
-
-	auto &progress = _progressView[botId];
-	progress.force_assign(progress.current());
-}
-
-[[nodiscard]] auto Downloads::downloadsProgress(not_null<UserData*> bot)
+[[nodiscard]] auto Downloads::progress(not_null<UserData*> bot)
 ->rpl::producer<DownloadsProgress> {
 	read();
 
 	return _progressView[bot->id].value();
 }
 
+const std::vector<DownloadsEntry> &Downloads::list(
+		not_null<UserData*> bot,
+		bool forceCheck) {
+	read();
+
+	auto &entry = _lists[bot->id];
+	if (forceCheck) {
+		const auto was = int(entry.list.size());
+		for (auto i = begin(entry.list); i != end(entry.list);) {
+			if (i->loading || i->failed) {
+				++i;
+			} else if (auto info = QFileInfo(i->path)
+				; !info.exists() || info.size() != i->total) {
+				i = entry.list.erase(i);
+			} else {
+				++i;
+			}
+		}
+		if (int(entry.list.size()) != was) {
+			write();
+		}
+	}
+	return entry.list;
+}
+
 void Downloads::read() {
 	auto bytes = _session->local().readInlineBotsDownloads();
 	if (bytes.isEmpty()) {
@@ -239,8 +329,9 @@ void Downloads::read() {
 		list.list.reserve(count);
 		for (auto j = 0; j != count; ++j) {
 			auto entry = DownloadsEntry();
-			stream >> entry.url >> entry.path >> entry.total;
-			entry.ready = entry.total;
+			auto size = int64();
+			stream >> entry.url >> entry.path >> size;
+			entry.total = entry.ready = size;
 			entry.id = ++_autoIncrementId;
 			list.list.push_back(std::move(entry));
 		}
@@ -259,7 +350,7 @@ void Downloads::write() {
 			if (entry.total > 0 && entry.ready == entry.total) {
 				size += Serialize::stringSize(entry.url)
 					+ Serialize::stringSize(entry.path)
-					+ sizeof(quint64); // total
+					+ sizeof(quint64); // size
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h
index 33383cd7f..1d66e6c8d 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "ui/chat/attach/attach_bot_webview.h"
+
 class webFileLoader;
 
 namespace Main {
@@ -17,23 +19,13 @@ namespace Ui {
 class GenericBox;
 } // namespace Ui
 
-namespace Ui::BotWebView {
-struct DownloadsProgress;
-} // namespace Ui::BotWebView
-
 namespace InlineBots {
 
 using DownloadId = uint32;
 
 using ::Ui::BotWebView::DownloadsProgress;
-
-struct DownloadsEntry {
-	DownloadId id = 0;
-	QString url;
-	QString path;
-	uint64 ready = 0;
-	uint64 total = 0;
-};
+using ::Ui::BotWebView::DownloadsEntry;
+using ::Ui::BotWebView::DownloadsAction;
 
 class Downloads final {
 public:
@@ -47,15 +39,20 @@ public:
 	};
 	uint32 start(StartArgs &&args); // Returns download id.
 
-	void cancel(DownloadId id);
+	void action(
+		not_null<UserData*> bot,
+		DownloadId id,
+		DownloadsAction type);
 
-	[[nodiscard]] auto downloadsProgress(not_null<UserData*> bot)
-		-> rpl::producer<DownloadsProgress>;
+	[[nodiscard]] rpl::producer<DownloadsProgress> progress(
+		not_null<UserData*> bot);
+	[[nodiscard]] const std::vector<DownloadsEntry> &list(
+		not_null<UserData*> bot,
+		bool check = false);
 
 private:
 	struct List {
 		std::vector<DownloadsEntry> list;
-		bool checked = false;
 	};
 	struct Loader {
 		std::unique_ptr<webFileLoader> loader;
@@ -65,14 +62,23 @@ private:
 	void read();
 	void write();
 
+	void load(
+		PeerId botId,
+		DownloadId id,
+		DownloadsEntry &entry);
 	void progress(PeerId botId, DownloadId id);
-	void fail(PeerId botId, DownloadId id);
+	void fail(PeerId botId, DownloadId id, bool cancel = false);
 	void done(PeerId botId, DownloadId id);
 	void applyProgress(
 		PeerId botId,
 		DownloadId id,
 		int64 total,
 		int64 ready);
+	void applyProgress(
+		PeerId botId,
+		DownloadsEntry &entry,
+		int64 total,
+		int64 ready);
 
 	const not_null<Main::Session*> _session;
 
diff --git a/Telegram/SourceFiles/payments/ui/payments.style b/Telegram/SourceFiles/payments/ui/payments.style
index fd9e57bab..2369181db 100644
--- a/Telegram/SourceFiles/payments/ui/payments.style
+++ b/Telegram/SourceFiles/payments/ui/payments.style
@@ -150,3 +150,7 @@ botWebViewBottomButton: RoundButton(paymentsPanelSubmit) {
 	}
 	textTop: 11px;
 }
+botWebViewRadialStroke: 3px;
+botWebViewMenu: PopupMenu(popupMenuWithIcons) {
+	maxHeight: 360px;
+}
diff --git a/Telegram/SourceFiles/storage/file_download_web.cpp b/Telegram/SourceFiles/storage/file_download_web.cpp
index bda894d4c..1c56d8b06 100644
--- a/Telegram/SourceFiles/storage/file_download_web.cpp
+++ b/Telegram/SourceFiles/storage/file_download_web.cpp
@@ -321,7 +321,7 @@ void WebLoadManager::progress(
 			).arg(status));
 		failed(id, reply);
 	} else {
-		notify(id, reply, ready, total);
+		notify(id, reply, ready, std::max(ready, total));
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp
new file mode 100644
index 000000000..5f6fe432c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp
@@ -0,0 +1,268 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_bot_downloads.h"
+
+#include "lang/lang_keys.h"
+#include "ui/widgets/menu/menu_item_base.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/painter.h"
+#include "styles/style_chat.h"
+
+namespace Ui::BotWebView {
+namespace {
+
+class Action final : public Menu::ItemBase {
+public:
+	Action(
+		not_null<RpWidget*> parent,
+		const DownloadsEntry &entry,
+		Fn<void(DownloadsAction)> callback);
+
+	bool isEnabled() const override;
+	not_null<QAction*> action() const override { return _dummyAction; }
+	void handleKeyPress(not_null<QKeyEvent*> e) override;
+
+	void refresh(const DownloadsEntry &entry);
+
+private:
+	QPoint prepareRippleStartPosition() const override {
+		return mapFromGlobal(QCursor::pos());
+	}
+	QImage prepareRippleMask() const override {
+		return Ui::RippleAnimation::RectMask(size());
+	}
+	int contentHeight() const override { return _height; }
+
+	void prepare();
+	void paint(Painter &p);
+
+	const not_null<QAction*> _dummyAction;
+	const style::Menu &_st = st::defaultMenu;
+
+	DownloadsEntry _entry;
+	Text::String _name;
+	FlatLabel _progress;
+	IconButton _cancel;
+	int _textWidth = 0;
+	const int _height;
+};
+
+Action::Action(
+	not_null<RpWidget*> parent,
+	const DownloadsEntry &entry,
+	Fn<void(DownloadsAction)> callback)
+: ItemBase(parent, st::defaultMenu)
+, _dummyAction(new QAction(parent))
+, _progress(this, st::botDownloadProgress)
+, _cancel(this, st::botDownloadCancel)
+, _height(st::ttlItemPadding.top()
+	+ _st.itemStyle.font->height
+	+ st::ttlItemTimerFont->height
+	+ st::ttlItemPadding.bottom()) {
+	setAcceptBoth(true);
+	initResizeHook(parent->sizeValue());
+	setClickedCallback([=] {
+		if (isEnabled()) {
+			callback(DownloadsAction::Open);
+		}
+	});
+	_cancel.setClickedCallback([=] {
+		callback(DownloadsAction::Cancel);
+	});
+
+	paintRequest(
+	) | rpl::start_with_next([=] {
+		Painter p(this);
+		paint(p);
+	}, lifetime());
+
+	widthValue() | rpl::start_with_next([=](int width) {
+		_progress.moveToLeft(
+			_st.itemPadding.left(),
+			st::ttlItemPadding.top() + _st.itemStyle.font->height,
+			width);
+
+		_cancel.moveToRight(
+			_st.itemPadding.right(),
+			(_height - _cancel.height()) / 2,
+			width);
+	}, lifetime());
+
+	_progress.setClickHandlerFilter([=](const auto &...) {
+		callback(DownloadsAction::Retry);
+		return false;
+	});
+
+	enableMouseSelecting();
+	refresh(entry);
+}
+
+void Action::paint(Painter &p) {
+	const auto selected = isSelected();
+	if (selected && _st.itemBgOver->c.alpha() < 255) {
+		p.fillRect(0, 0, width(), _height, _st.itemBg);
+	}
+	p.fillRect(0, 0, width(), _height, selected ? _st.itemBgOver : _st.itemBg);
+	if (isEnabled()) {
+		paintRipple(p, 0, 0);
+	}
+
+	p.setPen(selected ? _st.itemFgOver : _st.itemFg);
+	_name.drawLeftElided(
+		p,
+		_st.itemPadding.left(),
+		st::ttlItemPadding.top(),
+		_textWidth,
+		width());
+
+	_progress.setTextColorOverride(
+		selected ? _st.itemFgShortcutOver->c : _st.itemFgShortcut->c);
+}
+
+void Action::prepare() {
+	const auto filenameWidth = _name.maxWidth();
+	const auto progressWidth = _progress.textMaxWidth();
+	const auto &padding = _st.itemPadding;
+
+	const auto goodWidth = std::max(filenameWidth, progressWidth);
+
+	// Example max width: "4000 / 4000 MB"
+	const auto countWidth = [&](const QString &text) {
+		return st::ttlItemTimerFont->width(text);
+	};
+	const auto maxProgressWidth = countWidth(tr::lng_media_save_progress(
+		tr::now,
+		lt_ready,
+		"0000",
+		lt_total,
+		"0000",
+		lt_mb,
+		"MB"));
+	const auto maxStartingWidth = countWidth(
+		tr::lng_bot_download_starting(tr::now));
+	const auto maxFailedWidth = countWidth(tr::lng_bot_download_failed(
+		tr::now,
+		lt_retry,
+		tr::lng_bot_download_retry(tr::now)));
+
+	const auto cancel = _cancel.width() + padding.right();
+	const auto paddings = padding.left() + padding.right() + cancel;
+	const auto w = std::clamp(
+		paddings + std::max({
+			goodWidth,
+			maxProgressWidth,
+			maxStartingWidth,
+			maxFailedWidth,
+		}),
+		_st.widthMin,
+		_st.widthMax);
+	_textWidth = w - paddings;
+	_progress.resizeToWidth(_textWidth);
+	setMinWidth(w);
+	update();
+}
+
+bool Action::isEnabled() const {
+	return _entry.total > 0 && _entry.ready == _entry.total;
+}
+
+void Action::handleKeyPress(not_null<QKeyEvent*> e) {
+	if (!isSelected()) {
+		return;
+	}
+	const auto key = e->key();
+	if (key == Qt::Key_Enter || key == Qt::Key_Return) {
+		setClicked(Menu::TriggeredSource::Keyboard);
+	}
+}
+
+void Action::refresh(const DownloadsEntry &entry) {
+	_entry = entry;
+	const auto filename = entry.path.split('/').last();
+	_name.setMarkedText(_st.itemStyle, { filename }, kDefaultTextOptions);
+
+	const auto progressText = (entry.total && entry.total == entry.ready)
+		? TextWithEntities{ FormatSizeText(entry.total) }
+		: entry.loading
+		? (entry.total
+			? TextWithEntities{
+				FormatProgressText(entry.ready, entry.total),
+			}
+			: tr::lng_bot_download_starting(tr::now, Text::WithEntities))
+		: tr::lng_bot_download_failed(
+			tr::now,
+			lt_retry,
+			Text::Link(tr::lng_bot_download_retry(tr::now)),
+			Text::WithEntities);
+	_progress.setMarkedText(progressText);
+
+	const auto enabled = isEnabled();
+	setCursor(enabled ? style::cur_pointer : style::cur_default);
+	_cancel.setVisible(!enabled && _entry.loading);
+	_progress.setAttribute(Qt::WA_TransparentForMouseEvents, enabled);
+
+	prepare();
+}
+
+} // namespace
+
+FnMut<void(not_null<PopupMenu*>)> FillAttachBotDownloadsSubmenu(
+		rpl::producer<std::vector<DownloadsEntry>> content,
+		Fn<void(uint32, DownloadsAction)> callback) {
+	return [callback, moved = std::move(content)](
+			not_null<PopupMenu*> menu) mutable {
+		struct Row {
+			not_null<Action*> action;
+			uint32 id = 0;
+		};
+		struct State {
+			std::vector<Row> rows;
+		};
+		const auto state = menu->lifetime().make_state<State>();
+		std::move(
+			moved
+		) | rpl::start_with_next([=](
+			const std::vector<DownloadsEntry> &entries) {
+			auto found = base::flat_set<uint32>();
+			for (const auto &entry : entries | ranges::views::reverse) {
+				const auto id = entry.id;
+				const auto path = entry.path;
+				const auto i = ranges::find(state->rows, id, &Row::id);
+				found.emplace(id);
+
+				if (i != end(state->rows)) {
+					i->action->refresh(entry);
+				} else {
+					auto action = base::make_unique_q<Action>(
+						menu,
+						entry,
+						[=](DownloadsAction type) { callback(id, type); });
+					state->rows.push_back({
+						.action = action.get(),
+						.id = id,
+						});
+					menu->addAction(std::move(action));
+				}
+			}
+			for (auto i = begin(state->rows); i != end(state->rows);) {
+				if (!found.contains(i->id)) {
+					menu->removeAction(i - begin(state->rows));
+					i = state->rows.erase(i);
+				} else {
+					++i;
+				}
+			}
+		}, menu->lifetime());
+	};
+}
+
+} // namespace Ui::BotWebView
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.h
new file mode 100644
index 000000000..4e85e5e16
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.h
@@ -0,0 +1,47 @@
+/*
+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 PopupMenu;
+} // namespace Ui
+
+namespace Ui::BotWebView {
+
+struct DownloadsProgress {
+	uint64 ready = 0;
+	uint64 total : 63 = 0;
+	uint64 loading : 1 = 0;
+
+	friend inline bool operator==(
+		const DownloadsProgress &a,
+		const DownloadsProgress &b) = default;
+};
+
+struct DownloadsEntry {
+	uint32 id = 0;
+	QString url;
+	QString path;
+	uint64 ready : 63 = 0;
+	uint64 loading : 1 = 0;
+	uint64 total : 63 = 0;
+	uint64 failed : 1 = 0;
+};
+
+enum class DownloadsAction {
+	Open,
+	Retry,
+	Cancel,
+};
+
+[[nodiscard]] auto FillAttachBotDownloadsSubmenu(
+	rpl::producer<std::vector<DownloadsEntry>> content,
+	Fn<void(uint32, DownloadsAction)> callback)
+-> FnMut<void(not_null<PopupMenu*>)>;
+
+} // namespace Ui::BotWebView
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 98e965a86..670d714bc 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -8,9 +8,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/attach/attach_bot_webview.h"
 
 #include "core/file_utilities.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/layers/box_content.h"
+#include "ui/style/style_core_palette.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/separate_panel.h"
 #include "ui/widgets/buttons.h"
@@ -28,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/debug_log.h"
 #include "base/invoke_queued.h"
 #include "base/qt_signal_producer.h"
+#include "styles/style_chat.h"
 #include "styles/style_payments.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
@@ -370,7 +373,9 @@ Panel::Panel(Args &&args)
 : _storageId(args.storageId)
 , _delegate(args.delegate)
 , _menuButtons(args.menuButtons)
-, _widget(std::make_unique<SeparatePanel>())
+, _widget(std::make_unique<SeparatePanel>(Ui::SeparatePanelArgs{
+	.menuSt = &st::botWebViewMenu,
+}))
 , _fullscreen(args.fullscreen)
 , _allowClipboardRead(args.allowClipboardRead) {
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
@@ -425,7 +430,9 @@ Panel::Panel(Args &&args)
 	setTitle(std::move(args.title));
 	_widget->setTitleBadge(std::move(args.titleBadge));
 
-	if (!showWebview(args.url, params, std::move(args.bottom))) {
+	if (showWebview(args.url, params, std::move(args.bottom))) {
+		setupDownloadsProgress(rpl::duplicate(args.downloadsProgress));
+	} else {
 		const auto available = Webview::Availability();
 		if (available.error != Webview::Available::Error::None) {
 			showWebviewError(tr::lng_bot_no_webview(tr::now), available);
@@ -441,6 +448,97 @@ Panel::~Panel() {
 	_widget = nullptr;
 }
 
+void Panel::setupDownloadsProgress(rpl::producer<DownloadsProgress> progress) {
+	Expects(_menuToggle != nullptr);
+
+	const auto widget = Ui::CreateChild<RpWidget>(_menuToggle.data());
+	widget->show();
+	widget->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	_menuToggle->sizeValue() | rpl::start_with_next([=](QSize size) {
+		widget->setGeometry(QRect(QPoint(), size));
+	}, widget->lifetime());
+
+	struct State {
+		State(QWidget *parent, Fn<float64()> progress)
+		: animation([=](crl::time now) {
+			const auto updated = animation.update(progress(), false, now);
+			if (!anim::Disabled() || updated) {
+				parent->update();
+			}
+		}) {
+		}
+
+		RadialAnimation animation;
+		Animations::Simple fade;
+		bool shown = false;
+	};
+	const auto state = widget->lifetime().make_state<State>(widget, [=] {
+		const auto total = _downloadsProgress.total;
+		return total ? (_downloadsProgress.ready / float64(total)) : 0.;
+	});
+	std::move(
+		progress
+	) | rpl::start_with_next([=](DownloadsProgress progress) {
+		const auto toggle = [&](bool shown) {
+			if (state->shown == shown) {
+				return;
+			}
+			state->shown = shown;
+			if (shown && !state->fade.animating()) {
+				return;
+			}
+			state->fade.start([=] {
+				widget->update();
+				if (!state->shown
+					&& !state->fade.animating()
+					&& (!_downloadsProgress.total
+						|| (_downloadsProgress.ready
+							== _downloadsProgress.total))) {
+					state->animation.stop();
+				}
+			}, shown ? 0. : 2., shown ? 2. : 0., st::radialDuration * 2);
+		};
+		if (!state->shown && progress.loading) {
+			if (!state->animation.animating()) {
+				state->animation.start(0.);
+			}
+			toggle(true);
+		} else if ((_downloadsProgress.total && !progress.total)
+			|| (_downloadsProgress.ready < _downloadsProgress.total
+				&& progress.ready == progress.total)) {
+			state->animation.update(1., false, crl::now());
+			toggle(false);
+		}
+		_downloadsProgress = progress;
+		_downloadsUpdated.fire({});
+	}, widget->lifetime());
+
+	widget->paintRequest() | rpl::start_with_next([=] {
+		const auto opacity = std::clamp(
+			state->fade.value(state->shown ? 2. : 0.) - 1.,
+			0.,
+			1.);
+		if (!opacity) {
+			return;
+		}
+		auto p = QPainter(widget);
+		p.setOpacity(opacity);
+		const auto palette = _widget->titleOverridePalette();
+		const auto color = palette
+			? palette->boxTitleCloseFg()
+			: st::paymentsLoading.color;
+		const auto &st = st::separatePanelMenu;
+		const auto size = st.rippleAreaSize;
+		const auto rect = QRect(st.rippleAreaPosition, QSize(size, size));
+		const auto stroke = st::botWebViewRadialStroke;
+		const auto shift = stroke * 1.5;
+		const auto inner = QRectF(rect).marginsRemoved(
+			QMarginsF{ shift, shift, shift, shift });
+		state->animation.draw(p, inner, stroke, color);
+	}, widget->lifetime());
+}
+
 void Panel::requestActivate() {
 	_widget->showAndActivate();
 	if (const auto widget = _webview ? _webview->window.widget() : nullptr) {
@@ -582,7 +680,32 @@ bool Panel::showWebview(
 	updateThemeParams(params);
 	_webview->window.navigate(url);
 	_widget->setBackAllowed(allowBack);
-	_widget->setMenuAllowed([=](const Ui::Menu::MenuCallback &callback) {
+
+	_menuToggle = _widget->setMenuAllowed([=](
+			const Ui::Menu::MenuCallback &callback) {
+		auto list = _delegate->botDownloads(true);
+		if (!list.empty()) {
+			auto value = rpl::single(
+				std::move(list)
+			) | rpl::then(_downloadsUpdated.events(
+			) | rpl::map([=] {
+				return _delegate->botDownloads();
+			}));
+			const auto action = [=](uint32 id, DownloadsAction type) {
+				_delegate->botDownloadsAction(id, type);
+			};
+			callback(Ui::Menu::MenuCallback::Args{
+				.text = tr::lng_downloads_section(tr::now),
+				.icon = &st::menuIconDownload,
+				.fillSubmenu = FillAttachBotDownloadsSubmenu(
+					std::move(value),
+					action),
+			});
+			callback({
+				.separatorSt = &st::expandedMenuSeparator,
+				.isSeparator = true,
+			});
+		}
 		if (_webview && _webview->window.widget() && _hasSettingsButton) {
 			callback(tr::lng_bot_settings(tr::now), [=] {
 				postEvent("settings_button_pressed");
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index 5b4fa16cb..7f59731b1 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 "ui/chat/attach/attach_bot_downloads.h"
 #include "ui/rect_part.h"
 #include "ui/round_rect.h"
 #include "webview/webview_common.h"
@@ -22,6 +23,7 @@ namespace Ui {
 class BoxContent;
 class RpWidget;
 class SeparatePanel;
+class IconButton;
 enum class LayerOption;
 using LayerOptions = base::flags<LayerOption>;
 } // namespace Ui
@@ -63,15 +65,6 @@ struct DownloadFileRequest {
 	Fn<void(bool)> callback;
 };
 
-struct DownloadsProgress {
-	uint64 ready = 0;
-	uint64 total = 0;
-
-	friend inline bool operator==(
-		const DownloadsProgress &a,
-		const DownloadsProgress &b) = default;
-};
-
 struct SendPreparedMessageRequest {
 	QString id = 0;
 	Fn<void(QString)> callback;
@@ -79,7 +72,12 @@ struct SendPreparedMessageRequest {
 
 class Delegate {
 public:
-	virtual Webview::ThemeParams botThemeParams() = 0;
+	[[nodiscard]] virtual Webview::ThemeParams botThemeParams() = 0;
+	[[nodiscard]] virtual auto botDownloads(bool forceCheck = false)
+		-> const std::vector<DownloadsEntry> & = 0;
+	virtual void botDownloadsAction(
+		uint32 id,
+		Ui::BotWebView::DownloadsAction type) = 0;
 	virtual bool botHandleLocalUri(QString uri, bool keepOpen) = 0;
 	virtual void botHandleInvoice(QString slug) = 0;
 	virtual void botHandleMenuButton(MenuButton button) = 0;
@@ -158,6 +156,7 @@ private:
 	void createWebviewBottom();
 	void showWebviewProgress();
 	void hideWebviewProgress();
+	void setupDownloadsProgress(rpl::producer<DownloadsProgress> progress);
 	void setTitle(rpl::producer<QString> title);
 	void sendDataMessage(const QJsonObject &args);
 	void switchInlineQueryMessage(const QJsonObject &args);
@@ -214,6 +213,7 @@ private:
 	bool _hasSettingsButton = false;
 	MenuButtons _menuButtons = {};
 	std::unique_ptr<SeparatePanel> _widget;
+	QPointer<IconButton> _menuToggle;
 	std::unique_ptr<WebviewWithLifetime> _webview;
 	std::unique_ptr<RpWidget> _webviewBottom;
 	rpl::variable<QString> _bottomText;
@@ -229,6 +229,8 @@ private:
 	rpl::lifetime _headerColorLifetime;
 	rpl::lifetime _bodyColorLifetime;
 	rpl::lifetime _bottomBarColorLifetime;
+	DownloadsProgress _downloadsProgress;
+	rpl::event_stream<> _downloadsUpdated;
 	rpl::variable<bool> _fullscreen = false;
 	bool _layerShown : 1 = false;
 	bool _webviewProgress : 1 = false;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index b7bb520bc..b3fec713b 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1183,3 +1183,21 @@ botEmojiStatusEmoji: FlatLabel(botEmojiStatusName) {
 }
 
 botDownloadLabel: boxLabel;
+botDownloadProgress: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: ttlItemTimerFont;
+	}
+}
+botDownloadCancel: IconButton {
+	width: 20px;
+	height: 20px;
+
+	icon: smallCloseIcon;
+	iconOver: smallCloseIconOver;
+	iconPosition: point(-1px, -1px);
+
+	rippleAreaPosition: point(0px, 0px);
+	rippleAreaSize: 20px;
+	ripple: defaultRippleAnimationBgOver;
+}
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index c7af0a748..716d4d6b8 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -310,6 +310,8 @@ PRIVATE
     ui/chat/attach/attach_album_preview.h
     ui/chat/attach/attach_album_thumbnail.cpp
     ui/chat/attach/attach_album_thumbnail.h
+    ui/chat/attach/attach_bot_downloads.cpp
+    ui/chat/attach/attach_bot_downloads.h
     ui/chat/attach/attach_bot_webview.cpp
     ui/chat/attach/attach_bot_webview.h
     ui/chat/attach/attach_controls.cpp
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 967ae393e..3b5ef7899 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 967ae393e82eb52174fd25e3a5a15b8029e21938
+Subproject commit 3b5ef7899e5edd544e37ecdf8b1e7e3ba0ca2dc0

From 762592daffcf69e226b31eaff7486c93c3ee9189 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Nov 2024 18:45:56 +0400
Subject: [PATCH 279/306] Allow RTMP for manage call admins.

---
 Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp | 11 +++++++++--
 .../history/view/history_view_top_bar_widget.cpp      |  6 ++----
 Telegram/SourceFiles/window/window_peer_menu.cpp      |  7 ++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
index fded07614..db94f72cb 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
@@ -9,7 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "apiwrap.h"
 #include "calls/group/calls_group_common.h"
-#include "data/data_peer.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
@@ -169,7 +171,12 @@ void StartRtmpProcess::finish(JoinInfo info) {
 void StartRtmpProcess::createBox() {
 	auto done = [=] {
 		const auto peer = _request->peer;
-		finish({ .peer = peer, .joinAs = peer, .rtmp = true });
+		const auto joinAs = (peer->isChat() && peer->asChat()->amCreator())
+			? peer
+			: (peer->isChannel() && peer->asChannel()->amCreator())
+			? peer
+			: peer->session().user();
+		finish({ .peer = peer, .joinAs = joinAs, .rtmp = true });
 	};
 	auto revoke = [=] {
 		const auto guard = base::make_weak(&_request->guard);
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index 3912e5389..93c0e1ac2 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -72,10 +72,8 @@ namespace {
 
 constexpr auto kEmojiInteractionSeenDuration = 3 * crl::time(1000);
 
-inline bool HasGroupCallMenu(const not_null<PeerData*> &peer) {
-	return !peer->groupCall()
-		&& ((peer->isChannel() && peer->asChannel()->amCreator())
-			|| (peer->isChat() && peer->asChat()->amCreator()));
+[[nodiscard]] inline bool HasGroupCallMenu(not_null<PeerData*> peer) {
+	return !peer->groupCall() && peer->canManageGroupCall();
 }
 
 QString TopBarNameText(
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 764ebba2e..5d0c2bc12 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2798,9 +2798,6 @@ bool FillVideoChatMenu(
 	const auto livestream = !peer->isMegagroup() && peer->isChannel();
 	const auto has = (peer->groupCall() != nullptr);
 	const auto manager = peer->canManageGroupCall();
-	const auto creator = peer->isChat()
-		? peer->asChat()->amCreator()
-		: peer->asChannel()->amCreator();
 	if (has) {
 		addAction(
 			tr::lng_menu_start_group_call_join(tr::now),
@@ -2812,9 +2809,9 @@ bool FillVideoChatMenu(
 				? tr::lng_menu_start_group_call_channel
 				: tr::lng_menu_start_group_call)(tr::now),
 			[=] { callback({}); },
-			creator ? &st::menuIconStartStream : &st::menuIconVideoChat);
+			&st::menuIconStartStream);
 	}
-	if (!has && creator) {
+	if (!has && manager) {
 		addAction(
 			(livestream
 				? tr::lng_menu_start_group_call_scheduled_channel

From 06b85442f8e9ea16a8cbab48e44c6128627fa8bc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Nov 2024 21:17:44 +0400
Subject: [PATCH 280/306] Fix miniapp downloads in fullscreen.

---
 .../inline_bots/inline_bot_downloads.cpp      |  8 +-
 .../ui/chat/attach/attach_bot_webview.cpp     | 82 ++++++++++---------
 .../ui/chat/attach/attach_bot_webview.h       | 23 +++---
 Telegram/lib_ui                               |  2 +-
 4 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
index cbb4ede82..d1c82d54a 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
@@ -392,6 +392,7 @@ void DownloadFileBox(not_null<Ui::GenericBox*> box, DownloadBoxArgs args) {
 	const auto done = std::move(args.done);
 	const auto name = args.name;
 	const auto session = args.session;
+	const auto chosen = std::make_shared<bool>();
 	box->addButton(tr::lng_bot_download_file_button(), [=] {
 		const auto path = FileNameForSave(
 			session,
@@ -402,14 +403,19 @@ void DownloadFileBox(not_null<Ui::GenericBox*> box, DownloadBoxArgs args) {
 			false,
 			QDir());
 		if (!path.isEmpty()) {
+			*chosen = true;
 			box->closeBox();
 			done(path);
 		}
 	});
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
-		done(QString());
 	});
+	box->boxClosing() | rpl::start_with_next([=] {
+		if (!*chosen) {
+			done(QString());
+		}
+	}, box->lifetime());
 }
 
 } // namespace InlineBots
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 670d714bc..6fa4bb997 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "core/file_utilities.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/chat/attach/attach_bot_downloads.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/layers/box_content.h"
@@ -430,9 +431,7 @@ Panel::Panel(Args &&args)
 	setTitle(std::move(args.title));
 	_widget->setTitleBadge(std::move(args.titleBadge));
 
-	if (showWebview(args.url, params, std::move(args.bottom))) {
-		setupDownloadsProgress(rpl::duplicate(args.downloadsProgress));
-	} else {
+	if (!showWebview(std::move(args), params)) {
 		const auto available = Webview::Availability();
 		if (available.error != Webview::Available::Error::None) {
 			showWebviewError(tr::lng_bot_no_webview(tr::now), available);
@@ -448,35 +447,38 @@ Panel::~Panel() {
 	_widget = nullptr;
 }
 
-void Panel::setupDownloadsProgress(rpl::producer<DownloadsProgress> progress) {
-	Expects(_menuToggle != nullptr);
-
-	const auto widget = Ui::CreateChild<RpWidget>(_menuToggle.data());
+void Panel::setupDownloadsProgress(
+		not_null<RpWidget*> button,
+		rpl::producer<DownloadsProgress> progress,
+		bool fullscreen) {
+	const auto widget = Ui::CreateChild<RpWidget>(button.get());
 	widget->show();
 	widget->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	_menuToggle->sizeValue() | rpl::start_with_next([=](QSize size) {
+	button->sizeValue() | rpl::start_with_next([=](QSize size) {
 		widget->setGeometry(QRect(QPoint(), size));
 	}, widget->lifetime());
 
 	struct State {
-		State(QWidget *parent, Fn<float64()> progress)
+		State(QWidget *parent)
 		: animation([=](crl::time now) {
-			const auto updated = animation.update(progress(), false, now);
+			const auto total = progress.total;
+			const auto current = total
+				? (progress.ready / float64(total))
+				: 0.;
+			const auto updated = animation.update(current, false, now);
 			if (!anim::Disabled() || updated) {
 				parent->update();
 			}
 		}) {
 		}
 
+		DownloadsProgress progress;
 		RadialAnimation animation;
 		Animations::Simple fade;
 		bool shown = false;
 	};
-	const auto state = widget->lifetime().make_state<State>(widget, [=] {
-		const auto total = _downloadsProgress.total;
-		return total ? (_downloadsProgress.ready / float64(total)) : 0.;
-	});
+	const auto state = widget->lifetime().make_state<State>(widget);
 	std::move(
 		progress
 	) | rpl::start_with_next([=](DownloadsProgress progress) {
@@ -492,9 +494,9 @@ void Panel::setupDownloadsProgress(rpl::producer<DownloadsProgress> progress) {
 				widget->update();
 				if (!state->shown
 					&& !state->fade.animating()
-					&& (!_downloadsProgress.total
-						|| (_downloadsProgress.ready
-							== _downloadsProgress.total))) {
+					&& (!state->progress.total
+						|| (state->progress.ready
+							== state->progress.total))) {
 					state->animation.stop();
 				}
 			}, shown ? 0. : 2., shown ? 2. : 0., st::radialDuration * 2);
@@ -504,14 +506,13 @@ void Panel::setupDownloadsProgress(rpl::producer<DownloadsProgress> progress) {
 				state->animation.start(0.);
 			}
 			toggle(true);
-		} else if ((_downloadsProgress.total && !progress.total)
-			|| (_downloadsProgress.ready < _downloadsProgress.total
+		} else if ((state->progress.total && !progress.total)
+			|| (state->progress.ready < state->progress.total
 				&& progress.ready == progress.total)) {
 			state->animation.update(1., false, crl::now());
 			toggle(false);
 		}
-		_downloadsProgress = progress;
-		_downloadsUpdated.fire({});
+		state->progress = progress;
 	}, widget->lifetime());
 
 	widget->paintRequest() | rpl::start_with_next([=] {
@@ -525,10 +526,14 @@ void Panel::setupDownloadsProgress(rpl::producer<DownloadsProgress> progress) {
 		auto p = QPainter(widget);
 		p.setOpacity(opacity);
 		const auto palette = _widget->titleOverridePalette();
-		const auto color = palette
+		const auto color = fullscreen
+			? st::radialFg
+			: palette
 			? palette->boxTitleCloseFg()
 			: st::paymentsLoading.color;
-		const auto &st = st::separatePanelMenu;
+		const auto &st = fullscreen
+			? st::fullScreenPanelMenu
+			: st::separatePanelMenu;
 		const auto size = st.rippleAreaSize;
 		const auto rect = QRect(st.rippleAreaPosition, QSize(size, size));
 		const auto stroke = st::botWebViewRadialStroke;
@@ -666,11 +671,8 @@ void Panel::hideWebviewProgress() {
 	toggleProgress(false);
 }
 
-bool Panel::showWebview(
-		const QString &url,
-		const Webview::ThemeParams &params,
-		rpl::producer<QString> bottomText) {
-	_bottomText = std::move(bottomText);
+bool Panel::showWebview(Args &&args, const Webview::ThemeParams &params) {
+	_bottomText = std::move(args.bottom);
 	if (!_webview && !createWebview(params)) {
 		return false;
 	}
@@ -678,10 +680,15 @@ bool Panel::showWebview(
 	showWebviewProgress();
 	_widget->hideLayer(anim::type::instant);
 	updateThemeParams(params);
+	const auto url = args.url;
 	_webview->window.navigate(url);
 	_widget->setBackAllowed(allowBack);
 
-	_menuToggle = _widget->setMenuAllowed([=](
+	rpl::duplicate(args.downloadsProgress) | rpl::start_with_next([=] {
+		_downloadsUpdated.fire({});
+	}, lifetime());
+
+	_widget->setMenuAllowed([=](
 			const Ui::Menu::MenuCallback &callback) {
 		auto list = _delegate->botDownloads(true);
 		if (!list.empty()) {
@@ -754,16 +761,15 @@ bool Panel::showWebview(
 				.isAttention = true,
 			});
 		}
-		if (_widget->isFullScreen()) {
-			callback(u"Close Full Screen"_q, [=] {
-				_fullscreen = false;
-			}, &st::menuIconPlayerWindowed);
-		} else {
-			callback(u"Show Full Screen"_q, [=] {
-				_fullscreen = true;
-			}, &st::menuIconPlayerFullScreen);
-		}
+	}, [=, progress = std::move(args.downloadsProgress)](
+			not_null<RpWidget*> button,
+			bool fullscreen) {
+		setupDownloadsProgress(
+			button,
+			rpl::duplicate(progress),
+			fullscreen);
 	});
+
 	return true;
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index 7f59731b1..e5a822474 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/object_ptr.h"
 #include "base/weak_ptr.h"
 #include "base/flags.h"
-#include "ui/chat/attach/attach_bot_downloads.h"
 #include "ui/rect_part.h"
 #include "ui/round_rect.h"
 #include "webview/webview_common.h"
@@ -34,6 +33,10 @@ struct Available;
 
 namespace Ui::BotWebView {
 
+struct DownloadsProgress;
+struct DownloadsEntry;
+enum class DownloadsAction;
+
 [[nodiscard]] TextWithEntities ErrorText(const Webview::Available &info);
 
 enum class MenuButton {
@@ -75,9 +78,7 @@ public:
 	[[nodiscard]] virtual Webview::ThemeParams botThemeParams() = 0;
 	[[nodiscard]] virtual auto botDownloads(bool forceCheck = false)
 		-> const std::vector<DownloadsEntry> & = 0;
-	virtual void botDownloadsAction(
-		uint32 id,
-		Ui::BotWebView::DownloadsAction type) = 0;
+	virtual void botDownloadsAction(uint32 id, DownloadsAction type) = 0;
 	virtual bool botHandleLocalUri(QString uri, bool keepOpen) = 0;
 	virtual void botHandleInvoice(QString slug) = 0;
 	virtual void botHandleMenuButton(MenuButton button) = 0;
@@ -122,11 +123,6 @@ public:
 	void requestActivate();
 	void toggleProgress(bool shown);
 
-	bool showWebview(
-		const QString &url,
-		const Webview::ThemeParams &params,
-		rpl::producer<QString> bottomText);
-
 	void showBox(object_ptr<BoxContent> box);
 	void showBox(
 		object_ptr<BoxContent> box,
@@ -152,11 +148,16 @@ private:
 	struct Progress;
 	struct WebviewWithLifetime;
 
+	bool showWebview(Args &&args, const Webview::ThemeParams &params);
+
 	bool createWebview(const Webview::ThemeParams &params);
 	void createWebviewBottom();
 	void showWebviewProgress();
 	void hideWebviewProgress();
-	void setupDownloadsProgress(rpl::producer<DownloadsProgress> progress);
+	void setupDownloadsProgress(
+		not_null<RpWidget*> button,
+		rpl::producer<DownloadsProgress> progress,
+		bool fullscreen);
 	void setTitle(rpl::producer<QString> title);
 	void sendDataMessage(const QJsonObject &args);
 	void switchInlineQueryMessage(const QJsonObject &args);
@@ -213,7 +214,6 @@ private:
 	bool _hasSettingsButton = false;
 	MenuButtons _menuButtons = {};
 	std::unique_ptr<SeparatePanel> _widget;
-	QPointer<IconButton> _menuToggle;
 	std::unique_ptr<WebviewWithLifetime> _webview;
 	std::unique_ptr<RpWidget> _webviewBottom;
 	rpl::variable<QString> _bottomText;
@@ -229,7 +229,6 @@ private:
 	rpl::lifetime _headerColorLifetime;
 	rpl::lifetime _bodyColorLifetime;
 	rpl::lifetime _bottomBarColorLifetime;
-	DownloadsProgress _downloadsProgress;
 	rpl::event_stream<> _downloadsUpdated;
 	rpl::variable<bool> _fullscreen = false;
 	bool _layerShown : 1 = false;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 3b5ef7899..46c18e2c7 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 3b5ef7899e5edd544e37ecdf8b1e7e3ba0ca2dc0
+Subproject commit 46c18e2c7e730c6304e8d813be4d5abc6fb364ad

From d0911b6a450955b25c8324c81c6e9f32b697addc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 00:42:02 +0400
Subject: [PATCH 281/306] Send to buy premium from miniapps emoji status.

---
 .../SourceFiles/boxes/premium_preview_box.cpp |  2 +-
 .../inline_bots/bot_attach_web_view.cpp       | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index f163be612..89e0edfed 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -77,7 +77,7 @@ bool operator==(const Descriptor &a, const Descriptor &b) {
 struct Preload {
 	Descriptor descriptor;
 	std::shared_ptr<Data::DocumentMedia> media;
-	std::weak_ptr<ChatHelpers::Show> show;
+	std::weak_ptr<Main::SessionShow> show;
 };
 
 [[nodiscard]] std::vector<Preload> &Preloads() {
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 90a40dbff..e54976e4e 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
 #include "boxes/peer_list_controllers.h"
+#include "boxes/premium_preview_box.h"
 #include "boxes/share_box.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "chat_helpers/tabbed_panel.h"
@@ -514,6 +515,20 @@ std::unique_ptr<Ui::RpWidget> MakeEmojiSetStatusPreview(
 	return result;
 }
 
+bool CheckEmojiStatusPremium(not_null<UserData*> bot) {
+	if (bot->session().premium()) {
+		return true;
+	}
+	const auto window = ChatHelpers::ResolveWindowDefault()(
+		&bot->session(),
+		ChatHelpers::WindowUsage::PremiumPromo);
+	if (window) {
+		ShowPremiumPreviewBox(window, PremiumFeature::EmojiStatus);
+		window->window().activate();
+	}
+	return false;
+}
+
 void ConfirmEmojiStatusAccessBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<UserData*> bot,
@@ -554,6 +569,9 @@ void ConfirmEmojiStatusAccessBox(
 		st::botEmojiStatusText));
 
 	box->addButton(tr::lng_bot_emoji_status_access_allow(), [=] {
+		if (!CheckEmojiStatusPremium(bot)) {
+			return;
+		}
 		*set = true;
 		box->closeBox();
 		done(true);
@@ -610,6 +628,9 @@ void ConfirmEmojiStatusBox(
 		object_ptr<Ui::RpWidget>::fromRaw(ownedSet.release()));
 
 	box->addButton(tr::lng_bot_emoji_status_confirm(), [=] {
+		if (!CheckEmojiStatusPremium(bot)) {
+			return;
+		}
 		document->owner().emojiStatuses().set(
 			document->id,
 			duration ? (base::unixtime::now() + duration) : 0);

From 3cfbd6a93b747fdbfe0240f371122cf4eeff194e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 12:14:49 +0400
Subject: [PATCH 282/306] Support non-convertible star gifts from bots.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/api/api_credits.cpp      |  3 +-
 Telegram/SourceFiles/api/api_premium.cpp      |  4 +-
 Telegram/SourceFiles/api/api_premium.h        |  4 +-
 .../SourceFiles/boxes/gift_premium_box.cpp    | 14 +++++--
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  2 +-
 Telegram/SourceFiles/data/data_credits.h      | 25 +++++++------
 Telegram/SourceFiles/data/data_media_types.h  |  2 +-
 Telegram/SourceFiles/history/history_item.cpp |  2 +-
 .../view/media/history_view_premium_gift.cpp  |  4 +-
 .../info_statistics_list_controllers.cpp      |  6 +--
 .../settings/settings_credits_graphics.cpp    | 37 +++++++++++++------
 .../ui/effects/credits_graphics.cpp           |  2 +-
 13 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 905db2f92..2c124769b 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1879,6 +1879,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_gift_got_stars_text#one" = "Display this gift on your page or convert it to **{count}** Star.";
 "lng_action_gift_got_stars_text#other" = "Display this gift on your page or convert it to **{count}** Stars.";
 "lng_action_gift_got_gift_text" = "You can keep this gift on your page.";
+"lng_action_gift_can_remove_text" = "You can remove this gift from your page.";
 "lng_action_gift_sent_subtitle" = "Gift for {user}";
 "lng_action_gift_sent_text#one" = "{user} can display this gift on their page or convert it to {count} Star.";
 "lng_action_gift_sent_text#other" = "{user} can display this gift on their page or convert it to {count} Stars.";
diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 133a9326b..80e995219 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -117,11 +117,12 @@ constexpr auto kTransactionsLimit = 100;
 			? base::unixtime::parse(tl.data().vtransaction_date()->v)
 			: QDateTime(),
 		.successLink = qs(tl.data().vtransaction_url().value_or_empty()),
-		.convertStars = int(stargift
+		.starsConverted = int(stargift
 			? stargift->data().vconvert_stars().v
 			: 0),
 		.floodSkip = int(tl.data().vfloodskip_number().value_or(0)),
 		.converted = stargift && incoming,
+		.stargift = stargift.has_value(),
 		.reaction = tl.data().is_reaction(),
 		.refunded = tl.data().is_refund(),
 		.pending = tl.data().is_pending(),
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 4328f04ce..91824922e 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -772,7 +772,7 @@ std::optional<StarGift> FromTL(
 	return StarGift{
 		.id = uint64(data.vid().v),
 		.stars = int64(data.vstars().v),
-		.convertStars = int64(data.vconvert_stars().v),
+		.starsConverted = int64(data.vconvert_stars().v),
 		.document = document,
 		.limitedLeft = remaining.value_or_empty(),
 		.limitedCount = total.value_or_empty(),
@@ -800,7 +800,7 @@ std::optional<UserStarGift> FromTL(
 					data.vmessage()->data().ventities().v),
 			}
 			: TextWithEntities()),
-		.convertStars = int64(data.vconvert_stars().value_or_empty()),
+		.starsConverted = int64(data.vconvert_stars().value_or_empty()),
 		.fromId = (data.vfrom_id()
 			? peerFromUser(data.vfrom_id()->v)
 			: PeerId()),
diff --git a/Telegram/SourceFiles/api/api_premium.h b/Telegram/SourceFiles/api/api_premium.h
index f0567cbe0..ef08eb8fb 100644
--- a/Telegram/SourceFiles/api/api_premium.h
+++ b/Telegram/SourceFiles/api/api_premium.h
@@ -76,7 +76,7 @@ struct GiftOptionData {
 struct StarGift {
 	uint64 id = 0;
 	int64 stars = 0;
-	int64 convertStars = 0;
+	int64 starsConverted = 0;
 	not_null<DocumentData*> document;
 	int limitedLeft = 0;
 	int limitedCount = 0;
@@ -91,7 +91,7 @@ struct StarGift {
 struct UserStarGift {
 	StarGift info;
 	TextWithEntities message;
-	int64 convertStars = 0;
+	int64 starsConverted = 0;
 	PeerId fromId = 0;
 	MsgId messageId = 0;
 	TimeId date = 0;
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 915e2c48b..a3d385c72 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -266,7 +266,7 @@ object_ptr<Ui::RpWidget> MakeStarGiftStarsValue(
 			raw,
 			tr::lng_gift_sell_small(
 				lt_count_decimal,
-				rpl::single(entry.convertStars * 1.)),
+				rpl::single(entry.starsConverted * 1.)),
 			st::starGiftSmallButton)
 		: nullptr;
 	if (convert) {
@@ -1044,7 +1044,8 @@ void AddStarGiftTable(
 	const auto peerId = PeerId(entry.barePeerId);
 	const auto session = &controller->session();
 	if (peerId) {
-		const auto withSendButton = entry.in;
+		const auto user = session->data().peer(peerId)->asUser();
+		const auto withSendButton = entry.in && user && !user->isBot();
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_peer_in(),
@@ -1144,12 +1145,17 @@ void AddCreditsHistoryEntryTable(
 			st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
 	const auto peerId = PeerId(entry.barePeerId);
+	const auto actorId = PeerId(entry.bareActorId);
 	const auto session = &controller->session();
-	if (peerId) {
+	if (actorId || peerId) {
 		auto text = entry.in
 			? tr::lng_credits_box_history_entry_peer_in()
 			: tr::lng_credits_box_history_entry_peer();
-		AddTableRow(table, std::move(text), controller, peerId);
+		AddTableRow(
+			table,
+			std::move(text),
+			controller,
+			actorId ? actorId : peerId);
 	}
 	if (const auto msgId = MsgId(peerId ? entry.bareMsgId : 0)) {
 		const auto peer = session->data().peer(peerId);
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 6c8203934..70fe207ab 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -216,7 +216,7 @@ auto GenerateGiftMedia(
 			return tr::lng_action_gift_got_stars_text(
 				tr::now,
 				lt_count,
-				gift.info.convertStars,
+				gift.info.starsConverted,
 				Ui::Text::RichLangValue);
 		});
 		auto description = data.text.empty()
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 28817376c..fe77aedc5 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -69,19 +69,20 @@ struct CreditsHistoryEntry final {
 	QString successLink;
 	int limitedCount = 0;
 	int limitedLeft = 0;
-	int convertStars = 0;
+	int starsConverted = 0;
 	int floodSkip = 0;
-	bool converted = false;
-	bool anonymous = false;
-	bool savedToProfile = false;
-	bool fromGiftsList = false;
-	bool soldOutInfo = false;
-	bool reaction = false;
-	bool refunded = false;
-	bool pending = false;
-	bool failed = false;
-	bool in = false;
-	bool gift = false;
+	bool converted : 1 = false;
+	bool anonymous : 1 = false;
+	bool stargift : 1 = false;
+	bool savedToProfile : 1 = false;
+	bool fromGiftsList : 1 = false;
+	bool soldOutInfo : 1 = false;
+	bool reaction : 1 = false;
+	bool refunded : 1 = false;
+	bool pending : 1 = false;
+	bool failed : 1 = false;
+	bool in : 1 = false;
+	bool gift : 1 = false;
 };
 
 struct CreditsStatusSlice final {
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index 86dd6d594..57e684ee9 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -139,7 +139,7 @@ struct GiftCode {
 	TextWithEntities message;
 	ChannelData *channel = nullptr;
 	MsgId giveawayMsgId = 0;
-	int convertStars = 0;
+	int starsConverted = 0;
 	int limitedCount = 0;
 	int limitedLeft = 0;
 	int count = 0;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 08b3187dc..c8f21a423 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -5530,7 +5530,7 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 						data.vmessage()->data().ventities().v),
 				}
 				: TextWithEntities()),
-			.convertStars = int(data.vconvert_stars().value_or_empty()),
+			.starsConverted = int(data.vconvert_stars().value_or_empty()),
 			.limitedCount = gift.vavailability_total().value_or_empty(),
 			.limitedLeft = gift.vavailability_remains().value_or_empty(),
 			.count = int(gift.vstars().v),
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 12e9f1ffc..0a9aea114 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -80,7 +80,7 @@ TextWithEntities PremiumGift::subtitle() {
 			? tr::lng_action_gift_sent_text(
 				tr::now,
 				lt_count,
-				_data.convertStars,
+				_data.starsConverted,
 				lt_user,
 				Ui::Text::Bold(_parent->history()->peer->shortName()),
 				Ui::Text::RichLangValue)
@@ -89,7 +89,7 @@ TextWithEntities PremiumGift::subtitle() {
 				: tr::lng_action_gift_got_stars_text)(
 					tr::now,
 					lt_count,
-					_data.convertStars,
+					_data.starsConverted,
 					Ui::Text::RichLangValue);
 	}
 	const auto isCreditsPrize = creditsPrize();
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index a14d9141d..abbd690c7 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -822,9 +822,7 @@ void CreditsRow::init() {
 	const auto name = !isSpecial
 		? PeerListRow::generateName()
 		: Ui::GenerateEntryName(_entry).text;
-	_name = (_entry.reaction
-		|| _entry.bareGiveawayMsgId
-		|| _entry.convertStars)
+	_name = (_entry.reaction || _entry.stargift || _entry.bareGiveawayMsgId)
 		? Ui::GenerateEntryName(_entry).text
 		: _entry.title.isEmpty()
 		? name
@@ -876,7 +874,7 @@ void CreditsRow::init() {
 			_context);
 	}
 	if (!_paintUserpicCallback) {
-		_paintUserpicCallback = _entry.convertStars
+		_paintUserpicCallback = _entry.stargift
 			? Ui::GenerateGiftStickerUserpicCallback(
 				_context.session,
 				_entry.bareGiftStickerId,
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 32804af35..fc1b1d8e8 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -797,7 +797,7 @@ void ReceiptCreditsBox(
 		const Data::SubscriptionEntry &s) {
 	const auto item = controller->session().data().message(
 		PeerId(e.barePeerId), MsgId(e.bareMsgId));
-	const auto isStarGift = (e.convertStars > 0) || e.soldOutInfo;
+	const auto isStarGift = e.stargift || e.soldOutInfo;
 	const auto creditsHistoryStarGift = isStarGift && !e.id.isEmpty();
 	const auto sentStarGift = creditsHistoryStarGift && !e.in;
 	const auto convertedStarGift = creditsHistoryStarGift && e.converted;
@@ -811,9 +811,13 @@ void ReceiptCreditsBox(
 		+ controller->session().appConfig().stargiftConvertPeriodMax();
 	const auto timeLeft = int64(convertLast) - int64(base::unixtime::now());
 	const auto timeExceeded = (timeLeft <= 0);
-	const auto forConvert = gotStarGift && !e.converted && starGiftSender;
+	const auto forConvert = gotStarGift
+		&& e.starsConverted
+		&& !e.converted
+		&& starGiftSender;
 	const auto canConvert = forConvert && !timeExceeded;
 	const auto couldConvert = forConvert && timeExceeded;
+	const auto nonConvertible = (gotStarGift && !e.starsConverted);
 
 	box->setStyle(st::giveawayGiftCodeBox);
 	box->setNoContentMargin(true);
@@ -1108,15 +1112,17 @@ void ReceiptCreditsBox(
 				box,
 				object_ptr<Ui::FlatLabel>(
 					box,
-					(couldConvert
-						? tr::lng_action_gift_got_gift_text(
-							Ui::Text::WithEntities)
+					((couldConvert || nonConvertible)
+						? (e.savedToProfile
+							? tr::lng_action_gift_can_remove_text
+							: tr::lng_action_gift_got_gift_text)(
+								Ui::Text::WithEntities)
 						: rpl::combine(
 							(canConvert
 								? tr::lng_action_gift_got_stars_text
 								: tr::lng_gift_got_stars)(
 									lt_count,
-									rpl::single(e.convertStars * 1.),
+									rpl::single(e.starsConverted * 1.),
 									Ui::Text::RichLangValue),
 							tr::lng_paid_about_link()
 						) | rpl::map([](
@@ -1180,7 +1186,7 @@ void ReceiptCreditsBox(
 
 	if (isStarGift && e.id.isEmpty()) {
 		const auto convert = [=, weak = Ui::MakeWeak(box)] {
-			const auto stars = e.convertStars;
+			const auto stars = e.starsConverted;
 			const auto days = canConvert ? ((timeLeft + 86399) / 86400) : 0;
 			const auto name = starGiftSender->shortName();
 			ConfirmConvertStarGift(box->uiShow(), name, stars, days, [=] {
@@ -1319,13 +1325,13 @@ void ReceiptCreditsBox(
 			? tr::lng_credits_subscription_off_button()
 			: toCancel
 			? tr::lng_credits_subscription_on_button()
-			: (canConvert || couldConvert)
+			: (canConvert || couldConvert || nonConvertible)
 			? (e.savedToProfile
 				? tr::lng_gift_display_on_page_hide()
 				: tr::lng_gift_display_on_page())
 			: tr::lng_box_ok()));
 	const auto send = [=, weak = Ui::MakeWeak(box)] {
-		if (canConvert || couldConvert) {
+		if (canConvert || couldConvert || nonConvertible) {
 			const auto save = !e.savedToProfile;
 			const auto window = weakWindow.get();
 			const auto showSection = !e.fromGiftsList;
@@ -1399,7 +1405,12 @@ void ReceiptCreditsBox(
 			return;
 		}
 		state->confirmButtonBusy = true;
-		if ((toRenew || toCancel || canConvert || couldConvert) && peer) {
+		if (peer
+			&& (toRenew
+				|| toCancel
+				|| canConvert
+				|| couldConvert
+				|| nonConvertible)) {
 			send();
 		} else {
 			box->closeBox();
@@ -1491,9 +1502,10 @@ void UserStarGiftBox(
 			.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
 			.limitedCount = data.info.limitedCount,
 			.limitedLeft = data.info.limitedLeft,
-			.convertStars = int(data.info.convertStars),
+			.starsConverted = int(data.info.starsConverted),
 			.converted = false,
 			.anonymous = data.anonymous,
+			.stargift = true,
 			.savedToProfile = !data.hidden,
 			.fromGiftsList = true,
 			.in = data.mine,
@@ -1521,9 +1533,10 @@ void StarGiftViewBox(
 			.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
 			.limitedCount = data.limitedCount,
 			.limitedLeft = data.limitedLeft,
-			.convertStars = data.convertStars,
+			.starsConverted = data.starsConverted,
 			.converted = data.converted,
 			.anonymous = data.anonymous,
+			.stargift = true,
 			.savedToProfile = data.saved,
 			.in = true,
 			.gift = true,
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
index 97b6a744c..76d899c76 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -553,7 +553,7 @@ TextWithEntities GenerateEntryName(const Data::CreditsHistoryEntry &entry) {
 		? tr::lng_credits_box_history_entry_giveaway_name
 		: entry.converted
 		? tr::lng_credits_box_history_entry_gift_converted
-		: entry.convertStars
+		: entry.starsConverted
 		? tr::lng_credits_box_history_entry_gift_sent
 		: entry.gift
 		? tr::lng_credits_box_history_entry_gift_name

From 572c074c4245d656edbdde8b441d0c0691a29e7c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 15:34:23 +0400
Subject: [PATCH 283/306] Add gifts-to-profile privacy.

---
 Telegram/Resources/langs/lang.strings         |  14 +
 Telegram/SourceFiles/api/api_user_privacy.cpp |  13 +
 Telegram/SourceFiles/api/api_user_privacy.h   |   2 +
 .../SourceFiles/boxes/edit_privacy_box.cpp    | 244 ++++++++++++------
 Telegram/SourceFiles/boxes/edit_privacy_box.h |   4 +
 Telegram/SourceFiles/mtproto/scheme/api.tl    |   6 +
 .../settings/settings_privacy_controllers.cpp | 131 +++++++---
 .../settings/settings_privacy_controllers.h   |  20 +-
 .../settings/settings_privacy_security.cpp    |  19 +-
 9 files changed, 346 insertions(+), 107 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2c124769b..14cc25536 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -682,6 +682,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_gifts_privacy" = "Gifts";
 "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";
@@ -1162,19 +1163,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_blocked_list_subtitle#other" = "{count} blocked users";
 
 "lng_edit_privacy_everyone" = "Everybody";
+"lng_edit_privacy_no_miniapps" = "Not Mini Apps";
 "lng_edit_privacy_contacts" = "My contacts";
 "lng_edit_privacy_close_friends" = "Close friends";
 "lng_edit_privacy_contacts_and_premium" = "Contacts & Premium";
+"lng_edit_privacy_contacts_and_miniapps" = "Contacts & Mini Apps";
 "lng_edit_privacy_nobody" = "Nobody";
 "lng_edit_privacy_premium" = "Premium users";
+"lng_edit_privacy_miniapps" = "Mini Apps";
 "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_miniapps_status" = "web mini apps that you use";
 
 "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_miniapps_and" = "Mini Apps & {users}";
 "lng_edit_privacy_exceptions_add" = "Add users";
 
 "lng_edit_privacy_phone_number_title" = "Phone number privacy";
@@ -1228,6 +1234,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "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_gifts_title" = "Gifts";
+"lng_edit_privacy_gifts_header" = "Who can display gifts on my profile";
+"lng_edit_privacy_gifts_always_empty" = "Always allow";
+"lng_edit_privacy_gifts_never_empty" = "Never allow";
+"lng_edit_privacy_gifts_exceptions" = "Choose whether gifts from specific senders need your approval before they're visible to others on your profile.";
+"lng_edit_privacy_gifts_always_title" = "Always allow";
+"lng_edit_privacy_gifts_never_title" = "Never allow";
+
 "lng_edit_privacy_calls_title" = "Calls";
 "lng_edit_privacy_calls_header" = "Who can call me";
 "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 d0c17fa6b..78f863bed 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -69,6 +69,9 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 		if (rule.always.premiums && (rule.option != Option::Everyone)) {
 			result.push_back(MTP_inputPrivacyValueAllowPremium());
 		}
+		if (rule.always.miniapps && (rule.option != Option::Everyone)) {
+			result.push_back(MTP_inputPrivacyValueAllowBots());
+		}
 	}
 	if (!rule.ignoreNever) {
 		const auto users = collectInputUsers(rule.never);
@@ -83,6 +86,9 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 				MTP_inputPrivacyValueDisallowChatParticipants(
 					MTP_vector<MTPlong>(chats)));
 		}
+		if (rule.never.miniapps && (rule.option != Option::Nobody)) {
+			result.push_back(MTP_inputPrivacyValueDisallowBots());
+		}
 	}
 	result.push_back([&] {
 		switch (rule.option) {
@@ -124,6 +130,10 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 			setOption(Option::CloseFriends);
 		}, [&](const MTPDprivacyValueAllowPremium &) {
 			result.always.premiums = true;
+		}, [&](const MTPDprivacyValueAllowBots &) {
+			result.always.miniapps = true;
+		}, [&](const MTPDprivacyValueDisallowBots &) {
+			result.never.miniapps = true;
 		}, [&](const MTPDprivacyValueAllowUsers &data) {
 			const auto &users = data.vusers().v;
 			always.reserve(always.size() + users.size());
@@ -199,6 +209,7 @@ MTPInputPrivacyKey KeyToTL(UserPrivacy::Key key) {
 	case Key::Voices: return MTP_inputPrivacyKeyVoiceMessages();
 	case Key::About: return MTP_inputPrivacyKeyAbout();
 	case Key::Birthday: return MTP_inputPrivacyKeyBirthday();
+	case Key::GiftsAutoSave: return MTP_inputPrivacyKeyStarGiftsAutoSave();
 	}
 	Unexpected("Key in Api::UserPrivacy::KetToTL.");
 }
@@ -228,6 +239,8 @@ std::optional<UserPrivacy::Key> TLToKey(mtpTypeId type) {
 	case mtpc_inputPrivacyKeyAbout: return Key::About;
 	case mtpc_privacyKeyBirthday:
 	case mtpc_inputPrivacyKeyBirthday: return Key::Birthday;
+	case mtpc_privacyKeyStarGiftsAutoSave:
+	case mtpc_inputPrivacyKeyStarGiftsAutoSave: return Key::GiftsAutoSave;
 	}
 	return std::nullopt;
 }
diff --git a/Telegram/SourceFiles/api/api_user_privacy.h b/Telegram/SourceFiles/api/api_user_privacy.h
index 471f41f48..a1f66189f 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.h
+++ b/Telegram/SourceFiles/api/api_user_privacy.h
@@ -31,6 +31,7 @@ public:
 		Voices,
 		About,
 		Birthday,
+		GiftsAutoSave,
 	};
 	enum class Option {
 		Everyone,
@@ -41,6 +42,7 @@ public:
 	struct Exceptions {
 		std::vector<not_null<PeerData*>> peers;
 		bool premiums = false;
+		bool miniapps = false;
 	};
 	struct Rule {
 		Option option = Option::Everyone;
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index c9a9055e1..d90059cb9 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -36,13 +36,64 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_settings.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_window.h"
 
 namespace {
 
 constexpr auto kPremiumsRowId = PeerId(FakeChatId(BareId(1))).value;
+constexpr auto kMiniAppsRowId = PeerId(FakeChatId(BareId(2))).value;
 
 using Exceptions = Api::UserPrivacy::Exceptions;
 
+enum class SpecialRowType {
+	Premiums,
+	MiniApps,
+};
+
+[[nodiscard]] PaintRoundImageCallback GeneratePremiumsUserpicCallback(
+		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, QRect(x, y, size, size));
+	};
+}
+
+[[nodiscard]] PaintRoundImageCallback GenerateMiniAppsUserpicCallback(
+		bool forceRound) {
+	return [=](QPainter &p, int x, int y, int outerWidth, int size) {
+		const auto &color1 = st::historyPeer6UserpicBg;
+		const auto &color2 = st::historyPeer6UserpicBg2;
+
+		const auto rect = style::rtlrect(x, y, size, size, outerWidth);
+		auto hq = PainterHighQualityEnabler(p);
+		auto gradient = QLinearGradient(x, y, x, y + size);
+		gradient.setStops({ { 0., color1->c }, { 1., color2->c } });
+
+		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::windowFilterTypeBots.paintInCenter(p, QRect(x, y, size, size));
+	};
+}
+
 void CreateRadiobuttonLock(
 		not_null<Ui::RpWidget*> widget,
 		const style::Checkbox &st) {
@@ -102,7 +153,7 @@ public:
 		not_null<Main::Session*> session,
 		rpl::producer<QString> title,
 		const Exceptions &selected,
-		bool allowChoosePremiums);
+		std::optional<SpecialRowType> allowChooseSpecial);
 
 	Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
@@ -110,18 +161,20 @@ public:
 	bool handleDeselectForeignRow(PeerListRowId itemId) override;
 
 	[[nodiscard]] bool premiumsSelected() const;
+	[[nodiscard]] bool miniAppsSelected() const;
 
 protected:
 	void prepareViewHook() override;
 	std::unique_ptr<Row> createRow(not_null<History*> history) override;
 
 private:
-	[[nodiscard]] object_ptr<Ui::RpWidget> preparePremiumsRowList();
+	[[nodiscard]] object_ptr<Ui::RpWidget> prepareSpecialRowList(
+		SpecialRowType type);
 
 	const not_null<Main::Session*> _session;
 	rpl::producer<QString> _title;
 	Exceptions _selected;
-	bool _allowChoosePremiums = false;
+	std::optional<SpecialRowType> _allowChooseSpecial;
 
 	PeerListContentDelegate *_typesDelegate = nullptr;
 	Fn<void(PeerListRowId)> _deselectOption;
@@ -133,9 +186,9 @@ struct RowSelectionChange {
 	bool checked = false;
 };
 
-class PremiumsRow final : public PeerListRow {
+class SpecialRow final : public PeerListRow {
 public:
-	PremiumsRow();
+	explicit SpecialRow(SpecialRowType type);
 
 	QString generateName() override;
 	QString generateShortName() override;
@@ -143,70 +196,68 @@ public:
 		bool forceRound) override;
 	bool useForumLikeUserpic() const override;
 
+private:
+	const SpecialRowType _type = SpecialRowType::Premiums;
+
 };
 
 class TypesController final : public PeerListController {
 public:
-	TypesController(not_null<Main::Session*> session, bool premiums);
+	TypesController(not_null<Main::Session*> session, SpecialRowType type);
 
 	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]] bool specialSelected() const;
+	[[nodiscard]] rpl::producer<bool> specialChanges() const;
 	[[nodiscard]] auto rowSelectionChanges() const
 		-> rpl::producer<RowSelectionChange>;
 
 private:
 	const not_null<Main::Session*> _session;
+	const SpecialRowType _type;
 
 	rpl::event_stream<> _selectionChanged;
 	rpl::event_stream<RowSelectionChange> _rowSelectionChanges;
 
 };
 
-PremiumsRow::PremiumsRow() : PeerListRow(kPremiumsRowId) {
-	setCustomStatus(tr::lng_edit_privacy_premium_status(tr::now));
+SpecialRow::SpecialRow(SpecialRowType type)
+: PeerListRow((type == SpecialRowType::Premiums)
+	? kPremiumsRowId
+	: kMiniAppsRowId) {
+	setCustomStatus((id() == kPremiumsRowId)
+		? tr::lng_edit_privacy_premium_status(tr::now)
+		: tr::lng_edit_privacy_miniapps_status(tr::now));
 }
 
-QString PremiumsRow::generateName() {
-	return tr::lng_edit_privacy_premium(tr::now);
+QString SpecialRow::generateName() {
+	return (id() == kPremiumsRowId)
+		? tr::lng_edit_privacy_premium(tr::now)
+		: tr::lng_edit_privacy_miniapps(tr::now);
 }
 
-QString PremiumsRow::generateShortName() {
+QString SpecialRow::generateShortName() {
 	return generateName();
 }
 
-PaintRoundImageCallback PremiumsRow::generatePaintUserpicCallback(
+PaintRoundImageCallback SpecialRow::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, QRect(x, y, size, size));
-	};
+	return (id() == kPremiumsRowId)
+		? GeneratePremiumsUserpicCallback(forceRound)
+		: GenerateMiniAppsUserpicCallback(forceRound);
 }
 
-bool PremiumsRow::useForumLikeUserpic() const {
+bool SpecialRow::useForumLikeUserpic() const {
 	return true;
 }
 
 TypesController::TypesController(
 	not_null<Main::Session*> session,
-	bool premiums)
-: _session(session) {
+	SpecialRowType type)
+: _session(session)
+, _type(type) {
 }
 
 Main::Session &TypesController::session() const {
@@ -214,12 +265,15 @@ Main::Session &TypesController::session() const {
 }
 
 void TypesController::prepare() {
-	delegate()->peerListAppendRow(std::make_unique<PremiumsRow>());
+	delegate()->peerListAppendRow(std::make_unique<SpecialRow>(_type));
 	delegate()->peerListRefreshRows();
 }
 
-bool TypesController::premiumsSelected() const {
-	const auto row = delegate()->peerListFindRow(kPremiumsRowId);
+bool TypesController::specialSelected() const {
+	const auto premiums = (_type == SpecialRowType::Premiums);
+	const auto row = delegate()->peerListFindRow(premiums
+		? kPremiumsRowId
+		: kMiniAppsRowId);
 	Assert(row != nullptr);
 
 	return row->checked();
@@ -231,10 +285,10 @@ void TypesController::rowClicked(not_null<PeerListRow*> row) {
 	_rowSelectionChanges.fire({ row, checked });
 }
 
-rpl::producer<bool> TypesController::premiumsChanges() const {
+rpl::producer<bool> TypesController::specialChanges() const {
 	return _rowSelectionChanges.events(
 	) | rpl::map([=] {
-		return premiumsSelected();
+		return specialSelected();
 	});
 }
 
@@ -247,12 +301,12 @@ PrivacyExceptionsBoxController::PrivacyExceptionsBoxController(
 	not_null<Main::Session*> session,
 	rpl::producer<QString> title,
 	const Exceptions &selected,
-	bool allowChoosePremiums)
+	std::optional<SpecialRowType> allowChooseSpecial)
 : ChatsListBoxController(session)
 , _session(session)
 , _title(std::move(title))
 , _selected(selected)
-, _allowChoosePremiums(allowChoosePremiums) {
+, _allowChooseSpecial(allowChooseSpecial) {
 }
 
 Main::Session &PrivacyExceptionsBoxController::session() const {
@@ -261,14 +315,18 @@ Main::Session &PrivacyExceptionsBoxController::session() const {
 
 void PrivacyExceptionsBoxController::prepareViewHook() {
 	delegate()->peerListSetTitle(std::move(_title));
-	if (_allowChoosePremiums || _selected.premiums) {
-		delegate()->peerListSetAboveWidget(preparePremiumsRowList());
+	if (_allowChooseSpecial || _selected.premiums || _selected.miniapps) {
+		delegate()->peerListSetAboveWidget(prepareSpecialRowList(
+			_allowChooseSpecial.value_or(_selected.premiums
+				? SpecialRowType::Premiums
+				: SpecialRowType::MiniApps)));
 	}
 	delegate()->peerListAddSelectedPeers(_selected.peers);
 }
 
 bool PrivacyExceptionsBoxController::isForeignRow(PeerListRowId itemId) {
-	return (itemId == kPremiumsRowId);
+	return (itemId == kPremiumsRowId)
+		|| (itemId == kMiniAppsRowId);
 }
 
 bool PrivacyExceptionsBoxController::handleDeselectForeignRow(
@@ -280,7 +338,8 @@ bool PrivacyExceptionsBoxController::handleDeselectForeignRow(
 	return false;
 }
 
-auto PrivacyExceptionsBoxController::preparePremiumsRowList()
+auto PrivacyExceptionsBoxController::prepareSpecialRowList(
+	SpecialRowType type)
 -> object_ptr<Ui::RpWidget> {
 	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
 	const auto container = result.data();
@@ -291,30 +350,39 @@ auto PrivacyExceptionsBoxController::preparePremiumsRowList()
 	_typesDelegate = lifetime.make_state<PeerListContentDelegateSimple>();
 	const auto controller = lifetime.make_state<TypesController>(
 		&session(),
-		_selected.premiums);
+		type);
 	const auto content = result->add(object_ptr<PeerListContent>(
 		container,
 		controller));
 	_typesDelegate->setContent(content);
 	controller->setDelegate(_typesDelegate);
 
+	const auto selectType = [&](PeerListRowId id) {
+		const auto row = _typesDelegate->peerListFindRow(id);
+		if (row) {
+			content->changeCheckState(row, true, anim::type::instant);
+			this->delegate()->peerListSetForeignRowChecked(
+				row,
+				true,
+				anim::type::instant);
+		}
+	};
 	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);
+		selectType(kPremiumsRowId);
+	} else if (_selected.miniapps) {
+		selectType(kMiniAppsRowId);
 	}
 	container->add(CreatePeerListSectionSubtitle(
 		container,
 		tr::lng_edit_privacy_users_and_groups()));
 
-	controller->premiumsChanges(
-	) | rpl::start_with_next([=](bool premiums) {
-		_selected.premiums = premiums;
+	controller->specialChanges(
+	) | rpl::start_with_next([=](bool chosen) {
+		if (type == SpecialRowType::Premiums) {
+			_selected.premiums = chosen;
+		} else {
+			_selected.miniapps = chosen;
+		}
 	}, lifetime);
 
 	controller->rowSelectionChanges(
@@ -329,6 +397,8 @@ auto PrivacyExceptionsBoxController::preparePremiumsRowList()
 		if (const auto row = _typesDelegate->peerListFindRow(itemId)) {
 			if (itemId == kPremiumsRowId) {
 				_selected.premiums = false;
+			} else if (itemId == kMiniAppsRowId) {
+				_selected.miniapps = false;
 			}
 			_typesDelegate->peerListSetRowChecked(row, false);
 		}
@@ -337,10 +407,14 @@ auto PrivacyExceptionsBoxController::preparePremiumsRowList()
 	return result;
 }
 
-[[nodiscard]] bool PrivacyExceptionsBoxController::premiumsSelected() const {
+bool PrivacyExceptionsBoxController::premiumsSelected() const {
 	return _selected.premiums;
 }
 
+bool PrivacyExceptionsBoxController::miniAppsSelected() const {
+	return _selected.miniapps;
+}
+
 void PrivacyExceptionsBoxController::rowClicked(not_null<PeerListRow*> row) {
 	const auto peer = row->peer();
 
@@ -412,6 +486,11 @@ EditPrivacyBox::EditPrivacyBox(
 		// If we switch from Everyone to Contacts or Nobody suggest Premiums.
 		_value.always.premiums = true;
 	}
+	if (_controller->allowMiniAppsToggle(Exception::Always)
+		&& _value.option == Option::Everyone) {
+		// If we switch from Everyone to Contacts or Nobody suggest MiniApps.
+		_value.always.miniapps = true;
+	}
 }
 
 void EditPrivacyBox::prepare() {
@@ -427,12 +506,18 @@ void EditPrivacyBox::editExceptions(
 		&_window->session(),
 		_controller->exceptionBoxTitle(exception),
 		exceptions(exception),
-		_controller->allowPremiumsToggle(exception));
+		(_controller->allowPremiumsToggle(exception)
+			? SpecialRowType::Premiums
+			: _controller->allowMiniAppsToggle(exception)
+			? SpecialRowType::MiniApps
+			: std::optional<SpecialRowType>()));
 	auto initBox = [=, controller = controller.get()](
 			not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_settings_save(), crl::guard(this, [=] {
-			exceptions(exception).peers = box->collectSelectedRows();
-			exceptions(exception).premiums = controller->premiumsSelected();
+			auto &setTo = exceptions(exception);
+			setTo.peers = box->collectSelectedRows();
+			setTo.premiums = controller->premiumsSelected();
+			setTo.miniapps = controller->miniAppsSelected();
 			const auto type = [&] {
 				switch (exception) {
 				case Exception::Always: return Exception::Never;
@@ -440,11 +525,17 @@ void EditPrivacyBox::editExceptions(
 				}
 				Unexpected("Invalid exception value.");
 			}();
-			auto &removeFrom = exceptions(type).peers;
+			auto &removeFrom = exceptions(type);
 			for (const auto peer : exceptions(exception).peers) {
-				removeFrom.erase(
-					ranges::remove(removeFrom, peer),
-					end(removeFrom));
+				removeFrom.peers.erase(
+					ranges::remove(removeFrom.peers, peer),
+					end(removeFrom.peers));
+			}
+			if (setTo.premiums) {
+				removeFrom.premiums = false;
+			}
+			if (setTo.miniapps) {
+				removeFrom.miniapps = false;
 			}
 			done();
 			box->closeBox();
@@ -566,14 +657,21 @@ void EditPrivacyBox::setupContent() {
 					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);
+			return value.premiums
+				? (!count
+					? tr::lng_edit_privacy_premium(tr::now)
+					: tr::lng_edit_privacy_exceptions_premium_and(
+						tr::now,
+						lt_users,
+						users))
+				: value.miniapps
+				? (!count
+					? tr::lng_edit_privacy_miniapps(tr::now)
+					: tr::lng_edit_privacy_exceptions_miniapps_and(
+						tr::now,
+						lt_users,
+						users))
+				: users;
 		});
 		_controller->handleExceptionsChange(
 			exception,
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.h b/Telegram/SourceFiles/boxes/edit_privacy_box.h
index 3aae28403..bd87e90f2 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.h
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.h
@@ -61,6 +61,10 @@ public:
 			Exception exception) const {
 		return false;
 	}
+	[[nodiscard]] virtual bool allowMiniAppsToggle(
+			Exception exception) const {
+		return false;
+	}
 	virtual void handleExceptionsChange(
 		Exception exception,
 		rpl::producer<int> value) {
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 6b2a753ce..db18d216e 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -533,6 +533,7 @@ inputPrivacyKeyAddedByPhone#d1219bdd = InputPrivacyKey;
 inputPrivacyKeyVoiceMessages#aee69d68 = InputPrivacyKey;
 inputPrivacyKeyAbout#3823cc40 = InputPrivacyKey;
 inputPrivacyKeyBirthday#d65a11cc = InputPrivacyKey;
+inputPrivacyKeyStarGiftsAutoSave#e1732341 = InputPrivacyKey;
 
 privacyKeyStatusTimestamp#bc2eab30 = PrivacyKey;
 privacyKeyChatInvite#500e6dfa = PrivacyKey;
@@ -545,6 +546,7 @@ privacyKeyAddedByPhone#42ffd42b = PrivacyKey;
 privacyKeyVoiceMessages#697f414 = PrivacyKey;
 privacyKeyAbout#a486b761 = PrivacyKey;
 privacyKeyBirthday#2000a518 = PrivacyKey;
+privacyKeyStarGiftsAutoSave#2ca4fdf8 = PrivacyKey;
 
 inputPrivacyValueAllowContacts#d09e07b = InputPrivacyRule;
 inputPrivacyValueAllowAll#184b35ce = InputPrivacyRule;
@@ -556,6 +558,8 @@ inputPrivacyValueAllowChatParticipants#840649cf chats:Vector<long> = InputPrivac
 inputPrivacyValueDisallowChatParticipants#e94f0f86 chats:Vector<long> = InputPrivacyRule;
 inputPrivacyValueAllowCloseFriends#2f453e49 = InputPrivacyRule;
 inputPrivacyValueAllowPremium#77cdc9f1 = InputPrivacyRule;
+inputPrivacyValueAllowBots#5a4fcce5 = InputPrivacyRule;
+inputPrivacyValueDisallowBots#c4e57915 = InputPrivacyRule;
 
 privacyValueAllowContacts#fffe1bac = PrivacyRule;
 privacyValueAllowAll#65427b82 = PrivacyRule;
@@ -567,6 +571,8 @@ privacyValueAllowChatParticipants#6b134e8e chats:Vector<long> = PrivacyRule;
 privacyValueDisallowChatParticipants#41c87565 chats:Vector<long> = PrivacyRule;
 privacyValueAllowCloseFriends#f7e8d89b = PrivacyRule;
 privacyValueAllowPremium#ece9814b = PrivacyRule;
+privacyValueAllowBots#21461b5d = PrivacyRule;
+privacyValueDisallowBots#f6a5f82f = PrivacyRule;
 
 account.privacyRules#50a04e45 rules:Vector<PrivacyRule> chats:Vector<Chat> users:Vector<User> = account.PrivacyRules;
 
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index dc9a7bcc3..c93c50aae 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -380,11 +380,13 @@ void BlockedBoxController::rowClicked(not_null<PeerListRow*> row) {
 	});
 }
 
-void BlockedBoxController::rowRightActionClicked(not_null<PeerListRow*> row) {
+void BlockedBoxController::rowRightActionClicked(
+		not_null<PeerListRow*> row) {
 	session().api().blockedPeers().unblock(row->peer());
 }
 
-void BlockedBoxController::applySlice(const Api::BlockedPeers::Slice &slice) {
+void BlockedBoxController::applySlice(
+		const Api::BlockedPeers::Slice &slice) {
 	if (slice.list.empty()) {
 		_allLoaded = true;
 	}
@@ -487,7 +489,8 @@ rpl::producer<QString> PhoneNumberPrivacyController::title() const {
 	return tr::lng_edit_privacy_phone_number_title();
 }
 
-rpl::producer<QString> PhoneNumberPrivacyController::optionsTitleKey() const {
+auto PhoneNumberPrivacyController::optionsTitleKey() const
+-> rpl::producer<QString> {
 	return tr::lng_edit_privacy_phone_number_header();
 }
 
@@ -731,7 +734,8 @@ void LastSeenPrivacyController::handleExceptionsChange(
 void LastSeenPrivacyController::confirmSave(
 		bool someAreDisallowed,
 		Fn<void()> saveCallback) {
-	if (someAreDisallowed && !Core::App().settings().lastSeenWarningSeen()) {
+	if (someAreDisallowed
+		&& !Core::App().settings().lastSeenWarningSeen()) {
 		auto callback = [
 			=,
 			saveCallback = std::move(saveCallback)
@@ -776,11 +780,14 @@ rpl::producer<QString> GroupsInvitePrivacyController::optionsTitleKey(
 	return tr::lng_edit_privacy_groups_header();
 }
 
-rpl::producer<QString> GroupsInvitePrivacyController::exceptionButtonTextKey(
-		Exception exception) const {
+auto GroupsInvitePrivacyController::exceptionButtonTextKey(
+	Exception exception) const
+-> rpl::producer<QString> {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_groups_always_empty();
-	case Exception::Never: return tr::lng_edit_privacy_groups_never_empty();
+	case Exception::Always:
+		return tr::lng_edit_privacy_groups_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_groups_never_empty();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -788,8 +795,10 @@ rpl::producer<QString> GroupsInvitePrivacyController::exceptionButtonTextKey(
 rpl::producer<QString> GroupsInvitePrivacyController::exceptionBoxTitle(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_groups_always_title();
-	case Exception::Never: return tr::lng_edit_privacy_groups_never_title();
+	case Exception::Always:
+		return tr::lng_edit_privacy_groups_always_title();
+	case Exception::Never:
+		return tr::lng_edit_privacy_groups_never_title();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -819,8 +828,10 @@ rpl::producer<QString> CallsPrivacyController::optionsTitleKey() const {
 rpl::producer<QString> CallsPrivacyController::exceptionButtonTextKey(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_calls_always_empty();
-	case Exception::Never: return tr::lng_edit_privacy_calls_never_empty();
+	case Exception::Always:
+		return tr::lng_edit_privacy_calls_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_calls_never_empty();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -828,7 +839,8 @@ rpl::producer<QString> CallsPrivacyController::exceptionButtonTextKey(
 rpl::producer<QString> CallsPrivacyController::exceptionBoxTitle(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_calls_always_title();
+	case Exception::Always:
+		return tr::lng_edit_privacy_calls_always_title();
 	case Exception::Never: return tr::lng_edit_privacy_calls_never_title();
 	}
 	Unexpected("Invalid exception value.");
@@ -871,7 +883,8 @@ rpl::producer<QString> CallsPeer2PeerPrivacyController::title() const {
 	return tr::lng_edit_privacy_calls_p2p_title();
 }
 
-rpl::producer<QString> CallsPeer2PeerPrivacyController::optionsTitleKey() const {
+auto CallsPeer2PeerPrivacyController::optionsTitleKey() const
+-> rpl::producer<QString> {
 	return tr::lng_edit_privacy_calls_p2p_header();
 }
 
@@ -895,8 +908,9 @@ auto CallsPeer2PeerPrivacyController::warning() const
 	return tr::lng_settings_peer_to_peer_about(Ui::Text::WithEntities);
 }
 
-rpl::producer<QString> CallsPeer2PeerPrivacyController::exceptionButtonTextKey(
-		Exception exception) const {
+auto CallsPeer2PeerPrivacyController::exceptionButtonTextKey(
+	Exception exception) const
+-> rpl::producer<QString> {
 	switch (exception) {
 	case Exception::Always: {
 		return tr::lng_edit_privacy_calls_p2p_always_empty();
@@ -1121,7 +1135,8 @@ rpl::producer<QString> ProfilePhotoPrivacyController::title() const {
 	return tr::lng_edit_privacy_profile_photo_title();
 }
 
-rpl::producer<QString> ProfilePhotoPrivacyController::optionsTitleKey() const {
+auto ProfilePhotoPrivacyController::optionsTitleKey() const
+-> rpl::producer<QString> {
 	return tr::lng_edit_privacy_profile_photo_header();
 }
 
@@ -1234,7 +1249,8 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 					container,
 					&controller->window(),
 					{
-						.confirm = tr::lng_profile_set_photo_button(tr::now),
+						.confirm = tr::lng_profile_set_photo_button(
+							tr::now),
 						.cropType = EditorData::CropType::Ellipse,
 						.keepAspectRatio = true,
 					},
@@ -1283,8 +1299,9 @@ void ProfilePhotoPrivacyController::saveAdditional() {
 	}
 }
 
-rpl::producer<QString> ProfilePhotoPrivacyController::exceptionButtonTextKey(
-		Exception exception) const {
+auto ProfilePhotoPrivacyController::exceptionButtonTextKey(
+	Exception exception) const
+-> rpl::producer<QString> {
 	switch (exception) {
 	case Exception::Always: {
 		return tr::lng_edit_privacy_profile_photo_always_empty();
@@ -1363,8 +1380,10 @@ rpl::producer<QString> VoicesPrivacyController::optionsTitleKey() const {
 rpl::producer<QString> VoicesPrivacyController::exceptionButtonTextKey(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_voices_always_empty();
-	case Exception::Never: return tr::lng_edit_privacy_voices_never_empty();
+	case Exception::Always:
+		return tr::lng_edit_privacy_voices_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_voices_never_empty();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -1372,7 +1391,8 @@ rpl::producer<QString> VoicesPrivacyController::exceptionButtonTextKey(
 rpl::producer<QString> VoicesPrivacyController::exceptionBoxTitle(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_voices_always_title();
+	case Exception::Always:
+		return tr::lng_edit_privacy_voices_always_title();
 	case Exception::Never: return tr::lng_edit_privacy_voices_never_title();
 	}
 	Unexpected("Invalid exception value.");
@@ -1468,7 +1488,8 @@ rpl::producer<QString> AboutPrivacyController::optionsTitleKey() const {
 rpl::producer<QString> AboutPrivacyController::exceptionButtonTextKey(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_about_always_empty();
+	case Exception::Always:
+		return tr::lng_edit_privacy_about_always_empty();
 	case Exception::Never: return tr::lng_edit_privacy_about_never_empty();
 	}
 	Unexpected("Invalid exception value.");
@@ -1477,7 +1498,8 @@ rpl::producer<QString> AboutPrivacyController::exceptionButtonTextKey(
 rpl::producer<QString> AboutPrivacyController::exceptionBoxTitle(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_about_always_title();
+	case Exception::Always:
+		return tr::lng_edit_privacy_about_always_title();
 	case Exception::Never: return tr::lng_edit_privacy_about_never_title();
 	}
 	Unexpected("Invalid exception value.");
@@ -1485,7 +1507,7 @@ rpl::producer<QString> AboutPrivacyController::exceptionBoxTitle(
 
 auto AboutPrivacyController::exceptionsDescription() const
 -> rpl::producer<QString> {
-	return tr::lng_edit_privacy_birthday_exceptions();
+	return tr::lng_edit_privacy_about_exceptions();
 }
 
 UserPrivacy::Key BirthdayPrivacyController::key() const {
@@ -1503,8 +1525,10 @@ rpl::producer<QString> BirthdayPrivacyController::optionsTitleKey() const {
 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();
+	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.");
 }
@@ -1512,8 +1536,10 @@ rpl::producer<QString> BirthdayPrivacyController::exceptionButtonTextKey(
 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();
+	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.");
 }
@@ -1553,4 +1579,49 @@ object_ptr<Ui::RpWidget> BirthdayPrivacyController::setupAboveWidget(
 	return result;
 }
 
+UserPrivacy::Key GiftsAutoSavePrivacyController::key() const {
+	return Key::GiftsAutoSave;
+}
+
+rpl::producer<QString> GiftsAutoSavePrivacyController::title() const {
+	return tr::lng_edit_privacy_gifts_title();
+}
+
+auto GiftsAutoSavePrivacyController::optionsTitleKey() const
+-> rpl::producer<QString> {
+	return tr::lng_edit_privacy_gifts_header();
+}
+
+auto GiftsAutoSavePrivacyController::exceptionButtonTextKey(
+	Exception exception) const
+-> rpl::producer<QString> {
+	switch (exception) {
+	case Exception::Always:
+		return tr::lng_edit_privacy_gifts_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_gifts_never_empty();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+rpl::producer<QString> GiftsAutoSavePrivacyController::exceptionBoxTitle(
+		Exception exception) const {
+	switch (exception) {
+	case Exception::Always:
+		return tr::lng_edit_privacy_gifts_always_title();
+	case Exception::Never: return tr::lng_edit_privacy_gifts_never_title();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+auto GiftsAutoSavePrivacyController::exceptionsDescription() const
+-> rpl::producer<QString> {
+	return tr::lng_edit_privacy_lastseen_exceptions();
+}
+
+bool GiftsAutoSavePrivacyController::allowMiniAppsToggle(
+		Exception exception) const {
+	return true;
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
index d058649d2..88a61d9cd 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
@@ -194,7 +194,7 @@ public:
 
 };
 
-class ForwardsPrivacyController
+class ForwardsPrivacyController final
 	: public EditPrivacyController
 	, private HistoryView::SimpleElementDelegate {
 public:
@@ -340,4 +340,22 @@ public:
 
 };
 
+class GiftsAutoSavePrivacyController 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;
+	bool allowMiniAppsToggle(Exception exception) const override;
+
+};
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index f71134c3c..3222bc248 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -185,16 +185,23 @@ QString PrivacyBase(Privacy::Key key, const Privacy::Rule &rule) {
 		[[fallthrough]];
 	default:
 		switch (rule.option) {
-		case Option::Everyone: return tr::lng_edit_privacy_everyone(tr::now);
+		case Option::Everyone:
+			return rule.never.miniapps
+				? tr::lng_edit_privacy_no_miniapps(tr::now)
+				: tr::lng_edit_privacy_everyone(tr::now);
 		case Option::Contacts:
 			return rule.always.premiums
 				? tr::lng_edit_privacy_contacts_and_premium(tr::now)
+				: rule.always.miniapps
+				? tr::lng_edit_privacy_contacts_and_miniapps(tr::now)
 				: tr::lng_edit_privacy_contacts(tr::now);
 		case Option::CloseFriends:
 			return tr::lng_edit_privacy_close_friends(tr::now);
 		case Option::Nobody:
 			return rule.always.premiums
 				? tr::lng_edit_privacy_premium(tr::now)
+				: rule.always.miniapps
+				? tr::lng_edit_privacy_miniapps(tr::now)
 				: tr::lng_edit_privacy_nobody(tr::now);
 		}
 		Unexpected("Value in Privacy::Option.");
@@ -405,7 +412,8 @@ void SetupPrivacy(
 	add(
 		tr::lng_settings_last_seen(),
 		Key::LastSeen,
-		[=] { return std::make_unique<LastSeenPrivacyController>(session); });
+		[=] { return std::make_unique<LastSeenPrivacyController>(
+			session); });
 	add(
 		tr::lng_settings_profile_photo_privacy(),
 		Key::ProfilePhoto,
@@ -414,6 +422,10 @@ void SetupPrivacy(
 		tr::lng_settings_bio_privacy(),
 		Key::About,
 		[] { return std::make_unique<AboutPrivacyController>(); });
+	add(
+		tr::lng_settings_gifts_privacy(),
+		Key::GiftsAutoSave,
+		[=] { return std::make_unique<GiftsAutoSavePrivacyController>(); });
 	add(
 		tr::lng_settings_birthday_privacy(),
 		Key::Birthday,
@@ -442,7 +454,8 @@ void SetupPrivacy(
 	}
 	AddMessagesPrivacyButton(controller, container);
 
-	session->api().userPrivacy().reload(Api::UserPrivacy::Key::AddedByPhone);
+	session->api().userPrivacy().reload(
+		Api::UserPrivacy::Key::AddedByPhone);
 
 	Ui::AddSkip(container, st::settingsPrivacySecurityPadding);
 	Ui::AddDivider(container);

From 60f4587d95ef8e5665d7d5880ee5906324dabded Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 18:05:21 +0400
Subject: [PATCH 284/306] Sort birthday gifts to the front.

---
 Telegram/SourceFiles/api/api_premium.cpp     |  1 +
 Telegram/SourceFiles/api/api_premium.h       |  1 +
 Telegram/SourceFiles/boxes/star_gift_box.cpp | 40 +++++++++++++++++---
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 91824922e..d88a5ddce 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -778,6 +778,7 @@ std::optional<StarGift> FromTL(
 		.limitedCount = total.value_or_empty(),
 		.firstSaleDate = data.vfirst_sale_date().value_or_empty(),
 		.lastSaleDate = data.vlast_sale_date().value_or_empty(),
+		.birthday = data.is_birthday(),
 	};
 }
 
diff --git a/Telegram/SourceFiles/api/api_premium.h b/Telegram/SourceFiles/api/api_premium.h
index ef08eb8fb..23455ba18 100644
--- a/Telegram/SourceFiles/api/api_premium.h
+++ b/Telegram/SourceFiles/api/api_premium.h
@@ -82,6 +82,7 @@ struct StarGift {
 	int limitedCount = 0;
 	TimeId firstSaleDate = 0;
 	TimeId lastSaleDate = 0;
+	bool birthday = false;
 
 	friend inline bool operator==(
 		const StarGift &,
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 70fe207ab..781e008d2 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -139,6 +139,23 @@ private:
 
 };
 
+[[nodiscard]] bool SortForBirthday(not_null<PeerData*> peer) {
+	const auto user = peer->asUser();
+	if (!user) {
+		return false;
+	}
+	const auto birthday = user->birthday();
+	if (!birthday) {
+		return false;
+	}
+	const auto is = [&](const QDate &date) {
+		return (date.day() == birthday.day())
+			&& (date.month() == birthday.month());
+	};
+	const auto now = QDate::currentDate();
+	return is(now) || is(now.addDays(1)) || is(now.addDays(-1));
+}
+
 PreviewDelegate::PreviewDelegate(
 	not_null<QWidget*> parent,
 	not_null<Ui::ChatStyle*> st,
@@ -1068,10 +1085,23 @@ void SendGiftBox(
 		const auto padding = st::giftBoxPadding;
 		const auto available = width - padding.left() - padding.right();
 		const auto perRow = available / single.width();
+		const auto count = int(gifts.list.size());
+
+		auto order = ranges::views::ints
+			| ranges::views::take(count)
+			| ranges::to_vector;
+
+		if (SortForBirthday(peer)) {
+			ranges::stable_partition(order, [&](int i) {
+				const auto &gift = gifts.list[i];
+				const auto stars = std::get_if<GiftTypeStars>(&gift);
+				return stars && stars->info.birthday;
+			});
+		}
 
 		auto x = padding.left();
 		auto y = padding.top();
-		state->buttons.resize(gifts.list.size());
+		state->buttons.resize(count);
 		for (auto &button : state->buttons) {
 			if (!button) {
 				button = std::make_unique<GiftButton>(raw, &state->delegate);
@@ -1079,9 +1109,9 @@ void SendGiftBox(
 			}
 		}
 		const auto api = gifts.api;
-		for (auto i = 0, count = int(gifts.list.size()); i != count; ++i) {
+		for (auto i = 0; i != count; ++i) {
 			const auto button = state->buttons[i].get();
-			const auto &descriptor = gifts.list[i];
+			const auto &descriptor = gifts.list[order[i]];
 			button->setDescriptor(descriptor);
 
 			const auto last = !((i + 1) % perRow);
@@ -1108,12 +1138,12 @@ void SendGiftBox(
 				}
 			});
 		}
-		if (gifts.list.size() % perRow) {
+		if (count % perRow) {
 			y += padding.bottom() + single.height();
 		} else {
 			y += padding.bottom() - st::giftBoxGiftSkip.y();
 		}
-		raw->resize(raw->width(), gifts.list.empty() ? 0 : y);
+		raw->resize(raw->width(), count ? y : 0);
 	}, raw->lifetime());
 
 	return result;

From 7552328cdd22f9b8923756efde61e2326da7cc1d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 23:38:28 +0400
Subject: [PATCH 285/306] Multi-select in mini app send prepared.

---
 .../inline_bots/bot_attach_web_view.cpp       |  79 ++++++-----
 .../SourceFiles/window/window_peer_menu.cpp   | 125 +++++++++++++++---
 .../SourceFiles/window/window_peer_menu.h     |   3 +-
 3 files changed, 158 insertions(+), 49 deletions(-)

diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index e54976e4e..7a2f79071 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -1826,11 +1826,56 @@ void WebViewInstance::botSendPreparedMessage(
 		});
 		struct State {
 			QPointer<Ui::BoxContent> preview;
+			QPointer<Ui::BoxContent> choose;
 			rpl::event_stream<not_null<Data::Thread*>> recipient;
 			bool sent = false;
 		};
 		const auto state = std::make_shared<State>();
 		auto recipient = state->recipient.events();
+		const auto send = [=](std::vector<not_null<Data::Thread*>> list) {
+			if (state->sent) {
+				return;
+			}
+			state->sent = true;
+			const auto failed = std::make_shared<int>();
+			const auto count = int(list.size());
+			const auto weak1 = state->preview;
+			const auto weak2 = state->choose;
+			const auto close = [=] {
+				if (const auto strong = weak1.data()) {
+					strong->closeBox();
+				}
+				if (const auto strong = weak2.data()) {
+					strong->closeBox();
+				}
+			};
+			const auto done = [=](bool success) {
+				if (*failed < 0) {
+					return;
+				}
+				if (success) {
+					*failed = -1;
+					if (const auto strong2 = weak2.data()) {
+						strong2->showToast({ tr::lng_share_done(tr::now) });
+					} else if (const auto strong1 = weak1.data()) {
+						strong1->showToast({ tr::lng_share_done(tr::now) });
+					}
+					base::call_delayed(Ui::Toast::kDefaultDuration, close);
+					callback(QString());
+				} else if (++*failed == count) {
+					close();
+					callback(u"MESSAGE_SEND_FAILED"_q);
+				}
+			};
+			for (const auto &thread : list) {
+				bot->session().api().sendInlineResult(
+					bot,
+					parsed.get(),
+					Api::SendAction(thread),
+					std::nullopt,
+					done);
+			}
+		};
 		auto box = Box(PreparedPreviewBox, item, std::move(recipient), [=] {
 			if (state->sent) {
 				return;
@@ -1850,38 +1895,12 @@ void WebViewInstance::botSendPreparedMessage(
 				chosen,
 				tr::lng_inline_switch_choose(),
 				nullptr,
-				types);
+				types,
+				send);
+			state->choose = box.data();
 			panel->showBox(std::move(box));
 		}, [=](not_null<Data::Thread*> thread) {
-			if (state->sent) {
-				return;
-			}
-			state->sent = true;
-			const auto weak = state->preview;
-			const auto done = [=](bool success) {
-				if (success) {
-					if (const auto strong = weak.data()) {
-						strong->showToast({ tr::lng_share_done(tr::now) });
-					}
-					base::call_delayed(Ui::Toast::kDefaultDuration, [weak] {
-						if (const auto strong = weak.data()) {
-							strong->closeBox();
-						}
-					});
-					callback(QString());
-				} else {
-					if (const auto strong = weak.data()) {
-						strong->closeBox();
-					}
-					callback(u"MESSAGE_SEND_FAILED"_q);
-				}
-			};
-			bot->session().api().sendInlineResult(
-				bot,
-				parsed.get(),
-				Api::SendAction(thread),
-				std::nullopt,
-				done);
+			send({ thread });
 		});
 		box->boxClosing() | rpl::start_with_next([=] {
 			if (!state->sent) {
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 5d0c2bc12..2ea988a8e 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1886,8 +1886,83 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 		FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 		rpl::producer<QString> titleOverride,
 		FnMut<void()> &&successCallback,
-		InlineBots::PeerTypes typesRestriction) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+		InlineBots::PeerTypes typesRestriction,
+		Fn<void(std::vector<not_null<Data::Thread*>>)> sendMany) {
+	const auto weak = std::make_shared<QPointer<PeerListBox>>();
+	const auto selectable = (sendMany != nullptr);
+	class Controller final : public ChooseRecipientBoxController {
+	public:
+		using Chosen = not_null<Data::Thread*>;
+
+		Controller(
+			not_null<Main::Session*> session,
+			FnMut<void(Chosen)> callback,
+			Fn<bool(Chosen)> filter,
+			bool selectable)
+		: ChooseRecipientBoxController({
+			.session = session,
+			.callback = std::move(callback),
+			.filter = filter,
+			.premiumRequiredError = WritePremiumRequiredError,
+		})
+		, _selectable(selectable) {
+		}
+
+		using PeerListController::setSearchNoResultsText;
+
+		void rowClicked(not_null<PeerListRow*> row) override final {
+			if (!_selectable) {
+				return ChooseRecipientBoxController::rowClicked(row);
+			}
+			const auto count = delegate()->peerListSelectedRowsCount();
+			if (showLockedError(row) || (count && row->peer()->isForum())) {
+				return;
+			} else if (row->peer()->isForum()) {
+				ChooseRecipientBoxController::rowClicked(row);
+			} else {
+				delegate()->peerListSetRowChecked(row, !row->checked());
+				_hasSelectedChanges.fire(
+					delegate()->peerListSelectedRowsCount() > 0);
+			}
+		}
+
+		base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+				QWidget *parent,
+				not_null<PeerListRow*> row) override final {
+			if (!_selectable) {
+				return ChooseRecipientBoxController::rowContextMenu(
+					parent,
+					row);
+			}
+			if (!row->checked() && !row->peer()->isForum()) {
+				auto menu = base::make_unique_q<Ui::PopupMenu>(
+					parent,
+					st::popupMenuWithIcons);
+				menu->addAction(tr::lng_bot_choose_chat(tr::now), [=] {
+					delegate()->peerListSetRowChecked(row, true);
+					_hasSelectedChanges.fire(
+						delegate()->peerListSelectedRowsCount() > 0);
+				}, &st::menuIconSelect);
+				return menu;
+			}
+			return nullptr;
+		}
+
+		[[nodiscard]] rpl::producer<bool> hasSelectedChanges() const {
+			return _hasSelectedChanges.events_starting_with(false);
+		}
+
+		[[nodiscard]] rpl::producer<Chosen> singleChosen() const {
+			return _singleChosen.events();
+		}
+
+	private:
+		rpl::event_stream<Chosen> _singleChosen;
+		rpl::event_stream<bool> _hasSelectedChanges;
+		bool _selectable = false;
+
+	};
+
 	auto callback = [
 		chosen = std::move(chosen),
 		success = std::move(successCallback),
@@ -1919,23 +1994,40 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 			}
 		}
 		: Fn<bool(not_null<Data::Thread*>)>();
+	auto controller = std::make_unique<Controller>(
+		session,
+		std::move(callback),
+		std::move(filter),
+		selectable);
+	const auto raw = controller.get();
 	auto initBox = [=](not_null<PeerListBox*> box) {
-		box->addButton(tr::lng_cancel(), [box] {
-			box->closeBox();
-		});
+		raw->hasSelectedChanges(
+		) | rpl::start_with_next([=](bool shown) {
+			box->clearButtons();
+			if (shown) {
+				box->addButton(tr::lng_send_button(), [=] {
+					const auto peers = box->collectSelectedRows();
+					sendMany(ranges::views::all(
+						peers
+					) | ranges::views::transform([&](
+						not_null<PeerData*> peer) -> Controller::Chosen {
+						return peer->owner().history(peer);
+					}) | ranges::to_vector);
+				});
+			}
+			box->addButton(tr::lng_cancel(), [=] {
+				box->closeBox();
+			});
+		}, box->lifetime());
 		if (titleOverride) {
 			box->setTitle(std::move(titleOverride));
 		}
 	};
 	auto result = Box<PeerListBox>(
-		std::make_unique<ChooseRecipientBoxController>(ChooseRecipientArgs{
-			.session = session,
-			.callback = std::move(callback),
-			.filter = std::move(filter),
-			.premiumRequiredError = WritePremiumRequiredError,
-		}),
+		std::move(controller),
 		std::move(initBox));
 	*weak = result.data();
+
 	return result;
 }
 
@@ -2014,9 +2106,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		}) {
 		}
 
-		void setSearchNoResultsText(const QString &text) {
-			PeerListController::setSearchNoResultsText(text);
-		}
+		using PeerListController::setSearchNoResultsText;
 
 		void rowClicked(not_null<PeerListRow*> row) override final {
 			const auto count = delegate()->peerListSelectedRowsCount();
@@ -2034,13 +2124,12 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		base::unique_qptr<Ui::PopupMenu> rowContextMenu(
 				QWidget *parent,
 				not_null<PeerListRow*> row) override final {
-			const auto count = delegate()->peerListSelectedRowsCount();
-			if (!count && !row->peer()->isForum()) {
+			if (!row->checked() && !row->peer()->isForum()) {
 				auto menu = base::make_unique_q<Ui::PopupMenu>(
 					parent,
 					st::popupMenuWithIcons);
 				menu->addAction(tr::lng_bot_choose_chat(tr::now), [=] {
-					delegate()->peerListSetRowChecked(row, !row->checked());
+					delegate()->peerListSetRowChecked(row, true);
 					_hasSelectedChanges.fire(
 						delegate()->peerListSelectedRowsCount() > 0);
 				}, &st::menuIconSelect);
@@ -2049,7 +2138,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			return nullptr;
 		}
 
-		[[nodiscard]] rpl::producer<bool> hasSelectedChanges() const{
+		[[nodiscard]] rpl::producer<bool> hasSelectedChanges() const {
 			return _hasSelectedChanges.events_starting_with(false);
 		}
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index e1714257b..6ef96c9f5 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -144,7 +144,8 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 	FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 	rpl::producer<QString> titleOverride = nullptr,
 	FnMut<void()> &&successCallback = nullptr,
-	InlineBots::PeerTypes typesRestriction = 0);
+	InlineBots::PeerTypes typesRestriction = 0,
+	Fn<void(std::vector<not_null<Data::Thread*>>)> sendMany = nullptr);
 QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 	not_null<Window::SessionNavigation*> navigation,
 	FnMut<bool(not_null<Data::Thread*>)> &&chosen,

From fa8262cbe9b45c22105aaa218913455c9d8dffc2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 14:33:57 +0400
Subject: [PATCH 286/306] Version 5.8.

- Updates in Mini Apps platform.
- Chat folders in forward and share boxes.
- Horizontal strip mode for chat folders.
---
 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             |  6 +++---
 Telegram/build/version                          | 12 ++++++------
 changelog.txt                                   |  6 ++++++
 7 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 4683ca419..ba846faae 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.7.4.0" />
+    Version="5.8.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 65d5d0ed8..a959f80fa 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,7,4,0
- PRODUCTVERSION 5,7,4,0
+ FILEVERSION 5,8,0,0
+ PRODUCTVERSION 5,8,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", "5.7.4.0"
+            VALUE "FileVersion", "5.8.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.4.0"
+            VALUE "ProductVersion", "5.8.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 9e2d62198..657ef3748 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,7,4,0
- PRODUCTVERSION 5,7,4,0
+ FILEVERSION 5,8,0,0
+ PRODUCTVERSION 5,8,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", "5.7.4.0"
+            VALUE "FileVersion", "5.8.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.7.4.0"
+            VALUE "ProductVersion", "5.8.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index d90059cb9..94c4af054 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -77,7 +77,6 @@ enum class SpecialRowType {
 		const auto &color1 = st::historyPeer6UserpicBg;
 		const auto &color2 = st::historyPeer6UserpicBg2;
 
-		const auto rect = style::rtlrect(x, y, size, size, outerWidth);
 		auto hq = PainterHighQualityEnabler(p);
 		auto gradient = QLinearGradient(x, y, x, y + size);
 		gradient.setStops({ { 0., color1->c }, { 1., color2->c } });
@@ -196,9 +195,6 @@ public:
 		bool forceRound) override;
 	bool useForumLikeUserpic() const override;
 
-private:
-	const SpecialRowType _type = SpecialRowType::Premiums;
-
 };
 
 class TypesController final : public PeerListController {
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index e7b5a1873..a79722155 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 = 5007004;
-constexpr auto AppVersionStr = "5.7.4";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 5008000;
+constexpr auto AppVersionStr = "5.8";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 9776d9e67..914da2773 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5007004
-AppVersionStrMajor 5.7
-AppVersionStrSmall 5.7.4
-AppVersionStr      5.7.4
-BetaChannel        1
+AppVersion         5008000
+AppVersionStrMajor 5.8
+AppVersionStrSmall 5.8
+AppVersionStr      5.8.0
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.7.4.beta
+AppVersionOriginal 5.8
diff --git a/changelog.txt b/changelog.txt
index eb4229eca..45dfdaecc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+5.8 (17.11.24)
+
+- Updates in Mini Apps platform.
+- Chat folders in forward and share boxes.
+- Horizontal strip mode for chat folders.
+
 5.7.4 beta (15.11.24)
 
 - Enable auto night mode by default.

From 42a70ff7d09e3f07b128182a788e5c9b5f6b32c2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 22:41:52 +0400
Subject: [PATCH 287/306] Fix crash with inline results sending.

---
 Telegram/SourceFiles/apiwrap.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index f4779b1f7..d206261da 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4028,13 +4028,17 @@ void ApiWrap::sendInlineResult(
 		history->finishSavingCloudDraft(
 			topicRootId,
 			UnixtimeFromMsgId(response.outerMsgId));
-		done(true);
+		if (done) {
+			done(true);
+		}
 	}, [=](const MTP::Error &error, const MTP::Response &response) {
 		sendMessageFail(error, peer, randomId, newId);
 		history->finishSavingCloudDraft(
 			topicRootId,
 			UnixtimeFromMsgId(response.outerMsgId));
-		done(false);
+		if (done) {
+			done(false);
+		}
 	});
 	finishForwarding(action);
 }

From 73349c3c89bee744f22596faeee43d1229ec13dc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 22:52:52 +0400
Subject: [PATCH 288/306] Fix crash in chats strip reorder.

---
 .../ui/widgets/chat_filters_tabs_slider_reorder.cpp            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
index 8695aac32..21d0e9675 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
@@ -180,6 +180,9 @@ void ChatsFiltersTabsReorder::mousePress(
 		}
 	}
 	cancelCurrent();
+	if (!widget) {
+		return;
+	}
 	_currentWidget = widget->section;
 	_currentShiftedWidget = widget;
 	_currentStart = globalPosition.x();

From 39780f49bf62a19324a6277ace518872b74c7bf0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 23:00:46 +0400
Subject: [PATCH 289/306] Fix folder context menu Remove text color.

---
 .../SourceFiles/window/window_filters_menu.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index f32608d1c..f3e07eea9 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/filter_icons.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/vertical_layout_reorder.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/ui_utility.h"
@@ -356,18 +357,11 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 	_popupMenu = base::make_unique_q<Ui::PopupMenu>(
 		i->second.get(),
 		st::popupMenuWithIcons);
-	const auto addAction = Window::PeerMenuCallback([&](
-			Window::PeerMenuCallback::Args args) {
-		return _popupMenu->addAction(
-			args.text,
-			crl::guard(&_outer, std::move(args.handler)),
-			args.icon);
-	});
-
+	const auto addAction = Ui::Menu::CreateAddActionCallback(_popupMenu);
 	if (id) {
 		addAction(
 			tr::lng_filters_context_edit(tr::now),
-			[=] { EditExistingFilter(_session, id); },
+			crl::guard(&_outer, [=] { EditExistingFilter(_session, id); }),
 			&st::menuIconEdit);
 
 		auto filteredChats = [=] {
@@ -380,9 +374,9 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 
 		addAction({
 			.text = tr::lng_filters_context_remove(tr::now),
-			.handler = [=, this] {
+			.handler = crl::guard(&_outer, [=, this] {
 				_removeApi.request(Ui::MakeWeak(&_outer), _session, id);
-			},
+			}),
 			.icon = &st::menuIconDeleteAttention,
 			.isAttention = true,
 		});
@@ -401,7 +395,7 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 
 		addAction(
 			tr::lng_filters_setup_menu(tr::now),
-			[=] { openFiltersSettings(); },
+			crl::guard(&_outer, [=] { openFiltersSettings(); }),
 			&st::menuIconEdit);
 	}
 	if (_popupMenu->empty()) {

From c080bd4c4d751edf79fde9e844b13a0d336263a0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 23:09:42 +0400
Subject: [PATCH 290/306] Don't resubscribe on folder strip rebuild.

---
 .../ui/widgets/chat_filters_tabs_strip.cpp         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 569f139f4..fe8710f30 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -41,7 +41,7 @@ namespace {
 struct State final {
 	Ui::Animations::Simple animation;
 	std::optional<FilterId> lastFilterId = std::nullopt;
-	rpl::lifetime unreadLifetime;
+	rpl::lifetime rebuildLifetime;
 	base::unique_qptr<Ui::PopupMenu> menu;
 
 	Api::RemoveComplexChatFilter removeApi;
@@ -293,6 +293,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		if ((list.size() <= 1 && !slider->width()) || state->ignoreRefresh) {
 			return;
 		}
+		state->rebuildLifetime.destroy();
 		auto sections = ranges::views::all(
 			list
 		) | ranges::views::transform([](const Data::ChatFilter &filter) {
@@ -312,7 +313,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 				: premiumFrom);
 			slider->lockedClicked() | rpl::start_with_next([=] {
 				controller->show(Box(FiltersLimitBox, session, std::nullopt));
-			}, slider->lifetime());
+			}, state->rebuildLifetime);
 			if (state->reorder) {
 				state->reorder->cancel();
 				state->reorder->clearPinnedIntervals();
@@ -326,7 +327,6 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 		}
 		if (trackActiveFilterAndUnreadAndReorder) {
 			auto includeMuted = Data::IncludeMutedCounterFoldersValue();
-			state->unreadLifetime.destroy();
 			for (auto i = 0; i < list.size(); i++) {
 				rpl::combine(
 					Data::UnreadStateValue(session, list[i].id()),
@@ -340,7 +340,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 					const auto isMuted = includeMuted && (count == muted);
 					slider->setUnreadCount(i, count, isMuted);
 					slider->fitWidthToSections();
-				}, state->unreadLifetime);
+				}, state->rebuildLifetime);
 			}
 		}
 		[&] {
@@ -379,7 +379,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 					}
 				}
 				state->reorder->finishReordering();
-			}, slider->lifetime());
+			}, state->rebuildLifetime);
 		}
 		rpl::single(-1) | rpl::then(
 			slider->sectionActivated()
@@ -394,7 +394,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 				scrollToIndex(index, anim::type::normal);
 			}
 			applyFilter(filter);
-		}, wrap->lifetime());
+		}, state->rebuildLifetime);
 		slider->contextMenuRequested() | rpl::start_with_next([=](int index) {
 			if (trackActiveFilterAndUnreadAndReorder) {
 				ShowMenu(wrap, controller, state, index);
@@ -406,7 +406,7 @@ not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
 					slider->activeSection(),
 					[=](int i) { slider->setActiveSection(i); });
 			}
-		}, slider->lifetime());
+		}, state->rebuildLifetime);
 		wrap->toggle((list.size() > 1), anim::type::instant);
 
 		if (state->reorder) {

From ecb4ceec7b33e7e2c739c540992f8b2a88991146 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 23:21:16 +0400
Subject: [PATCH 291/306] Fix possible crash in phone click handler.

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

diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
index 9723ffe34..ec34b8f8b 100644
--- a/Telegram/SourceFiles/core/phone_click_handler.cpp
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -340,12 +340,12 @@ void PhoneClickHandler::onClick(ClickContext context) const {
 	if (Trim(phone) != Trim(controller->session().user()->phone())) {
 		menu->addAction(
 			tr::lng_info_add_as_contact(tr::now),
-			[=, raw = resolvePhoneAction.get()] {
+			[=, raw = Ui::MakeWeak(resolvePhoneAction.get())] {
 				controller->show(
 					Box<AddContactBox>(
-						_session,
-						raw->firstName(),
-						raw->lastName(),
+						&controller->session(),
+						raw ? raw->firstName() : QString(),
+						raw ? raw->lastName() : QString(),
 						Trim(phone)));
 			},
 			&st::menuIconInvite);

From bb32c546d4511cbd5950d8a3fe5ab8992b87a1ec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 23:24:08 +0400
Subject: [PATCH 292/306] Fix possible crash in swipe to reply.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 5531cae2e..687551768 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -916,8 +916,9 @@ void RepliesWidget::setupSwipeReply() {
 		result.callback = [=, itemId = view->data()->fullId()] {
 			const auto still = show->session().data().message(itemId);
 			const auto view = _inner->viewByPosition(still->position());
-			const auto selected = view->selectedQuote(
-				_inner->getSelectedTextRange(still));
+			const auto selected = view
+				? view->selectedQuote(_inner->getSelectedTextRange(still))
+				: SelectedQuote();
 			const auto replyToItemId = (selected.item
 				? selected.item
 				: still)->fullId();

From be53bec9b76bcc8c22cc77d33524930ace94904c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Nov 2024 23:33:45 +0400
Subject: [PATCH 293/306] Version 5.8.1.

- Fix several possible 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                                | 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 ba846faae..5d0614895 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.8.0.0" />
+    Version="5.8.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 a959f80fa..d1bec4dbc 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,8,0,0
- PRODUCTVERSION 5,8,0,0
+ FILEVERSION 5,8,1,0
+ PRODUCTVERSION 5,8,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.8.0.0"
+            VALUE "FileVersion", "5.8.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.8.0.0"
+            VALUE "ProductVersion", "5.8.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 657ef3748..ce7c85c9c 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,8,0,0
- PRODUCTVERSION 5,8,0,0
+ FILEVERSION 5,8,1,0
+ PRODUCTVERSION 5,8,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.8.0.0"
+            VALUE "FileVersion", "5.8.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.8.0.0"
+            VALUE "ProductVersion", "5.8.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index a79722155..73e17a564 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 = 5008000;
-constexpr auto AppVersionStr = "5.8";
+constexpr auto AppVersion = 5008001;
+constexpr auto AppVersionStr = "5.8.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 914da2773..0af1b0e5a 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5008000
+AppVersion         5008001
 AppVersionStrMajor 5.8
-AppVersionStrSmall 5.8
-AppVersionStr      5.8.0
+AppVersionStrSmall 5.8.1
+AppVersionStr      5.8.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.8
+AppVersionOriginal 5.8.1
diff --git a/changelog.txt b/changelog.txt
index 45dfdaecc..1324f2eca 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+5.8.1 (17.11.24)
+
+- Fix several possible crashes.
+
 5.8 (17.11.24)
 
 - Updates in Mini Apps platform.

From e4e2f47f8e9d92c833e77ddcdfe456ff353c86d9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Nov 2024 01:28:36 +0400
Subject: [PATCH 294/306] Adjust build script for Windows Store ARM version.

---
 Telegram/build/build.bat | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat
index 6dc539c61..a8062abd1 100644
--- a/Telegram/build/build.bat
+++ b/Telegram/build/build.bat
@@ -279,7 +279,9 @@ echo Done!
 if %BuildUWP% neq 0 (
   cd "%HomePath%"
 
-  mkdir "%ReleasePath%\AppX\modules\%Platform%\d3d"
+  if %BuildARM% equ 0 (
+    mkdir "%ReleasePath%\AppX\modules\%Platform%\d3d"
+  )
   xcopy "Resources\uwp\AppX\*" "%ReleasePath%\AppX\" /E
   set "ResourcePath=%ReleasePath%\AppX\AppxManifest.xml"
   call :repl "Argument= (ProcessorArchitecture=)&quot;ARCHITECTURE&quot;/ $1&quot;%Platform%&quot;" "Filename=!ResourcePath!" || goto error
@@ -288,7 +290,9 @@ if %BuildUWP% neq 0 (
 
   xcopy "%ReleasePath%\%BinaryName%.exe" "%ReleasePath%\AppX\"
   xcopy "%ReleasePath%\StartupTask.exe" "%ReleasePath%\AppX\"
-  xcopy "%ReleasePath%\modules\%Platform%\d3d\d3dcompiler_47.dll" "%ReleasePath%\AppX\modules\%Platform%\d3d\"
+  if %BuildARM% equ 0 (
+    xcopy "%ReleasePath%\modules\%Platform%\d3d\d3dcompiler_47.dll" "%ReleasePath%\AppX\modules\%Platform%\d3d\"
+  )
 
   MakeAppx.exe pack /d "%ReleasePath%\AppX" /l /p ..\out\Release\%BinaryName%.%Platform%.appx
   if %errorlevel% neq 0 goto error

From 9d74d93ed76fe4c5a57ab607041d62f5ebb3b559 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Nov 2024 12:50:36 +0400
Subject: [PATCH 295/306] Fix some warnings from PVS-Studio.

Fixes #28667.

Some warnings fixed detailed in this post:
https://pvs-studio.com/en/blog/posts/cpp/1186/
---
 Telegram/SourceFiles/api/api_earn.cpp         |  4 +--
 .../SourceFiles/boxes/local_storage_box.cpp   |  4 ++-
 .../chat_helpers/stickers_list_footer.cpp     |  2 +-
 .../chat_helpers/stickers_lottie.cpp          |  4 +--
 .../SourceFiles/core/click_handler_types.cpp  |  1 +
 .../data/components/recent_peers.cpp          |  1 -
 .../data/stickers/data_stickers.cpp           | 28 +++++++++----------
 .../SourceFiles/export/export_api_wrap.cpp    |  2 --
 .../SourceFiles/history/history_widget.cpp    |  6 ++--
 .../history_view_compose_controls.cpp         | 10 ++-----
 .../history_view_voice_record_bar.cpp         |  2 +-
 .../media/history_view_theme_document.cpp     |  3 +-
 .../inline_bots/bot_attach_web_view.cpp       |  2 +-
 .../SourceFiles/media/audio/media_audio.cpp   |  7 ++---
 .../media/view/media_view_overlay_widget.cpp  |  3 +-
 Telegram/SourceFiles/mtproto/session.cpp      |  8 ++----
 .../details/storage_settings_scheme.cpp       |  4 +--
 .../ui/boxes/show_or_premium_box.cpp          |  6 ++--
 18 files changed, 42 insertions(+), 55 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_earn.cpp b/Telegram/SourceFiles/api/api_earn.cpp
index 14615514b..c44690151 100644
--- a/Telegram/SourceFiles/api/api_earn.cpp
+++ b/Telegram/SourceFiles/api/api_earn.cpp
@@ -40,6 +40,7 @@ void HandleWithdrawalButton(
 		std::shared_ptr<Ui::Show> show) {
 	Expects(receiver.currencyReceiver
 		|| (receiver.creditsReceiver && receiver.creditsAmount));
+
 	struct State {
 		rpl::lifetime lifetime;
 		bool loading = false;
@@ -58,8 +59,7 @@ void HandleWithdrawalButton(
 	const auto processOut = [=] {
 		if (state->loading) {
 			return;
-		}
-		if (peer && !receiver.creditsAmount()) {
+		} else if (peer && !receiver.creditsAmount()) {
 			return;
 		}
 		state->loading = true;
diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp
index fcdbd8d6d..647d6e0e9 100644
--- a/Telegram/SourceFiles/boxes/local_storage_box.cpp
+++ b/Telegram/SourceFiles/boxes/local_storage_box.cpp
@@ -240,7 +240,8 @@ int LocalStorageBox::Row::resizeGetHeight(int newWidth) {
 }
 
 void LocalStorageBox::Row::paintEvent(QPaintEvent *e) {
-	if (!_progress || true) {
+#if 0 // not used
+	if (!_progress) {
 		return;
 	}
 	auto p = QPainter(this);
@@ -254,6 +255,7 @@ void LocalStorageBox::Row::paintEvent(QPaintEvent *e) {
 			st::proxyCheckingPosition.y() + bottom
 		},
 		width());
+#endif
 }
 
 QString LocalStorageBox::Row::titleText(const Database::TaggedSummary &data) const {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index 8d666249f..237865424 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -822,7 +822,7 @@ void StickersListFooter::mousePressEvent(QMouseEvent *e) {
 	if (e->button() != Qt::LeftButton) {
 		return;
 	}
-	_iconsMousePos = e ? e->globalPos() : QCursor::pos();
+	_iconsMousePos = e->globalPos();
 	updateSelected();
 
 	if (_selected == SpecialOver::Settings) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp b/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp
index 095abbb57..9c830dc57 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp
@@ -192,9 +192,7 @@ std::unique_ptr<Lottie::SinglePlayer> LottieThumbnail(
 	};
 	const auto session = thumb
 		? &thumb->owner()->session()
-		: media
-		? &media->owner()->session()
-		: nullptr;
+		: &media->owner()->session();
 	return LottieCachedFromContent(
 		method,
 		baseKey,
diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index 231d01972..ded39a2f8 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -189,6 +189,7 @@ void BotGameUrlClickHandler::onClick(ClickContext context) const {
 	const auto game = media ? media->game() : nullptr;
 	if (url.startsWith(u"tg://"_q, Qt::CaseInsensitive) || !_bot || !game) {
 		openLink();
+		return;
 	}
 	const auto bot = _bot;
 	const auto title = game->title;
diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
index 0917be2b9..6b49ea759 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.cpp
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -126,7 +126,6 @@ void RecentPeers::applyLocal(QByteArray serialized) {
 				).arg(count));
 			DEBUG_LOG(("Failed bytes: %1.").arg(
 				QString::fromUtf8(serialized.mid(streamPosition).toHex())));
-			_list.clear();
 			return;
 		}
 	}
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index 4133af7b6..d04b880a6 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -206,22 +206,20 @@ void Stickers::incrementSticker(not_null<DocumentData*> document) {
 	auto &sets = setsRef();
 	auto it = sets.find(Data::Stickers::CloudRecentSetId);
 	if (it == sets.cend()) {
-		if (it == sets.cend()) {
-			it = sets.emplace(
+		it = sets.emplace(
+			Data::Stickers::CloudRecentSetId,
+			std::make_unique<Data::StickersSet>(
+				&session().data(),
 				Data::Stickers::CloudRecentSetId,
-				std::make_unique<Data::StickersSet>(
-					&session().data(),
-					Data::Stickers::CloudRecentSetId,
-					uint64(0), // accessHash
-					uint64(0), // hash
-					tr::lng_recent_stickers(tr::now),
-					QString(),
-					0, // count
-					SetFlag::Special,
-					TimeId(0))).first;
-		} else {
-			it->second->title = tr::lng_recent_stickers(tr::now);
-		}
+				uint64(0), // accessHash
+				uint64(0), // hash
+				tr::lng_recent_stickers(tr::now),
+				QString(),
+				0, // count
+				SetFlag::Special,
+				TimeId(0))).first;
+	} else {
+		it->second->title = tr::lng_recent_stickers(tr::now);
 	}
 	const auto set = it->second.get();
 	auto removedFromEmoji = std::vector<not_null<EmojiPtr>>();
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index b511b9fe3..fe2cd8bea 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -438,8 +438,6 @@ void ApiWrap::startExport(
 	}
 	if (_settings->types & Settings::Type::AnyChatsMask) {
 		_startProcess->steps.push_back(Step::SplitRanges);
-	}
-	if (_settings->types & Settings::Type::AnyChatsMask) {
 		_startProcess->steps.push_back(Step::DialogsCount);
 	}
 	if (_settings->types & Settings::Type::GroupsChannelsMask) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 7caf21053..33eec2d34 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -869,7 +869,7 @@ HistoryWidget::HistoryWidget(
 		}
 		if (flags & PeerUpdateFlag::FullInfo) {
 			fullInfoUpdated();
-			if (const auto channel = _peer ? _peer->asChannel() : nullptr) {
+			if (const auto channel = _peer->asChannel()) {
 				if (channel->allowedReactions().paidEnabled) {
 					session().credits().load();
 				}
@@ -3440,7 +3440,7 @@ void HistoryWidget::messagesFailed(const MTP::Error &error, int requestId) {
 		closeCurrent();
 		const auto wasAccount = not_null(&was->account());
 		if (const auto primary = Core::App().windowFor(wasAccount)) {
-			primary->showToast((was && was->isMegagroup())
+			primary->showToast(was->isMegagroup()
 				? tr::lng_group_not_accessible(tr::now)
 				: tr::lng_channel_not_accessible(tr::now));
 		}
@@ -5111,7 +5111,7 @@ bool HistoryWidget::updateCmdStartShown() {
 	const auto textSmall = _fieldCharsCountManager.count() > kSmallMenuAfter;
 	const auto textChanged = _botMenu.button
 		&& ((_botMenu.text != bot->botInfo->botMenuButtonText)
-		|| (_botMenu.small != textSmall));
+			|| (_botMenu.small != textSmall));
 	if (textChanged) {
 		_botMenu.text = bot->botInfo->botMenuButtonText;
 		if ((_botMenu.small = textSmall)) {
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 2fdbc1d15..a2eefd668 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -381,7 +381,7 @@ void FieldHeader::init() {
 			return;
 		}
 		const auto e = static_cast<QMouseEvent*>(event.get());
-		const auto pos = e ? e->pos() : mapFromGlobal(QCursor::pos());
+		const auto pos = e->pos();
 		const auto inPreviewRect = _clickableRect.contains(pos);
 		const auto inPhotoEdit = _shownMessageHasPreview
 			&& _photoEditAllowed
@@ -1191,9 +1191,7 @@ void ComposeControls::showStarted() {
 	if (_attachBotsMenu) {
 		_attachBotsMenu->hideFast();
 	}
-	if (_voiceRecordBar) {
-		_voiceRecordBar->hideFast();
-	}
+	_voiceRecordBar->hideFast();
 	if (_autocomplete) {
 		_autocomplete->hideFast();
 	}
@@ -1213,9 +1211,7 @@ void ComposeControls::showFinished() {
 	if (_attachBotsMenu) {
 		_attachBotsMenu->hideFast();
 	}
-	if (_voiceRecordBar) {
-		_voiceRecordBar->hideFast();
-	}
+	_voiceRecordBar->hideFast();
 	if (_autocomplete) {
 		_autocomplete->hideFast();
 	}
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 c6fd7bff4..1f80fb15c 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
@@ -474,7 +474,7 @@ TTLButton::TTLButton(
 		) | rpl::start_with_next([=](bool toHide) {
 			const auto isFirstTooltip
 				= !Core::App().settings().ttlVoiceClickTooltipHidden();
-			if (isFirstTooltip || (!isFirstTooltip && toHide)) {
+			if (isFirstTooltip || toHide) {
 				_tooltip->toggleAnimated(!toHide);
 			}
 		}, _tooltip->lifetime());
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 66db74036..ba324f7e3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -91,7 +91,8 @@ ThemeDocument::ThemeDocument(
 : File(parent, parent->data())
 , _data(document)
 , _serviceWidth(serviceWidth) {
-	Expects(params.has_value() || _data->hasThumbnail() || _data->isTheme());
+	Expects(params.has_value()
+		|| (_data && (_data->hasThumbnail() || _data->isTheme())));
 
 	if (params) {
 		_background = params->backgroundColors();
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 7a2f79071..df1111869 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -1366,7 +1366,7 @@ void WebViewInstance::show(ShowArgs &&args) {
 			: attached->inMainMenu
 			? Button::RemoveFromMainMenu
 			: Button::RemoveFromMenu);
-	const auto allowClipboardRead = v::is<WebViewSourceAttachMenu>(_source)
+	const auto allowClipboardRead = v::is<WebViewSourceMainMenu>(_source)
 		|| v::is<WebViewSourceAttachMenu>(_source)
 		|| (attached != end(bots)
 			&& (attached->inAttachMenu || attached->inMainMenu));
diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 2b4c57084..86fe5ce21 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -806,10 +806,9 @@ void Mixer::externalSoundProgress(const AudioMsgId &audio) {
 }
 
 bool Mixer::checkCurrentALError(AudioMsgId::Type type) {
-	if (!Audio::PlaybackErrorHappened()) return true;
-
-	const auto data = trackForType(type);
-	if (!data) {
+	if (!Audio::PlaybackErrorHappened()) {
+		return true;
+	} else if (const auto data = trackForType(type)) {
 		setStoppedState(data, State::StoppedAtError);
 		onError(data->state.id);
 	}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index f2314a616..921c39313 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1234,7 +1234,8 @@ void OverlayWidget::documentUpdated(not_null<DocumentData*> document) {
 	if (_document != document) {
 		return;
 	} else if (documentBubbleShown()) {
-		if ((_document->loading() && _docCancel->isHidden()) || (!_document->loading() && !_docCancel->isHidden())) {
+		if ((_document->loading() && _docCancel->isHidden())
+			|| (!_document->loading() && !_docCancel->isHidden())) {
 			updateControls();
 		} else if (_document->loading()) {
 			updateDocSize();
diff --git a/Telegram/SourceFiles/mtproto/session.cpp b/Telegram/SourceFiles/mtproto/session.cpp
index 0a50a4561..842541e77 100644
--- a/Telegram/SourceFiles/mtproto/session.cpp
+++ b/Telegram/SourceFiles/mtproto/session.cpp
@@ -399,12 +399,10 @@ int32 Session::getState() const {
 
 	if (_private) {
 		const auto s = _private->getState();
-		if (s == ConnectedState) {
+		if (s == ConnectedState
+			|| s == ConnectingState
+			|| s == DisconnectedState) {
 			return s;
-		} else if (s == ConnectingState || s == DisconnectedState) {
-			if (result < 0) {
-				return s;
-			}
 		} else if (s < 0) {
 			if (result < 0 && s > result) {
 				result = s;
diff --git a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
index 695f8f58a..d9421433e 100644
--- a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
+++ b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
@@ -1059,9 +1059,7 @@ bool ReadSetting(
 			auto id = Ui::Emoji::IdFromOldKey(static_cast<uint64>(i.key()));
 			if (!id.isEmpty()) {
 				auto index = Ui::Emoji::ColorIndexFromOldKey(i.value());
-				if (index >= 0) {
-					variants.insert(id, index);
-				}
+				variants.insert(id, index);
 			}
 		}
 		Core::App().settings().setLegacyEmojiVariants(std::move(variants));
diff --git a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
index e44a172f1..426ddce42 100644
--- a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
@@ -117,8 +117,7 @@ void ShowOrPremiumBox(
 			tr::lng_lastseen_shown_toast(tr::now),
 			&st::showOrIconLastSeen,
 		}
-		: (type == ShowOrPremium::ReadTime)
-		? Skin{
+		: Skin{
 			tr::lng_readtime_show_title(),
 			tr::lng_readtime_show_about(
 				lt_user,
@@ -134,8 +133,7 @@ void ShowOrPremiumBox(
 			tr::lng_readtime_premium_button(),
 			tr::lng_readtime_shown_toast(tr::now),
 			&st::showOrIconReadTime,
-		}
-		: Skin();
+		};
 
 	box->setStyle(st::showOrBox);
 	box->setWidth(st::boxWideWidth);

From 1594afa3893de5fd598d376cb8323188576a416d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Nov 2024 14:17:01 +0400
Subject: [PATCH 296/306] Fix emoji status pack view regression.

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

diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index b14e9aee1..172420fd8 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -774,7 +774,7 @@ void TopBarUser::updateTitle(
 		{ EntityType::CustomEmoji, 0, 1, entityEmojiData },
 		Ui::Text::Link(text, linkIndex).entities.front(),
 	};
-	auto title = (setId != coloredId)
+	auto title = (setId == coloredId)
 		? tr::lng_premium_emoji_status_title_colored(
 			tr::now,
 			lt_user,

From eed9541f9fcdc4cc6bd7542eea48b700034c5aef Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Nov 2024 14:25:24 +0400
Subject: [PATCH 297/306] Fix Withdraw button text.

---
 Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
index a1ec88936..7b2072cda 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
@@ -240,7 +240,7 @@ void InnerWidget::fill() {
 			),
 			rpl::duplicate(availableBalanceValue),
 			rpl::duplicate(dateValue),
-			std::move(dateValue) | rpl::map([=](const QDateTime &dt) {
+			rpl::duplicate(dateValue) | rpl::map([=](const QDateTime &dt) {
 				return !dt.isNull() || (!_state.isWithdrawalEnabled);
 			}),
 			rpl::duplicate(availableBalanceValue) | rpl::map([=](uint64 v) {

From 20fadfef7f75512ddfe6f0bb35ceda4aea57a5b8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Nov 2024 16:01:15 +0400
Subject: [PATCH 298/306] Fix file dialog for Windows on ARM.

---
 Telegram/SourceFiles/platform/win/file_utilities_win.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
index 5bf883658..e07298811 100644
--- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
+++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
@@ -375,7 +375,9 @@ bool Get(
 		dialog.setFileMode(QFileDialog::AnyFile);
 		dialog.setAcceptMode(QFileDialog::AcceptSave);
 	}
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	dialog.show();
+#endif // Qt < 6.0.0
 
 	auto realLastPath = [=] {
 		// If we're given some non empty path containing a folder - use it.

From 5c62ba08350ff49f3dbbf614d3cbb75de5b15b64 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Nov 2024 16:23:19 +0400
Subject: [PATCH 299/306] Don't reopen forum on opening a link.

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

diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index bb9bddf9e..912d663aa 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -572,7 +572,8 @@ void SessionNavigation::showPeerByLinkResolved(
 		const auto controller = parentController();
 		if (const auto forum = peer->forum()) {
 			if (controller->windowId().hasChatsList()
-				&& !controller->adaptive().isOneColumn()) {
+				&& !controller->adaptive().isOneColumn()
+				&& controller->shownForum().current() != forum) {
 				controller->showForum(forum);
 			}
 		}

From 1438046dd46d527f0cd04288bfb4958b4ba6b0fa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Nov 2024 10:37:47 +0400
Subject: [PATCH 300/306] Improve bottom label color in mini apps.

---
 .../ui/chat/attach/attach_bot_webview.cpp     | 46 +++++++++++++++++--
 .../ui/chat/attach/attach_bot_webview.h       |  3 ++
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 6fa4bb997..1ede6deb9 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -783,6 +783,8 @@ void Panel::createWebviewBottom() {
 		_webviewBottom.get(),
 		_bottomText.value(),
 		st::paymentsWebviewBottom);
+	_webviewBottomLabel = label;
+
 	const auto height = padding.top()
 		+ label->heightNoMargins()
 		+ padding.bottom();
@@ -840,6 +842,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			}
 		}
 		if (_webviewBottom.get() == bottom) {
+			_webviewBottomLabel = nullptr;
 			_webviewBottom = nullptr;
 			_secondaryButton = nullptr;
 			_mainButton = nullptr;
@@ -1596,20 +1599,53 @@ void Panel::processHeaderColor(const QJsonObject &args) {
 	}
 }
 
+void Panel::overrideBodyColor(std::optional<QColor> color) {
+	_widget->overrideBodyColor(color);
+	const auto raw = _webviewBottomLabel.data();
+	if (!raw) {
+		return;
+	} else if (!color) {
+		raw->setTextColorOverride(std::nullopt);
+		return;
+	}
+	const auto set = [](const style::color &color, QColor value) {
+		color.set(
+			uchar(value.red()),
+			uchar(value.green()),
+			uchar(value.blue()),
+			uchar(value.alpha()));
+	};
+
+	const auto contrast = 2.5;
+	const auto luminance = 0.2126 * color->redF()
+		+ 0.7152 * color->greenF()
+		+ 0.0722 * color->blueF();
+	const auto textColor = (luminance > 0.5)
+		? QColor(0, 0, 0)
+		: QColor(255, 255, 255);
+	const auto textLuminance = (luminance > 0.5) ? 0 : 1;
+	const auto adaptiveOpacity = (luminance - textLuminance + contrast)
+		/ contrast;
+	const auto opacity = std::clamp(adaptiveOpacity, 0.5, 0.64);
+	auto buttonColor = textColor;
+	buttonColor.setAlphaF(opacity);
+	raw->setTextColorOverride(buttonColor);
+}
+
 void Panel::processBackgroundColor(const QJsonObject &args) {
 	_bodyColorReceived = true;
 	if (const auto color = ParseColor(args["color"].toString())) {
-		_widget->overrideBodyColor(color);
+		overrideBodyColor(*color);
 		_bodyColorLifetime.destroy();
 	} else if (const auto color = LookupNamedColor(
 			args["color_key"].toString())) {
-		_widget->overrideBodyColor((*color)->c);
+		overrideBodyColor((*color)->c);
 		_bodyColorLifetime = style::PaletteChanged(
 		) | rpl::start_with_next([=] {
-			_widget->overrideBodyColor((*color)->c);
+			overrideBodyColor((*color)->c);
 		});
 	} else {
-		_widget->overrideBodyColor(std::nullopt);
+		overrideBodyColor(std::nullopt);
 		_bodyColorLifetime.destroy();
 	}
 	if (const auto raw = _bottomButtonsBg.get()) {
@@ -1923,7 +1959,7 @@ void Panel::updateColorOverrides(const Webview::ThemeParams &params) {
 		_widget->overrideTitleColor(params.titleBg);
 	}
 	if (!_bodyColorReceived && params.bodyBg.alpha() == 255) {
-		_widget->overrideBodyColor(params.bodyBg);
+		overrideBodyColor(params.bodyBg);
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index e5a822474..b17a648a4 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -19,6 +19,7 @@ class QJsonObject;
 class QJsonValue;
 
 namespace Ui {
+class FlatLabel;
 class BoxContent;
 class RpWidget;
 class SeparatePanel;
@@ -196,6 +197,7 @@ private:
 	void sendFullScreen();
 
 	void updateColorOverrides(const Webview::ThemeParams &params);
+	void overrideBodyColor(std::optional<QColor> color);
 
 	using EventData = std::variant<QString, QJsonObject>;
 	void postEvent(const QString &event);
@@ -216,6 +218,7 @@ private:
 	std::unique_ptr<SeparatePanel> _widget;
 	std::unique_ptr<WebviewWithLifetime> _webview;
 	std::unique_ptr<RpWidget> _webviewBottom;
+	QPointer<FlatLabel> _webviewBottomLabel;
 	rpl::variable<QString> _bottomText;
 	QPointer<RpWidget> _webviewParent;
 	std::unique_ptr<RpWidget> _bottomButtonsBg;

From 244696ae2433928a3728ad11e76cfb59d219a64d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Nov 2024 03:48:08 +0300
Subject: [PATCH 301/306] Fixed miss-order of archived dialogs in forward  box.

---
 .../SourceFiles/window/window_peer_menu.cpp   | 229 ++++++++++++------
 1 file changed, 158 insertions(+), 71 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 2ea988a8e..4a3abe2ea 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2157,6 +2157,163 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		not_null<Controller*> controller;
 		base::unique_qptr<Ui::PopupMenu> menu;
 	};
+
+	const auto applyFilter = [=](not_null<PeerListBox*> box, FilterId id) {
+		box->scrollToY(0);
+		auto &filters = session->data().chatsFilters();
+		const auto &list = filters.list();
+		if (list.size() <= 1) {
+			return;
+		}
+		const auto pinnedList = [&](
+				not_null<Dialogs::MainList*> list,
+				bool foundSelf) {
+			const auto pinned = list->pinned()->order();
+			auto peers = std::vector<not_null<PeerData*>>();
+			peers.reserve(pinned.size());
+			for (const auto &pin : pinned) {
+				if (!foundSelf && pin.peer()->isSelf()) {
+					peers.insert(peers.begin(), pin.peer());
+					foundSelf = true;
+				} else {
+					peers.push_back(pin.peer());
+				}
+			}
+			if (!foundSelf) {
+				peers.insert(peers.begin(), session->user());
+			}
+			return peers;
+		};
+		const auto folder = session->data().folderLoaded(
+			Data::Folder::kId);
+		const auto pinned = pinnedList(
+			id
+				? filters.chatsList(id)
+				: session->data().chatsList(nullptr),
+			!!id);
+		const auto pinnedInFolder = (!id && folder)
+			? pinnedList(folder->chatsList(), true)
+			: std::vector<not_null<PeerData*>>();
+		box->peerListSortRows([&](
+				const PeerListRow &r1,
+				const PeerListRow &r2) {
+			{ // Pinned to top.
+				auto it1 = pinned.end();
+				auto it2 = pinned.end();
+				for (auto it = pinned.begin(); it != pinned.end(); ++it) {
+					if ((*it) == r1.peer()) {
+						it1 = it;
+					}
+					if ((*it) == r2.peer()) {
+						it2 = it;
+					}
+					if (it1 != pinned.end() && it2 != pinned.end()) {
+						break;
+					}
+				}
+				if (it1 == pinned.end() && it2 != pinned.end()) {
+					return false;
+				} else if (it2 == pinned.end() && it1 != pinned.end()) {
+					return true;
+				} else if (it1 != pinned.end() && it2 != pinned.end()) {
+					return it1 < it2;
+				}
+			}
+			{ // Pinned to bottom.
+				const auto &indexed = session->data().contactsNoChatsList();
+				auto it1 = indexed->end();
+				auto it2 = indexed->end();
+				for (auto it = indexed->begin(); it != indexed->end(); ++it) {
+					if (it->get()->key().peer() == r1.peer()) {
+						it1 = it;
+					}
+					if (it->get()->key().peer() == r2.peer()) {
+						it2 = it;
+					}
+					if (it1 != indexed->end() && it2 != indexed->end()) {
+						break;
+					}
+				}
+				if (it1 == indexed->end() && it2 != indexed->end()) {
+					return true;
+				} else if (it2 == indexed->end() && it1 != indexed->end()) {
+					return false;
+				} else if (it1 != indexed->end() && it2 != indexed->end()) {
+					return it1 > it2;
+				}
+			}
+			if (folder) {
+				const auto pinned1 = ranges::find(pinnedInFolder, r1.peer());
+				const auto pinned2 = ranges::find(pinnedInFolder, r2.peer());
+				const auto isPinned1 = pinned1 != pinnedInFolder.end();
+				const auto isPinned2 = pinned2 != pinnedInFolder.end();
+				if (isPinned1 && isPinned2) {
+					return pinned1 < pinned2;
+				}
+
+				const auto &indexed = folder->chatsList()->indexed();
+				auto it1 = indexed->end();
+				auto it2 = indexed->end();
+				for (auto it = indexed->begin(); it != indexed->end(); ++it) {
+					if (it->get()->key().peer() == r1.peer()) {
+						it1 = it;
+					}
+					if (it->get()->key().peer() == r2.peer()) {
+						it2 = it;
+					}
+					if (it1 != indexed->end() && it2 != indexed->end()) {
+						break;
+					}
+				}
+				const auto isFoldered1 = it1 != indexed->end();
+				const auto isFoldered2 = it2 != indexed->end();
+				if (isPinned1 && !isPinned2) {
+					return isFoldered2;
+				}
+				if (isPinned2 && !isPinned1) {
+					return !isFoldered1;
+				}
+				if (!isPinned1 && !isPinned2) {
+					if (!isFoldered1 && isFoldered2) {
+						return true;
+					} else if (!isFoldered2 && isFoldered1) {
+						return false;
+					} else if (isFoldered1 && isFoldered2) {
+						return it1 < it2;
+					}
+				}
+			}
+			const auto history1 = session->data().history(r1.peer());
+			const auto history2 = session->data().history(r2.peer());
+			const auto date1 = history1->lastMessage()
+				? history1->lastMessage()->date()
+				: TimeId(0);
+			const auto date2 = history2->lastMessage()
+				? history2->lastMessage()->date()
+				: TimeId(0);
+			return date1 > date2;
+		});
+		const auto filter = ranges::find(
+			list,
+			id,
+			&Data::ChatFilter::id);
+		if (filter == list.end()) {
+			return;
+		}
+		box->peerListPartitionRows([&](const PeerListRow &row) {
+			const auto rowPtr = const_cast<PeerListRow*>(&row);
+			if (!filter->id()) {
+				box->peerListSetRowHidden(rowPtr, false);
+			} else {
+				const auto result = filter->contains(
+					session->data().history(row.peer()));
+				box->peerListSetRowHidden(rowPtr, !result);
+			}
+			return false;
+		});
+		box->peerListRefreshRows();
+	};
+
 	const auto state = [&] {
 		auto controller = std::make_unique<Controller>(session);
 		const auto controllerRaw = controller.get();
@@ -2164,80 +2321,10 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			controllerRaw->setSearchNoResultsText(
 				tr::lng_bot_chats_not_found(tr::now));
 			box->setSpecialTabMode(true);
-			auto applyFilter = [=](FilterId id) {
-				box->scrollToY(0);
-				auto &filters = session->data().chatsFilters();
-				const auto &list = filters.list();
-				if (list.size() <= 1) {
-					return;
-				}
-				const auto pinned = [&] {
-					const auto &list = id
-						? filters.chatsList(id)
-						: session->data().chatsList(nullptr);
-					const auto pinned = list->pinned()->order();
-					auto peers = std::vector<not_null<PeerData*>>();
-					peers.reserve(pinned.size());
-					auto foundSelf = !!id;
-					for (const auto &pin : pinned) {
-						if (!foundSelf && pin.peer()->isSelf()) {
-							peers.insert(peers.begin(), pin.peer());
-							foundSelf = true;
-						} else {
-							peers.push_back(pin.peer());
-						}
-					}
-					if (!foundSelf) {
-						peers.insert(peers.begin(), session->user());
-					}
-					return peers;
-				}();
-				box->peerListSortRows([&](
-						const PeerListRow &r1,
-						const PeerListRow &r2) {
-					const auto it1 = ranges::find(pinned, r1.peer());
-					const auto it2 = ranges::find(pinned, r2.peer());
-					if (it1 == pinned.end() && it2 != pinned.end()) {
-						return false;
-					} else if (it2 == pinned.end() && it1 != pinned.end()) {
-						return true;
-					} else if (it1 != pinned.end() && it2 != pinned.end()) {
-						return it1 < it2;
-					}
-					const auto history1 = session->data().history(r1.peer());
-					const auto history2 = session->data().history(r2.peer());
-					const auto date1 = history1->lastMessage()
-						? history1->lastMessage()->date()
-						: TimeId(0);
-					const auto date2 = history2->lastMessage()
-						? history2->lastMessage()->date()
-						: TimeId(0);
-					return date1 > date2;
-				});
-				const auto filter = ranges::find(
-					list,
-					id,
-					&Data::ChatFilter::id);
-				if (filter == list.end()) {
-					return;
-				}
-				box->peerListPartitionRows([&](const PeerListRow &row) {
-					const auto rowPtr = const_cast<PeerListRow*>(&row);
-					if (!filter->id()) {
-						box->peerListSetRowHidden(rowPtr, false);
-					} else {
-						const auto result = filter->contains(
-							session->data().history(row.peer()));
-						box->peerListSetRowHidden(rowPtr, !result);
-					}
-					return false;
-				});
-				box->peerListRefreshRows();
-			};
 			const auto chatsFilters = Ui::AddChatFiltersTabsStrip(
 				box,
 				session,
-				std::move(applyFilter));
+				[=](FilterId id) { applyFilter(box, id); });
 			chatsFilters->lower();
 			chatsFilters->heightValue() | rpl::start_with_next([box](int h) {
 				box->setAddedTopScrollSkip(h);

From bd2ae03ab4c0f898e0eae986f71803e770389563 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Nov 2024 04:40:07 +0300
Subject: [PATCH 302/306] Fixed display of long text for open button in web
 page views.

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

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 ff0c83af4..c9980a817 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -1232,8 +1232,9 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			.position = QPoint(
 				inner.x() + (inner.width() - _openButton.maxWidth()) / 2,
 				end + st::historyPageButtonPadding.top()),
-			.availableWidth = paintw,
+			.availableWidth = inner.width(),
 			.now = context.now,
+			.elisionLines = 1,
 		});
 	}
 }

From 0659ccc3f0636de441ba7a9ac72f1e672778e949 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Nov 2024 12:25:27 +0400
Subject: [PATCH 303/306] Fix user-driven fullscreen change on macOS.

---
 Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp | 5 +++++
 Telegram/lib_ui                                            | 2 +-
 2 files 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 1ede6deb9..e0f215d5c 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -394,6 +394,11 @@ Panel::Panel(Args &&args)
 		sendContentSafeArea();
 	}, _widget->lifetime());
 
+	_widget->fullScreenValue(
+	) | rpl::start_with_next([=](bool fullscreen) {
+		_fullscreen = fullscreen;
+	}, _widget->lifetime());
+
 	_widget->closeRequests(
 	) | rpl::start_with_next([=] {
 		if (_closeNeedConfirmation) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 46c18e2c7..716986e75 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 46c18e2c7e730c6304e8d813be4d5abc6fb364ad
+Subproject commit 716986e75b3abc3329f75346aeff9062a58bf98f

From 1267bcd255d20e25a093b33a4261d2ebfdee5b5a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Nov 2024 13:16:54 +0400
Subject: [PATCH 304/306] Use separate window buttons only with
 QWindowContainer.

---
 .../ui/chat/attach/attach_bot_webview.cpp          | 14 ++++++--------
 Telegram/lib_ui                                    |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index e0f215d5c..7f30d315f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -857,6 +857,12 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	if (!raw->widget()) {
 		return false;
 	}
+
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+	_widget->allowChildFullScreenControls(
+		!raw->widget()->inherits("QWindowContainer"));
+#endif // !Q_OS_WIN && !Q_OS_MAC
+
 	QObject::connect(raw->widget(), &QObject::destroyed, [=] {
 		const auto parent = _webviewParent.data();
 		if (!_webview
@@ -1613,14 +1619,6 @@ void Panel::overrideBodyColor(std::optional<QColor> color) {
 		raw->setTextColorOverride(std::nullopt);
 		return;
 	}
-	const auto set = [](const style::color &color, QColor value) {
-		color.set(
-			uchar(value.red()),
-			uchar(value.green()),
-			uchar(value.blue()),
-			uchar(value.alpha()));
-	};
-
 	const auto contrast = 2.5;
 	const auto luminance = 0.2126 * color->redF()
 		+ 0.7152 * color->greenF()
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 716986e75..c6710c2cf 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 716986e75b3abc3329f75346aeff9062a58bf98f
+Subproject commit c6710c2cfe68d3bc3c29ffbf6cd9d0a4cb168226

From e4902efefccc81d3db13385b57251f2c4c171365 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Nov 2024 14:01:41 +0400
Subject: [PATCH 305/306] Improve fullscreen miniapps on Linux.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index c6710c2cf..f48bc506d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit c6710c2cfe68d3bc3c29ffbf6cd9d0a4cb168226
+Subproject commit f48bc506d1e24395b8245f663affaa72c782bd60
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 095babf23..3dc2f15cd 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 095babf234736e053bdbbc3dc15bc042a40c45b4
+Subproject commit 3dc2f15cd449305536bd3ed0d0f3152701ce36c5

From c04f68f25cb2e3bfc32b2c6188c39968af18bbbc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Nov 2024 14:32:15 +0400
Subject: [PATCH 306/306] Version 5.8.2.

- Improve bottom label color in mini apps.
- Fix some fullscreen issues in mini apps.
- Fix miss-order of archived chats in forward box.
- Fix file dialog for Windows on ARM.
- Fix emoji status pack view from profile regression.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 8 ++++++++
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 5d0614895..8d93b797d 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.8.1.0" />
+    Version="5.8.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 d1bec4dbc..3d660e2e8 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,8,1,0
- PRODUCTVERSION 5,8,1,0
+ FILEVERSION 5,8,2,0
+ PRODUCTVERSION 5,8,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.8.1.0"
+            VALUE "FileVersion", "5.8.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.8.1.0"
+            VALUE "ProductVersion", "5.8.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index ce7c85c9c..8ccb08a81 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,8,1,0
- PRODUCTVERSION 5,8,1,0
+ FILEVERSION 5,8,2,0
+ PRODUCTVERSION 5,8,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.8.1.0"
+            VALUE "FileVersion", "5.8.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.8.1.0"
+            VALUE "ProductVersion", "5.8.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 73e17a564..481a4f39b 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 = 5008001;
-constexpr auto AppVersionStr = "5.8.1";
+constexpr auto AppVersion = 5008002;
+constexpr auto AppVersionStr = "5.8.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 0af1b0e5a..ff4691843 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5008001
+AppVersion         5008002
 AppVersionStrMajor 5.8
-AppVersionStrSmall 5.8.1
-AppVersionStr      5.8.1
+AppVersionStrSmall 5.8.2
+AppVersionStr      5.8.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.8.1
+AppVersionOriginal 5.8.2
diff --git a/changelog.txt b/changelog.txt
index 1324f2eca..a6704ef0b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+5.8.2 (19.11.24)
+
+- Improve bottom label color in mini apps.
+- Fix some fullscreen issues in mini apps.
+- Fix miss-order of archived chats in forward box.
+- Fix file dialog for Windows on ARM.
+- Fix emoji status pack view from profile regression.
+
 5.8.1 (17.11.24)
 
 - Fix several possible crashes.